diff options
author | Markus Keller | 2015-11-29 21:11:24 +0000 |
---|---|---|
committer | Markus Keller | 2015-12-01 01:50:38 +0000 |
commit | 64b34b614087b96e6cc92c72143768b98ae32602 (patch) | |
tree | 4f4f493fd8161f9a5885f11021cd14a923946e9f | |
parent | f01dd079500e382823d5d1767996cb9ef85233ee (diff) | |
download | eclipse.platform.text-64b34b614087b96e6cc92c72143768b98ae32602.tar.gz eclipse.platform.text-64b34b614087b96e6cc92c72143768b98ae32602.tar.xz eclipse.platform.text-64b34b614087b96e6cc92c72143768b98ae32602.zip |
Bug 478673: added @Override/@Deprecated and removed non-Javadoc boilerplate
648 files changed, 5291 insertions, 9184 deletions
diff --git a/org.eclipse.core.filebuffers.tests/src/org/eclipse/core/filebuffers/tests/FileBufferCreation.java b/org.eclipse.core.filebuffers.tests/src/org/eclipse/core/filebuffers/tests/FileBufferCreation.java index 20f338caa5a..eb8667b1032 100644 --- a/org.eclipse.core.filebuffers.tests/src/org/eclipse/core/filebuffers/tests/FileBufferCreation.java +++ b/org.eclipse.core.filebuffers.tests/src/org/eclipse/core/filebuffers/tests/FileBufferCreation.java @@ -53,10 +53,12 @@ public class FileBufferCreation extends TestCase { super(name); } + @Override protected void setUp() throws Exception { fProject= ResourceHelper.createProject("project"); } + @Override protected void tearDown() throws Exception { ResourceHelper.deleteProject("project"); } diff --git a/org.eclipse.core.filebuffers.tests/src/org/eclipse/core/filebuffers/tests/FileBufferFunctions.java b/org.eclipse.core.filebuffers.tests/src/org/eclipse/core/filebuffers/tests/FileBufferFunctions.java index 5a0254672d4..71533493dec 100644 --- a/org.eclipse.core.filebuffers.tests/src/org/eclipse/core/filebuffers/tests/FileBufferFunctions.java +++ b/org.eclipse.core.filebuffers.tests/src/org/eclipse/core/filebuffers/tests/FileBufferFunctions.java @@ -60,6 +60,7 @@ public abstract class FileBufferFunctions extends TestCase { protected abstract Class getAnnotationModelClass() throws Exception; + @Override protected void setUp() throws Exception { fManager= FileBuffers.getTextFileBufferManager(); fProject= ResourceHelper.createProject("project"); @@ -72,6 +73,7 @@ public abstract class FileBufferFunctions extends TestCase { return fProject; } + @Override protected void tearDown() throws Exception { ITextFileBuffer buffer= fManager.getTextFileBuffer(fPath, LocationKind.NORMALIZE); assertTrue(buffer == null); @@ -335,11 +337,13 @@ public abstract class FileBufferFunctions extends TestCase { public IFileBuffer buffer; public int count; + @Override public void bufferCreated(IFileBuffer buf) { ++count; this.buffer= buf; } + @Override public void bufferDisposed(IFileBuffer buf) { --count; this.buffer= buf; @@ -380,6 +384,7 @@ public abstract class FileBufferFunctions extends TestCase { public int count; public boolean isDirty; + @Override public void dirtyStateChanged(IFileBuffer buf, boolean state) { ++count; this.buffer= buf; @@ -430,6 +435,7 @@ public abstract class FileBufferFunctions extends TestCase { public int count; public boolean isDirty; + @Override public void dirtyStateChanged(IFileBuffer buf, boolean state) { ++count; this.buffer= buf; @@ -478,11 +484,13 @@ public abstract class FileBufferFunctions extends TestCase { public IFileBuffer preBuffer, postBuffer; public int preCount, postCount; + @Override public void bufferContentAboutToBeReplaced(IFileBuffer buffer) { ++preCount; preBuffer= buffer; } + @Override public void bufferContentReplaced(IFileBuffer buffer) { ++postCount; postBuffer= buffer; @@ -527,11 +535,13 @@ public abstract class FileBufferFunctions extends TestCase { public IFileBuffer preBuffer, postBuffer; public int preCount, postCount; + @Override public void bufferContentAboutToBeReplaced(IFileBuffer buffer) { ++preCount; preBuffer= buffer; } + @Override public void bufferContentReplaced(IFileBuffer buffer) { ++postCount; postBuffer= buffer; @@ -575,6 +585,7 @@ public abstract class FileBufferFunctions extends TestCase { public int count; public boolean isStateValidated; + @Override public void stateValidationChanged(IFileBuffer buf, boolean state) { ++count; this.buffer= buf; @@ -619,6 +630,7 @@ public abstract class FileBufferFunctions extends TestCase { public int count; public boolean isStateValidated; + @Override public void stateValidationChanged(IFileBuffer buf, boolean state) { ++count; this.buffer= buf; @@ -664,6 +676,7 @@ public abstract class FileBufferFunctions extends TestCase { public int count; public boolean isStateValidated; + @Override public void stateValidationChanged(IFileBuffer buf, boolean state) { ++count; this.buffer= buf; @@ -709,6 +722,7 @@ public abstract class FileBufferFunctions extends TestCase { public int count; public boolean isStateValidated; + @Override public void stateValidationChanged(IFileBuffer buf, boolean state) { ++count; this.buffer= buf; @@ -755,6 +769,7 @@ public abstract class FileBufferFunctions extends TestCase { public IFileBuffer buffer; public int count; + @Override public void underlyingFileDeleted(IFileBuffer buf) { ++count; this.buffer= buf; @@ -795,6 +810,7 @@ public abstract class FileBufferFunctions extends TestCase { public int count; public IPath newLocation; + @Override public void underlyingFileMoved(IFileBuffer buf, IPath location) { ++count; this.buffer= buf; @@ -847,6 +863,7 @@ public abstract class FileBufferFunctions extends TestCase { public IFileBuffer buffer; public int count; + @Override public void stateChanging(IFileBuffer buf) { ++count; this.buffer= buf; @@ -886,6 +903,7 @@ public abstract class FileBufferFunctions extends TestCase { public IFileBuffer buffer; public int count; + @Override public void stateChanging(IFileBuffer buf) { ++count; this.buffer= buf; @@ -925,6 +943,7 @@ public abstract class FileBufferFunctions extends TestCase { public IFileBuffer buffer; public int count; + @Override public void stateChanging(IFileBuffer buf) { ++count; this.buffer= buf; @@ -964,6 +983,7 @@ public abstract class FileBufferFunctions extends TestCase { public IFileBuffer buffer; public int count; + @Override public void stateChanging(IFileBuffer buf) { ++count; this.buffer= buf; @@ -1004,6 +1024,7 @@ public abstract class FileBufferFunctions extends TestCase { public IFileBuffer buffer; public int count; + @Override public void stateChanging(IFileBuffer buf) { ++count; this.buffer= buf; @@ -1045,6 +1066,7 @@ public abstract class FileBufferFunctions extends TestCase { public IFileBuffer buffer; public int count; + @Override public void stateChanging(IFileBuffer buf) { ++count; this.buffer= buf; @@ -1107,9 +1129,11 @@ public abstract class FileBufferFunctions extends TestCase { int notifyCount= 0; + @Override public void bufferCreated(IFileBuffer buffer) { notifyCount++; } + @Override public void bufferDisposed(IFileBuffer buffer) { notifyCount++; } @@ -1118,10 +1142,12 @@ public abstract class FileBufferFunctions extends TestCase { class ForcedException extends RuntimeException { private static final long serialVersionUID= 1L; + @Override public void printStackTrace(PrintStream s) { s.println("!FORCED BY TEST: this entry is intentional"); } + @Override public void printStackTrace(PrintWriter s) { s.println("!FORCED BY TEST: this entry is intentional"); } @@ -1131,9 +1157,11 @@ public abstract class FileBufferFunctions extends TestCase { NotifiedListener notifyCounter2= new NotifiedListener(); FileBufferListener failingListener= new FileBufferListener() { + @Override public void bufferCreated(IFileBuffer buffer) { throw new ForcedException(); } + @Override public void bufferDisposed(IFileBuffer buffer) { throw new ForcedException(); } diff --git a/org.eclipse.core.filebuffers.tests/src/org/eclipse/core/filebuffers/tests/FileBufferListener.java b/org.eclipse.core.filebuffers.tests/src/org/eclipse/core/filebuffers/tests/FileBufferListener.java index 4dbc0deb4bc..b70a6897cb2 100644 --- a/org.eclipse.core.filebuffers.tests/src/org/eclipse/core/filebuffers/tests/FileBufferListener.java +++ b/org.eclipse.core.filebuffers.tests/src/org/eclipse/core/filebuffers/tests/FileBufferListener.java @@ -20,63 +20,43 @@ import org.eclipse.core.filebuffers.IFileBufferListener; */ public class FileBufferListener implements IFileBufferListener { - /* - * @see org.eclipse.core.filebuffers.IFileBufferListener#bufferCreated(org.eclipse.core.filebuffers.IFileBuffer) - */ + @Override public void bufferCreated(IFileBuffer buffer) { } - /* - * @see org.eclipse.core.filebuffers.IFileBufferListener#bufferDisposed(org.eclipse.core.filebuffers.IFileBuffer) - */ + @Override public void bufferDisposed(IFileBuffer buffer) { } - /* - * @see org.eclipse.core.filebuffers.IFileBufferListener#bufferContentAboutToBeReplaced(org.eclipse.core.filebuffers.IFileBuffer) - */ + @Override public void bufferContentAboutToBeReplaced(IFileBuffer buffer) { } - /* - * @see org.eclipse.core.filebuffers.IFileBufferListener#bufferContentReplaced(org.eclipse.core.filebuffers.IFileBuffer) - */ + @Override public void bufferContentReplaced(IFileBuffer buffer) { } - /* - * @see org.eclipse.core.filebuffers.IFileBufferListener#stateChanging(org.eclipse.core.filebuffers.IFileBuffer) - */ + @Override public void stateChanging(IFileBuffer buffer) { } - /* - * @see org.eclipse.core.filebuffers.IFileBufferListener#dirtyStateChanged(org.eclipse.core.filebuffers.IFileBuffer, boolean) - */ + @Override public void dirtyStateChanged(IFileBuffer buffer, boolean isDirty) { } - /* - * @see org.eclipse.core.filebuffers.IFileBufferListener#stateValidationChanged(org.eclipse.core.filebuffers.IFileBuffer, boolean) - */ + @Override public void stateValidationChanged(IFileBuffer buffer, boolean isStateValidated) { } - /* - * @see org.eclipse.core.filebuffers.IFileBufferListener#underlyingFileMoved(org.eclipse.core.filebuffers.IFileBuffer, org.eclipse.core.runtime.IPath) - */ + @Override public void underlyingFileMoved(IFileBuffer buffer, IPath path) { } - /* - * @see org.eclipse.core.filebuffers.IFileBufferListener#underlyingFileDeleted(org.eclipse.core.filebuffers.IFileBuffer) - */ + @Override public void underlyingFileDeleted(IFileBuffer buffer) { } - /* - * @see org.eclipse.core.filebuffers.IFileBufferListener#stateChangeFailed(org.eclipse.core.filebuffers.IFileBuffer) - */ + @Override public void stateChangeFailed(IFileBuffer buffer) { } } diff --git a/org.eclipse.core.filebuffers.tests/src/org/eclipse/core/filebuffers/tests/FileBuffersForExternalFiles.java b/org.eclipse.core.filebuffers.tests/src/org/eclipse/core/filebuffers/tests/FileBuffersForExternalFiles.java index 65f3b3c53db..6f165eb60f3 100644 --- a/org.eclipse.core.filebuffers.tests/src/org/eclipse/core/filebuffers/tests/FileBuffersForExternalFiles.java +++ b/org.eclipse.core.filebuffers.tests/src/org/eclipse/core/filebuffers/tests/FileBuffersForExternalFiles.java @@ -27,18 +27,14 @@ import org.eclipse.core.filebuffers.FileBuffers; */ public class FileBuffersForExternalFiles extends FileBufferFunctions { - /* - * @see org.eclipse.core.filebuffers.tests.FileBufferFunctions#tearDown() - */ + @Override protected void tearDown() throws Exception { FileTool.delete(getPath()); FileTool.delete(FileBuffers.getSystemFileAtLocation(getPath()).getParentFile()); super.tearDown(); } - /* - * @see org.eclipse.core.filebuffers.tests.FileBufferFunctions#createPath(org.eclipse.core.resources.IProject) - */ + @Override protected IPath createPath(IProject project) throws Exception { File sourceFile= FileTool.getFileInPlugin(FileBuffersTestPlugin.getDefault(), new Path("testResources/ExternalFile")); File externalFile= FileTool.createTempFileInPlugin(FileBuffersTestPlugin.getDefault(), new Path("externalResources/ExternalFile")); @@ -46,43 +42,34 @@ public class FileBuffersForExternalFiles extends FileBufferFunctions { return new Path(externalFile.getAbsolutePath()); } + @Override protected void setReadOnly(boolean state) throws Exception { IFileStore fileStore= FileBuffers.getFileStoreAtLocation(getPath()); assertNotNull(fileStore); fileStore.fetchInfo().setAttribute(EFS.ATTRIBUTE_READ_ONLY, state); } - /* - * @see org.eclipse.core.filebuffers.tests.FileBufferFunctions#isStateValidationSupported() - */ + @Override protected boolean isStateValidationSupported() { return false; } - /* - * @see org.eclipse.core.filebuffers.tests.FileBufferFunctions#deleteUnderlyingFile() - */ + @Override protected boolean deleteUnderlyingFile() throws Exception { return false; } - /* - * @see org.eclipse.core.filebuffers.tests.FileBufferFunctions#moveUnderlyingFile() - */ + @Override protected IPath moveUnderlyingFile() throws Exception { return null; } - /* - * @see org.eclipse.core.filebuffers.tests.FileBufferFunctions#modifyUnderlyingFile() - */ + @Override protected boolean modifyUnderlyingFile() throws Exception { return false; } - /* - * @see org.eclipse.core.filebuffers.tests.FileBufferFunctions#getAnnotationModelClass() - */ + @Override protected Class getAnnotationModelClass() throws Exception { return null; } diff --git a/org.eclipse.core.filebuffers.tests/src/org/eclipse/core/filebuffers/tests/FileBuffersForFilesInLinkedFolders.java b/org.eclipse.core.filebuffers.tests/src/org/eclipse/core/filebuffers/tests/FileBuffersForFilesInLinkedFolders.java index 59b7ab1720f..55dc5ec0938 100644 --- a/org.eclipse.core.filebuffers.tests/src/org/eclipse/core/filebuffers/tests/FileBuffersForFilesInLinkedFolders.java +++ b/org.eclipse.core.filebuffers.tests/src/org/eclipse/core/filebuffers/tests/FileBuffersForFilesInLinkedFolders.java @@ -41,9 +41,7 @@ public class FileBuffersForFilesInLinkedFolders extends FileBufferFunctions { private File fExternalFile; - /* - * @see org.eclipse.core.filebuffers.tests.FileBufferFunctions#tearDown() - */ + @Override protected void tearDown() throws Exception { FileTool.delete(getPath()); File file= fExternalFile; @@ -55,9 +53,7 @@ public class FileBuffersForFilesInLinkedFolders extends FileBufferFunctions { super.tearDown(); } - /* - * @see org.eclipse.core.filebuffers.tests.FileBufferFunctions#createPath(org.eclipse.core.resources.IProject) - */ + @Override protected IPath createPath(IProject project) throws Exception { File sourceFile= FileTool.getFileInPlugin(FileBuffersTestPlugin.getDefault(), new Path("testResources/linkedFolderTarget/FileInLinkedFolder")); fExternalFile= FileTool.createTempFileInPlugin(FileBuffersTestPlugin.getDefault(), new Path("externalResources/linkedFolderTarget/FileInLinkedFolder")); @@ -71,6 +67,7 @@ public class FileBuffersForFilesInLinkedFolders extends FileBufferFunctions { /* * @see org.eclipse.core.filebuffers.tests.FileBufferFunctions#markReadOnly() */ + @Override protected void setReadOnly(boolean state) throws Exception { IFile file= FileBuffers.getWorkspaceFileAtLocation(getPath()); ResourceAttributes attributes= new ResourceAttributes(); @@ -78,25 +75,19 @@ public class FileBuffersForFilesInLinkedFolders extends FileBufferFunctions { file.setResourceAttributes(attributes); } - /* - * @see org.eclipse.core.filebuffers.tests.FileBufferFunctions#isStateValidationSupported() - */ + @Override protected boolean isStateValidationSupported() { return true; } - /* - * @see org.eclipse.core.filebuffers.tests.FileBufferFunctions#deleteUnderlyingFile() - */ + @Override protected boolean deleteUnderlyingFile() throws Exception { IFile file= FileBuffers.getWorkspaceFileAtLocation(getPath()); file.delete(true, false, null); return file.exists(); } - /* - * @see org.eclipse.core.filebuffers.tests.FileBufferFunctions#moveUnderlyingFile() - */ + @Override protected IPath moveUnderlyingFile() throws Exception { IFile file= FileBuffers.getWorkspaceFileAtLocation(getPath()); ResourceHelper.createFolder("project/folderA"); @@ -110,9 +101,7 @@ public class FileBuffersForFilesInLinkedFolders extends FileBufferFunctions { return null; } - /* - * @see org.eclipse.core.filebuffers.tests.FileBufferFunctions#modifyUnderlyingFile() - */ + @Override protected boolean modifyUnderlyingFile() throws Exception { IFileStore fileStore= FileBuffers.getFileStoreAtLocation(getPath()); assertTrue(fileStore.fetchInfo().exists()); @@ -135,9 +124,7 @@ public class FileBuffersForFilesInLinkedFolders extends FileBufferFunctions { return true; } - /* - * @see org.eclipse.core.filebuffers.tests.FileBufferFunctions#getAnnotationModelClass() - */ + @Override protected Class getAnnotationModelClass() throws Exception { Bundle bundle= Platform.getBundle("org.eclipse.ui.editors"); return bundle != null ? IAnnotationModel.class : null; diff --git a/org.eclipse.core.filebuffers.tests/src/org/eclipse/core/filebuffers/tests/FileBuffersForLinkedFiles.java b/org.eclipse.core.filebuffers.tests/src/org/eclipse/core/filebuffers/tests/FileBuffersForLinkedFiles.java index 9e5cd2637a3..26a35228861 100644 --- a/org.eclipse.core.filebuffers.tests/src/org/eclipse/core/filebuffers/tests/FileBuffersForLinkedFiles.java +++ b/org.eclipse.core.filebuffers.tests/src/org/eclipse/core/filebuffers/tests/FileBuffersForLinkedFiles.java @@ -34,18 +34,14 @@ public class FileBuffersForLinkedFiles extends FileBufferFunctions { private File fExternalFile; - /* - * @see org.eclipse.core.filebuffers.tests.FileBufferFunctions#tearDown() - */ + @Override protected void tearDown() throws Exception { FileTool.delete(fExternalFile); FileTool.delete(fExternalFile.getParentFile()); super.tearDown(); } - /* - * @see org.eclipse.core.filebuffers.tests.FileBufferFunctions#createPath(org.eclipse.core.resources.IProject) - */ + @Override protected IPath createPath(IProject project) throws Exception { File sourceFile= FileTool.getFileInPlugin(FileBuffersTestPlugin.getDefault(), new Path("testResources/LinkedFileTarget")); fExternalFile= FileTool.createTempFileInPlugin(FileBuffersTestPlugin.getDefault(), new Path("externalResources/LinkedFileTarget")); @@ -57,6 +53,7 @@ public class FileBuffersForLinkedFiles extends FileBufferFunctions { /* * @see org.eclipse.core.filebuffers.tests.FileBufferFunctions#markReadOnly() */ + @Override protected void setReadOnly(boolean state) throws Exception { IFile file= FileBuffers.getWorkspaceFileAtLocation(getPath()); ResourceAttributes attributes= new ResourceAttributes(); @@ -64,25 +61,19 @@ public class FileBuffersForLinkedFiles extends FileBufferFunctions { file.setResourceAttributes(attributes); } - /* - * @see org.eclipse.core.filebuffers.tests.FileBufferFunctions#isStateValidationSupported() - */ + @Override protected boolean isStateValidationSupported() { return true; } - /* - * @see org.eclipse.core.filebuffers.tests.FileBufferFunctions#deleteUnderlyingFile() - */ + @Override protected boolean deleteUnderlyingFile() throws Exception { IFile file= FileBuffers.getWorkspaceFileAtLocation(getPath()); file.delete(true, false, null); return file.exists(); } - /* - * @see org.eclipse.core.filebuffers.tests.FileBufferFunctions#moveUnderlyingFile() - */ + @Override protected IPath moveUnderlyingFile() throws Exception { IFile file= FileBuffers.getWorkspaceFileAtLocation(getPath()); ResourceHelper.createFolder("project/folderA"); @@ -96,9 +87,7 @@ public class FileBuffersForLinkedFiles extends FileBufferFunctions { return null; } - /* - * @see org.eclipse.core.filebuffers.tests.FileBufferFunctions#modifyUnderlyingFile() - */ + @Override protected boolean modifyUnderlyingFile() throws Exception { FileTool.write(fExternalFile.getAbsolutePath(), new StringBuffer("Changed content of linked file")); fExternalFile.setLastModified(1000); @@ -107,9 +96,7 @@ public class FileBuffersForLinkedFiles extends FileBufferFunctions { return true; } - /* - * @see org.eclipse.core.filebuffers.tests.FileBufferFunctions#getAnnotationModelClass() - */ + @Override protected Class getAnnotationModelClass() throws Exception { Bundle bundle= Platform.getBundle("org.eclipse.ui.editors"); return bundle != null ? IAnnotationModel.class : null; diff --git a/org.eclipse.core.filebuffers.tests/src/org/eclipse/core/filebuffers/tests/FileBuffersForNonAccessibleWorkspaceFiles.java b/org.eclipse.core.filebuffers.tests/src/org/eclipse/core/filebuffers/tests/FileBuffersForNonAccessibleWorkspaceFiles.java index 3272f550245..f2526d51873 100644 --- a/org.eclipse.core.filebuffers.tests/src/org/eclipse/core/filebuffers/tests/FileBuffersForNonAccessibleWorkspaceFiles.java +++ b/org.eclipse.core.filebuffers.tests/src/org/eclipse/core/filebuffers/tests/FileBuffersForNonAccessibleWorkspaceFiles.java @@ -26,11 +26,13 @@ import org.eclipse.core.filebuffers.FileBuffers; */ public class FileBuffersForNonAccessibleWorkspaceFiles extends FileBufferFunctions { + @Override protected void setUp() throws Exception { super.setUp(); getProject().close(null); } + @Override protected IPath createPath(IProject project) throws Exception { IFolder folder= ResourceHelper.createFolder("project/folderA/folderB/"); IFile file= ResourceHelper.createFile(folder, "WorkspaceFile", "content"); @@ -38,9 +40,7 @@ public class FileBuffersForNonAccessibleWorkspaceFiles extends FileBufferFunctio } - /* - * @see org.eclipse.core.filebuffers.tests.FileBufferFunctions#tearDown() - */ + @Override protected void tearDown() throws Exception { FileTool.delete(getPath()); super.tearDown(); @@ -49,55 +49,49 @@ public class FileBuffersForNonAccessibleWorkspaceFiles extends FileBufferFunctio /* * @see org.eclipse.core.filebuffers.tests.FileBufferFunctions#markReadOnly() */ + @Override protected void setReadOnly(boolean state) throws Exception { IFileStore fileStore= FileBuffers.getFileStoreAtLocation(getPath()); assertNotNull(fileStore); fileStore.fetchInfo().setAttribute(EFS.ATTRIBUTE_READ_ONLY, state); } - /* - * @see org.eclipse.core.filebuffers.tests.FileBufferFunctions#isStateValidationSupported() - */ + @Override protected boolean isStateValidationSupported() { return false; } - /* - * @see org.eclipse.core.filebuffers.tests.FileBufferFunctions#deleteUnderlyingFile() - */ + @Override protected boolean deleteUnderlyingFile() throws Exception { return false; } - /* - * @see org.eclipse.core.filebuffers.tests.FileBufferFunctions#moveUnderlyingFile() - */ + @Override protected IPath moveUnderlyingFile() throws Exception { return null; } - /* - * @see org.eclipse.core.filebuffers.tests.FileBufferFunctions#modifyUnderlyingFile() - */ + @Override protected boolean modifyUnderlyingFile() throws Exception { return false; } - /* - * @see org.eclipse.core.filebuffers.tests.FileBufferFunctions#getAnnotationModelClass() - */ + @Override protected Class getAnnotationModelClass() throws Exception { return null; } + @Override public void test7() throws Exception { // disable because it might create a file outside the closed project } + @Override public void test11_1() throws Exception { // disable because it might create a file outside the closed project } + @Override public void test17_3() throws Exception { // disable because it might create a file outside the closed project } diff --git a/org.eclipse.core.filebuffers.tests/src/org/eclipse/core/filebuffers/tests/FileBuffersForNonExistingExternalFiles.java b/org.eclipse.core.filebuffers.tests/src/org/eclipse/core/filebuffers/tests/FileBuffersForNonExistingExternalFiles.java index 7afde21f432..ccf40bd5e14 100644 --- a/org.eclipse.core.filebuffers.tests/src/org/eclipse/core/filebuffers/tests/FileBuffersForNonExistingExternalFiles.java +++ b/org.eclipse.core.filebuffers.tests/src/org/eclipse/core/filebuffers/tests/FileBuffersForNonExistingExternalFiles.java @@ -25,14 +25,13 @@ import org.eclipse.core.filebuffers.FileBuffers; */ public class FileBuffersForNonExistingExternalFiles extends FileBufferFunctions { - /* - * @see org.eclipse.core.filebuffers.tests.FileBufferFunctions#tearDown() - */ + @Override protected void tearDown() throws Exception { FileTool.delete(getPath()); super.tearDown(); } + @Override protected IPath createPath(IProject project) throws Exception { IPath path= FileBuffersTestPlugin.getDefault().getStateLocation(); path= path.append("NonExistingExternalFile"); @@ -42,43 +41,34 @@ public class FileBuffersForNonExistingExternalFiles extends FileBufferFunctions /* * @see org.eclipse.core.filebuffers.tests.FileBufferFunctions#markReadOnly() */ + @Override protected void setReadOnly(boolean state) throws Exception { IFileStore fileStore= FileBuffers.getFileStoreAtLocation(getPath()); assertNotNull(fileStore); fileStore.fetchInfo().setAttribute(EFS.ATTRIBUTE_READ_ONLY, state); } - /* - * @see org.eclipse.core.filebuffers.tests.FileBufferFunctions#isStateValidationSupported() - */ + @Override protected boolean isStateValidationSupported() { return false; } - /* - * @see org.eclipse.core.filebuffers.tests.FileBufferFunctions#deleteUnderlyingFile() - */ + @Override protected boolean deleteUnderlyingFile() throws Exception { return false; } - /* - * @see org.eclipse.core.filebuffers.tests.FileBufferFunctions#moveUnderlyingFile() - */ + @Override protected IPath moveUnderlyingFile() throws Exception { return null; } - /* - * @see org.eclipse.core.filebuffers.tests.FileBufferFunctions#modifyUnderlyingFile() - */ + @Override protected boolean modifyUnderlyingFile() throws Exception { return false; } - /* - * @see org.eclipse.core.filebuffers.tests.FileBufferFunctions#getAnnotationModelClass() - */ + @Override protected Class getAnnotationModelClass() throws Exception { return null; } diff --git a/org.eclipse.core.filebuffers.tests/src/org/eclipse/core/filebuffers/tests/FileBuffersForNonExistingWorkspaceFiles.java b/org.eclipse.core.filebuffers.tests/src/org/eclipse/core/filebuffers/tests/FileBuffersForNonExistingWorkspaceFiles.java index e953f63cc79..7629120ddcc 100644 --- a/org.eclipse.core.filebuffers.tests/src/org/eclipse/core/filebuffers/tests/FileBuffersForNonExistingWorkspaceFiles.java +++ b/org.eclipse.core.filebuffers.tests/src/org/eclipse/core/filebuffers/tests/FileBuffersForNonExistingWorkspaceFiles.java @@ -28,17 +28,13 @@ import org.eclipse.core.filebuffers.LocationKind; */ public class FileBuffersForNonExistingWorkspaceFiles extends FileBufferFunctions { - /* - * @see org.eclipse.core.filebuffers.tests.FileBufferFunctions#tearDown() - */ + @Override protected void tearDown() throws Exception { FileTool.delete(getPath()); super.tearDown(); } - /* - * @see org.eclipse.core.filebuffers.tests.FileBufferFunctions#createPath(org.eclipse.core.resources.IProject) - */ + @Override protected IPath createPath(IProject project) throws Exception { IFolder folder= ResourceHelper.createFolder("project/folderA/folderB/"); IPath filePath= folder.getLocation().append("NonExistingWorkspaceFile"); @@ -77,43 +73,34 @@ public class FileBuffersForNonExistingWorkspaceFiles extends FileBufferFunctions /* * @see org.eclipse.core.filebuffers.tests.FileBufferFunctions#markReadOnly() */ + @Override protected void setReadOnly(boolean state) throws Exception { IFileStore fileStore= FileBuffers.getFileStoreAtLocation(getPath()); assertNotNull(fileStore); fileStore.fetchInfo().setAttribute(EFS.ATTRIBUTE_READ_ONLY, state); } - /* - * @see org.eclipse.core.filebuffers.tests.FileBufferFunctions#isStateValidationSupported() - */ + @Override protected boolean isStateValidationSupported() { return false; } - /* - * @see org.eclipse.core.filebuffers.tests.FileBufferFunctions#deleteUnderlyingFile() - */ + @Override protected boolean deleteUnderlyingFile() throws Exception { return false; } - /* - * @see org.eclipse.core.filebuffers.tests.FileBufferFunctions#moveUnderlyingFile() - */ + @Override protected IPath moveUnderlyingFile() throws Exception { return null; } - /* - * @see org.eclipse.core.filebuffers.tests.FileBufferFunctions#modifyUnderlyingFile() - */ + @Override protected boolean modifyUnderlyingFile() throws Exception { return false; } - /* - * @see org.eclipse.core.filebuffers.tests.FileBufferFunctions#getAnnotationModelClass() - */ + @Override protected Class getAnnotationModelClass() throws Exception { return null; } diff --git a/org.eclipse.core.filebuffers.tests/src/org/eclipse/core/filebuffers/tests/FileBuffersForWorkspaceFiles.java b/org.eclipse.core.filebuffers.tests/src/org/eclipse/core/filebuffers/tests/FileBuffersForWorkspaceFiles.java index f540f3363d9..7f703dd39a8 100644 --- a/org.eclipse.core.filebuffers.tests/src/org/eclipse/core/filebuffers/tests/FileBuffersForWorkspaceFiles.java +++ b/org.eclipse.core.filebuffers.tests/src/org/eclipse/core/filebuffers/tests/FileBuffersForWorkspaceFiles.java @@ -38,6 +38,7 @@ import org.eclipse.jface.text.source.IAnnotationModel; */ public class FileBuffersForWorkspaceFiles extends FileBufferFunctions { + @Override protected IPath createPath(IProject project) throws Exception { IFolder folder= ResourceHelper.createFolder("project/folderA/folderB/"); IFile file= ResourceHelper.createFile(folder, "WorkspaceFile", "content"); @@ -47,6 +48,7 @@ public class FileBuffersForWorkspaceFiles extends FileBufferFunctions { /* * @see org.eclipse.core.filebuffers.tests.FileBufferFunctions#markReadOnly() */ + @Override protected void setReadOnly(boolean state) throws Exception { IFile file= FileBuffers.getWorkspaceFileAtLocation(getPath()); ResourceAttributes attributes= new ResourceAttributes(); @@ -54,25 +56,19 @@ public class FileBuffersForWorkspaceFiles extends FileBufferFunctions { file.setResourceAttributes(attributes); } - /* - * @see org.eclipse.core.filebuffers.tests.FileBufferFunctions#isStateValidationSupported() - */ + @Override protected boolean isStateValidationSupported() { return true; } - /* - * @see org.eclipse.core.filebuffers.tests.FileBufferFunctions#deleteUnderlyingFile() - */ + @Override protected boolean deleteUnderlyingFile() throws Exception { IFile file= FileBuffers.getWorkspaceFileAtLocation(getPath()); file.delete(true, false, null); return file.exists(); } - /* - * @see org.eclipse.core.filebuffers.tests.FileBufferFunctions#moveUnderlyingFile() - */ + @Override protected IPath moveUnderlyingFile() throws Exception { IFile file= FileBuffers.getWorkspaceFileAtLocation(getPath()); ResourceHelper.createFolder("project/folderA/folderB/folderC"); @@ -86,9 +82,7 @@ public class FileBuffersForWorkspaceFiles extends FileBufferFunctions { return null; } - /* - * @see org.eclipse.core.filebuffers.tests.FileBufferFunctions#modifyUnderlyingFile() - */ + @Override protected boolean modifyUnderlyingFile() throws Exception { IFileStore fileStore= FileBuffers.getFileStoreAtLocation(getPath()); assertTrue(fileStore.fetchInfo().exists()); @@ -110,9 +104,7 @@ public class FileBuffersForWorkspaceFiles extends FileBufferFunctions { return true; } - /* - * @see org.eclipse.core.filebuffers.tests.FileBufferFunctions#getAnnotationModelClass() - */ + @Override protected Class getAnnotationModelClass() throws Exception { Bundle bundle= Platform.getBundle("org.eclipse.ui.editors"); return bundle != null ? IAnnotationModel.class : null; diff --git a/org.eclipse.core.filebuffers.tests/src/org/eclipse/core/filebuffers/tests/FileStoreFileBufferFunctions.java b/org.eclipse.core.filebuffers.tests/src/org/eclipse/core/filebuffers/tests/FileStoreFileBufferFunctions.java index 559c8631532..5a4b6a2dbcb 100644 --- a/org.eclipse.core.filebuffers.tests/src/org/eclipse/core/filebuffers/tests/FileStoreFileBufferFunctions.java +++ b/org.eclipse.core.filebuffers.tests/src/org/eclipse/core/filebuffers/tests/FileStoreFileBufferFunctions.java @@ -58,6 +58,7 @@ public abstract class FileStoreFileBufferFunctions extends TestCase { protected abstract Class getAnnotationModelClass() throws Exception; + @Override protected void setUp() throws Exception { fManager= FileBuffers.getTextFileBufferManager(); fProject= ResourceHelper.createProject("project"); @@ -70,6 +71,7 @@ public abstract class FileStoreFileBufferFunctions extends TestCase { return fProject; } + @Override protected void tearDown() throws Exception { ITextFileBuffer buffer= fManager.getFileStoreTextFileBuffer(fFileStore); assertTrue(buffer == null); @@ -331,11 +333,13 @@ public abstract class FileStoreFileBufferFunctions extends TestCase { public IFileBuffer buffer; public int count; + @Override public void bufferCreated(IFileBuffer buf) { ++count; this.buffer= buf; } + @Override public void bufferDisposed(IFileBuffer buf) { --count; this.buffer= buf; @@ -376,6 +380,7 @@ public abstract class FileStoreFileBufferFunctions extends TestCase { public int count; public boolean isDirty; + @Override public void dirtyStateChanged(IFileBuffer buf, boolean state) { ++count; this.buffer= buf; @@ -426,6 +431,7 @@ public abstract class FileStoreFileBufferFunctions extends TestCase { public int count; public boolean isDirty; + @Override public void dirtyStateChanged(IFileBuffer buf, boolean state) { ++count; this.buffer= buf; @@ -474,11 +480,13 @@ public abstract class FileStoreFileBufferFunctions extends TestCase { public IFileBuffer preBuffer, postBuffer; public int preCount, postCount; + @Override public void bufferContentAboutToBeReplaced(IFileBuffer buffer) { ++preCount; preBuffer= buffer; } + @Override public void bufferContentReplaced(IFileBuffer buffer) { ++postCount; postBuffer= buffer; @@ -523,11 +531,13 @@ public abstract class FileStoreFileBufferFunctions extends TestCase { public IFileBuffer preBuffer, postBuffer; public int preCount, postCount; + @Override public void bufferContentAboutToBeReplaced(IFileBuffer buffer) { ++preCount; preBuffer= buffer; } + @Override public void bufferContentReplaced(IFileBuffer buffer) { ++postCount; postBuffer= buffer; @@ -571,6 +581,7 @@ public abstract class FileStoreFileBufferFunctions extends TestCase { public int count; public boolean isStateValidated; + @Override public void stateValidationChanged(IFileBuffer buf, boolean state) { ++count; this.buffer= buf; @@ -615,6 +626,7 @@ public abstract class FileStoreFileBufferFunctions extends TestCase { public int count; public boolean isStateValidated; + @Override public void stateValidationChanged(IFileBuffer buf, boolean state) { ++count; this.buffer= buf; @@ -660,6 +672,7 @@ public abstract class FileStoreFileBufferFunctions extends TestCase { public int count; public boolean isStateValidated; + @Override public void stateValidationChanged(IFileBuffer buf, boolean state) { ++count; this.buffer= buf; @@ -705,6 +718,7 @@ public abstract class FileStoreFileBufferFunctions extends TestCase { public int count; public boolean isStateValidated; + @Override public void stateValidationChanged(IFileBuffer buf, boolean state) { ++count; this.buffer= buf; @@ -751,6 +765,7 @@ public abstract class FileStoreFileBufferFunctions extends TestCase { public IFileBuffer buffer; public int count; + @Override public void underlyingFileDeleted(IFileBuffer buf) { ++count; this.buffer= buf; @@ -791,6 +806,7 @@ public abstract class FileStoreFileBufferFunctions extends TestCase { public int count; public IPath newLocation; + @Override public void underlyingFileMoved(IFileBuffer buf, IPath location) { ++count; this.buffer= buf; @@ -833,6 +849,7 @@ public abstract class FileStoreFileBufferFunctions extends TestCase { public IFileBuffer buffer; public int count; + @Override public void stateChanging(IFileBuffer buf) { ++count; this.buffer= buf; @@ -872,6 +889,7 @@ public abstract class FileStoreFileBufferFunctions extends TestCase { public IFileBuffer buffer; public int count; + @Override public void stateChanging(IFileBuffer buf) { ++count; this.buffer= buf; @@ -911,6 +929,7 @@ public abstract class FileStoreFileBufferFunctions extends TestCase { public IFileBuffer buffer; public int count; + @Override public void stateChanging(IFileBuffer buf) { ++count; this.buffer= buf; @@ -950,6 +969,7 @@ public abstract class FileStoreFileBufferFunctions extends TestCase { public IFileBuffer buffer; public int count; + @Override public void stateChanging(IFileBuffer buf) { ++count; this.buffer= buf; @@ -990,6 +1010,7 @@ public abstract class FileStoreFileBufferFunctions extends TestCase { public IFileBuffer buffer; public int count; + @Override public void stateChanging(IFileBuffer buf) { ++count; this.buffer= buf; @@ -1031,6 +1052,7 @@ public abstract class FileStoreFileBufferFunctions extends TestCase { public IFileBuffer buffer; public int count; + @Override public void stateChanging(IFileBuffer buf) { ++count; this.buffer= buf; @@ -1093,9 +1115,11 @@ public abstract class FileStoreFileBufferFunctions extends TestCase { int notifyCount= 0; + @Override public void bufferCreated(IFileBuffer buffer) { notifyCount++; } + @Override public void bufferDisposed(IFileBuffer buffer) { notifyCount++; } @@ -1104,10 +1128,12 @@ public abstract class FileStoreFileBufferFunctions extends TestCase { class ForcedException extends RuntimeException { private static final long serialVersionUID= 1L; + @Override public void printStackTrace(PrintStream s) { s.println("!FORCED BY TEST: this entry is intentional"); } + @Override public void printStackTrace(PrintWriter s) { s.println("!FORCED BY TEST: this entry is intentional"); } @@ -1117,9 +1143,11 @@ public abstract class FileStoreFileBufferFunctions extends TestCase { NotifiedListener notifyCounter2= new NotifiedListener(); FileBufferListener failingListener= new FileBufferListener() { + @Override public void bufferCreated(IFileBuffer buffer) { throw new ForcedException(); } + @Override public void bufferDisposed(IFileBuffer buffer) { throw new ForcedException(); } diff --git a/org.eclipse.core.filebuffers.tests/src/org/eclipse/core/filebuffers/tests/FileStoreFileBuffersForExternalFiles.java b/org.eclipse.core.filebuffers.tests/src/org/eclipse/core/filebuffers/tests/FileStoreFileBuffersForExternalFiles.java index 993d8cff587..de05cffeb1d 100644 --- a/org.eclipse.core.filebuffers.tests/src/org/eclipse/core/filebuffers/tests/FileStoreFileBuffersForExternalFiles.java +++ b/org.eclipse.core.filebuffers.tests/src/org/eclipse/core/filebuffers/tests/FileStoreFileBuffersForExternalFiles.java @@ -27,18 +27,14 @@ import org.eclipse.core.filebuffers.FileBuffers; */ public class FileStoreFileBuffersForExternalFiles extends FileStoreFileBufferFunctions { - /* - * @see org.eclipse.core.filebuffers.tests.FileBufferFunctions#tearDown() - */ + @Override protected void tearDown() throws Exception { FileTool.delete(getPath()); FileTool.delete(FileBuffers.getSystemFileAtLocation(getPath()).getParentFile()); super.tearDown(); } - /* - * @see org.eclipse.core.filebuffers.tests.FileBufferFunctions#createPath(org.eclipse.core.resources.IProject) - */ + @Override protected IPath createPath(IProject project) throws Exception { File sourceFile= FileTool.getFileInPlugin(FileBuffersTestPlugin.getDefault(), new Path("testResources/ExternalFile")); File externalFile= FileTool.createTempFileInPlugin(FileBuffersTestPlugin.getDefault(), new Path("externalResources/ExternalFile")); @@ -46,43 +42,34 @@ public class FileStoreFileBuffersForExternalFiles extends FileStoreFileBufferFun return new Path(externalFile.getAbsolutePath()); } + @Override protected void setReadOnly(boolean state) throws Exception { IFileStore fileStore= FileBuffers.getFileStoreAtLocation(getPath()); assertNotNull(fileStore); fileStore.fetchInfo().setAttribute(EFS.ATTRIBUTE_READ_ONLY, state); } - /* - * @see org.eclipse.core.filebuffers.tests.FileBufferFunctions#isStateValidationSupported() - */ + @Override protected boolean isStateValidationSupported() { return false; } - /* - * @see org.eclipse.core.filebuffers.tests.FileBufferFunctions#deleteUnderlyingFile() - */ + @Override protected boolean deleteUnderlyingFile() throws Exception { return false; } - /* - * @see org.eclipse.core.filebuffers.tests.FileBufferFunctions#moveUnderlyingFile() - */ + @Override protected IPath moveUnderlyingFile() throws Exception { return null; } - /* - * @see org.eclipse.core.filebuffers.tests.FileBufferFunctions#modifyUnderlyingFile() - */ + @Override protected boolean modifyUnderlyingFile() throws Exception { return false; } - /* - * @see org.eclipse.core.filebuffers.tests.FileBufferFunctions#getAnnotationModelClass() - */ + @Override protected Class getAnnotationModelClass() throws Exception { return null; } diff --git a/org.eclipse.core.filebuffers.tests/src/org/eclipse/core/filebuffers/tests/FileStoreFileBuffersForNonExistingExternalFiles.java b/org.eclipse.core.filebuffers.tests/src/org/eclipse/core/filebuffers/tests/FileStoreFileBuffersForNonExistingExternalFiles.java index 60fed9c5d1f..1484e941c21 100644 --- a/org.eclipse.core.filebuffers.tests/src/org/eclipse/core/filebuffers/tests/FileStoreFileBuffersForNonExistingExternalFiles.java +++ b/org.eclipse.core.filebuffers.tests/src/org/eclipse/core/filebuffers/tests/FileStoreFileBuffersForNonExistingExternalFiles.java @@ -25,14 +25,13 @@ import org.eclipse.core.filebuffers.FileBuffers; */ public class FileStoreFileBuffersForNonExistingExternalFiles extends FileStoreFileBufferFunctions { - /* - * @see org.eclipse.core.filebuffers.tests.FileBufferFunctions#tearDown() - */ + @Override protected void tearDown() throws Exception { FileTool.delete(getPath()); super.tearDown(); } + @Override protected IPath createPath(IProject project) throws Exception { IPath path= FileBuffersTestPlugin.getDefault().getStateLocation(); path= path.append("NonExistingExternalFile"); @@ -42,43 +41,34 @@ public class FileStoreFileBuffersForNonExistingExternalFiles extends FileStoreFi /* * @see org.eclipse.core.filebuffers.tests.FileBufferFunctions#markReadOnly() */ + @Override protected void setReadOnly(boolean state) throws Exception { IFileStore fileStore= FileBuffers.getFileStoreAtLocation(getPath()); assertNotNull(fileStore); fileStore.fetchInfo().setAttribute(EFS.ATTRIBUTE_READ_ONLY, state); } - /* - * @see org.eclipse.core.filebuffers.tests.FileBufferFunctions#isStateValidationSupported() - */ + @Override protected boolean isStateValidationSupported() { return false; } - /* - * @see org.eclipse.core.filebuffers.tests.FileBufferFunctions#deleteUnderlyingFile() - */ + @Override protected boolean deleteUnderlyingFile() throws Exception { return false; } - /* - * @see org.eclipse.core.filebuffers.tests.FileBufferFunctions#moveUnderlyingFile() - */ + @Override protected IPath moveUnderlyingFile() throws Exception { return null; } - /* - * @see org.eclipse.core.filebuffers.tests.FileBufferFunctions#modifyUnderlyingFile() - */ + @Override protected boolean modifyUnderlyingFile() throws Exception { return false; } - /* - * @see org.eclipse.core.filebuffers.tests.FileBufferFunctions#getAnnotationModelClass() - */ + @Override protected Class getAnnotationModelClass() throws Exception { return null; } diff --git a/org.eclipse.core.filebuffers.tests/src/org/eclipse/core/filebuffers/tests/FileStoreFileBuffersForNonExistingWorkspaceFiles.java b/org.eclipse.core.filebuffers.tests/src/org/eclipse/core/filebuffers/tests/FileStoreFileBuffersForNonExistingWorkspaceFiles.java index cb532c610d8..9c50e9a9a32 100644 --- a/org.eclipse.core.filebuffers.tests/src/org/eclipse/core/filebuffers/tests/FileStoreFileBuffersForNonExistingWorkspaceFiles.java +++ b/org.eclipse.core.filebuffers.tests/src/org/eclipse/core/filebuffers/tests/FileStoreFileBuffersForNonExistingWorkspaceFiles.java @@ -28,17 +28,13 @@ import org.eclipse.core.filebuffers.LocationKind; */ public class FileStoreFileBuffersForNonExistingWorkspaceFiles extends FileStoreFileBufferFunctions { - /* - * @see org.eclipse.core.filebuffers.tests.FileBufferFunctions#tearDown() - */ + @Override protected void tearDown() throws Exception { FileTool.delete(getPath()); super.tearDown(); } - /* - * @see org.eclipse.core.filebuffers.tests.FileBufferFunctions#createPath(org.eclipse.core.resources.IProject) - */ + @Override protected IPath createPath(IProject project) throws Exception { IFolder folder= ResourceHelper.createFolder("project/folderA/folderB/"); IPath filePath= folder.getLocation().append("NonExistingWorkspaceFile"); @@ -77,43 +73,34 @@ public class FileStoreFileBuffersForNonExistingWorkspaceFiles extends FileStoreF /* * @see org.eclipse.core.filebuffers.tests.FileBufferFunctions#markReadOnly() */ + @Override protected void setReadOnly(boolean state) throws Exception { IFileStore fileStore= FileBuffers.getFileStoreAtLocation(getPath()); assertNotNull(fileStore); fileStore.fetchInfo().setAttribute(EFS.ATTRIBUTE_READ_ONLY, state); } - /* - * @see org.eclipse.core.filebuffers.tests.FileBufferFunctions#isStateValidationSupported() - */ + @Override protected boolean isStateValidationSupported() { return false; } - /* - * @see org.eclipse.core.filebuffers.tests.FileBufferFunctions#deleteUnderlyingFile() - */ + @Override protected boolean deleteUnderlyingFile() throws Exception { return false; } - /* - * @see org.eclipse.core.filebuffers.tests.FileBufferFunctions#moveUnderlyingFile() - */ + @Override protected IPath moveUnderlyingFile() throws Exception { return null; } - /* - * @see org.eclipse.core.filebuffers.tests.FileBufferFunctions#modifyUnderlyingFile() - */ + @Override protected boolean modifyUnderlyingFile() throws Exception { return false; } - /* - * @see org.eclipse.core.filebuffers.tests.FileBufferFunctions#getAnnotationModelClass() - */ + @Override protected Class getAnnotationModelClass() throws Exception { return null; } diff --git a/org.eclipse.core.filebuffers.tests/src/org/eclipse/core/filebuffers/tests/FileStoreFileBuffersForWorkspaceFiles.java b/org.eclipse.core.filebuffers.tests/src/org/eclipse/core/filebuffers/tests/FileStoreFileBuffersForWorkspaceFiles.java index 65a0f7112ed..22a7d3a204b 100644 --- a/org.eclipse.core.filebuffers.tests/src/org/eclipse/core/filebuffers/tests/FileStoreFileBuffersForWorkspaceFiles.java +++ b/org.eclipse.core.filebuffers.tests/src/org/eclipse/core/filebuffers/tests/FileStoreFileBuffersForWorkspaceFiles.java @@ -38,6 +38,7 @@ import org.eclipse.jface.text.source.IAnnotationModel; */ public class FileStoreFileBuffersForWorkspaceFiles extends FileBufferFunctions { + @Override protected IPath createPath(IProject project) throws Exception { IFolder folder= ResourceHelper.createFolder("project/folderA/folderB/"); IFile file= ResourceHelper.createFile(folder, "WorkspaceFile", "content"); @@ -47,6 +48,7 @@ public class FileStoreFileBuffersForWorkspaceFiles extends FileBufferFunctions { /* * @see org.eclipse.core.filebuffers.tests.FileBufferFunctions#markReadOnly() */ + @Override protected void setReadOnly(boolean state) throws Exception { IFile file= FileBuffers.getWorkspaceFileAtLocation(getPath()); ResourceAttributes attributes= new ResourceAttributes(); @@ -54,25 +56,19 @@ public class FileStoreFileBuffersForWorkspaceFiles extends FileBufferFunctions { file.setResourceAttributes(attributes); } - /* - * @see org.eclipse.core.filebuffers.tests.FileBufferFunctions#isStateValidationSupported() - */ + @Override protected boolean isStateValidationSupported() { return true; } - /* - * @see org.eclipse.core.filebuffers.tests.FileBufferFunctions#deleteUnderlyingFile() - */ + @Override protected boolean deleteUnderlyingFile() throws Exception { IFile file= FileBuffers.getWorkspaceFileAtLocation(getPath()); file.delete(true, false, null); return file.exists(); } - /* - * @see org.eclipse.core.filebuffers.tests.FileBufferFunctions#moveUnderlyingFile() - */ + @Override protected IPath moveUnderlyingFile() throws Exception { IFile file= FileBuffers.getWorkspaceFileAtLocation(getPath()); ResourceHelper.createFolder("project/folderA/folderB/folderC"); @@ -86,9 +82,7 @@ public class FileStoreFileBuffersForWorkspaceFiles extends FileBufferFunctions { return null; } - /* - * @see org.eclipse.core.filebuffers.tests.FileBufferFunctions#modifyUnderlyingFile() - */ + @Override protected boolean modifyUnderlyingFile() throws Exception { IFileStore fileStore= FileBuffers.getFileStoreAtLocation(getPath()); assertTrue(fileStore.fetchInfo().exists()); @@ -110,9 +104,7 @@ public class FileStoreFileBuffersForWorkspaceFiles extends FileBufferFunctions { return true; } - /* - * @see org.eclipse.core.filebuffers.tests.FileBufferFunctions#getAnnotationModelClass() - */ + @Override protected Class getAnnotationModelClass() throws Exception { Bundle bundle= Platform.getBundle("org.eclipse.ui.editors"); return bundle != null ? IAnnotationModel.class : null; diff --git a/org.eclipse.core.filebuffers.tests/src/org/eclipse/core/filebuffers/tests/MockDocumentSetupParticipants.java b/org.eclipse.core.filebuffers.tests/src/org/eclipse/core/filebuffers/tests/MockDocumentSetupParticipants.java index 8b6759b903b..a0d22a5ebe1 100644 --- a/org.eclipse.core.filebuffers.tests/src/org/eclipse/core/filebuffers/tests/MockDocumentSetupParticipants.java +++ b/org.eclipse.core.filebuffers.tests/src/org/eclipse/core/filebuffers/tests/MockDocumentSetupParticipants.java @@ -33,18 +33,14 @@ public class MockDocumentSetupParticipants { * into the document being setup for integration test purposes. */ static abstract class AbstractTestDSP implements IDocumentSetupParticipant { - /* - * @see org.eclipse.core.filebuffers.IDocumentSetupParticipant#setup(org.eclipse.jface.text.IDocument) - */ + @Override public void setup(IDocument document) { append(document, getClass()+"\n"); } } static abstract class AbstractTestDSPExtension extends AbstractTestDSP implements IDocumentSetupParticipantExtension { - /* - * @see org.eclipse.core.filebuffers.IDocumentSetupParticipantExtension#setup(org.eclipse.jface.text.IDocument, org.eclipse.core.runtime.IPath, org.eclipse.core.filebuffers.LocationKind) - */ + @Override public void setup(IDocument document, IPath location, LocationKind locationKind) { append(document, getClass()+"%%EXTENSION\n"); } @@ -59,6 +55,7 @@ public class MockDocumentSetupParticipants { public static class TestDSP6 extends AbstractTestDSPExtension {} public static class TestDSP7 extends AbstractTestDSPExtension { + @Override public void setup(IDocument document, IPath location, LocationKind locationKind) { if (locationKind == LocationKind.IFILE) append(document, new StringBuffer(location.toPortableString()).reverse().toString()); @@ -66,6 +63,7 @@ public class MockDocumentSetupParticipants { } public static class TestDSP8 extends AbstractTestDSPExtension { + @Override public void setup(IDocument document, IPath location, LocationKind locationKind) { if (locationKind == LocationKind.LOCATION) append(document, new StringBuffer(location.toPortableString()).reverse().toString()); @@ -73,6 +71,7 @@ public class MockDocumentSetupParticipants { } public static class TestDSP9 extends AbstractTestDSPExtension { + @Override public void setup(IDocument document, IPath location, LocationKind locationKind) { if (locationKind == LocationKind.NORMALIZE) append(document, new StringBuffer(location.toPortableString()).reverse().toString()); diff --git a/org.eclipse.core.filebuffers.tests/src/org/eclipse/core/filebuffers/tests/ResourceTextFileManagerDocCreationTests.java b/org.eclipse.core.filebuffers.tests/src/org/eclipse/core/filebuffers/tests/ResourceTextFileManagerDocCreationTests.java index 95823e8ec45..ae2a30f8377 100644 --- a/org.eclipse.core.filebuffers.tests/src/org/eclipse/core/filebuffers/tests/ResourceTextFileManagerDocCreationTests.java +++ b/org.eclipse.core.filebuffers.tests/src/org/eclipse/core/filebuffers/tests/ResourceTextFileManagerDocCreationTests.java @@ -25,10 +25,12 @@ import org.eclipse.core.filebuffers.LocationKind; */ public class ResourceTextFileManagerDocCreationTests extends AbstractFileBufferDocCreationTests { + @Override protected void setUp() throws Exception { fManager= new ResourceTextFileBufferManager(); } + @Override protected void assertDocumentContent(String expectedContent, String fullPath, LocationKind locKind) { assertEquals(expectedContent, fManager.createEmptyDocument(new Path(fullPath), locKind).get()); if (locKind == LocationKind.IFILE) { @@ -37,6 +39,7 @@ public class ResourceTextFileManagerDocCreationTests extends AbstractFileBufferD } } + @Override protected LocationKind[] getSupportLocationKinds() { return new LocationKind[] {LocationKind.IFILE, LocationKind.LOCATION, LocationKind.NORMALIZE}; } diff --git a/org.eclipse.core.filebuffers.tests/src/org/eclipse/core/filebuffers/tests/TextFileManagerDocCreationTests.java b/org.eclipse.core.filebuffers.tests/src/org/eclipse/core/filebuffers/tests/TextFileManagerDocCreationTests.java index e282eb6e6fd..c4c295e5167 100644 --- a/org.eclipse.core.filebuffers.tests/src/org/eclipse/core/filebuffers/tests/TextFileManagerDocCreationTests.java +++ b/org.eclipse.core.filebuffers.tests/src/org/eclipse/core/filebuffers/tests/TextFileManagerDocCreationTests.java @@ -20,10 +20,12 @@ import org.eclipse.core.filebuffers.LocationKind; */ public class TextFileManagerDocCreationTests extends AbstractFileBufferDocCreationTests { + @Override protected void setUp() throws Exception { fManager= new TextFileBufferManager(); } + @Override protected void assertDocumentContent(String expectedContent, String path, LocationKind locKind) { if (locKind != LocationKind.IFILE) { /** {@link TextFileBufferManager} does not deal with {@link LocationKind#IFILE} */ @@ -31,6 +33,7 @@ public class TextFileManagerDocCreationTests extends AbstractFileBufferDocCreati } } + @Override protected LocationKind[] getSupportLocationKinds() { return new LocationKind[] {LocationKind.LOCATION, LocationKind.NORMALIZE}; } diff --git a/org.eclipse.core.filebuffers/src/org/eclipse/core/filebuffers/FileBuffers.java b/org.eclipse.core.filebuffers/src/org/eclipse/core/filebuffers/FileBuffers.java index 0a3c914e7c6..9adfed8b336 100644 --- a/org.eclipse.core.filebuffers/src/org/eclipse/core/filebuffers/FileBuffers.java +++ b/org.eclipse.core.filebuffers/src/org/eclipse/core/filebuffers/FileBuffers.java @@ -210,6 +210,7 @@ public final class FileBuffers { * @return the {@link File} in the local file system for the given location * @deprecated As of 3.2, replaced by {@link #getFileStoreAtLocation(IPath)} */ + @Deprecated public static File getSystemFileAtLocation(IPath location) { IFileStore store= getFileStoreAtLocation(location); if (store != null) { diff --git a/org.eclipse.core.filebuffers/src/org/eclipse/core/filebuffers/IDocumentFactory.java b/org.eclipse.core.filebuffers/src/org/eclipse/core/filebuffers/IDocumentFactory.java index 1b9631dc4d2..e9459ff103b 100644 --- a/org.eclipse.core.filebuffers/src/org/eclipse/core/filebuffers/IDocumentFactory.java +++ b/org.eclipse.core.filebuffers/src/org/eclipse/core/filebuffers/IDocumentFactory.java @@ -24,6 +24,7 @@ import org.eclipse.jface.text.IDocument; * @deprecated As of 3.2 the <code>"org.eclipse.core.filebuffers.documentCreation"</code> * extension point has been deprecated. See the extension point documentation for more details. */ +@Deprecated public interface IDocumentFactory { /** diff --git a/org.eclipse.core.filebuffers/src/org/eclipse/core/filebuffers/IFileBufferManager.java b/org.eclipse.core.filebuffers/src/org/eclipse/core/filebuffers/IFileBufferManager.java index 3c988008322..a90c5f4812f 100644 --- a/org.eclipse.core.filebuffers/src/org/eclipse/core/filebuffers/IFileBufferManager.java +++ b/org.eclipse.core.filebuffers/src/org/eclipse/core/filebuffers/IFileBufferManager.java @@ -53,6 +53,7 @@ public interface IFileBufferManager { * @throws CoreException if the file could not successfully be connected * @deprecated As of 3.3, replaced by {@link #connect(IPath, LocationKind, IProgressMonitor)} */ + @Deprecated void connect(IPath location, IProgressMonitor monitor) throws CoreException; /** @@ -110,6 +111,7 @@ public interface IFileBufferManager { * @throws CoreException if the file could not successfully be disconnected * @deprecated As of 3.3, replaced by {@link #disconnect(IPath, LocationKind, IProgressMonitor)} */ + @Deprecated void disconnect(IPath location, IProgressMonitor monitor) throws CoreException; /** @@ -165,6 +167,7 @@ public interface IFileBufferManager { * @return the file buffer managed for that location or <code>null</code> * @deprecated As of 3.3, replaced by {@link #getFileBuffer(IPath, LocationKind)} */ + @Deprecated IFileBuffer getFileBuffer(IPath location); /** @@ -262,6 +265,7 @@ public interface IFileBufferManager { * @param location the location * @deprecated As of 3.1, replaced by {@link org.eclipse.core.filebuffers.IFileBuffer#requestSynchronizationContext()} */ + @Deprecated void requestSynchronizationContext(IPath location); /** @@ -278,6 +282,7 @@ public interface IFileBufferManager { * @param location the location * @deprecated As of 3.1, replaced by {@link IFileBuffer#releaseSynchronizationContext()} */ + @Deprecated void releaseSynchronizationContext(IPath location); /** diff --git a/org.eclipse.core.filebuffers/src/org/eclipse/core/filebuffers/ITextFileBufferManager.java b/org.eclipse.core.filebuffers/src/org/eclipse/core/filebuffers/ITextFileBufferManager.java index 484c37eb825..fcf3a5463d6 100644 --- a/org.eclipse.core.filebuffers/src/org/eclipse/core/filebuffers/ITextFileBufferManager.java +++ b/org.eclipse.core.filebuffers/src/org/eclipse/core/filebuffers/ITextFileBufferManager.java @@ -53,6 +53,7 @@ public interface ITextFileBufferManager extends IFileBufferManager { * @return the text file buffer managed for that location or <code>null</code> * @deprecated As of 3.3, replaced by {@link #getTextFileBuffer(IPath, LocationKind)} */ + @Deprecated ITextFileBuffer getTextFileBuffer(IPath location); /** @@ -128,6 +129,7 @@ public interface ITextFileBufferManager extends IFileBufferManager { * @return a new empty document * @deprecated As of 3.3, replaced by {@link #createEmptyDocument(IPath, LocationKind)} */ + @Deprecated IDocument createEmptyDocument(IPath location); /** @@ -158,6 +160,7 @@ public interface ITextFileBufferManager extends IFileBufferManager { * @return the newly created annotation model * @deprecated As of 3.3, replaced by {@link #createAnnotationModel(IPath, LocationKind)} */ + @Deprecated IAnnotationModel createAnnotationModel(IPath location); /** @@ -194,6 +197,7 @@ public interface ITextFileBufferManager extends IFileBufferManager { * @since 3.1 * @deprecated As of 3.2, replaced by {@link #isTextFileLocation(IPath, boolean)} */ + @Deprecated boolean isTextFileLocation(IPath location); /** * Returns whether a file at the given location is or can be considered a diff --git a/org.eclipse.core.filebuffers/src/org/eclipse/core/filebuffers/LocationKind.java b/org.eclipse.core.filebuffers/src/org/eclipse/core/filebuffers/LocationKind.java index c24e3cf3844..0a0fc96cf42 100644 --- a/org.eclipse.core.filebuffers/src/org/eclipse/core/filebuffers/LocationKind.java +++ b/org.eclipse.core.filebuffers/src/org/eclipse/core/filebuffers/LocationKind.java @@ -61,9 +61,7 @@ public final class LocationKind { fName= name; } - /* - * @see java.lang.Object#toString() - */ + @Override public String toString() { return fName; } diff --git a/org.eclipse.core.filebuffers/src/org/eclipse/core/filebuffers/manipulation/ContainerCreator.java b/org.eclipse.core.filebuffers/src/org/eclipse/core/filebuffers/manipulation/ContainerCreator.java index a4c2da4f1ef..4dfbaaf1d00 100644 --- a/org.eclipse.core.filebuffers/src/org/eclipse/core/filebuffers/manipulation/ContainerCreator.java +++ b/org.eclipse.core.filebuffers/src/org/eclipse/core/filebuffers/manipulation/ContainerCreator.java @@ -66,6 +66,7 @@ public class ContainerCreator { */ public IContainer createContainer(IProgressMonitor progressMonitor) throws CoreException { IWorkspaceRunnable runnable= new IWorkspaceRunnable() { + @Override public void run(IProgressMonitor monitor) throws CoreException { monitor.beginTask(FileBuffersMessages.ContainerCreator_task_creatingContainer, fContainerFullPath.segmentCount()); if (fContainer != null) diff --git a/org.eclipse.core.filebuffers/src/org/eclipse/core/filebuffers/manipulation/ConvertLineDelimitersOperation.java b/org.eclipse.core.filebuffers/src/org/eclipse/core/filebuffers/manipulation/ConvertLineDelimitersOperation.java index 68d1d96f8cf..f0bb8b6bc2e 100644 --- a/org.eclipse.core.filebuffers/src/org/eclipse/core/filebuffers/manipulation/ConvertLineDelimitersOperation.java +++ b/org.eclipse.core.filebuffers/src/org/eclipse/core/filebuffers/manipulation/ConvertLineDelimitersOperation.java @@ -50,9 +50,7 @@ public class ConvertLineDelimitersOperation extends TextFileBufferOperation { fLineDelimiter= lineDelimiter; } - /* - * @see org.eclipse.core.internal.filebuffers.textmanipulation.TextFileBufferOperation#computeTextEdit(org.eclipse.core.filebuffers.ITextFileBuffer, org.eclipse.core.runtime.IProgressMonitor) - */ + @Override protected MultiTextEditWithProgress computeTextEdit(ITextFileBuffer fileBuffer, IProgressMonitor progressMonitor) throws CoreException { IDocument document= fileBuffer.getDocument(); int lineCount= document.getNumberOfLines(); @@ -84,9 +82,7 @@ public class ConvertLineDelimitersOperation extends TextFileBufferOperation { } } - /* - * @see org.eclipse.core.filebuffers.manipulation.TextFileBufferOperation#getDocumentRewriteSessionType() - */ + @Override protected DocumentRewriteSessionType getDocumentRewriteSessionType() { return DocumentRewriteSessionType.SEQUENTIAL; } diff --git a/org.eclipse.core.filebuffers/src/org/eclipse/core/filebuffers/manipulation/FileBufferOperationRunner.java b/org.eclipse.core.filebuffers/src/org/eclipse/core/filebuffers/manipulation/FileBufferOperationRunner.java index a994be80dfa..3e4aa3de3e7 100644 --- a/org.eclipse.core.filebuffers/src/org/eclipse/core/filebuffers/manipulation/FileBufferOperationRunner.java +++ b/org.eclipse.core.filebuffers/src/org/eclipse/core/filebuffers/manipulation/FileBufferOperationRunner.java @@ -45,8 +45,10 @@ public class FileBufferOperationRunner extends GenericFileBufferOperationRunner super(fileBufferManager, validationContext); } + @Override protected void commit(final IFileBuffer[] fileBuffers, final IProgressMonitor progressMonitor) throws CoreException { IWorkspaceRunnable runnable= new IWorkspaceRunnable() { + @Override public void run(IProgressMonitor monitor) throws CoreException { doCommit(fileBuffers, progressMonitor); } diff --git a/org.eclipse.core.filebuffers/src/org/eclipse/core/filebuffers/manipulation/GenericFileBufferOperationRunner.java b/org.eclipse.core.filebuffers/src/org/eclipse/core/filebuffers/manipulation/GenericFileBufferOperationRunner.java index 3433130a070..2092ae679c7 100644 --- a/org.eclipse.core.filebuffers/src/org/eclipse/core/filebuffers/manipulation/GenericFileBufferOperationRunner.java +++ b/org.eclipse.core.filebuffers/src/org/eclipse/core/filebuffers/manipulation/GenericFileBufferOperationRunner.java @@ -111,13 +111,16 @@ public class GenericFileBufferOperationRunner { synchronized (fCompletionLock) { executeInContext(new Runnable() { + @Override public void run() { synchronized(fCompletionLock) { try { SafeRunner.run(new ISafeRunnable() { + @Override public void handleException(Throwable throwable) { fThrowable= throwable; } + @Override public void run() throws Exception { performOperation(synchronizedFileBuffers, operation, progressMonitor); } diff --git a/org.eclipse.core.filebuffers/src/org/eclipse/core/filebuffers/manipulation/MultiTextEditWithProgress.java b/org.eclipse.core.filebuffers/src/org/eclipse/core/filebuffers/manipulation/MultiTextEditWithProgress.java index 24aa132a1b9..e8fa43fc3dc 100644 --- a/org.eclipse.core.filebuffers/src/org/eclipse/core/filebuffers/manipulation/MultiTextEditWithProgress.java +++ b/org.eclipse.core.filebuffers/src/org/eclipse/core/filebuffers/manipulation/MultiTextEditWithProgress.java @@ -65,18 +65,14 @@ public class MultiTextEditWithProgress extends MultiTextEdit { } } - /* - * @see org.eclipse.text.edits.TextEdit#childDocumentUpdated() - */ + @Override protected void childDocumentUpdated() { if (fProgressMonitor.isCanceled()) throw new OperationCanceledException(); fProgressMonitor.worked(1); } - /* - * @see org.eclipse.text.edits.TextEdit#childRegionUpdated() - */ + @Override protected void childRegionUpdated() { if (fProgressMonitor.isCanceled()) throw new OperationCanceledException(); diff --git a/org.eclipse.core.filebuffers/src/org/eclipse/core/filebuffers/manipulation/RemoveTrailingWhitespaceOperation.java b/org.eclipse.core.filebuffers/src/org/eclipse/core/filebuffers/manipulation/RemoveTrailingWhitespaceOperation.java index ce800eb47c1..55b69af8b82 100644 --- a/org.eclipse.core.filebuffers/src/org/eclipse/core/filebuffers/manipulation/RemoveTrailingWhitespaceOperation.java +++ b/org.eclipse.core.filebuffers/src/org/eclipse/core/filebuffers/manipulation/RemoveTrailingWhitespaceOperation.java @@ -43,9 +43,7 @@ public class RemoveTrailingWhitespaceOperation extends TextFileBufferOperation { super(FileBuffersMessages.RemoveTrailingWhitespaceOperation_name); } - /* - * @see org.eclipse.core.internal.filebuffers.textmanipulation.TextFileBufferOperation#computeTextEdit(org.eclipse.core.filebuffers.ITextFileBuffer, org.eclipse.core.runtime.IProgressMonitor) - */ + @Override protected MultiTextEditWithProgress computeTextEdit(ITextFileBuffer fileBuffer, IProgressMonitor progressMonitor) throws CoreException { IDocument document= fileBuffer.getDocument(); int lineCount= document.getNumberOfLines(); @@ -83,9 +81,7 @@ public class RemoveTrailingWhitespaceOperation extends TextFileBufferOperation { } } - /* - * @see org.eclipse.core.filebuffers.manipulation.TextFileBufferOperation#getDocumentRewriteSessionType() - */ + @Override protected DocumentRewriteSessionType getDocumentRewriteSessionType() { return DocumentRewriteSessionType.SEQUENTIAL; } diff --git a/org.eclipse.core.filebuffers/src/org/eclipse/core/filebuffers/manipulation/TextFileBufferOperation.java b/org.eclipse.core.filebuffers/src/org/eclipse/core/filebuffers/manipulation/TextFileBufferOperation.java index f802f553227..c4321198b2a 100644 --- a/org.eclipse.core.filebuffers/src/org/eclipse/core/filebuffers/manipulation/TextFileBufferOperation.java +++ b/org.eclipse.core.filebuffers/src/org/eclipse/core/filebuffers/manipulation/TextFileBufferOperation.java @@ -77,16 +77,12 @@ public abstract class TextFileBufferOperation implements IFileBufferOperation { fOperationName= operationName; } - /* - * @see org.eclipse.core.internal.filebuffers.textmanipulation.IFileBufferOperation#getOperationName() - */ + @Override public String getOperationName() { return fOperationName; } - /* - * @see org.eclipse.core.internal.filebuffers.textmanipulation.IFileBufferOperation#run(org.eclipse.core.filebuffers.IFileBuffer, org.eclipse.core.runtime.IProgressMonitor) - */ + @Override public void run(IFileBuffer fileBuffer, IProgressMonitor progressMonitor) throws CoreException, OperationCanceledException { if (fileBuffer instanceof ITextFileBuffer) { diff --git a/org.eclipse.core.filebuffers/src/org/eclipse/core/internal/filebuffers/AbstractFileBuffer.java b/org.eclipse.core.filebuffers/src/org/eclipse/core/internal/filebuffers/AbstractFileBuffer.java index 25762b7318a..756883a18f4 100644 --- a/org.eclipse.core.filebuffers/src/org/eclipse/core/internal/filebuffers/AbstractFileBuffer.java +++ b/org.eclipse.core.filebuffers/src/org/eclipse/core/internal/filebuffers/AbstractFileBuffer.java @@ -69,32 +69,23 @@ public abstract class AbstractFileBuffer implements IFileBuffer, IStateValidatio protected void dispose() { } - /* - * @see org.eclipse.core.filebuffers.IStateValidationSupport#validationStateAboutToBeChanged() - */ + @Override public void validationStateAboutToBeChanged() { fManager.fireStateChanging(this); } - /* - * @see org.eclipse.core.filebuffers.IStateValidationSupport#validationStateChangeFailed() - */ + @Override public void validationStateChangeFailed() { fManager.fireStateChangeFailed(this); } - /* - * @see org.eclipse.core.filebuffers.IFileBuffer#getModificationStamp() - */ + @Override public long getModificationStamp() { IFileInfo info= fFileStore.fetchInfo(); return info.exists() ? info.getLastModified() : IDocumentExtension4.UNKNOWN_MODIFICATION_STAMP; } - /* - * @see org.eclipse.core.filebuffers.IFileBuffer#getFileStore() - * @since 3.3 - */ + @Override public IFileStore getFileStore() { return fFileStore; } diff --git a/org.eclipse.core.filebuffers/src/org/eclipse/core/internal/filebuffers/DocumentReader.java b/org.eclipse.core.filebuffers/src/org/eclipse/core/internal/filebuffers/DocumentReader.java index 942ab44eb27..9b96627a855 100644 --- a/org.eclipse.core.filebuffers/src/org/eclipse/core/internal/filebuffers/DocumentReader.java +++ b/org.eclipse.core.filebuffers/src/org/eclipse/core/internal/filebuffers/DocumentReader.java @@ -52,16 +52,12 @@ class DocumentReader extends Reader { fDocument= document; } - /* - * @see java.lang.CharSequence#length() - */ + @Override public int length() { return fDocument.getLength(); } - /* - * @see java.lang.CharSequence#charAt(int) - */ + @Override public char charAt(int index) { try { return fDocument.getChar(index); @@ -70,9 +66,7 @@ class DocumentReader extends Reader { } } - /* - * @see java.lang.CharSequence#subSequence(int, int) - */ + @Override public CharSequence subSequence(int start, int end) { try { return fDocument.get(start, end - start); @@ -87,16 +81,12 @@ class DocumentReader extends Reader { */ private class InternalDocumentListener implements IDocumentListener { - /* - * @see org.eclipse.jface.text.IDocumentListener#documentAboutToBeChanged(org.eclipse.jface.text.DocumentEvent) - */ + @Override public void documentAboutToBeChanged(DocumentEvent event) { handleDocumentAboutToBeChanged(); } - /* - * @see org.eclipse.jface.text.IDocumentListener#documentChanged(org.eclipse.jface.text.DocumentEvent) - */ + @Override public void documentChanged(DocumentEvent event) { } } @@ -130,9 +120,7 @@ class DocumentReader extends Reader { fLength= fCharSequence.length(); } - /* - * @see java.io.InputStream#close() - */ + @Override public void close() throws IOException { synchronized (this) { fCharSequence= null; @@ -166,10 +154,7 @@ class DocumentReader extends Reader { fDocumentListener= null; } - /* - * @see java.io.Reader#read(char[], int, int) - * @since 3.1 - */ + @Override public int read(char[] cbuf, int off, int len) throws IOException { int i= 0; try { diff --git a/org.eclipse.core.filebuffers/src/org/eclipse/core/internal/filebuffers/ExtensionsRegistry.java b/org.eclipse.core.filebuffers/src/org/eclipse/core/internal/filebuffers/ExtensionsRegistry.java index a0afbbcdee3..63731ff3a1c 100644 --- a/org.eclipse.core.filebuffers/src/org/eclipse/core/internal/filebuffers/ExtensionsRegistry.java +++ b/org.eclipse.core.filebuffers/src/org/eclipse/core/internal/filebuffers/ExtensionsRegistry.java @@ -71,16 +71,12 @@ public class ExtensionsRegistry { return fContentType.getId(); } - /* - * @see java.lang.Object#equals(java.lang.Object) - */ + @Override public boolean equals(Object obj) { return obj instanceof ContentTypeAdapter && fContentType.getId().equals(((ContentTypeAdapter)obj).getId()); } - /* - * @see java.lang.Object#hashCode() - */ + @Override public int hashCode() { return fContentType.getId().hashCode(); } @@ -258,6 +254,7 @@ public class ExtensionsRegistry { * @return the sharable document factory or <code>null</code> * @deprecated As of 3.5 */ + @Deprecated protected org.eclipse.core.filebuffers.IDocumentFactory getDocumentFactory(String nameOrExtension) { Set set= (Set) fFactoryDescriptors.get(nameOrExtension); if (set != null) { @@ -274,6 +271,7 @@ public class ExtensionsRegistry { * @return the sharable document factory or <code>null</code> * @deprecated As of 3.5 */ + @Deprecated protected org.eclipse.core.filebuffers.IDocumentFactory doGetDocumentFactory(IContentType[] contentTypes) { Set set= null; int i= 0; @@ -296,6 +294,7 @@ public class ExtensionsRegistry { * @return the sharable document factory or <code>null</code> * @deprecated As of 3.5 */ + @Deprecated protected org.eclipse.core.filebuffers.IDocumentFactory getDocumentFactory(IContentType[] contentTypes) { org.eclipse.core.filebuffers.IDocumentFactory factory= doGetDocumentFactory(contentTypes); while (factory == null) { @@ -477,6 +476,7 @@ public class ExtensionsRegistry { * @since 3.3 * @deprecated As of 3.5 */ + @Deprecated public org.eclipse.core.filebuffers.IDocumentFactory getDocumentFactory(IPath location, LocationKind locationKind) { org.eclipse.core.filebuffers.IDocumentFactory factory= getDocumentFactory(findContentTypes(location, locationKind)); if (factory == null) diff --git a/org.eclipse.core.filebuffers/src/org/eclipse/core/internal/filebuffers/FileStoreFileBuffer.java b/org.eclipse.core.filebuffers/src/org/eclipse/core/internal/filebuffers/FileStoreFileBuffer.java index 78e8f98c78d..e395f679694 100644 --- a/org.eclipse.core.filebuffers/src/org/eclipse/core/internal/filebuffers/FileStoreFileBuffer.java +++ b/org.eclipse.core.filebuffers/src/org/eclipse/core/internal/filebuffers/FileStoreFileBuffer.java @@ -67,11 +67,13 @@ public abstract class FileStoreFileBuffer extends AbstractFileBuffer { addFileBufferContentListeners(); } + @Override public void create(IPath location, IProgressMonitor monitor) throws CoreException { fLocation= location; create(EFS.getStore(URIUtil.toURI(getLocation())), monitor); } + @Override public void connect() { ++ fReferenceCount; if (fReferenceCount == 1) @@ -87,6 +89,7 @@ public abstract class FileStoreFileBuffer extends AbstractFileBuffer { protected void connected() { } + @Override public void disconnect() throws CoreException { --fReferenceCount; if (fReferenceCount <= 0) @@ -102,24 +105,17 @@ public abstract class FileStoreFileBuffer extends AbstractFileBuffer { protected void disconnected() { } - /* - * @see org.eclipse.core.internal.filebuffers.AbstractFileBuffer#isDisconnected() - * @since 3.1 - */ + @Override protected boolean isDisconnected() { return fReferenceCount <= 0; } - /* - * @see org.eclipse.core.filebuffers.IFileBuffer#getLocation() - */ + @Override public IPath getLocation() { return fLocation; } - /* - * @see org.eclipse.core.filebuffers.IFileBuffer#commit(org.eclipse.core.runtime.IProgressMonitor, boolean) - */ + @Override public void commit(IProgressMonitor monitor, boolean overwrite) throws CoreException { if (!isDisconnected() && fCanBeSaved) { @@ -141,101 +137,73 @@ public abstract class FileStoreFileBuffer extends AbstractFileBuffer { } } - /* - * @see org.eclipse.core.filebuffers.IFileBuffer#computeCommitRule() - */ + @Override public ISchedulingRule computeCommitRule() { return null; } - /* - * @see org.eclipse.core.filebuffers.IFileBuffer#isDirty() - */ + @Override public boolean isDirty() { return fCanBeSaved; } - /* - * @see org.eclipse.core.filebuffers.IFileBuffer#setDirty(boolean) - */ + @Override public void setDirty(boolean isDirty) { fCanBeSaved= isDirty; } - /* - * @see org.eclipse.core.filebuffers.IFileBuffer#isShared() - */ + @Override public boolean isShared() { return fReferenceCount > 1; } - /* - * @see org.eclipse.core.filebuffers.IFileBuffer#computeValidateStateRule() - */ + @Override public ISchedulingRule computeValidateStateRule() { return null; } - /* - * @see org.eclipse.core.filebuffers.IFileBuffer#validateState(org.eclipse.core.runtime.IProgressMonitor, java.lang.Object) - */ + @Override public void validateState(IProgressMonitor monitor, Object computationContext) throws CoreException { // nop } - /* - * @see org.eclipse.core.filebuffers.IFileBuffer#isStateValidated() - */ + @Override public boolean isStateValidated() { return true; } - /* - * @see org.eclipse.core.filebuffers.IFileBuffer#resetStateValidation() - */ + @Override public void resetStateValidation() { // nop } - /* - * @see org.eclipse.core.filebuffers.IFileBuffer#isSynchronized() - */ + @Override public boolean isSynchronized() { return fSynchronizationStamp == getModificationStamp(); } - /* - * @see org.eclipse.core.filebuffers.IFileBuffer#requestSynchronizationContext() - */ + @Override public void requestSynchronizationContext() { ++ fSynchronizationContextCount; } - /* - * @see org.eclipse.core.filebuffers.IFileBuffer#releaseSynchronizationContext() - */ + @Override public void releaseSynchronizationContext() { -- fSynchronizationContextCount; } - /* - * @see org.eclipse.core.filebuffers.IFileBuffer#isSynchronizationContextRequested() - */ + @Override public boolean isSynchronizationContextRequested() { return fSynchronizationContextCount > 0; } - /* - * @see org.eclipse.core.filebuffers.IFileBuffer#isCommitable() - */ + @Override public boolean isCommitable() { IFileInfo info= fFileStore.fetchInfo(); return info.exists() && !info.getAttribute(EFS.ATTRIBUTE_READ_ONLY); } - /* - * @see org.eclipse.core.filebuffers.IStateValidationSupport#validationStateChanged(boolean, org.eclipse.core.runtime.IStatus) - */ + @Override public void validationStateChanged(boolean validationState, IStatus status) { //nop } diff --git a/org.eclipse.core.filebuffers/src/org/eclipse/core/internal/filebuffers/FileStoreTextFileBuffer.java b/org.eclipse.core.filebuffers/src/org/eclipse/core/internal/filebuffers/FileStoreTextFileBuffer.java index 74a69a2ba12..19bee7bf2ff 100644 --- a/org.eclipse.core.filebuffers/src/org/eclipse/core/internal/filebuffers/FileStoreTextFileBuffer.java +++ b/org.eclipse.core.filebuffers/src/org/eclipse/core/internal/filebuffers/FileStoreTextFileBuffer.java @@ -65,15 +65,11 @@ public class FileStoreTextFileBuffer extends FileStoreFileBuffer implements ITex private class DocumentListener implements IDocumentListener { - /* - * @see org.eclipse.jface.text.IDocumentListener#documentAboutToBeChanged(org.eclipse.jface.text.DocumentEvent) - */ + @Override public void documentAboutToBeChanged(DocumentEvent event) { } - /* - * @see org.eclipse.jface.text.IDocumentListener#documentChanged(org.eclipse.jface.text.DocumentEvent) - */ + @Override public void documentChanged(DocumentEvent event) { fCanBeSaved= true; removeFileBufferContentListeners(); @@ -133,16 +129,12 @@ public class FileStoreTextFileBuffer extends FileStoreFileBuffer implements ITex super(manager); } - /* - * @see org.eclipse.core.filebuffers.ITextFileBuffer#getDocument() - */ + @Override public IDocument getDocument() { return fDocument; } - /* - * @see org.eclipse.core.filebuffers.ITextFileBuffer#getAnnotationModel() - */ + @Override public IAnnotationModel getAnnotationModel() { synchronized (fAnnotationModelCreationLock) { if (fAnnotationModel == null && !isDisconnected()) { @@ -154,18 +146,14 @@ public class FileStoreTextFileBuffer extends FileStoreFileBuffer implements ITex return fAnnotationModel; } - /* - * @see org.eclipse.core.filebuffers.ITextFileBuffer#getEncoding() - */ + @Override public String getEncoding() { if (!fIsCacheUpdated) cacheEncodingState(); return fEncoding; } - /* - * @see org.eclipse.core.filebuffers.ITextFileBuffer#setEncoding(java.lang.String) - */ + @Override public void setEncoding(String encoding) { fExplicitEncoding= encoding; if (encoding == null || encoding.equals(fEncoding)) @@ -176,9 +164,7 @@ public class FileStoreTextFileBuffer extends FileStoreFileBuffer implements ITex } } - /* - * @see org.eclipse.core.filebuffers.ITextFileBuffer#getStatus() - */ + @Override public IStatus getStatus() { if (!isDisconnected()) { if (fStatus != null) @@ -227,9 +213,7 @@ public class FileStoreTextFileBuffer extends FileStoreFileBuffer implements ITex } } - /* - * @see org.eclipse.core.filebuffers.IFileBuffer#revert(org.eclipse.core.runtime.IProgressMonitor) - */ + @Override public void revert(IProgressMonitor monitor) throws CoreException { if (isDisconnected()) return; @@ -297,6 +281,7 @@ public class FileStoreTextFileBuffer extends FileStoreFileBuffer implements ITex * @see org.eclipse.core.filebuffers.IFileBuffer#getContentType() * @since 3.1 */ + @Override public IContentType getContentType () throws CoreException { InputStream stream= null; try { @@ -329,25 +314,19 @@ public class FileStoreTextFileBuffer extends FileStoreFileBuffer implements ITex } } - /* - * @see org.eclipse.core.internal.filebuffers.FileBuffer#addFileBufferContentListeners() - */ + @Override protected void addFileBufferContentListeners() { if (fDocument != null) fDocument.addDocumentListener(fDocumentListener); } - /* - * @see org.eclipse.core.internal.filebuffers.FileBuffer#removeFileBufferContentListeners() - */ + @Override protected void removeFileBufferContentListeners() { if (fDocument != null) fDocument.removeDocumentListener(fDocumentListener); } - /* - * @see org.eclipse.core.internal.filebuffers.FileBuffer#initializeFileBufferContent(org.eclipse.core.runtime.IProgressMonitor) - */ + @Override protected void initializeFileBufferContent(IProgressMonitor monitor) throws CoreException { try { fDocument= fManager.createEmptyDocument(getLocationOrName(), LocationKind.LOCATION); @@ -359,18 +338,14 @@ public class FileStoreTextFileBuffer extends FileStoreFileBuffer implements ITex } } - /* - * @see org.eclipse.core.internal.filebuffers.ResourceFileBuffer#connected() - */ + @Override protected void connected() { super.connected(); if (fAnnotationModel != null) fAnnotationModel.connect(fDocument); } - /* - * @see org.eclipse.core.internal.filebuffers.ResourceFileBuffer#disconnected() - */ + @Override protected void disconnected() { if (fAnnotationModel != null) fAnnotationModel.disconnect(fDocument); @@ -414,9 +389,7 @@ public class FileStoreTextFileBuffer extends FileStoreFileBuffer implements ITex } - /* - * @see org.eclipse.core.internal.filebuffers.FileBuffer#commitFileBufferContent(org.eclipse.core.runtime.IProgressMonitor, boolean) - */ + @Override protected void commitFileBufferContent(IProgressMonitor monitor, boolean overwrite) throws CoreException { if (!isSynchronized() && !overwrite) { String message= NLSUtility.format(FileBuffersMessages.FileBuffer_error_outOfSync, getFileStore().toURI()); diff --git a/org.eclipse.core.filebuffers/src/org/eclipse/core/internal/filebuffers/ResourceExtensionRegistry.java b/org.eclipse.core.filebuffers/src/org/eclipse/core/internal/filebuffers/ResourceExtensionRegistry.java index 531c6b9e329..0c171b05541 100644 --- a/org.eclipse.core.filebuffers/src/org/eclipse/core/internal/filebuffers/ResourceExtensionRegistry.java +++ b/org.eclipse.core.filebuffers/src/org/eclipse/core/internal/filebuffers/ResourceExtensionRegistry.java @@ -42,6 +42,7 @@ public class ResourceExtensionRegistry extends ExtensionsRegistry { * @param locationKind the kind of the given location * @return the set of content types for the location */ + @Override protected IContentType[] findContentTypes(IPath location, LocationKind locationKind) { if (locationKind != LocationKind.LOCATION) { IFile file= FileBuffers.getWorkspaceFileAtLocation(location); @@ -58,6 +59,7 @@ public class ResourceExtensionRegistry extends ExtensionsRegistry { * @return the sharable document factory * @deprecated As of 3.5 */ + @Deprecated org.eclipse.core.filebuffers.IDocumentFactory getDocumentFactory(IFile file) { org.eclipse.core.filebuffers.IDocumentFactory factory= getDocumentFactory(findContentTypes(file)); if (factory == null) { diff --git a/org.eclipse.core.filebuffers/src/org/eclipse/core/internal/filebuffers/ResourceFileBuffer.java b/org.eclipse.core.filebuffers/src/org/eclipse/core/internal/filebuffers/ResourceFileBuffer.java index 2e409480905..514911246b4 100644 --- a/org.eclipse.core.filebuffers/src/org/eclipse/core/internal/filebuffers/ResourceFileBuffer.java +++ b/org.eclipse.core.filebuffers/src/org/eclipse/core/internal/filebuffers/ResourceFileBuffer.java @@ -72,9 +72,7 @@ public abstract class ResourceFileBuffer extends AbstractFileBuffer { fManager.fireStateChanging(ResourceFileBuffer.this); } - /* - * @see java.lang.Runnable#run() - */ + @Override public void run() { if (isDisconnected()) { @@ -121,9 +119,7 @@ public abstract class ResourceFileBuffer extends AbstractFileBuffer { fIsInstalled= false; } - /* - * @see IResourceChangeListener#resourceChanged(IResourceChangeEvent) - */ + @Override public void resourceChanged(IResourceChangeEvent e) { IResourceDelta delta= e.getDelta(); if (delta != null) @@ -138,6 +134,7 @@ public abstract class ResourceFileBuffer extends AbstractFileBuffer { if ((IResourceDelta.ENCODING & flags) != 0) { if (!isDisconnected() && !fCanBeSaved && isSynchronized()) { fileChange= new SafeFileChange() { + @Override protected void execute() throws Exception { handleFileContentChanged(false, false); } @@ -147,6 +144,7 @@ public abstract class ResourceFileBuffer extends AbstractFileBuffer { if (fileChange == null && (IResourceDelta.CONTENT & flags) != 0) { if (!isDisconnected() && !fCanBeSaved && (!isSynchronized() || (IResourceDelta.REPLACED & flags) != 0)) { fileChange= new SafeFileChange() { + @Override protected void execute() throws Exception { handleFileContentChanged(false, true); } @@ -158,6 +156,7 @@ public abstract class ResourceFileBuffer extends AbstractFileBuffer { if ((IResourceDelta.MOVED_TO & flags) != 0) { final IPath path= delta.getMovedToPath(); fileChange= new SafeFileChange() { + @Override protected void execute() throws Exception { handleFileMoved(path); } @@ -165,6 +164,7 @@ public abstract class ResourceFileBuffer extends AbstractFileBuffer { } else { if (!isDisconnected() && !fCanBeSaved) { fileChange= new SafeFileChange() { + @Override protected void execute() throws Exception { handleFileDeleted(); } @@ -225,6 +225,7 @@ public abstract class ResourceFileBuffer extends AbstractFileBuffer { abstract protected void handleFileContentChanged(boolean revert, boolean updateModificationStamp) throws CoreException; + @Override public void create(IPath location, IProgressMonitor monitor) throws CoreException { monitor= Progress.getMonitor(monitor); monitor.beginTask(FileBuffersMessages.ResourceFileBuffer_task_creatingFileBuffer, 2); @@ -256,6 +257,7 @@ public abstract class ResourceFileBuffer extends AbstractFileBuffer { } } + @Override public void connect() { ++fReferenceCount; if (fReferenceCount == 1) @@ -272,6 +274,7 @@ public abstract class ResourceFileBuffer extends AbstractFileBuffer { fFileSynchronizer.install(); } + @Override public void disconnect() throws CoreException { --fReferenceCount; if (fReferenceCount <= 0) @@ -292,32 +295,23 @@ public abstract class ResourceFileBuffer extends AbstractFileBuffer { removeFileBufferContentListeners(); } - /* - * @see org.eclipse.core.internal.filebuffers.AbstractFileBuffer#isDisconnected() - * @since 3.1 - */ + @Override public boolean isDisconnected() { return fFileSynchronizer == null; } - /* - * @see org.eclipse.core.filebuffers.IFileBuffer#getLocation() - */ + @Override public IPath getLocation() { return fLocation; } - /* - * @see org.eclipse.core.filebuffers.IFileBuffer#computeCommitRule() - */ + @Override public ISchedulingRule computeCommitRule() { IResourceRuleFactory factory= ResourcesPlugin.getWorkspace().getRuleFactory(); return factory.modifyRule(fFile); } - /* - * @see org.eclipse.core.filebuffers.IFileBuffer#commit(org.eclipse.core.runtime.IProgressMonitor, boolean) - */ + @Override public void commit(IProgressMonitor monitor, boolean overwrite) throws CoreException { if (!isDisconnected() && fCanBeSaved) { @@ -338,9 +332,7 @@ public abstract class ResourceFileBuffer extends AbstractFileBuffer { } } - /* - * @see org.eclipse.core.filebuffers.IFileBuffer#revert(org.eclipse.core.runtime.IProgressMonitor) - */ + @Override public void revert(IProgressMonitor monitor) throws CoreException { if (isDisconnected()) return; @@ -360,38 +352,28 @@ public abstract class ResourceFileBuffer extends AbstractFileBuffer { } } - /* - * @see org.eclipse.core.filebuffers.IFileBuffer#isDirty() - */ + @Override public boolean isDirty() { return fCanBeSaved; } - /* - * @see org.eclipse.core.filebuffers.IFileBuffer#setDirty(boolean) - */ + @Override public void setDirty(boolean isDirty) { fCanBeSaved= isDirty; } - /* - * @see org.eclipse.core.filebuffers.IFileBuffer#isShared() - */ + @Override public boolean isShared() { return fReferenceCount > 1; } - /* - * @see org.eclipse.core.filebuffers.IFileBuffer#computeValidateStateRule() - */ + @Override public ISchedulingRule computeValidateStateRule() { IResourceRuleFactory factory= ResourcesPlugin.getWorkspace().getRuleFactory(); return factory.validateEditRule(new IResource[] { fFile }); } - /* - * @see org.eclipse.core.filebuffers.IFileBuffer#validateState(org.eclipse.core.runtime.IProgressMonitor, java.lang.Object) - */ + @Override public void validateState(IProgressMonitor monitor, Object computationContext) throws CoreException { if (!isDisconnected() && !fIsStateValidated) { @@ -425,16 +407,12 @@ public abstract class ResourceFileBuffer extends AbstractFileBuffer { } } - /* - * @see org.eclipse.core.filebuffers.IFileBuffer#isStateValidated() - */ + @Override public boolean isStateValidated() { return fIsStateValidated; } - /* - * @see org.eclipse.core.filebuffers.IFileBuffer#resetStateValidation() - */ + @Override public void resetStateValidation() { if (fIsStateValidated) { fIsStateValidated= false; @@ -483,9 +461,7 @@ public abstract class ResourceFileBuffer extends AbstractFileBuffer { log.log(exception.getStatus()); } - /* - * @see org.eclipse.core.filebuffers.IFileBuffer#isSynchronized() - */ + @Override public boolean isSynchronized() { if (fSynchronizationStamp == fFile.getModificationStamp() && fFile.isSynchronized(IResource.DEPTH_ZERO)) return true; @@ -494,38 +470,28 @@ public abstract class ResourceFileBuffer extends AbstractFileBuffer { return false; } - /* - * @see org.eclipse.core.filebuffers.IFileBuffer#requestSynchronizationContext() - */ + @Override public void requestSynchronizationContext() { ++ fSynchronizationContextCount; } - /* - * @see org.eclipse.core.filebuffers.IFileBuffer#releaseSynchronizationContext() - */ + @Override public void releaseSynchronizationContext() { -- fSynchronizationContextCount; } - /* - * @see org.eclipse.core.filebuffers.IFileBuffer#isSynchronizationContextRequested() - */ + @Override public boolean isSynchronizationContextRequested() { return fSynchronizationContextCount > 0; } - /* - * @see org.eclipse.core.filebuffers.IFileBuffer#isCommitable() - */ + @Override public boolean isCommitable() { IFileInfo info= fFileStore.fetchInfo(); return info.exists() && !info.getAttribute(EFS.ATTRIBUTE_READ_ONLY); } - /* - * @see org.eclipse.core.filebuffers.IStateValidationSupport#validationStateChanged(boolean, org.eclipse.core.runtime.IStatus) - */ + @Override public void validationStateChanged(boolean validationState, IStatus status) { fIsStateValidated= validationState; fStatus= status; diff --git a/org.eclipse.core.filebuffers/src/org/eclipse/core/internal/filebuffers/ResourceTextFileBuffer.java b/org.eclipse.core.filebuffers/src/org/eclipse/core/internal/filebuffers/ResourceTextFileBuffer.java index c2de3c73409..465995a4ba6 100644 --- a/org.eclipse.core.filebuffers/src/org/eclipse/core/internal/filebuffers/ResourceTextFileBuffer.java +++ b/org.eclipse.core.filebuffers/src/org/eclipse/core/internal/filebuffers/ResourceTextFileBuffer.java @@ -61,15 +61,11 @@ public class ResourceTextFileBuffer extends ResourceFileBuffer implements ITextF private class DocumentListener implements IDocumentListener { - /* - * @see org.eclipse.jface.text.IDocumentListener#documentAboutToBeChanged(org.eclipse.jface.text.DocumentEvent) - */ + @Override public void documentAboutToBeChanged(DocumentEvent event) { } - /* - * @see org.eclipse.jface.text.IDocumentListener#documentChanged(org.eclipse.jface.text.DocumentEvent) - */ + @Override public void documentChanged(DocumentEvent event) { if (fCanBeSaved && fSynchronizationStamp == event.getModificationStamp()) { fCanBeSaved= false; @@ -142,16 +138,12 @@ public class ResourceTextFileBuffer extends ResourceFileBuffer implements ITextF super(manager); } - /* - * @see org.eclipse.core.filebuffers.ITextFileBuffer#getDocument() - */ + @Override public IDocument getDocument() { return fDocument; } - /* - * @see org.eclipse.core.filebuffers.ITextFileBuffer#getAnnotationModel() - */ + @Override public IAnnotationModel getAnnotationModel() { synchronized (fAnnotationModelCreationLock) { if (fAnnotationModel == null && !isDisconnected()) { @@ -173,16 +165,12 @@ public class ResourceTextFileBuffer extends ResourceFileBuffer implements ITextF return (ResourceTextFileBufferManager)fManager; } - /* - * @see org.eclipse.core.filebuffers.ITextFileBuffer#getEncoding() - */ + @Override public String getEncoding() { return fEncoding; } - /* - * @see org.eclipse.core.filebuffers.ITextFileBuffer#setEncoding(java.lang.String) - */ + @Override public void setEncoding(String encoding) { fEncoding= encoding; fExplicitEncoding= encoding; @@ -197,9 +185,7 @@ public class ResourceTextFileBuffer extends ResourceFileBuffer implements ITextF } } - /* - * @see org.eclipse.core.filebuffers.IFileBuffer#getStatus() - */ + @Override public IStatus getStatus() { if (!isDisconnected()) { if (fStatus != null) @@ -209,10 +195,7 @@ public class ResourceTextFileBuffer extends ResourceFileBuffer implements ITextF return STATUS_ERROR; } - /* - * @see org.eclipse.core.filebuffers.IFileBuffer#getContentType() - * @since 3.1 - */ + @Override public IContentType getContentType() throws CoreException { try { if (isDirty()) { @@ -239,25 +222,19 @@ public class ResourceTextFileBuffer extends ResourceFileBuffer implements ITextF } } - /* - * @see org.eclipse.core.internal.filebuffers.FileBuffer#addFileBufferContentListeners() - */ + @Override protected void addFileBufferContentListeners() { if (fDocument != null) fDocument.addDocumentListener(fDocumentListener); } - /* - * @see org.eclipse.core.internal.filebuffers.FileBuffer#removeFileBufferContentListeners() - */ + @Override protected void removeFileBufferContentListeners() { if (fDocument != null) fDocument.removeDocumentListener(fDocumentListener); } - /* - * @see org.eclipse.core.internal.filebuffers.FileBuffer#initializeFileBufferContent(org.eclipse.core.runtime.IProgressMonitor) - */ + @Override protected void initializeFileBufferContent(IProgressMonitor monitor) throws CoreException { try { fEncoding= null; @@ -306,9 +283,7 @@ public class ResourceTextFileBuffer extends ResourceFileBuffer implements ITextF fBOM= (byte[])description.getProperty(IContentDescription.BYTE_ORDER_MARK); } - /* - * @see org.eclipse.core.internal.filebuffers.ResourceFileBuffer#connected() - */ + @Override protected void connected() { super.connected(); if (fAnnotationModel != null) @@ -318,6 +293,7 @@ public class ResourceTextFileBuffer extends ResourceFileBuffer implements ITextF /* * @see org.eclipse.core.internal.filebuffers.ResourceFileBuffer#disconnected() */ + @Override protected void dispose() { try { fDocument.removePositionCategory(IDocument.DEFAULT_CATEGORY); @@ -330,9 +306,7 @@ public class ResourceTextFileBuffer extends ResourceFileBuffer implements ITextF super.dispose(); } - /* - * @see org.eclipse.core.internal.filebuffers.FileBuffer#commitFileBufferContent(org.eclipse.core.runtime.IProgressMonitor, boolean) - */ + @Override protected void commitFileBufferContent(IProgressMonitor monitor, boolean overwrite) throws CoreException { if (!isSynchronized() && !overwrite) { String message= NLSUtility.format(FileBuffersMessages.FileBuffer_error_outOfSync, getFileStore().toURI()); @@ -487,9 +461,7 @@ public class ResourceTextFileBuffer extends ResourceFileBuffer implements ITextF cacheBOM(); } - /* - * @see org.eclipse.core.internal.filebuffers.ResourceFileBuffer#handleFileContentChanged() - */ + @Override protected void handleFileContentChanged(boolean revert, boolean updateModificationStamp) throws CoreException { IDocument document= getManager().createEmptyDocument(fFile); diff --git a/org.eclipse.core.filebuffers/src/org/eclipse/core/internal/filebuffers/ResourceTextFileBufferManager.java b/org.eclipse.core.filebuffers/src/org/eclipse/core/internal/filebuffers/ResourceTextFileBufferManager.java index edafab86194..d3932fdbe45 100644 --- a/org.eclipse.core.filebuffers/src/org/eclipse/core/internal/filebuffers/ResourceTextFileBufferManager.java +++ b/org.eclipse.core.filebuffers/src/org/eclipse/core/internal/filebuffers/ResourceTextFileBufferManager.java @@ -61,10 +61,7 @@ public class ResourceTextFileBufferManager extends TextFileBufferManager { fRegistry= new ResourceExtensionRegistry(); } - /* - * @see org.eclipse.core.filebuffers.ITextFileBufferManager#isTextFileLocation(org.eclipse.core.runtime.IPath, boolean) - * @since 3.2 - */ + @Override public boolean isTextFileLocation(IPath location, boolean strict) { Assert.isNotNull(location); location= FileBuffers.normalizeLocation(location); @@ -98,20 +95,17 @@ public class ResourceTextFileBufferManager extends TextFileBufferManager { return isTextFileLocation(FileBuffers.getFileStoreAtLocation(location), strict); } - /* - * @see org.eclipse.core.buffer.text.IBufferedFileManager#getDefaultEncoding() - */ + @Override public String getDefaultEncoding() { return ResourcesPlugin.getEncoding(); } - /* - * @see org.eclipse.core.internal.filebuffers.TextFileBufferManager#normalizeLocation(org.eclipse.core.runtime.IPath) - */ + @Override protected IPath normalizeLocation(IPath location) { return FileBuffers.normalizeLocation(location); } + @Override protected AbstractFileBuffer createTextFileBuffer(IPath location, LocationKind locationKind) { if (locationKind == LocationKind.IFILE || locationKind == LocationKind.NORMALIZE && FileBuffers.getWorkspaceFileAtLocation(location, true) != null) return new ResourceTextFileBuffer(this); @@ -146,6 +140,7 @@ public class ResourceTextFileBufferManager extends TextFileBufferManager { for (int i= 0; i < participants.length; i++) { final IDocumentSetupParticipant participant= participants[i]; ISafeRunnable runnable= new ISafeRunnable() { + @Override public void run() throws Exception { if (participant instanceof IDocumentSetupParticipantExtension) ((IDocumentSetupParticipantExtension)participant).setup(document, file.getFullPath(), LocationKind.IFILE); @@ -158,6 +153,7 @@ public class ResourceTextFileBufferManager extends TextFileBufferManager { FileBuffersPlugin.getDefault().getLog().log(status); } } + @Override public void handleException(Throwable t) { IStatus status= new Status(IStatus.ERROR, FileBuffersPlugin.PLUGIN_ID, IStatus.OK, FileBuffersMessages.TextFileBufferManager_error_documentSetupFailed, t); FileBuffersPlugin.getDefault().getLog().log(status); @@ -178,14 +174,17 @@ public class ResourceTextFileBufferManager extends TextFileBufferManager { * @since 3.5 * @deprecated As of 3.5 */ + @Deprecated private IDocument createEmptyDocumentFromFactory(final IFile file) { final IDocument[] runnableResult= new IDocument[1]; final org.eclipse.core.filebuffers.IDocumentFactory factory= ((ResourceExtensionRegistry)fRegistry).getDocumentFactory(file); if (factory != null) { ISafeRunnable runnable= new ISafeRunnable() { + @Override public void run() throws Exception { runnableResult[0]= factory.createDocument(); } + @Override public void handleException(Throwable t) { IStatus status= new Status(IStatus.ERROR, FileBuffersPlugin.PLUGIN_ID, IStatus.OK, FileBuffersMessages.TextFileBufferManager_error_documentFactoryFailed, t); FileBuffersPlugin.getDefault().getLog().log(status); @@ -210,6 +209,7 @@ public class ResourceTextFileBufferManager extends TextFileBufferManager { return Platform.getPreferencesService().getString(Platform.PI_RUNTIME, Platform.PREF_LINE_SEPARATOR, null, scopeContext); } + @Override protected String getLineDelimiterPreference(IPath location, LocationKind locationKind) { IFile file= null; if (locationKind != LocationKind.LOCATION) @@ -217,12 +217,10 @@ public class ResourceTextFileBufferManager extends TextFileBufferManager { return getLineDelimiterPreference(file); } - /* - * @see org.eclipse.core.filebuffers.IFileBufferManager#validateState(org.eclipse.core.filebuffers.IFileBuffer[], org.eclipse.core.runtime.IProgressMonitor, java.lang.Object) - * @since 3.1 - */ + @Override public void validateState(final IFileBuffer[] fileBuffers, IProgressMonitor monitor, final Object computationContext) throws CoreException { IWorkspaceRunnable runnable= new IWorkspaceRunnable() { + @Override public void run(IProgressMonitor progressMonitor) throws CoreException { IFileBuffer[] toValidate= findFileBuffersToValidate(fileBuffers); validationStateAboutToBeChanged(toValidate); diff --git a/org.eclipse.core.filebuffers/src/org/eclipse/core/internal/filebuffers/SynchronizableDocument.java b/org.eclipse.core.filebuffers/src/org/eclipse/core/internal/filebuffers/SynchronizableDocument.java index d3b0a45bacb..cf4664d1c51 100644 --- a/org.eclipse.core.filebuffers/src/org/eclipse/core/internal/filebuffers/SynchronizableDocument.java +++ b/org.eclipse.core.filebuffers/src/org/eclipse/core/internal/filebuffers/SynchronizableDocument.java @@ -35,16 +35,12 @@ public class SynchronizableDocument extends Document implements ISynchronizable private Object fLockObject; - /* - * @see org.eclipse.jface.text.ISynchronizable#setLockObject(java.lang.Object) - */ + @Override public synchronized void setLockObject(Object lockObject) { fLockObject= lockObject; } - /* - * @see org.eclipse.jface.text.ISynchronizable#getLockObject() - */ + @Override public synchronized Object getLockObject() { return fLockObject; } @@ -55,6 +51,8 @@ public class SynchronizableDocument extends Document implements ISynchronizable * @deprecated As of 3.1, replaced by * {@link IDocumentExtension4#startRewriteSession(DocumentRewriteSessionType)} */ + @Deprecated + @Override public void startSequentialRewrite(boolean normalized) { Object lockObject= getLockObject(); if (lockObject == null) { @@ -72,6 +70,8 @@ public class SynchronizableDocument extends Document implements ISynchronizable * @deprecated As of 3.1, replaced by * {@link IDocumentExtension4#stopRewriteSession(DocumentRewriteSession)} */ + @Deprecated + @Override public void stopSequentialRewrite() { Object lockObject= getLockObject(); if (lockObject == null) { @@ -83,11 +83,7 @@ public class SynchronizableDocument extends Document implements ISynchronizable } } - /* - * @see org.eclipse.jface.text.AbstractDocument#startRewriteSession(org.eclipse.jface.text.DocumentRewriteSessionType) - * - * @since 3.5 - */ + @Override public DocumentRewriteSession startRewriteSession(DocumentRewriteSessionType sessionType) { Object lockObject= getLockObject(); if (lockObject == null) { @@ -98,11 +94,7 @@ public class SynchronizableDocument extends Document implements ISynchronizable } } - /* - * @see org.eclipse.jface.text.AbstractDocument#stopRewriteSession(org.eclipse.jface.text.DocumentRewriteSession) - * - * @since 3.5 - */ + @Override public void stopRewriteSession(DocumentRewriteSession session) { Object lockObject= getLockObject(); if (lockObject == null) { @@ -114,9 +106,7 @@ public class SynchronizableDocument extends Document implements ISynchronizable } } - /* - * @see IDocument#get() - */ + @Override public String get() { Object lockObject= getLockObject(); if (lockObject == null) { @@ -127,9 +117,7 @@ public class SynchronizableDocument extends Document implements ISynchronizable } } - /* - * @see IDocument#get(int, int) - */ + @Override public String get(int offset, int length) throws BadLocationException { Object lockObject= getLockObject(); if (lockObject == null) { @@ -140,9 +128,7 @@ public class SynchronizableDocument extends Document implements ISynchronizable } } - /* - * @see IDocument#getChar(int) - */ + @Override public char getChar(int offset) throws BadLocationException { Object lockObject= getLockObject(); if (lockObject == null) { @@ -153,10 +139,7 @@ public class SynchronizableDocument extends Document implements ISynchronizable } } - /* - * @see org.eclipse.jface.text.IDocumentExtension4#getModificationStamp() - * @since 3.1 - */ + @Override public long getModificationStamp() { Object lockObject= getLockObject(); if (lockObject == null) { @@ -167,9 +150,7 @@ public class SynchronizableDocument extends Document implements ISynchronizable } } - /* - * @see IDocument#replace(int, int, String) - */ + @Override public void replace(int offset, int length, String text) throws BadLocationException { Object lockObject= getLockObject(); if (lockObject == null) { @@ -181,9 +162,7 @@ public class SynchronizableDocument extends Document implements ISynchronizable } } - /* - * @see IDocumentExtension4#replace(int, int, String, long) - */ + @Override public void replace(int offset, int length, String text, long modificationStamp) throws BadLocationException { Object lockObject= getLockObject(); if (lockObject == null) { @@ -195,9 +174,7 @@ public class SynchronizableDocument extends Document implements ISynchronizable } } - /* - * @see IDocument#set(String) - */ + @Override public void set(String text) { Object lockObject= getLockObject(); if (lockObject == null) { @@ -209,9 +186,7 @@ public class SynchronizableDocument extends Document implements ISynchronizable } } - /* - * @see IDocumentExtension4#set(String, long) - */ + @Override public void set(String text, long modificationStamp) { Object lockObject= getLockObject(); if (lockObject == null) { @@ -223,9 +198,7 @@ public class SynchronizableDocument extends Document implements ISynchronizable } } - /* - * @see org.eclipse.jface.text.AbstractDocument#addPosition(java.lang.String, org.eclipse.jface.text.Position) - */ + @Override public void addPosition(String category, Position position) throws BadLocationException, BadPositionCategoryException { Object lockObject= getLockObject(); if (lockObject == null) { @@ -237,9 +210,7 @@ public class SynchronizableDocument extends Document implements ISynchronizable } } - /* - * @see org.eclipse.jface.text.AbstractDocument#removePosition(java.lang.String, org.eclipse.jface.text.Position) - */ + @Override public void removePosition(String category, Position position) throws BadPositionCategoryException { Object lockObject= getLockObject(); if (lockObject == null) { @@ -251,9 +222,7 @@ public class SynchronizableDocument extends Document implements ISynchronizable } } - /* - * @see org.eclipse.jface.text.AbstractDocument#getPositions(java.lang.String) - */ + @Override public Position[] getPositions(String category) throws BadPositionCategoryException { Object lockObject= getLockObject(); if (lockObject == null) { @@ -264,10 +233,7 @@ public class SynchronizableDocument extends Document implements ISynchronizable } } - /* - * @see org.eclipse.jface.text.AbstractDocument#getPositions(java.lang.String, int, int, boolean, boolean) - * @since 3.4 - */ + @Override public Position[] getPositions(String category, int offset, int length, boolean canStartBefore, boolean canEndAfter) throws BadPositionCategoryException { Object lockObject= getLockObject(); if (lockObject == null) { @@ -278,11 +244,7 @@ public class SynchronizableDocument extends Document implements ISynchronizable } } - /* - * @see org.eclipse.jface.text.AbstractDocument#computePartitioning(java.lang.String, int, int, boolean) - * - * @since 3.5 - */ + @Override public ITypedRegion[] computePartitioning(String partitioning, int offset, int length, boolean includeZeroLengthPartitions) throws BadLocationException, BadPartitioningException { Object lockObject= getLockObject(); if (lockObject == null) { @@ -293,11 +255,7 @@ public class SynchronizableDocument extends Document implements ISynchronizable } } - /* - * @see org.eclipse.jface.text.AbstractDocument#getLineDelimiter(int) - * - * @since 3.5 - */ + @Override public String getLineDelimiter(int line) throws BadLocationException { Object lockObject= getLockObject(); if (lockObject == null) { @@ -308,11 +266,7 @@ public class SynchronizableDocument extends Document implements ISynchronizable } } - /* - * @see org.eclipse.jface.text.AbstractDocument#getDefaultLineDelimiter() - * - * @since 3.5 - */ + @Override public String getDefaultLineDelimiter() { Object lockObject= getLockObject(); if (lockObject == null) { @@ -323,11 +277,7 @@ public class SynchronizableDocument extends Document implements ISynchronizable } } - /* - * @see org.eclipse.jface.text.AbstractDocument#getLineInformation(int) - * - * @since 3.5 - */ + @Override public IRegion getLineInformation(int line) throws BadLocationException { Object lockObject= getLockObject(); if (lockObject == null) { @@ -338,11 +288,7 @@ public class SynchronizableDocument extends Document implements ISynchronizable } } - /* - * @see org.eclipse.jface.text.AbstractDocument#getLineInformationOfOffset(int) - * - * @since 3.5 - */ + @Override public IRegion getLineInformationOfOffset(int offset) throws BadLocationException { Object lockObject= getLockObject(); if (lockObject == null) { @@ -353,11 +299,7 @@ public class SynchronizableDocument extends Document implements ISynchronizable } } - /* - * @see org.eclipse.jface.text.AbstractDocument#getLineLength(int) - * - * @since 3.5 - */ + @Override public int getLineLength(int line) throws BadLocationException { Object lockObject= getLockObject(); if (lockObject == null) { @@ -368,11 +310,7 @@ public class SynchronizableDocument extends Document implements ISynchronizable } } - /* - * @see org.eclipse.jface.text.AbstractDocument#getLineOffset(int) - * - * @since 3.5 - */ + @Override public int getLineOffset(int line) throws BadLocationException { Object lockObject= getLockObject(); if (lockObject == null) { @@ -383,11 +321,7 @@ public class SynchronizableDocument extends Document implements ISynchronizable } } - /* - * @see org.eclipse.jface.text.AbstractDocument#getLineOfOffset(int) - * - * @since 3.5 - */ + @Override public int getLineOfOffset(int pos) throws BadLocationException { Object lockObject= getLockObject(); if (lockObject == null) { diff --git a/org.eclipse.core.filebuffers/src/org/eclipse/core/internal/filebuffers/TextFileBufferManager.java b/org.eclipse.core.filebuffers/src/org/eclipse/core/internal/filebuffers/TextFileBufferManager.java index 515156899b3..1a0da3fcec0 100644 --- a/org.eclipse.core.filebuffers/src/org/eclipse/core/internal/filebuffers/TextFileBufferManager.java +++ b/org.eclipse.core.filebuffers/src/org/eclipse/core/internal/filebuffers/TextFileBufferManager.java @@ -60,6 +60,7 @@ import org.eclipse.jface.text.source.IAnnotationModel; public class TextFileBufferManager implements ITextFileBufferManager { private static abstract class SafeNotifier implements ISafeRunnable { + @Override public void handleException(Throwable ex) { // NOTE: Logging is done by SafeRunner } @@ -83,14 +84,13 @@ public class TextFileBufferManager implements ITextFileBufferManager { * * @deprecated As of 3.3, replaced by {@link #connect(IPath, LocationKind, IProgressMonitor)} */ + @Deprecated + @Override public void connect(IPath location, IProgressMonitor monitor) throws CoreException { connect(location, LocationKind.NORMALIZE, monitor); } - /* - * @see org.eclipse.core.filebuffers.IFileBufferManager#connect(org.eclipse.core.runtime.IPath, org.eclipse.core.filebuffers.IFileBufferManager.LocationKind, org.eclipse.core.runtime.IProgressMonitor) - * @since 3.3 - */ + @Override public void connect(IPath location, LocationKind locationKind, IProgressMonitor monitor) throws CoreException { Assert.isNotNull(location); if (locationKind == LocationKind.NORMALIZE) @@ -127,10 +127,7 @@ public class TextFileBufferManager implements ITextFileBufferManager { fireBufferCreated(fileBuffer); } - /* - * @see org.eclipse.core.filebuffers.IFileBufferManager#connectFileStore(org.eclipse.core.filesystem.IFileStore, org.eclipse.core.runtime.IProgressMonitor) - * @since 3.3 - */ + @Override public void connectFileStore(IFileStore fileStore, IProgressMonitor monitor) throws CoreException { Assert.isLegal(fileStore != null); @@ -170,6 +167,8 @@ public class TextFileBufferManager implements ITextFileBufferManager { * * @deprecated As of 3.3, replaced by {@link #disconnect(IPath, LocationKind, IProgressMonitor)} */ + @Deprecated + @Override public void disconnect(IPath location, IProgressMonitor monitor) throws CoreException { disconnect(location, LocationKind.NORMALIZE, monitor); } @@ -181,10 +180,7 @@ public class TextFileBufferManager implements ITextFileBufferManager { return location; } - /* - * @see org.eclipse.core.filebuffers.IFileBufferManager#disconnect(org.eclipse.core.runtime.IPath, org.eclipse.core.filebuffers.IFileBufferManager.LocationKind, org.eclipse.core.runtime.IProgressMonitor) - * @since 3.3 - */ + @Override public void disconnect(IPath location, LocationKind locationKind, IProgressMonitor monitor) throws CoreException { Assert.isNotNull(location); if (locationKind == LocationKind.NORMALIZE) @@ -208,10 +204,7 @@ public class TextFileBufferManager implements ITextFileBufferManager { fileBuffer.dispose(); } - /* - * @see org.eclipse.core.filebuffers.IFileBufferManager#disconnectFileStore(org.eclipse.core.filesystem.IFileStore, org.eclipse.core.runtime.IProgressMonitor) - * @since 3.3 - */ + @Override public void disconnectFileStore(IFileStore fileStore, IProgressMonitor monitor) throws CoreException { Assert.isLegal(fileStore != null); @@ -238,6 +231,8 @@ public class TextFileBufferManager implements ITextFileBufferManager { * * @deprecated As of 3.2, replaced by {@link #isTextFileLocation(IPath, boolean)} */ + @Deprecated + @Override public boolean isTextFileLocation(IPath location) { return isTextFileLocation(location, false); } @@ -307,10 +302,7 @@ public class TextFileBufferManager implements ITextFileBufferManager { return !strict; } - /* - * @see org.eclipse.core.filebuffers.ITextFileBufferManager#isTextFileLocation(org.eclipse.core.runtime.IPath, boolean) - * @since 3.2 - */ + @Override public boolean isTextFileLocation(IPath location, boolean strict) { Assert.isNotNull(location); location= normalizeLocation(location); @@ -326,24 +318,20 @@ public class TextFileBufferManager implements ITextFileBufferManager { * * @deprecated As of 3.3, replaced by {@link #getFileBuffer(IPath, LocationKind)} */ + @Deprecated + @Override public IFileBuffer getFileBuffer(IPath location) { return getFileBuffer(location, LocationKind.NORMALIZE); } - /* - * @see org.eclipse.core.filebuffers.IFileBufferManager#getFileBuffer(org.eclipse.core.runtime.IPath, org.eclipse.core.filebuffers.IFileBufferManager.LocationKind) - * @since 3.3 - */ + @Override public IFileBuffer getFileBuffer(IPath location, LocationKind locationKind) { if (locationKind == LocationKind.NORMALIZE) location= normalizeLocation(location); return internalGetFileBuffer(location); } - /* - * @see org.eclipse.core.filebuffers.IFileBufferManager#getFileStoreFileBuffer(org.eclipse.core.filesystem.IFileStore) - * @since 3.3 - */ + @Override public IFileBuffer getFileStoreFileBuffer(IFileStore fileStore) { Assert.isLegal(fileStore != null); return internalGetFileBuffer(fileStore); @@ -366,31 +354,24 @@ public class TextFileBufferManager implements ITextFileBufferManager { * * @deprecated As of 3.3, replaced by {@link #getTextFileBuffer(IPath, LocationKind)} */ + @Deprecated + @Override public ITextFileBuffer getTextFileBuffer(IPath location) { return getTextFileBuffer(location, LocationKind.NORMALIZE); } - /* - * @see org.eclipse.core.filebuffers.ITextFileBufferManager#getTextFileBuffer(org.eclipse.core.runtime.IPath, org.eclipse.core.filebuffers.IFileBufferManager.LocationKind) - * @since 3.3 - */ + @Override public ITextFileBuffer getTextFileBuffer(IPath location, LocationKind locationKind) { return (ITextFileBuffer)getFileBuffer(location, locationKind); } - /* - * @see org.eclipse.core.filebuffers.ITextFileBufferManager#getFileStoreTextFileBuffer(org.eclipse.core.filesystem.IFileStore) - * @since 3.3 - */ + @Override public ITextFileBuffer getFileStoreTextFileBuffer(IFileStore fileStore) { Assert.isLegal(fileStore != null); return (ITextFileBuffer)getFileStoreFileBuffer(fileStore); } - /* - * @see org.eclipse.core.filebuffers.ITextFileBufferManager#getTextFileBuffer(org.eclipse.jface.text.IDocument) - * @since 3.3 - */ + @Override public ITextFileBuffer getTextFileBuffer(IDocument document) { Assert.isLegal(document != null); Iterator iter; @@ -425,10 +406,7 @@ public class TextFileBufferManager implements ITextFileBufferManager { return null; } - /* - * @see org.eclipse.core.filebuffers.IFileBufferManager#getFileBuffers() - * @since 3.4 - */ + @Override public IFileBuffer[] getFileBuffers() { synchronized (fFilesBuffers) { Collection values= fFilesBuffers.values(); @@ -436,10 +414,7 @@ public class TextFileBufferManager implements ITextFileBufferManager { } } - /* - * @see org.eclipse.core.filebuffers.IFileBufferManager#getFileStoreFileBuffers() - * @since 3.4 - */ + @Override public IFileBuffer[] getFileStoreFileBuffers() { synchronized (fFileStoreFileBuffers) { Collection values= fFileStoreFileBuffers.values(); @@ -447,9 +422,7 @@ public class TextFileBufferManager implements ITextFileBufferManager { } } - /* - * @see org.eclipse.core.buffer.text.IBufferedFileManager#getDefaultEncoding() - */ + @Override public String getDefaultEncoding() { return System.getProperty("file.encoding"); //$NON-NLS-1$; } @@ -459,14 +432,13 @@ public class TextFileBufferManager implements ITextFileBufferManager { * * @deprecated As of 3.3, replaced by {@link #createEmptyDocument(IPath, LocationKind)} */ + @Deprecated + @Override public IDocument createEmptyDocument(IPath location) { return createEmptyDocument(location, LocationKind.NORMALIZE); } - /* - * @see org.eclipse.core.filebuffers.ITextFileBufferManager#createEmptyDocument(org.eclipse.core.runtime.IPath, org.eclipse.core.filebuffers.LocationKind) - * @since 3.3 - */ + @Override public IDocument createEmptyDocument(final IPath location, final LocationKind locationKind) { IDocument documentFromFactory= createDocumentFromFactory(location, locationKind); final IDocument document; @@ -490,6 +462,7 @@ public class TextFileBufferManager implements ITextFileBufferManager { for (int i= 0; i < participants.length; i++) { final IDocumentSetupParticipant participant= participants[i]; ISafeRunnable runnable= new ISafeRunnable() { + @Override public void run() throws Exception { if (participant instanceof IDocumentSetupParticipantExtension) ((IDocumentSetupParticipantExtension)participant).setup(document, location, locationKind); @@ -502,6 +475,7 @@ public class TextFileBufferManager implements ITextFileBufferManager { FileBuffersPlugin.getDefault().getLog().log(status); } } + @Override public void handleException(Throwable t) { IStatus status= new Status(IStatus.ERROR, FileBuffersPlugin.PLUGIN_ID, IStatus.OK, FileBuffersMessages.TextFileBufferManager_error_documentSetupFailed, t); FileBuffersPlugin.getDefault().getLog().log(status); @@ -523,15 +497,18 @@ public class TextFileBufferManager implements ITextFileBufferManager { * @since 3.5 * @deprecated As of 3.5 */ + @Deprecated private IDocument createDocumentFromFactory(final IPath location, final LocationKind locationKind) { final IDocument[] runnableResult= new IDocument[1]; if (location != null) { final org.eclipse.core.filebuffers.IDocumentFactory factory= fRegistry.getDocumentFactory(location, locationKind); if (factory != null) { ISafeRunnable runnable= new ISafeRunnable() { + @Override public void run() throws Exception { runnableResult[0]= factory.createDocument(); } + @Override public void handleException(Throwable t) { IStatus status= new Status(IStatus.ERROR, FileBuffersPlugin.PLUGIN_ID, IStatus.OK, FileBuffersMessages.TextFileBufferManager_error_documentFactoryFailed, t); FileBuffersPlugin.getDefault().getLog().log(status); @@ -548,14 +525,13 @@ public class TextFileBufferManager implements ITextFileBufferManager { * * @deprecated As of 3.3, replaced by {@link #createAnnotationModel(IPath, LocationKind)} */ + @Deprecated + @Override public IAnnotationModel createAnnotationModel(IPath location) { return createAnnotationModel(location, LocationKind.NORMALIZE); } - /* - * @see org.eclipse.core.filebuffers.ITextFileBufferManager#createAnnotationModel(org.eclipse.core.runtime.IPath, org.eclipse.core.filebuffers.LocationKind) - * @since 3.3 - */ + @Override public IAnnotationModel createAnnotationModel(IPath location, LocationKind locationKind) { Assert.isNotNull(location); IAnnotationModelFactory factory= fRegistry.getAnnotationModelFactory(location, locationKind); @@ -564,9 +540,7 @@ public class TextFileBufferManager implements ITextFileBufferManager { return null; } - /* - * @see org.eclipse.core.filebuffers.IFileBufferManager#addFileBufferListener(org.eclipse.core.filebuffers.IFileBufferListener) - */ + @Override public void addFileBufferListener(IFileBufferListener listener) { Assert.isNotNull(listener); synchronized (fFileBufferListeners) { @@ -575,9 +549,7 @@ public class TextFileBufferManager implements ITextFileBufferManager { } } - /* - * @see org.eclipse.core.filebuffers.IFileBufferManager#removeFileBufferListener(org.eclipse.core.filebuffers.IFileBufferListener) - */ + @Override public void removeFileBufferListener(IFileBufferListener listener) { Assert.isNotNull(listener); synchronized (fFileBufferListeners) { @@ -585,9 +557,7 @@ public class TextFileBufferManager implements ITextFileBufferManager { } } - /* - * @see org.eclipse.core.filebuffers.IFileBufferManager#setSynchronizationContext(org.eclipse.core.filebuffers.ISynchronizationContext) - */ + @Override public void setSynchronizationContext(ISynchronizationContext context) { fSynchronizationContext= context; } @@ -598,6 +568,8 @@ public class TextFileBufferManager implements ITextFileBufferManager { * @deprecated As of 3.1, replaced by * {@link org.eclipse.core.filebuffers.IFileBuffer#requestSynchronizationContext()} */ + @Deprecated + @Override public void requestSynchronizationContext(IPath location) { Assert.isNotNull(location); location= normalizeLocation(location); @@ -612,6 +584,8 @@ public class TextFileBufferManager implements ITextFileBufferManager { * * @deprecated As of 3.1, replaced by {@link IFileBuffer#releaseSynchronizationContext()} */ + @Deprecated + @Override public void releaseSynchronizationContext(IPath location) { Assert.isNotNull(location); location= normalizeLocation(location); @@ -621,9 +595,7 @@ public class TextFileBufferManager implements ITextFileBufferManager { fileBuffer.releaseSynchronizationContext(); } - /** - * {@inheritDoc} - */ + @Override public void execute(Runnable runnable) { if (fSynchronizationContext != null) fSynchronizationContext.run(runnable); @@ -702,6 +674,7 @@ public class TextFileBufferManager implements ITextFileBufferManager { while (e.hasNext()) { final IFileBufferListener l= (IFileBufferListener) e.next(); SafeRunner.run(new SafeNotifier() { + @Override public void run() { l.dirtyStateChanged(buffer, isDirty); } @@ -714,6 +687,7 @@ public class TextFileBufferManager implements ITextFileBufferManager { while (e.hasNext()) { final IFileBufferListener l= (IFileBufferListener) e.next(); SafeRunner.run(new SafeNotifier() { + @Override public void run() { l.bufferContentAboutToBeReplaced(buffer); } @@ -726,6 +700,7 @@ public class TextFileBufferManager implements ITextFileBufferManager { while (e.hasNext()) { final IFileBufferListener l= (IFileBufferListener) e.next(); SafeRunner.run(new SafeNotifier() { + @Override public void run() { l.bufferContentReplaced(buffer); } @@ -738,6 +713,7 @@ public class TextFileBufferManager implements ITextFileBufferManager { while (e.hasNext()) { final IFileBufferListener l= (IFileBufferListener) e.next(); SafeRunner.run(new SafeNotifier() { + @Override public void run() { l.underlyingFileMoved(buffer, target); } @@ -750,6 +726,7 @@ public class TextFileBufferManager implements ITextFileBufferManager { while (e.hasNext()) { final IFileBufferListener l= (IFileBufferListener) e.next(); SafeRunner.run(new SafeNotifier() { + @Override public void run() { l.underlyingFileDeleted(buffer); } @@ -762,6 +739,7 @@ public class TextFileBufferManager implements ITextFileBufferManager { while (e.hasNext()) { final IFileBufferListener l= (IFileBufferListener) e.next(); SafeRunner.run(new SafeNotifier() { + @Override public void run() { l.stateValidationChanged(buffer, isStateValidated); } @@ -774,6 +752,7 @@ public class TextFileBufferManager implements ITextFileBufferManager { while (e.hasNext()) { final IFileBufferListener l= (IFileBufferListener) e.next(); SafeRunner.run(new SafeNotifier() { + @Override public void run() { l.stateChanging(buffer); } @@ -786,6 +765,7 @@ public class TextFileBufferManager implements ITextFileBufferManager { while (e.hasNext()) { final IFileBufferListener l= (IFileBufferListener) e.next(); SafeRunner.run(new SafeNotifier() { + @Override public void run() { l.stateChangeFailed(buffer); } @@ -798,6 +778,7 @@ public class TextFileBufferManager implements ITextFileBufferManager { while (e.hasNext()) { final IFileBufferListener l= (IFileBufferListener) e.next(); SafeRunner.run(new SafeNotifier() { + @Override public void run() { l.bufferCreated(buffer); } @@ -810,6 +791,7 @@ public class TextFileBufferManager implements ITextFileBufferManager { while (e.hasNext()) { final IFileBufferListener l= (IFileBufferListener) e.next(); SafeRunner.run(new SafeNotifier() { + @Override public void run() { l.bufferDisposed(buffer); } @@ -817,10 +799,7 @@ public class TextFileBufferManager implements ITextFileBufferManager { } } - /* - * @see org.eclipse.core.filebuffers.IFileBufferManager#validateState(org.eclipse.core.filebuffers.IFileBuffer[], org.eclipse.core.runtime.IProgressMonitor, java.lang.Object) - * @since 3.1 - */ + @Override public void validateState(final IFileBuffer[] fileBuffers, IProgressMonitor monitor, final Object computationContext) throws CoreException { } diff --git a/org.eclipse.jface.text.tests/src/org/eclipse/jface/text/tests/AbstractPairMatcherTest.java b/org.eclipse.jface.text.tests/src/org/eclipse/jface/text/tests/AbstractPairMatcherTest.java index 95abf681199..6108c22400b 100644 --- a/org.eclipse.jface.text.tests/src/org/eclipse/jface/text/tests/AbstractPairMatcherTest.java +++ b/org.eclipse.jface.text.tests/src/org/eclipse/jface/text/tests/AbstractPairMatcherTest.java @@ -488,22 +488,27 @@ public abstract class AbstractPairMatcherTest extends TestCase { fString= str; } + @Override public char get(int offset) { return fString.charAt(offset); } + @Override public String get(int offset, int length) { return fString.substring(offset, offset + length); } + @Override public int getLength() { return fString.length(); } + @Override public void replace(int offset, int length, String text) { throw new UnsupportedOperationException(); } + @Override public void set(String text) { fString= text; } diff --git a/org.eclipse.jface.text.tests/src/org/eclipse/jface/text/tests/AbstractUndoManagerTest.java b/org.eclipse.jface.text.tests/src/org/eclipse/jface/text/tests/AbstractUndoManagerTest.java index 42915499cdd..78c88a49d31 100644 --- a/org.eclipse.jface.text.tests/src/org/eclipse/jface/text/tests/AbstractUndoManagerTest.java +++ b/org.eclipse.jface.text.tests/src/org/eclipse/jface/text/tests/AbstractUndoManagerTest.java @@ -58,9 +58,7 @@ public abstract class AbstractUndoManagerTest extends TestCase { super(name); } - /* - * @see TestCase#setUp() - */ + @Override protected void setUp() { fShell= new Shell(); fUndoManager= createUndoManager(MAX_UNDO_LEVEL); @@ -71,9 +69,7 @@ public abstract class AbstractUndoManagerTest extends TestCase { abstract protected IUndoManager createUndoManager(int maxUndoLevel); - /* - * @see TestCase#tearDown() - */ + @Override protected void tearDown() { fUndoManager.disconnect(); fUndoManager= null; diff --git a/org.eclipse.jface.text.tests/src/org/eclipse/jface/text/tests/DefaultUndoManagerTest.java b/org.eclipse.jface.text.tests/src/org/eclipse/jface/text/tests/DefaultUndoManagerTest.java index e6819c7ec2d..c087c0cb952 100644 --- a/org.eclipse.jface.text.tests/src/org/eclipse/jface/text/tests/DefaultUndoManagerTest.java +++ b/org.eclipse.jface.text.tests/src/org/eclipse/jface/text/tests/DefaultUndoManagerTest.java @@ -34,10 +34,7 @@ public class DefaultUndoManagerTest extends AbstractUndoManagerTest { super(name); } - /* - * @see org.eclipse.jface.text.tests.AbstractUndoManagerTest#createUndoManager(int) - * @since 3.2 - */ + @Override protected IUndoManager createUndoManager(int maxUndoLevel) { return new DefaultUndoManager(maxUndoLevel); } diff --git a/org.eclipse.jface.text.tests/src/org/eclipse/jface/text/tests/HTML2TextReaderTest.java b/org.eclipse.jface.text.tests/src/org/eclipse/jface/text/tests/HTML2TextReaderTest.java index 12aef7b696e..2c9fc3da7c7 100644 --- a/org.eclipse.jface.text.tests/src/org/eclipse/jface/text/tests/HTML2TextReaderTest.java +++ b/org.eclipse.jface.text.tests/src/org/eclipse/jface/text/tests/HTML2TextReaderTest.java @@ -53,6 +53,7 @@ public class HTML2TextReaderTest extends TestCase { * @throws IOException * @deprecated pass actual style ranges */ + @Deprecated private void verify(String input, String expectedOutput, int styleRangeCount) throws IOException { Reader reader= new StringReader(input); TextPresentation textPresentation= new TextPresentation(); @@ -71,6 +72,7 @@ public class HTML2TextReaderTest extends TestCase { assertEquals("Incorrect number of style ranges", styleRangeCount, ranges.size()); Collections.sort(ranges, new Comparator() { + @Override public int compare(Object o1, Object o2) { StyleRange range1= (StyleRange)o1; StyleRange range2= (StyleRange)o2; @@ -105,6 +107,7 @@ public class HTML2TextReaderTest extends TestCase { } Collections.sort(ranges, new Comparator() { + @Override public int compare(Object o1, Object o2) { StyleRange range1= (StyleRange)o1; StyleRange range2= (StyleRange)o2; diff --git a/org.eclipse.jface.text.tests/src/org/eclipse/jface/text/tests/TestTextViewer.java b/org.eclipse.jface.text.tests/src/org/eclipse/jface/text/tests/TestTextViewer.java index 41859b308a8..7a1bc80228c 100644 --- a/org.eclipse.jface.text.tests/src/org/eclipse/jface/text/tests/TestTextViewer.java +++ b/org.eclipse.jface.text.tests/src/org/eclipse/jface/text/tests/TestTextViewer.java @@ -60,6 +60,7 @@ public class TestTextViewer implements ISourceViewer, IDocumentListener { /** * @see ITextViewer#setDocument(IDocument, int, int) */ + @Override public void setDocument(IDocument document, int p1, int p2) { setDocument(document); } @@ -67,6 +68,7 @@ public class TestTextViewer implements ISourceViewer, IDocumentListener { /** * @see ITextViewer#getDocument() */ + @Override public IDocument getDocument() { return fDocument; } @@ -74,6 +76,7 @@ public class TestTextViewer implements ISourceViewer, IDocumentListener { /** * @see ITextViewer#setDocument(IDocument) */ + @Override public void setDocument(IDocument document) { IDocument oldDoc= fDocument; fireTextInputChanged(oldDoc, document, true); @@ -94,6 +97,7 @@ public class TestTextViewer implements ISourceViewer, IDocumentListener { /** * @see ITextViewer#removeTextInputListener(ITextInputListener) */ + @Override public void removeTextInputListener(ITextInputListener listener) { fInputListeners.remove(listener); } @@ -101,6 +105,7 @@ public class TestTextViewer implements ISourceViewer, IDocumentListener { /** * @see ITextViewer#addTextInputListener(ITextInputListener) */ + @Override public void addTextInputListener(ITextInputListener listener) { if (!fInputListeners.contains(listener)) fInputListeners.add(listener); @@ -120,6 +125,7 @@ public class TestTextViewer implements ISourceViewer, IDocumentListener { /** * @see ITextViewer#changeTextPresentation(TextPresentation, boolean) */ + @Override public void changeTextPresentation(TextPresentation presentation, boolean p1) { fTextPresentation= presentation; } @@ -127,6 +133,7 @@ public class TestTextViewer implements ISourceViewer, IDocumentListener { /** * @see ITextViewer#invalidateTextPresentation() */ + @Override public void invalidateTextPresentation() { } @@ -134,6 +141,7 @@ public class TestTextViewer implements ISourceViewer, IDocumentListener { return fTextPresentation; } + @Override public void documentAboutToBeChanged(DocumentEvent event) { try { fDeletion= fDocument.get(event.getOffset(), event.getLength()); @@ -141,6 +149,7 @@ public class TestTextViewer implements ISourceViewer, IDocumentListener { } } + @Override public void documentChanged(DocumentEvent event) { fireTextChanged(new TestTextEvent(event, fDeletion)); } @@ -148,6 +157,7 @@ public class TestTextViewer implements ISourceViewer, IDocumentListener { /** * @see ITextViewer#getFindReplaceTarget() */ + @Override public IFindReplaceTarget getFindReplaceTarget() { return null; } @@ -155,6 +165,7 @@ public class TestTextViewer implements ISourceViewer, IDocumentListener { /** * @see ITextViewer#getTextOperationTarget() */ + @Override public ITextOperationTarget getTextOperationTarget() { return null; } @@ -162,18 +173,21 @@ public class TestTextViewer implements ISourceViewer, IDocumentListener { /** * @see ITextViewer#setTextColor(Color, int, int, boolean) */ + @Override public void setTextColor(Color p0, int p1, int p2, boolean p3) { } /** * @see ITextViewer#setTextColor(Color) */ + @Override public void setTextColor(Color p0) { } /** * @see ITextViewer#overlapsWithVisibleRegion(int, int) */ + @Override public boolean overlapsWithVisibleRegion(int p0, int p1) { return false; } @@ -181,6 +195,7 @@ public class TestTextViewer implements ISourceViewer, IDocumentListener { /** * @see ITextViewer#getVisibleRegion() */ + @Override public IRegion getVisibleRegion() { return null; } @@ -188,70 +203,82 @@ public class TestTextViewer implements ISourceViewer, IDocumentListener { /** * @see ITextViewer#resetVisibleRegion() */ + @Override public void resetVisibleRegion() { } /** * @see ITextViewer#setVisibleRegion(int, int) */ + @Override public void setVisibleRegion(int p0, int p1) { } /** * @see ITextViewer#setIndentPrefixes(String[], String) */ + @Override public void setIndentPrefixes(String[] p0, String p1) { } /** * @see ITextViewer#setDefaultPrefixes(String[], String) */ + @Override public void setDefaultPrefixes(String[] p0, String p1) { } /** * @see ITextViewer#setAutoIndentStrategy(IAutoIndentStrategy, String) */ + @Override public void setAutoIndentStrategy(IAutoIndentStrategy p0, String p1) { } /** * @see ITextViewer#setTextDoubleClickStrategy(ITextDoubleClickStrategy, String) */ + @Override public void setTextDoubleClickStrategy(ITextDoubleClickStrategy p0, String p1) { } /** * @see ITextViewer#setUndoManager(IUndoManager) */ + @Override public void setUndoManager(IUndoManager p0) { } /** * @see ITextViewer#getTextWidget() */ + @Override public StyledText getTextWidget() { return null; } + @Override public void setTextHover(ITextHover p0, String p1) { } /** * @see ITextViewer#activatePlugins() */ + @Override public void activatePlugins() { } /** * @see ITextViewer#resetPlugins() */ + @Override public void resetPlugins() { } /** * @see ITextViewer#getTopInset() */ + @Override public int getTopInset() { return 0; } @@ -259,6 +286,7 @@ public class TestTextViewer implements ISourceViewer, IDocumentListener { /** * @see ITextViewer#getBottomIndexEndOffset() */ + @Override public int getBottomIndexEndOffset() { return 0; } @@ -266,6 +294,7 @@ public class TestTextViewer implements ISourceViewer, IDocumentListener { /** * @see ITextViewer#getBottomIndex() */ + @Override public int getBottomIndex() { return 0; } @@ -273,6 +302,7 @@ public class TestTextViewer implements ISourceViewer, IDocumentListener { /** * @see ITextViewer#getTopIndexStartOffset() */ + @Override public int getTopIndexStartOffset() { return 0; } @@ -280,6 +310,7 @@ public class TestTextViewer implements ISourceViewer, IDocumentListener { /** * @see ITextViewer#getTopIndex() */ + @Override public int getTopIndex() { return 0; } @@ -287,18 +318,21 @@ public class TestTextViewer implements ISourceViewer, IDocumentListener { /** * @see ITextViewer#setTopIndex(int) */ + @Override public void setTopIndex(int p0) { } /** * @see ITextViewer#revealRange(int, int) */ + @Override public void revealRange(int p0, int p1) { } /** * @see ITextViewer#getSelectedRange() */ + @Override public Point getSelectedRange() { return fSelection; } @@ -306,6 +340,7 @@ public class TestTextViewer implements ISourceViewer, IDocumentListener { /** * @see ITextViewer#setSelectedRange(int, int) */ + @Override public void setSelectedRange(int offset, int length) { fSelection.x= offset; fSelection.y= length; @@ -314,6 +349,7 @@ public class TestTextViewer implements ISourceViewer, IDocumentListener { /** * @see ITextViewer#isEditable() */ + @Override public boolean isEditable() { return true; } @@ -321,18 +357,21 @@ public class TestTextViewer implements ISourceViewer, IDocumentListener { /** * @see ITextViewer#setEditable(boolean) */ + @Override public void setEditable(boolean p0) { } /** * @see ITextViewer#setEventConsumer(IEventConsumer) */ + @Override public void setEventConsumer(IEventConsumer p0) { } /** * @see ITextViewer#removeTextListener(ITextListener) */ + @Override public void removeTextListener(ITextListener listener) { fTextListeners.remove(listener); } @@ -348,6 +387,7 @@ public class TestTextViewer implements ISourceViewer, IDocumentListener { /** * @see ITextViewer#addTextListener(ITextListener) */ + @Override public void addTextListener(ITextListener listener) { if (!fTextListeners.contains(listener)) fTextListeners.add(listener); @@ -356,18 +396,21 @@ public class TestTextViewer implements ISourceViewer, IDocumentListener { /** * @see ITextViewer#removeViewportListener(IViewportListener) */ + @Override public void removeViewportListener(IViewportListener p0) { } /** * @see ITextViewer#addViewportListener(IViewportListener) */ + @Override public void addViewportListener(IViewportListener p0) { } /** * @see ISourceViewer#getSelectionProvider() */ + @Override public ISelectionProvider getSelectionProvider() { return null; } @@ -375,18 +418,21 @@ public class TestTextViewer implements ISourceViewer, IDocumentListener { /** * @see ISourceViewer#showAnnotations(boolean) */ + @Override public void showAnnotations(boolean p0) { } /** * @see ISourceViewer#removeRangeIndication() */ + @Override public void removeRangeIndication() { } /** * @see ISourceViewer#getRangeIndication() */ + @Override public IRegion getRangeIndication() { return null; } @@ -394,18 +440,21 @@ public class TestTextViewer implements ISourceViewer, IDocumentListener { /** * @see ISourceViewer#setRangeIndication(int, int, boolean) */ + @Override public void setRangeIndication(int p0, int p1, boolean p2) { } /** * @see ISourceViewer#setRangeIndicator(Annotation) */ + @Override public void setRangeIndicator(Annotation p0) { } /** * @see ISourceViewer#getAnnotationModel() */ + @Override public IAnnotationModel getAnnotationModel() { return null; } @@ -413,24 +462,28 @@ public class TestTextViewer implements ISourceViewer, IDocumentListener { /** * @see ISourceViewer#setDocument(IDocument, IAnnotationModel, int, int) */ + @Override public void setDocument(IDocument p0, IAnnotationModel p1, int p2, int p3) { } /** * @see ISourceViewer#setDocument(IDocument, IAnnotationModel) */ + @Override public void setDocument(IDocument p0, IAnnotationModel p1) { } /** * @see ISourceViewer#setAnnotationHover(IAnnotationHover) */ + @Override public void setAnnotationHover(IAnnotationHover p0) { } /** * @see ISourceViewer#configure(SourceViewerConfiguration) */ + @Override public void configure(SourceViewerConfiguration p0) { } } diff --git a/org.eclipse.jface.text.tests/src/org/eclipse/jface/text/tests/TextHoverPopupTest.java b/org.eclipse.jface.text.tests/src/org/eclipse/jface/text/tests/TextHoverPopupTest.java index 271067be89d..bd791bd0dcd 100644 --- a/org.eclipse.jface.text.tests/src/org/eclipse/jface/text/tests/TextHoverPopupTest.java +++ b/org.eclipse.jface.text.tests/src/org/eclipse/jface/text/tests/TextHoverPopupTest.java @@ -22,6 +22,7 @@ public class TextHoverPopupTest extends TestCase { super(name); } + @Override protected void setUp() { } @@ -29,6 +30,7 @@ public class TextHoverPopupTest extends TestCase { return new TestSuite(TextHoverPopupTest.class); } + @Override protected void tearDown() { } diff --git a/org.eclipse.jface.text.tests/src/org/eclipse/jface/text/tests/TextPresentationTest.java b/org.eclipse.jface.text.tests/src/org/eclipse/jface/text/tests/TextPresentationTest.java index 689e8dc81e3..665b53abc7d 100644 --- a/org.eclipse.jface.text.tests/src/org/eclipse/jface/text/tests/TextPresentationTest.java +++ b/org.eclipse.jface.text.tests/src/org/eclipse/jface/text/tests/TextPresentationTest.java @@ -38,6 +38,7 @@ public class TextPresentationTest extends TestCase { return new TestSuite(TextPresentationTest.class); } + @Override protected void setUp() { setUpStyleRanges(); setUpTextPresentation(); diff --git a/org.eclipse.jface.text.tests/src/org/eclipse/jface/text/tests/TextViewerUndoManagerTest.java b/org.eclipse.jface.text.tests/src/org/eclipse/jface/text/tests/TextViewerUndoManagerTest.java index 11a32cd300f..48ad3498ffa 100644 --- a/org.eclipse.jface.text.tests/src/org/eclipse/jface/text/tests/TextViewerUndoManagerTest.java +++ b/org.eclipse.jface.text.tests/src/org/eclipse/jface/text/tests/TextViewerUndoManagerTest.java @@ -50,10 +50,7 @@ public class TextViewerUndoManagerTest extends AbstractUndoManagerTest { super(name); } - /* - * @see org.eclipse.jface.text.tests.AbstractUndoManagerTest#createUndoManager(int) - * @since 3.2 - */ + @Override protected IUndoManager createUndoManager(int maxUndoLevel) { return new TextViewerUndoManager(maxUndoLevel); } @@ -66,15 +63,19 @@ public class TextViewerUndoManagerTest extends AbstractUndoManagerTest { tempUndoManager.connect(context); IUndoableOperation operation= new AbstractOperation("") { + @Override public boolean canUndo() { return isUndoable; } + @Override public IStatus execute(IProgressMonitor monitor, IAdaptable info) throws ExecutionException { return Status.OK_STATUS; } + @Override public IStatus redo(IProgressMonitor monitor, IAdaptable info) throws ExecutionException { return Status.OK_STATUS; } + @Override public IStatus undo(IProgressMonitor monitor, IAdaptable info) throws ExecutionException { return Status.OK_STATUS; } @@ -89,6 +90,7 @@ public class TextViewerUndoManagerTest extends AbstractUndoManagerTest { undoManager.connect(newContext); undoManager.addDocumentUndoListener(new IDocumentUndoListener() { + @Override public void documentUndoNotification(DocumentUndoEvent event) { fail(); } @@ -120,6 +122,7 @@ public class TextViewerUndoManagerTest extends AbstractUndoManagerTest { undoManager.addDocumentUndoListener(new IDocumentUndoListener() { + @Override public void documentUndoNotification(DocumentUndoEvent event) { if (event.getEventType() == DocumentUndoEvent.ABOUT_TO_UNDO) assertEquals(true, undoManager.undoable()); diff --git a/org.eclipse.jface.text.tests/src/org/eclipse/jface/text/tests/reconciler/AbstractReconcilerTest.java b/org.eclipse.jface.text.tests/src/org/eclipse/jface/text/tests/reconciler/AbstractReconcilerTest.java index 698f5589d69..ee4fddf83bf 100644 --- a/org.eclipse.jface.text.tests/src/org/eclipse/jface/text/tests/reconciler/AbstractReconcilerTest.java +++ b/org.eclipse.jface.text.tests/src/org/eclipse/jface/text/tests/reconciler/AbstractReconcilerTest.java @@ -135,27 +135,34 @@ public class AbstractReconcilerTest extends TestCase { private IProgressMonitor fProgressMonitor; + @Override protected void setUp() { fBarrier= new Barrier(); fCallLog= Collections.synchronizedList(new ArrayList()); fReconciler= new AbstractReconciler() { + @Override protected void initialProcess() { fCallLog.add("initialProcess"); fBarrier.await(); } + @Override protected void process(DirtyRegion dirtyRegion) { fCallLog.add("process"); fBarrier.await(); } + @Override protected void reconcilerDocumentChanged(IDocument newDocument) { fCallLog.add("reconcilerDocumentChanged"); } + @Override protected void aboutToBeReconciled() { fCallLog.add("aboutToBeReconciled"); } + @Override protected void reconcilerReset() { fCallLog.add("reconcilerReset"); } + @Override public IReconcilingStrategy getReconcilingStrategy(String contentType) { return null; } @@ -175,6 +182,7 @@ public class AbstractReconcilerTest extends TestCase { } + @Override protected void tearDown() throws Exception { fBarrier.shutdown(); fReconciler.uninstall(); diff --git a/org.eclipse.jface.text.tests/src/org/eclipse/jface/text/tests/rules/DefaultPartitionerTest.java b/org.eclipse.jface.text.tests/src/org/eclipse/jface/text/tests/rules/DefaultPartitionerTest.java index e54ad3e86ef..bfa5ad90c2f 100644 --- a/org.eclipse.jface.text.tests/src/org/eclipse/jface/text/tests/rules/DefaultPartitionerTest.java +++ b/org.eclipse.jface.text.tests/src/org/eclipse/jface/text/tests/rules/DefaultPartitionerTest.java @@ -15,13 +15,12 @@ import org.eclipse.jface.text.rules.DefaultPartitioner; import org.eclipse.jface.text.rules.IPartitionTokenScanner; public class DefaultPartitionerTest extends FastPartitionerTest { + @Override protected IDocumentPartitioner createPartitioner(IPartitionTokenScanner scanner) { return new DefaultPartitioner(scanner, new String[] { DEFAULT, COMMENT }); } - /* - * @see org.eclipse.jface.text.tests.rules.FastPartitionerTest#testPR130900() - */ + @Override public void testPR130900() throws Exception { System.out.println("Bug130900 not fixed in DefaultPartitioner"); } diff --git a/org.eclipse.jface.text.tests/src/org/eclipse/jface/text/tests/rules/DefaultPartitionerZeroLengthTest.java b/org.eclipse.jface.text.tests/src/org/eclipse/jface/text/tests/rules/DefaultPartitionerZeroLengthTest.java index bb7020539fd..965a3ebb603 100644 --- a/org.eclipse.jface.text.tests/src/org/eclipse/jface/text/tests/rules/DefaultPartitionerZeroLengthTest.java +++ b/org.eclipse.jface.text.tests/src/org/eclipse/jface/text/tests/rules/DefaultPartitionerZeroLengthTest.java @@ -36,6 +36,7 @@ public class DefaultPartitionerZeroLengthTest extends TestCase { private IDocument fDoc; private FastPartitioner fPartitioner; + @Override public void setUp() { fDoc= new Document(); IPartitionTokenScanner scanner= new RuleBasedPartitionScanner() { diff --git a/org.eclipse.jface.text.tests/src/org/eclipse/jface/text/tests/rules/FastPartitionerTest.java b/org.eclipse.jface.text.tests/src/org/eclipse/jface/text/tests/rules/FastPartitionerTest.java index e0eca1be465..df25fb9fd4b 100644 --- a/org.eclipse.jface.text.tests/src/org/eclipse/jface/text/tests/rules/FastPartitionerTest.java +++ b/org.eclipse.jface.text.tests/src/org/eclipse/jface/text/tests/rules/FastPartitionerTest.java @@ -38,6 +38,7 @@ public class FastPartitionerTest extends TestCase { private IDocument fDoc; private IDocumentPartitioner fPartitioner; + @Override public void setUp() { fDoc= new Document(); IPartitionTokenScanner scanner= new RuleBasedPartitionScanner() { diff --git a/org.eclipse.jface.text.tests/src/org/eclipse/jface/text/tests/rules/ScannerColumnTest.java b/org.eclipse.jface.text.tests/src/org/eclipse/jface/text/tests/rules/ScannerColumnTest.java index 1b0c8b67029..e2a31ce7e96 100644 --- a/org.eclipse.jface.text.tests/src/org/eclipse/jface/text/tests/rules/ScannerColumnTest.java +++ b/org.eclipse.jface.text.tests/src/org/eclipse/jface/text/tests/rules/ScannerColumnTest.java @@ -25,10 +25,12 @@ public class ScannerColumnTest extends TestCase { private IDocument fDocument; + @Override protected void setUp() throws Exception { fDocument= new Document("scanner test"); } + @Override protected void tearDown() throws Exception { fDocument= null; } diff --git a/org.eclipse.jface.text.tests/src/org/eclipse/jface/text/tests/rules/WordRuleTest.java b/org.eclipse.jface.text.tests/src/org/eclipse/jface/text/tests/rules/WordRuleTest.java index c5f4cb7a03e..2a0354229d2 100644 --- a/org.eclipse.jface.text.tests/src/org/eclipse/jface/text/tests/rules/WordRuleTest.java +++ b/org.eclipse.jface.text.tests/src/org/eclipse/jface/text/tests/rules/WordRuleTest.java @@ -32,10 +32,12 @@ public class WordRuleTest extends TestCase { private static class SimpleWordDetector implements IWordDetector { + @Override public boolean isWordStart(char c) { return !Character.isWhitespace(c); } + @Override public boolean isWordPart(char c) { return !Character.isWhitespace(c); } @@ -48,10 +50,12 @@ public class WordRuleTest extends TestCase { public void testBug163116() throws Exception { IWordDetector detector= new IWordDetector() { + @Override public boolean isWordPart(char c) { return true; } + @Override public boolean isWordStart(char c) { return true; } diff --git a/org.eclipse.jface.text/projection/org/eclipse/jface/text/source/projection/ProjectionAnnotation.java b/org.eclipse.jface.text/projection/org/eclipse/jface/text/source/projection/ProjectionAnnotation.java index fb4cec2de5f..2ffc33fddb4 100644 --- a/org.eclipse.jface.text/projection/org/eclipse/jface/text/source/projection/ProjectionAnnotation.java +++ b/org.eclipse.jface.text/projection/org/eclipse/jface/text/source/projection/ProjectionAnnotation.java @@ -41,6 +41,7 @@ public class ProjectionAnnotation extends Annotation implements IAnnotationPrese private static class DisplayDisposeRunnable implements Runnable { + @Override public void run() { if (fgCollapsedImage != null) { fgCollapsedImage.dispose(); @@ -109,9 +110,7 @@ public class ProjectionAnnotation extends Annotation implements IAnnotationPrese gc.drawLine(r.x + 4, height, r.x + r.width - MARGIN, height); } - /* - * @see org.eclipse.jface.text.source.IAnnotationPresentation#paint(org.eclipse.swt.graphics.GC, org.eclipse.swt.widgets.Canvas, org.eclipse.swt.graphics.Rectangle) - */ + @Override public void paint(GC gc, Canvas canvas, Rectangle rectangle) { Image image= getImage(canvas.getDisplay()); if (image != null) { @@ -126,9 +125,7 @@ public class ProjectionAnnotation extends Annotation implements IAnnotationPrese } } - /* - * @see org.eclipse.jface.text.source.IAnnotationPresentation#getLayer() - */ + @Override public int getLayer() { return IAnnotationPresentation.DEFAULT_LAYER; } diff --git a/org.eclipse.jface.text/projection/org/eclipse/jface/text/source/projection/ProjectionAnnotationHover.java b/org.eclipse.jface.text/projection/org/eclipse/jface/text/source/projection/ProjectionAnnotationHover.java index a65d06a9c40..2374073e703 100644 --- a/org.eclipse.jface.text/projection/org/eclipse/jface/text/source/projection/ProjectionAnnotationHover.java +++ b/org.eclipse.jface.text/projection/org/eclipse/jface/text/source/projection/ProjectionAnnotationHover.java @@ -62,9 +62,7 @@ class ProjectionAnnotationHover implements IAnnotationHover, IAnnotationHoverExt fInformationPresenterControlCreator= creator; } - /* - * @see org.eclipse.jface.text.source.IAnnotationHover#getHoverInfo(org.eclipse.jface.text.source.ISourceViewer, int) - */ + @Override public String getHoverInfo(ISourceViewer sourceViewer, int lineNumber) { // this is a no-op as semantics is defined by the implementation of the annotation hover extension return null; @@ -138,33 +136,26 @@ class ProjectionAnnotationHover implements IAnnotationHover, IAnnotationHoverExt return document.get(offset, endOffset - offset); } - /* - * @see org.eclipse.jface.text.source.IAnnotationHoverExtension#getHoverInfo(org.eclipse.jface.text.source.ISourceViewer, org.eclipse.jface.text.source.ILineRange, int) - */ + @Override public Object getHoverInfo(ISourceViewer sourceViewer, ILineRange lineRange, int visibleLines) { return getProjectionTextAtLine(sourceViewer, lineRange.getStartLine(), visibleLines); } - /* - * @see org.eclipse.jface.text.source.IAnnotationHoverExtension#getHoverLineRange(org.eclipse.jface.text.source.ISourceViewer, int) - */ + @Override public ILineRange getHoverLineRange(ISourceViewer viewer, int lineNumber) { return new LineRange(lineNumber, 1); } - /* - * @see org.eclipse.jface.text.source.IAnnotationHoverExtension#canHandleMouseCursor() - */ + @Override public boolean canHandleMouseCursor() { return false; } - /* - * @see org.eclipse.jface.text.source.IAnnotationHoverExtension#getHoverControlCreator() - */ + @Override public IInformationControlCreator getHoverControlCreator() { if (fInformationControlCreator == null) { fInformationControlCreator= new IInformationControlCreator() { + @Override public IInformationControl createInformationControl(Shell parent) { return new SourceViewerInformationControl(parent, false, JFaceResources.TEXT_FONT, null); } @@ -173,13 +164,11 @@ class ProjectionAnnotationHover implements IAnnotationHover, IAnnotationHoverExt return fInformationControlCreator; } - /* - * @see org.eclipse.jface.text.information.IInformationProviderExtension2#getInformationPresenterControlCreator() - * @since 3.3 - */ + @Override public IInformationControlCreator getInformationPresenterControlCreator() { if (fInformationPresenterControlCreator == null) { fInformationPresenterControlCreator= new IInformationControlCreator() { + @Override public IInformationControl createInformationControl(Shell parent) { return new SourceViewerInformationControl(parent, true, JFaceResources.TEXT_FONT, null); } diff --git a/org.eclipse.jface.text/projection/org/eclipse/jface/text/source/projection/ProjectionRulerColumn.java b/org.eclipse.jface.text/projection/org/eclipse/jface/text/source/projection/ProjectionRulerColumn.java index d268731f230..d7c156a226b 100644 --- a/org.eclipse.jface.text/projection/org/eclipse/jface/text/source/projection/ProjectionRulerColumn.java +++ b/org.eclipse.jface.text/projection/org/eclipse/jface/text/source/projection/ProjectionRulerColumn.java @@ -66,9 +66,7 @@ class ProjectionRulerColumn extends AnnotationRulerColumn { super(width, annotationAccess); } - /* - * @see org.eclipse.jface.text.source.AnnotationRulerColumn#mouseClicked(int) - */ + @Override protected void mouseClicked(int line) { clearCurrentAnnotation(); if (fMouseDownLine != line) @@ -80,18 +78,12 @@ class ProjectionRulerColumn extends AnnotationRulerColumn { } } - /* - * @see org.eclipse.jface.text.source.AnnotationRulerColumn#mouseDown(int) - * @since 3.5 - */ + @Override protected void mouseDown(int rulerLine) { fMouseDownLine= rulerLine; } - /* - * @see org.eclipse.jface.text.source.AnnotationRulerColumn#mouseDoubleClicked(int) - * @since 3.5 - */ + @Override protected void mouseDoubleClicked(int rulerLine) { if (findAnnotation(rulerLine, true) != null) return; @@ -193,9 +185,7 @@ class ProjectionRulerColumn extends AnnotationRulerColumn { return false; } - /* - * @see org.eclipse.jface.text.source.IVerticalRulerColumn#createControl(org.eclipse.jface.text.source.CompositeRuler, org.eclipse.swt.widgets.Composite) - */ + @Override public Control createControl(CompositeRuler parentRuler, Composite parentControl) { Control control= super.createControl(parentRuler, parentControl); @@ -205,6 +195,7 @@ class ProjectionRulerColumn extends AnnotationRulerColumn { // install hover listener control.addMouseTrackListener(new MouseTrackAdapter() { + @Override public void mouseExit(MouseEvent e) { if (clearCurrentAnnotation()) redraw(); @@ -213,6 +204,7 @@ class ProjectionRulerColumn extends AnnotationRulerColumn { // install mouse move listener control.addMouseMoveListener(new MouseMoveListener() { + @Override public void mouseMove(MouseEvent e) { boolean redraw= false; ProjectionAnnotation annotation= findAnnotation(toDocumentLineNumber(e.y), false); @@ -234,9 +226,7 @@ class ProjectionRulerColumn extends AnnotationRulerColumn { return control; } - /* - * @see org.eclipse.jface.text.source.AnnotationRulerColumn#setModel(org.eclipse.jface.text.source.IAnnotationModel) - */ + @Override public void setModel(IAnnotationModel model) { if (model instanceof IAnnotationModelExtension) { IAnnotationModelExtension extension= (IAnnotationModelExtension) model; @@ -245,16 +235,12 @@ class ProjectionRulerColumn extends AnnotationRulerColumn { super.setModel(model); } - /* - * @see org.eclipse.jface.text.source.AnnotationRulerColumn#isPropagatingMouseListener() - */ + @Override protected boolean isPropagatingMouseListener() { return false; } - /* - * @see org.eclipse.jface.text.source.AnnotationRulerColumn#hasAnnotation(int) - */ + @Override protected boolean hasAnnotation(int lineNumber) { return findAnnotation(lineNumber, true) != null; } diff --git a/org.eclipse.jface.text/projection/org/eclipse/jface/text/source/projection/ProjectionSummary.java b/org.eclipse.jface.text/projection/org/eclipse/jface/text/source/projection/ProjectionSummary.java index eccbeb46902..1475139012d 100644 --- a/org.eclipse.jface.text/projection/org/eclipse/jface/text/source/projection/ProjectionSummary.java +++ b/org.eclipse.jface.text/projection/org/eclipse/jface/text/source/projection/ProjectionSummary.java @@ -58,9 +58,7 @@ class ProjectionSummary { } } - /* - * @see java.lang.Thread#run() - */ + @Override public void run() { while (true) { synchronized (fLock) { diff --git a/org.eclipse.jface.text/projection/org/eclipse/jface/text/source/projection/ProjectionSupport.java b/org.eclipse.jface.text/projection/org/eclipse/jface/text/source/projection/ProjectionSupport.java index 8cb567ba105..e6722f766eb 100644 --- a/org.eclipse.jface.text/projection/org/eclipse/jface/text/source/projection/ProjectionSupport.java +++ b/org.eclipse.jface.text/projection/org/eclipse/jface/text/source/projection/ProjectionSupport.java @@ -60,9 +60,7 @@ public class ProjectionSupport { super(sourceViewer, access); } - /* - * @see org.eclipse.jface.text.source.AnnotationPainter#findAnnotationModel(org.eclipse.jface.text.source.ISourceViewer) - */ + @Override protected IAnnotationModel findAnnotationModel(ISourceViewer sourceViewer) { if (sourceViewer instanceof ProjectionViewer) { ProjectionViewer projectionViewer= (ProjectionViewer) sourceViewer; @@ -71,9 +69,7 @@ public class ProjectionSupport { return null; } - /* - * @see org.eclipse.jface.text.source.AnnotationPainter#skip(org.eclipse.jface.text.source.Annotation) - */ + @Override protected boolean skip(Annotation annotation) { if (annotation instanceof ProjectionAnnotation) return !((ProjectionAnnotation) annotation).isCollapsed(); @@ -83,9 +79,7 @@ public class ProjectionSupport { } private static class ProjectionDrawingStrategy implements AnnotationPainter.IDrawingStrategy { - /* - * @see org.eclipse.jface.text.source.AnnotationPainter.IDrawingStrategy#draw(org.eclipse.swt.graphics.GC, org.eclipse.swt.custom.StyledText, int, int, org.eclipse.swt.graphics.Color) - */ + @Override public void draw(Annotation annotation, GC gc, StyledText textWidget, int offset, int length, Color color) { if (annotation instanceof ProjectionAnnotation) { ProjectionAnnotation projectionAnnotation= (ProjectionAnnotation) annotation; @@ -136,16 +130,12 @@ public class ProjectionSupport { private class ProjectionListener implements IProjectionListener { - /* - * @see org.eclipse.jface.text.source.projection.IProjectionListener#projectionEnabled() - */ + @Override public void projectionEnabled() { doEnableProjection(); } - /* - * @see org.eclipse.jface.text.source.projection.IProjectionListener#projectionDisabled() - */ + @Override public void projectionDisabled() { doDisableProjection(); } diff --git a/org.eclipse.jface.text/projection/org/eclipse/jface/text/source/projection/ProjectionViewer.java b/org.eclipse.jface.text/projection/org/eclipse/jface/text/source/projection/ProjectionViewer.java index 7e3d27ef0f5..123b8bb8d28 100644 --- a/org.eclipse.jface.text/projection/org/eclipse/jface/text/source/projection/ProjectionViewer.java +++ b/org.eclipse.jface.text/projection/org/eclipse/jface/text/source/projection/ProjectionViewer.java @@ -101,16 +101,12 @@ public class ProjectionViewer extends SourceViewer implements ITextViewerExtensi */ private class AnnotationModelListener implements IAnnotationModelListener, IAnnotationModelListenerExtension { - /* - * @see org.eclipse.jface.text.source.IAnnotationModelListener#modelChanged(org.eclipse.jface.text.source.IAnnotationModel) - */ + @Override public void modelChanged(IAnnotationModel model) { processModelChanged(model, null); } - /* - * @see org.eclipse.jface.text.source.IAnnotationModelListenerExtension#modelChanged(org.eclipse.jface.text.source.AnnotationModelEvent) - */ + @Override public void modelChanged(AnnotationModelEvent event) { processModelChanged(event.getAnnotationModel(), event); } @@ -156,15 +152,11 @@ public class ProjectionViewer extends SourceViewer implements ITextViewerExtensi } } - /* - * @see org.eclipse.jface.text.IDocumentListener#documentAboutToBeChanged(org.eclipse.jface.text.DocumentEvent) - */ + @Override public void documentAboutToBeChanged(DocumentEvent event) { } - /* - * @see org.eclipse.jface.text.IDocumentListener#documentChanged(org.eclipse.jface.text.DocumentEvent) - */ + @Override public void documentChanged(DocumentEvent event) { fExecutionTrigger.removeDocumentListener(this); executeReplaceVisibleDocument(fSlaveDocument); @@ -357,9 +349,7 @@ public class ProjectionViewer extends SourceViewer implements ITextViewerExtensi return null; } - /* - * @see org.eclipse.jface.text.source.SourceViewer#setDocument(org.eclipse.jface.text.IDocument, org.eclipse.jface.text.source.IAnnotationModel, int, int) - */ + @Override public void setDocument(IDocument document, IAnnotationModel annotationModel, int modelRangeOffset, int modelRangeLength) { boolean wasProjectionEnabled= false; @@ -380,9 +370,7 @@ public class ProjectionViewer extends SourceViewer implements ITextViewerExtensi } - /* - * @see org.eclipse.jface.text.source.SourceViewer#createVisualAnnotationModel(org.eclipse.jface.text.source.IAnnotationModel) - */ + @Override protected IAnnotationModel createVisualAnnotationModel(IAnnotationModel annotationModel) { IAnnotationModel model= super.createVisualAnnotationModel(annotationModel); fProjectionAnnotationModel= new ProjectionAnnotationModel(); @@ -403,16 +391,12 @@ public class ProjectionViewer extends SourceViewer implements ITextViewerExtensi return null; } - /* - * @see org.eclipse.jface.text.TextViewer#createSlaveDocumentManager() - */ + @Override protected ISlaveDocumentManager createSlaveDocumentManager() { return new ProjectionDocumentManager(); } - /* - * @see org.eclipse.jface.text.TextViewer#updateSlaveDocument(org.eclipse.jface.text.IDocument, int, int) - */ + @Override protected boolean updateSlaveDocument(IDocument slaveDocument, int modelRangeOffset, int modelRangeLength) throws BadLocationException { if (slaveDocument instanceof ProjectionDocument) { ProjectionDocument projection= (ProjectionDocument) slaveDocument; @@ -694,18 +678,14 @@ public class ProjectionViewer extends SourceViewer implements ITextViewerExtensi return document.getLineInformationOfOffset(offset).getOffset(); } - /* - * @see org.eclipse.jface.text.TextViewer#setVisibleRegion(int, int) - */ + @Override public void setVisibleRegion(int start, int length) { fWasProjectionEnabled= isProjectionMode(); disableProjection(); super.setVisibleRegion(start, length); } - /* - * @see org.eclipse.jface.text.TextViewer#setVisibleDocument(org.eclipse.jface.text.IDocument) - */ + @Override protected void setVisibleDocument(IDocument document) { if (!isProjectionMode()) { super.setVisibleDocument(document); @@ -718,18 +698,14 @@ public class ProjectionViewer extends SourceViewer implements ITextViewerExtensi fFindReplaceDocumentAdapter= adapter; } - /* - * @see org.eclipse.jface.text.TextViewer#resetVisibleRegion() - */ + @Override public void resetVisibleRegion() { super.resetVisibleRegion(); if (fWasProjectionEnabled) enableProjection(); } - /* - * @see org.eclipse.jface.text.ITextViewer#getVisibleRegion() - */ + @Override public IRegion getVisibleRegion() { disableProjection(); IRegion visibleRegion= getModelCoverage(); @@ -739,9 +715,7 @@ public class ProjectionViewer extends SourceViewer implements ITextViewerExtensi return visibleRegion; } - /* - * @see org.eclipse.jface.text.ITextViewer#overlapsWithVisibleRegion(int,int) - */ + @Override public boolean overlapsWithVisibleRegion(int offset, int length) { disableProjection(); IRegion coverage= getModelCoverage(); @@ -901,6 +875,7 @@ public class ProjectionViewer extends SourceViewer implements ITextViewerExtensi Display display= widget.getDisplay(); if (display != null) { display.asyncExec(new Runnable() { + @Override public void run() { try { while (true) { @@ -1239,9 +1214,7 @@ public class ProjectionViewer extends SourceViewer implements ITextViewerExtensi replaceVisibleDocument(projection); } - /* - * @see org.eclipse.jface.text.TextViewer#handleVerifyEvent(org.eclipse.swt.events.VerifyEvent) - */ + @Override protected void handleVerifyEvent(VerifyEvent e) { if (getTextWidget().getBlockSelection()) { ITextSelection selection= (ITextSelection) getSelection(); @@ -1270,9 +1243,7 @@ public class ProjectionViewer extends SourceViewer implements ITextViewerExtensi super.handleVerifyEvent(e); } - /* - * @see org.eclipse.jface.text.ITextViewerExtension5#exposeModelRange(org.eclipse.jface.text.IRegion) - */ + @Override public boolean exposeModelRange(IRegion modelRange) { if (isProjectionMode()) return fProjectionAnnotationModel.expandAll(modelRange.getOffset(), modelRange.getLength()); @@ -1285,9 +1256,7 @@ public class ProjectionViewer extends SourceViewer implements ITextViewerExtensi return false; } - /* - * @see org.eclipse.jface.text.source.SourceViewer#setRangeIndication(int, int, boolean) - */ + @Override public void setRangeIndication(int offset, int length, boolean moveCursor) { IRegion rangeIndication= getRangeIndication(); if (moveCursor && fProjectionAnnotationModel != null && (rangeIndication == null || offset != rangeIndication.getOffset() || length != rangeIndication.getLength())) { @@ -1321,10 +1290,7 @@ public class ProjectionViewer extends SourceViewer implements ITextViewerExtensi return false; } - /* - * @see org.eclipse.jface.text.source.SourceViewer#handleDispose() - * @since 3.0 - */ + @Override protected void handleDispose() { fWasProjectionEnabled= false; super.handleDispose(); @@ -1333,6 +1299,7 @@ public class ProjectionViewer extends SourceViewer implements ITextViewerExtensi /* * @see org.eclipse.jface.text.TextViewer#handleVisibleDocumentAboutToBeChanged(org.eclipse.jface.text.DocumentEvent) */ + @Override protected void handleVisibleDocumentChanged(DocumentEvent event) { if (fHandleProjectionChanges && event instanceof ProjectionDocumentEvent && isProjectionMode()) { ProjectionDocumentEvent e= (ProjectionDocumentEvent) event; @@ -1363,10 +1330,7 @@ public class ProjectionViewer extends SourceViewer implements ITextViewerExtensi } } - /* - * @see org.eclipse.jface.text.TextViewer#handleVisibleDocumentAboutToBeChanged(org.eclipse.jface.text.DocumentEvent) - * @since 3.1 - */ + @Override protected void handleVisibleDocumentAboutToBeChanged(DocumentEvent event) { if (fHandleProjectionChanges && event instanceof ProjectionDocumentEvent && isProjectionMode()) { int deletedLines; @@ -1379,9 +1343,7 @@ public class ProjectionViewer extends SourceViewer implements ITextViewerExtensi } } - /* - * @see org.eclipse.jface.text.ITextViewerExtension5#getCoveredModelRanges(org.eclipse.jface.text.IRegion) - */ + @Override public IRegion[] getCoveredModelRanges(IRegion modelRange) { if (fInformationMapping == null) return new IRegion[] { new Region(modelRange.getOffset(), modelRange.getLength()) }; @@ -1397,9 +1359,7 @@ public class ProjectionViewer extends SourceViewer implements ITextViewerExtensi return null; } - /* - * @see org.eclipse.jface.text.ITextOperationTarget#doOperation(int) - */ + @Override public void doOperation(int operation) { switch (operation) { case TOGGLE: @@ -1502,9 +1462,7 @@ public class ProjectionViewer extends SourceViewer implements ITextViewerExtensi } } - /* - * @see org.eclipse.jface.text.source.SourceViewer#canDoOperation(int) - */ + @Override public boolean canDoOperation(int operation) { switch (operation) { @@ -1541,9 +1499,7 @@ public class ProjectionViewer extends SourceViewer implements ITextViewerExtensi return start > end ? new Region (end, start - end) : new Region(start, end - start); } - /* - * @see org.eclipse.jface.text.TextViewer#copyMarkedRegion(boolean) - */ + @Override protected void copyMarkedRegion(boolean delete) { IRegion markedRegion= getMarkedRegion(); if (markedRegion != null) @@ -1614,6 +1570,7 @@ public class ProjectionViewer extends SourceViewer implements ITextViewerExtensi * @param widgetSelection the widget selection * @return the model selection while respecting line based folding */ + @Override protected Point widgetSelection2ModelSelection(Point widgetSelection) { if (!isProjectionMode()) @@ -1699,9 +1656,7 @@ public class ProjectionViewer extends SourceViewer implements ITextViewerExtensi return (Position[]) positions.toArray(new Position[positions.size()]); } - /* - * @see org.eclipse.jface.text.TextViewer#getFindReplaceDocumentAdapter() - */ + @Override protected FindReplaceDocumentAdapter getFindReplaceDocumentAdapter() { if (fFindReplaceDocumentAdapter == null) { IDocument document= isProjectionMode() ? getDocument() : getVisibleDocument(); @@ -1710,9 +1665,7 @@ public class ProjectionViewer extends SourceViewer implements ITextViewerExtensi return fFindReplaceDocumentAdapter; } - /* - * @see org.eclipse.jface.text.TextViewer#findAndSelect(int, java.lang.String, boolean, boolean, boolean, boolean) - */ + @Override protected int findAndSelect(int startPosition, String findString, boolean forwardSearch, boolean caseSensitive, boolean wholeWord, boolean regExSearch) { if (!isProjectionMode()) @@ -1738,9 +1691,7 @@ public class ProjectionViewer extends SourceViewer implements ITextViewerExtensi return -1; } - /* - * @see org.eclipse.jface.text.TextViewer#findAndSelectInRange(int, java.lang.String, boolean, boolean, boolean, int, int, boolean) - */ + @Override protected int findAndSelectInRange(int startPosition, String findString, boolean forwardSearch, boolean caseSensitive, boolean wholeWord, int rangeOffset, int rangeLength, boolean regExSearch) { if (!isProjectionMode()) diff --git a/org.eclipse.jface.text/projection/org/eclipse/jface/text/source/projection/SourceViewerInformationControl.java b/org.eclipse.jface.text/projection/org/eclipse/jface/text/source/projection/SourceViewerInformationControl.java index 7970a8217a4..8266ab28236 100644 --- a/org.eclipse.jface.text/projection/org/eclipse/jface/text/source/projection/SourceViewerInformationControl.java +++ b/org.eclipse.jface.text/projection/org/eclipse/jface/text/source/projection/SourceViewerInformationControl.java @@ -140,11 +140,13 @@ class SourceViewerInformationControl implements IInformationControl, IInformatio fText.addKeyListener(new KeyListener() { + @Override public void keyPressed(KeyEvent e) { if (e.character == 0x1B) // ESC fShell.dispose(); } + @Override public void keyReleased(KeyEvent e) {} }); @@ -213,9 +215,7 @@ class SourceViewerInformationControl implements IInformationControl, IInformatio setInformation(null); } - /* - * @see IInformationControl#setInformation(String) - */ + @Override public void setInformation(String content) { if (content == null) { fViewer.setInput(null); @@ -226,16 +226,12 @@ class SourceViewerInformationControl implements IInformationControl, IInformatio fViewer.setInput(doc); } - /* - * @see IInformationControl#setVisible(boolean) - */ + @Override public void setVisible(boolean visible) { fShell.setVisible(visible); } - /* - * @see org.eclipse.swt.events.DisposeListener#widgetDisposed(org.eclipse.swt.events.DisposeEvent) - */ + @Override public void widgetDisposed(DisposeEvent event) { if (fStatusTextFont != null && !fStatusTextFont.isDisposed()) fStatusTextFont.dispose(); @@ -249,9 +245,7 @@ class SourceViewerInformationControl implements IInformationControl, IInformatio fText= null; } - /* - * @see org.eclipse.jface.text.IInformationControl#dispose() - */ + @Override public final void dispose() { if (fShell != null && !fShell.isDisposed()) fShell.dispose(); @@ -259,9 +253,7 @@ class SourceViewerInformationControl implements IInformationControl, IInformatio widgetDisposed(null); } - /* - * @see IInformationControl#setSize(int, int) - */ + @Override public void setSize(int width, int height) { if (fStatusField != null) { @@ -276,24 +268,18 @@ class SourceViewerInformationControl implements IInformationControl, IInformatio fShell.pack(true); } - /* - * @see IInformationControl#setLocation(Point) - */ + @Override public void setLocation(Point location) { fShell.setLocation(location); } - /* - * @see IInformationControl#setSizeConstraints(int, int) - */ + @Override public void setSizeConstraints(int maxWidth, int maxHeight) { fMaxWidth= maxWidth; fMaxHeight= maxHeight; } - /* - * @see IInformationControl#computeSizeHint() - */ + @Override public Point computeSizeHint() { // compute the preferred size int x= SWT.DEFAULT; @@ -311,74 +297,53 @@ class SourceViewerInformationControl implements IInformationControl, IInformatio return size; } - /* - * @see IInformationControl#addDisposeListener(DisposeListener) - */ + @Override public void addDisposeListener(DisposeListener listener) { fShell.addDisposeListener(listener); } - /* - * @see IInformationControl#removeDisposeListener(DisposeListener) - */ + @Override public void removeDisposeListener(DisposeListener listener) { fShell.removeDisposeListener(listener); } - /* - * @see IInformationControl#setForegroundColor(Color) - */ + @Override public void setForegroundColor(Color foreground) { fText.setForeground(foreground); } - /* - * @see IInformationControl#setBackgroundColor(Color) - */ + @Override public void setBackgroundColor(Color background) { fText.setBackground(background); } - /* - * @see IInformationControl#isFocusControl() - */ + @Override public boolean isFocusControl() { return fShell.getDisplay().getActiveShell() == fShell; } - /* - * @see IInformationControl#setFocus() - */ + @Override public void setFocus() { fShell.forceFocus(); fText.setFocus(); } - /* - * @see IInformationControl#addFocusListener(FocusListener) - */ + @Override public void addFocusListener(FocusListener listener) { fText.addFocusListener(listener); } - /* - * @see IInformationControl#removeFocusListener(FocusListener) - */ + @Override public void removeFocusListener(FocusListener listener) { fText.removeFocusListener(listener); } - /* - * @see IInformationControlExtension#hasContents() - */ + @Override public boolean hasContents() { return fText.getCharCount() > 0; } - /* - * @see org.eclipse.jface.text.IInformationControlExtension3#computeTrim() - * @since 3.4 - */ + @Override public Rectangle computeTrim() { Rectangle trim= fShell.computeTrim(0, 0, 0, 0); addInternalTrim(trim); @@ -398,46 +363,32 @@ class SourceViewerInformationControl implements IInformationControl, IInformatio } } - /* - * @see org.eclipse.jface.text.IInformationControlExtension3#getBounds() - * @since 3.4 - */ + @Override public Rectangle getBounds() { return fShell.getBounds(); } - /* - * @see org.eclipse.jface.text.IInformationControlExtension3#restoresLocation() - * @since 3.4 - */ + @Override public boolean restoresLocation() { return false; } - /* - * @see org.eclipse.jface.text.IInformationControlExtension3#restoresSize() - * @since 3.4 - */ + @Override public boolean restoresSize() { return false; } - /* - * @see org.eclipse.jface.text.IInformationControlExtension5#getInformationPresenterControlCreator() - * @since 3.4 - */ + @Override public IInformationControlCreator getInformationPresenterControlCreator() { return new IInformationControlCreator() { + @Override public IInformationControl createInformationControl(Shell parent) { return new SourceViewerInformationControl(parent, true, fSymbolicFontName, null); } }; } - /* - * @see org.eclipse.jface.text.IInformationControlExtension5#containsControl(org.eclipse.swt.widgets.Control) - * @since 3.4 - */ + @Override public boolean containsControl(Control control) { do { if (control == fShell) @@ -449,17 +400,12 @@ class SourceViewerInformationControl implements IInformationControl, IInformatio return false; } - /* - * @see org.eclipse.jface.text.IInformationControlExtension5#isVisible() - * @since 3.4 - */ + @Override public boolean isVisible() { return fShell != null && !fShell.isDisposed() && fShell.isVisible(); } - /* - * @see org.eclipse.jface.text.IInformationControlExtension5#computeSizeConstraints(int, int) - */ + @Override public Point computeSizeConstraints(int widthInChars, int heightInChars) { GC gc= new GC(fText); gc.setFont(fTextFont); diff --git a/org.eclipse.jface.text/src/org/eclipse/jface/contentassist/AbstractControlContentAssistSubjectAdapter.java b/org.eclipse.jface.text/src/org/eclipse/jface/contentassist/AbstractControlContentAssistSubjectAdapter.java index 311e36b6f4f..57b16ebe092 100644 --- a/org.eclipse.jface.text/src/org/eclipse/jface/contentassist/AbstractControlContentAssistSubjectAdapter.java +++ b/org.eclipse.jface.text/src/org/eclipse/jface/contentassist/AbstractControlContentAssistSubjectAdapter.java @@ -50,6 +50,7 @@ import org.eclipse.jface.text.IEventConsumer; * @since 3.0 * @deprecated As of 3.2, replaced by Platform UI's field assist support */ +@Deprecated public abstract class AbstractControlContentAssistSubjectAdapter implements IContentAssistSubjectControl { protected static final boolean DEBUG= "true".equalsIgnoreCase(Platform.getDebugOption("org.eclipse.jface.text/debug/ContentAssistSubjectAdapters")); //$NON-NLS-1$//$NON-NLS-2$ @@ -91,14 +92,10 @@ public abstract class AbstractControlContentAssistSubjectAdapter implements ICon fKeyListeners= new HashSet(1); } - /* - * @see org.eclipse.jface.text.contentassist.IContentAssistSubjectControl#getControl() - */ + @Override public abstract Control getControl(); - /* - * @see org.eclipse.jface.text.contentassist.IContentAssistSubjectControl#addKeyListener(org.eclipse.swt.events.KeyListener) - */ + @Override public void addKeyListener(KeyListener keyListener) { fKeyListeners.add(keyListener); @@ -108,9 +105,7 @@ public abstract class AbstractControlContentAssistSubjectAdapter implements ICon installControlListener(); } - /* - * @see org.eclipse.jface.contentassist.IContentAssistSubjectControl#removeKeyListener(org.eclipse.swt.events.KeyListener) - */ + @Override public void removeKeyListener(KeyListener keyListener) { boolean deleted= fKeyListeners.remove(keyListener); @@ -123,16 +118,12 @@ public abstract class AbstractControlContentAssistSubjectAdapter implements ICon uninstallControlListener(); } - /* - * @see org.eclipse.jface.contentassist.IContentAssistSubjectControl#supportsVerifyKeyListener() - */ + @Override public boolean supportsVerifyKeyListener() { return true; } - /* - * @see org.eclipse.jface.contentassist.IContentAssistSubjectControl#appendVerifyKeyListener(org.eclipse.swt.custom.VerifyKeyListener) - */ + @Override public boolean appendVerifyKeyListener(final VerifyKeyListener verifyKeyListener) { fVerifyKeyListeners.add(verifyKeyListener); @@ -143,9 +134,7 @@ public abstract class AbstractControlContentAssistSubjectAdapter implements ICon return true; } - /* - * @see org.eclipse.jface.contentassist.IContentAssistSubjectControl#prependVerifyKeyListener(org.eclipse.swt.custom.VerifyKeyListener) - */ + @Override public boolean prependVerifyKeyListener(final VerifyKeyListener verifyKeyListener) { fVerifyKeyListeners.add(0, verifyKeyListener); @@ -156,9 +145,7 @@ public abstract class AbstractControlContentAssistSubjectAdapter implements ICon return true; } - /* - * @see org.eclipse.jface.contentassist.IContentAssistSubjectControl#removeVerifyKeyListener(org.eclipse.swt.custom.VerifyKeyListener) - */ + @Override public void removeVerifyKeyListener(VerifyKeyListener verifyKeyListener) { fVerifyKeyListeners.remove(verifyKeyListener); @@ -168,18 +155,14 @@ public abstract class AbstractControlContentAssistSubjectAdapter implements ICon uninstallControlListener(); } - /* - * @see org.eclipse.jface.contentassist.IContentAssistSubjectControl#setEventConsumer(org.eclipse.jface.text.IEventConsumer) - */ + @Override public void setEventConsumer(IEventConsumer eventConsumer) { // this is not supported if (DEBUG) System.out.println("AbstractControlContentAssistSubjectAdapter#setEventConsumer()"); //$NON-NLS-1$ } - /* - * @see org.eclipse.jface.contentassist.IContentAssistSubjectControl#getLineDelimiter() - */ + @Override public String getLineDelimiter() { return System.getProperty("line.separator"); //$NON-NLS-1$ } @@ -196,6 +179,7 @@ public abstract class AbstractControlContentAssistSubjectAdapter implements ICon return; fControlListener= new Listener() { + @Override public void handleEvent(Event e) { if (! getControl().isFocusControl()) return; //SWT.TRAVERSE_MNEMONIC events can also come in to inactive widgets @@ -345,6 +329,7 @@ public abstract class AbstractControlContentAssistSubjectAdapter implements ICon if (fControlDecoration == null) { fControlDecoration= new ControlDecoration(getControl(), (SWT.TOP | SWT.LEFT)); getControl().addDisposeListener(new DisposeListener() { + @Override public void widgetDisposed(DisposeEvent e) { if (fCueLabelProvider != null) { fCueLabelProvider.dispose(); @@ -365,6 +350,7 @@ public abstract class AbstractControlContentAssistSubjectAdapter implements ICon } ILabelProviderListener listener= new ILabelProviderListener() { + @Override public void labelProviderChanged(LabelProviderChangedEvent event) { fControlDecoration.setDescriptionText(labelProvider.getText(getControl())); Image image= labelProvider.getImage(getControl()); diff --git a/org.eclipse.jface.text/src/org/eclipse/jface/contentassist/ComboContentAssistSubjectAdapter.java b/org.eclipse.jface.text/src/org/eclipse/jface/contentassist/ComboContentAssistSubjectAdapter.java index 508999e61ba..c4b719507cd 100644 --- a/org.eclipse.jface.text/src/org/eclipse/jface/contentassist/ComboContentAssistSubjectAdapter.java +++ b/org.eclipse.jface.text/src/org/eclipse/jface/contentassist/ComboContentAssistSubjectAdapter.java @@ -49,6 +49,7 @@ import org.eclipse.jface.text.IDocument; * @since 3.0 * @deprecated As of 3.2, replaced by Platform UI's field assist support */ +@Deprecated public class ComboContentAssistSubjectAdapter extends AbstractControlContentAssistSubjectAdapter { /** @@ -63,9 +64,7 @@ public class ComboContentAssistSubjectAdapter extends AbstractControlContentAssi private InternalDocument() { super(fCombo.getText()); fModifyListener= new ModifyListener() { - /* - * @see org.eclipse.swt.events.ModifyListener#modifyText(org.eclipse.swt.events.ModifyEvent) - */ + @Override public void modifyText(ModifyEvent e) { set(fCombo.getText()); } @@ -73,9 +72,7 @@ public class ComboContentAssistSubjectAdapter extends AbstractControlContentAssi fCombo.addModifyListener(fModifyListener); } - /* - * @see org.eclipse.jface.text.AbstractDocument#replace(int, int, java.lang.String) - */ + @Override public void replace(int pos, int length, String text) throws BadLocationException { super.replace(pos, length, text); fCombo.removeModifyListener(fModifyListener); @@ -101,30 +98,22 @@ public class ComboContentAssistSubjectAdapter extends AbstractControlContentAssi fModifyListeners= new HashMap(); } - /* - * @see org.eclipse.jface.text.contentassist.IContentAssistSubjectControl#getControl() - */ + @Override public Control getControl() { return fCombo; } - /* - * @see org.eclipse.jface.text.contentassist.IContentAssistSubjectControl#getLineHeight() - */ + @Override public int getLineHeight() { return fCombo.getTextHeight(); } - /* - * @see org.eclipse.jface.text.contentassist.IContentAssistSubjectControl#getCaretOffset() - */ + @Override public int getCaretOffset() { return fCombo.getCaretPosition(); } - /* - * @see org.eclipse.jface.text.contentassist.IContentAssistSubjectControl#getLocationAtOffset(int) - */ + @Override public Point getLocationAtOffset(int offset) { String comboString= fCombo.getText(); GC gc = new GC(fCombo); @@ -139,23 +128,17 @@ public class ComboContentAssistSubjectAdapter extends AbstractControlContentAssi return new Point(x, fCombo.getClientArea().y); } - /* - * @see org.eclipse.jface.text.contentassist.IContentAssistSubjectControl#getSelectionRange() - */ + @Override public Point getWidgetSelectionRange() { return new Point(fCombo.getSelection().x, Math.abs(fCombo.getSelection().y - fCombo.getSelection().x)); } - /* - * @see org.eclipse.jface.text.contentassist.IContentAssistSubjectControl#getSelectedRange() - */ + @Override public Point getSelectedRange() { return new Point(fCombo.getSelection().x, Math.abs(fCombo.getSelection().y - fCombo.getSelection().x)); } - /* - * @see org.eclipse.jface.text.contentassist.IContentAssistSubjectControl#getDocument() - */ + @Override public IDocument getDocument() { IDocument document= (IDocument)fCombo.getData("document"); //$NON-NLS-1$ if (document == null) { @@ -165,30 +148,25 @@ public class ComboContentAssistSubjectAdapter extends AbstractControlContentAssi return document; } - /* - * @see org.eclipse.jface.text.contentassist.IContentAssistSubjectControl#setSelectedRange(int, int) - */ + @Override public void setSelectedRange(int i, int j) { fCombo.setSelection(new Point(i, i+j)); } - /* - * @see org.eclipse.jface.text.contentassist.IContentAssistSubjectControl#revealRange(int, int) - */ + @Override public void revealRange(int i, int j) { // XXX: this should be improved fCombo.setSelection(new Point(i, i+j)); } - /* - * @see org.eclipse.jface.text.contentassist.IContentAssistSubjectControl#addSelectionListener(org.eclipse.swt.events.SelectionListener) - */ + @Override public boolean addSelectionListener(final SelectionListener selectionListener) { fCombo.addSelectionListener(selectionListener); Listener listener= new Listener() { /* * @see org.eclipse.swt.events.ModifyListener#modifyText(org.eclipse.swt.events.ModifyEvent) */ + @Override public void handleEvent(Event e) { selectionListener.widgetSelected(new SelectionEvent(e)); @@ -199,9 +177,7 @@ public class ComboContentAssistSubjectAdapter extends AbstractControlContentAssi return true; } - /* - * @see org.eclipse.jface.text.contentassist.IContentAssistSubjectControl#removeSelectionListener(org.eclipse.swt.events.SelectionListener) - */ + @Override public void removeSelectionListener(SelectionListener selectionListener) { fCombo.removeSelectionListener(selectionListener); Object listener= fModifyListeners.get(selectionListener); diff --git a/org.eclipse.jface.text/src/org/eclipse/jface/contentassist/ISubjectControlContentAssistProcessor.java b/org.eclipse.jface.text/src/org/eclipse/jface/contentassist/ISubjectControlContentAssistProcessor.java index d802990859d..23292ac4843 100644 --- a/org.eclipse.jface.text/src/org/eclipse/jface/contentassist/ISubjectControlContentAssistProcessor.java +++ b/org.eclipse.jface.text/src/org/eclipse/jface/contentassist/ISubjectControlContentAssistProcessor.java @@ -23,6 +23,7 @@ import org.eclipse.jface.text.contentassist.IContextInformation; * @since 3.0 * @deprecated As of 3.2, replaced by Platform UI's field assist support */ +@Deprecated public interface ISubjectControlContentAssistProcessor extends IContentAssistProcessor { /** diff --git a/org.eclipse.jface.text/src/org/eclipse/jface/contentassist/ISubjectControlContentAssistant.java b/org.eclipse.jface.text/src/org/eclipse/jface/contentassist/ISubjectControlContentAssistant.java index 0547d62fbf1..29bc616ba52 100644 --- a/org.eclipse.jface.text/src/org/eclipse/jface/contentassist/ISubjectControlContentAssistant.java +++ b/org.eclipse.jface.text/src/org/eclipse/jface/contentassist/ISubjectControlContentAssistant.java @@ -21,6 +21,7 @@ import org.eclipse.jface.text.contentassist.IContentAssistant; * @since 3.0 * @deprecated As of 3.2, replaced by Platform UI's field assist support */ +@Deprecated public interface ISubjectControlContentAssistant extends IContentAssistant { /** diff --git a/org.eclipse.jface.text/src/org/eclipse/jface/contentassist/ISubjectControlContextInformationPresenter.java b/org.eclipse.jface.text/src/org/eclipse/jface/contentassist/ISubjectControlContextInformationPresenter.java index a172b773a49..f609605e3b3 100644 --- a/org.eclipse.jface.text/src/org/eclipse/jface/contentassist/ISubjectControlContextInformationPresenter.java +++ b/org.eclipse.jface.text/src/org/eclipse/jface/contentassist/ISubjectControlContextInformationPresenter.java @@ -22,6 +22,7 @@ import org.eclipse.jface.text.contentassist.IContextInformationPresenter; * @since 3.0 * @deprecated As of 3.2, replaced by Platform UI's field assist support */ +@Deprecated public interface ISubjectControlContextInformationPresenter extends IContextInformationPresenter { /** diff --git a/org.eclipse.jface.text/src/org/eclipse/jface/contentassist/ISubjectControlContextInformationValidator.java b/org.eclipse.jface.text/src/org/eclipse/jface/contentassist/ISubjectControlContextInformationValidator.java index 0d1e32eb282..63b4886a047 100644 --- a/org.eclipse.jface.text/src/org/eclipse/jface/contentassist/ISubjectControlContextInformationValidator.java +++ b/org.eclipse.jface.text/src/org/eclipse/jface/contentassist/ISubjectControlContextInformationValidator.java @@ -22,6 +22,7 @@ import org.eclipse.jface.text.contentassist.IContextInformationValidator; * @since 3.0 * @deprecated As of 3.2, replaced by Platform UI's field assist support */ +@Deprecated public interface ISubjectControlContextInformationValidator extends IContextInformationValidator { /** diff --git a/org.eclipse.jface.text/src/org/eclipse/jface/contentassist/SubjectControlContentAssistant.java b/org.eclipse.jface.text/src/org/eclipse/jface/contentassist/SubjectControlContentAssistant.java index c8c6d215bb9..798c1414206 100644 --- a/org.eclipse.jface.text/src/org/eclipse/jface/contentassist/SubjectControlContentAssistant.java +++ b/org.eclipse.jface.text/src/org/eclipse/jface/contentassist/SubjectControlContentAssistant.java @@ -20,11 +20,10 @@ import org.eclipse.core.runtime.Assert; * @since 3.0 * @deprecated As of 3.2, replaced by Platform UI's field assist support * */ +@Deprecated public class SubjectControlContentAssistant extends org.eclipse.jface.text.contentassist.ContentAssistant implements ISubjectControlContentAssistant { - /* - * @see ISubjectControlContentAssistant#install(IContentAssistSubjectControl) - */ + @Override public void install(IContentAssistSubjectControl contentAssistSubjectControl) { Assert.isNotNull(contentAssistSubjectControl); super.install(contentAssistSubjectControl); diff --git a/org.eclipse.jface.text/src/org/eclipse/jface/contentassist/SubjectControlContextInformationValidator.java b/org.eclipse.jface.text/src/org/eclipse/jface/contentassist/SubjectControlContextInformationValidator.java index 11280bc4537..42974894cab 100644 --- a/org.eclipse.jface.text/src/org/eclipse/jface/contentassist/SubjectControlContextInformationValidator.java +++ b/org.eclipse.jface.text/src/org/eclipse/jface/contentassist/SubjectControlContextInformationValidator.java @@ -25,6 +25,7 @@ import org.eclipse.jface.text.contentassist.IContextInformation; * @since 3.0 * @deprecated As of 3.2, replaced by Platform UI's field assist support */ +@Deprecated public final class SubjectControlContextInformationValidator implements ISubjectControlContextInformationValidator { /** The content assist processor. */ @@ -44,24 +45,18 @@ public final class SubjectControlContextInformationValidator implements ISubject fProcessor= processor; } - /* - * @see IContextInformationValidator#install(IContextInformation, ITextViewer, int) - */ + @Override public void install(IContextInformation contextInformation, ITextViewer viewer, int offset) { throw new UnsupportedOperationException(); } - /* - * @see ISubjectControlContextInformationValidator#install(IContextInformation, IContentAssistSubjectControl, int) - */ + @Override public void install(IContextInformation contextInformation, IContentAssistSubjectControl contentAssistSubjectControl, int offset) { fContextInformation= contextInformation; fContentAssistSubjectControl= contentAssistSubjectControl; } - /* - * @see IContentAssistTipCloser#isContextInformationValid(int) - */ + @Override public boolean isContextInformationValid(int offset) { if (fContentAssistSubjectControl != null && fProcessor instanceof ISubjectControlContentAssistProcessor) { IContextInformation[] infos= ((ISubjectControlContentAssistProcessor)fProcessor).computeContextInformation(fContentAssistSubjectControl, offset); diff --git a/org.eclipse.jface.text/src/org/eclipse/jface/contentassist/TextContentAssistSubjectAdapter.java b/org.eclipse.jface.text/src/org/eclipse/jface/contentassist/TextContentAssistSubjectAdapter.java index e6252f347ee..8dd2244aaee 100644 --- a/org.eclipse.jface.text/src/org/eclipse/jface/contentassist/TextContentAssistSubjectAdapter.java +++ b/org.eclipse.jface.text/src/org/eclipse/jface/contentassist/TextContentAssistSubjectAdapter.java @@ -38,6 +38,7 @@ import org.eclipse.jface.text.IDocument; * @since 3.0 * @deprecated As of 3.2, replaced by Platform UI's field assist support */ +@Deprecated public class TextContentAssistSubjectAdapter extends AbstractControlContentAssistSubjectAdapter { /** @@ -53,9 +54,7 @@ public class TextContentAssistSubjectAdapter extends AbstractControlContentAssis private InternalDocument() { super(fText.getText()); fModifyListener= new ModifyListener() { - /* - * @see org.eclipse.swt.events.ModifyListener#modifyText(org.eclipse.swt.events.ModifyEvent) - */ + @Override public void modifyText(ModifyEvent e) { set(fText.getText()); } @@ -63,9 +62,7 @@ public class TextContentAssistSubjectAdapter extends AbstractControlContentAssis fText.addModifyListener(fModifyListener); } - /* - * @see org.eclipse.jface.text.AbstractDocument#replace(int, int, java.lang.String) - */ + @Override public void replace(int pos, int length, String text) throws BadLocationException { super.replace(pos, length, text); fText.removeModifyListener(fModifyListener); @@ -89,30 +86,22 @@ public class TextContentAssistSubjectAdapter extends AbstractControlContentAssis fText= text; } - /* - * @see org.eclipse.jface.contentassist.IContentAssistSubjectControl#getControl() - */ + @Override public Control getControl() { return fText; } - /* - * @see org.eclipse.jface.contentassist.IContentAssistSubjectControl#getLineHeight() - */ + @Override public int getLineHeight() { return fText.getLineHeight(); } - /* - * @see org.eclipse.jface.contentassist.IContentAssistSubjectControl#getCaretOffset() - */ + @Override public int getCaretOffset() { return fText.getCaretPosition(); } - /* - * @see org.eclipse.jface.contentassist.IContentAssistSubjectControl#getLocationAtOffset(int) - */ + @Override public Point getLocationAtOffset(int offset) { Point caretLocation= fText.getCaretLocation(); /* @@ -122,23 +111,17 @@ public class TextContentAssistSubjectAdapter extends AbstractControlContentAssis return caretLocation; } - /* - * @see org.eclipse.jface.contentassist.IContentAssistSubjectControl#getWidgetSelectionRange() - */ + @Override public Point getWidgetSelectionRange() { return new Point(fText.getSelection().x, Math.abs(fText.getSelection().y - fText.getSelection().x)); } - /* - * @see org.eclipse.jface.contentassist.IContentAssistSubjectControl#getSelectedRange() - */ + @Override public Point getSelectedRange() { return new Point(fText.getSelection().x, Math.abs(fText.getSelection().y - fText.getSelection().x)); } - /* - * @see org.eclipse.jface.contentassist.IContentAssistSubjectControl#getDocument() - */ + @Override public IDocument getDocument() { IDocument document= (IDocument)fText.getData("document"); //$NON-NLS-1$ if (document == null) { @@ -148,30 +131,22 @@ public class TextContentAssistSubjectAdapter extends AbstractControlContentAssis return document; } - /* - * @see org.eclipse.jface.contentassist.IContentAssistSubjectControl#setSelectedRange(int, int) - */ + @Override public void setSelectedRange(int i, int j) { fText.setSelection(new Point(i, i+j)); } - /* - * @see org.eclipse.jface.contentassist.IContentAssistSubjectControl#revealRange(int, int) - */ + @Override public void revealRange(int i, int j) { // XXX: this should be improved fText.setSelection(new Point(i, i+j)); } - /* - * @see org.eclipse.jface.contentassist.IContentAssistSubjectControl#addSelectionListener(org.eclipse.swt.events.SelectionListener) - */ + @Override public boolean addSelectionListener(final SelectionListener selectionListener) { fText.addSelectionListener(selectionListener); Listener listener= new Listener() { - /* - * @see org.eclipse.swt.widgets.Listener#handleEvent(org.eclipse.swt.widgets.Event) - */ + @Override public void handleEvent(Event e) { selectionListener.widgetSelected(new SelectionEvent(e)); @@ -182,9 +157,7 @@ public class TextContentAssistSubjectAdapter extends AbstractControlContentAssis return true; } - /* - * @see org.eclipse.jface.contentassist.IContentAssistSubjectControl#removeSelectionListener(org.eclipse.swt.events.SelectionListener) - */ + @Override public void removeSelectionListener(SelectionListener selectionListener) { fText.removeSelectionListener(selectionListener); Object listener= fModifyListeners.get(selectionListener); diff --git a/org.eclipse.jface.text/src/org/eclipse/jface/internal/text/DelayedInputChangeListener.java b/org.eclipse.jface.text/src/org/eclipse/jface/internal/text/DelayedInputChangeListener.java index 09092a459b6..bde90bc9b45 100644 --- a/org.eclipse.jface.text/src/org/eclipse/jface/internal/text/DelayedInputChangeListener.java +++ b/org.eclipse.jface.text/src/org/eclipse/jface/internal/text/DelayedInputChangeListener.java @@ -35,9 +35,7 @@ public final class DelayedInputChangeListener implements IInputChangedListener { fInformationControlReplacer= informationControlReplacer; } - /* - * @see org.eclipse.jface.text.IDelayedInputChangeListener#inputChanged(java.lang.Object) - */ + @Override public void inputChanged(Object newInput) { fChangeProvider.setDelayedInputChangeListener(null); fInformationControlReplacer.setDelayedInput(newInput); diff --git a/org.eclipse.jface.text/src/org/eclipse/jface/internal/text/InformationControlReplacer.java b/org.eclipse.jface.text/src/org/eclipse/jface/internal/text/InformationControlReplacer.java index 2284a6581d2..9fdf80e1097 100644 --- a/org.eclipse.jface.text/src/org/eclipse/jface/internal/text/InformationControlReplacer.java +++ b/org.eclipse.jface.text/src/org/eclipse/jface/internal/text/InformationControlReplacer.java @@ -50,6 +50,7 @@ public class InformationControlReplacer extends AbstractInformationControlManage * Default control creator. */ protected static class DefaultInformationControlCreator extends AbstractReusableInformationControlCreator { + @Override public IInformationControl doCreateInformationControl(Shell shell) { return new DefaultInformationControl(shell, true); } @@ -106,9 +107,7 @@ public class InformationControlReplacer extends AbstractInformationControlManage } } - /* - * @see org.eclipse.jface.text.AbstractInformationControlManager#computeInformation() - */ + @Override protected void computeInformation() { if (fIsReplacing && fReplacableInformation != null) { setInformation(fReplacableInformation, fReplaceableArea); @@ -162,9 +161,7 @@ public class InformationControlReplacer extends AbstractInformationControlManage showInformationControl(subjectArea); } - /* - * @see org.eclipse.jface.text.AbstractInformationControlManager#hideInformationControl() - */ + @Override public void hideInformationControl() { super.hideInformationControl(); } diff --git a/org.eclipse.jface.text/src/org/eclipse/jface/internal/text/NonDeletingPositionUpdater.java b/org.eclipse.jface.text/src/org/eclipse/jface/internal/text/NonDeletingPositionUpdater.java index a93f958117a..0383e6f99e8 100644 --- a/org.eclipse.jface.text/src/org/eclipse/jface/internal/text/NonDeletingPositionUpdater.java +++ b/org.eclipse.jface.text/src/org/eclipse/jface/internal/text/NonDeletingPositionUpdater.java @@ -38,9 +38,7 @@ public final class NonDeletingPositionUpdater implements IPositionUpdater { fCategory= category; } - /* - * @see org.eclipse.jface.text.IPositionUpdater#update(org.eclipse.jface.text.DocumentEvent) - */ + @Override public void update(DocumentEvent event) { int eventOffset= event.getOffset(); diff --git a/org.eclipse.jface.text/src/org/eclipse/jface/internal/text/SelectionProcessor.java b/org.eclipse.jface.text/src/org/eclipse/jface/internal/text/SelectionProcessor.java index 30a7a0e5ad2..0f34d8f15df 100644 --- a/org.eclipse.jface.text/src/org/eclipse/jface/internal/text/SelectionProcessor.java +++ b/org.eclipse.jface.text/src/org/eclipse/jface/internal/text/SelectionProcessor.java @@ -161,26 +161,31 @@ public final class SelectionProcessor { private final Implementation NULL_IMPLEMENTATION= new Implementation(); private final Implementation RANGE_IMPLEMENTATION= new Implementation() { + @Override TextEdit replace(ISelection selection, String replacement) { ITextSelection ts= (ITextSelection)selection; return new ReplaceEdit(ts.getOffset(), ts.getLength(), replacement); } + @Override String getText(ISelection selection) { ITextSelection ts= (ITextSelection)selection; return ts.getText(); } + @Override boolean isEmpty(ISelection selection) { ITextSelection ts= (ITextSelection)selection; return ts.getLength() <= 0; } + @Override boolean isMultiline(ISelection selection) throws BadLocationException { ITextSelection ts= (ITextSelection)selection; return fDocument.getLineOfOffset(ts.getOffset()) < fDocument.getLineOfOffset(ts.getOffset() + ts.getLength()); } + @Override TextEdit delete(ISelection selection) { ITextSelection ts= (ITextSelection)selection; if (isEmpty(selection)) @@ -188,6 +193,7 @@ public final class SelectionProcessor { return new DeleteEdit(ts.getOffset(), ts.getLength()); } + @Override TextEdit backspace(ISelection selection) throws BadLocationException { ITextSelection ts= (ITextSelection)selection; if (isEmpty(selection)) @@ -195,6 +201,7 @@ public final class SelectionProcessor { return new DeleteEdit(ts.getOffset(), ts.getLength()); } + @Override ISelection makeEmpty(ISelection selection, boolean beginning) { ITextSelection ts= (ITextSelection)selection; return beginning ? @@ -202,16 +209,19 @@ public final class SelectionProcessor { : new TextSelection(fDocument, ts.getOffset() + ts.getLength(), 0); } + @Override IRegion[] getRanges(ISelection selection) { ITextSelection ts= (ITextSelection)selection; return new IRegion[] { new Region(ts.getOffset(), ts.getLength()) }; } + @Override int getCoveredLines(ISelection selection) throws BadLocationException { ITextSelection ts= (ITextSelection)selection; return ts.getEndLine() - ts.getStartLine() + 1; } + @Override ISelection makeReplaceSelection(ISelection selection, String replacement) { ITextSelection ts= (ITextSelection)selection; return new TextSelection(fDocument, ts.getOffset() + replacement.length(), 0); @@ -284,10 +294,12 @@ public final class SelectionProcessor { } } + @Override TextEdit replace(ISelection selection, String replacement) throws BadLocationException { return replace(selection, replacement, false); } + @Override String getText(ISelection selection) throws BadLocationException { IBlockTextSelection cts= (IBlockTextSelection)selection; StringBuffer buf= new StringBuffer(cts.getLength()); @@ -307,6 +319,7 @@ public final class SelectionProcessor { return buf.toString(); } + @Override boolean isEmpty(ISelection selection) throws BadLocationException { IBlockTextSelection cts= (IBlockTextSelection)selection; int startLine= cts.getStartLine(); @@ -318,11 +331,13 @@ public final class SelectionProcessor { return visualEndColumn == visualStartColumn; } + @Override boolean isMultiline(ISelection selection) { ITextSelection ts= (ITextSelection)selection; return ts.getEndLine() > ts.getStartLine(); } + @Override TextEdit delete(ISelection selection) throws BadLocationException { if (isEmpty(selection)) { IBlockTextSelection cts= (IBlockTextSelection)selection; @@ -331,6 +346,7 @@ public final class SelectionProcessor { return replace(selection, "", true); //$NON-NLS-1$ } + @Override TextEdit backspace(ISelection selection) throws BadLocationException { IBlockTextSelection cts= (IBlockTextSelection)selection; if (isEmpty(selection) && cts.getStartColumn() > 0) { @@ -339,6 +355,7 @@ public final class SelectionProcessor { return replace(selection, ""); //$NON-NLS-1$ } + @Override ISelection makeEmpty(ISelection selection, boolean beginning) throws BadLocationException { IBlockTextSelection cts= (IBlockTextSelection)selection; int startLine, startColumn, endLine, endColumn; @@ -356,6 +373,7 @@ public final class SelectionProcessor { return new BlockTextSelection(fDocument, startLine, startColumn, endLine, endColumn, fTabWidth); } + @Override ISelection makeReplaceSelection(ISelection selection, String replacement) throws BadLocationException { IBlockTextSelection bts= (IBlockTextSelection)selection; String[] delimiters= fDocument.getLegalLineDelimiters(); @@ -373,6 +391,7 @@ public final class SelectionProcessor { return new BlockTextSelection(fDocument, startLine, column, endLine, endColumn, fTabWidth); } + @Override IRegion[] getRanges(ISelection selection) throws BadLocationException { IBlockTextSelection cts= (IBlockTextSelection)selection; final int startLine= cts.getStartLine(); @@ -394,6 +413,7 @@ public final class SelectionProcessor { return ranges; } + @Override int getCoveredLines(ISelection selection) throws BadLocationException { ITextSelection ts= (ITextSelection)selection; return ts.getEndLine() - ts.getStartLine() + 1; diff --git a/org.eclipse.jface.text/src/org/eclipse/jface/internal/text/StickyHoverManager.java b/org.eclipse.jface.text/src/org/eclipse/jface/internal/text/StickyHoverManager.java index c8b2a9ded0c..921dc012ce2 100644 --- a/org.eclipse.jface.text/src/org/eclipse/jface/internal/text/StickyHoverManager.java +++ b/org.eclipse.jface.text/src/org/eclipse/jface/internal/text/StickyHoverManager.java @@ -84,23 +84,17 @@ public class StickyHoverManager extends InformationControlReplacer implements IW /** The display. */ private Display fDisplay; - /* - * @see IInformationControlCloser#setSubjectControl(Control) - */ + @Override public void setSubjectControl(Control control) { fSubjectControl= control; } - /* - * @see IInformationControlCloser#setInformationControl(IInformationControl) - */ + @Override public void setInformationControl(IInformationControl control) { // NOTE: we use getCurrentInformationControl2() from the outer class } - /* - * @see IInformationControlCloser#start(Rectangle) - */ + @Override public void start(Rectangle informationArea) { if (fIsActive) @@ -126,9 +120,7 @@ public class StickyHoverManager extends InformationControlReplacer implements IW } } - /* - * @see IInformationControlCloser#stop() - */ + @Override public void stop() { if (!fIsActive) @@ -155,83 +147,62 @@ public class StickyHoverManager extends InformationControlReplacer implements IW fDisplay= null; } - /* - * @see ControlListener#controlResized(ControlEvent) - */ - public void controlResized(ControlEvent e) { + @Override + public void controlResized(ControlEvent e) { hideInformationControl(); } - /* - * @see ControlListener#controlMoved(ControlEvent) - */ - public void controlMoved(ControlEvent e) { + @Override + public void controlMoved(ControlEvent e) { hideInformationControl(); } - /* - * @see MouseListener#mouseDown(MouseEvent) - */ - public void mouseDown(MouseEvent e) { + @Override + public void mouseDown(MouseEvent e) { hideInformationControl(); } - /* - * @see MouseListener#mouseUp(MouseEvent) - */ + @Override public void mouseUp(MouseEvent e) { } - /* - * @see MouseListener#mouseDoubleClick(MouseEvent) - */ + @Override public void mouseDoubleClick(MouseEvent e) { hideInformationControl(); } - /* - * @see IViewportListenerListener#viewportChanged(int) - */ + @Override public void viewportChanged(int topIndex) { hideInformationControl(); } - /* - * @see KeyListener#keyPressed(KeyEvent) - */ + @Override public void keyPressed(KeyEvent e) { hideInformationControl(); } - /* - * @see KeyListener#keyReleased(KeyEvent) - */ + @Override public void keyReleased(KeyEvent e) { } - /* - * @see org.eclipse.swt.events.FocusListener#focusGained(org.eclipse.swt.events.FocusEvent) - */ + @Override public void focusGained(FocusEvent e) { } - /* - * @see org.eclipse.swt.events.FocusListener#focusLost(org.eclipse.swt.events.FocusEvent) - */ + @Override public void focusLost(FocusEvent e) { if (DEBUG) System.out.println("StickyHoverManager.Closer.focusLost(): " + e); //$NON-NLS-1$ Display d= fSubjectControl.getDisplay(); d.asyncExec(new Runnable() { // Without the asyncExec, mouse clicks to the workbench window are swallowed. + @Override public void run() { hideInformationControl(); } }); } - /* - * @see org.eclipse.swt.widgets.Listener#handleEvent(org.eclipse.swt.widgets.Event) - */ + @Override public void handleEvent(Event event) { if (event.type == SWT.MouseMove) { if (!(event.widget instanceof Control) || event.widget.isDisposed()) @@ -287,9 +258,7 @@ public class StickyHoverManager extends InformationControlReplacer implements IW install(fTextViewer.getTextWidget()); } - /* - * @see AbstractInformationControlManager#showInformationControl(Rectangle) - */ + @Override protected void showInformationControl(Rectangle subjectArea) { if (fTextViewer != null && fTextViewer.requestWidgetToken(this, WIDGET_PRIORITY)) super.showInformationControl(subjectArea); @@ -298,9 +267,7 @@ public class StickyHoverManager extends InformationControlReplacer implements IW System.out.println("cancelled StickyHoverManager.showInformationControl(..): did not get widget token (with prio)"); //$NON-NLS-1$ } - /* - * @see AbstractInformationControlManager#hideInformationControl() - */ + @Override public void hideInformationControl() { try { super.hideInformationControl(); @@ -310,9 +277,7 @@ public class StickyHoverManager extends InformationControlReplacer implements IW } } - /* - * @see AbstractInformationControlManager#handleInformationControlDisposed() - */ + @Override protected void handleInformationControlDisposed() { try { super.handleInformationControlDisposed(); @@ -322,9 +287,7 @@ public class StickyHoverManager extends InformationControlReplacer implements IW } } - /* - * @see org.eclipse.jface.text.IWidgetTokenKeeper#requestWidgetToken(IWidgetTokenOwner) - */ + @Override public boolean requestWidgetToken(IWidgetTokenOwner owner) { hideInformationControl(); if (DEBUG) @@ -332,9 +295,7 @@ public class StickyHoverManager extends InformationControlReplacer implements IW return true; } - /* - * @see org.eclipse.jface.text.IWidgetTokenKeeperExtension#requestWidgetToken(org.eclipse.jface.text.IWidgetTokenOwner, int) - */ + @Override public boolean requestWidgetToken(IWidgetTokenOwner owner, int priority) { if (getCurrentInformationControl2() != null) { if (getCurrentInformationControl2().isFocusControl()) { @@ -357,9 +318,7 @@ public class StickyHoverManager extends InformationControlReplacer implements IW return true; } - /* - * @see org.eclipse.jface.text.IWidgetTokenKeeperExtension#setFocus(org.eclipse.jface.text.IWidgetTokenOwner) - */ + @Override public boolean setFocus(IWidgetTokenOwner owner) { IInformationControl iControl= getCurrentInformationControl2(); if (iControl instanceof IInformationControlExtension5) { diff --git a/org.eclipse.jface.text/src/org/eclipse/jface/internal/text/TableOwnerDrawSupport.java b/org.eclipse.jface.text/src/org/eclipse/jface/internal/text/TableOwnerDrawSupport.java index 114fff28f80..f8551c18942 100644 --- a/org.eclipse.jface.text/src/org/eclipse/jface/internal/text/TableOwnerDrawSupport.java +++ b/org.eclipse.jface.text/src/org/eclipse/jface/internal/text/TableOwnerDrawSupport.java @@ -70,9 +70,7 @@ public class TableOwnerDrawSupport implements Listener { fLayout.setOrientation(orientation); } - /* - * @see org.eclipse.swt.widgets.Listener#handleEvent(org.eclipse.swt.widgets.Event) - */ + @Override public void handleEvent(Event event) { switch (event.type) { case SWT.MeasureItem: diff --git a/org.eclipse.jface.text/src/org/eclipse/jface/internal/text/html/BrowserInformationControl.java b/org.eclipse.jface.text/src/org/eclipse/jface/internal/text/html/BrowserInformationControl.java index ad33c9e07a6..67f9b3d74cb 100644 --- a/org.eclipse.jface.text/src/org/eclipse/jface/internal/text/html/BrowserInformationControl.java +++ b/org.eclipse.jface.text/src/org/eclipse/jface/internal/text/html/BrowserInformationControl.java @@ -211,9 +211,7 @@ public class BrowserInformationControl extends AbstractInformationControl implem create(); } - /* - * @see org.eclipse.jface.text.AbstractInformationControl#createContent(org.eclipse.swt.widgets.Composite) - */ + @Override protected void createContent(Composite parent) { fBrowser= new Browser(parent, SWT.NONE); fBrowser.setJavascriptEnabled(false); @@ -223,12 +221,14 @@ public class BrowserInformationControl extends AbstractInformationControl implem fBrowser.setBackground(display.getSystemColor(SWT.COLOR_INFO_BACKGROUND)); fBrowser.addProgressListener(new ProgressAdapter() { + @Override public void completed(ProgressEvent event) { fCompleted= true; } }); fBrowser.addOpenWindowListener(new OpenWindowListener() { + @Override public void open(WindowEvent event) { event.required= true; // Cancel opening of new windows } @@ -244,16 +244,21 @@ public class BrowserInformationControl extends AbstractInformationControl implem * {@inheritDoc} * @deprecated use {@link #setInput(Object)} */ + @Deprecated + @Override public void setInformation(final String content) { setInput(new BrowserInformationControlInput(null) { + @Override public String getHtml() { return content; } + @Override public String getInputName() { return ""; //$NON-NLS-1$ } + @Override public Object getInputElement() { return content; } @@ -264,6 +269,7 @@ public class BrowserInformationControl extends AbstractInformationControl implem * {@inheritDoc} This control can handle {@link String} and * {@link BrowserInformationControlInput}. */ + @Override public void setInput(Object input) { Assert.isLegal(input == null || input instanceof String || input instanceof BrowserInformationControlInput); @@ -318,9 +324,7 @@ public class BrowserInformationControl extends AbstractInformationControl implem ((IInputChangedListener)listeners[i]).inputChanged(fInput); } - /* - * @see IInformationControl#setVisible(boolean) - */ + @Override public void setVisible(boolean visible) { Shell shell= getShell(); if (shell.isVisible() == visible) @@ -341,6 +345,7 @@ public class BrowserInformationControl extends AbstractInformationControl implem // Make sure the display wakes from sleep after timeout: display.timerExec(100, new Runnable() { + @Override public void run() { fCompleted= true; } @@ -367,9 +372,7 @@ public class BrowserInformationControl extends AbstractInformationControl implem super.setVisible(true); } - /* - * @see org.eclipse.jface.text.AbstractInformationControl#setSize(int, int) - */ + @Override public void setSize(int width, int height) { fBrowser.setRedraw(false); // avoid flickering try { @@ -403,10 +406,7 @@ public class BrowserInformationControl extends AbstractInformationControl implem fTextLayout.setText(""); //$NON-NLS-1$ } - /* - * @see org.eclipse.jface.text.AbstractInformationControl#handleDispose() - * @since 3.6 - */ + @Override protected void handleDispose() { if (fTextLayout != null) { fTextLayout.dispose(); @@ -417,9 +417,7 @@ public class BrowserInformationControl extends AbstractInformationControl implem super.handleDispose(); } - /* - * @see IInformationControl#computeSizeHint() - */ + @Override public Point computeSizeHint() { Point sizeConstraints= getSizeConstraints(); Rectangle trim= computeTrim(); @@ -482,9 +480,7 @@ public class BrowserInformationControl extends AbstractInformationControl implem return new Point(width, height); } - /* - * @see org.eclipse.jface.text.IInformationControlExtension3#computeTrim() - */ + @Override public Rectangle computeTrim() { Rectangle trim= super.computeTrim(); if (isResizable()) { @@ -509,25 +505,19 @@ public class BrowserInformationControl extends AbstractInformationControl implem fBrowser.addLocationListener(listener); } - /* - * @see IInformationControl#setForegroundColor(Color) - */ + @Override public void setForegroundColor(Color foreground) { super.setForegroundColor(foreground); fBrowser.setForeground(foreground); } - /* - * @see IInformationControl#setBackgroundColor(Color) - */ + @Override public void setBackgroundColor(Color background) { super.setBackgroundColor(background); fBrowser.setBackground(background); } - /* - * @see IInformationControlExtension#hasContents() - */ + @Override public boolean hasContents() { return fBrowserHasContent; } @@ -555,10 +545,7 @@ public class BrowserInformationControl extends AbstractInformationControl implem fInputChangeListeners.remove(inputChangeListener); } - /* - * @see org.eclipse.jface.text.IDelayedInputChangeProvider#setDelayedInputChangeListener(org.eclipse.jface.text.IInputChangedListener) - * @since 3.4 - */ + @Override public void setDelayedInputChangeListener(IInputChangedListener inputChangeListener) { fDelayedInputChangeListener= inputChangeListener; } @@ -585,10 +572,7 @@ public class BrowserInformationControl extends AbstractInformationControl implem fDelayedInputChangeListener.inputChanged(newInput); } - /* - * @see java.lang.Object#toString() - * @since 3.4 - */ + @Override public String toString() { String style= (getShell().getStyle() & SWT.RESIZE) == 0 ? "fixed" : "resizeable"; //$NON-NLS-1$ //$NON-NLS-2$ return super.toString() + " - style: " + style; //$NON-NLS-1$ @@ -601,9 +585,7 @@ public class BrowserInformationControl extends AbstractInformationControl implem return fInput; } - /* - * @see org.eclipse.jface.text.IInformationControlExtension5#computeSizeConstraints(int, int) - */ + @Override public Point computeSizeConstraints(int widthInChars, int heightInChars) { if (fSymbolicFontName == null) return null; diff --git a/org.eclipse.jface.text/src/org/eclipse/jface/internal/text/html/BrowserInformationControlInput.java b/org.eclipse.jface.text/src/org/eclipse/jface/internal/text/html/BrowserInformationControlInput.java index 25da7836c42..9f505f28da8 100644 --- a/org.eclipse.jface.text/src/org/eclipse/jface/internal/text/html/BrowserInformationControlInput.java +++ b/org.eclipse.jface.text/src/org/eclipse/jface/internal/text/html/BrowserInformationControlInput.java @@ -51,6 +51,7 @@ public abstract class BrowserInformationControlInput extends BrowserInput { * * @return {@link #getHtml()} */ + @Override public String toString() { return getHtml(); } diff --git a/org.eclipse.jface.text/src/org/eclipse/jface/internal/text/html/HTML2TextReader.java b/org.eclipse.jface.text/src/org/eclipse/jface/internal/text/html/HTML2TextReader.java index a4f4ec15cce..290a684de35 100644 --- a/org.eclipse.jface.text/src/org/eclipse/jface/internal/text/html/HTML2TextReader.java +++ b/org.eclipse.jface.text/src/org/eclipse/jface/internal/text/html/HTML2TextReader.java @@ -90,6 +90,7 @@ public class HTML2TextReader extends SubstitutionTextReader { fTextPresentation= presentation; } + @Override public int read() throws IOException { int c= super.read(); if (c != -1) @@ -174,9 +175,7 @@ public class HTML2TextReader extends SubstitutionTextReader { } - /* - * @see org.eclipse.jdt.internal.ui.text.SubstitutionTextReader#computeSubstitution(int) - */ + @Override protected String computeSubstitution(int c) throws IOException { if (c == '<') diff --git a/org.eclipse.jface.text/src/org/eclipse/jface/internal/text/html/HTMLPrinter.java b/org.eclipse.jface.text/src/org/eclipse/jface/internal/text/html/HTMLPrinter.java index a7fd2068089..04e4903c8aa 100644 --- a/org.eclipse.jface.text/src/org/eclipse/jface/internal/text/html/HTMLPrinter.java +++ b/org.eclipse.jface.text/src/org/eclipse/jface/internal/text/html/HTMLPrinter.java @@ -47,9 +47,7 @@ public class HTMLPrinter { if (display != null && !display.isDisposed()) { try { display.asyncExec(new Runnable() { - /* - * @see java.lang.Runnable#run() - */ + @Override public void run() { cacheColors(display); installColorUpdater(display); @@ -73,6 +71,7 @@ public class HTMLPrinter { private static void installColorUpdater(final Display display) { display.addListener(SWT.Settings, new Listener() { + @Override public void handleEvent(Event event) { cacheColors(display); } diff --git a/org.eclipse.jface.text/src/org/eclipse/jface/internal/text/html/HTMLTextPresenter.java b/org.eclipse.jface.text/src/org/eclipse/jface/internal/text/html/HTMLTextPresenter.java index cff9634b1ff..341452782dd 100644 --- a/org.eclipse.jface.text/src/org/eclipse/jface/internal/text/html/HTMLTextPresenter.java +++ b/org.eclipse.jface.text/src/org/eclipse/jface/internal/text/html/HTMLTextPresenter.java @@ -104,14 +104,13 @@ public class HTMLTextPresenter implements DefaultInformationControl.IInformation * @deprecated Use {@link #updatePresentation(Drawable, String, TextPresentation, int, int)} * instead */ + @Deprecated + @Override public String updatePresentation(Display display, String hoverInfo, TextPresentation presentation, int maxWidth, int maxHeight) { return updatePresentation((Drawable)display, hoverInfo, presentation, maxWidth, maxHeight); } - /* - * @see IHoverInformationPresenterExtension#updatePresentation(Drawable drawable, String, TextPresentation, int, int) - * @since 3.2 - */ + @Override public String updatePresentation(Drawable drawable, String hoverInfo, TextPresentation presentation, int maxWidth, int maxHeight) { if (hoverInfo == null) diff --git a/org.eclipse.jface.text/src/org/eclipse/jface/internal/text/html/SingleCharReader.java b/org.eclipse.jface.text/src/org/eclipse/jface/internal/text/html/SingleCharReader.java index 362daecf9fa..924c3554964 100644 --- a/org.eclipse.jface.text/src/org/eclipse/jface/internal/text/html/SingleCharReader.java +++ b/org.eclipse.jface.text/src/org/eclipse/jface/internal/text/html/SingleCharReader.java @@ -23,11 +23,13 @@ public abstract class SingleCharReader extends Reader { /** * @see Reader#read() */ + @Override public abstract int read() throws IOException; /** * @see Reader#read(char[],int,int) */ + @Override public int read(char cbuf[], int off, int len) throws IOException { int end= off + len; for (int i= off; i < end; i++) { @@ -45,7 +47,8 @@ public abstract class SingleCharReader extends Reader { /** * @see Reader#ready() */ - public boolean ready() throws IOException { + @Override + public boolean ready() throws IOException { return true; } diff --git a/org.eclipse.jface.text/src/org/eclipse/jface/internal/text/html/SubstitutionTextReader.java b/org.eclipse.jface.text/src/org/eclipse/jface/internal/text/html/SubstitutionTextReader.java index 36a2bc6f0e1..5a18b6ba255 100644 --- a/org.eclipse.jface.text/src/org/eclipse/jface/internal/text/html/SubstitutionTextReader.java +++ b/org.eclipse.jface.text/src/org/eclipse/jface/internal/text/html/SubstitutionTextReader.java @@ -105,6 +105,7 @@ public abstract class SubstitutionTextReader extends SingleCharReader { /** * @see Reader#read() */ + @Override public int read() throws IOException { int c; do { @@ -127,13 +128,15 @@ public abstract class SubstitutionTextReader extends SingleCharReader { /** * @see Reader#ready() */ - public boolean ready() throws IOException { + @Override + public boolean ready() throws IOException { return fReader.ready(); } /** * @see Reader#close() */ + @Override public void close() throws IOException { fReader.close(); } @@ -141,6 +144,7 @@ public abstract class SubstitutionTextReader extends SingleCharReader { /** * @see Reader#reset() */ + @Override public void reset() throws IOException { fReader.reset(); fWasWhiteSpace= true; diff --git a/org.eclipse.jface.text/src/org/eclipse/jface/internal/text/link/contentassist/AdditionalInfoController2.java b/org.eclipse.jface.text/src/org/eclipse/jface/internal/text/link/contentassist/AdditionalInfoController2.java index af454c1c626..48bb8b5720d 100644 --- a/org.eclipse.jface.text/src/org/eclipse/jface/internal/text/link/contentassist/AdditionalInfoController2.java +++ b/org.eclipse.jface.text/src/org/eclipse/jface/internal/text/link/contentassist/AdditionalInfoController2.java @@ -42,16 +42,12 @@ class AdditionalInfoController2 extends AbstractInformationControlManager implem */ private class TableSelectionListener implements SelectionListener { - /* - * @see SelectionListener#widgetSelected(SelectionEvent) - */ + @Override public void widgetSelected(SelectionEvent e) { handleTableSelectionChanged(); } - /* - * @see SelectionListener#widgetDefaultSelected(SelectionEvent) - */ + @Override public void widgetDefaultSelected(SelectionEvent e) { } } @@ -88,9 +84,7 @@ class AdditionalInfoController2 extends AbstractInformationControlManager implem setFallbackAnchors(new Anchor[] {ANCHOR_RIGHT, ANCHOR_LEFT, ANCHOR_BOTTOM }); } - /* - * @see AbstractInformationControlManager#install(Control) - */ + @Override public void install(Control control) { if (fProposalTable == control) { @@ -120,10 +114,8 @@ class AdditionalInfoController2 extends AbstractInformationControlManager implem } } - /* - * @see AbstractInformationControlManager#disposeInformationControl() - */ - public void disposeInformationControl() { + @Override + public void disposeInformationControl() { synchronized (fThreadAccess) { if (fThread != null) { @@ -140,9 +132,7 @@ class AdditionalInfoController2 extends AbstractInformationControlManager implem super.disposeInformationControl(); } - /* - * @see java.lang.Runnable#run() - */ + @Override public void run() { try { while (true) { @@ -170,6 +160,7 @@ class AdditionalInfoController2 extends AbstractInformationControlManager implem if (fProposalTable != null && !fProposalTable.isDisposed()) { fProposalTable.getDisplay().asyncExec(new Runnable() { + @Override public void run() { if (!fIsReset) showInformation(); @@ -201,9 +192,7 @@ class AdditionalInfoController2 extends AbstractInformationControlManager implem } } - /* - * @see AbstractInformationControlManager#computeInformation() - */ + @Override protected void computeInformation() { if (fProposalTable == null || fProposalTable.isDisposed()) @@ -239,9 +228,7 @@ class AdditionalInfoController2 extends AbstractInformationControlManager implem } } - /* - * @see org.eclipse.jface.text.AbstractInformationControlManager#computeSizeConstraints(Control, IInformationControl) - */ + @Override protected Point computeSizeConstraints(Control subjectControl, IInformationControl informationControl) { // at least as big as the proposal table Point sizeConstraint= super.computeSizeConstraints(subjectControl, informationControl); diff --git a/org.eclipse.jface.text/src/org/eclipse/jface/internal/text/link/contentassist/CompletionProposalPopup2.java b/org.eclipse.jface.text/src/org/eclipse/jface/internal/text/link/contentassist/CompletionProposalPopup2.java index 712b33e2c77..188df4e69ac 100644 --- a/org.eclipse.jface.text/src/org/eclipse/jface/internal/text/link/contentassist/CompletionProposalPopup2.java +++ b/org.eclipse.jface.text/src/org/eclipse/jface/internal/text/link/contentassist/CompletionProposalPopup2.java @@ -114,10 +114,12 @@ class CompletionProposalPopup2 implements IContentAssistListener2 { private final IEditingSupport fFocusEditingSupport= new IEditingSupport() { + @Override public boolean isOriginator(DocumentEvent event, IRegion focus) { return false; } + @Override public boolean ownsFocusShell() { return Helper2.okToUse(fProposalShell) && fProposalShell.isFocusControl() || Helper2.okToUse(fProposalTable) && fProposalTable.isFocusControl(); @@ -126,6 +128,7 @@ class CompletionProposalPopup2 implements IContentAssistListener2 { }; private final IEditingSupport fModificationEditingSupport= new IEditingSupport() { + @Override public boolean isOriginator(DocumentEvent event, IRegion focus) { if (fViewer != null) { Point selection= fViewer.getSelectedRange(); @@ -134,6 +137,7 @@ class CompletionProposalPopup2 implements IContentAssistListener2 { return false; } + @Override public boolean ownsFocusShell() { return false; } @@ -166,6 +170,7 @@ class CompletionProposalPopup2 implements IContentAssistListener2 { if (fKeyListener == null) { fKeyListener= new KeyListener() { + @Override public void keyPressed(KeyEvent e) { if (!Helper2.okToUse(fProposalShell)) return; @@ -178,6 +183,7 @@ class CompletionProposalPopup2 implements IContentAssistListener2 { } } + @Override public void keyReleased(KeyEvent e) { if (!Helper2.okToUse(fProposalShell)) return; @@ -294,8 +300,10 @@ class CompletionProposalPopup2 implements IContentAssistListener2 { if (fAdditionalInfoController != null) { fProposalShell.addControlListener(new ControlListener() { + @Override public void controlMoved(ControlEvent e) {} + @Override public void controlResized(ControlEvent e) { // resets the cached resize constraints fAdditionalInfoController.setSizeConstraints(50, 10, true, false); @@ -313,8 +321,10 @@ class CompletionProposalPopup2 implements IContentAssistListener2 { fProposalTable.addSelectionListener(new SelectionListener() { + @Override public void widgetSelected(SelectionEvent e) {} + @Override public void widgetDefaultSelected(SelectionEvent e) { selectProposalWithMask(e.stateMask); } @@ -323,6 +333,7 @@ class CompletionProposalPopup2 implements IContentAssistListener2 { fPopupCloser.install(fContentAssistant, fProposalTable); fProposalShell.addDisposeListener(new DisposeListener() { + @Override public void widgetDisposed(DisposeEvent e) { unregister(); // but don't dispose the shell, since we're being called from its disposal event! } @@ -660,11 +671,13 @@ class CompletionProposalPopup2 implements IContentAssistListener2 { if (fDocumentListener == null) fDocumentListener= new IDocumentListener() { + @Override public void documentAboutToBeChanged(DocumentEvent event) { if (!fInserting) fDocumentEvents.add(event); } + @Override public void documentChanged(DocumentEvent event) { if (!fInserting) filterProposals(); @@ -695,9 +708,7 @@ class CompletionProposalPopup2 implements IContentAssistListener2 { } } - /* - * @see IContentAssistListener#verifyKey(VerifyEvent) - */ + @Override public boolean verifyKey(VerifyEvent e) { if (!Helper2.okToUse(fProposalShell)) return true; @@ -842,9 +853,7 @@ class CompletionProposalPopup2 implements IContentAssistListener2 { return false; } - /* - * @see IEventConsumer#processEvent(VerifyEvent) - */ + @Override public void processEvent(VerifyEvent e) { } @@ -856,6 +865,7 @@ class CompletionProposalPopup2 implements IContentAssistListener2 { Control control= fViewer.getTextWidget(); control.getDisplay().asyncExec(new Runnable() { long fCounter= fInvocationCounter; + @Override public void run() { if (fCounter != fInvocationCounter) diff --git a/org.eclipse.jface.text/src/org/eclipse/jface/internal/text/link/contentassist/ContentAssistant2.java b/org.eclipse.jface.text/src/org/eclipse/jface/internal/text/link/contentassist/ContentAssistant2.java index 823674e267b..e9df55d5d16 100644 --- a/org.eclipse.jface.text/src/org/eclipse/jface/internal/text/link/contentassist/ContentAssistant2.java +++ b/org.eclipse.jface.text/src/org/eclipse/jface/internal/text/link/contentassist/ContentAssistant2.java @@ -134,49 +134,35 @@ public class ContentAssistant2 implements IContentAssistant, IContentAssistantEx fViewer.removeViewportListener(this); } - /* - * @see ControlListener#controlResized(ControlEvent) - */ + @Override public void controlResized(ControlEvent e) { hide(); } - /* - * @see ControlListener#controlMoved(ControlEvent) - */ + @Override public void controlMoved(ControlEvent e) { hide(); } - /* - * @see MouseListener#mouseDown(MouseEvent) - */ + @Override public void mouseDown(MouseEvent e) { hide(); } - /* - * @see MouseListener#mouseUp(MouseEvent) - */ + @Override public void mouseUp(MouseEvent e) { } - /* - * @see MouseListener#mouseDoubleClick(MouseEvent) - */ + @Override public void mouseDoubleClick(MouseEvent e) { hide(); } - /* - * @see FocusListener#focusGained(FocusEvent) - */ + @Override public void focusGained(FocusEvent e) { } - /* - * @see FocusListener#focusLost(FocusEvent) - */ + @Override public void focusLost(FocusEvent e) { if (fViewer != null) { Control control= fViewer.getTextWidget(); @@ -184,6 +170,7 @@ public class ContentAssistant2 implements IContentAssistant, IContentAssistantEx Display d= control.getDisplay(); if (d != null) { d.asyncExec(new Runnable() { + @Override public void run() { if (!hasFocus()) hide(); @@ -197,6 +184,7 @@ public class ContentAssistant2 implements IContentAssistant, IContentAssistantEx /* * @seeDisposeListener#widgetDisposed(DisposeEvent) */ + @Override public void widgetDisposed(DisposeEvent e) { /* * 1GGYYWK: ITPJUI:ALL - Dismissing editor with code assist up causes lots of Internal Errors @@ -204,9 +192,7 @@ public class ContentAssistant2 implements IContentAssistant, IContentAssistantEx hide(); } - /* - * @see IViewportListener#viewportChanged(int) - */ + @Override public void viewportChanged(int topIndex) { if (System.currentTimeMillis() > fViewportListenerStartTime) hide(); @@ -241,6 +227,7 @@ public class ContentAssistant2 implements IContentAssistant, IContentAssistantEx fThread.start(); } + @Override public void run() { try { while (true) { @@ -284,6 +271,7 @@ public class ContentAssistant2 implements IContentAssistant, IContentAssistantEx return false; } + @Override public void verifyKey(VerifyEvent e) { // Only act on typed characters and ignore modifier-only events if (e.character == 0 && (e.keyCode & SWT.KEYCODE_BIT) == 0) @@ -321,6 +309,7 @@ public class ContentAssistant2 implements IContentAssistant, IContentAssistantEx if (d != null) { try { d.syncExec(new Runnable() { + @Override public void run() { if (showStyle == SHOW_PROPOSALS) fProposalPopup.showProposals(true); @@ -378,6 +367,7 @@ public class ContentAssistant2 implements IContentAssistant, IContentAssistantEx type == LAYOUT_CONTEXT_SELECTOR || type == LAYOUT_CONTEXT_INFO_POPUP); } + @Override public void handleEvent(Event event) { Widget source= event.widget; source.removeListener(SWT.Dispose, this); @@ -624,6 +614,7 @@ public class ContentAssistant2 implements IContentAssistant, IContentAssistantEx * @param e the verify event * @see VerifyKeyListener#verifyKey(org.eclipse.swt.events.VerifyEvent) */ + @Override public void verifyKey(VerifyEvent e) { IContentAssistListener2[] listeners= (IContentAssistListener2[]) fListeners.clone(); for (int i= 0; i < listeners.length; i++) { @@ -637,6 +628,7 @@ public class ContentAssistant2 implements IContentAssistant, IContentAssistantEx /* * @see IEventConsumer#processEvent */ + @Override public void processEvent(VerifyEvent event) { installKeyListener(); @@ -737,6 +729,7 @@ public class ContentAssistant2 implements IContentAssistant, IContentAssistantEx */ private IInformationControlCreator getInformationControlCreator() { return new IInformationControlCreator() { + @Override public IInformationControl createInformationControl(Shell parent) { return new DefaultInformationControl(parent, false); } @@ -753,10 +746,7 @@ public class ContentAssistant2 implements IContentAssistant, IContentAssistantEx fPartitioning= partitioning; } - /* - * @see org.eclipse.jface.text.contentassist.IContentAssistantExtension#getDocumentPartitioning() - * @since 3.0 - */ + @Override public String getDocumentPartitioning() { return fPartitioning; } @@ -785,6 +775,7 @@ public class ContentAssistant2 implements IContentAssistant, IContentAssistantEx /* * @see IContentAssistant#getContentAssistProcessor */ + @Override public IContentAssistProcessor getContentAssistProcessor(String contentType) { if (fProcessors == null) return null; @@ -1007,6 +998,7 @@ public class ContentAssistant2 implements IContentAssistant, IContentAssistantEx /* * @see IContentAssist#install */ + @Override public void install(ITextViewer textViewer) { Assert.isNotNull(textViewer); @@ -1028,6 +1020,7 @@ public class ContentAssistant2 implements IContentAssistant, IContentAssistantEx /* * @see IContentAssist#uninstall */ + @Override public void uninstall() { if (fProposalPopup != null) @@ -1261,6 +1254,7 @@ public class ContentAssistant2 implements IContentAssistant, IContentAssistantEx /* * @see IContentAssist#showPossibleCompletions */ + @Override public String showPossibleCompletions() { return fProposalPopup.showProposals(false); } @@ -1293,6 +1287,7 @@ public class ContentAssistant2 implements IContentAssistant, IContentAssistantEx /* * @see IContentAssist#showContextInformation */ + @Override public String showContextInformation() { return fContextInfoPopup.showContextProposals(false); } @@ -1456,10 +1451,7 @@ public class ContentAssistant2 implements IContentAssistant, IContentAssistantEx return p != null ? p.getContextInformationAutoActivationCharacters() : null; } - /* - * @see org.eclipse.jface.text.IWidgetTokenKeeper#requestWidgetToken(IWidgetTokenOwner) - * @since 2.0 - */ + @Override public boolean requestWidgetToken(IWidgetTokenOwner owner) { hidePossibleCompletions(); return true; @@ -1493,10 +1485,7 @@ public class ContentAssistant2 implements IContentAssistant, IContentAssistantEx fProposals= proposals; } - /* - * @see org.eclipse.jface.text.IWidgetTokenKeeperExtension#requestWidgetToken(org.eclipse.jface.text.IWidgetTokenOwner, int) - * @since 3.0 - */ + @Override public boolean requestWidgetToken(IWidgetTokenOwner owner, int priority) { if (priority > WIDGET_PRIORITY) { hidePossibleCompletions(); @@ -1505,10 +1494,7 @@ public class ContentAssistant2 implements IContentAssistant, IContentAssistantEx return false; } - /* - * @see org.eclipse.jface.text.IWidgetTokenKeeperExtension#setFocus(org.eclipse.jface.text.IWidgetTokenOwner) - * @since 3.0 - */ + @Override public boolean setFocus(IWidgetTokenOwner owner) { if (fProposalPopup != null) { fProposalPopup.setFocus(); @@ -1527,9 +1513,7 @@ public class ContentAssistant2 implements IContentAssistant, IContentAssistantEx || (fContextInfoPopup != null && fContextInfoPopup.hasFocus()); } - /* - * @see org.eclipse.jface.text.contentassist.IContentAssistantExtension#completePrefix() - */ + @Override public String completePrefix() { return null; } diff --git a/org.eclipse.jface.text/src/org/eclipse/jface/internal/text/link/contentassist/ContextInformationPopup2.java b/org.eclipse.jface.text/src/org/eclipse/jface/internal/text/link/contentassist/ContextInformationPopup2.java index 9b4c70da53f..766c134b338 100644 --- a/org.eclipse.jface.text/src/org/eclipse/jface/internal/text/link/contentassist/ContextInformationPopup2.java +++ b/org.eclipse.jface.text/src/org/eclipse/jface/internal/text/link/contentassist/ContextInformationPopup2.java @@ -107,6 +107,7 @@ class ContextInformationPopup2 implements IContentAssistListener2 { public String showContextProposals(final boolean autoActivated) { final StyledText styledText= fViewer.getTextWidget(); BusyIndicator.showWhile(styledText.getDisplay(), new Runnable() { + @Override public void run() { int position= fViewer.getSelectedRange().x; @@ -145,6 +146,7 @@ class ContextInformationPopup2 implements IContentAssistListener2 { public void showContextInformation(final IContextInformation info, final int position) { Control control= fViewer.getTextWidget(); BusyIndicator.showWhile(control.getDisplay(), new Runnable() { + @Override public void run() { internalShowContextInfo(info, position); hideContextSelector(); @@ -347,9 +349,11 @@ class ContextInformationPopup2 implements IContentAssistListener2 { fContextSelectorTable.setForeground(c); fContextSelectorTable.addSelectionListener(new SelectionListener() { + @Override public void widgetSelected(SelectionEvent e) { } + @Override public void widgetDefaultSelected(SelectionEvent e) { insertSelectedContext(); hideContextSelector(); @@ -459,9 +463,7 @@ class ContextInformationPopup2 implements IContentAssistListener2 { return (Helper2.okToUse(fContextInfoPopup) || Helper2.okToUse(fContextSelectorShell)); } - /* - * @see IContentAssistListener#verifyKey(VerifyEvent) - */ + @Override public boolean verifyKey(VerifyEvent e) { if (Helper2.okToUse(fContextSelectorShell)) return contextSelectorKeyPressed(e); @@ -572,9 +574,7 @@ class ContextInformationPopup2 implements IContentAssistListener2 { return true; } - /* - * @see IEventConsumer#processEvent(VerifyEvent) - */ + @Override public void processEvent(VerifyEvent event) { if (Helper2.okToUse(fContextSelectorShell)) contextSelectorProcessEvent(event); @@ -621,6 +621,7 @@ class ContextInformationPopup2 implements IContentAssistListener2 { private ContextFrame fFrame= (ContextFrame) fContextFrameStack.peek(); + @Override public void run() { if (Helper2.okToUse(fContextInfoPopup) && fFrame == fContextFrameStack.peek()) { int offset= fViewer.getSelectedRange().x; diff --git a/org.eclipse.jface.text/src/org/eclipse/jface/internal/text/link/contentassist/PopupCloser2.java b/org.eclipse.jface.text/src/org/eclipse/jface/internal/text/link/contentassist/PopupCloser2.java index 28f058f3d65..a8cb2bfb54f 100644 --- a/org.eclipse.jface.text/src/org/eclipse/jface/internal/text/link/contentassist/PopupCloser2.java +++ b/org.eclipse.jface.text/src/org/eclipse/jface/internal/text/link/contentassist/PopupCloser2.java @@ -79,33 +79,26 @@ class PopupCloser2 extends ShellAdapter implements FocusListener, SelectionListe fTable.removeFocusListener(this); } - /* - * @see org.eclipse.swt.events.SelectionListener#widgetSelected(org.eclipse.swt.events.SelectionEvent) - */ + @Override public void widgetSelected(SelectionEvent e) { fScrollbarClicked= true; } - /* - * @see org.eclipse.swt.events.SelectionListener#widgetDefaultSelected(org.eclipse.swt.events.SelectionEvent) - */ + @Override public void widgetDefaultSelected(SelectionEvent e) { fScrollbarClicked= true; } - /* - * @see org.eclipse.swt.events.FocusListener#focusGained(org.eclipse.swt.events.FocusEvent) - */ + @Override public void focusGained(FocusEvent e) { } - /* - * @see org.eclipse.swt.events.FocusListener#focusLost(org.eclipse.swt.events.FocusEvent) - */ + @Override public void focusLost(final FocusEvent e) { fScrollbarClicked= false; Display d= fTable.getDisplay(); d.asyncExec(new Runnable() { + @Override public void run() { if (Helper2.okToUse(fTable) && !fTable.isFocusControl() && !fScrollbarClicked && fContentAssistant != null) fContentAssistant.popupFocusLost(e); @@ -113,20 +106,14 @@ class PopupCloser2 extends ShellAdapter implements FocusListener, SelectionListe }); } - /* - * @see org.eclipse.swt.events.ShellAdapter#shellDeactivated(org.eclipse.swt.events.ShellEvent) - * @since 3.1 - */ + @Override public void shellDeactivated(ShellEvent e) { if (fContentAssistant != null) fContentAssistant.hide(); } - /* - * @see org.eclipse.swt.events.ShellAdapter#shellClosed(org.eclipse.swt.events.ShellEvent) - * @since 3.1 - */ + @Override public void shellClosed(ShellEvent e) { if (fContentAssistant != null) fContentAssistant.hide(); diff --git a/org.eclipse.jface.text/src/org/eclipse/jface/internal/text/revisions/ChangeRegion.java b/org.eclipse.jface.text/src/org/eclipse/jface/internal/text/revisions/ChangeRegion.java index 86cac108ed0..ac3aeef7648 100644 --- a/org.eclipse.jface.text/src/org/eclipse/jface/internal/text/revisions/ChangeRegion.java +++ b/org.eclipse.jface.text/src/org/eclipse/jface/internal/text/revisions/ChangeRegion.java @@ -156,9 +156,7 @@ public final class ChangeRegion { return Math.max(0, cutCount); } - /* - * @see java.lang.Object#toString() - */ + @Override public String toString() { return "ChangeRegion [" + fRevision.toString() + ", [" + fLines.getStartLine() + "+" + fLines.getNumberOfLines() + ")]"; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ } diff --git a/org.eclipse.jface.text/src/org/eclipse/jface/internal/text/revisions/Hunk.java b/org.eclipse.jface.text/src/org/eclipse/jface/internal/text/revisions/Hunk.java index 8e1292f4f0a..467cdb34b97 100644 --- a/org.eclipse.jface.text/src/org/eclipse/jface/internal/text/revisions/Hunk.java +++ b/org.eclipse.jface.text/src/org/eclipse/jface/internal/text/revisions/Hunk.java @@ -48,16 +48,12 @@ public final class Hunk { this.changed= changed; } - /* - * @see java.lang.Object#toString() - */ + @Override public String toString() { return "Hunk [" + line + ">" + changed + (delta < 0 ? "-" : "+") + Math.abs(delta) + "]"; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ } - /* - * @see java.lang.Object#hashCode() - */ + @Override public int hashCode() { final int prime= 31; int result= 1; @@ -67,9 +63,7 @@ public final class Hunk { return result; } - /* - * @see java.lang.Object#equals(java.lang.Object) - */ + @Override public boolean equals(Object obj) { if (obj == this) return true; diff --git a/org.eclipse.jface.text/src/org/eclipse/jface/internal/text/revisions/Range.java b/org.eclipse.jface.text/src/org/eclipse/jface/internal/text/revisions/Range.java index ade2d13961d..4aa56247cf7 100644 --- a/org.eclipse.jface.text/src/org/eclipse/jface/internal/text/revisions/Range.java +++ b/org.eclipse.jface.text/src/org/eclipse/jface/internal/text/revisions/Range.java @@ -86,16 +86,12 @@ public final class Range implements ILineRange, Cloneable { setLength(length); } - /* - * @see org.eclipse.jface.text.source.ILineRange#getStartLine() - */ + @Override public int getStartLine() { return start(); } - /* - * @see org.eclipse.jface.text.source.ILineRange#getNumberOfLines() - */ + @Override public int getNumberOfLines() { return length(); } @@ -258,9 +254,7 @@ public final class Range implements ILineRange, Cloneable { return range.getStartLine() == start() && range.getNumberOfLines() == length(); } - /* - * @see java.lang.Object#clone() - */ + @Override public Object clone() { return Range.copy(this); } diff --git a/org.eclipse.jface.text/src/org/eclipse/jface/internal/text/revisions/RevisionPainter.java b/org.eclipse.jface.text/src/org/eclipse/jface/internal/text/revisions/RevisionPainter.java index ced3ca81b8d..2fbbb36dea9 100644 --- a/org.eclipse.jface.text/src/org/eclipse/jface/internal/text/revisions/RevisionPainter.java +++ b/org.eclipse.jface.text/src/org/eclipse/jface/internal/text/revisions/RevisionPainter.java @@ -290,9 +290,7 @@ public final class RevisionPainter { } } - /* - * @see org.eclipse.swt.widgets.Listener#handleEvent(org.eclipse.swt.widgets.Event) - */ + @Override public void handleEvent(Event event) { switch (event.type) { case SWT.MouseVerticalWheel: @@ -309,29 +307,21 @@ public final class RevisionPainter { } } - /* - * @see org.eclipse.swt.events.MouseTrackListener#mouseEnter(org.eclipse.swt.events.MouseEvent) - */ + @Override public void mouseEnter(MouseEvent e) { updateFocusLine(toDocumentLineNumber(e.y)); } - /* - * @see org.eclipse.swt.events.MouseTrackListener#mouseExit(org.eclipse.swt.events.MouseEvent) - */ + @Override public void mouseExit(MouseEvent e) { updateFocusLine(-1); } - /* - * @see org.eclipse.swt.events.MouseTrackListener#mouseHover(org.eclipse.swt.events.MouseEvent) - */ + @Override public void mouseHover(MouseEvent e) { } - /* - * @see org.eclipse.swt.events.MouseMoveListener#mouseMove(org.eclipse.swt.events.MouseEvent) - */ + @Override public void mouseMove(MouseEvent e) { updateFocusLine(toDocumentLineNumber(e.y)); } @@ -341,9 +331,7 @@ public final class RevisionPainter { * Internal listener class that will update the ruler when the underlying model changes. */ private class AnnotationListener implements IAnnotationModelListener { - /* - * @see org.eclipse.jface.text.source.IAnnotationModelListener#modelChanged(org.eclipse.jface.text.source.IAnnotationModel) - */ + @Override public void modelChanged(IAnnotationModel model) { clearRangeCache(); postRedraw(); @@ -361,9 +349,7 @@ public final class RevisionPainter { fIsFocusable= isFocusable; } - /* - * @see org.eclipse.jface.internal.text.revisions.AbstractReusableInformationControlCreator#doCreateInformationControl(org.eclipse.swt.widgets.Shell) - */ + @Override protected IInformationControl doCreateInformationControl(Shell parent) { if (BrowserInformationControl.isAvailable(parent)) { return new BrowserInformationControl(parent, JFaceResources.DIALOG_FONT, fIsFocusable) { @@ -372,7 +358,9 @@ public final class RevisionPainter { * * @deprecated use {@link #setInput(Object)} */ - public void setInformation(String content) { + @Deprecated + @Override + public void setInformation(String content) { content= addCSSToHTMLFragment(content); super.setInformation(content); } @@ -402,9 +390,7 @@ public final class RevisionPainter { return new DefaultInformationControl(parent, fIsFocusable); } - /* - * @see org.eclipse.jface.text.AbstractReusableInformationControlCreator#canReplace(org.eclipse.jface.text.IInformationControlCreator) - */ + @Override public boolean canReplace(IInformationControlCreator creator) { return creator.getClass() == getClass() && ((HoverInformationControlCreator) creator).fIsFocusable == fIsFocusable; @@ -448,18 +434,13 @@ public final class RevisionPainter { */ private final class RevisionHover implements IAnnotationHover, IAnnotationHoverExtension, IAnnotationHoverExtension2, IInformationProviderExtension2 { - /* - * @see org.eclipse.jface.text.source.IAnnotationHover#getHoverInfo(org.eclipse.jface.text.source.ISourceViewer, - * int) - */ + @Override public String getHoverInfo(ISourceViewer sourceViewer, int lineNumber) { Object info= getHoverInfo(sourceViewer, getHoverLineRange(sourceViewer, lineNumber), 0); return info == null ? null : info.toString(); } - /* - * @see org.eclipse.jface.text.source.IAnnotationHoverExtension#getHoverControlCreator() - */ + @Override public IInformationControlCreator getHoverControlCreator() { RevisionInformation revisionInfo= fRevisionInfo; if (revisionInfo != null) { @@ -470,43 +451,31 @@ public final class RevisionPainter { return new HoverInformationControlCreator(false); } - /* - * @see org.eclipse.jface.text.source.IAnnotationHoverExtension#canHandleMouseCursor() - */ + @Override public boolean canHandleMouseCursor() { return false; } - /* - * @see org.eclipse.jface.text.source.IAnnotationHoverExtension2#canHandleMouseWheel() - */ + @Override public boolean canHandleMouseWheel() { return true; } - /* - * @see org.eclipse.jface.text.source.IAnnotationHoverExtension#getHoverInfo(org.eclipse.jface.text.source.ISourceViewer, - * org.eclipse.jface.text.source.ILineRange, int) - */ + @Override public Object getHoverInfo(ISourceViewer sourceViewer, ILineRange lineRange, int visibleNumberOfLines) { RevisionRange range= getRange(lineRange.getStartLine()); Object info= range == null ? null : range.getRevision().getHoverInfo(); return info; } - /* - * @see org.eclipse.jface.text.source.IAnnotationHoverExtension#getHoverLineRange(org.eclipse.jface.text.source.ISourceViewer, - * int) - */ + @Override public ILineRange getHoverLineRange(ISourceViewer viewer, int lineNumber) { RevisionRange range= getRange(lineNumber); return range == null ? null : new LineRange(lineNumber, 1); } - /* - * @see org.eclipse.jface.text.information.IInformationProviderExtension2#getInformationPresenterControlCreator() - */ - public IInformationControlCreator getInformationPresenterControlCreator() { + @Override + public IInformationControlCreator getInformationPresenterControlCreator() { RevisionInformation revisionInfo= fRevisionInfo; if (revisionInfo != null) { IInformationControlCreator creator= revisionInfo.getInformationPresenterControlCreator(); @@ -756,9 +725,7 @@ public final class RevisionPainter { fControl.addListener(SWT.MouseUp, fMouseHandler); fControl.addListener(SWT.MouseDown, fMouseHandler); fControl.addDisposeListener(new DisposeListener() { - /* - * @see org.eclipse.swt.events.DisposeListener#widgetDisposed(org.eclipse.swt.events.DisposeEvent) - */ + @Override public void widgetDisposed(DisposeEvent e) { handleDispose(); } @@ -1376,6 +1343,7 @@ public final class RevisionPainter { Display d= fControl.getDisplay(); if (d != null) { d.asyncExec(new Runnable() { + @Override public void run() { redraw(); } diff --git a/org.eclipse.jface.text/src/org/eclipse/jface/internal/text/revisions/RevisionSelectionProvider.java b/org.eclipse.jface.text/src/org/eclipse/jface/internal/text/revisions/RevisionSelectionProvider.java index 6469bafb6b2..6108f85117c 100644 --- a/org.eclipse.jface.text/src/org/eclipse/jface/internal/text/revisions/RevisionSelectionProvider.java +++ b/org.eclipse.jface.text/src/org/eclipse/jface/internal/text/revisions/RevisionSelectionProvider.java @@ -51,6 +51,7 @@ public final class RevisionSelectionProvider implements ISelectionProvider { fPostProvider= postProvider; } + @Override public void selectionChanged(SelectionChangedEvent event) { ISelection selection= event.getSelection(); if (selection instanceof ITextSelection) { @@ -97,33 +98,25 @@ public final class RevisionSelectionProvider implements ISelectionProvider { fPainter= painter; } - /* - * @see org.eclipse.jface.viewers.ISelectionProvider#addSelectionChangedListener(org.eclipse.jface.viewers.ISelectionChangedListener) - */ - public void addSelectionChangedListener(ISelectionChangedListener listener) { + @Override + public void addSelectionChangedListener(ISelectionChangedListener listener) { fListeners.add(listener); } - /* - * @see org.eclipse.jface.viewers.ISelectionProvider#removeSelectionChangedListener(org.eclipse.jface.viewers.ISelectionChangedListener) - */ - public void removeSelectionChangedListener(ISelectionChangedListener listener) { + @Override + public void removeSelectionChangedListener(ISelectionChangedListener listener) { fListeners.remove(listener); } - /* - * @see org.eclipse.jface.viewers.ISelectionProvider#getSelection() - */ - public ISelection getSelection() { + @Override + public ISelection getSelection() { if (fSelection == null) return StructuredSelection.EMPTY; return new StructuredSelection(fSelection); } - /* - * @see org.eclipse.jface.viewers.ISelectionProvider#setSelection(org.eclipse.jface.viewers.ISelection) - */ - public void setSelection(ISelection selection) { + @Override + public void setSelection(ISelection selection) { if (fIgnoreEvents) return; if (selection instanceof IStructuredSelection) { diff --git a/org.eclipse.jface.text/src/org/eclipse/jface/internal/text/source/DiffPainter.java b/org.eclipse.jface.text/src/org/eclipse/jface/internal/text/source/DiffPainter.java index 7ecf3f41e06..6f68e1365f4 100644 --- a/org.eclipse.jface.text/src/org/eclipse/jface/internal/text/source/DiffPainter.java +++ b/org.eclipse.jface.text/src/org/eclipse/jface/internal/text/source/DiffPainter.java @@ -50,9 +50,7 @@ public final class DiffPainter { * Internal listener class that will update the ruler when the underlying model changes. */ private class AnnotationListener implements IAnnotationModelListener { - /* - * @see org.eclipse.jface.text.source.IAnnotationModelListener#modelChanged(org.eclipse.jface.text.source.IAnnotationModel) - */ + @Override public void modelChanged(IAnnotationModel model) { postRedraw(); } @@ -180,9 +178,7 @@ public final class DiffPainter { return; fControl.addDisposeListener(new DisposeListener() { - /* - * @see org.eclipse.swt.events.DisposeListener#widgetDisposed(org.eclipse.swt.events.DisposeEvent) - */ + @Override public void widgetDisposed(DisposeEvent e) { handleDispose(); } @@ -367,6 +363,7 @@ public final class DiffPainter { Display d= fControl.getDisplay(); if (d != null) { d.asyncExec(new Runnable() { + @Override public void run() { redraw(); } diff --git a/org.eclipse.jface.text/src/org/eclipse/jface/text/AbstractHoverInformationControlManager.java b/org.eclipse.jface.text/src/org/eclipse/jface/text/AbstractHoverInformationControlManager.java index f136335866b..b14e47d120e 100644 --- a/org.eclipse.jface.text/src/org/eclipse/jface/text/AbstractHoverInformationControlManager.java +++ b/org.eclipse.jface.text/src/org/eclipse/jface/text/AbstractHoverInformationControlManager.java @@ -91,9 +91,7 @@ abstract public class AbstractHoverInformationControlManager extends AbstractInf public Closer() { } - /* - * @see IInformationControlCloser#setSubjectControl(Control) - */ + @Override public void setSubjectControl(Control control) { fSubjectControl= control; } @@ -101,13 +99,12 @@ abstract public class AbstractHoverInformationControlManager extends AbstractInf /* * @see IInformationControlCloser#setHoverControl(IHoverControl) */ + @Override public void setInformationControl(IInformationControl control) { // NOTE: we use getCurrentInformationControl() from the outer class } - /* - * @see IInformationControlCloser#start(Rectangle) - */ + @Override public void start(Rectangle subjectArea) { if (fIsActive) @@ -149,9 +146,7 @@ abstract public class AbstractHoverInformationControlManager extends AbstractInf } } - /* - * @see IInformationControlCloser#stop() - */ + @Override public void stop() { if (!fIsActive) return; @@ -193,9 +188,7 @@ abstract public class AbstractHoverInformationControlManager extends AbstractInf fDisplay= null; } - /* - * @see org.eclipse.swt.events.MouseMoveListener#mouseMove(org.eclipse.swt.events.MouseEvent) - */ + @Override public void mouseMove(MouseEvent event) { if (!hasInformationControlReplacer() || !canMoveIntoInformationControl(getCurrentInformationControl())) { if (!fSubjectArea.contains(event.x, event.y)) { @@ -209,70 +202,49 @@ abstract public class AbstractHoverInformationControlManager extends AbstractInf } } - /* - * @see org.eclipse.swt.events.MouseListener#mouseUp(org.eclipse.swt.events.MouseEvent) - */ + @Override public void mouseUp(MouseEvent event) { } - /* - * @see MouseListener#mouseDown(MouseEvent) - */ + @Override public void mouseDown(MouseEvent event) { hideInformationControl(); } - /* - * @see MouseListener#mouseDoubleClick(MouseEvent) - */ + @Override public void mouseDoubleClick(MouseEvent event) { hideInformationControl(); } - /* - * @see ControlListener#controlResized(ControlEvent) - */ + @Override public void controlResized(ControlEvent event) { hideInformationControl(); } - /* - * @see ControlListener#controlMoved(ControlEvent) - */ + @Override public void controlMoved(ControlEvent event) { hideInformationControl(); } - /* - * @see KeyListener#keyReleased(KeyEvent) - */ + @Override public void keyReleased(KeyEvent event) { } - /* - * @see KeyListener#keyPressed(KeyEvent) - */ + @Override public void keyPressed(KeyEvent event) { hideInformationControl(); } - /* - * @see org.eclipse.swt.events.SelectionListener#widgetSelected(org.eclipse.swt.events.SelectionEvent) - */ + @Override public void widgetSelected(SelectionEvent e) { hideInformationControl(); } - /* - * @see org.eclipse.swt.events.SelectionListener#widgetDefaultSelected(org.eclipse.swt.events.SelectionEvent) - */ + @Override public void widgetDefaultSelected(SelectionEvent e) { } - /* - * @see org.eclipse.swt.widgets.Listener#handleEvent(org.eclipse.swt.widgets.Event) - * @since 3.1 - */ + @Override public void handleEvent(Event event) { switch (event.type) { case SWT.Activate: @@ -315,6 +287,7 @@ abstract public class AbstractHoverInformationControlManager extends AbstractInf delayedICP.setDelayedInputChangeListener(inputChangeListener); // cancel automatic input updating after a small timeout: control.getShell().getDisplay().timerExec(1000, new Runnable() { + @Override public void run() { delayedICP.setDelayedInputChangeListener(null); } @@ -323,6 +296,7 @@ abstract public class AbstractHoverInformationControlManager extends AbstractInf // XXX: workaround for https://bugs.eclipse.org/bugs/show_bug.cgi?id=212392 : control.getShell().getDisplay().asyncExec(new Runnable() { + @Override public void run() { replaceInformationControl(true); } @@ -490,6 +464,7 @@ abstract public class AbstractHoverInformationControlManager extends AbstractInf * * @param event the mouse hover event */ + @Override public void mouseHover(MouseEvent event) { if (fIsComputing || fIsInRestartMode || (fSubjectControl != null && !fSubjectControl.isDisposed() && fSubjectControl.getShell() != fSubjectControl.getShell().getDisplay().getActiveShell())) { @@ -535,15 +510,11 @@ abstract public class AbstractHoverInformationControlManager extends AbstractInf } } - /* - * @see MouseTrackListener#mouseEnter(MouseEvent) - */ + @Override public void mouseEnter(MouseEvent e) { } - /* - * @see MouseTrackListener#mouseExit(MouseEvent) - */ + @Override public void mouseExit(MouseEvent e) { if (!hasInformationControlReplacer() || !canMoveIntoInformationControl(getCurrentInformationControl()) || !inKeepUpZone(e.x, e.y, fSubjectControl, fSubjectArea, false)) { fMouseLostWhileComputing= true; @@ -551,9 +522,7 @@ abstract public class AbstractHoverInformationControlManager extends AbstractInf } } - /* - * @see MouseMoveListener#mouseMove(MouseEvent) - */ + @Override public void mouseMove(MouseEvent event) { if (!hasInformationControlReplacer() || !canMoveIntoInformationControl(getCurrentInformationControl())) { if (!fSubjectArea.contains(event.x, event.y)) @@ -564,17 +533,13 @@ abstract public class AbstractHoverInformationControlManager extends AbstractInf } } - /* - * @see ShellListener#shellDeactivated(ShellEvent) - */ + @Override public void shellDeactivated(ShellEvent e) { fShellDeactivatedWhileComputing= true; deactivate(); } - /* - * @see ShellListener#shellIconified(ShellEvent) - */ + @Override public void shellIconified(ShellEvent e) { fShellDeactivatedWhileComputing= true; deactivate(); @@ -780,9 +745,7 @@ abstract public class AbstractHoverInformationControlManager extends AbstractInf return fEnrichMode != null && canReplace(iControl); } - /* - * @see org.eclipse.jface.text.AbstractInformationControlManager#hideInformationControl() - */ + @Override protected void hideInformationControl() { cancelReplacingDelay(); super.hideInformationControl(); @@ -801,9 +764,7 @@ abstract public class AbstractHoverInformationControlManager extends AbstractInf fEnrichMode= mode; } - /* - * @see org.eclipse.jface.text.AbstractInformationControlManager#replaceInformationControl(boolean) - */ + @Override void replaceInformationControl(boolean takeFocus) { fWaitForMouseUp= false; super.replaceInformationControl(takeFocus); @@ -858,11 +819,13 @@ abstract public class AbstractHoverInformationControlManager extends AbstractInf } fReplacingDelayJob= new Job("AbstractHoverInformationControlManager Replace Delayer") { //$NON-NLS-1$ + @Override public IStatus run(final IProgressMonitor monitor) { if (monitor.isCanceled() || display.isDisposed()) { return Status.CANCEL_STATUS; } display.syncExec(new Runnable() { + @Override public void run() { fReplacingDelayJob= null; if (monitor.isCanceled()) @@ -881,9 +844,7 @@ abstract public class AbstractHoverInformationControlManager extends AbstractInf fReplacingDelayJob.schedule(HOVER_AUTO_REPLACING_DELAY); } - /* - * @see org.eclipse.jface.text.AbstractInformationControlManager#presentInformation() - */ + @Override protected void presentInformation() { if (fMouseTracker == null) { super.presentInformation(); @@ -907,6 +868,8 @@ abstract public class AbstractHoverInformationControlManager extends AbstractInf * {@inheritDoc} * @deprecated visibility will be changed to protected */ + @Deprecated + @Override public void setEnabled(boolean enabled) { boolean was= isEnabled(); @@ -924,6 +887,7 @@ abstract public class AbstractHoverInformationControlManager extends AbstractInf /** * Disposes this manager's information control. */ + @Override public void dispose() { if (fMouseTracker != null) { fMouseTracker.stop(); @@ -972,8 +936,10 @@ abstract public class AbstractHoverInformationControlManager extends AbstractInf * @noreference This method is not intended to be referenced by clients. * @nooverride This method is not intended to be re-implemented or extended by clients. */ + @Override public InternalAccessor getInternalAccessor() { return new MyInternalAccessor() { + @Override public void setHoverEnrichMode(EnrichMode mode) { AbstractHoverInformationControlManager.this.setHoverEnrichMode(mode); } diff --git a/org.eclipse.jface.text/src/org/eclipse/jface/text/AbstractInformationControl.java b/org.eclipse.jface.text/src/org/eclipse/jface/text/AbstractInformationControl.java index 4d0c8ec9c8b..68c0e1d56a7 100644 --- a/org.eclipse.jface.text/src/org/eclipse/jface/text/AbstractInformationControl.java +++ b/org.eclipse.jface.text/src/org/eclipse/jface/text/AbstractInformationControl.java @@ -169,6 +169,7 @@ public abstract class AbstractInformationControl implements IInformationControl, * * @deprecated clients should use one of the public constructors */ + @Deprecated AbstractInformationControl(Shell parentShell, int shellStyle, final String statusFieldText, final ToolBarManager toolBarManager) { Assert.isTrue(statusFieldText == null || toolBarManager == null); fResizeHandleSize= -1; @@ -198,6 +199,7 @@ public abstract class AbstractInformationControl implements IInformationControl, createStatusComposite(statusFieldText, toolBarManager, foreground, background); addDisposeListener(new DisposeListener() { + @Override public void widgetDisposed(DisposeEvent e) { handleDispose(); } @@ -288,6 +290,7 @@ public abstract class AbstractInformationControl implements IInformationControl, data.heightHint= size; resizer.setLayoutData(data); resizer.addPaintListener(new PaintListener() { + @Override public void paintControl(PaintEvent e) { Point s= resizer.getSize(); int x= s.x - 2; @@ -325,6 +328,7 @@ public abstract class AbstractInformationControl implements IInformationControl, MouseAdapter resizeSupport= new MouseAdapter() { private MouseMoveListener fResizeListener; + @Override public void mouseDown(MouseEvent e) { Rectangle shellBounds= fShell.getBounds(); final int shellX= shellBounds.x; @@ -335,6 +339,7 @@ public abstract class AbstractInformationControl implements IInformationControl, final int mouseX= mouseLoc.x; final int mouseY= mouseLoc.y; fResizeListener= new MouseMoveListener() { + @Override public void mouseMove(MouseEvent e2) { Point mouseLoc2= resizer.toDisplay(e2.x, e2.y); int dx= mouseLoc2.x - mouseX; @@ -350,6 +355,7 @@ public abstract class AbstractInformationControl implements IInformationControl, resizer.addMouseMoveListener(fResizeListener); } + @Override public void mouseUp(MouseEvent e) { resizer.removeMouseMoveListener(fResizeListener); fResizeListener= null; @@ -381,6 +387,7 @@ public abstract class AbstractInformationControl implements IInformationControl, MouseAdapter moveSupport= new MouseAdapter() { private MouseMoveListener fMoveListener; + @Override public void mouseDown(MouseEvent e) { Point shellLoc= fShell.getLocation(); final int shellX= shellLoc.x; @@ -389,6 +396,7 @@ public abstract class AbstractInformationControl implements IInformationControl, final int mouseX= mouseLoc.x; final int mouseY= mouseLoc.y; fMoveListener= new MouseMoveListener() { + @Override public void mouseMove(MouseEvent e2) { Point mouseLoc2= control.toDisplay(e2.x, e2.y); int dx= mouseLoc2.x - mouseX; @@ -399,6 +407,7 @@ public abstract class AbstractInformationControl implements IInformationControl, control.addMouseMoveListener(fMoveListener); } + @Override public void mouseUp(MouseEvent e) { control.removeMouseMoveListener(fMoveListener); fMoveListener= null; @@ -481,6 +490,7 @@ public abstract class AbstractInformationControl implements IInformationControl, * * @see org.eclipse.jface.text.IInformationControl#setInformation(java.lang.String) */ + @Override public void setInformation(String information) { } @@ -495,9 +505,7 @@ public abstract class AbstractInformationControl implements IInformationControl, return fResizable; } - /* - * @see IInformationControl#setVisible(boolean) - */ + @Override public void setVisible(boolean visible) { if (fShell.isVisible() == visible) return; @@ -505,9 +513,7 @@ public abstract class AbstractInformationControl implements IInformationControl, fShell.setVisible(visible); } - /* - * @see IInformationControl#dispose() - */ + @Override public void dispose() { if (fShell != null && !fShell.isDisposed()) fShell.dispose(); @@ -530,23 +536,17 @@ public abstract class AbstractInformationControl implements IInformationControl, } } - /* - * @see IInformationControl#setSize(int, int) - */ + @Override public void setSize(int width, int height) { fShell.setSize(width, height); } - /* - * @see IInformationControl#setLocation(Point) - */ + @Override public void setLocation(Point location) { fShell.setLocation(location); } - /* - * @see IInformationControl#setSizeConstraints(int, int) - */ + @Override public void setSizeConstraints(int maxWidth, int maxHeight) { fSizeConstraints= new Point(maxWidth, maxHeight); } @@ -561,9 +561,7 @@ public abstract class AbstractInformationControl implements IInformationControl, return fSizeConstraints != null ? Geometry.copy(fSizeConstraints) : null; } - /* - * @see IInformationControl#computeSizeHint() - */ + @Override public Point computeSizeHint() { // XXX: Verify whether this is a good default implementation. If yes, document it. Point constrains= getSizeConstraints(); @@ -580,6 +578,7 @@ public abstract class AbstractInformationControl implements IInformationControl, * * @see org.eclipse.jface.text.IInformationControlExtension3#computeTrim() */ + @Override public Rectangle computeTrim() { Rectangle trim= fShell.computeTrim(0, 0, 0, 0); @@ -589,9 +588,7 @@ public abstract class AbstractInformationControl implements IInformationControl, return trim; } - /* - * @see org.eclipse.jface.text.IInformationControlExtension3#getBounds() - */ + @Override public Rectangle getBounds() { return fShell.getBounds(); } @@ -603,6 +600,7 @@ public abstract class AbstractInformationControl implements IInformationControl, * </p> * @see org.eclipse.jface.text.IInformationControlExtension3#restoresLocation() */ + @Override public boolean restoresLocation() { return false; } @@ -614,34 +612,27 @@ public abstract class AbstractInformationControl implements IInformationControl, * </p> * @see org.eclipse.jface.text.IInformationControlExtension3#restoresSize() */ + @Override public boolean restoresSize() { return false; } - /* - * @see IInformationControl#addDisposeListener(DisposeListener) - */ + @Override public void addDisposeListener(DisposeListener listener) { fShell.addDisposeListener(listener); } - /* - * @see IInformationControl#removeDisposeListener(DisposeListener) - */ + @Override public void removeDisposeListener(DisposeListener listener) { fShell.removeDisposeListener(listener); } - /* - * @see IInformationControl#setForegroundColor(Color) - */ + @Override public void setForegroundColor(Color foreground) { fContentComposite.setForeground(foreground); } - /* - * @see IInformationControl#setBackgroundColor(Color) - */ + @Override public void setBackgroundColor(Color background) { fContentComposite.setBackground(background); } @@ -650,6 +641,7 @@ public abstract class AbstractInformationControl implements IInformationControl, * {@inheritDoc} * This method is not intended to be overridden by subclasses. */ + @Override public boolean isFocusControl() { return fShell.getDisplay().getActiveShell() == fShell; } @@ -660,6 +652,7 @@ public abstract class AbstractInformationControl implements IInformationControl, * * @see IInformationControl#setFocus() */ + @Override public void setFocus() { boolean focusTaken= fShell.setFocus(); if (!focusTaken) @@ -670,10 +663,12 @@ public abstract class AbstractInformationControl implements IInformationControl, * {@inheritDoc} * This method is not intended to be overridden by subclasses. */ + @Override public void addFocusListener(final FocusListener listener) { if (fFocusListeners.isEmpty()) { fShellListener= new Listener() { + @Override public void handleEvent(Event event) { Object[] listeners= fFocusListeners.getListeners(); for (int i= 0; i < listeners.length; i++) { @@ -696,6 +691,7 @@ public abstract class AbstractInformationControl implements IInformationControl, * {@inheritDoc} * This method is not intended to be overridden by subclasses. */ + @Override public void removeFocusListener(FocusListener listener) { fFocusListeners.remove(listener); if (fFocusListeners.isEmpty()) { @@ -719,6 +715,7 @@ public abstract class AbstractInformationControl implements IInformationControl, * * @see org.eclipse.jface.text.IInformationControlExtension4#setStatusText(java.lang.String) */ + @Override public void setStatusText(String statusFieldText) { if (fStatusLabel != null && ! getShell().isVisible()) { if (statusFieldText == null ) { @@ -730,9 +727,7 @@ public abstract class AbstractInformationControl implements IInformationControl, } } - /* - * @see org.eclipse.jface.text.IInformationControlExtension5#containsControl(org.eclipse.swt.widgets.Control) - */ + @Override public boolean containsControl(Control control) { do { if (control == fShell) @@ -744,9 +739,7 @@ public abstract class AbstractInformationControl implements IInformationControl, return false; } - /* - * @see org.eclipse.jface.text.IInformationControlExtension5#isVisible() - */ + @Override public boolean isVisible() { return fShell != null && !fShell.isDisposed() && fShell.isVisible(); } @@ -755,6 +748,7 @@ public abstract class AbstractInformationControl implements IInformationControl, * {@inheritDoc} * This default implementation returns <code>null</code>. Subclasses may override. */ + @Override public IInformationControlCreator getInformationPresenterControlCreator() { return null; } @@ -766,6 +760,7 @@ public abstract class AbstractInformationControl implements IInformationControl, * * @see org.eclipse.jface.text.IInformationControlExtension5#computeSizeConstraints(int, int) */ + @Override public Point computeSizeConstraints(int widthInChars, int heightInChars) { GC gc= new GC(fContentComposite); gc.setFont(JFaceResources.getDialogFont()); diff --git a/org.eclipse.jface.text/src/org/eclipse/jface/text/AbstractInformationControlManager.java b/org.eclipse.jface.text/src/org/eclipse/jface/text/AbstractInformationControlManager.java index 91492736a6d..f5ee2396d13 100644 --- a/org.eclipse.jface.text/src/org/eclipse/jface/text/AbstractInformationControlManager.java +++ b/org.eclipse.jface.text/src/org/eclipse/jface/text/AbstractInformationControlManager.java @@ -58,38 +58,47 @@ abstract public class AbstractInformationControlManager { * @since 3.4 */ class MyInternalAccessor extends InternalAccessor { + @Override public IInformationControl getCurrentInformationControl() { return AbstractInformationControlManager.this.getCurrentInformationControl(); } + @Override public void setInformationControlReplacer(InformationControlReplacer replacer) { AbstractInformationControlManager.this.setInformationControlReplacer(replacer); } + @Override public InformationControlReplacer getInformationControlReplacer() { return AbstractInformationControlManager.this.getInformationControlReplacer(); } + @Override public boolean canReplace(IInformationControl control) { return AbstractInformationControlManager.this.canReplace(control); } + @Override public boolean isReplaceInProgress() { return AbstractInformationControlManager.this.isReplaceInProgress(); } + @Override public void replaceInformationControl(boolean takeFocus) { AbstractInformationControlManager.this.replaceInformationControl(takeFocus); } + @Override public void cropToClosestMonitor(Rectangle bounds) { AbstractInformationControlManager.this.cropToClosestMonitor(bounds); } + @Override public void setHoverEnrichMode(EnrichMode mode) { throw new UnsupportedOperationException("only implemented in AbstractHoverInformationControlManager"); //$NON-NLS-1$ } + @Override public boolean getAllowMouseExit() { throw new UnsupportedOperationException("only implemented in AnnotationBarHoverManager"); //$NON-NLS-1$ } @@ -161,6 +170,7 @@ abstract public class AbstractInformationControlManager { return fFlag; } + @Override public String toString() { switch (fFlag) { case SWT.BOTTOM: return "BOTTOM"; //$NON-NLS-1$ @@ -667,6 +677,7 @@ abstract public class AbstractInformationControlManager { private DisposeListener getSubjectControlDisposeListener() { if (fSubjectControlDisposeListener == null) { fSubjectControlDisposeListener= new DisposeListener() { + @Override public void widgetDisposed(DisposeEvent e) { handleSubjectControlDisposed(); } @@ -699,6 +710,7 @@ abstract public class AbstractInformationControlManager { * @param enabled the enable state * @deprecated visibility will be changed to protected */ + @Deprecated public void setEnabled(boolean enabled) { fEnabled= enabled; } @@ -818,6 +830,7 @@ abstract public class AbstractInformationControlManager { if (fInformationControl == null) { fInformationControl= creator.createInformationControl(fSubjectControl.getShell()); fInformationControl.addDisposeListener(new DisposeListener() { + @Override public void widgetDisposed(DisposeEvent e) { handleInformationControlDisposed(); } diff --git a/org.eclipse.jface.text/src/org/eclipse/jface/text/AbstractReusableInformationControlCreator.java b/org.eclipse.jface.text/src/org/eclipse/jface/text/AbstractReusableInformationControlCreator.java index 0817afacf93..94fc583607b 100644 --- a/org.eclipse.jface.text/src/org/eclipse/jface/text/AbstractReusableInformationControlCreator.java +++ b/org.eclipse.jface.text/src/org/eclipse/jface/text/AbstractReusableInformationControlCreator.java @@ -36,9 +36,7 @@ public abstract class AbstractReusableInformationControlCreator implements IInfo */ protected abstract IInformationControl doCreateInformationControl(Shell parent); - /* - * @see org.eclipse.jface.text.IInformationControlCreator#createInformationControl(org.eclipse.swt.widgets.Shell) - */ + @Override public IInformationControl createInformationControl(Shell parent) { IInformationControl control= (IInformationControl)fInformationControls.get(parent); if (control == null) { @@ -49,9 +47,7 @@ public abstract class AbstractReusableInformationControlCreator implements IInfo return control; } - /* - * @see org.eclipse.swt.events.DisposeListener#widgetDisposed(org.eclipse.swt.events.DisposeEvent) - */ + @Override public void widgetDisposed(DisposeEvent e) { Composite parent= null; if (e.widget instanceof Shell) @@ -61,16 +57,12 @@ public abstract class AbstractReusableInformationControlCreator implements IInfo } - /* - * @see org.eclipse.jface.text.IInformationControlCreatorExtension#canReuse(org.eclipse.jface.text.IInformationControl) - */ + @Override public boolean canReuse(IInformationControl control) { return fInformationControls.containsValue(control); } - /* - * @see org.eclipse.jface.text.IInformationControlCreatorExtension#canReplace(org.eclipse.jface.text.IInformationControlCreator) - */ + @Override public boolean canReplace(IInformationControlCreator creator) { return creator.getClass() == getClass(); } diff --git a/org.eclipse.jface.text/src/org/eclipse/jface/text/BlockTextSelection.java b/org.eclipse.jface.text/src/org/eclipse/jface/text/BlockTextSelection.java index 4bafd0b22b7..97484036313 100644 --- a/org.eclipse.jface.text/src/org/eclipse/jface/text/BlockTextSelection.java +++ b/org.eclipse.jface.text/src/org/eclipse/jface/text/BlockTextSelection.java @@ -82,37 +82,27 @@ public class BlockTextSelection extends TextSelection implements IBlockTextSelec } } - /* - * @see org.eclipse.jface.text.TextSelection#getStartLine() - */ + @Override public int getStartLine() { return fStartLine; } - /* - * @see org.eclipse.jface.text.IColumnTextSelection#getStartColumn() - */ + @Override public int getStartColumn() { return fStartColumn; } - /* - * @see org.eclipse.jface.text.TextSelection#getEndLine() - */ + @Override public int getEndLine() { return fEndLine; } - /* - * @see org.eclipse.jface.text.IColumnTextSelection#getEndColumn() - */ + @Override public int getEndColumn() { return fEndColumn; } - /* - * @see org.eclipse.jface.text.TextSelection#getText() - */ + @Override public String getText() { IDocument document= getDocument(); if (document != null) { @@ -125,9 +115,7 @@ public class BlockTextSelection extends TextSelection implements IBlockTextSelec return super.getText(); } - /* - * @see org.eclipse.jface.text.TextSelection#hashCode() - */ + @Override public int hashCode() { final int prime= 31; int result= super.hashCode(); @@ -138,9 +126,7 @@ public class BlockTextSelection extends TextSelection implements IBlockTextSelec return result; } - /* - * @see org.eclipse.jface.text.TextSelection#equals(java.lang.Object) - */ + @Override public boolean equals(Object obj) { if (this == obj) return true; @@ -158,9 +144,7 @@ public class BlockTextSelection extends TextSelection implements IBlockTextSelec return true; } - /* - * @see org.eclipse.jface.text.IColumnTextSelection#getRegions() - */ + @Override public IRegion[] getRegions() { IDocument document= getDocument(); if (document != null) { diff --git a/org.eclipse.jface.text/src/org/eclipse/jface/text/CursorLinePainter.java b/org.eclipse.jface.text/src/org/eclipse/jface/text/CursorLinePainter.java index 69efd3f508a..83171688c5e 100644 --- a/org.eclipse.jface.text/src/org/eclipse/jface/text/CursorLinePainter.java +++ b/org.eclipse.jface.text/src/org/eclipse/jface/text/CursorLinePainter.java @@ -68,9 +68,7 @@ public class CursorLinePainter implements IPainter, LineBackgroundListener { fHighlightColor= highlightColor; } - /* - * @see LineBackgroundListener#lineGetBackground(LineBackgroundEvent) - */ + @Override public void lineGetBackground(LineBackgroundEvent event) { // don't use cached line information because of asynchronous painting @@ -195,9 +193,7 @@ public class CursorLinePainter implements IPainter, LineBackgroundListener { textWidget.redraw(0, upperLeft.y, width, height, false); } - /* - * @see IPainter#deactivate(boolean) - */ + @Override public void deactivate(boolean redraw) { if (fIsActive) { fIsActive= false; @@ -219,15 +215,11 @@ public class CursorLinePainter implements IPainter, LineBackgroundListener { } } - /* - * @see IPainter#dispose() - */ + @Override public void dispose() { } - /* - * @see IPainter#paint(int) - */ + @Override public void paint(int reason) { if (fViewer.getDocument() == null) { deactivate(false); @@ -280,9 +272,7 @@ public class CursorLinePainter implements IPainter, LineBackgroundListener { } } - /* - * @see IPainter#setPositionManager(IPaintPositionManager) - */ + @Override public void setPositionManager(IPaintPositionManager manager) { fPositionManager = manager; } diff --git a/org.eclipse.jface.text/src/org/eclipse/jface/text/DefaultAutoIndentStrategy.java b/org.eclipse.jface.text/src/org/eclipse/jface/text/DefaultAutoIndentStrategy.java index 76c9c2d4121..9f8f7cd0600 100644 --- a/org.eclipse.jface.text/src/org/eclipse/jface/text/DefaultAutoIndentStrategy.java +++ b/org.eclipse.jface.text/src/org/eclipse/jface/text/DefaultAutoIndentStrategy.java @@ -20,6 +20,7 @@ package org.eclipse.jface.text; * @deprecated since 3.1 use {@link org.eclipse.jface.text.DefaultIndentLineAutoEditStrategy} instead * @noextend This class is not intended to be subclassed by clients. */ +@Deprecated public class DefaultAutoIndentStrategy extends DefaultIndentLineAutoEditStrategy implements IAutoIndentStrategy { /** diff --git a/org.eclipse.jface.text/src/org/eclipse/jface/text/DefaultDocumentAdapter.java b/org.eclipse.jface.text/src/org/eclipse/jface/text/DefaultDocumentAdapter.java index 38764f7be03..9c4704e7517 100644 --- a/org.eclipse.jface.text/src/org/eclipse/jface/text/DefaultDocumentAdapter.java +++ b/org.eclipse.jface.text/src/org/eclipse/jface/text/DefaultDocumentAdapter.java @@ -82,6 +82,7 @@ class DefaultDocumentAdapter implements IDocumentAdapter, IDocumentListener, IDo * * @param document the document to be adapted or <code>null</code> if there is no document */ + @Override public void setDocument(IDocument document) { if (fDocument != null) @@ -105,18 +106,14 @@ class DefaultDocumentAdapter implements IDocumentAdapter, IDocumentListener, IDo fDocument.addPrenotifiedDocumentListener(this); } - /* - * @see StyledTextContent#addTextChangeListener(TextChangeListener) - */ + @Override public void addTextChangeListener(TextChangeListener listener) { Assert.isNotNull(listener); if (!fTextChangeListeners.contains(listener)) fTextChangeListeners.add(listener); } - /* - * @see StyledTextContent#removeTextChangeListener(TextChangeListener) - */ + @Override public void removeTextChangeListener(TextChangeListener listener) { Assert.isNotNull(listener); fTextChangeListeners.remove(listener); @@ -163,9 +160,7 @@ class DefaultDocumentAdapter implements IDocumentAdapter, IDocumentListener, IDo return fDocument; } - /* - * @see StyledTextContent#getLine(int) - */ + @Override public String getLine(int line) { IDocument document= getDocumentForRead(); @@ -183,9 +178,7 @@ class DefaultDocumentAdapter implements IDocumentAdapter, IDocumentListener, IDo return null; } - /* - * @see StyledTextContent#getLineAtOffset(int) - */ + @Override public int getLineAtOffset(int offset) { IDocument document= getDocumentForRead(); try { @@ -202,16 +195,12 @@ class DefaultDocumentAdapter implements IDocumentAdapter, IDocumentListener, IDo return -1; } - /* - * @see StyledTextContent#getLineCount() - */ + @Override public int getLineCount() { return getDocumentForRead().getNumberOfLines(); } - /* - * @see StyledTextContent#getOffsetAtLine(int) - */ + @Override public int getOffsetAtLine(int line) { IDocument document= getDocumentForRead(); try { @@ -228,9 +217,7 @@ class DefaultDocumentAdapter implements IDocumentAdapter, IDocumentListener, IDo return -1; } - /* - * @see StyledTextContent#getTextRange(int, int) - */ + @Override public String getTextRange(int offset, int length) { try { return getDocumentForRead().get(offset, length); @@ -240,9 +227,7 @@ class DefaultDocumentAdapter implements IDocumentAdapter, IDocumentListener, IDo } } - /* - * @see StyledTextContent#replaceTextRange(int, int, String) - */ + @Override public void replaceTextRange(int pos, int length, String text) { try { fDocument.replace(pos, length, text); @@ -251,32 +236,24 @@ class DefaultDocumentAdapter implements IDocumentAdapter, IDocumentListener, IDo } } - /* - * @see StyledTextContent#setText(String) - */ + @Override public void setText(String text) { fDocument.set(text); } - /* - * @see StyledTextContent#getCharCount() - */ + @Override public int getCharCount() { return getDocumentForRead().getLength(); } - /* - * @see StyledTextContent#getLineDelimiter() - */ + @Override public String getLineDelimiter() { if (fLineDelimiter == null) fLineDelimiter= TextUtilities.getDefaultLineDelimiter(fDocument); return fLineDelimiter; } - /* - * @see IDocumentListener#documentChanged(DocumentEvent) - */ + @Override public void documentChanged(DocumentEvent event) { // check whether the given event is the one which was remembered if (fEvent == null || event != fEvent) @@ -292,9 +269,7 @@ class DefaultDocumentAdapter implements IDocumentAdapter, IDocumentListener, IDo } } - /* - * @see IDocumentListener#documentAboutToBeChanged(DocumentEvent) - */ + @Override public void documentAboutToBeChanged(DocumentEvent event) { fRememberedLengthOfDocument= fDocument.getLength(); @@ -396,10 +371,7 @@ class DefaultDocumentAdapter implements IDocumentAdapter, IDocumentListener, IDo } } - /* - * @see IDocumentAdapterExtension#resumeForwardingDocumentChanges() - * @since 2.0 - */ + @Override public void resumeForwardingDocumentChanges() { fIsForwarding= true; fDocumentClone= null; @@ -408,10 +380,7 @@ class DefaultDocumentAdapter implements IDocumentAdapter, IDocumentListener, IDo fireTextSet(); } - /* - * @see IDocumentAdapterExtension#stopForwardingDocumentChanges() - * @since 2.0 - */ + @Override public void stopForwardingDocumentChanges() { fDocumentClone= null; fOriginalContent= fDocument.get(); diff --git a/org.eclipse.jface.text/src/org/eclipse/jface/text/DefaultIndentLineAutoEditStrategy.java b/org.eclipse.jface.text/src/org/eclipse/jface/text/DefaultIndentLineAutoEditStrategy.java index 48cc0808ec6..1012cd568b7 100644 --- a/org.eclipse.jface.text/src/org/eclipse/jface/text/DefaultIndentLineAutoEditStrategy.java +++ b/org.eclipse.jface.text/src/org/eclipse/jface/text/DefaultIndentLineAutoEditStrategy.java @@ -82,9 +82,7 @@ public class DefaultIndentLineAutoEditStrategy implements IAutoEditStrategy { } } - /* - * @see org.eclipse.jface.text.IAutoEditStrategy#customizeDocumentCommand(org.eclipse.jface.text.IDocument, org.eclipse.jface.text.DocumentCommand) - */ + @Override public void customizeDocumentCommand(IDocument d, DocumentCommand c) { if (c.length == 0 && c.text != null && TextUtilities.endsWith(d.getLegalLineDelimiters(), c.text) != -1) autoIndentAfterNewLine(d, c); diff --git a/org.eclipse.jface.text/src/org/eclipse/jface/text/DefaultInformationControl.java b/org.eclipse.jface.text/src/org/eclipse/jface/text/DefaultInformationControl.java index fa158158ed6..4d6a2a096a4 100644 --- a/org.eclipse.jface.text/src/org/eclipse/jface/text/DefaultInformationControl.java +++ b/org.eclipse.jface.text/src/org/eclipse/jface/text/DefaultInformationControl.java @@ -64,6 +64,7 @@ public class DefaultInformationControl extends AbstractInformationControl implem * @return the manipulated information * @deprecated As of 3.2, replaced by {@link DefaultInformationControl.IInformationPresenterExtension#updatePresentation(Drawable, String, TextPresentation, int, int)} */ + @Deprecated String updatePresentation(Display display, String hoverInfo, TextPresentation presentation, int maxWidth, int maxHeight); } @@ -227,6 +228,7 @@ public class DefaultInformationControl extends AbstractInformationControl implem * @param presenter the presenter to be used * @deprecated As of 3.4, replaced by simpler constructors */ + @Deprecated public DefaultInformationControl(Shell parent, int shellStyle, int style, IInformationPresenter presenter) { this(parent, shellStyle, style, presenter, null); } @@ -245,6 +247,7 @@ public class DefaultInformationControl extends AbstractInformationControl implem * @since 3.0 * @deprecated As of 3.4, replaced by simpler constructors */ + @Deprecated public DefaultInformationControl(Shell parentShell, int shellStyle, final int style, IInformationPresenter presenter, String statusFieldText) { super(parentShell, SWT.NO_FOCUS | SWT.ON_TOP | shellStyle, statusFieldText, null); fAdditionalTextStyles= style; @@ -262,6 +265,7 @@ public class DefaultInformationControl extends AbstractInformationControl implem * @param presenter the presenter to be used * @deprecated As of 3.4, replaced by {@link #DefaultInformationControl(Shell, DefaultInformationControl.IInformationPresenter)} */ + @Deprecated public DefaultInformationControl(Shell parent, int textStyles, IInformationPresenter presenter) { this(parent, textStyles, presenter, null); } @@ -278,6 +282,7 @@ public class DefaultInformationControl extends AbstractInformationControl implem * @since 3.0 * @deprecated As of 3.4, replaced by {@link #DefaultInformationControl(Shell, String, DefaultInformationControl.IInformationPresenter)} */ + @Deprecated public DefaultInformationControl(Shell parent, int textStyles, IInformationPresenter presenter, String statusFieldText) { super(parent, statusFieldText); fAdditionalTextStyles= textStyles; @@ -285,9 +290,7 @@ public class DefaultInformationControl extends AbstractInformationControl implem create(); } - /* - * @see org.eclipse.jface.text.AbstractInformationControl#createContent(org.eclipse.swt.widgets.Composite) - */ + @Override protected void createContent(Composite parent) { fText= new StyledText(parent, SWT.MULTI | SWT.READ_ONLY | fAdditionalTextStyles); fText.setForeground(parent.getForeground()); @@ -303,9 +306,7 @@ public class DefaultInformationControl extends AbstractInformationControl implem } } - /* - * @see IInformationControl#setInformation(String) - */ + @Override public void setInformation(String content) { if (fPresenter == null) { fText.setText(content); @@ -346,9 +347,7 @@ public class DefaultInformationControl extends AbstractInformationControl implem } } - /* - * @see IInformationControl#setVisible(boolean) - */ + @Override public void setVisible(boolean visible) { if (visible) { if (fText.getWordWrap()) { @@ -363,9 +362,7 @@ public class DefaultInformationControl extends AbstractInformationControl implem super.setVisible(visible); } - /* - * @see IInformationControl#computeSizeHint() - */ + @Override public Point computeSizeHint() { // see https://bugs.eclipse.org/bugs/show_bug.cgi?id=117602 int widthHint= SWT.DEFAULT; @@ -376,32 +373,24 @@ public class DefaultInformationControl extends AbstractInformationControl implem return getShell().computeSize(widthHint, SWT.DEFAULT, true); } - /* - * @see org.eclipse.jface.text.AbstractInformationControl#computeTrim() - */ + @Override public Rectangle computeTrim() { return Geometry.add(super.computeTrim(), fText.computeTrim(0, 0, 0, 0)); } - /* - * @see IInformationControl#setForegroundColor(Color) - */ + @Override public void setForegroundColor(Color foreground) { super.setForegroundColor(foreground); fText.setForeground(foreground); } - /* - * @see IInformationControl#setBackgroundColor(Color) - */ + @Override public void setBackgroundColor(Color background) { super.setBackgroundColor(background); fText.setBackground(background); } - /* - * @see IInformationControlExtension#hasContents() - */ + @Override public boolean hasContents() { return fText.getCharCount() > 0; } @@ -411,18 +400,15 @@ public class DefaultInformationControl extends AbstractInformationControl implem * @since 3.0 * @deprecated As of 3.2, no longer used and called */ + @Deprecated + @Override public void widgetDisposed(DisposeEvent event) { } - /* - * @see org.eclipse.jface.text.IInformationControlExtension5#getInformationPresenterControlCreator() - * @since 3.4 - */ + @Override public IInformationControlCreator getInformationPresenterControlCreator() { return new IInformationControlCreator() { - /* - * @see org.eclipse.jface.text.IInformationControlCreator#createInformationControl(org.eclipse.swt.widgets.Shell) - */ + @Override public IInformationControl createInformationControl(Shell parent) { return new DefaultInformationControl(parent, (ToolBarManager) null, fPresenter); } diff --git a/org.eclipse.jface.text/src/org/eclipse/jface/text/DefaultTextDoubleClickStrategy.java b/org.eclipse.jface.text/src/org/eclipse/jface/text/DefaultTextDoubleClickStrategy.java index 46c37dcaec4..6ccb56e9661 100644 --- a/org.eclipse.jface.text/src/org/eclipse/jface/text/DefaultTextDoubleClickStrategy.java +++ b/org.eclipse.jface.text/src/org/eclipse/jface/text/DefaultTextDoubleClickStrategy.java @@ -64,25 +64,19 @@ public class DefaultTextDoubleClickStrategy implements ITextDoubleClickStrategy fEndOffset= fOffset + iteratorRange.getLength(); } - /* - * @see CharacterIterator#first() - */ + @Override public char first() { fIndex= fOffset; return current(); } - /* - * @see CharacterIterator#last() - */ + @Override public char last() { fIndex= fOffset < fEndOffset ? fEndOffset -1 : fEndOffset; return current(); } - /* - * @see CharacterIterator#current() - */ + @Override public char current() { if (fOffset <= fIndex && fIndex < fEndOffset) { try { @@ -93,9 +87,7 @@ public class DefaultTextDoubleClickStrategy implements ITextDoubleClickStrategy return DONE; } - /* - * @see CharacterIterator#next() - */ + @Override public char next() { ++fIndex; int end= getEndIndex(); @@ -106,9 +98,7 @@ public class DefaultTextDoubleClickStrategy implements ITextDoubleClickStrategy return current(); } - /* - * @see CharacterIterator#previous() - */ + @Override public char previous() { if (fIndex == fOffset) return DONE; @@ -119,38 +109,28 @@ public class DefaultTextDoubleClickStrategy implements ITextDoubleClickStrategy return current(); } - /* - * @see CharacterIterator#setIndex(int) - */ + @Override public char setIndex(int index) { fIndex= index; return current(); } - /* - * @see CharacterIterator#getBeginIndex() - */ + @Override public int getBeginIndex() { return fOffset; } - /* - * @see CharacterIterator#getEndIndex() - */ + @Override public int getEndIndex() { return fEndOffset; } - /* - * @see CharacterIterator#getIndex() - */ + @Override public int getIndex() { return fIndex; } - /* - * @see CharacterIterator#clone() - */ + @Override public Object clone() { DocumentCharacterIterator i= new DocumentCharacterIterator(); i.fDocument= fDocument; @@ -192,9 +172,7 @@ public class DefaultTextDoubleClickStrategy implements ITextDoubleClickStrategy public DefaultTextDoubleClickStrategy() { } - /* - * @see org.eclipse.jface.text.ITextDoubleClickStrategy#doubleClicked(org.eclipse.jface.text.ITextViewer) - */ + @Override public void doubleClicked(ITextViewer text) { int offset= text.getSelectedRange().x; diff --git a/org.eclipse.jface.text/src/org/eclipse/jface/text/DefaultTextHover.java b/org.eclipse.jface.text/src/org/eclipse/jface/text/DefaultTextHover.java index 612fd20fbff..d7551522243 100644 --- a/org.eclipse.jface.text/src/org/eclipse/jface/text/DefaultTextHover.java +++ b/org.eclipse.jface.text/src/org/eclipse/jface/text/DefaultTextHover.java @@ -44,6 +44,8 @@ public class DefaultTextHover implements ITextHover { * * @deprecated As of 3.4, replaced by {@link ITextHoverExtension2#getHoverInfo2(ITextViewer, IRegion)} */ + @Deprecated + @Override public String getHoverInfo(ITextViewer textViewer, IRegion hoverRegion) { IAnnotationModel model= getAnnotationModel(fSourceViewer); if (model == null) @@ -65,9 +67,7 @@ public class DefaultTextHover implements ITextHover { return null; } - /* - * @see org.eclipse.jface.text.ITextHover#getHoverRegion(org.eclipse.jface.text.ITextViewer, int) - */ + @Override public IRegion getHoverRegion(ITextViewer textViewer, int offset) { return findWord(textViewer.getDocument(), offset); } diff --git a/org.eclipse.jface.text/src/org/eclipse/jface/text/DefaultUndoManager.java b/org.eclipse.jface.text/src/org/eclipse/jface/text/DefaultUndoManager.java index 0f80aefb23f..ae95f9bb426 100644 --- a/org.eclipse.jface.text/src/org/eclipse/jface/text/DefaultUndoManager.java +++ b/org.eclipse.jface.text/src/org/eclipse/jface/text/DefaultUndoManager.java @@ -69,6 +69,7 @@ import org.eclipse.jface.dialogs.MessageDialog; * @deprecated As of 3.2, replaced by {@link TextViewerUndoManager} * @noextend This class is not intended to be subclassed by clients. */ +@Deprecated public class DefaultUndoManager implements IUndoManager, IUndoManagerExtension { /** @@ -127,10 +128,7 @@ public class DefaultUndoManager implements IUndoManager, IUndoManagerExtension { fPreservedText= null; } - /* - * @see org.eclipse.core.commands.operations.IUndoableOperation#dispose() - * @since 3.1 - */ + @Override public void dispose() { reinitialize(); } @@ -151,10 +149,7 @@ public class DefaultUndoManager implements IUndoManager, IUndoManagerExtension { } } - /* - * @see org.eclipse.core.commands.operations.IUndoableOperation#canUndo() - * @since 3.1 - */ + @Override public boolean canUndo() { if (isConnected() && isValid()) { @@ -208,10 +203,7 @@ public class DefaultUndoManager implements IUndoManager, IUndoManagerExtension { return false; } - /* - * @see org.eclipse.core.commands.operations.IUndoableOperation#canRedo() - * @since 3.1 - */ + @Override public boolean canRedo() { if (isConnected() && isValid()) { IDocument doc= fTextViewer.getDocument(); @@ -226,18 +218,12 @@ public class DefaultUndoManager implements IUndoManager, IUndoManagerExtension { return false; } - /* - * @see org.eclipse.core.commands.operations.IUndoableOperation#canExecute() - * @since 3.1 - */ + @Override public boolean canExecute() { return isConnected(); } - /* - * @see org.eclipse.core.commands.operations.IUndoableOperation#execute(org.eclipse.core.runtime.IProgressMonitor, org.eclipse.core.runtime.IAdaptable) - * @since 3.1 - */ + @Override public IStatus execute(IProgressMonitor monitor, IAdaptable uiInfo) { // Text commands execute as they are typed, so executing one has no effect. return Status.OK_STATUS; @@ -256,6 +242,7 @@ public class DefaultUndoManager implements IUndoManager, IUndoManagerExtension { * @param uiInfo an adaptable that can provide UI info if needed * @return the status */ + @Override public IStatus undo(IProgressMonitor monitor, IAdaptable uiInfo) { if (isValid()) { undoTextChange(); @@ -290,6 +277,7 @@ public class DefaultUndoManager implements IUndoManager, IUndoManagerExtension { * @param uiInfo an adaptable that can provide UI info if needed * @return the status */ + @Override public IStatus redo(IProgressMonitor monitor, IAdaptable uiInfo) { if (isValid()) { redoTextChange(); @@ -382,10 +370,7 @@ public class DefaultUndoManager implements IUndoManager, IUndoManagerExtension { fText != null; } - /* - * @see java.lang.Object#toString() - * @since 3.1 - */ + @Override public String toString() { String delimiter= ", "; //$NON-NLS-1$ StringBuffer text= new StringBuffer(super.toString()); @@ -460,9 +445,7 @@ public class DefaultUndoManager implements IUndoManager, IUndoManagerExtension { fCommands.add(command); } - /* - * @see org.eclipse.jface.text.DefaultUndoManager.TextCommand#undo() - */ + @Override public IStatus undo(IProgressMonitor monitor, IAdaptable uiInfo) { resetProcessChangeSate(); @@ -483,9 +466,7 @@ public class DefaultUndoManager implements IUndoManager, IUndoManagerExtension { return Status.OK_STATUS; } - /* - * @see org.eclipse.jface.text.DefaultUndoManager.TextCommand#redo() - */ + @Override public IStatus redo(IProgressMonitor monitor, IAdaptable uiInfo) { resetProcessChangeSate(); @@ -510,6 +491,7 @@ public class DefaultUndoManager implements IUndoManager, IUndoManagerExtension { */ + @Override protected void updateCommand() { // first gather the data from the buffers super.updateCommand(); @@ -531,6 +513,7 @@ public class DefaultUndoManager implements IUndoManager, IUndoManagerExtension { /* * @see TextCommand#createCurrent */ + @Override protected TextCommand createCurrent() { if (!fFoldingIntoCompoundChange) @@ -540,9 +523,7 @@ public class DefaultUndoManager implements IUndoManager, IUndoManagerExtension { return this; } - /* - * @see org.eclipse.jface.text.DefaultUndoManager.TextCommand#commit() - */ + @Override protected void commit() { // if there is pending data, update the command if (fStart > -1) @@ -557,6 +538,7 @@ public class DefaultUndoManager implements IUndoManager, IUndoManagerExtension { * @return true if the command is valid. * @since 3.1 */ + @Override protected boolean isValid() { if (isConnected()) return (fStart > -1 || fCommands.size() > 0); @@ -569,6 +551,7 @@ public class DefaultUndoManager implements IUndoManager, IUndoManagerExtension { * @return the undo modification stamp * @since 3.1 */ + @Override protected long getUndoModificationStamp() { if (fStart > -1) return super.getUndoModificationStamp(); @@ -584,6 +567,7 @@ public class DefaultUndoManager implements IUndoManager, IUndoManagerExtension { * @return the redo modification stamp * @since 3.1 */ + @Override protected long getRedoModificationStamp() { if (fStart > -1) return super.getRedoModificationStamp(); @@ -602,6 +586,7 @@ public class DefaultUndoManager implements IUndoManager, IUndoManagerExtension { /* * @see MouseListener#mouseDoubleClick */ + @Override public void mouseDoubleClick(MouseEvent e) { } @@ -609,6 +594,7 @@ public class DefaultUndoManager implements IUndoManager, IUndoManagerExtension { * If the right mouse button is pressed, the current editing command is closed * @see MouseListener#mouseDown */ + @Override public void mouseDown(MouseEvent e) { if (e.button == 1) commit(); @@ -617,12 +603,14 @@ public class DefaultUndoManager implements IUndoManager, IUndoManagerExtension { /* * @see MouseListener#mouseUp */ + @Override public void mouseUp(MouseEvent e) { } /* * @see KeyListener#keyPressed */ + @Override public void keyReleased(KeyEvent e) { } @@ -630,6 +618,7 @@ public class DefaultUndoManager implements IUndoManager, IUndoManagerExtension { * On cursor keys, the current editing command is closed * @see KeyListener#keyPressed */ + @Override public void keyPressed(KeyEvent e) { switch (e.keyCode) { case SWT.ARROW_UP: @@ -649,9 +638,7 @@ public class DefaultUndoManager implements IUndoManager, IUndoManagerExtension { private String fReplacedText; - /* - * @see org.eclipse.jface.text.IDocumentListener#documentAboutToBeChanged(org.eclipse.jface.text.DocumentEvent) - */ + @Override public void documentAboutToBeChanged(DocumentEvent event) { try { fReplacedText= event.getDocument().get(event.getOffset(), event.getLength()); @@ -661,9 +648,7 @@ public class DefaultUndoManager implements IUndoManager, IUndoManagerExtension { } } - /* - * @see org.eclipse.jface.text.IDocumentListener#documentChanged(org.eclipse.jface.text.DocumentEvent) - */ + @Override public void documentChanged(DocumentEvent event) { fPreservedRedoModificationStamp= event.getModificationStamp(); @@ -700,9 +685,7 @@ public class DefaultUndoManager implements IUndoManager, IUndoManagerExtension { */ class TextInputListener implements ITextInputListener { - /* - * @see org.eclipse.jface.text.ITextInputListener#inputDocumentAboutToBeChanged(org.eclipse.jface.text.IDocument, org.eclipse.jface.text.IDocument) - */ + @Override public void inputDocumentAboutToBeChanged(IDocument oldInput, IDocument newInput) { if (oldInput != null && fDocumentListener != null) { oldInput.removeDocumentListener(fDocumentListener); @@ -710,9 +693,7 @@ public class DefaultUndoManager implements IUndoManager, IUndoManagerExtension { } } - /* - * @see org.eclipse.jface.text.ITextInputListener#inputDocumentChanged(org.eclipse.jface.text.IDocument, org.eclipse.jface.text.IDocument) - */ + @Override public void inputDocumentChanged(IDocument oldInput, IDocument newInput) { if (newInput != null) { if (fDocumentListener == null) @@ -730,6 +711,7 @@ public class DefaultUndoManager implements IUndoManager, IUndoManagerExtension { class HistoryListener implements IOperationHistoryListener { private IUndoableOperation fOperation; + @Override public void historyNotification(final OperationHistoryEvent event) { final int type= event.getEventType(); switch (type) { @@ -738,6 +720,7 @@ public class DefaultUndoManager implements IUndoManager, IUndoManagerExtension { // if this is one of our operations if (event.getOperation().hasContext(fUndoContext)) { fTextViewer.getTextWidget().getDisplay().syncExec(new Runnable() { + @Override public void run() { // if we are undoing/redoing a command we generated, then ignore // the document changes associated with this undo or redo. @@ -769,6 +752,7 @@ public class DefaultUndoManager implements IUndoManager, IUndoManagerExtension { case OperationHistoryEvent.OPERATION_NOT_OK: if (event.getOperation() == fOperation) { fTextViewer.getTextWidget().getDisplay().syncExec(new Runnable() { + @Override public void run() { listenToTextChanges(true); fOperation= null; @@ -863,6 +847,7 @@ public class DefaultUndoManager implements IUndoManager, IUndoManagerExtension { /* * @see IUndoManager#beginCompoundChange */ + @Override public void beginCompoundChange() { if (isConnected()) { fFoldingIntoCompoundChange= true; @@ -874,6 +859,7 @@ public class DefaultUndoManager implements IUndoManager, IUndoManagerExtension { /* * @see IUndoManager#endCompoundChange */ + @Override public void endCompoundChange() { if (isConnected()) { fFoldingIntoCompoundChange= false; @@ -1193,6 +1179,7 @@ public class DefaultUndoManager implements IUndoManager, IUndoManagerExtension { else display= Display.getDefault(); display.syncExec(new Runnable() { + @Override public void run() { MessageDialog.openError(finalShell, title, ex.getLocalizedMessage()); } @@ -1200,9 +1187,7 @@ public class DefaultUndoManager implements IUndoManager, IUndoManagerExtension { } } - /* - * @see org.eclipse.jface.text.IUndoManager#setMaximalUndoLevel(int) - */ + @Override public void setMaximalUndoLevel(int undoLevel) { fUndoLevel= Math.max(0, undoLevel); if (isConnected()) { @@ -1210,9 +1195,7 @@ public class DefaultUndoManager implements IUndoManager, IUndoManagerExtension { } } - /* - * @see org.eclipse.jface.text.IUndoManager#connect(org.eclipse.jface.text.ITextViewer) - */ + @Override public void connect(ITextViewer textViewer) { if (!isConnected() && textViewer != null) { fTextViewer= textViewer; @@ -1233,9 +1216,7 @@ public class DefaultUndoManager implements IUndoManager, IUndoManagerExtension { } } - /* - * @see org.eclipse.jface.text.IUndoManager#disconnect() - */ + @Override public void disconnect() { if (isConnected()) { @@ -1250,9 +1231,7 @@ public class DefaultUndoManager implements IUndoManager, IUndoManagerExtension { } } - /* - * @see org.eclipse.jface.text.IUndoManager#reset() - */ + @Override public void reset() { if (isConnected()) { initializeCommandStack(); @@ -1267,23 +1246,17 @@ public class DefaultUndoManager implements IUndoManager, IUndoManagerExtension { } } - /* - * @see org.eclipse.jface.text.IUndoManager#redoable() - */ + @Override public boolean redoable() { return fHistory.canRedo(fUndoContext); } - /* - * @see org.eclipse.jface.text.IUndoManager#undoable() - */ + @Override public boolean undoable() { return fHistory.canUndo(fUndoContext); } - /* - * @see org.eclipse.jface.text.IUndoManager#redo() - */ + @Override public void redo() { if (isConnected() && redoable()) { try { @@ -1294,9 +1267,7 @@ public class DefaultUndoManager implements IUndoManager, IUndoManagerExtension { } } - /* - * @see org.eclipse.jface.text.IUndoManager#undo() - */ + @Override public void undo() { if (isConnected() && undoable()) { try { @@ -1325,10 +1296,7 @@ public class DefaultUndoManager implements IUndoManager, IUndoManagerExtension { fTextViewer.revealRange(offset, length); } - /* - * @see org.eclipse.jface.text.IUndoManagerExtension#getUndoContext() - * @since 3.1 - */ + @Override public IUndoContext getUndoContext() { return fUndoContext; } diff --git a/org.eclipse.jface.text/src/org/eclipse/jface/text/DocumentClone.java b/org.eclipse.jface.text/src/org/eclipse/jface/text/DocumentClone.java index 2998f1e6d67..313240360b5 100644 --- a/org.eclipse.jface.text/src/org/eclipse/jface/text/DocumentClone.java +++ b/org.eclipse.jface.text/src/org/eclipse/jface/text/DocumentClone.java @@ -34,36 +34,26 @@ class DocumentClone extends AbstractDocument { fContent= content; } - /* - * @see org.eclipse.jface.text.ITextStore#get(int) - */ + @Override public char get(int offset) { return fContent.charAt(offset); } - /* - * @see org.eclipse.jface.text.ITextStore#get(int, int) - */ + @Override public String get(int offset, int length) { return fContent.substring(offset, offset + length); } - /* - * @see org.eclipse.jface.text.ITextStore#getLength() - */ + @Override public int getLength() { return fContent.length(); } - /* - * @see org.eclipse.jface.text.ITextStore#replace(int, int, java.lang.String) - */ + @Override public void replace(int offset, int length, String text) { } - /* - * @see org.eclipse.jface.text.ITextStore#set(java.lang.String) - */ + @Override public void set(String text) { } diff --git a/org.eclipse.jface.text/src/org/eclipse/jface/text/DocumentCommand.java b/org.eclipse.jface.text/src/org/eclipse/jface/text/DocumentCommand.java index d29bf7135d7..554032cfefe 100644 --- a/org.eclipse.jface.text/src/org/eclipse/jface/text/DocumentCommand.java +++ b/org.eclipse.jface.text/src/org/eclipse/jface/text/DocumentCommand.java @@ -88,6 +88,7 @@ public class DocumentCommand { /* * @see java.util.Comparator#compare(java.lang.Object, java.lang.Object) */ + @Override public int compareTo(final Object object) { if (isEqual(object)) return 0; @@ -132,23 +133,17 @@ public class DocumentCommand { fListIterator= listIterator; } - /* - * @see java.util.Iterator#hasNext() - */ + @Override public boolean hasNext() { return fListIterator.hasPrevious(); } - /* - * @see java.util.Iterator#next() - */ + @Override public Object next() { return fListIterator.previous(); } - /* - * @see java.util.Iterator#remove() - */ + @Override public void remove() { throw new UnsupportedOperationException(); } @@ -183,16 +178,12 @@ public class DocumentCommand { fForward= forward; } - /* - * @see java.util.Iterator#hasNext() - */ + @Override public boolean hasNext() { return fCommand != null || fIterator.hasNext(); } - /* - * @see java.util.Iterator#next() - */ + @Override public Object next() { if (!hasNext()) @@ -223,9 +214,7 @@ public class DocumentCommand { } } - /* - * @see java.util.Iterator#remove() - */ + @Override public void remove() { throw new UnsupportedOperationException(); } diff --git a/org.eclipse.jface.text/src/org/eclipse/jface/text/FindReplaceDocumentAdapterContentProposalProvider.java b/org.eclipse.jface.text/src/org/eclipse/jface/text/FindReplaceDocumentAdapterContentProposalProvider.java index c06ec31a070..37089e74f54 100644 --- a/org.eclipse.jface.text/src/org/eclipse/jface/text/FindReplaceDocumentAdapterContentProposalProvider.java +++ b/org.eclipse.jface.text/src/org/eclipse/jface/text/FindReplaceDocumentAdapterContentProposalProvider.java @@ -335,9 +335,7 @@ public class FindReplaceDocumentAdapterContentProposalProvider implements IConte fIsFind= isFind; } - /* - * @see org.eclipse.jface.fieldassist.IContentProposalProvider#getProposals(java.lang.String, int) - */ + @Override public IContentProposal [] getProposals(String contents, int position) { if (fIsFind) return new ProposalComputer(contents, position).computeFindProposals(); diff --git a/org.eclipse.jface.text/src/org/eclipse/jface/text/IAutoIndentStrategy.java b/org.eclipse.jface.text/src/org/eclipse/jface/text/IAutoIndentStrategy.java index cc6d5128e71..2ce53444f9c 100644 --- a/org.eclipse.jface.text/src/org/eclipse/jface/text/IAutoIndentStrategy.java +++ b/org.eclipse.jface.text/src/org/eclipse/jface/text/IAutoIndentStrategy.java @@ -17,5 +17,6 @@ package org.eclipse.jface.text; * * @deprecated since 3.0, use <code>IAutoEditStrategy</code> directly */ +@Deprecated public interface IAutoIndentStrategy extends IAutoEditStrategy { } diff --git a/org.eclipse.jface.text/src/org/eclipse/jface/text/IBlockTextSelection.java b/org.eclipse.jface.text/src/org/eclipse/jface/text/IBlockTextSelection.java index 657e5473517..7c9c806b8c0 100644 --- a/org.eclipse.jface.text/src/org/eclipse/jface/text/IBlockTextSelection.java +++ b/org.eclipse.jface.text/src/org/eclipse/jface/text/IBlockTextSelection.java @@ -66,6 +66,7 @@ public interface IBlockTextSelection extends ITextSelection { * * @see org.eclipse.jface.text.ITextSelection#getText() */ + @Override String getText(); /** * Returns a non-empty array containing the selected text range for each line covered by the diff --git a/org.eclipse.jface.text/src/org/eclipse/jface/text/ITextHover.java b/org.eclipse.jface.text/src/org/eclipse/jface/text/ITextHover.java index 9ee2ab2d773..48f07097ee3 100644 --- a/org.eclipse.jface.text/src/org/eclipse/jface/text/ITextHover.java +++ b/org.eclipse.jface.text/src/org/eclipse/jface/text/ITextHover.java @@ -49,6 +49,7 @@ public interface ITextHover { * @return the hover popup display information, or <code>null</code> if none available * @deprecated As of 3.4, replaced by {@link ITextHoverExtension2#getHoverInfo2(ITextViewer, IRegion)} */ + @Deprecated String getHoverInfo(ITextViewer textViewer, IRegion hoverRegion); /** diff --git a/org.eclipse.jface.text/src/org/eclipse/jface/text/ITextViewer.java b/org.eclipse.jface.text/src/org/eclipse/jface/text/ITextViewer.java index cc8e74307c1..b9547312a6b 100644 --- a/org.eclipse.jface.text/src/org/eclipse/jface/text/ITextViewer.java +++ b/org.eclipse.jface.text/src/org/eclipse/jface/text/ITextViewer.java @@ -167,6 +167,7 @@ public interface ITextViewer { * {@link ITextViewerExtension2#prependAutoEditStrategy(IAutoEditStrategy, String)} and * {@link ITextViewerExtension2#removeAutoEditStrategy(IAutoEditStrategy, String)} instead */ + @Deprecated void setAutoIndentStrategy(IAutoIndentStrategy strategy, String contentType); /** diff --git a/org.eclipse.jface.text/src/org/eclipse/jface/text/ITextViewerExtension3.java b/org.eclipse.jface.text/src/org/eclipse/jface/text/ITextViewerExtension3.java index 82adc0d3fdc..da2ef3ea6e1 100644 --- a/org.eclipse.jface.text/src/org/eclipse/jface/text/ITextViewerExtension3.java +++ b/org.eclipse.jface.text/src/org/eclipse/jface/text/ITextViewerExtension3.java @@ -19,6 +19,7 @@ package org.eclipse.jface.text; * @since 2.1 * @deprecated replaced by {@link org.eclipse.jface.text.ITextViewerExtension5} */ +@Deprecated public interface ITextViewerExtension3 { diff --git a/org.eclipse.jface.text/src/org/eclipse/jface/text/ITextViewerExtension5.java b/org.eclipse.jface.text/src/org/eclipse/jface/text/ITextViewerExtension5.java index 206cfc3cee3..65615e272d2 100644 --- a/org.eclipse.jface.text/src/org/eclipse/jface/text/ITextViewerExtension5.java +++ b/org.eclipse.jface.text/src/org/eclipse/jface/text/ITextViewerExtension5.java @@ -41,6 +41,7 @@ public interface ITextViewerExtension5 extends ITextViewerExtension3 { * @return the minimal region of the viewer's document comprising the * contents of the viewer's widget or <code>null</code> */ + @Override IRegion getModelCoverage(); /** @@ -50,6 +51,7 @@ public interface ITextViewerExtension5 extends ITextViewerExtension3 { * @param modelLine the line of the viewer's document * @return the corresponding widget line or <code>-1</code> */ + @Override int modelLine2WidgetLine(int modelLine); /** @@ -59,6 +61,7 @@ public interface ITextViewerExtension5 extends ITextViewerExtension3 { * @param modelOffset the offset in the viewer's document * @return the corresponding widget offset or <code>-1</code> */ + @Override int modelOffset2WidgetOffset(int modelOffset); /** @@ -70,6 +73,7 @@ public interface ITextViewerExtension5 extends ITextViewerExtension3 { * @return the minimal region of the widget comprising * <code>modelRange</code> or <code>null</code> */ + @Override IRegion modelRange2WidgetRange(IRegion modelRange); /** @@ -80,6 +84,7 @@ public interface ITextViewerExtension5 extends ITextViewerExtension3 { * @return the corresponding offset in the viewer's document or * <code>-1</code> */ + @Override int widgetOffset2ModelOffset(int widgetOffset); /** @@ -91,6 +96,7 @@ public interface ITextViewerExtension5 extends ITextViewerExtension3 { * @return the minimal region of the viewer's document comprising * <code>widgetlRange</code> or <code>null</code> */ + @Override IRegion widgetRange2ModelRange(IRegion widgetRange); /** @@ -109,6 +115,7 @@ public interface ITextViewerExtension5 extends ITextViewerExtension3 { * @param widgetOffset the widget offset * @return the widget line of the widget offset */ + @Override int widgetLineOfWidgetOffset(int widgetOffset); diff --git a/org.eclipse.jface.text/src/org/eclipse/jface/text/ITextViewerExtension8.java b/org.eclipse.jface.text/src/org/eclipse/jface/text/ITextViewerExtension8.java index 9288ac9919f..93e11e8cffb 100644 --- a/org.eclipse.jface.text/src/org/eclipse/jface/text/ITextViewerExtension8.java +++ b/org.eclipse.jface.text/src/org/eclipse/jface/text/ITextViewerExtension8.java @@ -78,9 +78,7 @@ public interface ITextViewerExtension8 { fName= name; } - /* - * @see java.lang.Object#toString() - */ + @Override public String toString() { return fName; } diff --git a/org.eclipse.jface.text/src/org/eclipse/jface/text/MarginPainter.java b/org.eclipse.jface.text/src/org/eclipse/jface/text/MarginPainter.java index a57d4d17de4..1d667d8d42c 100644 --- a/org.eclipse.jface.text/src/org/eclipse/jface/text/MarginPainter.java +++ b/org.eclipse.jface.text/src/org/eclipse/jface/text/MarginPainter.java @@ -118,9 +118,7 @@ public class MarginPainter implements IPainter, PaintListener { fCachedWidgetX= pixels * fMarginWidth; } - /* - * @see IPainter#deactivate(boolean) - */ + @Override public void deactivate(boolean redraw) { if (fIsActive) { fIsActive= false; @@ -131,16 +129,12 @@ public class MarginPainter implements IPainter, PaintListener { } } - /* - * @see IPainter#dispose() - */ + @Override public void dispose() { fTextWidget= null; } - /* - * @see IPainter#paint(int) - */ + @Override public void paint(int reason) { if (!fIsActive) { fIsActive= true; @@ -152,9 +146,7 @@ public class MarginPainter implements IPainter, PaintListener { fTextWidget.redraw(); } - /* - * @see org.eclipse.swt.events.PaintListener#paintControl(org.eclipse.swt.events.PaintEvent) - */ + @Override public void paintControl(PaintEvent e) { if (fTextWidget != null) { int x= fCachedWidgetX - fTextWidget.getHorizontalPixel(); @@ -168,9 +160,7 @@ public class MarginPainter implements IPainter, PaintListener { } } - /* - * @see org.eclipse.jface.text.IPainter#setPositionManager(org.eclipse.jface.text.IPaintPositionManager) - */ + @Override public void setPositionManager(IPaintPositionManager manager) { } } diff --git a/org.eclipse.jface.text/src/org/eclipse/jface/text/MarkSelection.java b/org.eclipse.jface.text/src/org/eclipse/jface/text/MarkSelection.java index 59be8d4905e..c2b87b7923e 100644 --- a/org.eclipse.jface.text/src/org/eclipse/jface/text/MarkSelection.java +++ b/org.eclipse.jface.text/src/org/eclipse/jface/text/MarkSelection.java @@ -39,30 +39,22 @@ public class MarkSelection implements IMarkSelection { fLength= length; } - /* - * @see IMarkSelection#getDocument() - */ + @Override public IDocument getDocument() { return fDocument; } - /* - * @see IMarkSelection#getOffset() - */ + @Override public int getOffset() { return fOffset; } - /* - * @see IMarkSelection#getLength() - */ + @Override public int getLength() { return fLength; } - /* - * @see ISelection#isEmpty() - */ + @Override public boolean isEmpty() { return fLength == 0; } diff --git a/org.eclipse.jface.text/src/org/eclipse/jface/text/PaintManager.java b/org.eclipse.jface.text/src/org/eclipse/jface/text/PaintManager.java index dc403188bef..0220b5f2984 100644 --- a/org.eclipse.jface.text/src/org/eclipse/jface/text/PaintManager.java +++ b/org.eclipse.jface.text/src/org/eclipse/jface/text/PaintManager.java @@ -59,6 +59,7 @@ public final class PaintManager implements KeyListener, MouseListener, ISelectio * right behind the end of the position, the position is extended rather * than kept stable. */ + @Override protected void adaptToInsert() { int myStart= fPosition.offset; @@ -145,6 +146,7 @@ public final class PaintManager implements KeyListener, MouseListener, ISelectio /* * @see IPositionManager#addManagedPosition(Position) */ + @Override public void managePosition(Position position) { try { fDocument.addPosition(fCategory, position); @@ -158,6 +160,7 @@ public final class PaintManager implements KeyListener, MouseListener, ISelectio /* * @see IPositionManager#removeManagedPosition(Position) */ + @Override public void unmanagePosition(Position position) { try { fDocument.removePosition(fCategory, position); @@ -299,48 +302,34 @@ public final class PaintManager implements KeyListener, MouseListener, ISelectio ((IPainter) e.next()).paint(reason); } - /* - * @see KeyListener#keyPressed(KeyEvent) - */ + @Override public void keyPressed(KeyEvent e) { paint(IPainter.KEY_STROKE); } - /* - * @see KeyListener#keyReleased(KeyEvent) - */ + @Override public void keyReleased(KeyEvent e) { } - /* - * @see MouseListener#mouseDoubleClick(MouseEvent) - */ + @Override public void mouseDoubleClick(MouseEvent e) { } - /* - * @see MouseListener#mouseDown(MouseEvent) - */ + @Override public void mouseDown(MouseEvent e) { paint(IPainter.MOUSE_BUTTON); } - /* - * @see MouseListener#mouseUp(MouseEvent) - */ + @Override public void mouseUp(MouseEvent e) { } - /* - * @see ISelectionChangedListener#selectionChanged(SelectionChangedEvent) - */ + @Override public void selectionChanged(SelectionChangedEvent event) { paint(IPainter.SELECTION); } - /* - * @see ITextListener#textChanged(TextEvent) - */ + @Override public void textChanged(TextEvent event) { if (!event.getViewerRedrawState()) @@ -349,6 +338,7 @@ public final class PaintManager implements KeyListener, MouseListener, ISelectio Control control= fTextViewer.getTextWidget(); if (control != null) { control.getDisplay().asyncExec(new Runnable() { + @Override public void run() { if (fTextViewer != null) paint(IPainter.TEXT_CHANGE); @@ -357,9 +347,7 @@ public final class PaintManager implements KeyListener, MouseListener, ISelectio } } - /* - * @see ITextInputListener#inputDocumentAboutToBeChanged(IDocument, IDocument) - */ + @Override public void inputDocumentAboutToBeChanged(IDocument oldInput, IDocument newInput) { if (oldInput != null) { for (Iterator e= fPainters.iterator(); e.hasNext();) @@ -369,9 +357,7 @@ public final class PaintManager implements KeyListener, MouseListener, ISelectio } } - /* - * @see ITextInputListener#inputDocumentChanged(IDocument, IDocument) - */ + @Override public void inputDocumentChanged(IDocument oldInput, IDocument newInput) { if (newInput != null && newInput != fManager.fDocument) { fManager.install(newInput); diff --git a/org.eclipse.jface.text/src/org/eclipse/jface/text/PropagatingFontFieldEditor.java b/org.eclipse.jface.text/src/org/eclipse/jface/text/PropagatingFontFieldEditor.java index a825d01d780..5ff9b3e6ad5 100644 --- a/org.eclipse.jface.text/src/org/eclipse/jface/text/PropagatingFontFieldEditor.java +++ b/org.eclipse.jface.text/src/org/eclipse/jface/text/PropagatingFontFieldEditor.java @@ -37,6 +37,7 @@ import org.eclipse.jface.util.PropertyChangeEvent; * @since 2.0 * @deprecated since 3.0 not longer in use, no longer supported */ +@Deprecated public class PropagatingFontFieldEditor extends FontFieldEditor { /** The editor's parent widget */ @@ -58,9 +59,7 @@ public class PropagatingFontFieldEditor extends FontFieldEditor { fDefaultFontLabel= defaultFontLabel == null ? "" : defaultFontLabel; //$NON-NLS-1$ } - /* - * @see FontFieldEditor#doLoad() - */ + @Override protected void doLoad() { if (getPreferenceStore().isDefault(getPreferenceName())) loadDefault(); @@ -68,9 +67,7 @@ public class PropagatingFontFieldEditor extends FontFieldEditor { checkForDefault(); } - /* - * @see FontFieldEditor#doLoadDefault() - */ + @Override protected void doLoadDefault() { super.doLoadDefault(); checkForDefault(); @@ -121,6 +118,7 @@ public class PropagatingFontFieldEditor extends FontFieldEditor { */ public static void startPropagate(final IPreferenceStore source, final String sourceKey, final IPreferenceStore target, final String targetKey) { source.addPropertyChangeListener(new IPropertyChangeListener() { + @Override public void propertyChange(PropertyChangeEvent event) { if (sourceKey.equals(event.getProperty())) propagateFont(source, sourceKey, target, targetKey); diff --git a/org.eclipse.jface.text/src/org/eclipse/jface/text/TabsToSpacesConverter.java b/org.eclipse.jface.text/src/org/eclipse/jface/text/TabsToSpacesConverter.java index 3fa7f6b3849..6e01547ed4b 100644 --- a/org.eclipse.jface.text/src/org/eclipse/jface/text/TabsToSpacesConverter.java +++ b/org.eclipse.jface.text/src/org/eclipse/jface/text/TabsToSpacesConverter.java @@ -46,6 +46,7 @@ public class TabsToSpacesConverter implements IAutoEditStrategy { return remainder; } + @Override public void customizeDocumentCommand(IDocument document, DocumentCommand command) { String text= command.text; if (text == null) diff --git a/org.eclipse.jface.text/src/org/eclipse/jface/text/TextAttribute.java b/org.eclipse.jface.text/src/org/eclipse/jface/text/TextAttribute.java index 9d70dffba74..81c4404f35d 100644 --- a/org.eclipse.jface.text/src/org/eclipse/jface/text/TextAttribute.java +++ b/org.eclipse.jface.text/src/org/eclipse/jface/text/TextAttribute.java @@ -99,9 +99,7 @@ public class TextAttribute { this(foreground, null, SWT.NORMAL); } - /* - * @see Object#equals(Object) - */ + @Override public boolean equals(Object object) { if (object == this) @@ -128,10 +126,8 @@ public class TextAttribute { return (o2 == null); } - /* - * @see Object#hashCode() - */ - public int hashCode() { + @Override + public int hashCode() { if (fHashCode == 0) { int multiplier= 37; // some prime fHashCode= 13; // some random value diff --git a/org.eclipse.jface.text/src/org/eclipse/jface/text/TextPresentation.java b/org.eclipse.jface.text/src/org/eclipse/jface/text/TextPresentation.java index 2d160e71c38..6730ae24f52 100644 --- a/org.eclipse.jface.text/src/org/eclipse/jface/text/TextPresentation.java +++ b/org.eclipse.jface.text/src/org/eclipse/jface/text/TextPresentation.java @@ -90,9 +90,7 @@ public class TextPresentation { computeIndex(); } - /* - * @see Iterator#next() - */ + @Override public Object next() { try { StyleRange r= (StyleRange) fRanges.get(fIndex++); @@ -105,16 +103,12 @@ public class TextPresentation { } } - /* - * @see Iterator#hasNext() - */ + @Override public boolean hasNext() { return fIndex < fLength; } - /* - * @see Iterator#remove() - */ + @Override public void remove() { throw new UnsupportedOperationException(); } diff --git a/org.eclipse.jface.text/src/org/eclipse/jface/text/TextSelection.java b/org.eclipse.jface.text/src/org/eclipse/jface/text/TextSelection.java index 33d1516e055..b29e1eae5eb 100644 --- a/org.eclipse.jface.text/src/org/eclipse/jface/text/TextSelection.java +++ b/org.eclipse.jface.text/src/org/eclipse/jface/text/TextSelection.java @@ -101,27 +101,22 @@ public class TextSelection implements ITextSelection { * @return <code>true</code> if this selection is empty * @see #emptySelection() */ + @Override public boolean isEmpty() { return this == NULL || /* backwards compatibility: */ fOffset < 0 || fLength < 0; } - /* - * @see org.eclipse.jface.text.ITextSelection#getOffset() - */ + @Override public int getOffset() { return fOffset; } - /* - * @see org.eclipse.jface.text.ITextSelection#getLength() - */ + @Override public int getLength() { return fLength; } - /* - * @see org.eclipse.jface.text.ITextSelection#getStartLine() - */ + @Override public int getStartLine() { try { @@ -133,9 +128,7 @@ public class TextSelection implements ITextSelection { return -1; } - /* - * @see org.eclipse.jface.text.ITextSelection#getEndLine() - */ + @Override public int getEndLine() { try { if (fDocument != null) { @@ -150,9 +143,7 @@ public class TextSelection implements ITextSelection { return -1; } - /* - * @see org.eclipse.jface.text.ITextSelection#getText() - */ + @Override public String getText() { try { if (fDocument != null) @@ -163,9 +154,7 @@ public class TextSelection implements ITextSelection { return null; } - /* - * @see java.lang.Object#equals(Object) - */ + @Override public boolean equals(Object obj) { if (obj == this) return true; @@ -193,9 +182,7 @@ public class TextSelection implements ITextSelection { return false; } - /* - * @see java.lang.Object#hashCode() - */ + @Override public int hashCode() { int low= fDocument != null ? fDocument.hashCode() : 0; return (fOffset << 24) | (fLength << 16) | low; diff --git a/org.eclipse.jface.text/src/org/eclipse/jface/text/TextViewer.java b/org.eclipse.jface.text/src/org/eclipse/jface/text/TextViewer.java index 2028462b002..fe62f16a3f7 100644 --- a/org.eclipse.jface.text/src/org/eclipse/jface/text/TextViewer.java +++ b/org.eclipse.jface.text/src/org/eclipse/jface/text/TextViewer.java @@ -203,18 +203,12 @@ public class TextViewer extends Viewer implements /** Internal flag to remember the last double-click selection. */ private Point fDoubleClickSelection; - /* - * @see org.eclipse.swt.events.MouseAdapter#mouseUp(org.eclipse.swt.events.MouseEvent) - * @since 3.2 - */ + @Override public void mouseUp(MouseEvent e) { fDoubleClickSelection= null; } - /* - * @see org.eclipse.swt.custom.MovementListener#getNextOffset(org.eclipse.swt.custom.MovementEvent) - * @since 3.3 - */ + @Override public void getNextOffset(MovementEvent event) { if (event.movement != SWT.MOVEMENT_WORD_END) return; @@ -230,10 +224,7 @@ public class TextViewer extends Viewer implements } } - /* - * @see org.eclipse.swt.custom.MovementListener#getPreviousOffset(org.eclipse.swt.custom.MovementEvent) - * @since 3.3 - */ + @Override public void getPreviousOffset(MovementEvent event) { if (event.movement != SWT.MOVEMENT_WORD_START) return; @@ -282,22 +273,19 @@ public class TextViewer extends Viewer implements class ViewportGuard extends MouseAdapter implements ControlListener, KeyListener, SelectionListener { - /* - * @see ControlListener#controlResized(ControlEvent) - */ + @Override public void controlResized(ControlEvent e) { updateViewportListeners(RESIZE); } - /* - * @see ControlListener#controlMoved(ControlEvent) - */ + @Override public void controlMoved(ControlEvent e) { } /* * @see KeyListener#keyReleased */ + @Override public void keyReleased(KeyEvent e) { updateViewportListeners(KEY); } @@ -305,6 +293,7 @@ public class TextViewer extends Viewer implements /* * @see KeyListener#keyPressed */ + @Override public void keyPressed(KeyEvent e) { updateViewportListeners(KEY); } @@ -312,6 +301,7 @@ public class TextViewer extends Viewer implements /* * @see MouseListener#mouseUp */ + @Override public void mouseUp(MouseEvent e) { if (fTextWidget != null) fTextWidget.removeSelectionListener(this); @@ -321,6 +311,7 @@ public class TextViewer extends Viewer implements /* * @see MouseListener#mouseDown */ + @Override public void mouseDown(MouseEvent e) { if (fTextWidget != null) fTextWidget.addSelectionListener(this); @@ -329,6 +320,7 @@ public class TextViewer extends Viewer implements /* * @see SelectionListener#widgetSelected */ + @Override public void widgetSelected(SelectionEvent e) { if (e.widget == fScroller) updateViewportListeners(SCROLLER); @@ -339,6 +331,7 @@ public class TextViewer extends Viewer implements /* * @see SelectionListener#widgetDefaultSelected */ + @Override public void widgetDefaultSelected(SelectionEvent e) {} } @@ -360,6 +353,7 @@ public class TextViewer extends Viewer implements * If an insertion happens at the selection's start offset, * the position is extended rather than shifted. */ + @Override protected void adaptToInsert() { int myStart= fPosition.offset; @@ -391,6 +385,7 @@ public class TextViewer extends Viewer implements /* * @see IDocumentListener#documentAboutToBeChanged */ + @Override public void documentAboutToBeChanged(DocumentEvent e) { if (e.getDocument() == getVisibleDocument()) fWidgetCommand.setEvent(e); @@ -400,6 +395,7 @@ public class TextViewer extends Viewer implements /* * @see IDocumentListener#documentChanged */ + @Override public void documentChanged(DocumentEvent e) { if (fWidgetCommand.event == e) updateTextListeners(fWidgetCommand); @@ -429,9 +425,7 @@ public class TextViewer extends Viewer implements fForward= forward; } - /* - * @see VerifyListener#verifyText(VerifyEvent) - */ + @Override public void verifyText(VerifyEvent e) { if (fForward) handleVerifyEvent(e); @@ -478,9 +472,7 @@ public class TextViewer extends Viewer implements /** The reentrance count. */ private int fReentranceCount= 0; - /* - * @see VerifyKeyListener#verifyKey(VerifyEvent) - */ + @Override public void verifyKey(VerifyEvent event) { if (fListeners.isEmpty()) return; @@ -669,10 +661,7 @@ public class TextViewer extends Viewer implements paint(); } - /* - * @see LineBackgroundListener#lineGetBackground(LineBackgroundEvent) - * @since 2.0 - */ + @Override public void lineGetBackground(LineBackgroundEvent event) { /* Don't use cached line information because of patched redrawing events. */ @@ -759,19 +748,13 @@ public class TextViewer extends Viewer implements fTextWidget.redrawRange(offset, length, true); } - /* - * @see ITextListener#textChanged(TextEvent) - * @since 2.0 - */ + @Override public void textChanged(TextEvent event) { if (event.getViewerRedrawState()) paint(); } - /* - * @see IPositionUpdater#update(DocumentEvent) - * @since 2.0 - */ + @Override public void update(DocumentEvent event) { int offset= event.getOffset(); int length= event.getLength(); @@ -801,9 +784,7 @@ public class TextViewer extends Viewer implements */ private DocumentRewriteSession fRewriteSession; - /* - * @see IFindReplaceTarget#getSelectionText() - */ + @Override public String getSelectionText() { Point s= TextViewer.this.getSelectedRange(); if (s.x > -1 && s.y > -1) { @@ -816,16 +797,12 @@ public class TextViewer extends Viewer implements return ""; //$NON-NLS-1$ } - /* - * @see IFindReplaceTarget#replaceSelection(String) - */ + @Override public void replaceSelection(String text) { replaceSelection(text, false); } - /* - * @see IFindReplaceTarget#replaceSelection(String) - */ + @Override public void replaceSelection(String text, boolean regExReplace) { Point s= TextViewer.this.getSelectedRange(); if (s.x > -1 && s.y > -1) { @@ -842,25 +819,19 @@ public class TextViewer extends Viewer implements } } - /* - * @see IFindReplaceTarget#isEditable() - */ + @Override public boolean isEditable() { return TextViewer.this.isEditable(); } - /* - * @see IFindReplaceTarget#getSelection() - */ + @Override public Point getSelection() { Point modelSelection= TextViewer.this.getSelectedRange(); Point widgetSelection= modelSelection2WidgetSelection(modelSelection); return widgetSelection != null ? widgetSelection : new Point(-1, -1); } - /* - * @see IFindReplaceTarget#findAndSelect(int, String, boolean, boolean, boolean) - */ + @Override public int findAndSelect(int widgetOffset, String findString, boolean searchForward, boolean caseSensitive, boolean wholeWord) { try { return findAndSelect(widgetOffset, findString, searchForward, caseSensitive, wholeWord, false); @@ -869,9 +840,7 @@ public class TextViewer extends Viewer implements } } - /* - * @see IFindReplaceTarget#findAndSelect(int, String, boolean, boolean, boolean) - */ + @Override public int findAndSelect(int widgetOffset, String findString, boolean searchForward, boolean caseSensitive, boolean wholeWord, boolean regExSearch) { int modelOffset= widgetOffset == -1 ? -1 : widgetOffset2ModelOffset(widgetOffset); @@ -887,25 +856,17 @@ public class TextViewer extends Viewer implements return widgetOffset; } - /* - * @see IFindReplaceTarget#canPerformFind() - */ + @Override public boolean canPerformFind() { return TextViewer.this.canPerformFind(); } - /* - * @see IFindReplaceTargetExtension#beginSession() - * @since 2.0 - */ + @Override public void beginSession() { fRange= null; } - /* - * @see IFindReplaceTargetExtension#endSession() - * @since 2.0 - */ + @Override public void endSession() { if (fRange != null) { fRange.uninstall(); @@ -913,18 +874,12 @@ public class TextViewer extends Viewer implements } } - /* - * @see IFindReplaceTargetExtension#getScope() - * @since 2.0 - */ + @Override public IRegion getScope() { return fRange == null ? null : fRange.getRange(); } - /* - * @see IFindReplaceTargetExtension#getLineSelection() - * @since 2.0 - */ + @Override public Point getLineSelection() { Point point= TextViewer.this.getSelectedRange(); @@ -952,18 +907,12 @@ public class TextViewer extends Viewer implements } } - /* - * @see IFindReplaceTargetExtension#setSelection(int, int) - * @since 2.0 - */ + @Override public void setSelection(int modelOffset, int modelLength) { TextViewer.this.setSelectedRange(modelOffset, modelLength); } - /* - * @see IFindReplaceTargetExtension#setScope(IRegion) - * @since 2.0 - */ + @Override public void setScope(IRegion scope) { if (fRange != null) fRange.uninstall(); @@ -978,20 +927,14 @@ public class TextViewer extends Viewer implements fRange.install(); } - /* - * @see IFindReplaceTargetExtension#setScopeHighlightColor(Color) - * @since 2.0 - */ + @Override public void setScopeHighlightColor(Color color) { if (fRange != null) fRange.setHighlightColor(color); fScopeHighlightColor= color; } - /* - * @see IFindReplaceTargetExtension#setReplaceAllMode(boolean) - * @since 2.0 - */ + @Override public void setReplaceAllMode(boolean replaceAll) { // http://bugs.eclipse.org/bugs/show_bug.cgi?id=18232 @@ -1039,32 +982,24 @@ public class TextViewer extends Viewer implements */ class RewriteTarget implements IRewriteTarget { - /* - * @see org.eclipse.jface.text.IRewriteTarget#beginCompoundChange() - */ + @Override public void beginCompoundChange() { if (fUndoManager != null) fUndoManager.beginCompoundChange(); } - /* - * @see org.eclipse.jface.text.IRewriteTarget#endCompoundChange() - */ + @Override public void endCompoundChange() { if (fUndoManager != null) fUndoManager.endCompoundChange(); } - /* - * @see org.eclipse.jface.text.IRewriteTarget#getDocument() - */ + @Override public IDocument getDocument() { return TextViewer.this.getDocument(); } - /* - * @see org.eclipse.jface.text.IRewriteTarget#setRedraw(boolean) - */ + @Override public void setRedraw(boolean redraw) { TextViewer.this.setRedraw(redraw); } @@ -1096,9 +1031,7 @@ public class TextViewer extends Viewer implements fStateMask= stateMask; } - /* - * @see java.lang.Object#equals(java.lang.Object) - */ + @Override public boolean equals(Object obj) { if (obj == null || obj.getClass() != getClass()) return false; @@ -1106,9 +1039,7 @@ public class TextViewer extends Viewer implements return textHoverKey.fContentType.equals(fContentType) && textHoverKey.fStateMask == fStateMask; } - /* - * @see java.lang.Object#hashCode() - */ + @Override public int hashCode() { return fStateMask << 16 | fContentType.hashCode(); } @@ -1404,15 +1335,14 @@ public class TextViewer extends Viewer implements } } - /* - * @see KeyListener#keyPressed(org.eclipse.swt.events.KeyEvent) - */ + @Override public void keyPressed(KeyEvent event) { } /* * @see KeyListener#keyPressed(org.eclipse.swt.events.KeyEvent) */ + @Override public void keyReleased(KeyEvent e) { if (!fTextWidget.isTextSelected()) { fLastSentSelectionChange= null; @@ -1420,21 +1350,15 @@ public class TextViewer extends Viewer implements } } - /* - * @see MouseListener#mouseDoubleClick(org.eclipse.swt.events.MouseEvent) - */ + @Override public void mouseDoubleClick(MouseEvent e) { } - /* - * @see MouseListener#mouseDown(org.eclipse.swt.events.MouseEvent) - */ + @Override public void mouseDown(MouseEvent e) { } - /* - * @see MouseListener#mouseUp(org.eclipse.swt.events.MouseEvent) - */ + @Override public void mouseUp(MouseEvent event) { if (!fTextWidget.isTextSelected()) queuePostSelectionChanged(false); @@ -1447,9 +1371,7 @@ public class TextViewer extends Viewer implements */ private class DocumentRewriteSessionListener implements IDocumentRewriteSessionListener { - /* - * @see org.eclipse.jface.text.IDocumentRewriteSessionListener#documentRewriteSessionChanged(org.eclipse.jface.text.DocumentRewriteSessionEvent) - */ + @Override public void documentRewriteSessionChanged(DocumentRewriteSessionEvent event) { IRewriteTarget target= TextViewer.this.getRewriteTarget(); final boolean toggleRedraw; @@ -1779,6 +1701,7 @@ public class TextViewer extends Viewer implements // Support scroll page upon MOD1+MouseWheel fTextWidget.addListener(SWT.MouseVerticalWheel, new Listener() { + @Override public void handleEvent(Event event) { if (((event.stateMask & SWT.MOD1) == 0)) return; @@ -1797,6 +1720,7 @@ public class TextViewer extends Viewer implements fTextWidget.addDisposeListener( new DisposeListener() { + @Override public void widgetDisposed(DisposeEvent e) { fDisposedControl= getControl(); handleDispose(); @@ -1812,6 +1736,7 @@ public class TextViewer extends Viewer implements * 1GIYQ9K: ITPUI:WINNT - StyledText swallows Shift+TAB */ fTextWidget.addTraverseListener(new TraverseListener() { + @Override public void keyTraversed(TraverseEvent e) { if ((SWT.SHIFT == e.stateMask) && ('\t' == e.character)) e.doit= !fTextWidget.getEditable(); @@ -1825,9 +1750,11 @@ public class TextViewer extends Viewer implements fTextWidget.addVerifyListener(fVerifyListener); fTextWidget.addSelectionListener(new SelectionListener() { + @Override public void widgetDefaultSelected(SelectionEvent event) { selectionChanged(event.x, event.y - event.x); } + @Override public void widgetSelected(SelectionEvent event) { selectionChanged(event.x, event.y - event.x); } @@ -1839,16 +1766,12 @@ public class TextViewer extends Viewer implements initializeViewportUpdate(); } - /* - * @see Viewer#getControl() - */ + @Override public Control getControl() { return fTextWidget != null ? fTextWidget : fDisposedControl; } - /* - * @see ITextViewer#activatePlugins() - */ + @Override public void activatePlugins() { if (fDoubleClickStrategies != null && !fDoubleClickStrategies.isEmpty() && fDoubleClickStrategyConnector == null) { @@ -1878,9 +1801,7 @@ public class TextViewer extends Viewer implements } } - /* - * @see ITextViewer#resetPlugins() - */ + @Override public void resetPlugins() { if (fUndoManager != null) fUndoManager.reset(); @@ -1987,9 +1908,7 @@ public class TextViewer extends Viewer implements //---- simple getters and setters - /* - * @see org.eclipse.jface.text.ITextViewer#getTextWidget() - */ + @Override public StyledText getTextWidget() { return fTextWidget; } @@ -2019,6 +1938,8 @@ public class TextViewer extends Viewer implements * {@link ITextViewerExtension2#prependAutoEditStrategy(IAutoEditStrategy, String)} and * {@link ITextViewerExtension2#removeAutoEditStrategy(IAutoEditStrategy, String)} instead */ + @Deprecated + @Override public void setAutoIndentStrategy(IAutoIndentStrategy strategy, String contentType) { setAutoEditStrategies(new IAutoEditStrategy[] { strategy }, contentType); } @@ -2053,10 +1974,7 @@ public class TextViewer extends Viewer implements } } - /* - * @see org.eclipse.jface.text.ITextViewerExtension2#prependAutoEditStrategy(org.eclipse.jface.text.IAutoEditStrategy, java.lang.String) - * @since 2.1 - */ + @Override public void prependAutoEditStrategy(IAutoEditStrategy strategy, String contentType) { if (strategy == null || contentType == null) @@ -2074,10 +1992,7 @@ public class TextViewer extends Viewer implements autoEditStrategies.add(0, strategy); } - /* - * @see org.eclipse.jface.text.ITextViewerExtension2#removeAutoEditStrategy(org.eclipse.jface.text.IAutoEditStrategy, java.lang.String) - * @since 2.1 - */ + @Override public void removeAutoEditStrategy(IAutoEditStrategy strategy, String contentType) { if (fAutoIndentStrategies == null) return; @@ -2097,16 +2012,12 @@ public class TextViewer extends Viewer implements fAutoIndentStrategies.put(contentType, null); } - /* - * @see ITextViewer#setEventConsumer(IEventConsumer) - */ + @Override public void setEventConsumer(IEventConsumer consumer) { fEventConsumer= consumer; } - /* - * @see ITextViewer#setIndentPrefixes(String[], String) - */ + @Override public void setIndentPrefixes(String[] indentPrefixes, String contentType) { int i= -1; @@ -2125,25 +2036,19 @@ public class TextViewer extends Viewer implements fIndentChars.remove(contentType); } - /* - * @see ITextViewer#getTopInset() - */ + @Override public int getTopInset() { return fTopInset; } - /* - * @see ITextViewer#isEditable() - */ + @Override public boolean isEditable() { if (fTextWidget == null) return false; return fTextWidget.getEditable(); } - /* - * @see ITextViewer#setEditable(boolean) - */ + @Override public void setEditable(boolean editable) { if (fTextWidget != null) fTextWidget.setEditable(editable); @@ -2153,6 +2058,7 @@ public class TextViewer extends Viewer implements * @see ITextViewer#setDefaultPrefixes * @since 2.0 */ + @Override public void setDefaultPrefixes(String[] defaultPrefixes, String contentType) { if (defaultPrefixes != null && defaultPrefixes.length > 0) { @@ -2163,32 +2069,22 @@ public class TextViewer extends Viewer implements fDefaultPrefixChars.remove(contentType); } - /* - * @see ITextViewer#setUndoManager(IUndoManager) - */ + @Override public void setUndoManager(IUndoManager undoManager) { fUndoManager= undoManager; } - /* - * @see ITextViewerExtension6#getUndoManager() - * @since 3.1 - */ + @Override public IUndoManager getUndoManager() { return fUndoManager; } - /* - * @see ITextViewer#setTextHover(ITextHover, String) - */ + @Override public void setTextHover(ITextHover hover, String contentType) { setTextHover(hover, contentType, ITextViewerExtension2.DEFAULT_HOVER_STATE_MASK); } - /* - * @see ITextViewerExtension2#setTextHover(ITextHover, String, int) - * @since 2.1 - */ + @Override public void setTextHover(ITextHover hover, String contentType, int stateMask) { TextHoverKey key= new TextHoverKey(contentType, stateMask); if (hover != null) { @@ -2202,10 +2098,7 @@ public class TextViewer extends Viewer implements ensureHoverControlManagerInstalled(); } - /* - * @see ITextViewerExtension2#removeTextHovers(String) - * @since 2.1 - */ + @Override public void removeTextHovers(String contentType) { if (fTextHovers == null) return; @@ -2285,17 +2178,15 @@ public class TextViewer extends Viewer implements * * @since 3.4 */ + @Override public void setHoverEnrichMode(ITextViewerExtension8.EnrichMode mode) { if (fTextHoverManager == null) return; fTextHoverManager.setHoverEnrichMode(mode); } - /* - * @see IWidgetTokenOwner#requestWidgetToken(IWidgetTokenKeeper) - * @since 2.0 - */ - public boolean requestWidgetToken(IWidgetTokenKeeper requester) { + @Override + public boolean requestWidgetToken(IWidgetTokenKeeper requester) { if (fTextWidget != null) { if (fWidgetTokenKeeper != null) { if (fWidgetTokenKeeper == requester) @@ -2312,10 +2203,7 @@ public class TextViewer extends Viewer implements return false; } - /* - * @see org.eclipse.jface.text.IWidgetTokenOwnerExtension#requestWidgetToken(org.eclipse.jface.text.IWidgetTokenKeeper, int) - * @since 3.0 - */ + @Override public boolean requestWidgetToken(IWidgetTokenKeeper requester, int priority) { if (fTextWidget != null) { if (fWidgetTokenKeeper != null) { @@ -2344,10 +2232,7 @@ public class TextViewer extends Viewer implements return false; } - /* - * @see IWidgetTokenOwner#releaseWidgetToken(IWidgetTokenKeeper) - * @since 2.0 - */ + @Override public void releaseWidgetToken(IWidgetTokenKeeper tokenKeeper) { if (fWidgetTokenKeeper == tokenKeeper) fWidgetTokenKeeper= null; @@ -2356,9 +2241,7 @@ public class TextViewer extends Viewer implements //---- Selection - /* - * @see ITextViewer#getSelectedRange() - */ + @Override public Point getSelectedRange() { if (!redraws() && fViewerState != null) @@ -2374,9 +2257,7 @@ public class TextViewer extends Viewer implements return new Point(-1, -1); } - /* - * @see ITextViewer#setSelectedRange(int, int) - */ + @Override public void setSelectedRange(int selectionOffset, int selectionLength) { if (!redraws()) { @@ -2485,9 +2366,7 @@ public class TextViewer extends Viewer implements } } - /* - * @see Viewer#setSelection(ISelection) - */ + @Override public void setSelection(ISelection selection, boolean reveal) { if (selection instanceof IBlockTextSelection && getTextWidget().getBlockSelection()) { IBlockTextSelection s= (IBlockTextSelection) selection; @@ -2536,9 +2415,7 @@ public class TextViewer extends Viewer implements } } - /* - * @see Viewer#getSelection() - */ + @Override public ISelection getSelection() { if (fTextWidget != null && fTextWidget.getBlockSelection()) { int[] ranges= fTextWidget.getSelectionRanges(); @@ -2598,17 +2475,12 @@ public class TextViewer extends Viewer implements return diff > 0 ? diff / avgCharWidth : 0; } - /* - * @see ITextViewer#getSelectionProvider() - */ + @Override public ISelectionProvider getSelectionProvider() { return this; } - /* - * @see org.eclipse.jface.text.IPostSelectionProvider#addPostSelectionChangedListener(org.eclipse.jface.viewers.ISelectionChangedListener) - * @since 3.0 - */ + @Override public void addPostSelectionChangedListener(ISelectionChangedListener listener) { Assert.isNotNull(listener); @@ -2620,10 +2492,7 @@ public class TextViewer extends Viewer implements fPostSelectionChangedListeners.add(listener); } - /* - * @see org.eclipse.jface.text.IPostSelectionProvider#removePostSelectionChangedListener(org.eclipse.jface.viewers.ISelectionChangedListener) - * @since 3.0 - */ + @Override public void removePostSelectionChangedListener(ISelectionChangedListener listener) { Assert.isNotNull(listener); @@ -2666,6 +2535,7 @@ public class TextViewer extends Viewer implements fNumberOfPostSelectionChangedEvents[0]++; display.timerExec(getEmptySelectionChangedEventDelay(), new Runnable() { final int id= fNumberOfPostSelectionChangedEvents[0]; + @Override public void run() { if (id == fNumberOfPostSelectionChangedEvents[0]) { // Check again because this is executed after the delay @@ -2778,9 +2648,7 @@ public class TextViewer extends Viewer implements //---- Text listeners - /* - * @see ITextViewer#addTextListener(ITextListener) - */ + @Override public void addTextListener(ITextListener listener) { Assert.isNotNull(listener); @@ -2792,9 +2660,7 @@ public class TextViewer extends Viewer implements fTextListeners.add(listener); } - /* - * @see ITextViewer#removeTextListener(ITextListener) - */ + @Override public void removeTextListener(ITextListener listener) { Assert.isNotNull(listener); @@ -2830,9 +2696,7 @@ public class TextViewer extends Viewer implements //---- Text input listeners - /* - * @see ITextViewer#addTextInputListener(ITextInputListener) - */ + @Override public void addTextInputListener(ITextInputListener listener) { Assert.isNotNull(listener); @@ -2844,9 +2708,7 @@ public class TextViewer extends Viewer implements fTextInputListeners.add(listener); } - /* - * @see ITextViewer#removeTextInputListener(ITextInputListener) - */ + @Override public void removeTextInputListener(ITextInputListener listener) { Assert.isNotNull(listener); @@ -2894,23 +2756,17 @@ public class TextViewer extends Viewer implements //---- Document - /* - * @see Viewer#getInput() - */ + @Override public Object getInput() { return getDocument(); } - /* - * @see ITextViewer#getDocument() - */ + @Override public IDocument getDocument() { return fDocument; } - /* - * @see Viewer#setInput(Object) - */ + @Override public void setInput(Object input) { IDocument document= null; @@ -2920,9 +2776,7 @@ public class TextViewer extends Viewer implements setDocument(document); } - /* - * @see ITextViewer#setDocument(IDocument) - */ + @Override public void setDocument(IDocument document) { fReplaceTextPresentation= true; @@ -2941,9 +2795,7 @@ public class TextViewer extends Viewer implements fReplaceTextPresentation= false; } - /* - * @see ITextViewer#setDocument(IDocument, int, int) - */ + @Override public void setDocument(IDocument document, int modelRangeOffset, int modelRangeLength) { fReplaceTextPresentation= true; @@ -2999,6 +2851,7 @@ public class TextViewer extends Viewer implements * @since 2.1 * @deprecated use <code>updateSlaveDocument</code> instead */ + @Deprecated protected boolean updateVisibleDocument(IDocument visibleDocument, int visibleRegionOffset, int visibleRegionLength) throws BadLocationException { if (visibleDocument instanceof ChildDocument) { ChildDocument childDocument= (ChildDocument) visibleDocument; @@ -3080,9 +2933,7 @@ public class TextViewer extends Viewer implements } } - /* - * @see ITextViewer#addViewportListener(IViewportListener) - */ + @Override public void addViewportListener(IViewportListener listener) { if (fViewportListeners == null) { @@ -3094,9 +2945,7 @@ public class TextViewer extends Viewer implements fViewportListeners.add(listener); } - /* - * @see ITextViewer#removeViewportListener(IVewportListener) - */ + @Override public void removeViewportListener(IViewportListener listener) { if (fViewportListeners != null) fViewportListeners.remove(listener); @@ -3128,9 +2977,7 @@ public class TextViewer extends Viewer implements //---- scrolling and revealing - /* - * @see ITextViewer#getTopIndex() - */ + @Override public int getTopIndex() { if (fTextWidget != null) { @@ -3141,9 +2988,7 @@ public class TextViewer extends Viewer implements return -1; } - /* - * @see ITextViewer#setTopIndex(int) - */ + @Override public void setTopIndex(int index) { if (fTextWidget != null) { @@ -3169,6 +3014,7 @@ public class TextViewer extends Viewer implements * @return the view port height in lines * @deprecated as of 3.2 */ + @Deprecated protected int getVisibleLinesInViewport() { if (fTextWidget != null) { Rectangle clArea= fTextWidget.getClientArea(); @@ -3178,9 +3024,7 @@ public class TextViewer extends Viewer implements return -1; } - /* - * @see ITextViewer#getBottomIndex() - */ + @Override public int getBottomIndex() { if (fTextWidget == null) @@ -3190,9 +3034,7 @@ public class TextViewer extends Viewer implements return widgetLine2ModelLine(widgetBottom); } - /* - * @see ITextViewer#getTopIndexStartOffset() - */ + @Override public int getTopIndexStartOffset() { if (fTextWidget != null) { @@ -3209,9 +3051,7 @@ public class TextViewer extends Viewer implements return -1; } - /* - * @see ITextViewer#getBottomIndexEndOffset() - */ + @Override public int getBottomIndexEndOffset() { try { @@ -3232,9 +3072,7 @@ public class TextViewer extends Viewer implements } } - /* - * @see ITextViewer#revealRange(int, int) - */ + @Override public void revealRange(int start, int length) { if (fTextWidget == null || !redraws()) @@ -3383,6 +3221,7 @@ public class TextViewer extends Viewer implements * @return the width of the presentation of the given string * @deprecated use <code>getWidthInPixels(int, int)</code> instead */ + @Deprecated final protected int getWidthInPixels(String text) { GC gc= new GC(fTextWidget); gc.setFont(fTextWidget.getFont()); @@ -3434,9 +3273,7 @@ public class TextViewer extends Viewer implements return JFaceTextUtil.getAverageCharWidth(getTextWidget()); } - /* - * @see Viewer#refresh() - */ + @Override public void refresh() { setDocument(getDocument()); } @@ -3466,9 +3303,7 @@ public class TextViewer extends Viewer implements return new ChildDocumentManager(); } - /* - * @see org.eclipse.jface.text.ITextViewer#invalidateTextPresentation() - */ + @Override public final void invalidateTextPresentation() { if (fVisibleDocument != null) { fWidgetCommand.event= null; @@ -3486,6 +3321,7 @@ public class TextViewer extends Viewer implements * @param length the length of the range to be invalidated * @since 2.1 */ + @Override public final void invalidateTextPresentation(int offset, int length) { if (fVisibleDocument != null) { @@ -3627,9 +3463,7 @@ public class TextViewer extends Viewer implements return 0; } - /* - * @see ITextViewer#getVisibleRegion() - */ + @Override public IRegion getVisibleRegion() { IDocument document= getVisibleDocument(); @@ -3641,9 +3475,7 @@ public class TextViewer extends Viewer implements return new Region(0, document == null ? 0 : document.getLength()); } - /* - * @see ITextViewer#overlapsWithVisibleRegion(int, int) - */ + @Override public boolean overlapsWithVisibleRegion(int start, int length) { IDocument document= getVisibleDocument(); if (document instanceof ChildDocument) { @@ -3656,9 +3488,7 @@ public class TextViewer extends Viewer implements return false; } - /* - * @see ITextViewer#setVisibleRegion(int, int) - */ + @Override public void setVisibleRegion(int start, int length) { IRegion region= getVisibleRegion(); @@ -3681,9 +3511,7 @@ public class TextViewer extends Viewer implements } } - /* - * @see ITextViewer#resetVisibleRegion() - */ + @Override public void resetVisibleRegion() { ISlaveDocumentManager manager= getSlaveDocumentManager(); if (manager != null) { @@ -3699,9 +3527,7 @@ public class TextViewer extends Viewer implements //-------------------------------------- - /* - * @see ITextViewer#setTextDoubleClickStrategy(ITextDoubleClickStrategy, String) - */ + @Override public void setTextDoubleClickStrategy(ITextDoubleClickStrategy strategy, String contentType) { if (strategy != null) { @@ -3889,6 +3715,7 @@ public class TextViewer extends Viewer implements fLastEventTime= e.time; if (isFirst) { wrapCompoundChange(new Runnable() { + @Override public void run() { SelectionProcessor processor= new SelectionProcessor(TextViewer.this); try { @@ -3937,9 +3764,7 @@ public class TextViewer extends Viewer implements modelRange2WidgetRange(fMarkPosition) == null; } - /* - * @see ITextViewer#canDoOperation(int) - */ + @Override public boolean canDoOperation(int operation) { if (fTextWidget == null || !redraws()) @@ -3979,9 +3804,7 @@ public class TextViewer extends Viewer implements return false; } - /* - * @see ITextViewer#doOperation(int) - */ + @Override public void doOperation(int operation) { if (fTextWidget == null || !redraws()) @@ -4010,6 +3833,7 @@ public class TextViewer extends Viewer implements copyMarkedRegion(true); else wrapCompoundChange(new Runnable() { + @Override public void run() { fTextWidget.cut(); } @@ -4080,6 +3904,7 @@ public class TextViewer extends Viewer implements fTextWidget.invokeAction(ST.DELETE_NEXT); } else { wrapCompoundChange(new Runnable(){ + @Override public void run() { try { new SelectionProcessor(TextViewer.this).doDelete(getSelection()); @@ -4100,6 +3925,7 @@ public class TextViewer extends Viewer implements fTextWidget.paste(); } else { wrapCompoundChange(new Runnable(){ + @Override public void run() { SelectionProcessor processor= new SelectionProcessor(TextViewer.this); Clipboard clipboard= new Clipboard(getDisplay()); @@ -4207,10 +4033,7 @@ public class TextViewer extends Viewer implements return fIgnoreAutoIndent; } - /* - * @see ITextOperationTargetExtension#enableOperation(int, boolean) - * @since 2.0 - */ + @Override public void enableOperation(int operation, boolean enable) { /* * NO-OP by default. @@ -4241,6 +4064,7 @@ public class TextViewer extends Viewer implements if (delete) { wrapCompoundChange(new Runnable() { + @Override public void run() { fTextWidget.cut(); } @@ -4258,6 +4082,7 @@ public class TextViewer extends Viewer implements * * @deprecated use <code>StyledText.invokeAction</code> instead */ + @Deprecated protected void deleteText() { fTextWidget.invokeAction(ST.DELETE_NEXT); } @@ -4374,6 +4199,7 @@ public class TextViewer extends Viewer implements * * @deprecated use shift(boolean, boolean, boolean) instead */ + @Deprecated protected void shift(boolean useDefaultPrefixes, boolean right) { shift(useDefaultPrefixes, right, false); } @@ -4562,6 +4388,7 @@ public class TextViewer extends Viewer implements * * @since 3.4 */ + @Override public void print(StyledTextPrintOptions options) { final Shell shell= fTextWidget.getShell(); @@ -4581,6 +4408,7 @@ public class TextViewer extends Viewer implements final Runnable styledTextPrinter= fTextWidget.print(printer, options); Thread printingThread= new Thread("Printing") { //$NON-NLS-1$ + @Override public void run() { styledTextPrinter.run(); printer.dispose(); @@ -4635,6 +4463,7 @@ public class TextViewer extends Viewer implements * @return the model offset of the first match * @deprecated as of 3.0 use {@link #findAndSelect(int, String, boolean, boolean, boolean, boolean)} */ + @Deprecated protected int findAndSelect(int startPosition, String findString, boolean forwardSearch, boolean caseSensitive, boolean wholeWord) { try { return findAndSelect(startPosition, findString, forwardSearch, caseSensitive, wholeWord, false); @@ -4780,17 +4609,13 @@ public class TextViewer extends Viewer implements //---------- text presentation support - /* - * @see ITextViewer#setTextColor(Color) - */ + @Override public void setTextColor(Color color) { if (color != null) setTextColor(color, 0, getDocument().getLength(), true); } - /* - * @see ITextViewer#setTextColor(Color, start, length, boolean) - */ + @Override public void setTextColor(Color color, int start, int length, boolean controlRedraw) { if (fTextWidget != null) { @@ -4902,9 +4727,7 @@ public class TextViewer extends Viewer implements return null; } - /* - * @see ITextViewer#changeTextPresentation(TextPresentation, boolean) - */ + @Override public void changeTextPresentation(TextPresentation presentation, boolean controlRedraw) { if (presentation == null || !redraws()) @@ -4941,9 +4764,7 @@ public class TextViewer extends Viewer implements fTextWidget.setRedraw(true); } - /* - * @see ITextViewer#getFindReplaceTarget() - */ + @Override public IFindReplaceTarget getFindReplaceTarget() { if (fFindReplaceTarget == null) fFindReplaceTarget= new FindReplaceTarget(); @@ -4962,51 +4783,34 @@ public class TextViewer extends Viewer implements return fFindReplaceDocumentAdapter; } - /* - * @see ITextViewer#getTextOperationTarget() - */ + @Override public ITextOperationTarget getTextOperationTarget() { return this; } - /* - * @see ITextViewerExtension#appendVerifyKeyListener(VerifyKeyListener) - * @since 2.0 - */ + @Override public void appendVerifyKeyListener(VerifyKeyListener listener) { int index= fVerifyKeyListenersManager.numberOfListeners(); fVerifyKeyListenersManager.insertListener(listener, index); } - /* - * @see ITextViewerExtension#prependVerifyKeyListener(VerifyKeyListener) - * @since 2.0 - */ + @Override public void prependVerifyKeyListener(VerifyKeyListener listener) { fVerifyKeyListenersManager.insertListener(listener, 0); } - /* - * @see ITextViewerExtension#removeVerifyKeyListener(VerifyKeyListener) - * @since 2.0 - */ + @Override public void removeVerifyKeyListener(VerifyKeyListener listener) { fVerifyKeyListenersManager.removeListener(listener); } - /* - * @see ITextViewerExtension#getMark() - * @since 2.0 - */ + @Override public int getMark() { return fMarkPosition == null || fMarkPosition.isDeleted() ? -1 : fMarkPosition.getOffset(); } - /* - * @see ITextViewerExtension#setMark(int) - * @since 2.0 - */ + @Override public void setMark(int offset) { // clear @@ -5052,10 +4856,7 @@ public class TextViewer extends Viewer implements } } - /* - * @see Viewer#inputChanged(Object, Object) - * @since 2.0 - */ + @Override protected void inputChanged(Object newInput, Object oldInput) { IDocument oldDocument= (IDocument) oldInput; @@ -5164,10 +4965,7 @@ public class TextViewer extends Viewer implements fireRedrawChanged(); } - /* - * @see ITextViewerExtension#setRedraw(boolean) - * @since 2.0 - */ + @Override public final void setRedraw(boolean redraw) { setRedraw(redraw, -1); } @@ -5219,6 +5017,7 @@ public class TextViewer extends Viewer implements * @since 2.0 * @deprecated since 3.1 use {@link IDocumentExtension4#startRewriteSession(DocumentRewriteSessionType)} instead */ + @Deprecated protected final void startSequentialRewriteMode(boolean normalized) { IDocument document= getDocument(); if (document instanceof IDocumentExtension) { @@ -5233,6 +5032,7 @@ public class TextViewer extends Viewer implements * @since 2.0 * @deprecated since 3.1 use {@link IDocumentExtension4#stopRewriteSession(DocumentRewriteSession)} instead */ + @Deprecated protected final void stopSequentialRewriteMode() { IDocument document= getDocument(); if (document instanceof IDocumentExtension) { @@ -5241,28 +5041,21 @@ public class TextViewer extends Viewer implements } } - /* - * @see org.eclipse.jface.text.ITextViewerExtension#getRewriteTarget() - * @since 2.0 - */ + @Override public IRewriteTarget getRewriteTarget() { if (fRewriteTarget == null) fRewriteTarget= new RewriteTarget(); return fRewriteTarget; } - /* - * @see org.eclipse.jface.text.ITextViewerExtension2#getCurrentTextHover() - */ + @Override public ITextHover getCurrentTextHover() { if (fTextHoverManager == null) return null; return fTextHoverManager.getCurrentTextHover(); } - /* - * @see org.eclipse.jface.text.ITextViewerExtension2#getHoverEventLocation() - */ + @Override public Point getHoverEventLocation() { if (fTextHoverManager == null) return null; @@ -5288,6 +5081,7 @@ public class TextViewer extends Viewer implements * @param painter the painter to be added * @since 2.1 */ + @Override public void addPainter(IPainter painter) { getPaintManager().addPainter(painter); } @@ -5299,6 +5093,7 @@ public class TextViewer extends Viewer implements * @param painter the painter to be removed * @since 2.1 */ + @Override public void removePainter(IPainter painter) { getPaintManager().removePainter(painter); } @@ -5626,10 +5421,7 @@ public class TextViewer extends Viewer implements return -1; } - /* - * @see org.eclipse.jface.text.ITextViewerExtension4#moveFocusToWidgetToken() - * @since 3.0 - */ + @Override public boolean moveFocusToWidgetToken() { if (fWidgetTokenKeeper instanceof IWidgetTokenKeeperExtension) { IWidgetTokenKeeperExtension extension= (IWidgetTokenKeeperExtension) fWidgetTokenKeeper; @@ -5661,10 +5453,7 @@ public class TextViewer extends Viewer implements //---- Text presentation listeners ---- - /* - * @see ITextViewerExtension4#addTextPresentationListener(ITextPresentationListener) - * @since 3.0 - */ + @Override public void addTextPresentationListener(ITextPresentationListener listener) { Assert.isNotNull(listener); @@ -5676,10 +5465,7 @@ public class TextViewer extends Viewer implements fTextPresentationListeners.add(listener); } - /* - * @see ITextViewerExtension4#removeTextPresentationListener(ITextPresentationListener) - * @since 3.0 - */ + @Override public void removeTextPresentationListener(ITextPresentationListener listener) { Assert.isNotNull(listener); @@ -5695,6 +5481,7 @@ public class TextViewer extends Viewer implements * @see org.eclipse.jface.text.IEditingSupportRegistry#registerHelper(org.eclipse.jface.text.IEditingSupport) * @since 3.1 */ + @Override public void register(IEditingSupport helper) { Assert.isLegal(helper != null); fEditorHelpers.add(helper); @@ -5704,6 +5491,7 @@ public class TextViewer extends Viewer implements * @see org.eclipse.jface.text.IEditingSupportRegistry#deregisterHelper(org.eclipse.jface.text.IEditingSupport) * @since 3.1 */ + @Override public void unregister(IEditingSupport helper) { fEditorHelpers.remove(helper); } @@ -5712,14 +5500,12 @@ public class TextViewer extends Viewer implements * @see org.eclipse.jface.text.IEditingSupportRegistry#getCurrentHelpers() * @since 3.1 */ + @Override public IEditingSupport[] getRegisteredSupports() { return (IEditingSupport[]) fEditorHelpers.toArray(new IEditingSupport[fEditorHelpers.size()]); } - /* - * @see org.eclipse.jface.text.ITextViewerExtension6#setHyperlinkDetectors(org.eclipse.jface.text.hyperlink.IHyperlinkDetector[], int) - * @since 3.1 - */ + @Override public void setHyperlinkDetectors(IHyperlinkDetector[] hyperlinkDetectors, int eventStateMask) { if (fHyperlinkDetectors != null) { for (int i= 0; i < fHyperlinkDetectors.length; i++) { @@ -5777,10 +5563,7 @@ public class TextViewer extends Viewer implements } } - /* - * @see org.eclipse.jface.text.ITextViewerExtension7#setTabsToSpacesConverter(org.eclipse.jface.text.IAutoEditStrategy) - * @since 3.3 - */ + @Override public void setTabsToSpacesConverter(IAutoEditStrategy converter) { fTabsToSpacesConverter= converter; } diff --git a/org.eclipse.jface.text/src/org/eclipse/jface/text/TextViewerHoverManager.java b/org.eclipse.jface.text/src/org/eclipse/jface/text/TextViewerHoverManager.java index 14e9738f468..0148a3a3b10 100644 --- a/org.eclipse.jface.text/src/org/eclipse/jface/text/TextViewerHoverManager.java +++ b/org.eclipse.jface.text/src/org/eclipse/jface/text/TextViewerHoverManager.java @@ -84,6 +84,7 @@ class TextViewerHoverManager extends AbstractHoverInformationControlManager impl super(creator); fTextViewer= textViewer; fStopper= new ITextListener() { + @Override public void textChanged(TextEvent event) { synchronized (fMutex) { if (fThread != null) { @@ -94,18 +95,14 @@ class TextViewerHoverManager extends AbstractHoverInformationControlManager impl } }; fViewportListener= new IViewportListener() { - /* - * @see org.eclipse.jface.text.IViewportListener#viewportChanged(int) - */ + @Override public void viewportChanged(int verticalOffset) { fProcessMouseHoverEvent= false; } }; fTextViewer.addViewportListener(fViewportListener); fMouseMoveListener= new MouseMoveListener() { - /* - * @see MouseMoveListener#mouseMove(MouseEvent) - */ + @Override public void mouseMove(MouseEvent event) { fProcessMouseHoverEvent= true; } @@ -117,6 +114,7 @@ class TextViewerHoverManager extends AbstractHoverInformationControlManager impl * Determines all necessary details and delegates the computation into * a background thread. */ + @Override protected void computeInformation() { if (!fProcessMouseHoverEvent) { @@ -155,6 +153,7 @@ class TextViewerHoverManager extends AbstractHoverInformationControlManager impl } fThread= new Thread("Text Viewer Hover Presenter") { //$NON-NLS-1$ + @Override public void run() { // http://bugs.eclipse.org/bugs/show_bug.cgi?id=17693 boolean hasFinished= false; @@ -218,6 +217,7 @@ class TextViewerHoverManager extends AbstractHoverInformationControlManager impl * flow back into the UI thread, in order to allow displaying the * information in the information control. */ + @Override protected void presentInformation() { if (fTextViewer == null) return; @@ -229,6 +229,7 @@ class TextViewerHoverManager extends AbstractHoverInformationControlManager impl return; display.asyncExec(new Runnable() { + @Override public void run() { doPresentInformation(); } @@ -275,9 +276,7 @@ class TextViewerHoverManager extends AbstractHoverInformationControlManager impl } } - /* - * @see org.eclipse.jface.text.AbstractInformationControlManager#showInformationControl(org.eclipse.swt.graphics.Rectangle) - */ + @Override protected void showInformationControl(Rectangle subjectArea) { if (fTextViewer != null && fTextViewer.requestWidgetToken(this, WIDGET_PRIORITY)) super.showInformationControl(subjectArea); @@ -286,9 +285,7 @@ class TextViewerHoverManager extends AbstractHoverInformationControlManager impl System.out.println("TextViewerHoverManager#showInformationControl(..) did not get widget token"); //$NON-NLS-1$ } - /* - * @see org.eclipse.jface.text.AbstractInformationControlManager#hideInformationControl() - */ + @Override protected void hideInformationControl() { try { fTextHover= null; @@ -299,19 +296,14 @@ class TextViewerHoverManager extends AbstractHoverInformationControlManager impl } } - /* - * @see org.eclipse.jface.text.AbstractInformationControlManager#replaceInformationControl(boolean) - * @since 3.4 - */ + @Override void replaceInformationControl(boolean takeFocus) { if (fTextViewer != null) fTextViewer.releaseWidgetToken(this); super.replaceInformationControl(takeFocus); } - /* - * @see org.eclipse.jface.text.AbstractInformationControlManager#handleInformationControlDisposed() - */ + @Override protected void handleInformationControlDisposed() { try { super.handleInformationControlDisposed(); @@ -321,19 +313,14 @@ class TextViewerHoverManager extends AbstractHoverInformationControlManager impl } } - /* - * @see org.eclipse.jface.text.IWidgetTokenKeeper#requestWidgetToken(org.eclipse.jface.text.IWidgetTokenOwner) - */ + @Override public boolean requestWidgetToken(IWidgetTokenOwner owner) { fTextHover= null; super.hideInformationControl(); return true; } - /* - * @see org.eclipse.jface.text.IWidgetTokenKeeperExtension#requestWidgetToken(org.eclipse.jface.text.IWidgetTokenOwner, int) - * @since 3.0 - */ + @Override public boolean requestWidgetToken(IWidgetTokenOwner owner, int priority) { if (priority > WIDGET_PRIORITY) { fTextHover= null; @@ -343,10 +330,7 @@ class TextViewerHoverManager extends AbstractHoverInformationControlManager impl return false; } - /* - * @see org.eclipse.jface.text.IWidgetTokenKeeperExtension#setFocus(org.eclipse.jface.text.IWidgetTokenOwner) - * @since 3.0 - */ + @Override public boolean setFocus(IWidgetTokenOwner owner) { if (! hasInformationControlReplacer()) return false; @@ -375,10 +359,7 @@ class TextViewerHoverManager extends AbstractHoverInformationControlManager impl return fTextHover; } - /* - * @see org.eclipse.jface.text.AbstractHoverInformationControlManager#dispose() - * @since 3.0 - */ + @Override public void dispose() { if (fTextViewer != null) { fTextViewer.removeViewportListener(fViewportListener); diff --git a/org.eclipse.jface.text/src/org/eclipse/jface/text/TextViewerUndoManager.java b/org.eclipse.jface.text/src/org/eclipse/jface/text/TextViewerUndoManager.java index 827a523430f..f71786e7065 100644 --- a/org.eclipse.jface.text/src/org/eclipse/jface/text/TextViewerUndoManager.java +++ b/org.eclipse.jface.text/src/org/eclipse/jface/text/TextViewerUndoManager.java @@ -65,6 +65,7 @@ public class TextViewerUndoManager implements IUndoManager, IUndoManagerExtensio /* * @see MouseListener#mouseDoubleClick */ + @Override public void mouseDoubleClick(MouseEvent e) { } @@ -72,6 +73,7 @@ public class TextViewerUndoManager implements IUndoManager, IUndoManagerExtensio * If the right mouse button is pressed, the current editing command is closed * @see MouseListener#mouseDown */ + @Override public void mouseDown(MouseEvent e) { if (e.button == 1) if (isConnected()) @@ -81,12 +83,14 @@ public class TextViewerUndoManager implements IUndoManager, IUndoManagerExtensio /* * @see MouseListener#mouseUp */ + @Override public void mouseUp(MouseEvent e) { } /* * @see KeyListener#keyPressed */ + @Override public void keyReleased(KeyEvent e) { } @@ -94,6 +98,7 @@ public class TextViewerUndoManager implements IUndoManager, IUndoManagerExtensio * On cursor keys, the current editing command is closed * @see KeyListener#keyPressed */ + @Override public void keyPressed(KeyEvent e) { switch (e.keyCode) { case SWT.ARROW_UP: @@ -114,16 +119,12 @@ public class TextViewerUndoManager implements IUndoManager, IUndoManagerExtensio */ private class TextInputListener implements ITextInputListener { - /* - * @see org.eclipse.jface.text.ITextInputListener#inputDocumentAboutToBeChanged(org.eclipse.jface.text.IDocument, org.eclipse.jface.text.IDocument) - */ + @Override public void inputDocumentAboutToBeChanged(IDocument oldInput, IDocument newInput) { disconnectDocumentUndoManager(); } - /* - * @see org.eclipse.jface.text.ITextInputListener#inputDocumentChanged(org.eclipse.jface.text.IDocument, org.eclipse.jface.text.IDocument) - */ + @Override public void inputDocumentChanged(IDocument oldInput, IDocument newInput) { connectDocumentUndoManager(newInput); } @@ -135,9 +136,7 @@ public class TextViewerUndoManager implements IUndoManager, IUndoManagerExtensio */ private class DocumentUndoListener implements IDocumentUndoListener { - /* - * @see org.eclipse.jface.text.IDocumentUndoListener#documentUndoNotification(DocumentUndoEvent) - */ + @Override public void documentUndoNotification(DocumentUndoEvent event ){ if (!isConnected()) return; @@ -152,6 +151,7 @@ public class TextViewerUndoManager implements IUndoManager, IUndoManagerExtensio extension.setRedraw(false); } fTextViewer.getTextWidget().getDisplay().syncExec(new Runnable() { + @Override public void run() { if (fTextViewer instanceof TextViewer) ((TextViewer)fTextViewer).ignoreAutoEditStrategies(true); @@ -160,6 +160,7 @@ public class TextViewerUndoManager implements IUndoManager, IUndoManagerExtensio } else if (((eventType & DocumentUndoEvent.UNDONE) != 0) || ((eventType & DocumentUndoEvent.REDONE) != 0)) { fTextViewer.getTextWidget().getDisplay().syncExec(new Runnable() { + @Override public void run() { if (fTextViewer instanceof TextViewer) ((TextViewer)fTextViewer).ignoreAutoEditStrategies(false); @@ -227,6 +228,7 @@ public class TextViewerUndoManager implements IUndoManager, IUndoManagerExtensio /* * @see IUndoManager#beginCompoundChange */ + @Override public void beginCompoundChange() { if (isConnected()) { fDocumentUndoManager.beginCompoundChange(); @@ -237,6 +239,7 @@ public class TextViewerUndoManager implements IUndoManager, IUndoManagerExtensio /* * @see IUndoManager#endCompoundChange */ + @Override public void endCompoundChange() { if (isConnected()) { fDocumentUndoManager.endCompoundChange(); @@ -298,6 +301,7 @@ public class TextViewerUndoManager implements IUndoManager, IUndoManagerExtensio else display= Display.getDefault(); display.syncExec(new Runnable() { + @Override public void run() { MessageDialog.openError(finalShell, title, ex.getLocalizedMessage()); } @@ -305,9 +309,7 @@ public class TextViewerUndoManager implements IUndoManager, IUndoManagerExtensio } } - /* - * @see org.eclipse.jface.text.IUndoManager#setMaximalUndoLevel(int) - */ + @Override public void setMaximalUndoLevel(int undoLevel) { fUndoLevel= Math.max(0, undoLevel); if (isConnected()) { @@ -315,9 +317,7 @@ public class TextViewerUndoManager implements IUndoManager, IUndoManagerExtensio } } - /* - * @see org.eclipse.jface.text.IUndoManager#connect(org.eclipse.jface.text.ITextViewer) - */ + @Override public void connect(ITextViewer textViewer) { if (fTextViewer == null && textViewer != null) { fTextViewer= textViewer; @@ -327,9 +327,7 @@ public class TextViewerUndoManager implements IUndoManager, IUndoManagerExtensio connectDocumentUndoManager(doc); } - /* - * @see org.eclipse.jface.text.IUndoManager#disconnect() - */ + @Override public void disconnect() { if (fTextViewer != null) { removeListeners(); @@ -338,36 +336,28 @@ public class TextViewerUndoManager implements IUndoManager, IUndoManagerExtensio disconnectDocumentUndoManager(); } - /* - * @see org.eclipse.jface.text.IUndoManager#reset() - */ + @Override public void reset() { if (isConnected()) fDocumentUndoManager.reset(); } - /* - * @see org.eclipse.jface.text.IUndoManager#redoable() - */ + @Override public boolean redoable() { if (isConnected()) return fDocumentUndoManager.redoable(); return false; } - /* - * @see org.eclipse.jface.text.IUndoManager#undoable() - */ + @Override public boolean undoable() { if (isConnected()) return fDocumentUndoManager.undoable(); return false; } - /* - * @see org.eclipse.jface.text.IUndoManager#redo() - */ + @Override public void redo() { if (isConnected()) { try { @@ -378,9 +368,7 @@ public class TextViewerUndoManager implements IUndoManager, IUndoManagerExtensio } } - /* - * @see org.eclipse.jface.text.IUndoManager#undo() - */ + @Override public void undo() { if (isConnected()) { try { @@ -408,9 +396,7 @@ public class TextViewerUndoManager implements IUndoManager, IUndoManagerExtensio fTextViewer.revealRange(offset, length); } - /* - * @see org.eclipse.jface.text.IUndoManagerExtension#getUndoContext() - */ + @Override public IUndoContext getUndoContext() { if (isConnected()) { return fDocumentUndoManager.getUndoContext(); diff --git a/org.eclipse.jface.text/src/org/eclipse/jface/text/WhitespaceCharacterPainter.java b/org.eclipse.jface.text/src/org/eclipse/jface/text/WhitespaceCharacterPainter.java index 2e2458a8f1a..3093d98e7a0 100644 --- a/org.eclipse.jface.text/src/org/eclipse/jface/text/WhitespaceCharacterPainter.java +++ b/org.eclipse.jface.text/src/org/eclipse/jface/text/WhitespaceCharacterPainter.java @@ -130,17 +130,13 @@ public class WhitespaceCharacterPainter implements IPainter, PaintListener { fAlpha= alpha; } - /* - * @see org.eclipse.jface.text.IPainter#dispose() - */ + @Override public void dispose() { fTextViewer= null; fTextWidget= null; } - /* - * @see org.eclipse.jface.text.IPainter#paint(int) - */ + @Override public void paint(int reason) { IDocument document= fTextViewer.getDocument(); if (document == null) { @@ -156,9 +152,7 @@ public class WhitespaceCharacterPainter implements IPainter, PaintListener { } } - /* - * @see org.eclipse.jface.text.IPainter#deactivate(boolean) - */ + @Override public void deactivate(boolean redraw) { if (fIsActive) { fIsActive= false; @@ -169,16 +163,12 @@ public class WhitespaceCharacterPainter implements IPainter, PaintListener { } } - /* - * @see org.eclipse.jface.text.IPainter#setPositionManager(org.eclipse.jface.text.IPaintPositionManager) - */ + @Override public void setPositionManager(IPaintPositionManager manager) { // no need for a position manager } - /* - * @see org.eclipse.swt.events.PaintListener#paintControl(org.eclipse.swt.events.PaintEvent) - */ + @Override public void paintControl(PaintEvent event) { if (fTextWidget != null) { handleDrawRequest(event.gc, event.x, event.y, event.width, event.height); diff --git a/org.eclipse.jface.text/src/org/eclipse/jface/text/contentassist/AdditionalInfoController.java b/org.eclipse.jface.text/src/org/eclipse/jface/text/contentassist/AdditionalInfoController.java index d0364f562bb..6016c81f646 100644 --- a/org.eclipse.jface.text/src/org/eclipse/jface/text/contentassist/AdditionalInfoController.java +++ b/org.eclipse.jface.text/src/org/eclipse/jface/text/contentassist/AdditionalInfoController.java @@ -64,7 +64,8 @@ class AdditionalInfoController extends AbstractInformationControlManager { /** * Runs this task. */ - public abstract void run(); + @Override + public abstract void run(); /** * @return the task to be scheduled after this task has been run */ @@ -76,19 +77,23 @@ class AdditionalInfoController extends AbstractInformationControlManager { * but specifies an infinite delay. */ private final Task IDLE= new Task() { + @Override public void run() { Assert.isTrue(false); } + @Override public Task nextTask() { Assert.isTrue(false); return null; } + @Override public long delay() { return Long.MAX_VALUE; } + @Override public String toString() { return "IDLE"; //$NON-NLS-1$ } @@ -97,9 +102,11 @@ class AdditionalInfoController extends AbstractInformationControlManager { * FIRST_WAIT: Schedules a platform {@link Job} to fetch additional info from an {@link ICompletionProposalExtension5}. */ private final Task FIRST_WAIT= new Task() { + @Override public void run() { final ICompletionProposalExtension5 proposal= getCurrentProposalEx(); Job job= new Job(JFaceTextMessages.getString("AdditionalInfoController.job_name")) { //$NON-NLS-1$ + @Override protected IStatus run(IProgressMonitor monitor) { Object info; try { @@ -118,14 +125,17 @@ class AdditionalInfoController extends AbstractInformationControlManager { job.schedule(); } + @Override public Task nextTask() { return SECOND_WAIT; } + @Override public long delay() { return DELAY_UNTIL_JOB_IS_SCHEDULED; } + @Override public String toString() { return "FIRST_WAIT"; //$NON-NLS-1$ } @@ -135,19 +145,23 @@ class AdditionalInfoController extends AbstractInformationControlManager { * {@link ICompletionProposalExtension5}. */ private final Task SECOND_WAIT= new Task() { + @Override public void run() { // show the info allowShowing(); } + @Override public Task nextTask() { return IDLE; } + @Override public long delay() { return fDelay - DELAY_UNTIL_JOB_IS_SCHEDULED; } + @Override public String toString() { return "SECOND_WAIT"; //$NON-NLS-1$ } @@ -156,10 +170,12 @@ class AdditionalInfoController extends AbstractInformationControlManager { * LEGACY_WAIT: Posts a runnable into the display thread to fetch additional info from non-{@link ICompletionProposalExtension5}s. */ private final Task LEGACY_WAIT= new Task() { + @Override public void run() { final ICompletionProposal proposal= getCurrentProposal(); if (!fDisplay.isDisposed()) { fDisplay.asyncExec(new Runnable() { + @Override public void run() { synchronized (Timer.this) { if (proposal == getCurrentProposal()) { @@ -172,14 +188,17 @@ class AdditionalInfoController extends AbstractInformationControlManager { } } + @Override public Task nextTask() { return IDLE; } + @Override public long delay() { return fDelay; } + @Override public String toString() { return "LEGACY_WAIT"; //$NON-NLS-1$ } @@ -188,19 +207,23 @@ class AdditionalInfoController extends AbstractInformationControlManager { * EXIT: The task that triggers termination of the timer thread. */ private final Task EXIT= new Task() { + @Override public long delay() { return 1; } + @Override public Task nextTask() { Assert.isTrue(false); return EXIT; } + @Override public void run() { Assert.isTrue(false); } + @Override public String toString() { return "EXIT"; //$NON-NLS-1$ } @@ -234,7 +257,8 @@ class AdditionalInfoController extends AbstractInformationControlManager { schedule(IDLE, current); fThread= new Thread(new Runnable() { - public void run() { + @Override + public void run() { try { loop(); } catch (InterruptedException x) { @@ -336,6 +360,7 @@ class AdditionalInfoController extends AbstractInformationControlManager { final Object info= fCurrentInfo; if (!fDisplay.isDisposed()) { fDisplay.asyncExec(new Runnable() { + @Override public void run() { synchronized (Timer.this) { if (info == fCurrentInfo) { @@ -365,16 +390,12 @@ class AdditionalInfoController extends AbstractInformationControlManager { */ private class TableSelectionListener implements SelectionListener { - /* - * @see SelectionListener#widgetSelected(SelectionEvent) - */ + @Override public void widgetSelected(SelectionEvent e) { handleTableSelectionChanged(); } - /* - * @see SelectionListener#widgetDefaultSelected(SelectionEvent) - */ + @Override public void widgetDefaultSelected(SelectionEvent e) { } } @@ -384,6 +405,7 @@ class AdditionalInfoController extends AbstractInformationControlManager { * @since 3.4 */ private static class DefaultPresenterControlCreator extends AbstractReusableInformationControlCreator { + @Override public IInformationControl doCreateInformationControl(Shell shell) { return new DefaultInformationControl(shell, true); } @@ -437,9 +459,7 @@ class AdditionalInfoController extends AbstractInformationControlManager { getInternalAccessor().setInformationControlReplacer(replacer); } - /* - * @see AbstractInformationControlManager#install(Control) - */ + @Override public void install(Control control) { if (fProposalTable == control) { @@ -455,6 +475,7 @@ class AdditionalInfoController extends AbstractInformationControlManager { getInternalAccessor().getInformationControlReplacer().install(fProposalTable); fTimer= new Timer(fProposalTable.getDisplay(), fDelay) { + @Override protected void showInformation(ICompletionProposal proposal, Object info) { InformationControlReplacer replacer= getInternalAccessor().getInformationControlReplacer(); if (replacer != null) @@ -464,9 +485,7 @@ class AdditionalInfoController extends AbstractInformationControlManager { }; } - /* - * @see AbstractInformationControlManager#disposeInformationControl() - */ + @Override public void disposeInformationControl() { if (fTimer !=null) { @@ -517,9 +536,7 @@ class AdditionalInfoController extends AbstractInformationControlManager { showInformation(); } - /* - * @see AbstractInformationControlManager#computeInformation() - */ + @Override protected void computeInformation() { if (fProposal instanceof ICompletionProposalExtension3) setCustomInformationControlCreator(((ICompletionProposalExtension3) fProposal).getInformationControlCreator()); @@ -533,9 +550,7 @@ class AdditionalInfoController extends AbstractInformationControlManager { setInformation(fInformation, new Rectangle(0, 0, size.x, size.y)); } - /* - * @see org.eclipse.jface.text.AbstractInformationControlManager#computeLocation(org.eclipse.swt.graphics.Rectangle, org.eclipse.swt.graphics.Point, org.eclipse.jface.text.AbstractInformationControlManager.Anchor) - */ + @Override protected Point computeLocation(Rectangle subjectArea, Point controlSize, Anchor anchor) { Point location= super.computeLocation(subjectArea, controlSize, anchor); @@ -551,9 +566,7 @@ class AdditionalInfoController extends AbstractInformationControlManager { return location; } - /* - * @see org.eclipse.jface.text.AbstractInformationControlManager#computeSizeConstraints(Control, IInformationControl) - */ + @Override protected Point computeSizeConstraints(Control subjectControl, IInformationControl informationControl) { // at least as big as the proposal table Point sizeConstraint= super.computeSizeConstraints(subjectControl, informationControl); @@ -575,19 +588,14 @@ class AdditionalInfoController extends AbstractInformationControlManager { return sizeConstraint; } - /* - * @see org.eclipse.jface.text.AbstractInformationControlManager#hideInformationControl() - */ + @Override protected void hideInformationControl() { super.hideInformationControl(); if (fTimer != null) fTimer.reset(null); } - /* - * @see org.eclipse.jface.text.AbstractInformationControlManager#canClearDataOnHide() - * @since 3.6 - */ + @Override protected boolean canClearDataOnHide() { return false; // see https://bugs.eclipse.org/bugs/show_bug.cgi?id=293176 } diff --git a/org.eclipse.jface.text/src/org/eclipse/jface/text/contentassist/CompletionProposal.java b/org.eclipse.jface.text/src/org/eclipse/jface/text/contentassist/CompletionProposal.java index 17b15ca4e5d..c46bfd48fc0 100644 --- a/org.eclipse.jface.text/src/org/eclipse/jface/text/contentassist/CompletionProposal.java +++ b/org.eclipse.jface.text/src/org/eclipse/jface/text/contentassist/CompletionProposal.java @@ -82,9 +82,7 @@ public final class CompletionProposal implements ICompletionProposal { fAdditionalProposalInfo= additionalProposalInfo; } - /* - * @see ICompletionProposal#apply(IDocument) - */ + @Override public void apply(IDocument document) { try { document.replace(fReplacementOffset, fReplacementLength, fReplacementString); @@ -93,39 +91,29 @@ public final class CompletionProposal implements ICompletionProposal { } } - /* - * @see ICompletionProposal#getSelection(IDocument) - */ + @Override public Point getSelection(IDocument document) { return new Point(fReplacementOffset + fCursorPosition, 0); } - /* - * @see ICompletionProposal#getContextInformation() - */ + @Override public IContextInformation getContextInformation() { return fContextInformation; } - /* - * @see ICompletionProposal#getImage() - */ + @Override public Image getImage() { return fImage; } - /* - * @see ICompletionProposal#getDisplayString() - */ + @Override public String getDisplayString() { if (fDisplayString != null) return fDisplayString; return fReplacementString; } - /* - * @see ICompletionProposal#getAdditionalProposalInfo() - */ + @Override public String getAdditionalProposalInfo() { return fAdditionalProposalInfo; } diff --git a/org.eclipse.jface.text/src/org/eclipse/jface/text/contentassist/CompletionProposalPopup.java b/org.eclipse.jface.text/src/org/eclipse/jface/text/contentassist/CompletionProposalPopup.java index 350a5e281ca..cb28c396118 100644 --- a/org.eclipse.jface.text/src/org/eclipse/jface/text/contentassist/CompletionProposalPopup.java +++ b/org.eclipse.jface.text/src/org/eclipse/jface/text/contentassist/CompletionProposalPopup.java @@ -139,10 +139,7 @@ class CompletionProposalPopup implements IContentAssistListener { fOperationCode= operationCode; } - /* - * @see org.eclipse.core.commands.AbstractHandler#execute(org.eclipse.core.commands.ExecutionEvent) - * @since 3.4 - */ + @Override public Object execute(ExecutionEvent event) throws ExecutionException { int itemCount= fProposalTable.getItemCount(); int selectionIndex= fProposalTable.getSelectionIndex(); @@ -176,76 +173,57 @@ class CompletionProposalPopup implements IContentAssistListener { String fDisplayString; int fOffset; - /* - * @see ICompletionProposal#apply(IDocument) - */ + @Override public void apply(IDocument document) { } - /* - * @see ICompletionProposal#getSelection(IDocument) - */ + @Override public Point getSelection(IDocument document) { return new Point(fOffset, 0); } - /* - * @see ICompletionProposal#getContextInformation() - */ + @Override public IContextInformation getContextInformation() { return null; } - /* - * @see ICompletionProposal#getImage() - */ + @Override public Image getImage() { return null; } - /* - * @see ICompletionProposal#getDisplayString() - */ + @Override public String getDisplayString() { return fDisplayString; } - /* - * @see ICompletionProposal#getAdditionalProposalInfo() - */ + @Override public String getAdditionalProposalInfo() { return null; } - /* - * @see org.eclipse.jface.text.contentassist.ICompletionProposalExtension#apply(org.eclipse.jface.text.IDocument, char, int) - */ + @Override public void apply(IDocument document, char trigger, int offset) { } - /* - * @see org.eclipse.jface.text.contentassist.ICompletionProposalExtension#isValidFor(org.eclipse.jface.text.IDocument, int) - */ + @Override public boolean isValidFor(IDocument document, int offset) { return false; } - /* - * @see org.eclipse.jface.text.contentassist.ICompletionProposalExtension#getTriggerCharacters() - */ + @Override public char[] getTriggerCharacters() { return null; } - /* - * @see org.eclipse.jface.text.contentassist.ICompletionProposalExtension#getContextInformationPosition() - */ + @Override public int getContextInformationPosition() { return -1; } } private final class ProposalSelectionListener implements KeyListener { + @Override public void keyPressed(KeyEvent e) { if (!Helper.okToUse(fProposalShell)) return; @@ -258,6 +236,7 @@ class CompletionProposalPopup implements IContentAssistListener { } } + @Override public void keyReleased(KeyEvent e) { if (!Helper.okToUse(fProposalShell)) return; @@ -278,6 +257,7 @@ class CompletionProposalPopup implements IContentAssistListener { fCommandSequence= keySequence; } + @Override public void keyPressed(KeyEvent e) { if (!Helper.okToUse(fProposalShell)) return; @@ -365,6 +345,7 @@ class CompletionProposalPopup implements IContentAssistListener { * @since 3.1.1 */ private final Runnable fFilterRunnable= new Runnable() { + @Override public void run() { if (!fIsFilterPending) return; @@ -497,6 +478,7 @@ class CompletionProposalPopup implements IContentAssistListener { fContentAssistSubjectControlAdapter.addKeyListener(fKeyListener); BusyIndicator.showWhile(control.getDisplay(), new Runnable() { + @Override public void run() { fInvocationOffset= fContentAssistSubjectControlAdapter.getSelectedRange().x; @@ -596,6 +578,7 @@ class CompletionProposalPopup implements IContentAssistListener { fProposalTable= new Table(fProposalShell, SWT.H_SCROLL | SWT.V_SCROLL | SWT.VIRTUAL); Listener listener= new Listener() { + @Override public void handleEvent(Event event) { handleSetData(event); } @@ -644,8 +627,10 @@ class CompletionProposalPopup implements IContentAssistListener { fProposalShell.addControlListener(new ControlListener() { + @Override public void controlMoved(ControlEvent e) {} + @Override public void controlResized(ControlEvent e) { if (fAdditionalInfoController != null) { // reset the cached resize constraints @@ -668,8 +653,10 @@ class CompletionProposalPopup implements IContentAssistListener { fProposalTable.addSelectionListener(new SelectionListener() { + @Override public void widgetSelected(SelectionEvent e) {} + @Override public void widgetDefaultSelected(SelectionEvent e) { insertSelectedProposalWithMask(e.stateMask); } @@ -678,6 +665,7 @@ class CompletionProposalPopup implements IContentAssistListener { fPopupCloser.install(fContentAssistant, fProposalTable, fAdditionalInfoController); fProposalShell.addDisposeListener(new DisposeListener() { + @Override public void widgetDisposed(DisposeEvent e) { unregister(); // but don't dispose the shell, since we're being called from its disposal event! } @@ -718,7 +706,8 @@ class CompletionProposalPopup implements IContentAssistListener { if (commandSequence != null && !commandSequence.isEmpty() && fContentAssistant.isRepeatedInvocationMode()) { control.addFocusListener(new FocusListener() { private CommandKeyListener fCommandKeyListener; - public void focusGained(FocusEvent e) { + @Override + public void focusGained(FocusEvent e) { if (Helper.okToUse(control)) { if (fCommandKeyListener == null) { fCommandKeyListener= new CommandKeyListener(commandSequence); @@ -726,7 +715,8 @@ class CompletionProposalPopup implements IContentAssistListener { } } } - public void focusLost(FocusEvent e) { + @Override + public void focusLost(FocusEvent e) { if (fCommandKeyListener != null) { control.removeKeyListener(fCommandKeyListener); fCommandKeyListener= null; @@ -737,11 +727,13 @@ class CompletionProposalPopup implements IContentAssistListener { if (fAdditionalInfoController != null) { control.addFocusListener(new FocusListener() { private TraverseListener fTraverseListener; - public void focusGained(FocusEvent e) { + @Override + public void focusGained(FocusEvent e) { if (Helper.okToUse(control)) { if (fTraverseListener == null) { fTraverseListener= new TraverseListener() { - public void keyTraversed(TraverseEvent event) { + @Override + public void keyTraversed(TraverseEvent event) { if (event.detail == SWT.TRAVERSE_TAB_NEXT) { IInformationControl iControl= fAdditionalInfoController.getCurrentInformationControl2(); if (fAdditionalInfoController.getInternalAccessor().canReplace(iControl)) { @@ -755,7 +747,8 @@ class CompletionProposalPopup implements IContentAssistListener { } } } - public void focusLost(FocusEvent e) { + @Override + public void focusLost(FocusEvent e) { if (fTraverseListener != null) { control.removeTraverseListener(fTraverseListener); fTraverseListener= null; @@ -819,12 +812,14 @@ class CompletionProposalPopup implements IContentAssistListener { if (fContentAssistant.isRepeatedInvocationMode()) { fMessageText.setCursor(fProposalShell.getDisplay().getSystemCursor(SWT.CURSOR_HAND)); fMessageText.addMouseListener(new MouseAdapter() { + @Override public void mouseUp(MouseEvent e) { fLastCompletionOffset= fFilterOffset; fProposalTable.setFocus(); handleRepeatedInvocation(); } + @Override public void mouseDown(MouseEvent e) { } }); @@ -930,10 +925,12 @@ class CompletionProposalPopup implements IContentAssistListener { IRewriteTarget target= null; IEditingSupport helper= new IEditingSupport() { + @Override public boolean isOriginator(DocumentEvent event, IRegion focus) { return focus.getOffset() <= offset && focus.getOffset() + focus.getLength() >= offset; } + @Override public boolean ownsFocusShell() { return false; } @@ -1221,10 +1218,12 @@ class CompletionProposalPopup implements IContentAssistListener { if (fFocusHelper == null) { fFocusHelper= new IEditingSupport() { + @Override public boolean isOriginator(DocumentEvent event, IRegion focus) { return false; // this helper just covers the focus change to the proposal shell, no remote editions } + @Override public boolean ownsFocusShell() { return true; } @@ -1265,11 +1264,13 @@ class CompletionProposalPopup implements IContentAssistListener { private void ensureDocumentListenerInstalled() { if (fDocumentListener == null) { fDocumentListener= new IDocumentListener() { + @Override public void documentAboutToBeChanged(DocumentEvent event) { if (!fInserting) fDocumentEvents.add(event); } + @Override public void documentChanged(DocumentEvent event) { if (!fInserting) filterProposals(); @@ -1281,9 +1282,7 @@ class CompletionProposalPopup implements IContentAssistListener { } } - /* - * @see IContentAssistListener#verifyKey(VerifyEvent) - */ + @Override public boolean verifyKey(VerifyEvent e) { if (!Helper.okToUse(fProposalShell)) return true; @@ -1454,9 +1453,7 @@ class CompletionProposalPopup implements IContentAssistListener { return false; } - /* - * @see IEventConsumer#processEvent(VerifyEvent) - */ + @Override public void processEvent(VerifyEvent e) { } @@ -1602,6 +1599,7 @@ class CompletionProposalPopup implements IContentAssistListener { fContentAssistSubjectControlAdapter.addKeyListener(fKeyListener); BusyIndicator.showWhile(control.getDisplay(), new Runnable() { + @Override public void run() { fInvocationOffset= fContentAssistSubjectControlAdapter.getSelectedRange().x; @@ -1907,6 +1905,7 @@ class CompletionProposalPopup implements IContentAssistListener { */ private void sortProposals(final ICompletionProposal[] proposals) { Arrays.sort(proposals, new Comparator() { + @Override public int compare(Object o1, Object o2) { return fSorter.compare((ICompletionProposal)o1, (ICompletionProposal)o2); diff --git a/org.eclipse.jface.text/src/org/eclipse/jface/text/contentassist/ContentAssistSubjectControlAdapter.java b/org.eclipse.jface.text/src/org/eclipse/jface/text/contentassist/ContentAssistSubjectControlAdapter.java index 5b9da382ed9..eef3647bc1c 100644 --- a/org.eclipse.jface.text/src/org/eclipse/jface/text/contentassist/ContentAssistSubjectControlAdapter.java +++ b/org.eclipse.jface.text/src/org/eclipse/jface/text/contentassist/ContentAssistSubjectControlAdapter.java @@ -69,9 +69,7 @@ final class ContentAssistSubjectControlAdapter implements IContentAssistSubjectC fViewer= viewer; } - /* - * @see IContentAssistSubjectControl#getLineHeight() - */ + @Override public int getLineHeight() { if (fContentAssistSubjectControl != null) return fContentAssistSubjectControl.getLineHeight(); @@ -79,63 +77,49 @@ final class ContentAssistSubjectControlAdapter implements IContentAssistSubjectC return fViewer.getTextWidget().getLineHeight(getCaretOffset()); } - /* - * @see IContentAssistSubjectControl#getControl() - */ + @Override public Control getControl() { if (fContentAssistSubjectControl != null) return fContentAssistSubjectControl.getControl(); return fViewer.getTextWidget(); } - /* - * @see IContentAssistSubjectControl#getLocationAtOffset(int) - */ + @Override public Point getLocationAtOffset(int offset) { if (fContentAssistSubjectControl != null) return fContentAssistSubjectControl.getLocationAtOffset(offset); return fViewer.getTextWidget().getLocationAtOffset(offset); } - /* - * @see IContentAssistSubjectControl#getWidgetSelectionRange() - */ + @Override public Point getWidgetSelectionRange() { if (fContentAssistSubjectControl != null) return fContentAssistSubjectControl.getWidgetSelectionRange(); return fViewer.getTextWidget().getSelectionRange(); } - /* - * @see IContentAssistSubjectControl#getSelectedRange() - */ + @Override public Point getSelectedRange() { if (fContentAssistSubjectControl != null) return fContentAssistSubjectControl.getSelectedRange(); return fViewer.getSelectedRange(); } - /* - * @see org.eclipse.jface.text.contentassist.IContentAssistSubjectControl#getCaretOffset() - */ + @Override public int getCaretOffset() { if (fContentAssistSubjectControl != null) return fContentAssistSubjectControl.getCaretOffset(); return fViewer.getTextWidget().getCaretOffset(); } - /* - * @see org.eclipse.jface.text.contentassist.IContentAssistSubjectControl#getLineDelimiter() - */ + @Override public String getLineDelimiter() { if (fContentAssistSubjectControl != null) return fContentAssistSubjectControl.getLineDelimiter(); return fViewer.getTextWidget().getLineDelimiter(); } - /* - * @see org.eclipse.jface.text.contentassist.IContentAssistSubjectControl#addKeyListener(org.eclipse.swt.events.KeyListener) - */ + @Override public void addKeyListener(KeyListener keyListener) { if (fContentAssistSubjectControl != null) fContentAssistSubjectControl.addKeyListener(keyListener); @@ -143,9 +127,7 @@ final class ContentAssistSubjectControlAdapter implements IContentAssistSubjectC fViewer.getTextWidget().addKeyListener(keyListener); } - /* - * @see org.eclipse.jface.text.contentassist.IContentAssistSubjectControl#removeKeyListener(org.eclipse.swt.events.KeyListener) - */ + @Override public void removeKeyListener(KeyListener keyListener) { if (fContentAssistSubjectControl != null) fContentAssistSubjectControl.removeKeyListener(keyListener); @@ -153,18 +135,14 @@ final class ContentAssistSubjectControlAdapter implements IContentAssistSubjectC fViewer.getTextWidget().removeKeyListener(keyListener); } - /* - * @see org.eclipse.jface.text.contentassist.IContentAssistSubjectControl#getDocument() - */ + @Override public IDocument getDocument() { if (fContentAssistSubjectControl != null) return fContentAssistSubjectControl.getDocument(); return fViewer.getDocument(); } - /* - * @see org.eclipse.jface.text.contentassist.IContentAssistSubjectControl#prependVerifyKeyListener(VerifyKeyListener) - */ + @Override public boolean prependVerifyKeyListener(VerifyKeyListener verifyKeyListener) { if (fContentAssistSubjectControl != null) { return fContentAssistSubjectControl.prependVerifyKeyListener(verifyKeyListener); @@ -183,9 +161,7 @@ final class ContentAssistSubjectControlAdapter implements IContentAssistSubjectC return false; } - /* - * @see org.eclipse.jface.text.contentassist.IContentAssistSubjectControl#appendVerifyKeyListener(org.eclipse.swt.custom.VerifyKeyListener) - */ + @Override public boolean appendVerifyKeyListener(VerifyKeyListener verifyKeyListener) { if (fContentAssistSubjectControl != null) return fContentAssistSubjectControl.appendVerifyKeyListener(verifyKeyListener); @@ -203,9 +179,7 @@ final class ContentAssistSubjectControlAdapter implements IContentAssistSubjectC return false; } - /* - * @see org.eclipse.jface.text.contentassist.IContentAssistSubjectControl#removeVerifyKeyListener(org.eclipse.swt.custom.VerifyKeyListener) - */ + @Override public void removeVerifyKeyListener(VerifyKeyListener verifyKeyListener) { if (fContentAssistSubjectControl != null) { fContentAssistSubjectControl.removeVerifyKeyListener(verifyKeyListener); @@ -219,9 +193,7 @@ final class ContentAssistSubjectControlAdapter implements IContentAssistSubjectC } } - /* - * @see org.eclipse.jface.text.contentassist.IContentAssistSubjectControl#setEventConsumer(org.eclipse.jface.text.contentassist.ContentAssistant.InternalListener) - */ + @Override public void setEventConsumer(IEventConsumer eventConsumer) { if (fContentAssistSubjectControl != null) fContentAssistSubjectControl.setEventConsumer(eventConsumer); @@ -229,9 +201,7 @@ final class ContentAssistSubjectControlAdapter implements IContentAssistSubjectC fViewer.setEventConsumer(eventConsumer); } - /* - * @see org.eclipse.jface.text.contentassist.IContentAssistSubjectControl#setSelectedRange(int, int) - */ + @Override public void setSelectedRange(int i, int j) { if (fContentAssistSubjectControl != null) fContentAssistSubjectControl.setSelectedRange(i, j); @@ -239,9 +209,7 @@ final class ContentAssistSubjectControlAdapter implements IContentAssistSubjectC fViewer.setSelectedRange(i, j); } - /* - * @see org.eclipse.jface.text.contentassist.IContentAssistSubjectControl#revealRange(int, int) - */ + @Override public void revealRange(int i, int j) { if (fContentAssistSubjectControl != null) fContentAssistSubjectControl.revealRange(i, j); @@ -252,6 +220,7 @@ final class ContentAssistSubjectControlAdapter implements IContentAssistSubjectC /* * @see org.eclipse.jface.text.contentassist.IContentAssistSubjectControl#canAddVerifyKeyListener() */ + @Override public boolean supportsVerifyKeyListener() { if (fContentAssistSubjectControl != null) return fContentAssistSubjectControl.supportsVerifyKeyListener(); @@ -390,9 +359,7 @@ final class ContentAssistSubjectControlAdapter implements IContentAssistSubjectC return contentAssistant.computeContextInformation(fViewer, offset); } - /* - * @see IContentAssistSubjectControl#addSelectionListener(SelectionListener) - */ + @Override public boolean addSelectionListener(SelectionListener selectionListener) { if (fContentAssistSubjectControl != null) return fContentAssistSubjectControl.addSelectionListener(selectionListener); @@ -400,9 +367,7 @@ final class ContentAssistSubjectControlAdapter implements IContentAssistSubjectC return true; } - /* - * @see IContentAssistSubjectControl#removeSelectionListener(SelectionListener) - */ + @Override public void removeSelectionListener(SelectionListener selectionListener) { if (fContentAssistSubjectControl != null) fContentAssistSubjectControl.removeSelectionListener(selectionListener); diff --git a/org.eclipse.jface.text/src/org/eclipse/jface/text/contentassist/ContentAssistant.java b/org.eclipse.jface.text/src/org/eclipse/jface/text/contentassist/ContentAssistant.java index 24373a654c5..eedb7689356 100644 --- a/org.eclipse.jface.text/src/org/eclipse/jface/text/contentassist/ContentAssistant.java +++ b/org.eclipse.jface.text/src/org/eclipse/jface/text/contentassist/ContentAssistant.java @@ -166,55 +166,42 @@ public class ContentAssistant implements IContentAssistant, IContentAssistantExt fViewer.removeViewportListener(this); } - /* - * @see ControlListener#controlResized(ControlEvent) - */ + @Override public void controlResized(ControlEvent e) { hide(); } - /* - * @see ControlListener#controlMoved(ControlEvent) - */ + @Override public void controlMoved(ControlEvent e) { hide(); } - /* - * @see MouseListener#mouseDown(MouseEvent) - */ + @Override public void mouseDown(MouseEvent e) { hide(); } - /* - * @see MouseListener#mouseUp(MouseEvent) - */ + @Override public void mouseUp(MouseEvent e) { } - /* - * @see MouseListener#mouseDoubleClick(MouseEvent) - */ + @Override public void mouseDoubleClick(MouseEvent e) { hide(); } - /* - * @see FocusListener#focusGained(FocusEvent) - */ + @Override public void focusGained(FocusEvent e) { } - /* - * @see FocusListener#focusLost(FocusEvent) - */ + @Override public void focusLost(FocusEvent e) { Control control= fControl; if (Helper.okToUse(control)) { Display d= control.getDisplay(); if (d != null) { d.asyncExec(new Runnable() { + @Override public void run() { if (!fProposalPopup.hasFocus() && (fContextInfoPopup == null || !fContextInfoPopup.hasFocus())) hide(); @@ -227,6 +214,7 @@ public class ContentAssistant implements IContentAssistant, IContentAssistantExt /* * @seeDisposeListener#widgetDisposed(DisposeEvent) */ + @Override public void widgetDisposed(DisposeEvent e) { /* * 1GGYYWK: ITPJUI:ALL - Dismissing editor with code assist up causes lots of Internal @@ -235,9 +223,7 @@ public class ContentAssistant implements IContentAssistant, IContentAssistantExt hide(); } - /* - * @see IViewportListener#viewportChanged(int) - */ + @Override public void viewportChanged(int topIndex) { hide(); } @@ -271,6 +257,7 @@ public class ContentAssistant implements IContentAssistant, IContentAssistantExt fThread.start(); } + @Override public void run() { try { while (true) { @@ -314,6 +301,7 @@ public class ContentAssistant implements IContentAssistant, IContentAssistantExt return false; } + @Override public void keyPressed(KeyEvent e) { // Only act on typed characters and ignore modifier-only events if (e.character == 0 && (e.keyCode & SWT.KEYCODE_BIT) == 0) @@ -353,9 +341,7 @@ public class ContentAssistant implements IContentAssistant, IContentAssistantExt start(showStyle); } - /* - * @see org.eclipse.swt.custom.VerifyKeyListener#verifyKey(org.eclipse.swt.events.VerifyEvent) - */ + @Override public void verifyKey(VerifyEvent event) { keyPressed(event); } @@ -371,6 +357,7 @@ public class ContentAssistant implements IContentAssistant, IContentAssistantExt try { d.syncExec(new Runnable() { + @Override public void run() { if (isProposalPopupActive()) return; @@ -437,6 +424,7 @@ public class ContentAssistant implements IContentAssistant, IContentAssistantExt type == LAYOUT_CONTEXT_SELECTOR || type == LAYOUT_CONTEXT_INFO_POPUP); } + @Override public void handleEvent(Event event) { Widget source= event.widget; source.removeListener(SWT.Dispose, this); @@ -807,6 +795,7 @@ public class ContentAssistant implements IContentAssistant, IContentAssistantExt * @param e the verify event * @see VerifyKeyListener#verifyKey(org.eclipse.swt.events.VerifyEvent) */ + @Override public void verifyKey(VerifyEvent e) { IContentAssistListener[] listeners= (IContentAssistListener[]) fListeners.clone(); for (int i= 0; i < listeners.length; i++) { @@ -822,6 +811,7 @@ public class ContentAssistant implements IContentAssistant, IContentAssistantExt /* * @see IEventConsumer#processEvent */ + @Override public void processEvent(VerifyEvent event) { installKeyListener(); @@ -853,6 +843,7 @@ public class ContentAssistant implements IContentAssistant, IContentAssistantExt fMessageKey= messageKey; } + @Override public void handleException(Throwable exception) { String message= JFaceTextMessages.getString(fMessageKey); @@ -1071,10 +1062,7 @@ public class ContentAssistant implements IContentAssistant, IContentAssistantExt fPartitioning= partitioning; } - /* - * @see org.eclipse.jface.text.contentassist.IContentAssistantExtension#getDocumentPartitioning() - * @since 3.0 - */ + @Override public String getDocumentPartitioning() { return fPartitioning; } @@ -1103,6 +1091,7 @@ public class ContentAssistant implements IContentAssistant, IContentAssistantExt /* * @see IContentAssistant#getContentAssistProcessor */ + @Override public IContentAssistProcessor getContentAssistProcessor(String contentType) { if (fProcessors == null) return null; @@ -1420,6 +1409,7 @@ public class ContentAssistant implements IContentAssistant, IContentAssistantExt * @see IContentAssist#install * @since 3.0 */ + @Override public void install(ITextViewer textViewer) { fViewer= textViewer; fContentAssistSubjectControlAdapter= new ContentAssistSubjectControlAdapter(fViewer); @@ -1445,6 +1435,7 @@ public class ContentAssistant implements IContentAssistant, IContentAssistantExt if (Helper.okToUse(fContentAssistSubjectControlAdapter.getControl())) { fContentAssistSubjectControlShell= fContentAssistSubjectControlAdapter.getControl().getShell(); fCASCSTraverseListener= new TraverseListener() { + @Override public void keyTraversed(TraverseEvent e) { if (e.detail == SWT.TRAVERSE_ESCAPE && isProposalPopupActive()) e.doit= false; @@ -1459,6 +1450,7 @@ public class ContentAssistant implements IContentAssistant, IContentAssistantExt /* * @see IContentAssist#uninstall */ + @Override public void uninstall() { hide(); manageAutoActivation(false); @@ -1712,6 +1704,7 @@ public class ContentAssistant implements IContentAssistant, IContentAssistantExt /* * @see IContentAssist#showPossibleCompletions */ + @Override public String showPossibleCompletions() { if (!prepareToShowCompletions(false)) return null; @@ -1720,10 +1713,7 @@ public class ContentAssistant implements IContentAssistant, IContentAssistantExt return fProposalPopup.showProposals(false); } - /* - * @see org.eclipse.jface.text.contentassist.IContentAssistantExtension#completePrefix() - * @since 3.0 - */ + @Override public String completePrefix() { if (!prepareToShowCompletions(false)) return null; @@ -1766,6 +1756,7 @@ public class ContentAssistant implements IContentAssistant, IContentAssistantExt /* * @see IContentAssist#showContextInformation */ + @Override public String showContextInformation() { promoteKeyListener(); if (fContextInfoPopup != null) @@ -1871,6 +1862,7 @@ public class ContentAssistant implements IContentAssistant, IContentAssistantExt if (p instanceof ISubjectControlContentAssistProcessor) { // Ensure that the assist session ends cleanly even if the processor throws an exception. SafeRunner.run(new ExceptionLoggingSafeRunnable(COMPLETION_ERROR_MESSAGE_KEY) { + @Override public void run() throws Exception { result[0]= ((ISubjectControlContentAssistProcessor) p) .computeCompletionProposals(contentAssistSubjectControl, offset); @@ -1900,6 +1892,7 @@ public class ContentAssistant implements IContentAssistant, IContentAssistantExt if (p != null) { // Ensure that the assist session ends cleanly even if the processor throws an exception. SafeRunner.run(new ExceptionLoggingSafeRunnable(COMPLETION_ERROR_MESSAGE_KEY) { + @Override public void run() throws Exception { result[0]= p.computeCompletionProposals(viewer, offset); fLastErrorMessage= p.getErrorMessage(); @@ -1929,6 +1922,7 @@ public class ContentAssistant implements IContentAssistant, IContentAssistantExt if (p != null) { // Ensure that the assist session ends cleanly even if the processor throws an exception. SafeRunner.run(new ExceptionLoggingSafeRunnable(CONTEXT_ERROR_MESSAGE_KEY) { + @Override public void run() throws Exception { result[0]= p.computeContextInformation(viewer, offset); fLastErrorMessage= p.getErrorMessage(); @@ -1960,6 +1954,7 @@ public class ContentAssistant implements IContentAssistant, IContentAssistantExt if (p instanceof ISubjectControlContentAssistProcessor) { // Ensure that the assist session ends cleanly even if the processor throws an exception. SafeRunner.run(new ExceptionLoggingSafeRunnable(CONTEXT_ERROR_MESSAGE_KEY) { + @Override public void run() throws Exception { result[0]= ((ISubjectControlContentAssistProcessor) p) .computeContextInformation(contentAssistSubjectControl, offset); @@ -2098,19 +2093,12 @@ public class ContentAssistant implements IContentAssistant, IContentAssistantExt return p != null ? p.getContextInformationAutoActivationCharacters() : null; } - /* - * @see org.eclipse.jface.text.IWidgetTokenKeeper#requestWidgetToken(IWidgetTokenOwner) - * @since 2.0 - */ + @Override public boolean requestWidgetToken(IWidgetTokenOwner owner) { return false; } - /* - * @see org.eclipse.jface.text.IWidgetTokenKeeperExtension#requestWidgetToken(org.eclipse.jface.text.IWidgetTokenOwner, - * int) - * @since 3.0 - */ + @Override public boolean requestWidgetToken(IWidgetTokenOwner owner, int priority) { if (priority > WIDGET_PRIORITY) { hide(); @@ -2119,10 +2107,7 @@ public class ContentAssistant implements IContentAssistant, IContentAssistantExt return false; } - /* - * @see org.eclipse.jface.text.IWidgetTokenKeeperExtension#setFocus(org.eclipse.jface.text.IWidgetTokenOwner) - * @since 3.0 - */ + @Override public boolean setFocus(IWidgetTokenOwner owner) { if (fProposalPopup != null) { fProposalPopup.setFocus(); @@ -2329,19 +2314,13 @@ public class ContentAssistant implements IContentAssistant, IContentAssistantExt return fProposalPopup.hasFocus(); } - /* - * @see org.eclipse.jface.text.contentassist.IContentAssistantExtension2#addCompletionListener(org.eclipse.jface.text.contentassist.ICompletionListener) - * @since 3.2 - */ + @Override public void addCompletionListener(ICompletionListener listener) { Assert.isLegal(listener != null); fCompletionListeners.add(listener); } - /* - * @see org.eclipse.jface.text.contentassist.IContentAssistantExtension2#removeCompletionListener(org.eclipse.jface.text.contentassist.ICompletionListener) - * @since 3.2 - */ + @Override public void removeCompletionListener(ICompletionListener listener) { fCompletionListeners.remove(listener); } @@ -2399,10 +2378,7 @@ public class ContentAssistant implements IContentAssistant, IContentAssistantExt } } - /* - * @see org.eclipse.jface.text.contentassist.IContentAssistantExtension2#setRepeatedInvocationMode(boolean) - * @since 3.2 - */ + @Override public void setRepeatedInvocationMode(boolean cycling) { fIsRepetitionMode= cycling; } @@ -2419,10 +2395,7 @@ public class ContentAssistant implements IContentAssistant, IContentAssistantExt return fIsRepetitionMode; } - /* - * @see org.eclipse.jface.text.contentassist.IContentAssistantExtension2#setShowEmptyList(boolean) - * @since 3.2 - */ + @Override public void setShowEmptyList(boolean showEmpty) { fShowEmptyList= showEmpty; } @@ -2439,10 +2412,7 @@ public class ContentAssistant implements IContentAssistant, IContentAssistantExt return fShowEmptyList; } - /* - * @see org.eclipse.jface.text.contentassist.IContentAssistantExtension2#setStatusLineVisible(boolean) - * @since 3.2 - */ + @Override public void setStatusLineVisible(boolean show) { fIsStatusLineVisible= show; if (fProposalPopup != null) @@ -2461,10 +2431,7 @@ public class ContentAssistant implements IContentAssistant, IContentAssistantExt return fIsStatusLineVisible; } - /* - * @see org.eclipse.jface.text.contentassist.IContentAssistantExtension2#setStatusMessage(java.lang.String) - * @since 3.2 - */ + @Override public void setStatusMessage(String message) { Assert.isLegal(message != null); fMessage= message; @@ -2482,10 +2449,7 @@ public class ContentAssistant implements IContentAssistant, IContentAssistantExt return fMessage; } - /* - * @see org.eclipse.jface.text.contentassist.IContentAssistantExtension2#setEmptyMessage(java.lang.String) - * @since 3.2 - */ + @Override public void setEmptyMessage(String message) { Assert.isLegal(message != null); if (fProposalPopup != null) @@ -2526,6 +2490,7 @@ public class ContentAssistant implements IContentAssistant, IContentAssistantExt * @see org.eclipse.jface.text.contentassist.IContentAssistantExtension3#setInvocationTrigger(org.eclipse.jface.bindings.keys.KeySequence) * @since 3.2 */ + @Override public void setRepeatedInvocationTrigger(KeySequence sequence) { fRepeatedInvocationKeySequence= sequence; } @@ -2565,6 +2530,7 @@ public class ContentAssistant implements IContentAssistant, IContentAssistantExt * * @since 3.4 */ + @Override public final IHandler getHandler(String commandId) { if (fHandlers == null) throw new IllegalStateException(); diff --git a/org.eclipse.jface.text/src/org/eclipse/jface/text/contentassist/ContextInformation.java b/org.eclipse.jface.text/src/org/eclipse/jface/text/contentassist/ContextInformation.java index ed393281893..a375aabcd42 100644 --- a/org.eclipse.jface.text/src/org/eclipse/jface/text/contentassist/ContextInformation.java +++ b/org.eclipse.jface.text/src/org/eclipse/jface/text/contentassist/ContextInformation.java @@ -55,9 +55,7 @@ public final class ContextInformation implements IContextInformation { fInformationDisplayString= informationDisplayString; } - /* - * @see IContextInformation#equals(Object) - */ + @Override public boolean equals(Object object) { if (object instanceof IContextInformation) { IContextInformation contextInformation= (IContextInformation) object; @@ -69,32 +67,23 @@ public final class ContextInformation implements IContextInformation { return false; } - /* - * @see java.lang.Object#hashCode() - * @since 3.1 - */ + @Override public int hashCode() { int low= fContextDisplayString != null ? fContextDisplayString.hashCode() : 0; return (fInformationDisplayString.hashCode() << 16) | low; } - /* - * @see IContextInformation#getInformationDisplayString() - */ + @Override public String getInformationDisplayString() { return fInformationDisplayString; } - /* - * @see IContextInformation#getImage() - */ + @Override public Image getImage() { return fImage; } - /* - * @see IContextInformation#getContextDisplayString() - */ + @Override public String getContextDisplayString() { if (fContextDisplayString != null) return fContextDisplayString; diff --git a/org.eclipse.jface.text/src/org/eclipse/jface/text/contentassist/ContextInformationPopup.java b/org.eclipse.jface.text/src/org/eclipse/jface/text/contentassist/ContextInformationPopup.java index 4f00d1a48c9..0bc4eb0360b 100644 --- a/org.eclipse.jface.text/src/org/eclipse/jface/text/contentassist/ContextInformationPopup.java +++ b/org.eclipse.jface.text/src/org/eclipse/jface/text/contentassist/ContextInformationPopup.java @@ -88,10 +88,7 @@ class ContextInformationPopup implements IContentAssistListener { fPresenter = presenter; } - /* - * @see java.lang.Object#equals(java.lang.Object) - * @since 3.0 - */ + @Override public boolean equals(Object obj) { if (obj instanceof ContextFrame) { ContextFrame frame= (ContextFrame) obj; @@ -100,10 +97,7 @@ class ContextInformationPopup implements IContentAssistListener { return super.equals(obj); } - /* - * @see java.lang.Object#hashCode() - * @since 3.1 - */ + @Override public int hashCode() { return (fInformation.hashCode() << 16) | fBeginOffset; } @@ -187,6 +181,7 @@ class ContextInformationPopup implements IContentAssistListener { public String showContextProposals(final boolean autoActivated) { final Control control= fContentAssistSubjectControlAdapter.getControl(); BusyIndicator.showWhile(control.getDisplay(), new Runnable() { + @Override public void run() { int offset= fContentAssistSubjectControlAdapter.getSelectedRange().x; @@ -258,6 +253,7 @@ class ContextInformationPopup implements IContentAssistListener { public void showContextInformation(final IContextInformation info, final int offset) { Control control= fContentAssistSubjectControlAdapter.getControl(); BusyIndicator.showWhile(control.getDisplay(), new Runnable() { + @Override public void run() { if (info == null) validateContextInformation(); @@ -370,9 +366,7 @@ class ContextInformationPopup implements IContentAssistListener { if (fContentAssistant.addContentAssistListener(this, ContentAssistant.CONTEXT_INFO_POPUP)) { if (fContentAssistSubjectControlAdapter.getControl() != null) { fTextWidgetSelectionListener= new SelectionAdapter() { - /* - * @see org.eclipse.swt.events.SelectionAdapter#widgetSelected(org.eclipse.swt.events.SelectionEvent) - */ + @Override public void widgetSelected(SelectionEvent e) { validateContextInformation(); }}; @@ -514,9 +508,11 @@ class ContextInformationPopup implements IContentAssistListener { fContextSelectorShell.addControlListener(new ControlListener() { + @Override public void controlMoved(ControlEvent e) { } + @Override public void controlResized(ControlEvent e) { fContextSelectorPopupSize= fContextSelectorShell.getSize(); } @@ -528,6 +524,7 @@ class ContextInformationPopup implements IContentAssistListener { final StyledText textWidget= fViewer.getTextWidget(); final VerifyKeyListener verifyListener= new VerifyKeyListener() { + @Override public void verifyKey(VerifyEvent event) { if (isActive() && event.keyCode == 13 && event.character == '\r' && event.widget == textWidget) { event.doit= false; @@ -540,6 +537,7 @@ class ContextInformationPopup implements IContentAssistListener { textViewerExtension.prependVerifyKeyListener(verifyListener); fContextSelectorShell.addDisposeListener(new DisposeListener() { + @Override public void widgetDisposed(DisposeEvent e) { textViewerExtension.removeVerifyKeyListener(verifyListener); } @@ -570,9 +568,11 @@ class ContextInformationPopup implements IContentAssistListener { fContextSelectorTable.setForeground(c); fContextSelectorTable.addSelectionListener(new SelectionListener() { + @Override public void widgetSelected(SelectionEvent e) { } + @Override public void widgetDefaultSelected(SelectionEvent e) { insertSelectedContext(); hideContextSelector(); @@ -711,9 +711,7 @@ class ContextInformationPopup implements IContentAssistListener { return (Helper.okToUse(fContextInfoPopup) || Helper.okToUse(fContextSelectorShell)); } - /* - * @see IContentAssistListener#verifyKey(VerifyEvent) - */ + @Override public boolean verifyKey(VerifyEvent e) { if (Helper.okToUse(fContextSelectorShell)) return contextSelectorKeyPressed(e); @@ -826,9 +824,7 @@ class ContextInformationPopup implements IContentAssistListener { return true; } - /* - * @see IEventConsumer#processEvent(VerifyEvent) - */ + @Override public void processEvent(VerifyEvent event) { if (Helper.okToUse(fContextSelectorShell)) contextSelectorProcessEvent(event); @@ -878,6 +874,7 @@ class ContextInformationPopup implements IContentAssistListener { private ContextFrame fFrame= (ContextFrame) fContextFrameStack.peek(); + @Override public void run() { // only do this if no other frames have been added in between if (!fContextFrameStack.isEmpty() && fFrame == fContextFrameStack.peek()) { diff --git a/org.eclipse.jface.text/src/org/eclipse/jface/text/contentassist/ContextInformationValidator.java b/org.eclipse.jface.text/src/org/eclipse/jface/text/contentassist/ContextInformationValidator.java index 0ac4de770c4..694018a8a67 100644 --- a/org.eclipse.jface.text/src/org/eclipse/jface/text/contentassist/ContextInformationValidator.java +++ b/org.eclipse.jface.text/src/org/eclipse/jface/text/contentassist/ContextInformationValidator.java @@ -39,17 +39,13 @@ public final class ContextInformationValidator implements IContextInformationVal fProcessor= processor; } - /* - * @see IContextInformationValidator#install(IContextInformation, ITextViewer, int) - */ + @Override public void install(IContextInformation contextInformation, ITextViewer viewer, int offset) { fContextInformation= contextInformation; fViewer= viewer; } - /* - * @see IContentAssistTipCloser#isContextInformationValid(int) - */ + @Override public boolean isContextInformationValid(int offset) { IContextInformation[] infos= fProcessor.computeContextInformation(fViewer, offset); if (infos != null && infos.length > 0) { diff --git a/org.eclipse.jface.text/src/org/eclipse/jface/text/contentassist/IContextInformation.java b/org.eclipse.jface.text/src/org/eclipse/jface/text/contentassist/IContextInformation.java index 3d6c63b9456..041c87e3d71 100644 --- a/org.eclipse.jface.text/src/org/eclipse/jface/text/contentassist/IContextInformation.java +++ b/org.eclipse.jface.text/src/org/eclipse/jface/text/contentassist/IContextInformation.java @@ -72,6 +72,7 @@ public interface IContextInformation { * * @see Object#equals(Object) */ + @Override boolean equals(Object object); } diff --git a/org.eclipse.jface.text/src/org/eclipse/jface/text/contentassist/PopupCloser.java b/org.eclipse.jface.text/src/org/eclipse/jface/text/contentassist/PopupCloser.java index ac45f218b61..5248c500feb 100644 --- a/org.eclipse.jface.text/src/org/eclipse/jface/text/contentassist/PopupCloser.java +++ b/org.eclipse.jface.text/src/org/eclipse/jface/text/contentassist/PopupCloser.java @@ -128,33 +128,26 @@ class PopupCloser extends ShellAdapter implements FocusListener, SelectionListen } } - /* - * @see org.eclipse.swt.events.SelectionListener#widgetSelected(org.eclipse.swt.events.SelectionEvent) - */ + @Override public void widgetSelected(SelectionEvent e) { fScrollbarClicked= true; } - /* - * @see org.eclipse.swt.events.SelectionListener#widgetDefaultSelected(org.eclipse.swt.events.SelectionEvent) - */ + @Override public void widgetDefaultSelected(SelectionEvent e) { fScrollbarClicked= true; } - /* - * @see org.eclipse.swt.events.FocusListener#focusGained(org.eclipse.swt.events.FocusEvent) - */ + @Override public void focusGained(FocusEvent e) { } - /* - * @see org.eclipse.swt.events.FocusListener#focusLost(org.eclipse.swt.events.FocusEvent) - */ + @Override public void focusLost(final FocusEvent e) { fScrollbarClicked= false; Display d= fTable.getDisplay(); d.asyncExec(new Runnable() { + @Override public void run() { if (Helper.okToUse(fTable) && !fTable.isFocusControl() && !fScrollbarClicked && fContentAssistant != null) fContentAssistant.popupFocusLost(e); @@ -162,13 +155,11 @@ class PopupCloser extends ShellAdapter implements FocusListener, SelectionListen }); } - /* - * @see org.eclipse.swt.events.ShellAdapter#shellDeactivated(org.eclipse.swt.events.ShellEvent) - * @since 3.1 - */ + @Override public void shellDeactivated(ShellEvent e) { if (fContentAssistant != null && fDisplay != null) { fDisplay.asyncExec(new Runnable() { + @Override public void run() { /* * The asyncExec is a workaround for https://bugs.eclipse.org/bugs/show_bug.cgi?id=235556 : @@ -182,19 +173,13 @@ class PopupCloser extends ShellAdapter implements FocusListener, SelectionListen } - /* - * @see org.eclipse.swt.events.ShellAdapter#shellClosed(org.eclipse.swt.events.ShellEvent) - * @since 3.1 - */ + @Override public void shellClosed(ShellEvent e) { if (fContentAssistant != null) fContentAssistant.hide(); } - /* - * @see org.eclipse.swt.widgets.Listener#handleEvent(org.eclipse.swt.widgets.Event) - * @since 3.4 - */ + @Override public void handleEvent(Event event) { switch (event.type) { case SWT.Activate: @@ -237,6 +222,7 @@ class PopupCloser extends ShellAdapter implements FocusListener, SelectionListen delayedICP.setDelayedInputChangeListener(inputChangeListener); // cancel automatic input updating after a small timeout: control.getShell().getDisplay().timerExec(1000, new Runnable() { + @Override public void run() { delayedICP.setDelayedInputChangeListener(null); } @@ -245,6 +231,7 @@ class PopupCloser extends ShellAdapter implements FocusListener, SelectionListen // XXX: workaround for https://bugs.eclipse.org/bugs/show_bug.cgi?id=212392 : control.getShell().getDisplay().asyncExec(new Runnable() { + @Override public void run() { fAdditionalInfoController.getInternalAccessor().replaceInformationControl(true); } @@ -265,6 +252,7 @@ class PopupCloser extends ShellAdapter implements FocusListener, SelectionListen IInformationControlExtension5 iControl5= (IInformationControlExtension5) iControl; if (iControl5.containsControl(control)) { control.getDisplay().asyncExec(new Runnable() { + @Override public void run() { if (fContentAssistant != null && ! fContentAssistant.hasProposalPopupFocus()) fContentAssistant.hide(); diff --git a/org.eclipse.jface.text/src/org/eclipse/jface/text/formatter/ContentFormatter.java b/org.eclipse.jface.text/src/org/eclipse/jface/text/formatter/ContentFormatter.java index 32fcd62110f..e02b999a493 100644 --- a/org.eclipse.jface.text/src/org/eclipse/jface/text/formatter/ContentFormatter.java +++ b/org.eclipse.jface.text/src/org/eclipse/jface/text/formatter/ContentFormatter.java @@ -166,9 +166,7 @@ public class ContentFormatter implements IContentFormatter { return getOffset() + getLength(); } - /* - * @see Comparable#compareTo(Object) - */ + @Override public int compareTo(Object obj) { if (obj instanceof PositionReference) { @@ -197,9 +195,7 @@ public class ContentFormatter implements IContentFormatter { super(category); } - /* - * @see DefaultPositionUpdater#notDeleted() - */ + @Override protected boolean notDeleted() { return true; } @@ -213,9 +209,7 @@ public class ContentFormatter implements IContentFormatter { * @see IPositionUpdater */ class RemoveAffectedPositions implements IPositionUpdater { - /* - * @see IPositionUpdater#update(DocumentEvent) - */ + @Override public void update(DocumentEvent event) { removeAffectedPositions(event.getDocument()); } @@ -246,9 +240,7 @@ public class ContentFormatter implements IContentFormatter { fOffset= offset; } - /* - * @see IPositionUpdater#update(DocumentEvent) - */ + @Override public void update(DocumentEvent event) { updateAffectedPositions(event.getDocument(), fPositions, fOffset); } @@ -331,6 +323,7 @@ public class ContentFormatter implements IContentFormatter { * @deprecated incompatible with an open set of document partitionings. The provided information is only used * if this formatter can not compute the partition managing position categories. */ + @Deprecated public void setPartitionManagingPositionCategories(String[] categories) { fExternalPartitonManagingCategories= TextUtilities.copy(categories); } @@ -354,9 +347,7 @@ public class ContentFormatter implements IContentFormatter { fIsPartitionAware= enable; } - /* - * @see IContentFormatter#getFormattingStrategy(String) - */ + @Override public IFormattingStrategy getFormattingStrategy(String contentType) { Assert.isNotNull(contentType); @@ -367,9 +358,7 @@ public class ContentFormatter implements IContentFormatter { return (IFormattingStrategy) fStrategies.get(contentType); } - /* - * @see IContentFormatter#format(IDocument, IRegion) - */ + @Override public void format(IDocument document, IRegion region) { fNeedsComputation= true; fDocument= document; diff --git a/org.eclipse.jface.text/src/org/eclipse/jface/text/formatter/ContextBasedFormattingStrategy.java b/org.eclipse.jface.text/src/org/eclipse/jface/text/formatter/ContextBasedFormattingStrategy.java index 5bc9b4a4e9a..ddeccc8d140 100644 --- a/org.eclipse.jface.text/src/org/eclipse/jface/text/formatter/ContextBasedFormattingStrategy.java +++ b/org.eclipse.jface.text/src/org/eclipse/jface/text/formatter/ContextBasedFormattingStrategy.java @@ -30,37 +30,27 @@ public abstract class ContextBasedFormattingStrategy implements IFormattingStrat /** The list of preferences for initiated the formatting steps */ private final LinkedList fPreferences= new LinkedList(); - /* - * @see org.eclipse.jface.text.formatter.IFormattingStrategyExtension#format() - */ + @Override public void format() { fCurrentPreferences= (Map)fPreferences.removeFirst(); } - /* - * @see org.eclipse.jface.text.formatter.IFormattingStrategy#format(java.lang.String, boolean, java.lang.String, int[]) - */ + @Override public String format(String content, boolean start, String indentation, int[] positions) { return null; } - /* - * @see org.eclipse.jface.text.formatter.IFormattingStrategyExtension#formatterStarts(org.eclipse.jface.text.formatter.IFormattingContext) - */ + @Override public void formatterStarts(final IFormattingContext context) { fPreferences.addLast(context.getProperty(FormattingContextProperties.CONTEXT_PREFERENCES)); } - /* - * @see IFormattingStrategy#formatterStarts(String) - */ + @Override public void formatterStarts(final String indentation) { // Do nothing } - /* - * @see org.eclipse.jface.text.formatter.IFormattingStrategyExtension#formatterStops() - */ + @Override public void formatterStops() { fPreferences.clear(); diff --git a/org.eclipse.jface.text/src/org/eclipse/jface/text/formatter/FormattingContext.java b/org.eclipse.jface.text/src/org/eclipse/jface/text/formatter/FormattingContext.java index f7cda8b02d0..9b76ced365e 100644 --- a/org.eclipse.jface.text/src/org/eclipse/jface/text/formatter/FormattingContext.java +++ b/org.eclipse.jface.text/src/org/eclipse/jface/text/formatter/FormattingContext.java @@ -26,73 +26,53 @@ public class FormattingContext implements IFormattingContext { /** Map to store the properties */ private final Map fMap= new HashMap(); - /* - * @see org.eclipse.jface.text.formatter.IFormattingContext#dispose() - */ + @Override public void dispose() { fMap.clear(); } - /* - * @see org.eclipse.jface.text.formatter.IFormattingContext#getPreferenceKeys() - */ + @Override public String[] getPreferenceKeys() { return new String[] { }; } - /* - * @see org.eclipse.jface.text.formatter.IFormattingContext#getProperty(java.lang.Object) - */ + @Override public Object getProperty(Object key) { return fMap.get(key); } - /* - * @see org.eclipse.jface.text.formatter.IFormattingContext#isBooleanPreference(java.lang.String) - */ + @Override public boolean isBooleanPreference(String key) { return false; } - /* - * @see org.eclipse.jface.text.formatter.IFormattingContext#isDoublePreference(java.lang.String) - */ + @Override public boolean isDoublePreference(String key) { return false; } - /* - * @see org.eclipse.jface.text.formatter.IFormattingContext#isFloatPreference(java.lang.String) - */ + @Override public boolean isFloatPreference(String key) { return false; } - /* - * @see org.eclipse.jface.text.formatter.IFormattingContext#isIntegerPreference(java.lang.String) - */ + @Override public boolean isIntegerPreference(String key) { return false; } - /* - * @see org.eclipse.jface.text.formatter.IFormattingContext#isLongPreference(java.lang.String) - */ + @Override public boolean isLongPreference(String key) { return false; } - /* - * @see org.eclipse.jface.text.formatter.IFormattingContext#isStringPreference(java.lang.String) - */ + @Override public boolean isStringPreference(String key) { return false; } - /* - * @see org.eclipse.jface.text.formatter.IFormattingContext#mapToStore(java.util.Map, org.eclipse.jface.preference.IPreferenceStore) - */ + @Override public void mapToStore(Map map, IPreferenceStore store) { final String[] preferences= getPreferenceKeys(); @@ -128,16 +108,12 @@ public class FormattingContext implements IFormattingContext { } } - /* - * @see org.eclipse.jface.text.formatter.IFormattingContext#setProperty(java.lang.Object, java.lang.Object) - */ + @Override public void setProperty(Object key, Object property) { fMap.put(key, property); } - /* - * @see org.eclipse.jface.text.formatter.IFormattingContext#storeToMap(org.eclipse.jface.preference.IPreferenceStore, java.util.Map, boolean) - */ + @Override public void storeToMap(IPreferenceStore store, Map map, boolean useDefault) { final String[] preferences= getPreferenceKeys(); diff --git a/org.eclipse.jface.text/src/org/eclipse/jface/text/formatter/MultiPassContentFormatter.java b/org.eclipse.jface.text/src/org/eclipse/jface/text/formatter/MultiPassContentFormatter.java index 6965a18cc86..be8d549897c 100644 --- a/org.eclipse.jface.text/src/org/eclipse/jface/text/formatter/MultiPassContentFormatter.java +++ b/org.eclipse.jface.text/src/org/eclipse/jface/text/formatter/MultiPassContentFormatter.java @@ -64,9 +64,7 @@ public class MultiPassContentFormatter implements IContentFormatter, IContentFor super(category); } - /* - * @see org.eclipse.jface.text.DefaultPositionUpdater#notDeleted() - */ + @Override protected final boolean notDeleted() { if (fOffset < fPosition.offset && (fPosition.offset + fPosition.length < fOffset + fLength)) { @@ -120,9 +118,7 @@ public class MultiPassContentFormatter implements IContentFormatter, IContentFor fType= type; } - /* - * @see org.eclipse.jface.text.formatter.IContentFormatterExtension#format(org.eclipse.jface.text.IDocument, org.eclipse.jface.text.formatter.IFormattingContext) - */ + @Override public final void format(final IDocument medium, final IFormattingContext context) { context.setProperty(FormattingContextProperties.CONTEXT_MEDIUM, medium); @@ -147,9 +143,7 @@ public class MultiPassContentFormatter implements IContentFormatter, IContentFor } } - /* - * @see org.eclipse.jface.text.formatter.IContentFormatter#format(org.eclipse.jface.text.IDocument, org.eclipse.jface.text.IRegion) - */ + @Override public final void format(final IDocument medium, final IRegion region) { final FormattingContext context= new FormattingContext(); @@ -281,9 +275,7 @@ public class MultiPassContentFormatter implements IContentFormatter, IContentFor } } - /* - * @see org.eclipse.jface.text.formatter.IContentFormatter#getFormattingStrategy(java.lang.String) - */ + @Override public final IFormattingStrategy getFormattingStrategy(final String type) { return null; } diff --git a/org.eclipse.jface.text/src/org/eclipse/jface/text/hyperlink/AbstractHyperlinkDetector.java b/org.eclipse.jface.text/src/org/eclipse/jface/text/hyperlink/AbstractHyperlinkDetector.java index 8854bbc626c..cd73b4f4480 100644 --- a/org.eclipse.jface.text/src/org/eclipse/jface/text/hyperlink/AbstractHyperlinkDetector.java +++ b/org.eclipse.jface.text/src/org/eclipse/jface/text/hyperlink/AbstractHyperlinkDetector.java @@ -46,9 +46,7 @@ public abstract class AbstractHyperlinkDetector implements IHyperlinkDetector, I fContext= context; } - /* - * @see org.eclipse.jface.text.hyperlink.IHyperlinkDetectorExtension#dispose() - */ + @Override public void dispose() { fContext= null; } diff --git a/org.eclipse.jface.text/src/org/eclipse/jface/text/hyperlink/DefaultHyperlinkPresenter.java b/org.eclipse.jface.text/src/org/eclipse/jface/text/hyperlink/DefaultHyperlinkPresenter.java index 109ab6ee3a3..6a5bf5604e0 100644 --- a/org.eclipse.jface.text/src/org/eclipse/jface/text/hyperlink/DefaultHyperlinkPresenter.java +++ b/org.eclipse.jface.text/src/org/eclipse/jface/text/hyperlink/DefaultHyperlinkPresenter.java @@ -130,9 +130,7 @@ public class DefaultHyperlinkPresenter implements IHyperlinkPresenter, IHyperlin fDisposeColor= true; } - /* - * @see org.eclipse.jdt.internal.ui.javaeditor.IHyperlinkControl#canShowMultipleHyperlinks() - */ + @Override public boolean canShowMultipleHyperlinks() { return false; } @@ -140,6 +138,7 @@ public class DefaultHyperlinkPresenter implements IHyperlinkPresenter, IHyperlin /* * @see org.eclipse.jdt.internal.ui.javaeditor.IHyperlinkControl#activate(org.eclipse.jdt.internal.ui.javaeditor.IHyperlink[]) */ + @Override public void showHyperlinks(IHyperlink[] hyperlinks) { Assert.isLegal(hyperlinks != null && hyperlinks.length == 1); highlightRegion(hyperlinks[0].getHyperlinkRegion()); @@ -150,6 +149,7 @@ public class DefaultHyperlinkPresenter implements IHyperlinkPresenter, IHyperlin * * @since 3.4 */ + @Override public boolean canHideHyperlinks() { return true; } @@ -157,14 +157,13 @@ public class DefaultHyperlinkPresenter implements IHyperlinkPresenter, IHyperlin /* * @see org.eclipse.jdt.internal.ui.javaeditor.IHyperlinkControl#deactivate() */ + @Override public void hideHyperlinks() { repairRepresentation(); fRememberedPosition= null; } - /* - * @see org.eclipse.jdt.internal.ui.javaeditor.IHyperlinkControl#install(org.eclipse.jface.text.ITextViewer) - */ + @Override public void install(ITextViewer textViewer) { Assert.isNotNull(textViewer); fTextViewer= textViewer; @@ -184,9 +183,7 @@ public class DefaultHyperlinkPresenter implements IHyperlinkPresenter, IHyperlin } } - /* - * @see org.eclipse.jdt.internal.ui.javaeditor.IHyperlinkControl#uninstall() - */ + @Override public void uninstall() { fTextViewer.removeTextInputListener(this); IDocument document= fTextViewer.getDocument(); @@ -223,9 +220,7 @@ public class DefaultHyperlinkPresenter implements IHyperlinkPresenter, IHyperlin fColor= color; } - /* - * @see org.eclipse.jface.text.ITextPresentationListener#applyTextPresentation(org.eclipse.jface.text.TextPresentation) - */ + @Override public void applyTextPresentation(TextPresentation textPresentation) { if (fActiveRegion == null) return; @@ -277,9 +272,7 @@ public class DefaultHyperlinkPresenter implements IHyperlinkPresenter, IHyperlin } - /* - * @see org.eclipse.jface.text.IDocumentListener#documentAboutToBeChanged(org.eclipse.jface.text.DocumentEvent) - */ + @Override public void documentAboutToBeChanged(DocumentEvent event) { if (fActiveRegion != null) { fRememberedPosition= new Position(fActiveRegion.getOffset(), fActiveRegion.getLength()); @@ -291,9 +284,7 @@ public class DefaultHyperlinkPresenter implements IHyperlinkPresenter, IHyperlin } } - /* - * @see org.eclipse.jface.text.IDocumentListener#documentChanged(org.eclipse.jface.text.DocumentEvent) - */ + @Override public void documentChanged(DocumentEvent event) { if (fRememberedPosition != null) { if (!fRememberedPosition.isDeleted()) { @@ -307,6 +298,7 @@ public class DefaultHyperlinkPresenter implements IHyperlinkPresenter, IHyperlin StyledText widget= fTextViewer.getTextWidget(); if (widget != null && !widget.isDisposed()) { widget.getDisplay().asyncExec(new Runnable() { + @Override public void run() { hideHyperlinks(); } @@ -315,9 +307,7 @@ public class DefaultHyperlinkPresenter implements IHyperlinkPresenter, IHyperlin } } - /* - * @see org.eclipse.jface.text.ITextInputListener#inputDocumentAboutToBeChanged(org.eclipse.jface.text.IDocument, org.eclipse.jface.text.IDocument) - */ + @Override public void inputDocumentAboutToBeChanged(IDocument oldInput, IDocument newInput) { if (oldInput == null) return; @@ -325,9 +315,7 @@ public class DefaultHyperlinkPresenter implements IHyperlinkPresenter, IHyperlin oldInput.removeDocumentListener(this); } - /* - * @see org.eclipse.jface.text.ITextInputListener#inputDocumentChanged(org.eclipse.jface.text.IDocument, org.eclipse.jface.text.IDocument) - */ + @Override public void inputDocumentChanged(IDocument oldInput, IDocument newInput) { if (newInput == null) return; @@ -361,9 +349,7 @@ public class DefaultHyperlinkPresenter implements IHyperlinkPresenter, IHyperlin return null; } - /* - * @see org.eclipse.jface.util.IPropertyChangeListener#propertyChange(org.eclipse.jface.util.PropertyChangeEvent) - */ + @Override public void propertyChange(PropertyChangeEvent event) { if (HYPERLINK_COLOR.equals(event.getProperty())) { if (fColor != null && fDisposeColor) diff --git a/org.eclipse.jface.text/src/org/eclipse/jface/text/hyperlink/HyperlinkManager.java b/org.eclipse.jface.text/src/org/eclipse/jface/text/hyperlink/HyperlinkManager.java index cb644299c52..419e4bb0bf2 100644 --- a/org.eclipse.jface.text/src/org/eclipse/jface/text/hyperlink/HyperlinkManager.java +++ b/org.eclipse.jface.text/src/org/eclipse/jface/text/hyperlink/HyperlinkManager.java @@ -69,9 +69,7 @@ public class HyperlinkManager implements ITextListener, Listener, KeyListener, M fName= name; } - /* - * @see java.lang.Object#toString() - */ + @Override public String toString() { return fName; } @@ -349,9 +347,7 @@ public class HyperlinkManager implements ITextListener, Listener, KeyListener, M return JFaceTextUtil.getOffsetForCursorLocation(fTextViewer); } - /* - * @see org.eclipse.swt.events.KeyListener#keyPressed(org.eclipse.swt.events.KeyEvent) - */ + @Override public void keyPressed(KeyEvent event) { if (!isRegisteredStateMask((event.keyCode | event.stateMask) & SWT.MODIFIER_MASK)) { @@ -364,22 +360,16 @@ public class HyperlinkManager implements ITextListener, Listener, KeyListener, M // do not show hyperlink, since that would often be confusing (e.g. when pressing Ctrl+C) } - /* - * @see org.eclipse.swt.events.KeyListener#keyReleased(org.eclipse.swt.events.KeyEvent) - */ + @Override public void keyReleased(KeyEvent event) { } - /* - * @see org.eclipse.swt.events.MouseListener#mouseDoubleClick(org.eclipse.swt.events.MouseEvent) - */ + @Override public void mouseDoubleClick(MouseEvent e) { } - /* - * @see org.eclipse.swt.events.MouseListener#mouseDown(org.eclipse.swt.events.MouseEvent) - */ + @Override public void mouseDown(MouseEvent event) { if (fHyperlinkPresenter instanceof IHyperlinkPresenterExtension) { @@ -417,9 +407,7 @@ public class HyperlinkManager implements ITextListener, Listener, KeyListener, M showHyperlinks(false); } - /* - * @see org.eclipse.swt.events.MouseListener#mouseUp(org.eclipse.swt.events.MouseEvent) - */ + @Override public void mouseUp(MouseEvent e) { if (!fActive) { @@ -436,9 +424,7 @@ public class HyperlinkManager implements ITextListener, Listener, KeyListener, M fActiveHyperlinks[0].open(); } - /* - * @see org.eclipse.swt.events.MouseMoveListener#mouseMove(org.eclipse.swt.events.MouseEvent) - */ + @Override public void mouseMove(MouseEvent event) { if (fHyperlinkPresenter instanceof IHyperlinkPresenterExtension) { if (!((IHyperlinkPresenterExtension)fHyperlinkPresenter).canHideHyperlinks()) @@ -492,31 +478,21 @@ public class HyperlinkManager implements ITextListener, Listener, KeyListener, M return false; } - /* - * @see org.eclipse.swt.events.FocusListener#focusGained(org.eclipse.swt.events.FocusEvent) - */ + @Override public void focusGained(FocusEvent e) {} - /* - * @see org.eclipse.swt.events.FocusListener#focusLost(org.eclipse.swt.events.FocusEvent) - */ + @Override public void focusLost(FocusEvent event) { deactivate(); } - /* - * @see org.eclipse.swt.widgets.Listener#handleEvent(org.eclipse.swt.widgets.Event) - * @since 3.2 - */ + @Override public void handleEvent(Event event) { //key up deactivate(); } - /* - * @see org.eclipse.jface.text.ITextListener#textChanged(TextEvent) - * @since 3.2 - */ + @Override public void textChanged(TextEvent event) { if (event.getDocumentEvent() != null) deactivate(); @@ -527,6 +503,7 @@ public class HyperlinkManager implements ITextListener, Listener, KeyListener, M * * @since 3.4 */ + @Override public void mouseExit(MouseEvent e) { if (fHyperlinkPresenter instanceof IHyperlinkPresenterExtension) { if (!((IHyperlinkPresenterExtension)fHyperlinkPresenter).canHideHyperlinks()) @@ -540,6 +517,7 @@ public class HyperlinkManager implements ITextListener, Listener, KeyListener, M * * @since 3.4 */ + @Override public void mouseEnter(MouseEvent e) { } @@ -548,6 +526,7 @@ public class HyperlinkManager implements ITextListener, Listener, KeyListener, M * * @since 3.4 */ + @Override public void mouseHover(MouseEvent e) { } diff --git a/org.eclipse.jface.text/src/org/eclipse/jface/text/hyperlink/MultipleHyperlinkPresenter.java b/org.eclipse.jface.text/src/org/eclipse/jface/text/hyperlink/MultipleHyperlinkPresenter.java index 35a8d7bfbe2..2972bca1ada 100644 --- a/org.eclipse.jface.text/src/org/eclipse/jface/text/hyperlink/MultipleHyperlinkPresenter.java +++ b/org.eclipse.jface.text/src/org/eclipse/jface/text/hyperlink/MultipleHyperlinkPresenter.java @@ -102,30 +102,22 @@ public class MultipleHyperlinkPresenter extends DefaultHyperlinkPresenter implem private static final class LinkContentProvider implements IStructuredContentProvider { - /* - * @see org.eclipse.jface.viewers.IStructuredContentProvider#getElements(java.lang.Object) - */ + @Override public Object[] getElements(Object inputElement) { return (Object[]) inputElement; } - /* - * @see org.eclipse.jface.viewers.IContentProvider#dispose() - */ + @Override public void dispose() { } - /* - * @see org.eclipse.jface.viewers.IContentProvider#inputChanged(org.eclipse.jface.viewers.Viewer, java.lang.Object, java.lang.Object) - */ + @Override public void inputChanged(Viewer viewer, Object oldInput, Object newInput) { } } private static final class LinkLabelProvider extends ColumnLabelProvider { - /* - * @see org.eclipse.jface.viewers.ColumnLabelProvider#getText(java.lang.Object) - */ + @Override public String getText(Object element) { IHyperlink link= (IHyperlink)element; String text= link.getHyperlinkText(); @@ -161,24 +153,18 @@ public class MultipleHyperlinkPresenter extends DefaultHyperlinkPresenter implem create(); } - /* - * @see org.eclipse.jface.text.IInformationControl#setInformation(java.lang.String) - */ + @Override public void setInformation(String information) { //replaced by IInformationControlExtension2#setInput(java.lang.Object) } - /* - * @see org.eclipse.jface.text.IInformationControlExtension2#setInput(java.lang.Object) - */ + @Override public void setInput(Object input) { fInput= (IHyperlink[]) input; deferredCreateContent(fParent); } - /* - * @see org.eclipse.jface.text.AbstractInformationControl#createContent(org.eclipse.swt.widgets.Composite) - */ + @Override protected void createContent(Composite parent) { fParent= parent; GridLayout layout= new GridLayout(); @@ -207,9 +193,7 @@ public class MultipleHyperlinkPresenter extends DefaultHyperlinkPresenter implem fParent.setBackground(fBackgroundColor); } - /* - * @see org.eclipse.jface.text.AbstractInformationControl#computeSizeHint() - */ + @Override public Point computeSizeHint() { Point preferedSize= getShell().computeSize(SWT.DEFAULT, SWT.DEFAULT, true); @@ -269,9 +253,7 @@ public class MultipleHyperlinkPresenter extends DefaultHyperlinkPresenter implem getShell().addShellListener(new ShellAdapter() { - /* - * @see org.eclipse.swt.events.ShellAdapter#shellActivated(org.eclipse.swt.events.ShellEvent) - */ + @Override public void shellActivated(ShellEvent e) { if (viewer.getTable().getSelectionCount() == 0) { viewer.getTable().setSelection(0); @@ -287,6 +269,7 @@ public class MultipleHyperlinkPresenter extends DefaultHyperlinkPresenter implem fTable.addMouseMoveListener(new MouseMoveListener() { TableItem fLastItem= null; + @Override public void mouseMove(MouseEvent e) { if (fTable.equals(e.getSource())) { Object o= fTable.getItem(new Point(e.x, e.y)); @@ -321,12 +304,14 @@ public class MultipleHyperlinkPresenter extends DefaultHyperlinkPresenter implem }); fTable.addSelectionListener(new SelectionAdapter() { + @Override public void widgetDefaultSelected(SelectionEvent e) { openSelectedLink(); } }); fTable.addMouseListener(new MouseAdapter() { + @Override public void mouseUp(MouseEvent e) { if (fTable.getSelectionCount() < 1) return; @@ -344,6 +329,7 @@ public class MultipleHyperlinkPresenter extends DefaultHyperlinkPresenter implem }); fTable.addTraverseListener(new TraverseListener() { + @Override public void keyTraversed(TraverseEvent e) { if (e.keyCode == SWT.ESC) { fManager.hideInformationControl(); @@ -352,9 +338,7 @@ public class MultipleHyperlinkPresenter extends DefaultHyperlinkPresenter implem }); } - /* - * @see org.eclipse.jface.text.IInformationControlExtension#hasContents() - */ + @Override public boolean hasContents() { return true; } @@ -381,29 +365,26 @@ public class MultipleHyperlinkPresenter extends DefaultHyperlinkPresenter implem * @deprecated As of 3.4, replaced by * {@link ITextHoverExtension2#getHoverInfo2(ITextViewer, IRegion)} */ + @Deprecated + @Override public String getHoverInfo(ITextViewer textViewer, IRegion hoverRegion) { return null; } - /* - * @see org.eclipse.jface.text.ITextHover#getHoverRegion(org.eclipse.jface.text.ITextViewer, int) - */ + @Override public IRegion getHoverRegion(ITextViewer textViewer, int offset) { return fSubjectRegion; } - /* - * @see org.eclipse.jface.text.ITextHoverExtension2#getHoverInfo2(org.eclipse.jface.text.ITextViewer, org.eclipse.jface.text.IRegion) - */ + @Override public Object getHoverInfo2(ITextViewer textViewer, IRegion hoverRegion) { return fHyperlinks; } - /* - * @see org.eclipse.jface.text.ITextHoverExtension#getHoverControlCreator() - */ + @Override public IInformationControlCreator getHoverControlCreator() { return new IInformationControlCreator() { + @Override public IInformationControl createInformationControl(Shell parent) { Color foregroundColor= fTextViewer.getTextWidget().getForeground(); Color backgroundColor= fTextViewer.getTextWidget().getBackground(); @@ -422,23 +403,17 @@ public class MultipleHyperlinkPresenter extends DefaultHyperlinkPresenter implem private IInformationControl fControl; private Rectangle fSubjectArea; - /* - * @see org.eclipse.jface.text.AbstractInformationControlManager.IInformationControlCloser#setInformationControl(org.eclipse.jface.text.IInformationControl) - */ + @Override public void setInformationControl(IInformationControl control) { fControl= control; } - /* - * @see org.eclipse.jface.text.AbstractInformationControlManager.IInformationControlCloser#setSubjectControl(org.eclipse.swt.widgets.Control) - */ + @Override public void setSubjectControl(Control subject) { fSubjectControl= subject; } - /* - * @see org.eclipse.jface.text.AbstractInformationControlManager.IInformationControlCloser#start(org.eclipse.swt.graphics.Rectangle) - */ + @Override public void start(Rectangle subjectArea) { fSubjectArea= subjectArea; @@ -451,9 +426,7 @@ public class MultipleHyperlinkPresenter extends DefaultHyperlinkPresenter implem } } - /* - * @see org.eclipse.jface.text.AbstractInformationControlManager.IInformationControlCloser#stop() - */ + @Override public void stop() { if (fDisplay != null && !fDisplay.isDisposed()) { fDisplay.removeFilter(SWT.FocusOut, this); @@ -465,9 +438,7 @@ public class MultipleHyperlinkPresenter extends DefaultHyperlinkPresenter implem fSubjectArea= null; } - /* - * @see org.eclipse.swt.widgets.Listener#handleEvent(org.eclipse.swt.widgets.Event) - */ + @Override public void handleEvent(Event event) { switch (event.type) { case SWT.FocusOut: @@ -538,39 +509,26 @@ public class MultipleHyperlinkPresenter extends DefaultHyperlinkPresenter implem return alsoKeepUp.contains(x, y); } - /* - * @see org.eclipse.swt.events.KeyListener#keyPressed(org.eclipse.swt.events.KeyEvent) - */ + @Override public void keyPressed(KeyEvent e) { hideInformationControl(); } - /* - * @see org.eclipse.swt.events.KeyListener#keyReleased(org.eclipse.swt.events.KeyEvent) - */ + @Override public void keyReleased(KeyEvent e) { if (!isTakingFocusWhenVisible()) hideInformationControl(); } - /* - * @see org.eclipse.swt.events.MouseListener#mouseDoubleClick(org.eclipse.swt.events.MouseEvent) - * @since 3.5 - */ + @Override public void mouseDoubleClick(MouseEvent e) { } - /* - * @see org.eclipse.swt.events.MouseListener#mouseDown(org.eclipse.swt.events.MouseEvent) - * @since 3.5 - */ + @Override public void mouseDown(MouseEvent e) { } - /* - * @see org.eclipse.swt.events.MouseListener#mouseUp(org.eclipse.swt.events.MouseEvent) - * @since 3.5 - */ + @Override public void mouseUp(MouseEvent e) { hideInformationControl(); } @@ -611,9 +569,7 @@ public class MultipleHyperlinkPresenter extends DefaultHyperlinkPresenter implem fIsControlVisible= false; } - /* - * @see org.eclipse.jface.text.AbstractInformationControlManager#computeInformation() - */ + @Override protected void computeInformation() { IRegion region= fHover.getHoverRegion(fTextViewer, -1); if (region == null) { @@ -632,9 +588,7 @@ public class MultipleHyperlinkPresenter extends DefaultHyperlinkPresenter implem setInformation(information, area); } - /* - * @see org.eclipse.jface.text.AbstractInformationControlManager#computeInformationControlLocation(org.eclipse.swt.graphics.Rectangle, org.eclipse.swt.graphics.Point) - */ + @Override protected Point computeInformationControlLocation(Rectangle subjectArea, Point controlSize) { Point result= super.computeInformationControlLocation(subjectArea, controlSize); @@ -646,9 +600,7 @@ public class MultipleHyperlinkPresenter extends DefaultHyperlinkPresenter implem return result; } - /* - * @see org.eclipse.jface.text.AbstractInformationControlManager#showInformationControl(org.eclipse.swt.graphics.Rectangle) - */ + @Override protected void showInformationControl(Rectangle subjectArea) { if (fTextViewer instanceof IWidgetTokenOwnerExtension) { if (((IWidgetTokenOwnerExtension)fTextViewer).requestWidgetToken(this, WIDGET_TOKEN_PRIORITY)) { @@ -675,9 +627,7 @@ public class MultipleHyperlinkPresenter extends DefaultHyperlinkPresenter implem fHyperlinkPresenter.setCaret(); } - /* - * @see org.eclipse.jface.text.AbstractInformationControlManager#hideInformationControl() - */ + @Override protected void hideInformationControl() { super.hideInformationControl(); @@ -689,9 +639,7 @@ public class MultipleHyperlinkPresenter extends DefaultHyperlinkPresenter implem fHyperlinkPresenter.hideHyperlinks(); } - /* - * @see org.eclipse.jface.text.AbstractInformationControlManager#disposeInformationControl() - */ + @Override public void disposeInformationControl() { super.disposeInformationControl(); @@ -703,17 +651,13 @@ public class MultipleHyperlinkPresenter extends DefaultHyperlinkPresenter implem fHyperlinkPresenter.hideHyperlinks(); } - /* - * @see org.eclipse.jface.text.IWidgetTokenKeeper#requestWidgetToken(org.eclipse.jface.text.IWidgetTokenOwner) - */ + @Override public boolean requestWidgetToken(IWidgetTokenOwner owner) { hideInformationControl(); return true; } - /* - * @see org.eclipse.jface.text.IWidgetTokenKeeperExtension#requestWidgetToken(org.eclipse.jface.text.IWidgetTokenOwner, int) - */ + @Override public boolean requestWidgetToken(IWidgetTokenOwner owner, int priority) { if (priority < WIDGET_TOKEN_PRIORITY) return false; @@ -722,9 +666,7 @@ public class MultipleHyperlinkPresenter extends DefaultHyperlinkPresenter implem return true; } - /* - * @see org.eclipse.jface.text.IWidgetTokenKeeperExtension#setFocus(org.eclipse.jface.text.IWidgetTokenOwner) - */ + @Override public boolean setFocus(IWidgetTokenOwner owner) { return isTakingFocusWhenVisible(); } @@ -771,9 +713,7 @@ public class MultipleHyperlinkPresenter extends DefaultHyperlinkPresenter implem super(color); } - /* - * @see org.eclipse.jface.text.hyperlink.DefaultHyperlinkPresenter#install(org.eclipse.jface.text.ITextViewer) - */ + @Override public void install(ITextViewer viewer) { super.install(viewer); fTextViewer= viewer; @@ -783,9 +723,7 @@ public class MultipleHyperlinkPresenter extends DefaultHyperlinkPresenter implem fManager.setSizeConstraints(100, 12, false, true); } - /* - * @see org.eclipse.jface.text.hyperlink.DefaultHyperlinkPresenter#uninstall() - */ + @Override public void uninstall() { super.uninstall(); @@ -796,31 +734,23 @@ public class MultipleHyperlinkPresenter extends DefaultHyperlinkPresenter implem } } - /* - * @see org.eclipse.jface.text.hyperlink.DefaultHyperlinkPresenter#canShowMultipleHyperlinks() - */ + @Override public boolean canShowMultipleHyperlinks() { return true; } - /* - * @see org.eclipse.jface.text.hyperlink.DefaultHyperlinkPresenter#canHideHyperlinks() - */ + @Override public boolean canHideHyperlinks() { return !fManager.isInformationControlVisible(); } - /* - * @see org.eclipse.jface.text.hyperlink.DefaultHyperlinkPresenter#hideHyperlinks() - */ + @Override public void hideHyperlinks() { super.hideHyperlinks(); fHyperlinks= null; } - /* - * @see org.eclipse.jface.text.hyperlink.DefaultHyperlinkPresenter#showHyperlinks(org.eclipse.jface.text.hyperlink.IHyperlink[]) - */ + @Override public void showHyperlinks(IHyperlink[] hyperlinks) { showHyperlinks(hyperlinks, false); } @@ -830,6 +760,7 @@ public class MultipleHyperlinkPresenter extends DefaultHyperlinkPresenter implem * * @since 3.7 */ + @Override public void showHyperlinks(IHyperlink[] activeHyperlinks, boolean takesFocusWhenVisible) { fManager.takesFocusWhenVisible(takesFocusWhenVisible); super.showHyperlinks(new IHyperlink[] { activeHyperlinks[0] }); diff --git a/org.eclipse.jface.text/src/org/eclipse/jface/text/hyperlink/URLHyperlink.java b/org.eclipse.jface.text/src/org/eclipse/jface/text/hyperlink/URLHyperlink.java index 8b032893fb2..851eae0f205 100644 --- a/org.eclipse.jface.text/src/org/eclipse/jface/text/hyperlink/URLHyperlink.java +++ b/org.eclipse.jface.text/src/org/eclipse/jface/text/hyperlink/URLHyperlink.java @@ -43,16 +43,12 @@ public class URLHyperlink implements IHyperlink { fURLString= urlString; } - /* - * @see org.eclipse.jdt.internal.ui.javaeditor.IHyperlink#getHyperlinkRegion() - */ + @Override public IRegion getHyperlinkRegion() { return fRegion; } - /* - * @see org.eclipse.jdt.internal.ui.javaeditor.IHyperlink#open() - */ + @Override public void open() { if (fURLString != null) { Program.launch(fURLString); @@ -60,16 +56,12 @@ public class URLHyperlink implements IHyperlink { } } - /* - * @see org.eclipse.jdt.internal.ui.javaeditor.IHyperlink#getTypeLabel() - */ + @Override public String getTypeLabel() { return null; } - /* - * @see org.eclipse.jdt.internal.ui.javaeditor.IHyperlink#getHyperlinkText() - */ + @Override public String getHyperlinkText() { return MessageFormat.format(HyperlinkMessages.getString("URLHyperlink.hyperlinkText"), new Object[] { fURLString }); //$NON-NLS-1$ } diff --git a/org.eclipse.jface.text/src/org/eclipse/jface/text/hyperlink/URLHyperlinkDetector.java b/org.eclipse.jface.text/src/org/eclipse/jface/text/hyperlink/URLHyperlinkDetector.java index 62710dbf6d6..c8b6fedade5 100644 --- a/org.eclipse.jface.text/src/org/eclipse/jface/text/hyperlink/URLHyperlinkDetector.java +++ b/org.eclipse.jface.text/src/org/eclipse/jface/text/hyperlink/URLHyperlinkDetector.java @@ -44,12 +44,11 @@ public class URLHyperlinkDetector extends AbstractHyperlinkDetector { * @param textViewer the text viewer in which to detect the hyperlink * @deprecated As of 3.2, replaced by {@link URLHyperlinkDetector} */ + @Deprecated public URLHyperlinkDetector(ITextViewer textViewer) { } - /* - * @see org.eclipse.jface.text.hyperlink.IHyperlinkDetector#detectHyperlinks(org.eclipse.jface.text.ITextViewer, org.eclipse.jface.text.IRegion, boolean) - */ + @Override public IHyperlink[] detectHyperlinks(ITextViewer textViewer, IRegion region, boolean canShowMultipleHyperlinks) { if (region == null || textViewer == null) return null; diff --git a/org.eclipse.jface.text/src/org/eclipse/jface/text/information/IInformationProvider.java b/org.eclipse.jface.text/src/org/eclipse/jface/text/information/IInformationProvider.java index 872f5413a0a..697a1cba1e1 100644 --- a/org.eclipse.jface.text/src/org/eclipse/jface/text/information/IInformationProvider.java +++ b/org.eclipse.jface.text/src/org/eclipse/jface/text/information/IInformationProvider.java @@ -63,5 +63,6 @@ public interface IInformationProvider { * @see IInformationPresenter * @deprecated As of 2.1, replaced by {@link IInformationProviderExtension#getInformation2(ITextViewer, IRegion)} */ + @Deprecated String getInformation(ITextViewer textViewer, IRegion subject); } diff --git a/org.eclipse.jface.text/src/org/eclipse/jface/text/information/InformationPresenter.java b/org.eclipse.jface.text/src/org/eclipse/jface/text/information/InformationPresenter.java index a691c449de5..c9c73534e47 100644 --- a/org.eclipse.jface.text/src/org/eclipse/jface/text/information/InformationPresenter.java +++ b/org.eclipse.jface.text/src/org/eclipse/jface/text/information/InformationPresenter.java @@ -90,23 +90,17 @@ public class InformationPresenter extends AbstractInformationControlManager impl /** Indicates whether this closer is active. */ private boolean fIsActive= false; - /* - * @see IInformationControlCloser#setSubjectControl(Control) - */ + @Override public void setSubjectControl(Control control) { fSubjectControl= control; } - /* - * @see IInformationControlCloser#setInformationControl(IInformationControl) - */ + @Override public void setInformationControl(IInformationControl control) { fInformationControlToClose= control; } - /* - * @see IInformationControlCloser#start(Rectangle) - */ + @Override public void start(Rectangle informationArea) { if (fIsActive) @@ -126,9 +120,7 @@ public class InformationPresenter extends AbstractInformationControlManager impl fTextViewer.addViewportListener(this); } - /* - * @see IInformationControlCloser#stop() - */ + @Override public void stop() { if (!fIsActive) @@ -148,53 +140,40 @@ public class InformationPresenter extends AbstractInformationControlManager impl } } - /* - * @see ControlListener#controlResized(ControlEvent) - */ - public void controlResized(ControlEvent e) { + @Override + public void controlResized(ControlEvent e) { hideInformationControl(); } - /* - * @see ControlListener#controlMoved(ControlEvent) - */ - public void controlMoved(ControlEvent e) { + @Override + public void controlMoved(ControlEvent e) { hideInformationControl(); } - /* - * @see MouseListener#mouseDown(MouseEvent) - */ - public void mouseDown(MouseEvent e) { + @Override + public void mouseDown(MouseEvent e) { hideInformationControl(); } - /* - * @see MouseListener#mouseUp(MouseEvent) - */ + @Override public void mouseUp(MouseEvent e) { } - /* - * @see MouseListener#mouseDoubleClick(MouseEvent) - */ + @Override public void mouseDoubleClick(MouseEvent e) { hideInformationControl(); } - /* - * @see FocusListener#focusGained(FocusEvent) - */ + @Override public void focusGained(FocusEvent e) { } - /* - * @see FocusListener#focusLost(FocusEvent) - */ - public void focusLost(FocusEvent e) { + @Override + public void focusLost(FocusEvent e) { Display d= fSubjectControl.getDisplay(); d.asyncExec(new Runnable() { // Without the asyncExec, mouse clicks to the workbench window are swallowed. + @Override public void run() { if (fInformationControlToClose == null || !fInformationControlToClose.isFocusControl()) hideInformationControl(); @@ -202,23 +181,17 @@ public class InformationPresenter extends AbstractInformationControlManager impl }); } - /* - * @see IViewportListenerListener#viewportChanged(int) - */ + @Override public void viewportChanged(int topIndex) { hideInformationControl(); } - /* - * @see KeyListener#keyPressed(KeyEvent) - */ + @Override public void keyPressed(KeyEvent e) { hideInformationControl(); } - /* - * @see KeyListener#keyReleased(KeyEvent) - */ + @Override public void keyReleased(KeyEvent e) { } } @@ -265,10 +238,7 @@ public class InformationPresenter extends AbstractInformationControlManager impl fPartitioning= partitioning; } - /* - * @see org.eclipse.jface.text.information.IInformationPresenterExtension#getDocumentPartitioning() - * @since 3.0 - */ + @Override public String getDocumentPartitioning() { return fPartitioning; } @@ -294,9 +264,7 @@ public class InformationPresenter extends AbstractInformationControlManager impl fProviders.put(contentType, provider); } - /* - * @see IInformationPresenter#getInformationProvider(String) - */ + @Override public IInformationProvider getInformationProvider(String contentType) { if (fProviders == null) return null; @@ -314,9 +282,7 @@ public class InformationPresenter extends AbstractInformationControlManager impl fOffset= offset; } - /* - * @see AbstractInformationControlManager#computeInformation() - */ + @Override protected void computeInformation() { int offset= fOffset < 0 ? fTextViewer.getSelectedRange().x : fOffset; @@ -409,24 +375,18 @@ public class InformationPresenter extends AbstractInformationControlManager impl return new Region(start, end - start); } - /* - * @see IInformationPresenter#install(ITextViewer) - */ + @Override public void install(ITextViewer textViewer) { fTextViewer= textViewer; install(fTextViewer.getTextWidget()); } - /* - * @see IInformationPresenter#uninstall() - */ + @Override public void uninstall() { dispose(); } - /* - * @see AbstractInformationControlManager#showInformationControl(Rectangle) - */ + @Override protected void showInformationControl(Rectangle subjectArea) { if (fTextViewer instanceof IWidgetTokenOwnerExtension && fTextViewer instanceof IWidgetTokenOwner) { IWidgetTokenOwnerExtension extension= (IWidgetTokenOwnerExtension) fTextViewer; @@ -441,9 +401,7 @@ public class InformationPresenter extends AbstractInformationControlManager impl super.showInformationControl(subjectArea); } - /* - * @see AbstractInformationControlManager#hideInformationControl() - */ + @Override protected void hideInformationControl() { try { super.hideInformationControl(); @@ -455,9 +413,7 @@ public class InformationPresenter extends AbstractInformationControlManager impl } } - /* - * @see AbstractInformationControlManager#handleInformationControlDisposed() - */ + @Override protected void handleInformationControlDisposed() { try { super.handleInformationControlDisposed(); @@ -469,25 +425,17 @@ public class InformationPresenter extends AbstractInformationControlManager impl } } - /* - * @see org.eclipse.jface.text.IWidgetTokenKeeper#requestWidgetToken(IWidgetTokenOwner) - */ + @Override public boolean requestWidgetToken(IWidgetTokenOwner owner) { return false; } - /* - * @see org.eclipse.jface.text.IWidgetTokenKeeperExtension#requestWidgetToken(org.eclipse.jface.text.IWidgetTokenOwner, int) - * @since 3.0 - */ + @Override public boolean requestWidgetToken(IWidgetTokenOwner owner, int priority) { return false; } - /* - * @see org.eclipse.jface.text.IWidgetTokenKeeperExtension#setFocus(org.eclipse.jface.text.IWidgetTokenOwner) - * @since 3.0 - */ + @Override public boolean setFocus(IWidgetTokenOwner owner) { return false; } diff --git a/org.eclipse.jface.text/src/org/eclipse/jface/text/link/LinkedModeUI.java b/org.eclipse.jface.text/src/org/eclipse/jface/text/link/LinkedModeUI.java index 225465bad68..4f2a5492d0c 100644 --- a/org.eclipse.jface.text/src/org/eclipse/jface/text/link/LinkedModeUI.java +++ b/org.eclipse.jface.text/src/org/eclipse/jface/text/link/LinkedModeUI.java @@ -129,10 +129,12 @@ public class LinkedModeUI { */ private static final class EmtpyFocusListener implements ILinkedModeUIFocusListener { + @Override public void linkingFocusGained(LinkedPosition position, LinkedModeUITarget target) { // ignore } + @Override public void linkingFocusLost(LinkedPosition position, LinkedModeUITarget target) { // ignore } @@ -185,22 +187,16 @@ public class LinkedModeUI { fTextViewer= viewer; } - /* - * @see org.eclipse.jdt.internal.ui.text.link2.LinkedModeUI.ILinkedUITarget#getViewer() - */ + @Override public ITextViewer getViewer() { return fTextViewer; } - /** - * {@inheritDoc} - */ + @Override public void linkingFocusLost(LinkedPosition position, LinkedModeUITarget target) { } - /** - * {@inheritDoc} - */ + @Override public void linkingFocusGained(LinkedPosition position, LinkedModeUITarget target) { } @@ -210,15 +206,18 @@ public class LinkedModeUI { * Listens for state changes in the model. */ private final class ExitListener implements ILinkedModeListener { + @Override public void left(LinkedModeModel model, int flags) { leave(ILinkedModeListener.EXIT_ALL | flags); } + @Override public void suspend(LinkedModeModel model) { disconnect(); redraw(); } + @Override public void resume(LinkedModeModel model, int flags) { if ((flags & ILinkedModeListener.EXIT_ALL) != 0) { leave(flags); @@ -283,9 +282,7 @@ public class LinkedModeUI { * A NullObject implementation of <code>IExitPolicy</code>. */ private static class NullExitPolicy implements IExitPolicy { - /* - * @see org.eclipse.jdt.internal.ui.text.link2.LinkedModeUI.IExitPolicy#doExit(org.eclipse.swt.events.VerifyEvent, int, int) - */ + @Override public ExitFlags doExit(LinkedModeModel model, VerifyEvent event, int offset, int length) { return null; } @@ -296,13 +293,16 @@ public class LinkedModeUI { */ private class Closer implements ShellListener, ITextInputListener { + @Override public void shellActivated(ShellEvent e) { } + @Override public void shellClosed(ShellEvent e) { leave(ILinkedModeListener.EXIT_ALL); } + @Override public void shellDeactivated(ShellEvent e) { // TODO re-enable after debugging // if (true) return; @@ -335,6 +335,7 @@ public class LinkedModeUI { { // Post in UI thread since the assistant popup will only get the focus after we lose it. display.asyncExec(new Runnable() { + @Override public void run() { if (fIsActive && viewer instanceof IEditingSupportRegistry) { IEditingSupport[] helpers= ((IEditingSupportRegistry) viewer).getRegisteredSupports(); @@ -352,23 +353,21 @@ public class LinkedModeUI { } } + @Override public void shellDeiconified(ShellEvent e) { } + @Override public void shellIconified(ShellEvent e) { leave(ILinkedModeListener.EXIT_ALL); } - /* - * @see org.eclipse.jface.text.ITextInputListener#inputDocumentAboutToBeChanged(org.eclipse.jface.text.IDocument, org.eclipse.jface.text.IDocument) - */ + @Override public void inputDocumentAboutToBeChanged(IDocument oldInput, IDocument newInput) { leave(ILinkedModeListener.EXIT_ALL); } - /* - * @see org.eclipse.jface.text.ITextInputListener#inputDocumentChanged(org.eclipse.jface.text.IDocument, org.eclipse.jface.text.IDocument) - */ + @Override public void inputDocumentChanged(IDocument oldInput, IDocument newInput) { } @@ -378,9 +377,7 @@ public class LinkedModeUI { * @since 3.1 */ private class DocumentListener implements IDocumentListener { - /* - * @see org.eclipse.jface.text.IDocumentListener#documentAboutToBeChanged(org.eclipse.jface.text.DocumentEvent) - */ + @Override public void documentAboutToBeChanged(DocumentEvent event) { // default behavior: any document change outside a linked position @@ -407,9 +404,7 @@ public class LinkedModeUI { } - /* - * @see org.eclipse.jface.text.IDocumentListener#documentChanged(org.eclipse.jface.text.DocumentEvent) - */ + @Override public void documentChanged(DocumentEvent event) { } } @@ -422,6 +417,7 @@ public class LinkedModeUI { private boolean fIsEnabled= true; + @Override public void verifyKey(VerifyEvent event) { if (!event.doit || !fIsEnabled) @@ -528,9 +524,7 @@ public class LinkedModeUI { */ private class MySelectionListener implements ISelectionChangedListener { - /* - * @see org.eclipse.jface.viewers.ISelectionChangedListener#selectionChanged(org.eclipse.jface.viewers.SelectionChangedEvent) - */ + @Override public void selectionChanged(SelectionChangedEvent event) { ISelection selection= event.getSelection(); if (selection instanceof ITextSelection) { @@ -558,9 +552,7 @@ public class LinkedModeUI { private class ProposalListener implements IProposalListener { - /* - * @see org.eclipse.jface.internal.text.link.contentassist.IProposalListener#proposalChosen(org.eclipse.jface.text.contentassist.ICompletionProposal) - */ + @Override public void proposalChosen(ICompletionProposal proposal) { next(); } @@ -617,9 +609,7 @@ public class LinkedModeUI { private ILinkedModeUIFocusListener fPositionListener= new EmtpyFocusListener(); private IAutoEditStrategy fAutoEditVetoer= new IAutoEditStrategy() { - /* - * @see org.eclipse.jface.text.IAutoEditStrategy#customizeDocumentCommand(org.eclipse.jface.text.IDocument, org.eclipse.jface.text.DocumentCommand) - */ + @Override public void customizeDocumentCommand(IDocument document, DocumentCommand command) { // invalidate the change to ensure that the change is performed on the document only. if (fModel.anyPositionContains(command.offset)) { @@ -982,6 +972,7 @@ public class LinkedModeUI { // See https://bugs.eclipse.org/bugs/show_bug.cgi?id=132263 widget.getDisplay().asyncExec(new Runnable() { + @Override public void run() { if (!widget.isDisposed()) try { @@ -1168,6 +1159,7 @@ public class LinkedModeUI { fModel.stopForwarding(flags); Runnable runnable= new Runnable() { + @Override public void run() { if (fExitPosition != null) fExitPosition.getDocument().removePosition(fExitPosition); diff --git a/org.eclipse.jface.text/src/org/eclipse/jface/text/link/LinkedPositionAnnotations.java b/org.eclipse.jface.text/src/org/eclipse/jface/text/link/LinkedPositionAnnotations.java index 32609cd84e2..b379b88ca4c 100644 --- a/org.eclipse.jface.text/src/org/eclipse/jface/text/link/LinkedPositionAnnotations.java +++ b/org.eclipse.jface.text/src/org/eclipse/jface/text/link/LinkedPositionAnnotations.java @@ -251,25 +251,19 @@ final class LinkedPositionAnnotations extends AnnotationModel { fExitPosition = position; } - /* - * @see org.eclipse.jface.text.source.AnnotationModel#addPosition(org.eclipse.jface.text.IDocument, org.eclipse.jface.text.Position) - */ + @Override protected void addPosition(IDocument document, Position position) { // don't to anything as our positions are managed by custom // position updaters } - /* - * @see org.eclipse.jface.text.source.AnnotationModel#removePosition(org.eclipse.jface.text.IDocument, org.eclipse.jface.text.Position) - */ + @Override protected void removePosition(IDocument document, Position pos) { // don't to anything as our positions are managed by custom // position updaters } - /* - * @see org.eclipse.jface.text.source.AnnotationModel#fireModelChanged() - */ + @Override public void fireModelChanged() { super.fireModelChanged(); } diff --git a/org.eclipse.jface.text/src/org/eclipse/jface/text/link/ProposalPosition.java b/org.eclipse.jface.text/src/org/eclipse/jface/text/link/ProposalPosition.java index 2c93ff16627..e8b9e09c945 100644 --- a/org.eclipse.jface.text/src/org/eclipse/jface/text/link/ProposalPosition.java +++ b/org.eclipse.jface.text/src/org/eclipse/jface/text/link/ProposalPosition.java @@ -69,9 +69,7 @@ public class ProposalPosition extends LinkedPosition { return null; } - /* - * @see java.lang.Object#equals(java.lang.Object) - */ + @Override public boolean equals(Object o) { if (o instanceof ProposalPosition) { if (super.equals(o)) { @@ -92,9 +90,7 @@ public class ProposalPosition extends LinkedPosition { return fProposals; } - /* - * @see org.eclipse.jdt.internal.ui.text.link.LinkedPosition#hashCode() - */ + @Override public int hashCode() { return super.hashCode() | (fProposals == null ? 0 : fProposals.hashCode()); } diff --git a/org.eclipse.jface.text/src/org/eclipse/jface/text/link/TabStopIterator.java b/org.eclipse.jface.text/src/org/eclipse/jface/text/link/TabStopIterator.java index 3300e8e11f2..e45acee3371 100644 --- a/org.eclipse.jface.text/src/org/eclipse/jface/text/link/TabStopIterator.java +++ b/org.eclipse.jface.text/src/org/eclipse/jface/text/link/TabStopIterator.java @@ -44,6 +44,7 @@ class TabStopIterator { * <p><code>o1</code> and <code>o2</code> are required to be instances * of <code>LinkedPosition</code>.</p> */ + @Override public int compare(Object o1, Object o2) { LinkedPosition p1= (LinkedPosition)o1; LinkedPosition p2= (LinkedPosition)o2; diff --git a/org.eclipse.jface.text/src/org/eclipse/jface/text/presentation/PresentationReconciler.java b/org.eclipse.jface.text/src/org/eclipse/jface/text/presentation/PresentationReconciler.java index a4d963820e7..d530446456b 100644 --- a/org.eclipse.jface.text/src/org/eclipse/jface/text/presentation/PresentationReconciler.java +++ b/org.eclipse.jface.text/src/org/eclipse/jface/text/presentation/PresentationReconciler.java @@ -77,9 +77,7 @@ public class PresentationReconciler implements IPresentationReconciler, IPresent */ private boolean fCachedRedrawState= true; - /* - * @see ITextInputListener#inputDocumentAboutToBeChanged(IDocument, IDocument) - */ + @Override public void inputDocumentAboutToBeChanged(IDocument oldDocument, IDocument newDocument) { if (oldDocument != null) { try { @@ -100,6 +98,7 @@ public class PresentationReconciler implements IPresentationReconciler, IPresent /* * @see ITextInputListener#inputDocumenChanged(IDocument, IDocument) */ + @Override public void inputDocumentChanged(IDocument oldDocument, IDocument newDocument) { fDocumentChanging= false; @@ -120,9 +119,7 @@ public class PresentationReconciler implements IPresentationReconciler, IPresent } } - /* - * @see IDocumentPartitioningListener#documentPartitioningChanged(IDocument) - */ + @Override public void documentPartitioningChanged(IDocument document) { if (!fDocumentChanging && fCachedRedrawState) processDamage(new Region(0, document.getLength()), document); @@ -130,10 +127,7 @@ public class PresentationReconciler implements IPresentationReconciler, IPresent fDocumentPartitioningChanged= true; } - /* - * @see IDocumentPartitioningListenerExtension#documentPartitioningChanged(IDocument, IRegion) - * @since 2.0 - */ + @Override public void documentPartitioningChanged(IDocument document, IRegion changedRegion) { if (!fDocumentChanging && fCachedRedrawState) { processDamage(new Region(changedRegion.getOffset(), changedRegion.getLength()), document); @@ -143,19 +137,14 @@ public class PresentationReconciler implements IPresentationReconciler, IPresent } } - /* - * @see org.eclipse.jface.text.IDocumentPartitioningListenerExtension2#documentPartitioningChanged(org.eclipse.jface.text.DocumentPartitioningChangedEvent) - * @since 3.0 - */ + @Override public void documentPartitioningChanged(DocumentPartitioningChangedEvent event) { IRegion changedRegion= event.getChangedRegion(getDocumentPartitioning()); if (changedRegion != null) documentPartitioningChanged(event.getDocument(), changedRegion); } - /* - * @see IDocumentListener#documentAboutToBeChanged(DocumentEvent) - */ + @Override public void documentAboutToBeChanged(DocumentEvent e) { fDocumentChanging= true; @@ -173,9 +162,7 @@ public class PresentationReconciler implements IPresentationReconciler, IPresent } } - /* - * @see IDocumentListener#documentChanged(DocumentEvent) - */ + @Override public void documentChanged(DocumentEvent e) { if (fCachedRedrawState) { try { @@ -187,9 +174,7 @@ public class PresentationReconciler implements IPresentationReconciler, IPresent fDocumentChanging= false; } - /* - * @see ITextListener#textChanged(TextEvent) - */ + @Override public void textChanged(TextEvent e) { fCachedRedrawState= e.getViewerRedrawState(); @@ -305,6 +290,7 @@ public class PresentationReconciler implements IPresentationReconciler, IPresent * @see org.eclipse.jface.text.presentation.IPresentationReconcilerExtension#geDocumenttPartitioning() * @since 3.0 */ + @Override public String getDocumentPartitioning() { return fPartitioning; } @@ -351,9 +337,7 @@ public class PresentationReconciler implements IPresentationReconciler, IPresent fRepairers.put(contentType, repairer); } - /* - * @see IPresentationReconciler#install(ITextViewer) - */ + @Override public void install(ITextViewer viewer) { Assert.isNotNull(viewer); @@ -365,9 +349,7 @@ public class PresentationReconciler implements IPresentationReconciler, IPresent fInternalListener.inputDocumentChanged(null, document); } - /* - * @see IPresentationReconciler#uninstall() - */ + @Override public void uninstall() { fViewer.removeTextInputListener(fInternalListener); @@ -375,9 +357,7 @@ public class PresentationReconciler implements IPresentationReconciler, IPresent fInternalListener.inputDocumentAboutToBeChanged(fViewer.getDocument(), null); } - /* - * @see IPresentationReconciler#getDamager(String) - */ + @Override public IPresentationDamager getDamager(String contentType) { if (fDamagers == null) @@ -386,9 +366,7 @@ public class PresentationReconciler implements IPresentationReconciler, IPresent return (IPresentationDamager) fDamagers.get(contentType); } - /* - * @see IPresentationReconciler#getRepairer(String) - */ + @Override public IPresentationRepairer getRepairer(String contentType) { if (fRepairers == null) diff --git a/org.eclipse.jface.text/src/org/eclipse/jface/text/quickassist/QuickAssistAssistant.java b/org.eclipse.jface.text/src/org/eclipse/jface/text/quickassist/QuickAssistAssistant.java index 598d1851449..3f74c5baa27 100644 --- a/org.eclipse.jface.text/src/org/eclipse/jface/text/quickassist/QuickAssistAssistant.java +++ b/org.eclipse.jface.text/src/org/eclipse/jface/text/quickassist/QuickAssistAssistant.java @@ -39,17 +39,12 @@ public class QuickAssistAssistant implements IQuickAssistAssistant, IQuickAssist private static final class QuickAssistAssistantImpl extends ContentAssistant { - /* - * @see org.eclipse.jface.text.contentassist.ContentAssistant#possibleCompletionsClosed() - */ + @Override public void possibleCompletionsClosed() { super.possibleCompletionsClosed(); } - /* - * @see org.eclipse.jface.text.contentassist.ContentAssistant#hide() - * @since 3.4 - */ + @Override protected void hide() { super.hide(); } @@ -64,9 +59,7 @@ public class QuickAssistAssistant implements IQuickAssistAssistant, IQuickAssist fQuickAssistProcessor= processor; } - /* - * @see org.eclipse.jface.text.contentassist.IContentAssistProcessor#computeCompletionProposals(org.eclipse.jface.text.ITextViewer, int) - */ + @Override public ICompletionProposal[] computeCompletionProposals(ITextViewer viewer, int offset) { // panic code - should not happen if (!(viewer instanceof ISourceViewer)) @@ -75,37 +68,27 @@ public class QuickAssistAssistant implements IQuickAssistAssistant, IQuickAssist return fQuickAssistProcessor.computeQuickAssistProposals(new TextInvocationContext((ISourceViewer)viewer, offset, -1)); } - /* - * @see org.eclipse.jface.text.contentassist.IContentAssistProcessor#computeContextInformation(org.eclipse.jface.text.ITextViewer, int) - */ + @Override public IContextInformation[] computeContextInformation(ITextViewer viewer, int offset) { return null; } - /* - * @see org.eclipse.jface.text.contentassist.IContentAssistProcessor#getCompletionProposalAutoActivationCharacters() - */ + @Override public char[] getCompletionProposalAutoActivationCharacters() { return null; } - /* - * @see org.eclipse.jface.text.contentassist.IContentAssistProcessor#getContextInformationAutoActivationCharacters() - */ + @Override public char[] getContextInformationAutoActivationCharacters() { return null; } - /* - * @see org.eclipse.jface.text.contentassist.IContentAssistProcessor#getErrorMessage() - */ + @Override public String getErrorMessage() { return null; } - /* - * @see org.eclipse.jface.text.contentassist.IContentAssistProcessor#getContextInformationValidator() - */ + @Override public IContextInformationValidator getContextInformationValidator() { return null; } @@ -121,74 +104,54 @@ public class QuickAssistAssistant implements IQuickAssistAssistant, IQuickAssist fQuickAssistAssistantImpl.enableAutoInsert(false); } - /* - * @see org.eclipse.jface.text.quickassist.IQuickAssistAssistant#showPossibleQuickAssists() - */ + @Override public String showPossibleQuickAssists() { return fQuickAssistAssistantImpl.showPossibleCompletions(); } - /* - * @see org.eclipse.jface.text.quickassist.IQuickAssistAssistant#getQuickAssistProcessor(java.lang.String) - */ + @Override public IQuickAssistProcessor getQuickAssistProcessor() { return fQuickAssistProcessor; } - /* - * @see org.eclipse.jface.text.quickassist.IQuickAssistAssistant#setQuickAssistProcessor(org.eclipse.jface.text.quickassist.IQuickAssistProcessor) - */ + @Override public void setQuickAssistProcessor(IQuickAssistProcessor processor) { fQuickAssistProcessor= processor; fQuickAssistAssistantImpl.setDocumentPartitioning("__" + getClass().getName() + "_partitioning"); //$NON-NLS-1$ //$NON-NLS-2$ fQuickAssistAssistantImpl.setContentAssistProcessor(new ContentAssistProcessor(processor), IDocument.DEFAULT_CONTENT_TYPE); } - /* - * @see org.eclipse.jface.text.quickassist.IQuickAssistAssistant#canFix(org.eclipse.jface.text.source.Annotation) - */ + @Override public boolean canFix(Annotation annotation) { return fQuickAssistProcessor != null && fQuickAssistProcessor.canFix(annotation); } - /* - * @see org.eclipse.jface.text.quickassist.IQuickAssistAssistant#canAssist(org.eclipse.jface.text.quickassist.IQuickAssistInvocationContext) - */ + @Override public boolean canAssist(IQuickAssistInvocationContext invocationContext) { return fQuickAssistProcessor != null && fQuickAssistProcessor.canAssist(invocationContext); } - /* - * @see org.eclipse.jface.text.quickassist.IQuickAssistAssistant#install(org.eclipse.jface.text.ITextViewer) - */ + @Override public void install(ISourceViewer sourceViewer) { fQuickAssistAssistantImpl.install(sourceViewer); } - /* - * @see org.eclipse.jface.text.quickassist.IQuickAssistAssistant#setInformationControlCreator(org.eclipse.jface.text.IInformationControlCreator) - */ + @Override public void setInformationControlCreator(IInformationControlCreator creator) { fQuickAssistAssistantImpl.setInformationControlCreator(creator); } - /* - * @see org.eclipse.jface.text.quickassist.IQuickAssistAssistant#uninstall() - */ + @Override public void uninstall() { fQuickAssistAssistantImpl.uninstall(); } - /* - * @see org.eclipse.jface.text.quickassist.IQuickAssistAssistant#setProposalSelectorBackground(org.eclipse.swt.graphics.Color) - */ + @Override public void setProposalSelectorBackground(Color background) { fQuickAssistAssistantImpl.setProposalSelectorBackground(background); } - /* - * @see org.eclipse.jface.text.quickassist.IQuickAssistAssistant#setProposalSelectorForeground(org.eclipse.swt.graphics.Color) - */ + @Override public void setProposalSelectorForeground(Color foreground) { fQuickAssistAssistantImpl.setProposalSelectorForeground(foreground); } @@ -225,31 +188,23 @@ public class QuickAssistAssistant implements IQuickAssistAssistant, IQuickAssist fQuickAssistAssistantImpl.possibleCompletionsClosed(); } - /* - * @see org.eclipse.jface.text.quickassist.IQuickAssistAssistant#addCompletionListener(org.eclipse.jface.text.contentassist.ICompletionListener) - */ + @Override public void addCompletionListener(ICompletionListener listener) { fQuickAssistAssistantImpl.addCompletionListener(listener); } - /* - * @see org.eclipse.jface.text.quickassist.IQuickAssistAssistant#removeCompletionListener(org.eclipse.jface.text.contentassist.ICompletionListener) - */ + @Override public void removeCompletionListener(ICompletionListener listener) { fQuickAssistAssistantImpl.removeCompletionListener(listener); } - /* - * @see org.eclipse.jface.text.quickassist.IQuickAssistAssistant#setStatusLineVisible(boolean) - */ + @Override public void setStatusLineVisible(boolean show) { fQuickAssistAssistantImpl.setStatusLineVisible(show); } - /* - * @see org.eclipse.jface.text.quickassist.IQuickAssistAssistant#setStatusMessage(java.lang.String) - */ + @Override public void setStatusMessage(String message) { fQuickAssistAssistantImpl.setStatusMessage(message); } @@ -259,6 +214,7 @@ public class QuickAssistAssistant implements IQuickAssistAssistant, IQuickAssist * * @since 3.4 */ + @Override public final IHandler getHandler(String commandId) { return fQuickAssistAssistantImpl.getHandler(commandId); } @@ -277,6 +233,7 @@ public class QuickAssistAssistant implements IQuickAssistAssistant, IQuickAssist * * @since 3.4 */ + @Override public void enableColoredLabels(boolean isEnabled) { fQuickAssistAssistantImpl.enableColoredLabels(isEnabled); } diff --git a/org.eclipse.jface.text/src/org/eclipse/jface/text/reconciler/AbstractReconcileStep.java b/org.eclipse.jface.text/src/org/eclipse/jface/text/reconciler/AbstractReconcileStep.java index eae51bcc9b1..111607fd63d 100644 --- a/org.eclipse.jface.text/src/org/eclipse/jface/text/reconciler/AbstractReconcileStep.java +++ b/org.eclipse.jface.text/src/org/eclipse/jface/text/reconciler/AbstractReconcileStep.java @@ -50,17 +50,17 @@ public abstract class AbstractReconcileStep implements IReconcileStep { public AbstractReconcileStep() { } + @Override public boolean isLastStep() { return fNextStep == null; } + @Override public boolean isFirstStep() { return fPreviousStep == null; } - /* - * @see org.eclipse.text.reconcilerpipe.IReconcilerResultCollector#setProgressMonitor(org.eclipse.core.runtime.IProgressMonitor) - */ + @Override public void setProgressMonitor(IProgressMonitor monitor) { fProgressMonitor= monitor; @@ -68,16 +68,12 @@ public abstract class AbstractReconcileStep implements IReconcileStep { fNextStep.setProgressMonitor(monitor); } - /* - * @see org.eclipse.jface.text.reconciler.IReconcileStep#getProgressMonitor() - */ + @Override public IProgressMonitor getProgressMonitor() { return fProgressMonitor; } - /* - * @see IReconcileStep#reconcile(IRegion) - */ + @Override public final IReconcileResult[] reconcile(IRegion partition) { IReconcileResult[] result= reconcileModel(null, partition); if (!isLastStep()) { @@ -88,9 +84,7 @@ public abstract class AbstractReconcileStep implements IReconcileStep { return result; } - /* - * @see IReconcileStep#reconcile(org.eclipse.jface.text.reconciler.DirtyRegion, org.eclipse.jface.text.IRegion) - */ + @Override public final IReconcileResult[] reconcile(DirtyRegion dirtyRegion, IRegion subRegion) { IReconcileResult[] result= reconcileModel(dirtyRegion, subRegion); if (!isLastStep()) { @@ -150,18 +144,14 @@ public abstract class AbstractReconcileStep implements IReconcileStep { return fProgressMonitor != null && fProgressMonitor.isCanceled(); } - /* - * @see IReconcileStep#setPreviousStep(IReconcileStep) - */ + @Override public void setPreviousStep(IReconcileStep step) { Assert.isNotNull(step); Assert.isTrue(fPreviousStep == null); fPreviousStep= step; } - /* - * @see IReconcileStep#setInputModel(Object) - */ + @Override public void setInputModel(IReconcilableModel inputModel) { fInputModel= inputModel; diff --git a/org.eclipse.jface.text/src/org/eclipse/jface/text/reconciler/AbstractReconciler.java b/org.eclipse.jface.text/src/org/eclipse/jface/text/reconciler/AbstractReconciler.java index 1965ba17a85..b1f22441578 100644 --- a/org.eclipse.jface.text/src/org/eclipse/jface/text/reconciler/AbstractReconciler.java +++ b/org.eclipse.jface.text/src/org/eclipse/jface/text/reconciler/AbstractReconciler.java @@ -158,6 +158,7 @@ abstract public class AbstractReconciler implements IReconciler { * Calls {@link AbstractReconciler#initialProcess()} on entrance. * </p> */ + @Override public void run() { synchronized (fDirtyRegionQueue) { @@ -224,15 +225,11 @@ abstract public class AbstractReconciler implements IReconciler { */ class Listener implements IDocumentListener, ITextInputListener { - /* - * @see IDocumentListener#documentAboutToBeChanged(DocumentEvent) - */ + @Override public void documentAboutToBeChanged(DocumentEvent e) { } - /* - * @see IDocumentListener#documentChanged(DocumentEvent) - */ + @Override public void documentChanged(DocumentEvent e) { if (fThread.isActive() || !fThread.isDirty() && fThread.isAlive()) { @@ -255,9 +252,7 @@ abstract public class AbstractReconciler implements IReconciler { } - /* - * @see ITextInputListener#inputDocumentAboutToBeChanged(IDocument, IDocument) - */ + @Override public void inputDocumentAboutToBeChanged(IDocument oldInput, IDocument newInput) { if (oldInput == fDocument) { @@ -281,9 +276,7 @@ abstract public class AbstractReconciler implements IReconciler { } } - /* - * @see ITextInputListener#inputDocumentChanged(IDocument, IDocument) - */ + @Override public void inputDocumentChanged(IDocument oldInput, IDocument newInput) { fDocument= newInput; @@ -445,9 +438,7 @@ abstract public class AbstractReconciler implements IReconciler { return fProgressMonitor; } - /* - * @see IReconciler#install(ITextViewer) - */ + @Override public void install(ITextViewer textViewer) { Assert.isNotNull(textViewer); @@ -477,9 +468,7 @@ abstract public class AbstractReconciler implements IReconciler { } } - /* - * @see IReconciler#uninstall() - */ + @Override public void uninstall() { if (fListener != null) { diff --git a/org.eclipse.jface.text/src/org/eclipse/jface/text/reconciler/DirtyRegion.java b/org.eclipse.jface.text/src/org/eclipse/jface/text/reconciler/DirtyRegion.java index 83b07ac530a..46483feba3b 100644 --- a/org.eclipse.jface.text/src/org/eclipse/jface/text/reconciler/DirtyRegion.java +++ b/org.eclipse.jface.text/src/org/eclipse/jface/text/reconciler/DirtyRegion.java @@ -67,16 +67,12 @@ public class DirtyRegion implements ITypedRegion { return null; } - /* - * @see ITypedRegion#getOffset() - */ + @Override public int getOffset() { return fOffset; } - /* - * @see ITypedRegion#getLength() - */ + @Override public int getLength() { return fLength; } @@ -84,6 +80,7 @@ public class DirtyRegion implements ITypedRegion { /* * @see ITypedRegion#getType */ + @Override public String getType() { return fType; } diff --git a/org.eclipse.jface.text/src/org/eclipse/jface/text/reconciler/MonoReconciler.java b/org.eclipse.jface.text/src/org/eclipse/jface/text/reconciler/MonoReconciler.java index 13e1ec97e41..b01185404ae 100644 --- a/org.eclipse.jface.text/src/org/eclipse/jface/text/reconciler/MonoReconciler.java +++ b/org.eclipse.jface.text/src/org/eclipse/jface/text/reconciler/MonoReconciler.java @@ -56,17 +56,13 @@ public class MonoReconciler extends AbstractReconciler { setIsIncrementalReconciler(isIncremental); } - /* - * @see IReconciler#getReconcilingStrategy(String) - */ + @Override public IReconcilingStrategy getReconcilingStrategy(String contentType) { Assert.isNotNull(contentType); return fStrategy; } - /* - * @see AbstractReconciler#process(DirtyRegion) - */ + @Override protected void process(DirtyRegion dirtyRegion) { if(dirtyRegion != null) @@ -78,16 +74,12 @@ public class MonoReconciler extends AbstractReconciler { } } - /* - * @see AbstractReconciler#reconcilerDocumentChanged(IDocument) - */ + @Override protected void reconcilerDocumentChanged(IDocument document) { fStrategy.setDocument(document); } - /* - * @see AbstractReconciler#setProgressMonitor(IProgressMonitor) - */ + @Override public void setProgressMonitor(IProgressMonitor monitor) { super.setProgressMonitor(monitor); if (fStrategy instanceof IReconcilingStrategyExtension) { @@ -96,9 +88,7 @@ public class MonoReconciler extends AbstractReconciler { } } - /* - * @see AbstractReconciler#initialProcess() - */ + @Override protected void initialProcess() { if (fStrategy instanceof IReconcilingStrategyExtension) { IReconcilingStrategyExtension extension= (IReconcilingStrategyExtension) fStrategy; diff --git a/org.eclipse.jface.text/src/org/eclipse/jface/text/reconciler/Reconciler.java b/org.eclipse.jface.text/src/org/eclipse/jface/text/reconciler/Reconciler.java index 0e0046d3aa7..4ff26dd2238 100644 --- a/org.eclipse.jface.text/src/org/eclipse/jface/text/reconciler/Reconciler.java +++ b/org.eclipse.jface.text/src/org/eclipse/jface/text/reconciler/Reconciler.java @@ -74,10 +74,7 @@ public class Reconciler extends AbstractReconciler implements IReconcilerExtensi fPartitioning= partitioning; } - /* - * @see org.eclipse.jface.text.reconciler.IReconcilerExtension#getDocumentPartitioning() - * @since 3.0 - */ + @Override public String getDocumentPartitioning() { return fPartitioning; } @@ -108,9 +105,7 @@ public class Reconciler extends AbstractReconciler implements IReconcilerExtensi } } - /* - * @see IReconciler#getReconcilingStrategy(String) - */ + @Override public IReconcilingStrategy getReconcilingStrategy(String contentType) { Assert.isNotNull(contentType); @@ -130,6 +125,7 @@ public class Reconciler extends AbstractReconciler implements IReconcilerExtensi * @param dirtyRegion the dirty region to be processed * @see AbstractReconciler#process(DirtyRegion) */ + @Override protected void process(DirtyRegion dirtyRegion) { IRegion region= dirtyRegion; @@ -152,10 +148,7 @@ public class Reconciler extends AbstractReconciler implements IReconcilerExtensi } } - /* - * @see AbstractReconciler#reconcilerDocumentChanged(IDocument) - * @since 2.0 - */ + @Override protected void reconcilerDocumentChanged(IDocument document) { if (fStrategies != null) { Iterator e= fStrategies.values().iterator(); @@ -166,10 +159,7 @@ public class Reconciler extends AbstractReconciler implements IReconcilerExtensi } } - /* - * @see AbstractReconciler#setProgressMonitor(IProgressMonitor) - * @since 2.0 - */ + @Override public void setProgressMonitor(IProgressMonitor monitor) { super.setProgressMonitor(monitor); @@ -185,10 +175,7 @@ public class Reconciler extends AbstractReconciler implements IReconcilerExtensi } } - /* - * @see AbstractReconciler#initialProcess() - * @since 2.0 - */ + @Override protected void initialProcess() { ITypedRegion[] regions= computePartitioning(0, getDocument().getLength()); List contentTypes= new ArrayList(regions.length); diff --git a/org.eclipse.jface.text/src/org/eclipse/jface/text/revisions/Revision.java b/org.eclipse.jface.text/src/org/eclipse/jface/text/revisions/Revision.java index dbb1395e013..9765150f933 100644 --- a/org.eclipse.jface.text/src/org/eclipse/jface/text/revisions/Revision.java +++ b/org.eclipse.jface.text/src/org/eclipse/jface/text/revisions/Revision.java @@ -141,9 +141,7 @@ public abstract class Revision { */ public abstract Date getDate(); - /* - * @see java.lang.Object#toString() - */ + @Override public String toString() { return "Revision " + getId(); //$NON-NLS-1$ } diff --git a/org.eclipse.jface.text/src/org/eclipse/jface/text/revisions/RevisionInformation.java b/org.eclipse.jface.text/src/org/eclipse/jface/text/revisions/RevisionInformation.java index 99140ca62ed..42f04a2bed8 100644 --- a/org.eclipse.jface.text/src/org/eclipse/jface/text/revisions/RevisionInformation.java +++ b/org.eclipse.jface.text/src/org/eclipse/jface/text/revisions/RevisionInformation.java @@ -105,6 +105,7 @@ public final class RevisionInformation implements ITextHoverExtension, IInformat // sort by start line Collections.sort(ranges, new Comparator() { + @Override public int compare(Object o1, Object o2) { RevisionRange r1= (RevisionRange) o1; RevisionRange r2= (RevisionRange) o2; @@ -133,10 +134,7 @@ public final class RevisionInformation implements ITextHoverExtension, IInformat ((Revision) revisions.next()).applyDiff(hunks); } - /* - * @see org.eclipse.jface.text.ITextHoverExtension#getHoverControlCreator() - * @since 3.3 - */ + @Override public IInformationControlCreator getHoverControlCreator() { return fHoverControlCreator; } @@ -146,6 +144,7 @@ public final class RevisionInformation implements ITextHoverExtension, IInformat * @return the information control creator or <code>null</code> * @since 3.3 */ + @Override public IInformationControlCreator getInformationPresenterControlCreator() { return fInformationPresenterControlCreator; } diff --git a/org.eclipse.jface.text/src/org/eclipse/jface/text/revisions/RevisionRange.java b/org.eclipse.jface.text/src/org/eclipse/jface/text/revisions/RevisionRange.java index c2a05a24ce6..8a67d5d476f 100644 --- a/org.eclipse.jface.text/src/org/eclipse/jface/text/revisions/RevisionRange.java +++ b/org.eclipse.jface.text/src/org/eclipse/jface/text/revisions/RevisionRange.java @@ -42,23 +42,17 @@ public final class RevisionRange implements ILineRange { return fRevision; } - /* - * @see org.eclipse.jface.text.source.ILineRange#getStartLine() - */ + @Override public int getStartLine() { return fStartLine; } - /* - * @see org.eclipse.jface.text.source.ILineRange#getNumberOfLines() - */ + @Override public int getNumberOfLines() { return fNumberOfLines; } - /* - * @see java.lang.Object#toString() - */ + @Override public String toString() { return "RevisionRange [" + fRevision.toString() + ", [" + getStartLine() + "+" + getNumberOfLines() + ")]"; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ } diff --git a/org.eclipse.jface.text/src/org/eclipse/jface/text/rules/BufferedRuleBasedScanner.java b/org.eclipse.jface.text/src/org/eclipse/jface/text/rules/BufferedRuleBasedScanner.java index 6f804a832b2..1b7762261e1 100644 --- a/org.eclipse.jface.text/src/org/eclipse/jface/text/rules/BufferedRuleBasedScanner.java +++ b/org.eclipse.jface.text/src/org/eclipse/jface/text/rules/BufferedRuleBasedScanner.java @@ -90,9 +90,7 @@ public class BufferedRuleBasedScanner extends RuleBasedScanner { } } - /* - * @see RuleBasedScanner#setRange(IDocument, int, int) - */ + @Override public void setRange(IDocument document, int offset, int length) { super.setRange(document, offset, length); @@ -101,9 +99,7 @@ public class BufferedRuleBasedScanner extends RuleBasedScanner { shiftBuffer(offset); } - /* - * @see RuleBasedScanner#read() - */ + @Override public int read() { fColumn= UNDEFINED; if (fOffset >= fRangeEnd) { @@ -119,9 +115,7 @@ public class BufferedRuleBasedScanner extends RuleBasedScanner { return fBuffer[fOffset++ - fStart]; } - /* - * @see RuleBasedScanner#unread() - */ + @Override public void unread() { if (fOffset == fStart) diff --git a/org.eclipse.jface.text/src/org/eclipse/jface/text/rules/DefaultDamagerRepairer.java b/org.eclipse.jface.text/src/org/eclipse/jface/text/rules/DefaultDamagerRepairer.java index 6f9bc723b64..578cee27034 100644 --- a/org.eclipse.jface.text/src/org/eclipse/jface/text/rules/DefaultDamagerRepairer.java +++ b/org.eclipse.jface.text/src/org/eclipse/jface/text/rules/DefaultDamagerRepairer.java @@ -58,6 +58,7 @@ public class DefaultDamagerRepairer implements IPresentationDamager, IPresentati * * @deprecated use DefaultDamagerRepairer(ITokenScanner) instead */ + @Deprecated public DefaultDamagerRepairer(ITokenScanner scanner, TextAttribute defaultTextAttribute) { Assert.isNotNull(defaultTextAttribute); @@ -84,6 +85,7 @@ public class DefaultDamagerRepairer implements IPresentationDamager, IPresentati * @see IPresentationDamager#setDocument(IDocument) * @see IPresentationRepairer#setDocument(IDocument) */ + @Override public void setDocument(IDocument document) { fDocument= document; } @@ -124,6 +126,7 @@ public class DefaultDamagerRepairer implements IPresentationDamager, IPresentati * clipped by the given partition. If there was a partitioning change then the whole * partition is returned. */ + @Override public IRegion getDamageRegion(ITypedRegion partition, DocumentEvent e, boolean documentPartitioningChanged) { if (!documentPartitioningChanged) { @@ -152,9 +155,7 @@ public class DefaultDamagerRepairer implements IPresentationDamager, IPresentati //---- IPresentationRepairer - /* - * @see IPresentationRepairer#createPresentation(TextPresentation, ITypedRegion) - */ + @Override public void createPresentation(TextPresentation presentation, ITypedRegion region) { if (fScanner == null) { diff --git a/org.eclipse.jface.text/src/org/eclipse/jface/text/rules/DefaultPartitioner.java b/org.eclipse.jface.text/src/org/eclipse/jface/text/rules/DefaultPartitioner.java index ad2ee9276ec..210e6bacddb 100644 --- a/org.eclipse.jface.text/src/org/eclipse/jface/text/rules/DefaultPartitioner.java +++ b/org.eclipse.jface.text/src/org/eclipse/jface/text/rules/DefaultPartitioner.java @@ -48,12 +48,14 @@ import org.eclipse.jface.text.TypedRegion; * @since 2.0 * @deprecated As of 3.1, replaced by {@link org.eclipse.jface.text.rules.FastPartitioner} instead */ +@Deprecated public class DefaultPartitioner implements IDocumentPartitioner, IDocumentPartitionerExtension, IDocumentPartitionerExtension2, IDocumentPartitionerExtension3 { /** * The position category this partitioner uses to store the document's partitioning information. * @deprecated As of 3.0, use <code>getManagingPositionCategories()</code> instead. */ + @Deprecated public final static String CONTENT_TYPES_CATEGORY= "__content_types_category"; //$NON-NLS-1$ @@ -103,25 +105,17 @@ public class DefaultPartitioner implements IDocumentPartitioner, IDocumentPartit fPositionUpdater= new DefaultPositionUpdater(fPositionCategory); } - /* - * @see org.eclipse.jface.text.IDocumentPartitionerExtension2#getManagingPositionCategories() - * @since 3.0 - */ + @Override public String[] getManagingPositionCategories() { return new String[] { fPositionCategory }; } - /* - * @see org.eclipse.jface.text.IDocumentPartitioner#connect(org.eclipse.jface.text.IDocument) - */ + @Override public void connect(IDocument document) { connect(document, false); } - /* - * @see org.eclipse.jface.text.IDocumentPartitionerExtension3#connect(org.eclipse.jface.text.IDocument, boolean) - * @since 3.1 - */ + @Override public void connect(IDocument document, boolean delayInitialization) { Assert.isNotNull(document); Assert.isTrue(!document.containsPositionCategory(fPositionCategory)); @@ -169,9 +163,7 @@ public class DefaultPartitioner implements IDocumentPartitioner, IDocumentPartit } } - /* - * @see IDocumentPartitioner#disconnect() - */ + @Override public void disconnect() { Assert.isTrue(fDocument.containsPositionCategory(fPositionCategory)); @@ -183,9 +175,7 @@ public class DefaultPartitioner implements IDocumentPartitioner, IDocumentPartit } } - /* - * @see IDocumentPartitioner#documentAboutToBeChanged(DocumentEvent) - */ + @Override public void documentAboutToBeChanged(DocumentEvent e) { if (fIsInitialized) { @@ -198,9 +188,7 @@ public class DefaultPartitioner implements IDocumentPartitioner, IDocumentPartit } } - /* - * @see IDocumentPartitioner#documentChanged(DocumentEvent) - */ + @Override public boolean documentChanged(DocumentEvent e) { if (fIsInitialized) { IRegion region= documentChanged2(e); @@ -262,10 +250,7 @@ public class DefaultPartitioner implements IDocumentPartitioner, IDocumentPartit } } - /* - * @see IDocumentPartitionerExtension#documentChanged2(DocumentEvent) - * @since 2.0 - */ + @Override public IRegion documentChanged2(DocumentEvent e) { if (!fIsInitialized) @@ -428,9 +413,7 @@ public class DefaultPartitioner implements IDocumentPartitioner, IDocumentPartit } - /* - * @see IDocumentPartitioner#getContentType(int) - */ + @Override public String getContentType(int offset) { checkInitialization(); @@ -441,9 +424,7 @@ public class DefaultPartitioner implements IDocumentPartitioner, IDocumentPartit return IDocument.DEFAULT_CONTENT_TYPE; } - /* - * @see IDocumentPartitioner#getPartition(int) - */ + @Override public ITypedRegion getPartition(int offset) { checkInitialization(); @@ -488,16 +469,12 @@ public class DefaultPartitioner implements IDocumentPartitioner, IDocumentPartit return new TypedRegion(0, fDocument.getLength(), IDocument.DEFAULT_CONTENT_TYPE); } - /* - * @see IDocumentPartitioner#computePartitioning(int, int) - */ + @Override public ITypedRegion[] computePartitioning(int offset, int length) { return computePartitioning(offset, length, false); } - /* - * @see IDocumentPartitioner#getLegalContentTypes() - */ + @Override public String[] getLegalContentTypes() { return TextUtilities.copy(fLegalContentTypes); } @@ -536,18 +513,12 @@ public class DefaultPartitioner implements IDocumentPartitioner, IDocumentPartit /* zero-length partition support */ - /* - * @see org.eclipse.jface.text.IDocumentPartitionerExtension2#getContentType(int) - * @since 3.0 - */ + @Override public String getContentType(int offset, boolean preferOpenPartitions) { return getPartition(offset, preferOpenPartitions).getType(); } - /* - * @see org.eclipse.jface.text.IDocumentPartitionerExtension2#getPartition(int) - * @since 3.0 - */ + @Override public ITypedRegion getPartition(int offset, boolean preferOpenPartitions) { ITypedRegion region= getPartition(offset); if (preferOpenPartitions) { @@ -563,10 +534,7 @@ public class DefaultPartitioner implements IDocumentPartitioner, IDocumentPartit return region; } - /* - * @see org.eclipse.jface.text.IDocumentPartitionerExtension2#computePartitioning(int, int, boolean) - * @since 3.0 - */ + @Override public ITypedRegion[] computePartitioning(int offset, int length, boolean includeZeroLengthPartitions) { checkInitialization(); List list= new ArrayList(); @@ -686,29 +654,20 @@ public class DefaultPartitioner implements IDocumentPartitioner, IDocumentPartit return j; } - /* - * @see org.eclipse.jface.text.IDocumentPartitionerExtension3#startRewriteSession(org.eclipse.jface.text.DocumentRewriteSession) - * @since 3.1 - */ + @Override public void startRewriteSession(DocumentRewriteSession session) throws IllegalStateException { if (fActiveRewriteSession != null) throw new IllegalStateException(); fActiveRewriteSession= session; } - /* - * @see org.eclipse.jface.text.IDocumentPartitionerExtension3#stopRewriteSession(org.eclipse.jface.text.DocumentRewriteSession) - * @since 3.1 - */ + @Override public void stopRewriteSession(DocumentRewriteSession session) { if (fActiveRewriteSession == session) flushRewriteSession(); } - /* - * @see org.eclipse.jface.text.IDocumentPartitionerExtension3#getActiveRewriteSession() - * @since 3.1 - */ + @Override public DocumentRewriteSession getActiveRewriteSession() { return fActiveRewriteSession; } diff --git a/org.eclipse.jface.text/src/org/eclipse/jface/text/rules/FastPartitioner.java b/org.eclipse.jface.text/src/org/eclipse/jface/text/rules/FastPartitioner.java index df08dd407ca..cb2937ec8a5 100644 --- a/org.eclipse.jface.text/src/org/eclipse/jface/text/rules/FastPartitioner.java +++ b/org.eclipse.jface.text/src/org/eclipse/jface/text/rules/FastPartitioner.java @@ -111,16 +111,12 @@ public class FastPartitioner implements IDocumentPartitioner, IDocumentPartition fPositionUpdater= new DefaultPositionUpdater(fPositionCategory); } - /* - * @see org.eclipse.jface.text.IDocumentPartitionerExtension2#getManagingPositionCategories() - */ + @Override public String[] getManagingPositionCategories() { return new String[] { fPositionCategory }; } - /* - * @see org.eclipse.jface.text.IDocumentPartitioner#connect(org.eclipse.jface.text.IDocument) - */ + @Override public final void connect(IDocument document) { connect(document, false); } @@ -131,6 +127,7 @@ public class FastPartitioner implements IDocumentPartitioner, IDocumentPartition * May be extended by subclasses. * </p> */ + @Override public void connect(IDocument document, boolean delayInitialization) { Assert.isNotNull(document); Assert.isTrue(!document.containsPositionCategory(fPositionCategory)); @@ -188,6 +185,7 @@ public class FastPartitioner implements IDocumentPartitioner, IDocumentPartition * May be extended by subclasses. * </p> */ + @Override public void disconnect() { Assert.isTrue(fDocument.containsPositionCategory(fPositionCategory)); @@ -205,6 +203,7 @@ public class FastPartitioner implements IDocumentPartitioner, IDocumentPartition * May be extended by subclasses. * </p> */ + @Override public void documentAboutToBeChanged(DocumentEvent e) { if (fIsInitialized) { @@ -217,9 +216,7 @@ public class FastPartitioner implements IDocumentPartitioner, IDocumentPartition } } - /* - * @see IDocumentPartitioner#documentChanged(DocumentEvent) - */ + @Override public final boolean documentChanged(DocumentEvent e) { if (fIsInitialized) { IRegion region= documentChanged2(e); @@ -287,6 +284,7 @@ public class FastPartitioner implements IDocumentPartitioner, IDocumentPartition * May be extended by subclasses. * </p> */ + @Override public IRegion documentChanged2(DocumentEvent e) { if (!fIsInitialized) @@ -455,6 +453,7 @@ public class FastPartitioner implements IDocumentPartitioner, IDocumentPartition * May be replaced or extended by subclasses. * </p> */ + @Override public String getContentType(int offset) { checkInitialization(); @@ -471,6 +470,7 @@ public class FastPartitioner implements IDocumentPartitioner, IDocumentPartition * May be replaced or extended by subclasses. * </p> */ + @Override public ITypedRegion getPartition(int offset) { checkInitialization(); @@ -515,9 +515,7 @@ public class FastPartitioner implements IDocumentPartitioner, IDocumentPartition return new TypedRegion(0, fDocument.getLength(), IDocument.DEFAULT_CONTENT_TYPE); } - /* - * @see IDocumentPartitioner#computePartitioning(int, int) - */ + @Override public final ITypedRegion[] computePartitioning(int offset, int length) { return computePartitioning(offset, length, false); } @@ -528,6 +526,7 @@ public class FastPartitioner implements IDocumentPartitioner, IDocumentPartition * May be replaced or extended by subclasses. * </p> */ + @Override public String[] getLegalContentTypes() { return TextUtilities.copy(fLegalContentTypes); } @@ -578,6 +577,7 @@ public class FastPartitioner implements IDocumentPartitioner, IDocumentPartition * May be replaced or extended by subclasses. * </p> */ + @Override public String getContentType(int offset, boolean preferOpenPartitions) { return getPartition(offset, preferOpenPartitions).getType(); } @@ -588,6 +588,7 @@ public class FastPartitioner implements IDocumentPartitioner, IDocumentPartition * May be replaced or extended by subclasses. * </p> */ + @Override public ITypedRegion getPartition(int offset, boolean preferOpenPartitions) { ITypedRegion region= getPartition(offset); if (preferOpenPartitions) { @@ -609,6 +610,7 @@ public class FastPartitioner implements IDocumentPartitioner, IDocumentPartition * May be replaced or extended by subclasses. * </p> */ + @Override public ITypedRegion[] computePartitioning(int offset, int length, boolean includeZeroLengthPartitions) { checkInitialization(); List list= new ArrayList(); @@ -729,9 +731,7 @@ public class FastPartitioner implements IDocumentPartitioner, IDocumentPartition return j; } - /* - * @see org.eclipse.jface.text.IDocumentPartitionerExtension3#startRewriteSession(org.eclipse.jface.text.DocumentRewriteSession) - */ + @Override public void startRewriteSession(DocumentRewriteSession session) throws IllegalStateException { if (fActiveRewriteSession != null) throw new IllegalStateException(); @@ -744,6 +744,7 @@ public class FastPartitioner implements IDocumentPartitioner, IDocumentPartition * May be extended by subclasses. * </p> */ + @Override public void stopRewriteSession(DocumentRewriteSession session) { if (fActiveRewriteSession == session) flushRewriteSession(); @@ -755,6 +756,7 @@ public class FastPartitioner implements IDocumentPartitioner, IDocumentPartition * May be extended by subclasses. * </p> */ + @Override public DocumentRewriteSession getActiveRewriteSession() { return fActiveRewriteSession; } diff --git a/org.eclipse.jface.text/src/org/eclipse/jface/text/rules/NumberRule.java b/org.eclipse.jface.text/src/org/eclipse/jface/text/rules/NumberRule.java index 9ae9a22ca23..952a945a9c8 100644 --- a/org.eclipse.jface.text/src/org/eclipse/jface/text/rules/NumberRule.java +++ b/org.eclipse.jface.text/src/org/eclipse/jface/text/rules/NumberRule.java @@ -51,9 +51,7 @@ public class NumberRule implements IRule { fColumn= column; } - /* - * @see IRule#evaluate(ICharacterScanner) - */ + @Override public IToken evaluate(ICharacterScanner scanner) { int c= scanner.read(); if (Character.isDigit((char)c)) { diff --git a/org.eclipse.jface.text/src/org/eclipse/jface/text/rules/PatternRule.java b/org.eclipse.jface.text/src/org/eclipse/jface/text/rules/PatternRule.java index d1d92f94496..bb9ffa87090 100644 --- a/org.eclipse.jface.text/src/org/eclipse/jface/text/rules/PatternRule.java +++ b/org.eclipse.jface.text/src/org/eclipse/jface/text/rules/PatternRule.java @@ -34,6 +34,7 @@ public class PatternRule implements IPredicateRule { * @since 3.1 */ private static class DecreasingCharArrayLengthComparator implements Comparator { + @Override public int compare(Object o1, Object o2) { return ((char[]) o2).length - ((char[]) o1).length; } @@ -202,9 +203,7 @@ public class PatternRule implements IPredicateRule { return Token.UNDEFINED; } - /* - * @see IRule#evaluate(ICharacterScanner) - */ + @Override public IToken evaluate(ICharacterScanner scanner) { return evaluate(scanner, false); } @@ -299,10 +298,7 @@ public class PatternRule implements IPredicateRule { return true; } - /* - * @see IPredicateRule#evaluate(ICharacterScanner, boolean) - * @since 2.0 - */ + @Override public IToken evaluate(ICharacterScanner scanner, boolean resume) { if (fColumn == UNDEFINED) return doEvaluate(scanner, resume); @@ -314,10 +310,7 @@ public class PatternRule implements IPredicateRule { return Token.UNDEFINED; } - /* - * @see IPredicateRule#getSuccessToken() - * @since 2.0 - */ + @Override public IToken getSuccessToken() { return fToken; } diff --git a/org.eclipse.jface.text/src/org/eclipse/jface/text/rules/RuleBasedDamagerRepairer.java b/org.eclipse.jface.text/src/org/eclipse/jface/text/rules/RuleBasedDamagerRepairer.java index 4157ddf92d1..fafbfaf9923 100644 --- a/org.eclipse.jface.text/src/org/eclipse/jface/text/rules/RuleBasedDamagerRepairer.java +++ b/org.eclipse.jface.text/src/org/eclipse/jface/text/rules/RuleBasedDamagerRepairer.java @@ -18,6 +18,7 @@ import org.eclipse.jface.text.TextAttribute; /** * @deprecated use <code>DefaultDamagerRepairer</code> */ +@Deprecated public class RuleBasedDamagerRepairer extends DefaultDamagerRepairer { /** @@ -30,6 +31,7 @@ public class RuleBasedDamagerRepairer extends DefaultDamagerRepairer { * * @deprecated use RuleBasedDamagerRepairer(RuleBasedScanner) instead */ + @Deprecated public RuleBasedDamagerRepairer(RuleBasedScanner scanner, TextAttribute defaultTextAttribute) { super(scanner, defaultTextAttribute); } diff --git a/org.eclipse.jface.text/src/org/eclipse/jface/text/rules/RuleBasedPartitionScanner.java b/org.eclipse.jface.text/src/org/eclipse/jface/text/rules/RuleBasedPartitionScanner.java index 55dde65d5b0..3e0491d1854 100644 --- a/org.eclipse.jface.text/src/org/eclipse/jface/text/rules/RuleBasedPartitionScanner.java +++ b/org.eclipse.jface.text/src/org/eclipse/jface/text/rules/RuleBasedPartitionScanner.java @@ -39,6 +39,7 @@ public class RuleBasedPartitionScanner extends BufferedRuleBasedScanner implemen * * @param rules the sequence of rules controlling this scanner */ + @Override public void setRules(IRule[] rules) { throw new UnsupportedOperationException(); } @@ -50,9 +51,7 @@ public class RuleBasedPartitionScanner extends BufferedRuleBasedScanner implemen super.setRules(rules); } - /* - * @see ITokenScanner#setRange(IDocument, int, int) - */ + @Override public void setRange(IDocument document, int offset, int length) { setPartialRange(document, offset, length, null, -1); } @@ -64,6 +63,7 @@ public class RuleBasedPartitionScanner extends BufferedRuleBasedScanner implemen * that match the given content type. * </p> */ + @Override public void setPartialRange(IDocument document, int offset, int length, String contentType, int partitionOffset) { fContentType= contentType; fPartitionOffset= partitionOffset; @@ -78,9 +78,7 @@ public class RuleBasedPartitionScanner extends BufferedRuleBasedScanner implemen super.setRange(document, offset, length); } - /* - * @see ITokenScanner#nextToken() - */ + @Override public IToken nextToken() { diff --git a/org.eclipse.jface.text/src/org/eclipse/jface/text/rules/RuleBasedPartitioner.java b/org.eclipse.jface.text/src/org/eclipse/jface/text/rules/RuleBasedPartitioner.java index 1647230ea6b..e6150e68f0b 100644 --- a/org.eclipse.jface.text/src/org/eclipse/jface/text/rules/RuleBasedPartitioner.java +++ b/org.eclipse.jface.text/src/org/eclipse/jface/text/rules/RuleBasedPartitioner.java @@ -48,12 +48,14 @@ import org.eclipse.jface.text.TypedRegion; * * @deprecated use <code>FastPartitioner</code> instead */ +@Deprecated public class RuleBasedPartitioner implements IDocumentPartitioner, IDocumentPartitionerExtension, IDocumentPartitionerExtension2 { /** * The position category this partitioner uses to store the document's partitioning information * @deprecated As of 3.0, use <code>getManagingPositionCategories()</code>. */ + @Deprecated public final static String CONTENT_TYPES_CATEGORY= "__content_types_category"; //$NON-NLS-1$ @@ -94,10 +96,7 @@ public class RuleBasedPartitioner implements IDocumentPartitioner, IDocumentPart fPositionUpdater= new DefaultPositionUpdater(fPositionCategory); } - /* - * @see org.eclipse.jface.text.IDocumentPartitionerExtension2#getManagingPositionCategories() - * @since 3.0 - */ + @Override public String[] getManagingPositionCategories() { return new String[] { fPositionCategory }; } @@ -105,6 +104,7 @@ public class RuleBasedPartitioner implements IDocumentPartitioner, IDocumentPart /* * @see IDocumentPartitioner#connect */ + @Override public void connect(IDocument document) { Assert.isNotNull(document); Assert.isTrue(!document.containsPositionCategory(fPositionCategory)); @@ -145,6 +145,7 @@ public class RuleBasedPartitioner implements IDocumentPartitioner, IDocumentPart /* * @see IDocumentPartitioner#disconnect */ + @Override public void disconnect() { Assert.isTrue(fDocument.containsPositionCategory(fPositionCategory)); @@ -159,6 +160,7 @@ public class RuleBasedPartitioner implements IDocumentPartitioner, IDocumentPart /* * @see IDocumentPartitioner#documentAboutToBeChanged */ + @Override public void documentAboutToBeChanged(DocumentEvent e) { Assert.isTrue(e.getDocument() == fDocument); @@ -172,6 +174,7 @@ public class RuleBasedPartitioner implements IDocumentPartitioner, IDocumentPart /* * @see IDocumentPartitioner#documentChanged */ + @Override public boolean documentChanged(DocumentEvent e) { IRegion region= documentChanged2(e); return (region != null); @@ -229,10 +232,7 @@ public class RuleBasedPartitioner implements IDocumentPartitioner, IDocumentPart } } - /* - * @see IDocumentPartitionerExtension#documentChanged2(DocumentEvent) - * @since 2.0 - */ + @Override public IRegion documentChanged2(DocumentEvent e) { try { @@ -398,6 +398,7 @@ public class RuleBasedPartitioner implements IDocumentPartitioner, IDocumentPart /* * @see IDocumentPartitioner#getContentType */ + @Override public String getContentType(int offset) { TypedPosition p= findClosestPosition(offset); @@ -410,6 +411,7 @@ public class RuleBasedPartitioner implements IDocumentPartitioner, IDocumentPart /* * @see IDocumentPartitioner#getPartition */ + @Override public ITypedRegion getPartition(int offset) { try { @@ -456,6 +458,7 @@ public class RuleBasedPartitioner implements IDocumentPartitioner, IDocumentPart /* * @see IDocumentPartitioner#computePartitioning */ + @Override public ITypedRegion[] computePartitioning(int offset, int length) { return computePartitioning(offset, length, false); } @@ -463,6 +466,7 @@ public class RuleBasedPartitioner implements IDocumentPartitioner, IDocumentPart /* * @see IDocumentPartitioner#getLegalContentTypes */ + @Override public String[] getLegalContentTypes() { return TextUtilities.copy(fLegalContentTypes); } @@ -501,18 +505,12 @@ public class RuleBasedPartitioner implements IDocumentPartitioner, IDocumentPart /* zero-length partition support */ - /* - * @see org.eclipse.jface.text.IDocumentPartitionerExtension2#getContentType(int) - * @since 3.0 - */ + @Override public String getContentType(int offset, boolean preferOpenPartitions) { return getPartition(offset, preferOpenPartitions).getType(); } - /* - * @see org.eclipse.jface.text.IDocumentPartitionerExtension2#getPartition(int) - * @since 3.0 - */ + @Override public ITypedRegion getPartition(int offset, boolean preferOpenPartitions) { ITypedRegion region= getPartition(offset); if (preferOpenPartitions) { @@ -528,10 +526,7 @@ public class RuleBasedPartitioner implements IDocumentPartitioner, IDocumentPart return region; } - /* - * @see org.eclipse.jface.text.IDocumentPartitionerExtension2#computePartitioning(int, int) - * @since 3.0 - */ + @Override public ITypedRegion[] computePartitioning(int offset, int length, boolean includeZeroLengthPartitions) { List list= new ArrayList(); diff --git a/org.eclipse.jface.text/src/org/eclipse/jface/text/rules/RuleBasedScanner.java b/org.eclipse.jface.text/src/org/eclipse/jface/text/rules/RuleBasedScanner.java index dc2777672bf..efe9ab4d5e9 100644 --- a/org.eclipse.jface.text/src/org/eclipse/jface/text/rules/RuleBasedScanner.java +++ b/org.eclipse.jface.text/src/org/eclipse/jface/text/rules/RuleBasedScanner.java @@ -83,9 +83,7 @@ public class RuleBasedScanner implements ICharacterScanner, ITokenScanner { fDefaultReturnToken= defaultReturnToken; } - /* - * @see ITokenScanner#setRange(IDocument, int, int) - */ + @Override public void setRange(final IDocument document, int offset, int length) { Assert.isLegal(document != null); final int documentLength= document.getLength(); @@ -120,16 +118,12 @@ public class RuleBasedScanner implements ICharacterScanner, ITokenScanner { Assert.isLegal(offset + length <= documentLength); } - /* - * @see ITokenScanner#getTokenOffset() - */ + @Override public int getTokenOffset() { return fTokenOffset; } - /* - * @see ITokenScanner#getTokenLength() - */ + @Override public int getTokenLength() { if (fOffset < fRangeEnd) return fOffset - getTokenOffset(); @@ -137,9 +131,7 @@ public class RuleBasedScanner implements ICharacterScanner, ITokenScanner { } - /* - * @see ICharacterScanner#getColumn() - */ + @Override public int getColumn() { if (fColumn == UNDEFINED) { try { @@ -154,16 +146,12 @@ public class RuleBasedScanner implements ICharacterScanner, ITokenScanner { return fColumn; } - /* - * @see ICharacterScanner#getLegalLineDelimiters() - */ + @Override public char[][] getLegalLineDelimiters() { return fDelimiters; } - /* - * @see ITokenScanner#nextToken() - */ + @Override public IToken nextToken() { fTokenOffset= fOffset; @@ -182,9 +170,7 @@ public class RuleBasedScanner implements ICharacterScanner, ITokenScanner { return fDefaultReturnToken; } - /* - * @see ICharacterScanner#read() - */ + @Override public int read() { try { @@ -204,9 +190,7 @@ public class RuleBasedScanner implements ICharacterScanner, ITokenScanner { } } - /* - * @see ICharacterScanner#unread() - */ + @Override public void unread() { --fOffset; fColumn= UNDEFINED; diff --git a/org.eclipse.jface.text/src/org/eclipse/jface/text/rules/Token.java b/org.eclipse.jface.text/src/org/eclipse/jface/text/rules/Token.java index 24f48a458f6..2153627ef31 100644 --- a/org.eclipse.jface.text/src/org/eclipse/jface/text/rules/Token.java +++ b/org.eclipse.jface.text/src/org/eclipse/jface/text/rules/Token.java @@ -46,6 +46,7 @@ public class Token implements IToken { * Standard token: Neither {@link #UNDEFINED}, {@link #WHITESPACE}, nor {@link #EOF}. * @deprecated will be removed */ + @Deprecated public static final IToken OTHER= new Token(T_OTHER); /** The type of this token */ @@ -88,37 +89,27 @@ public class Token implements IToken { fData= data; } - /* - * @see IToken#getData() - */ + @Override public Object getData() { return fData; } - /* - * @see IToken#isOther() - */ + @Override public boolean isOther() { return (fType == T_OTHER); } - /* - * @see IToken#isEOF() - */ + @Override public boolean isEOF() { return (fType == T_EOF); } - /* - * @see IToken#isWhitespace() - */ + @Override public boolean isWhitespace() { return (fType == T_WHITESPACE); } - /* - * @see IToken#isUndefined() - */ + @Override public boolean isUndefined() { return (fType == T_UNDEFINED); } diff --git a/org.eclipse.jface.text/src/org/eclipse/jface/text/rules/WhitespaceRule.java b/org.eclipse.jface.text/src/org/eclipse/jface/text/rules/WhitespaceRule.java index 6bd1af7f25c..d48d35393ad 100644 --- a/org.eclipse.jface.text/src/org/eclipse/jface/text/rules/WhitespaceRule.java +++ b/org.eclipse.jface.text/src/org/eclipse/jface/text/rules/WhitespaceRule.java @@ -64,6 +64,7 @@ public class WhitespaceRule implements IRule { * @return {@link #fWhitespaceToken} if whitespace got detected, {@link Token#UNDEFINED} * otherwise */ + @Override public IToken evaluate(ICharacterScanner scanner) { int c= scanner.read(); if (fDetector.isWhitespace((char) c)) { diff --git a/org.eclipse.jface.text/src/org/eclipse/jface/text/rules/WordPatternRule.java b/org.eclipse.jface.text/src/org/eclipse/jface/text/rules/WordPatternRule.java index a6f4b875a76..3c1762c8fcb 100644 --- a/org.eclipse.jface.text/src/org/eclipse/jface/text/rules/WordPatternRule.java +++ b/org.eclipse.jface.text/src/org/eclipse/jface/text/rules/WordPatternRule.java @@ -70,6 +70,7 @@ public class WordPatternRule extends SingleLineRule { * @param scanner the scanner to be used * @return <code>true</code> if the word ends on the given end sequence */ + @Override protected boolean endSequenceDetected(ICharacterScanner scanner) { fBuffer.setLength(0); int c= scanner.read(); diff --git a/org.eclipse.jface.text/src/org/eclipse/jface/text/rules/WordRule.java b/org.eclipse.jface.text/src/org/eclipse/jface/text/rules/WordRule.java index b52a7ea38ad..12ec542a543 100644 --- a/org.eclipse.jface.text/src/org/eclipse/jface/text/rules/WordRule.java +++ b/org.eclipse.jface.text/src/org/eclipse/jface/text/rules/WordRule.java @@ -125,9 +125,7 @@ public class WordRule implements IRule { fColumn= column; } - /* - * @see IRule#evaluate(ICharacterScanner) - */ + @Override public IToken evaluate(ICharacterScanner scanner) { int c= scanner.read(); if (c != ICharacterScanner.EOF && fDetector.isWordStart((char) c)) { diff --git a/org.eclipse.jface.text/src/org/eclipse/jface/text/source/AbstractRulerColumn.java b/org.eclipse.jface.text/src/org/eclipse/jface/text/source/AbstractRulerColumn.java index ffa1fa13381..0d566a31f2c 100644 --- a/org.eclipse.jface.text/src/org/eclipse/jface/text/source/AbstractRulerColumn.java +++ b/org.eclipse.jface.text/src/org/eclipse/jface/text/source/AbstractRulerColumn.java @@ -78,29 +78,21 @@ public abstract class AbstractRulerColumn implements IVerticalRulerColumn, IVert */ private final class MouseHandler implements MouseListener, MouseMoveListener { - /* - * @see org.eclipse.swt.events.MouseListener#mouseUp(org.eclipse.swt.events.MouseEvent) - */ + @Override public void mouseUp(MouseEvent event) { } - /* - * @see org.eclipse.swt.events.MouseListener#mouseDown(org.eclipse.swt.events.MouseEvent) - */ + @Override public void mouseDown(MouseEvent event) { fParentRuler.setLocationOfLastMouseButtonActivity(event.x, event.y); } - /* - * @see org.eclipse.swt.events.MouseListener#mouseDoubleClick(org.eclipse.swt.events.MouseEvent) - */ + @Override public void mouseDoubleClick(MouseEvent event) { fParentRuler.setLocationOfLastMouseButtonActivity(event.x, event.y); } - /* - * @see org.eclipse.swt.events.MouseMoveListener#mouseMove(org.eclipse.swt.events.MouseEvent) - */ + @Override public void mouseMove(MouseEvent event) { fParentRuler.setLocationOfLastMouseButtonActivity(event.x, event.y); } @@ -111,18 +103,14 @@ public abstract class AbstractRulerColumn implements IVerticalRulerColumn, IVert */ private final class InternalListener implements IViewportListener, ITextListener { - /* - * @see IViewportListener#viewportChanged(int) - */ + @Override public void viewportChanged(int topPixel) { int delta= topPixel - fLastTopPixel; if (scrollVertical(delta)) fCanvas.update(); // force update the invalidated regions } - /* - * @see ITextListener#textChanged(TextEvent) - */ + @Override public void textChanged(TextEvent event) { /* * Redraw: - when the viewer is drawing, and any of the following - the widget was not @@ -187,10 +175,7 @@ public abstract class AbstractRulerColumn implements IVerticalRulerColumn, IVert protected AbstractRulerColumn() { } - /* - * @see org.eclipse.jface.text.source.IVerticalRulerColumn#createControl(org.eclipse.jface.text.source.CompositeRuler, - * org.eclipse.swt.widgets.Composite) - */ + @Override public Control createControl(CompositeRuler parentRuler, Composite parentControl) { Assert.isLegal(parentControl != null); Assert.isLegal(parentRuler != null); @@ -210,6 +195,7 @@ public abstract class AbstractRulerColumn implements IVerticalRulerColumn, IVert fCanvas.setFont(getFont()); fCanvas.addPaintListener(new PaintListener() { + @Override public void paintControl(PaintEvent event) { AbstractRulerColumn.this.paintControl(event); } @@ -235,9 +221,7 @@ public abstract class AbstractRulerColumn implements IVerticalRulerColumn, IVert return SWT.NO_BACKGROUND; } - /* - * @see org.eclipse.jface.text.source.IVerticalRulerColumn#getControl() - */ + @Override public final Control getControl() { return fCanvas; } @@ -258,9 +242,7 @@ public abstract class AbstractRulerColumn implements IVerticalRulerColumn, IVert } } - /* - * @see org.eclipse.jface.text.source.IVerticalRulerColumn#getWidth() - */ + @Override public final int getWidth() { return fWidth; } @@ -280,6 +262,7 @@ public abstract class AbstractRulerColumn implements IVerticalRulerColumn, IVert * * @param font the font or <code>null</code> to use the default font */ + @Override public final void setFont(Font font) { if (fFont != font) { fFont= font; @@ -323,9 +306,7 @@ public abstract class AbstractRulerColumn implements IVerticalRulerColumn, IVert return fTextInset; } - /* - * @see org.eclipse.jface.text.source.IVerticalRulerColumn#setModel(org.eclipse.jface.text.source.IAnnotationModel) - */ + @Override public void setModel(IAnnotationModel model) { if (fModel != model) { fModel= model; @@ -333,9 +314,7 @@ public abstract class AbstractRulerColumn implements IVerticalRulerColumn, IVert } } - /* - * @see org.eclipse.jface.text.source.IVerticalRulerInfoExtension#getModel() - */ + @Override public final IAnnotationModel getModel() { return fModel; } @@ -387,9 +366,7 @@ public abstract class AbstractRulerColumn implements IVerticalRulerColumn, IVert fHover= hover; } - /* - * @see org.eclipse.jface.text.source.IVerticalRulerInfoExtension#getHover() - */ + @Override public IAnnotationHover getHover() { return fHover; } @@ -418,9 +395,7 @@ public abstract class AbstractRulerColumn implements IVerticalRulerColumn, IVert } } - /* - * @see org.eclipse.jface.text.source.IVerticalRulerColumn#redraw() - */ + @Override public final void redraw() { if (fCanvas != null && !fCanvas.isDisposed()) fCanvas.redraw(); @@ -577,30 +552,22 @@ public abstract class AbstractRulerColumn implements IVerticalRulerColumn, IVert return fStyledText.getDisplay().getSystemColor(SWT.COLOR_DARK_GRAY); } - /* - * @see org.eclipse.jface.text.source.IVerticalRulerInfo#getLineOfLastMouseButtonActivity() - */ + @Override public final int getLineOfLastMouseButtonActivity() { return getParentRuler().getLineOfLastMouseButtonActivity(); } - /* - * @see org.eclipse.jface.text.source.IVerticalRulerInfo#toDocumentLineNumber(int) - */ + @Override public final int toDocumentLineNumber(int y_coordinate) { return getParentRuler().toDocumentLineNumber(y_coordinate); } - /* - * @see org.eclipse.jface.text.source.IVerticalRulerInfoExtension#addVerticalRulerListener(org.eclipse.jface.text.source.IVerticalRulerListener) - */ + @Override public void addVerticalRulerListener(IVerticalRulerListener listener) { throw new UnsupportedOperationException(); } - /* - * @see org.eclipse.jface.text.source.IVerticalRulerInfoExtension#removeVerticalRulerListener(org.eclipse.jface.text.source.IVerticalRulerListener) - */ + @Override public void removeVerticalRulerListener(IVerticalRulerListener listener) { throw new UnsupportedOperationException(); } diff --git a/org.eclipse.jface.text/src/org/eclipse/jface/text/source/AnnotationBarHoverManager.java b/org.eclipse.jface.text/src/org/eclipse/jface/text/source/AnnotationBarHoverManager.java index 5593ba01dd1..760b2b6ed7c 100644 --- a/org.eclipse.jface.text/src/org/eclipse/jface/text/source/AnnotationBarHoverManager.java +++ b/org.eclipse.jface.text/src/org/eclipse/jface/text/source/AnnotationBarHoverManager.java @@ -66,6 +66,7 @@ public class AnnotationBarHoverManager extends AbstractHoverInformationControlMa * @since 3.0 * @deprecated As of 3.4, no longer used as closer from super class is used */ + @Deprecated protected class Closer extends MouseTrackAdapter implements IInformationControlCloser, MouseListener, MouseMoveListener, ControlListener, KeyListener, DisposeListener, ShellListener, Listener { /** The closer's subject control */ @@ -94,9 +95,7 @@ public class AnnotationBarHoverManager extends AbstractHoverInformationControlMa public Closer() { } - /* - * @see IInformationControlCloser#setSubjectControl(Control) - */ + @Override public void setSubjectControl(Control control) { fSubjectControl= control; } @@ -104,13 +103,12 @@ public class AnnotationBarHoverManager extends AbstractHoverInformationControlMa /* * @see IInformationControlCloser#setHoverControl(IHoverControl) */ + @Override public void setInformationControl(IInformationControl control) { fInformationControlToClose= control; } - /* - * @see IInformationControlCloser#start(Rectangle) - */ + @Override public void start(Rectangle subjectArea) { if (fIsActive) return; @@ -136,9 +134,7 @@ public class AnnotationBarHoverManager extends AbstractHoverInformationControlMa } } - /* - * @see IInformationControlCloser#stop() - */ + @Override public void stop() { if (!fIsActive) @@ -170,121 +166,84 @@ public class AnnotationBarHoverManager extends AbstractHoverInformationControlMa * @param delayRestart <code>true</code> if restart should be delayed * @deprecated As of 3.4, replaced by {@link #stop()}. Note that <code>delayRestart</code> was never honored. */ + @Deprecated protected void stop(boolean delayRestart) { stop(); } - /* - * @see org.eclipse.swt.events.MouseMoveListener#mouseMove(org.eclipse.swt.events.MouseEvent) - */ + @Override public void mouseMove(MouseEvent event) { if (!fSubjectArea.contains(event.x, event.y)) hideInformationControl(); } - /* - * @see org.eclipse.swt.events.MouseListener#mouseUp(org.eclipse.swt.events.MouseEvent) - */ + @Override public void mouseUp(MouseEvent event) { } - /* - * @see MouseListener#mouseDown(MouseEvent) - */ + @Override public void mouseDown(MouseEvent event) { hideInformationControl(); } - /* - * @see MouseListener#mouseDoubleClick(MouseEvent) - */ + @Override public void mouseDoubleClick(MouseEvent event) { hideInformationControl(); } - /* - * @see org.eclipse.swt.widgets.Listener#handleEvent(org.eclipse.swt.widgets.Event) - * @since 3.2 - */ + @Override public void handleEvent(Event event) { if (event.type == SWT.MouseHorizontalWheel || event.type == SWT.MouseVerticalWheel) hideInformationControl(); } - /* - * @see MouseTrackAdapter#mouseExit(MouseEvent) - */ + @Override public void mouseExit(MouseEvent event) { if (!fAllowMouseExit) hideInformationControl(); } - /* - * @see ControlListener#controlResized(ControlEvent) - */ + @Override public void controlResized(ControlEvent event) { hideInformationControl(); } - /* - * @see ControlListener#controlMoved(ControlEvent) - */ + @Override public void controlMoved(ControlEvent event) { hideInformationControl(); } - /* - * @see KeyListener#keyReleased(KeyEvent) - */ + @Override public void keyReleased(KeyEvent event) { } - /* - * @see KeyListener#keyPressed(KeyEvent) - */ + @Override public void keyPressed(KeyEvent event) { hideInformationControl(); } - /* - * @see org.eclipse.swt.events.ShellListener#shellActivated(org.eclipse.swt.events.ShellEvent) - * @since 3.1 - */ + @Override public void shellActivated(ShellEvent e) { } - /* - * @see org.eclipse.swt.events.ShellListener#shellClosed(org.eclipse.swt.events.ShellEvent) - * @since 3.1 - */ + @Override public void shellClosed(ShellEvent e) { } - /* - * @see org.eclipse.swt.events.ShellListener#shellDeactivated(org.eclipse.swt.events.ShellEvent) - * @since 3.1 - */ + @Override public void shellDeactivated(ShellEvent e) { hideInformationControl(); } - /* - * @see org.eclipse.swt.events.ShellListener#shellDeiconified(org.eclipse.swt.events.ShellEvent) - * @since 3.1 - */ + @Override public void shellDeiconified(ShellEvent e) { } - /* - * @see org.eclipse.swt.events.ShellListener#shellIconified(org.eclipse.swt.events.ShellEvent) - * @since 3.1 - */ + @Override public void shellIconified(ShellEvent e) { } - /* - * @see org.eclipse.swt.events.DisposeListener#widgetDisposed(org.eclipse.swt.events.DisposeEvent) - */ + @Override public void widgetDisposed(DisposeEvent e) { hideInformationControl(); } @@ -324,6 +283,7 @@ public class AnnotationBarHoverManager extends AbstractHoverInformationControlMa * @param creator the information control creator * @deprecated As of 2.1, replaced by {@link AnnotationBarHoverManager#AnnotationBarHoverManager(IVerticalRulerInfo, ISourceViewer, IAnnotationHover, IInformationControlCreator)} */ + @Deprecated public AnnotationBarHoverManager(ISourceViewer sourceViewer, IVerticalRuler ruler, IAnnotationHover annotationHover, IInformationControlCreator creator) { this(ruler, sourceViewer, annotationHover, creator); } @@ -352,9 +312,7 @@ public class AnnotationBarHoverManager extends AbstractHoverInformationControlMa // use closer from super class } - /* - * @see org.eclipse.jface.text.AbstractInformationControlManager#computeInformation() - */ + @Override protected void computeInformation() { fAllowMouseExit= false; MouseEvent event= getHoverEvent(); @@ -387,19 +345,13 @@ public class AnnotationBarHoverManager extends AbstractHoverInformationControlMa } - /* - * @see org.eclipse.jface.text.AbstractInformationControlManager#showInformationControl(org.eclipse.swt.graphics.Rectangle) - * @since 3.2 - */ + @Override protected void showInformationControl(Rectangle subjectArea) { super.showInformationControl(subjectArea); fCurrentHover= getHover(getHoverEvent()); } - /* - * @see org.eclipse.jface.text.AbstractInformationControlManager#hideInformationControl() - * @since 3.2 - */ + @Override protected void hideInformationControl() { fCurrentHover= null; super.hideInformationControl(); @@ -680,10 +632,7 @@ public class AnnotationBarHoverManager extends AbstractHoverInformationControlMa return fVerticalRulerInfo; } - /* - * @see org.eclipse.jface.text.AbstractInformationControlManager#computeSizeConstraints(org.eclipse.swt.widgets.Control, org.eclipse.swt.graphics.Rectangle, org.eclipse.jface.text.IInformationControl) - * @since 3.0 - */ + @Override protected Point computeSizeConstraints(Control subjectControl, Rectangle subjectArea, IInformationControl informationControl) { Point constraints= super.computeSizeConstraints(subjectControl, subjectArea, informationControl); @@ -701,10 +650,7 @@ public class AnnotationBarHoverManager extends AbstractHoverInformationControlMa return constraints; } - /* - * @see org.eclipse.jface.text.AbstractInformationControlManager#computeInformationControlLocation(org.eclipse.swt.graphics.Rectangle, org.eclipse.swt.graphics.Point) - * @since 3.7 - */ + @Override protected Point computeInformationControlLocation(Rectangle subjectArea, Point controlSize) { MouseEvent event= getHoverEvent(); IAnnotationHover hover= getHover(event); @@ -719,10 +665,7 @@ public class AnnotationBarHoverManager extends AbstractHoverInformationControlMa return super.computeInformationControlLocation(subjectArea, controlSize); } - /* - * @see org.eclipse.jface.text.AbstractInformationControlManager#computeLocation(org.eclipse.swt.graphics.Rectangle, org.eclipse.swt.graphics.Point, org.eclipse.jface.text.AbstractInformationControlManager.Anchor) - * @since 3.0 - */ + @Override protected Point computeLocation(Rectangle subjectArea, Point controlSize, Anchor anchor) { MouseEvent event= getHoverEvent(); IAnnotationHover hover= getHover(event); @@ -776,40 +719,50 @@ public class AnnotationBarHoverManager extends AbstractHoverInformationControlMa * @noreference This method is not intended to be referenced by clients. * @nooverride This method is not intended to be re-implemented or extended by clients. */ - public InternalAccessor getInternalAccessor() { + @Override + public InternalAccessor getInternalAccessor() { return new InternalAccessor() { + @Override public IInformationControl getCurrentInformationControl() { return AnnotationBarHoverManager.super.getInternalAccessor().getCurrentInformationControl(); } + @Override public void setInformationControlReplacer(InformationControlReplacer replacer) { AnnotationBarHoverManager.super.getInternalAccessor().setInformationControlReplacer(replacer); } + @Override public InformationControlReplacer getInformationControlReplacer() { return AnnotationBarHoverManager.super.getInternalAccessor().getInformationControlReplacer(); } + @Override public boolean canReplace(IInformationControl control) { return AnnotationBarHoverManager.super.getInternalAccessor().canReplace(control); } + @Override public boolean isReplaceInProgress() { return AnnotationBarHoverManager.super.getInternalAccessor().isReplaceInProgress(); } + @Override public void replaceInformationControl(boolean takeFocus) { AnnotationBarHoverManager.super.getInternalAccessor().replaceInformationControl(takeFocus); } + @Override public void cropToClosestMonitor(Rectangle bounds) { AnnotationBarHoverManager.super.getInternalAccessor().cropToClosestMonitor(bounds); } + @Override public void setHoverEnrichMode(EnrichMode mode) { AnnotationBarHoverManager.super.getInternalAccessor().setHoverEnrichMode(mode); } + @Override public boolean getAllowMouseExit() { return fAllowMouseExit; } diff --git a/org.eclipse.jface.text/src/org/eclipse/jface/text/source/AnnotationColumn.java b/org.eclipse.jface.text/src/org/eclipse/jface/text/source/AnnotationColumn.java index e456454427d..b3ad60389f3 100644 --- a/org.eclipse.jface.text/src/org/eclipse/jface/text/source/AnnotationColumn.java +++ b/org.eclipse.jface.text/src/org/eclipse/jface/text/source/AnnotationColumn.java @@ -18,6 +18,7 @@ package org.eclipse.jface.text.source; * instead. * @since 2.0 */ +@Deprecated public final class AnnotationColumn extends AnnotationRulerColumn { /** @@ -28,6 +29,7 @@ public final class AnnotationColumn extends AnnotationRulerColumn { * {@link org.eclipse.jface.text.source.AnnotationRulerColumn#AnnotationRulerColumn(int)} * instead */ + @Deprecated public AnnotationColumn(int width) { super(width); } diff --git a/org.eclipse.jface.text/src/org/eclipse/jface/text/source/AnnotationPainter.java b/org.eclipse.jface.text/src/org/eclipse/jface/text/source/AnnotationPainter.java index 7f6fe06231f..b1361603e23 100644 --- a/org.eclipse.jface.text/src/org/eclipse/jface/text/source/AnnotationPainter.java +++ b/org.eclipse.jface.text/src/org/eclipse/jface/text/source/AnnotationPainter.java @@ -105,12 +105,10 @@ public class AnnotationPainter implements IPainter, PaintListener, IAnnotationMo * @since 3.0 * @deprecated As of 3.4, replaced by {@link AnnotationPainter.UnderlineStrategy} */ + @Deprecated public static class SquigglesStrategy implements IDrawingStrategy { - /* - * @see org.eclipse.jface.text.source.AnnotationPainter.IDrawingStrategy#draw(org.eclipse.jface.text.source.Annotation, org.eclipse.swt.graphics.GC, org.eclipse.swt.custom.StyledText, int, int, org.eclipse.swt.graphics.Color) - * @since 3.0 - */ + @Override public void draw(Annotation annotation, GC gc, StyledText textWidget, int offset, int length, Color color) { if (gc != null) { @@ -191,10 +189,7 @@ public class AnnotationPainter implements IPainter, PaintListener, IAnnotationMo */ public static final class NullStrategy implements IDrawingStrategy { - /* - * @see org.eclipse.jface.text.source.AnnotationPainter.IDrawingStrategy#draw(org.eclipse.jface.text.source.Annotation, org.eclipse.swt.graphics.GC, org.eclipse.swt.custom.StyledText, int, int, org.eclipse.swt.graphics.Color) - * @since 3.0 - */ + @Override public void draw(Annotation annotation, GC gc, StyledText textWidget, int offset, int length, Color color) { // do nothing } @@ -224,6 +219,7 @@ public class AnnotationPainter implements IPainter, PaintListener, IAnnotationMo * @since 3.4 */ public static final class HighlightingStrategy implements ITextStyleStrategy { + @Override public void applyTextStyle(StyleRange styleRange, Color annotationColor) { styleRange.background= annotationColor; } @@ -244,6 +240,7 @@ public class AnnotationPainter implements IPainter, PaintListener, IAnnotationMo fUnderlineStyle= style; } + @Override public void applyTextStyle(StyleRange styleRange, Color annotationColor) { styleRange.underline= true; styleRange.underlineStyle= fUnderlineStyle; @@ -266,6 +263,7 @@ public class AnnotationPainter implements IPainter, PaintListener, IAnnotationMo fBorderStyle= style; } + @Override public void applyTextStyle(StyleRange styleRange, Color annotationColor) { styleRange.borderStyle= fBorderStyle; styleRange.borderColor= annotationColor; @@ -976,10 +974,7 @@ public class AnnotationPainter implements IPainter, PaintListener, IAnnotationMo } } - /* - * @see org.eclipse.jface.text.ITextPresentationListener#applyTextPresentation(org.eclipse.jface.text.TextPresentation) - * @since 3.0 - */ + @Override public void applyTextPresentation(TextPresentation tp) { Set decorations; @@ -1033,9 +1028,7 @@ public class AnnotationPainter implements IPainter, PaintListener, IAnnotationMo } } - /* - * @see org.eclipse.jface.text.source.IAnnotationModelListener#modelChanged(org.eclipse.jface.text.source.IAnnotationModel) - */ + @Override public synchronized void modelChanged(final IAnnotationModel model) { if (DEBUG) System.err.println("AP: OLD API of AnnotationModelListener called"); //$NON-NLS-1$ @@ -1043,9 +1036,7 @@ public class AnnotationPainter implements IPainter, PaintListener, IAnnotationMo modelChanged(new AnnotationModelEvent(model)); } - /* - * @see org.eclipse.jface.text.source.IAnnotationModelListenerExtension#modelChanged(org.eclipse.jface.text.source.AnnotationModelEvent) - */ + @Override public void modelChanged(final AnnotationModelEvent event) { Display textWidgetDisplay; try { @@ -1082,6 +1073,7 @@ public class AnnotationPainter implements IPainter, PaintListener, IAnnotationMo // now and running the posted runnable, the position information // is not accurate any longer. textWidgetDisplay.asyncExec(new Runnable() { + @Override public void run() { if (fTextWidget != null && !fTextWidget.isDisposed()) updatePainting(event); @@ -1114,6 +1106,7 @@ public class AnnotationPainter implements IPainter, PaintListener, IAnnotationMo * {@link #addTextStyleStrategy(Object, AnnotationPainter.ITextStyleStrategy)} and * {@link UnderlineStrategy} */ + @Deprecated public void addAnnotationType(Object annotationType) { addAnnotationType(annotationType, SQUIGGLES); } @@ -1135,16 +1128,12 @@ public class AnnotationPainter implements IPainter, PaintListener, IAnnotationMo if (fTextInputListener == null) { fTextInputListener= new ITextInputListener() { - /* - * @see org.eclipse.jface.text.ITextInputListener#inputDocumentAboutToBeChanged(org.eclipse.jface.text.IDocument, org.eclipse.jface.text.IDocument) - */ + @Override public void inputDocumentAboutToBeChanged(IDocument oldInput, IDocument newInput) { fInputDocumentAboutToBeChanged= true; } - /* - * @see org.eclipse.jface.text.ITextInputListener#inputDocumentChanged(org.eclipse.jface.text.IDocument, org.eclipse.jface.text.IDocument) - */ + @Override public void inputDocumentChanged(IDocument oldInput, IDocument newInput) { fInputDocumentAboutToBeChanged= false; } @@ -1266,9 +1255,7 @@ public class AnnotationPainter implements IPainter, PaintListener, IAnnotationMo return !fAnnotationType2PaintingStrategyId.isEmpty(); } - /* - * @see org.eclipse.jface.text.IPainter#dispose() - */ + @Override public void dispose() { if (fAnnotationType2Color != null) { @@ -1347,9 +1334,7 @@ public class AnnotationPainter implements IPainter, PaintListener, IAnnotationMo return -1; } - /* - * @see org.eclipse.swt.events.PaintListener#paintControl(org.eclipse.swt.events.PaintEvent) - */ + @Override public void paintControl(PaintEvent event) { if (fTextWidget != null) handleDrawRequest(event); @@ -1601,9 +1586,7 @@ public class AnnotationPainter implements IPainter, PaintListener, IAnnotationMo return (offset1 <= offset2+length2) && (offset2 <= offset1+length1); } - /* - * @see org.eclipse.jface.text.IPainter#deactivate(boolean) - */ + @Override public void deactivate(boolean redraw) { if (fIsActive) { fIsActive= false; @@ -1637,9 +1620,7 @@ public class AnnotationPainter implements IPainter, PaintListener, IAnnotationMo return null; } - /* - * @see org.eclipse.jface.text.IPainter#paint(int) - */ + @Override public void paint(int reason) { if (fSourceViewer.getDocument() == null) { deactivate(false); @@ -1656,9 +1637,7 @@ public class AnnotationPainter implements IPainter, PaintListener, IAnnotationMo updatePainting(null); } - /* - * @see org.eclipse.jface.text.IPainter#setPositionManager(org.eclipse.jface.text.IPaintPositionManager) - */ + @Override public void setPositionManager(IPaintPositionManager manager) { } } diff --git a/org.eclipse.jface.text/src/org/eclipse/jface/text/source/AnnotationRulerColumn.java b/org.eclipse.jface.text/src/org/eclipse/jface/text/source/AnnotationRulerColumn.java index 9fc8927189c..3673751fa0b 100644 --- a/org.eclipse.jface.text/src/org/eclipse/jface/text/source/AnnotationRulerColumn.java +++ b/org.eclipse.jface.text/src/org/eclipse/jface/text/source/AnnotationRulerColumn.java @@ -72,24 +72,18 @@ public class AnnotationRulerColumn implements IVerticalRulerColumn, IVerticalRul */ class InternalListener implements IViewportListener, IAnnotationModelListener, ITextListener { - /* - * @see IViewportListener#viewportChanged(int) - */ + @Override public void viewportChanged(int verticalPosition) { if (verticalPosition != fScrollPos) redraw(); } - /* - * @see IAnnotationModelListener#modelChanged(IAnnotationModel) - */ + @Override public void modelChanged(IAnnotationModel model) { postRedraw(); } - /* - * @see ITextListener#textChanged(TextEvent) - */ + @Override public void textChanged(TextEvent e) { if (e.getViewerRedrawState()) postRedraw(); @@ -122,9 +116,7 @@ public class AnnotationRulerColumn implements IVerticalRulerColumn, IVerticalRul * @since 3.0 */ private static class TupleComparator implements Comparator { - /* - * @see java.util.Comparator#compare(java.lang.Object, java.lang.Object) - */ + @Override public int compare(Object o1, Object o2) { Position p1= ((Tuple) o1).position; Position p2= ((Tuple) o2).position; @@ -250,23 +242,17 @@ public class AnnotationRulerColumn implements IVerticalRulerColumn, IVerticalRul fWidth= width; } - /* - * @see IVerticalRulerColumn#getControl() - */ + @Override public Control getControl() { return fCanvas; } - /* - * @see IVerticalRulerColumn#getWidth() - */ + @Override public int getWidth() { return fWidth; } - /* - * @see IVerticalRulerColumn#createControl(CompositeRuler, Composite) - */ + @Override public Control createControl(CompositeRuler parentRuler, Composite parentControl) { fParentRuler= parentRuler; @@ -278,6 +264,7 @@ public class AnnotationRulerColumn implements IVerticalRulerColumn, IVerticalRul fCanvas= createCanvas(parentControl); fCanvas.addPaintListener(new PaintListener() { + @Override public void paintControl(PaintEvent event) { if (fCachedTextViewer != null) doubleBufferPaint(event.gc); @@ -285,6 +272,7 @@ public class AnnotationRulerColumn implements IVerticalRulerColumn, IVerticalRul }); fCanvas.addDisposeListener(new DisposeListener() { + @Override public void widgetDisposed(DisposeEvent e) { handleDispose(); fCachedTextViewer= null; @@ -293,6 +281,7 @@ public class AnnotationRulerColumn implements IVerticalRulerColumn, IVerticalRul }); fMouseListener= new MouseListener() { + @Override public void mouseUp(MouseEvent event) { int lineNumber; if (isPropagatingMouseListener()) { @@ -305,6 +294,7 @@ public class AnnotationRulerColumn implements IVerticalRulerColumn, IVerticalRul mouseClicked(lineNumber); } + @Override public void mouseDown(MouseEvent event) { int lineNumber; if (isPropagatingMouseListener()) { @@ -317,6 +307,7 @@ public class AnnotationRulerColumn implements IVerticalRulerColumn, IVerticalRul AnnotationRulerColumn.this.mouseDown(lineNumber); } + @Override public void mouseDoubleClick(MouseEvent event) { int lineNumber; if (isPropagatingMouseListener()) { @@ -332,16 +323,14 @@ public class AnnotationRulerColumn implements IVerticalRulerColumn, IVerticalRul fCanvas.addMouseListener(fMouseListener); fCanvas.addMouseMoveListener(new MouseMoveListener() { - /* - * @see org.eclipse.swt.events.MouseMoveListener#mouseMove(org.eclipse.swt.events.MouseEvent) - * @since 3.0 - */ + @Override public void mouseMove(MouseEvent e) { handleMouseMove(e); } }); fCanvas.addMouseWheelListener(new MouseWheelListener() { + @Override public void mouseScrolled(MouseEvent e) { handleMouseScrolled(e); } @@ -352,6 +341,7 @@ public class AnnotationRulerColumn implements IVerticalRulerColumn, IVerticalRul fCachedTextViewer.addTextListener(fInternalListener); // on word wrap toggle a "resized" ControlEvent is fired: suggest a redraw of the ruler fCachedTextWidget.addControlListener(new ControlAdapter() { + @Override public void controlResized(ControlEvent e) { if (fCachedTextWidget != null && fCachedTextWidget.getWordWrap()) { redraw(); @@ -371,10 +361,7 @@ public class AnnotationRulerColumn implements IVerticalRulerColumn, IVerticalRul */ private Canvas createCanvas(Composite parent) { return new Canvas(parent, SWT.NO_BACKGROUND | SWT.NO_FOCUS) { - /* - * @see org.eclipse.swt.widgets.Control#addMouseListener(org.eclipse.swt.events.MouseListener) - * @since 3.0 - */ + @Override public void addMouseListener(MouseListener listener) { if (isPropagatingMouseListener() || listener == fMouseListener) super.addMouseListener(listener); @@ -830,6 +817,7 @@ public class AnnotationRulerColumn implements IVerticalRulerColumn, IVerticalRul Display d= fCanvas.getDisplay(); if (d != null) { d.asyncExec(new Runnable() { + @Override public void run() { redraw(); } @@ -838,9 +826,7 @@ public class AnnotationRulerColumn implements IVerticalRulerColumn, IVerticalRul } } - /* - * @see IVerticalRulerColumn#redraw() - */ + @Override public void redraw() { if (fCanvas != null && !fCanvas.isDisposed()) { if (VerticalRuler.IS_MAC_BUG_298936) { @@ -857,6 +843,7 @@ public class AnnotationRulerColumn implements IVerticalRulerColumn, IVerticalRul /* * @see IVerticalRulerColumn#setModel */ + @Override public void setModel(IAnnotationModel model) { if (fAllowSetModel && model != fModel) { @@ -872,9 +859,7 @@ public class AnnotationRulerColumn implements IVerticalRulerColumn, IVerticalRul } } - /* - * @see IVerticalRulerColumn#setFont(Font) - */ + @Override public void setFont(Font font) { } @@ -887,9 +872,7 @@ public class AnnotationRulerColumn implements IVerticalRulerColumn, IVerticalRul return fCachedTextViewer; } - /* - * @see org.eclipse.jface.text.source.IVerticalRulerInfoExtension#getModel() - */ + @Override public IAnnotationModel getModel() { return fModel; } @@ -907,18 +890,12 @@ public class AnnotationRulerColumn implements IVerticalRulerColumn, IVerticalRul fAllowedAnnotationTypes.clear(); } - /* - * @see org.eclipse.jface.text.source.IVerticalRulerInfo#getLineOfLastMouseButtonActivity() - * @since 3.0 - */ + @Override public int getLineOfLastMouseButtonActivity() { return fParentRuler.getLineOfLastMouseButtonActivity(); } - /* - * @see org.eclipse.jface.text.source.IVerticalRulerInfo#toDocumentLineNumber(int) - * @since 3.0 - */ + @Override public int toDocumentLineNumber(int y_coordinate) { return fParentRuler.toDocumentLineNumber(y_coordinate); } @@ -977,10 +954,7 @@ public class AnnotationRulerColumn implements IVerticalRulerColumn, IVerticalRul return !fConfiguredAnnotationTypes.contains(annotationType); } - /* - * @see org.eclipse.jface.text.source.IVerticalRulerInfoExtension#getHover() - * @since 3.0 - */ + @Override public IAnnotationHover getHover() { return fHover; } @@ -993,18 +967,12 @@ public class AnnotationRulerColumn implements IVerticalRulerColumn, IVerticalRul fHover= hover; } - /* - * @see org.eclipse.jface.text.source.IVerticalRulerInfoExtension#addVerticalRulerListener(org.eclipse.jface.text.source.IVerticalRulerListener) - * @since 3.0 - */ + @Override public void addVerticalRulerListener(IVerticalRulerListener listener) { throw new UnsupportedOperationException(); } - /* - * @see org.eclipse.jface.text.source.IVerticalRulerInfoExtension#removeVerticalRulerListener(org.eclipse.jface.text.source.IVerticalRulerListener) - * @since 3.0 - */ + @Override public void removeVerticalRulerListener(IVerticalRulerListener listener) { throw new UnsupportedOperationException(); } diff --git a/org.eclipse.jface.text/src/org/eclipse/jface/text/source/ChangeRulerColumn.java b/org.eclipse.jface.text/src/org/eclipse/jface/text/source/ChangeRulerColumn.java index 7669b1cfe3d..a613503d17d 100644 --- a/org.eclipse.jface.text/src/org/eclipse/jface/text/source/ChangeRulerColumn.java +++ b/org.eclipse.jface.text/src/org/eclipse/jface/text/source/ChangeRulerColumn.java @@ -60,29 +60,21 @@ public final class ChangeRulerColumn implements IChangeRulerColumn, IRevisionRul */ private class MouseHandler implements MouseListener, MouseMoveListener { - /* - * @see org.eclipse.swt.events.MouseListener#mouseUp(org.eclipse.swt.events.MouseEvent) - */ + @Override public void mouseUp(MouseEvent event) { } - /* - * @see org.eclipse.swt.events.MouseListener#mouseDown(org.eclipse.swt.events.MouseEvent) - */ + @Override public void mouseDown(MouseEvent event) { fParentRuler.setLocationOfLastMouseButtonActivity(event.x, event.y); } - /* - * @see org.eclipse.swt.events.MouseListener#mouseDoubleClick(org.eclipse.swt.events.MouseEvent) - */ + @Override public void mouseDoubleClick(MouseEvent event) { fParentRuler.setLocationOfLastMouseButtonActivity(event.x, event.y); } - /* - * @see org.eclipse.swt.events.MouseMoveListener#mouseMove(org.eclipse.swt.events.MouseEvent) - */ + @Override public void mouseMove(MouseEvent event) { fParentRuler.setLocationOfLastMouseButtonActivity(event.x, event.y); } @@ -93,17 +85,13 @@ public final class ChangeRulerColumn implements IChangeRulerColumn, IRevisionRul */ private class InternalListener implements IViewportListener, ITextListener { - /* - * @see IViewportListener#viewportChanged(int) - */ + @Override public void viewportChanged(int verticalPosition) { if (verticalPosition != fScrollPos) redraw(); } - /* - * @see ITextListener#textChanged(TextEvent) - */ + @Override public void textChanged(TextEvent event) { if (!event.getViewerRedrawState()) @@ -162,6 +150,7 @@ public final class ChangeRulerColumn implements IChangeRulerColumn, IRevisionRul * * @deprecated since 3.2 use {@link #ChangeRulerColumn(ISharedTextColors)} instead */ + @Deprecated public ChangeRulerColumn() { fRevisionPainter= null; fDiffPainter= new DiffPainter(this, null); @@ -190,9 +179,7 @@ public final class ChangeRulerColumn implements IChangeRulerColumn, IRevisionRul return fBackground; } - /* - * @see IVerticalRulerColumn#createControl(CompositeRuler, Composite) - */ + @Override public Control createControl(CompositeRuler parentRuler, Composite parentControl) { fParentRuler= parentRuler; @@ -203,6 +190,7 @@ public final class ChangeRulerColumn implements IChangeRulerColumn, IRevisionRul fCanvas.setBackground(getBackground()); fCanvas.addPaintListener(new PaintListener() { + @Override public void paintControl(PaintEvent event) { if (fCachedTextViewer != null) doubleBufferPaint(event.gc); @@ -210,6 +198,7 @@ public final class ChangeRulerColumn implements IChangeRulerColumn, IRevisionRul }); fCanvas.addDisposeListener(new DisposeListener() { + @Override public void widgetDisposed(DisposeEvent e) { handleDispose(); fCachedTextViewer= null; @@ -292,6 +281,7 @@ public final class ChangeRulerColumn implements IChangeRulerColumn, IRevisionRul * @deprecated as of 3.2 the number of lines in the viewport cannot be computed because * StyledText supports variable line heights */ + @Deprecated protected int getVisibleLinesInViewport() { // Hack to reduce amount of copied code. return LineNumberRulerColumn.getVisibleLinesInViewport(fCachedTextWidget); @@ -327,9 +317,7 @@ public final class ChangeRulerColumn implements IChangeRulerColumn, IRevisionRul fDiffPainter.paint(gc, visibleModelLines); } - /* - * @see IVerticalRulerColumn#redraw() - */ + @Override public void redraw() { if (fCachedTextViewer != null && fCanvas != null && !fCanvas.isDisposed()) { @@ -344,9 +332,7 @@ public final class ChangeRulerColumn implements IChangeRulerColumn, IRevisionRul } } - /* - * @see IVerticalRulerColumn#setFont(Font) - */ + @Override public void setFont(Font font) { } @@ -360,23 +346,17 @@ public final class ChangeRulerColumn implements IChangeRulerColumn, IRevisionRul return fParentRuler; } - /* - * @see org.eclipse.jface.text.source.IVerticalRulerInfo#getLineOfLastMouseButtonActivity() - */ + @Override public int getLineOfLastMouseButtonActivity() { return getParentRuler().getLineOfLastMouseButtonActivity(); } - /* - * @see org.eclipse.jface.text.source.IVerticalRulerInfo#toDocumentLineNumber(int) - */ + @Override public int toDocumentLineNumber(int y_coordinate) { return getParentRuler().toDocumentLineNumber(y_coordinate); } - /* - * @see org.eclipse.jface.text.source.IVerticalRulerInfoExtension#getHover() - */ + @Override public IAnnotationHover getHover() { int activeLine= getParentRuler().getLineOfLastMouseButtonActivity(); if (fRevisionPainter.hasHover(activeLine)) @@ -386,17 +366,13 @@ public final class ChangeRulerColumn implements IChangeRulerColumn, IRevisionRul return null; } - /* - * @see org.eclipse.jface.text.source.IChangeRulerColumn#setHover(org.eclipse.jface.text.source.IAnnotationHover) - */ + @Override public void setHover(IAnnotationHover hover) { fRevisionPainter.setHover(hover); fDiffPainter.setHover(hover); } - /* - * @see IVerticalRulerColumn#setModel(IAnnotationModel) - */ + @Override public void setModel(IAnnotationModel model) { setAnnotationModel(model); fRevisionPainter.setModel(model); @@ -408,9 +384,7 @@ public final class ChangeRulerColumn implements IChangeRulerColumn, IRevisionRul fAnnotationModel= model; } - /* - * @see org.eclipse.jface.text.source.IChangeRulerColumn#setBackground(org.eclipse.swt.graphics.Color) - */ + @Override public void setBackground(Color background) { fBackground= background; if (fCanvas != null && !fCanvas.isDisposed()) @@ -419,44 +393,32 @@ public final class ChangeRulerColumn implements IChangeRulerColumn, IRevisionRul fDiffPainter.setBackground(background); } - /* - * @see org.eclipse.jface.text.source.IChangeRulerColumn#setAddedColor(org.eclipse.swt.graphics.Color) - */ + @Override public void setAddedColor(Color addedColor) { fDiffPainter.setAddedColor(addedColor); } - /* - * @see org.eclipse.jface.text.source.IChangeRulerColumn#setChangedColor(org.eclipse.swt.graphics.Color) - */ + @Override public void setChangedColor(Color changedColor) { fDiffPainter.setChangedColor(changedColor); } - /* - * @see org.eclipse.jface.text.source.IChangeRulerColumn#setDeletedColor(org.eclipse.swt.graphics.Color) - */ + @Override public void setDeletedColor(Color deletedColor) { fDiffPainter.setDeletedColor(deletedColor); } - /* - * @see org.eclipse.jface.text.source.IVerticalRulerInfoExtension#getModel() - */ + @Override public IAnnotationModel getModel() { return fAnnotationModel; } - /* - * @see IVerticalRulerColumn#getControl() - */ + @Override public Control getControl() { return fCanvas; } - /* - * @see org.eclipse.jface.text.source.IVerticalRulerInfo#getWidth() - */ + @Override public int getWidth() { return fWidth; } @@ -469,6 +431,7 @@ public final class ChangeRulerColumn implements IChangeRulerColumn, IRevisionRul Display d= fCanvas.getDisplay(); if (d != null) { d.asyncExec(new Runnable() { + @Override public void run() { redraw(); } @@ -477,16 +440,12 @@ public final class ChangeRulerColumn implements IChangeRulerColumn, IRevisionRul } } - /* - * @see org.eclipse.jface.text.source.IVerticalRulerInfoExtension#addVerticalRulerListener(org.eclipse.jface.text.source.IVerticalRulerListener) - */ + @Override public void addVerticalRulerListener(IVerticalRulerListener listener) { throw new UnsupportedOperationException(); } - /* - * @see org.eclipse.jface.text.source.IVerticalRulerInfoExtension#removeVerticalRulerListener(org.eclipse.jface.text.source.IVerticalRulerListener) - */ + @Override public void removeVerticalRulerListener(IVerticalRulerListener listener) { throw new UnsupportedOperationException(); } @@ -542,9 +501,7 @@ public final class ChangeRulerColumn implements IChangeRulerColumn, IRevisionRul return visibleModelLines; } - /* - * @see org.eclipse.jface.text.revisions.IRevisionRulerColumn#setRevisionInformation(org.eclipse.jface.text.revisions.RevisionInformation) - */ + @Override public void setRevisionInformation(RevisionInformation info) { fRevisionPainter.setRevisionInformation(info); fRevisionPainter.setBackground(getBackground()); diff --git a/org.eclipse.jface.text/src/org/eclipse/jface/text/source/CompositeRuler.java b/org.eclipse.jface.text/src/org/eclipse/jface/text/source/CompositeRuler.java index 25785012f6a..fca69ff52fb 100644 --- a/org.eclipse.jface.text/src/org/eclipse/jface/text/source/CompositeRuler.java +++ b/org.eclipse.jface.text/src/org/eclipse/jface/text/source/CompositeRuler.java @@ -83,9 +83,7 @@ public class CompositeRuler implements IVerticalRuler, IVerticalRulerExtension, protected RulerLayout() { } - /* - * @see Layout#computeSize(Composite, int, int, boolean) - */ + @Override protected Point computeSize(Composite composite, int wHint, int hHint, boolean flushCache) { Control[] children= composite.getChildren(); Point size= new Point(0, 0); @@ -98,9 +96,7 @@ public class CompositeRuler implements IVerticalRuler, IVerticalRulerExtension, return size; } - /* - * @see Layout#layout(Composite, boolean) - */ + @Override protected void layout(Composite composite, boolean flushCache) { Rectangle clArea= composite.getClientArea(); int rulerHeight= clArea.height; @@ -147,6 +143,7 @@ public class CompositeRuler implements IVerticalRuler, IVerticalRulerExtension, public CompositeRulerCanvas(Composite parent, int style) { super(parent, style); fMenuDetectListener= new Listener() { + @Override public void handleEvent(Event event) { if (event.type == SWT.MenuDetect) { Menu menu= getMenu(); @@ -158,6 +155,7 @@ public class CompositeRuler implements IVerticalRuler, IVerticalRulerExtension, } }; super.addDisposeListener(new DisposeListener() { + @Override public void widgetDisposed(DisposeEvent e) { if (fCachedListeners != null) { fCachedListeners.clear(); @@ -354,89 +352,67 @@ public class CompositeRuler implements IVerticalRuler, IVerticalRulerExtension, } } - /* - * @see Control#removeControlListener(ControlListener) - */ + @Override public void removeControlListener(ControlListener listener) { removeListener(ControlListener.class, listener); super.removeControlListener(listener); } - /* - * @see Control#removeFocusListener(FocusListener) - */ + @Override public void removeFocusListener(FocusListener listener) { removeListener(FocusListener.class, listener); super.removeFocusListener(listener); } - /* - * @see Control#removeHelpListener(HelpListener) - */ + @Override public void removeHelpListener(HelpListener listener) { removeListener(HelpListener.class, listener); super.removeHelpListener(listener); } - /* - * @see Control#removeKeyListener(KeyListener) - */ + @Override public void removeKeyListener(KeyListener listener) { removeListener(KeyListener.class, listener); super.removeKeyListener(listener); } - /* - * @see Control#removeMouseListener(MouseListener) - */ + @Override public void removeMouseListener(MouseListener listener) { removeListener(MouseListener.class, listener); super.removeMouseListener(listener); } - /* - * @see Control#removeMouseMoveListener(MouseMoveListener) - */ + @Override public void removeMouseMoveListener(MouseMoveListener listener) { removeListener(MouseMoveListener.class, listener); super.removeMouseMoveListener(listener); } - /* - * @see Control#removeMouseTrackListener(MouseTrackListener) - */ + @Override public void removeMouseTrackListener(MouseTrackListener listener) { removeListener(MouseTrackListener.class, listener); super.removeMouseTrackListener(listener); } - /* - * @see Control#removePaintListener(PaintListener) - */ + @Override public void removePaintListener(PaintListener listener) { removeListener(PaintListener.class, listener); super.removePaintListener(listener); } - /* - * @see Control#removeTraverseListener(TraverseListener) - */ + @Override public void removeTraverseListener(TraverseListener listener) { removeListener(TraverseListener.class, listener); super.removeTraverseListener(listener); } - /* - * @see Widget#removeDisposeListener(DisposeListener) - */ + @Override public void removeDisposeListener(DisposeListener listener) { removeListener(DisposeListener.class, listener); super.removeDisposeListener(listener); } - /* - * @see Control#removeGestureListener(GestureListener) - */ + @Override public void removeGestureListener(GestureListener listener) { removeListener(GestureListener.class, listener); super.removeGestureListener(listener); @@ -445,54 +421,43 @@ public class CompositeRuler implements IVerticalRuler, IVerticalRulerExtension, /* * @seeControl#addControlListener(ControlListener) */ + @Override public void addControlListener(ControlListener listener) { super.addControlListener(listener); addListener(ControlListener.class, listener); } - /* - * @see Control#addFocusListener(FocusListener) - */ + @Override public void addFocusListener(FocusListener listener) { super.addFocusListener(listener); addListener(FocusListener.class, listener); } - /* - * @see Control#addHelpListener(HelpListener) - */ + @Override public void addHelpListener(HelpListener listener) { super.addHelpListener(listener); addListener(HelpListener.class, listener); } - /* - * @see Control#addKeyListener(KeyListener) - */ + @Override public void addKeyListener(KeyListener listener) { super.addKeyListener(listener); addListener(KeyListener.class, listener); } - /* - * @see Control#addMouseListener(MouseListener) - */ + @Override public void addMouseListener(MouseListener listener) { super.addMouseListener(listener); addListener(MouseListener.class, listener); } - /* - * @see Control#addMouseMoveListener(MouseMoveListener) - */ + @Override public void addMouseMoveListener(MouseMoveListener listener) { super.addMouseMoveListener(listener); addListener(MouseMoveListener.class, listener); } - /* - * @see Control#addMouseTrackListener(MouseTrackListener) - */ + @Override public void addMouseTrackListener(MouseTrackListener listener) { super.addMouseTrackListener(listener); addListener(MouseTrackListener.class, listener); @@ -501,30 +466,25 @@ public class CompositeRuler implements IVerticalRuler, IVerticalRulerExtension, /* * @seeControl#addPaintListener(PaintListener) */ + @Override public void addPaintListener(PaintListener listener) { super.addPaintListener(listener); addListener(PaintListener.class, listener); } - /* - * @see Control#addTraverseListener(TraverseListener) - */ + @Override public void addTraverseListener(TraverseListener listener) { super.addTraverseListener(listener); addListener(TraverseListener.class, listener); } - /* - * @see Widget#addDisposeListener(DisposeListener) - */ + @Override public void addDisposeListener(DisposeListener listener) { super.addDisposeListener(listener); addListener(DisposeListener.class, listener); } - /* - * @see Control#addGestureListener(GestureListener) - */ + @Override public void addGestureListener(GestureListener listener) { super.addGestureListener(listener); addListener(GestureListener.class, listener); @@ -635,16 +595,12 @@ public class CompositeRuler implements IVerticalRuler, IVerticalRulerExtension, ((Composite) parent).layout(true); } - /* - * @see IVerticalRuler#getControl() - */ + @Override public Control getControl() { return fComposite; } - /* - * @see IVerticalRuler#createControl(Composite, ITextViewer) - */ + @Override public Control createControl(Composite parent, ITextViewer textViewer) { fTextViewer= textViewer; @@ -662,9 +618,7 @@ public class CompositeRuler implements IVerticalRuler, IVerticalRulerExtension, return fComposite; } - /* - * @see IVerticalRuler#setModel(IAnnotationModel) - */ + @Override public void setModel(IAnnotationModel model) { fModel= model; @@ -676,21 +630,18 @@ public class CompositeRuler implements IVerticalRuler, IVerticalRulerExtension, } } - /* - * @see IVerticalRuler#getModel() - */ + @Override public IAnnotationModel getModel() { return fModel; } - /* - * @see IVerticalRuler#update() - */ + @Override public void update() { if (fComposite != null && !fComposite.isDisposed()) { Display d= fComposite.getDisplay(); if (d != null) { d.asyncExec(new Runnable() { + @Override public void run() { immediateUpdate(); } @@ -712,9 +663,7 @@ public class CompositeRuler implements IVerticalRuler, IVerticalRulerExtension, } } - /* - * @see IVerticalRulerExtension#setFont(Font) - */ + @Override public void setFont(Font font) { Iterator e= fDecorators.iterator(); while (e.hasNext()) { @@ -723,9 +672,7 @@ public class CompositeRuler implements IVerticalRuler, IVerticalRulerExtension, } } - /* - * @see IVerticalRulerInfo#getWidth() - */ + @Override public int getWidth() { int width= 0; Iterator e= fDecorators.iterator(); @@ -736,9 +683,7 @@ public class CompositeRuler implements IVerticalRuler, IVerticalRulerExtension, return Math.max(0, width - fGap); } - /* - * @see IVerticalRulerInfo#getLineOfLastMouseButtonActivity() - */ + @Override public int getLineOfLastMouseButtonActivity() { if (fLastMouseButtonActivityLine == -1) fLastMouseButtonActivityLine= toDocumentLineNumber(fLocation.y); @@ -747,9 +692,7 @@ public class CompositeRuler implements IVerticalRuler, IVerticalRulerExtension, return fLastMouseButtonActivityLine; } - /* - * @see IVerticalRulerInfo#toDocumentLineNumber(int) - */ + @Override public int toDocumentLineNumber(int y_coordinate) { if (fTextViewer == null || y_coordinate == -1) return -1; @@ -800,9 +743,7 @@ public class CompositeRuler implements IVerticalRuler, IVerticalRulerExtension, return fTextViewer; } - /* - * @see IVerticalRulerExtension#setLocationOfLastMouseButtonActivity(int, int) - */ + @Override public void setLocationOfLastMouseButtonActivity(int x, int y) { fLocation.x= x; fLocation.y= y; @@ -821,26 +762,17 @@ public class CompositeRuler implements IVerticalRuler, IVerticalRulerExtension, return fDecorators.iterator(); } - /* - * @see org.eclipse.jface.text.source.IVerticalRulerInfoExtension#getHover() - * @since 3.0 - */ + @Override public IAnnotationHover getHover() { return null; } - /* - * @see org.eclipse.jface.text.source.IVerticalRulerInfoExtension#addVerticalRulerListener(org.eclipse.jface.text.source.IVerticalRulerListener) - * @since 3.0 - */ + @Override public void addVerticalRulerListener(IVerticalRulerListener listener) { fAnnotationListeners.add(listener); } - /* - * @see org.eclipse.jface.text.source.IVerticalRulerInfoExtension#removeVerticalRulerListener(org.eclipse.jface.text.source.IVerticalRulerListener) - * @since 3.0 - */ + @Override public void removeVerticalRulerListener(IVerticalRulerListener listener) { fAnnotationListeners.remove(listener); } diff --git a/org.eclipse.jface.text/src/org/eclipse/jface/text/source/DefaultAnnotationHover.java b/org.eclipse.jface.text/src/org/eclipse/jface/text/source/DefaultAnnotationHover.java index 70ed3c67429..ade74e15b50 100644 --- a/org.eclipse.jface.text/src/org/eclipse/jface/text/source/DefaultAnnotationHover.java +++ b/org.eclipse.jface.text/src/org/eclipse/jface/text/source/DefaultAnnotationHover.java @@ -56,9 +56,7 @@ public class DefaultAnnotationHover implements IAnnotationHover { fShowLineNumber= showLineNumber; } - /* - * @see org.eclipse.jface.text.source.IAnnotationHover#getHoverInfo(org.eclipse.jface.text.source.ISourceViewer, int) - */ + @Override public String getHoverInfo(ISourceViewer sourceViewer, int lineNumber) { List javaAnnotations= getAnnotationsForLine(sourceViewer, lineNumber); if (javaAnnotations != null) { diff --git a/org.eclipse.jface.text/src/org/eclipse/jface/text/source/DefaultCharacterPairMatcher.java b/org.eclipse.jface.text/src/org/eclipse/jface/text/source/DefaultCharacterPairMatcher.java index f9dc9c9c558..d4a4c57337e 100644 --- a/org.eclipse.jface.text/src/org/eclipse/jface/text/source/DefaultCharacterPairMatcher.java +++ b/org.eclipse.jface.text/src/org/eclipse/jface/text/source/DefaultCharacterPairMatcher.java @@ -94,7 +94,7 @@ public class DefaultCharacterPairMatcher implements ICharacterPairMatcher, IChar this(chars, IDocumentExtension3.DEFAULT_PARTITIONING); } - /* @see ICharacterPairMatcher#match(IDocument, int) */ + @Override public IRegion match(IDocument doc, int offset) { if (doc == null || offset < 0 || offset > doc.getLength()) return null; try { @@ -109,6 +109,7 @@ public class DefaultCharacterPairMatcher implements ICharacterPairMatcher, IChar * int, int) * @since 3.8 */ + @Override public IRegion match(IDocument document, int offset, int length) { if (document == null || offset < 0 || offset > document.getLength() || Math.abs(length) > 1) return null; @@ -133,6 +134,7 @@ public class DefaultCharacterPairMatcher implements ICharacterPairMatcher, IChar * int, int) * @since 3.8 */ + @Override public IRegion findEnclosingPeerCharacters(IDocument document, int offset, int length) { if (document == null || offset < 0 || offset > document.getLength()) return null; @@ -163,6 +165,7 @@ public class DefaultCharacterPairMatcher implements ICharacterPairMatcher, IChar * @see org.eclipse.jface.text.source.ICharacterPairMatcherExtension#isMatchedChar(char) * @since 3.8 */ + @Override public boolean isMatchedChar(char ch) { return fPairs.contains(ch); } @@ -172,6 +175,7 @@ public class DefaultCharacterPairMatcher implements ICharacterPairMatcher, IChar * org.eclipse.jface.text.IDocument, int) * @since 3.8 */ + @Override public boolean isMatchedChar(char ch, IDocument document, int offset) { return isMatchedChar(ch); } @@ -181,6 +185,7 @@ public class DefaultCharacterPairMatcher implements ICharacterPairMatcher, IChar * org.eclipse.jface.text.IRegion, org.eclipse.jface.text.IRegion) * @since 3.8 */ + @Override public boolean isRecomputationOfEnclosingPairRequired(IDocument document, IRegion currentSelection, IRegion previousSelection) { int previousStartOffset= previousSelection.getOffset(); int currentStartOffset= currentSelection.getOffset(); @@ -445,15 +450,15 @@ public class DefaultCharacterPairMatcher implements ICharacterPairMatcher, IChar return -1; } - /* @see ICharacterPairMatcher#getAnchor() */ + @Override public int getAnchor() { return fAnchor; } - /* @see ICharacterPairMatcher#dispose() */ + @Override public void dispose() { } - /* @see ICharacterPairMatcher#clear() */ + @Override public void clear() { fAnchor= -1; } diff --git a/org.eclipse.jface.text/src/org/eclipse/jface/text/source/IAnnotationAccess.java b/org.eclipse.jface.text/src/org/eclipse/jface/text/source/IAnnotationAccess.java index 06c6ab18543..0342f0d581a 100644 --- a/org.eclipse.jface.text/src/org/eclipse/jface/text/source/IAnnotationAccess.java +++ b/org.eclipse.jface.text/src/org/eclipse/jface/text/source/IAnnotationAccess.java @@ -41,6 +41,7 @@ public interface IAnnotationAccess { * @return the type of the given annotation or <code>null</code> if it has none. * @deprecated use <code>Annotation.getType()</code> */ + @Deprecated Object getType(Annotation annotation); /** @@ -52,6 +53,7 @@ public interface IAnnotationAccess { * * @deprecated assumed to always return <code>true</code> */ + @Deprecated boolean isMultiLine(Annotation annotation); /** @@ -62,5 +64,6 @@ public interface IAnnotationAccess { * <code>false</code> otherwise * @deprecated use <code>Annotation.isPersistent()</code> */ + @Deprecated boolean isTemporary(Annotation annotation); } diff --git a/org.eclipse.jface.text/src/org/eclipse/jface/text/source/LineChangeHover.java b/org.eclipse.jface.text/src/org/eclipse/jface/text/source/LineChangeHover.java index 199ca232332..4b9df872431 100644 --- a/org.eclipse.jface.text/src/org/eclipse/jface/text/source/LineChangeHover.java +++ b/org.eclipse.jface.text/src/org/eclipse/jface/text/source/LineChangeHover.java @@ -34,9 +34,7 @@ import org.eclipse.jface.text.information.IInformationProviderExtension2; */ public class LineChangeHover implements IAnnotationHover, IAnnotationHoverExtension, IInformationProviderExtension2 { - /* - * @see org.eclipse.jface.text.source.IAnnotationHover#getHoverInfo(org.eclipse.jface.text.source.ISourceViewer, int) - */ + @Override public String getHoverInfo(ISourceViewer sourceViewer, int lineNumber) { return null; } @@ -240,9 +238,7 @@ public class LineChangeHover implements IAnnotationHover, IAnnotationHoverExtens return new Point(first, last); } - /* - * @see org.eclipse.jface.text.source.IAnnotationHoverExtension#getHoverInfo(org.eclipse.jface.text.source.ISourceViewer, org.eclipse.jface.text.source.ILineRange, int) - */ + @Override public Object getHoverInfo(ISourceViewer sourceViewer, ILineRange lineRange, int visibleLines) { int first= adaptFirstLine(sourceViewer, lineRange.getStartLine()); int last= adaptLastLine(sourceViewer, lineRange.getStartLine() + lineRange.getNumberOfLines() - 1); @@ -289,9 +285,7 @@ public class LineChangeHover implements IAnnotationHover, IAnnotationHoverExtens return lastLine; } - /* - * @see org.eclipse.jface.text.source.IAnnotationHoverExtension#getHoverLineRange(org.eclipse.jface.text.source.ISourceViewer, int) - */ + @Override public ILineRange getHoverLineRange(ISourceViewer viewer, int lineNumber) { IDocument document= viewer.getDocument(); if (document != null) { @@ -302,26 +296,20 @@ public class LineChangeHover implements IAnnotationHover, IAnnotationHoverExtens return null; } - /* - * @see org.eclipse.jface.text.source.IAnnotationHoverExtension#canHandleMouseCursor() - */ + @Override public boolean canHandleMouseCursor() { return false; } - /* - * @see org.eclipse.jface.text.source.IAnnotationHoverExtension#getHoverControlCreator() - */ + @Override public IInformationControlCreator getHoverControlCreator() { return null; } - /* - * @see org.eclipse.jface.text.information.IInformationProviderExtension2#getInformationPresenterControlCreator() - * @since 3.2 - */ + @Override public IInformationControlCreator getInformationPresenterControlCreator() { return new IInformationControlCreator() { + @Override public IInformationControl createInformationControl(Shell parent) { return new DefaultInformationControl(parent, (ToolBarManager)null, null); } diff --git a/org.eclipse.jface.text/src/org/eclipse/jface/text/source/LineNumberChangeRulerColumn.java b/org.eclipse.jface.text/src/org/eclipse/jface/text/source/LineNumberChangeRulerColumn.java index ee36bc93da7..daf6e4c4c96 100644 --- a/org.eclipse.jface.text/src/org/eclipse/jface/text/source/LineNumberChangeRulerColumn.java +++ b/org.eclipse.jface.text/src/org/eclipse/jface/text/source/LineNumberChangeRulerColumn.java @@ -68,9 +68,7 @@ public class LineNumberChangeRulerColumn extends LineNumberRulerColumn implement fDiffPainter= new DiffPainter(this, sharedColors); } - /* - * @see org.eclipse.jface.text.source.LineNumberRulerColumn#createControl(org.eclipse.jface.text.source.CompositeRuler, org.eclipse.swt.widgets.Composite) - */ + @Override public Control createControl(CompositeRuler parentRuler, Composite parentControl) { Control control= super.createControl(parentRuler, parentControl); fRevisionPainter.setParentRuler(parentRuler); @@ -78,23 +76,17 @@ public class LineNumberChangeRulerColumn extends LineNumberRulerColumn implement return control; } - /* - * @see org.eclipse.jface.text.source.IVerticalRulerInfo#getLineOfLastMouseButtonActivity() - */ + @Override public int getLineOfLastMouseButtonActivity() { return getParentRuler().getLineOfLastMouseButtonActivity(); } - /* - * @see org.eclipse.jface.text.source.IVerticalRulerInfo#toDocumentLineNumber(int) - */ + @Override public int toDocumentLineNumber(int y_coordinate) { return getParentRuler().toDocumentLineNumber(y_coordinate); } - /* - * @see IVerticalRulerColumn#setModel(IAnnotationModel) - */ + @Override public void setModel(IAnnotationModel model) { setAnnotationModel(model); fRevisionPainter.setModel(model); @@ -126,16 +118,12 @@ public class LineNumberChangeRulerColumn extends LineNumberRulerColumn implement } } - /* - * @see org.eclipse.jface.text.source.IVerticalRulerInfoExtension#getModel() - */ + @Override public IAnnotationModel getModel() { return fAnnotationModel; } - /* - * @see org.eclipse.jface.text.source.LineNumberRulerColumn#createDisplayString(int) - */ + @Override protected String createDisplayString(int line) { StringBuffer buffer= new StringBuffer(); if (fShowNumbers) @@ -145,9 +133,7 @@ public class LineNumberChangeRulerColumn extends LineNumberRulerColumn implement return buffer.toString(); } - /* - * @see org.eclipse.jface.text.source.LineNumberRulerColumn#computeNumberOfDigits() - */ + @Override protected int computeNumberOfDigits() { int digits; if (fCharacterDisplay && getModel() != null) { @@ -166,23 +152,17 @@ public class LineNumberChangeRulerColumn extends LineNumberRulerColumn implement return digits; } - /* - * @see org.eclipse.jface.text.source.IVerticalRulerInfoExtension#addVerticalRulerListener(org.eclipse.jface.text.source.IVerticalRulerListener) - */ + @Override public void addVerticalRulerListener(IVerticalRulerListener listener) { throw new UnsupportedOperationException(); } - /* - * @see org.eclipse.jface.text.source.IVerticalRulerInfoExtension#removeVerticalRulerListener(org.eclipse.jface.text.source.IVerticalRulerListener) - */ + @Override public void removeVerticalRulerListener(IVerticalRulerListener listener) { throw new UnsupportedOperationException(); } - /* - * @see org.eclipse.jface.text.source.LineNumberRulerColumn#doPaint(org.eclipse.swt.graphics.GC) - */ + @Override void doPaint(GC gc, ILineRange visibleLines) { Color foreground= gc.getForeground(); if (visibleLines != null) { @@ -196,9 +176,7 @@ public class LineNumberChangeRulerColumn extends LineNumberRulerColumn implement super.doPaint(gc, visibleLines); } - /* - * @see org.eclipse.jface.text.source.IVerticalRulerInfoExtension#getHover() - */ + @Override public IAnnotationHover getHover() { int activeLine= getParentRuler().getLineOfLastMouseButtonActivity(); if (fRevisionPainter.hasHover(activeLine)) @@ -208,47 +186,35 @@ public class LineNumberChangeRulerColumn extends LineNumberRulerColumn implement return null; } - /* - * @see org.eclipse.jface.text.source.IChangeRulerColumn#setHover(org.eclipse.jface.text.source.IAnnotationHover) - */ + @Override public void setHover(IAnnotationHover hover) { fRevisionPainter.setHover(hover); fDiffPainter.setHover(hover); } - /* - * @see org.eclipse.jface.text.source.IChangeRulerColumn#setBackground(org.eclipse.swt.graphics.Color) - */ + @Override public void setBackground(Color background) { super.setBackground(background); fRevisionPainter.setBackground(background); fDiffPainter.setBackground(background); } - /* - * @see org.eclipse.jface.text.source.IChangeRulerColumn#setAddedColor(org.eclipse.swt.graphics.Color) - */ + @Override public void setAddedColor(Color addedColor) { fDiffPainter.setAddedColor(addedColor); } - /* - * @see org.eclipse.jface.text.source.IChangeRulerColumn#setChangedColor(org.eclipse.swt.graphics.Color) - */ + @Override public void setChangedColor(Color changedColor) { fDiffPainter.setChangedColor(changedColor); } - /* - * @see org.eclipse.jface.text.source.IChangeRulerColumn#setDeletedColor(org.eclipse.swt.graphics.Color) - */ + @Override public void setDeletedColor(Color deletedColor) { fDiffPainter.setDeletedColor(deletedColor); } - /* - * @see org.eclipse.jface.text.revisions.IRevisionRulerColumn#setRevisionInformation(org.eclipse.jface.text.revisions.RevisionInformation) - */ + @Override public void setRevisionInformation(RevisionInformation info) { fRevisionPainter.setRevisionInformation(info); updateNumberOfDigits(); @@ -257,11 +223,8 @@ public class LineNumberChangeRulerColumn extends LineNumberRulerColumn implement postRedraw(); } - /* - * @see org.eclipse.jface.text.revisions.IRevisionRulerColumnExtension#getRevisionSelectionProvider() - * @since 3.2 - */ - public ISelectionProvider getRevisionSelectionProvider() { + @Override + public ISelectionProvider getRevisionSelectionProvider() { return fRevisionPainter.getRevisionSelectionProvider(); } @@ -269,7 +232,8 @@ public class LineNumberChangeRulerColumn extends LineNumberRulerColumn implement * @see org.eclipse.jface.text.revisions.IRevisionRulerColumnExtension#setRenderingMode(org.eclipse.jface.text.revisions.IRevisionRulerColumnExtension.RenderingMode) * @since 3.3 */ - public void setRevisionRenderingMode(RenderingMode renderingMode) { + @Override + public void setRevisionRenderingMode(RenderingMode renderingMode) { fRevisionPainter.setRenderingMode(renderingMode); } @@ -289,11 +253,8 @@ public class LineNumberChangeRulerColumn extends LineNumberRulerColumn implement } } - /* - * @see org.eclipse.jface.text.source.LineNumberRulerColumn#getWidth() - * @since 3.3 - */ - public int getWidth() { + @Override + public int getWidth() { int width= super.getWidth(); return width > 0 ? width : 8; // minimal width to display quick diff / revisions if no textual info is shown } @@ -331,10 +292,7 @@ public class LineNumberChangeRulerColumn extends LineNumberRulerColumn implement return fDiffPainter.hasInformation(); } - /* - * @see org.eclipse.jface.text.revisions.IRevisionRulerColumnExtension#showRevisionAuthor(boolean) - * @since 3.3 - */ + @Override public void showRevisionAuthor(boolean show) { fRevisionPainter.showRevisionAuthor(show); updateNumberOfDigits(); @@ -343,10 +301,7 @@ public class LineNumberChangeRulerColumn extends LineNumberRulerColumn implement postRedraw(); } - /* - * @see org.eclipse.jface.text.revisions.IRevisionRulerColumnExtension#showRevisionId(boolean) - * @since 3.3 - */ + @Override public void showRevisionId(boolean show) { fRevisionPainter.showRevisionId(show); updateNumberOfDigits(); @@ -355,26 +310,17 @@ public class LineNumberChangeRulerColumn extends LineNumberRulerColumn implement postRedraw(); } - /* - * @see org.eclipse.jface.text.revisions.IRevisionRulerColumnExtension#addRevisionListener(org.eclipse.jface.text.revisions.IRevisionListener) - * @since 3.3 - */ + @Override public void addRevisionListener(IRevisionListener listener) { fRevisionPainter.addRevisionListener(listener); } - /* - * @see org.eclipse.jface.text.revisions.IRevisionRulerColumnExtension#removeRevisionListener(org.eclipse.jface.text.revisions.IRevisionListener) - * @since 3.3 - */ + @Override public void removeRevisionListener(IRevisionListener listener) { fRevisionPainter.removeRevisionListener(listener); } - /* - * @see org.eclipse.jface.text.source.LineNumberRulerColumn#handleDispose() - * @since 3.3 - */ + @Override protected void handleDispose() { fRevisionPainter.setParentRuler(null); fRevisionPainter.setModel(null); @@ -383,6 +329,7 @@ public class LineNumberChangeRulerColumn extends LineNumberRulerColumn implement super.handleDispose(); } + @Override void handleMouseScrolled(MouseEvent e) { if (fRevisionPainter.isWheelHandlerInstalled()) { return; // scroll event is already handled; don't interfere diff --git a/org.eclipse.jface.text/src/org/eclipse/jface/text/source/LineNumberRulerColumn.java b/org.eclipse.jface.text/src/org/eclipse/jface/text/source/LineNumberRulerColumn.java index 679be320157..381680a78c2 100644 --- a/org.eclipse.jface.text/src/org/eclipse/jface/text/source/LineNumberRulerColumn.java +++ b/org.eclipse.jface.text/src/org/eclipse/jface/text/source/LineNumberRulerColumn.java @@ -70,17 +70,13 @@ public class LineNumberRulerColumn implements IVerticalRulerColumn { */ private boolean fCachedRedrawState= true; - /* - * @see IViewportListener#viewportChanged(int) - */ + @Override public void viewportChanged(int verticalPosition) { if (fCachedRedrawState && verticalPosition != fScrollPos) redraw(); } - /* - * @see ITextListener#textChanged(TextEvent) - */ + @Override public void textChanged(TextEvent event) { fCachedRedrawState= event.getViewerRedrawState(); @@ -116,9 +112,7 @@ public class LineNumberRulerColumn implements IVerticalRulerColumn { /* @since 3.2 */ private boolean fIsListeningForMove= false; - /* - * @see org.eclipse.swt.events.MouseListener#mouseUp(org.eclipse.swt.events.MouseEvent) - */ + @Override public void mouseUp(MouseEvent event) { // see bug 45700 if (event.button == 1) { @@ -127,9 +121,7 @@ public class LineNumberRulerColumn implements IVerticalRulerColumn { } } - /* - * @see org.eclipse.swt.events.MouseListener#mouseDown(org.eclipse.swt.events.MouseEvent) - */ + @Override public void mouseDown(MouseEvent event) { fParentRuler.setLocationOfLastMouseButtonActivity(event.x, event.y); // see bug 45700 @@ -138,18 +130,14 @@ public class LineNumberRulerColumn implements IVerticalRulerColumn { } } - /* - * @see org.eclipse.swt.events.MouseListener#mouseDoubleClick(org.eclipse.swt.events.MouseEvent) - */ + @Override public void mouseDoubleClick(MouseEvent event) { fParentRuler.setLocationOfLastMouseButtonActivity(event.x, event.y); stopSelecting(); stopAutoScroll(); } - /* - * @see org.eclipse.swt.events.MouseMoveListener#mouseMove(org.eclipse.swt.events.MouseEvent) - */ + @Override public void mouseMove(MouseEvent event) { if (fIsListeningForMove && !autoScroll(event)) { int newLine= fParentRuler.toDocumentLineNumber(event.y); @@ -322,6 +310,7 @@ public class LineNumberRulerColumn implements IVerticalRulerColumn { switch (direction) { case SWT.UP: timer= new Runnable() { + @Override public void run() { if (fAutoScrollDirection == SWT.UP) { int top= getInclusiveTopIndex(); @@ -336,6 +325,7 @@ public class LineNumberRulerColumn implements IVerticalRulerColumn { break; case SWT.DOWN: timer= new Runnable() { + @Override public void run() { if (fAutoScrollDirection == SWT.DOWN) { int top= getInclusiveTopIndex(); @@ -366,6 +356,7 @@ public class LineNumberRulerColumn implements IVerticalRulerColumn { return -1; } + @Override public void mouseScrolled(MouseEvent e) { handleMouseScrolled(e); } @@ -414,6 +405,7 @@ public class LineNumberRulerColumn implements IVerticalRulerColumn { * @since 3.0 */ private Runnable fRunnable= new Runnable() { + @Override public void run() { synchronized (fRunnableLock) { fIsRunnablePosted= false; @@ -473,9 +465,7 @@ public class LineNumberRulerColumn implements IVerticalRulerColumn { return fBackground; } - /* - * @see IVerticalRulerColumn#getControl() - */ + @Override public Control getControl() { return fCanvas; } @@ -483,6 +473,7 @@ public class LineNumberRulerColumn implements IVerticalRulerColumn { /* * @see IVerticalRuleColumnr#getWidth */ + @Override public int getWidth() { return fIndentation[0]; } @@ -581,9 +572,7 @@ public class LineNumberRulerColumn implements IVerticalRulerColumn { } } - /* - * @see IVerticalRulerColumn#createControl(CompositeRuler, Composite) - */ + @Override public Control createControl(CompositeRuler parentRuler, Composite parentControl) { fParentRuler= parentRuler; @@ -592,6 +581,7 @@ public class LineNumberRulerColumn implements IVerticalRulerColumn { // on word wrap toggle a "resized" ControlEvent is fired: suggest a redraw of the line ruler fCachedTextWidget.addControlListener(new ControlAdapter() { + @Override public void controlResized(ControlEvent e) { if (fCachedTextWidget != null && fCachedTextWidget.getWordWrap()) { postRedraw(); @@ -600,11 +590,8 @@ public class LineNumberRulerColumn implements IVerticalRulerColumn { }); fCanvas= new Canvas(parentControl, SWT.NO_FOCUS ) { - /* - * @see org.eclipse.swt.widgets.Control#addMouseListener(org.eclipse.swt.events.MouseListener) - * @since 3.4 - */ - public void addMouseListener(MouseListener listener) { + @Override + public void addMouseListener(MouseListener listener) { // see bug 40889, bug 230073 and AnnotationRulerColumn#isPropagatingMouseListener() if (listener == fMouseHandler) super.addMouseListener(listener); @@ -620,6 +607,7 @@ public class LineNumberRulerColumn implements IVerticalRulerColumn { fCanvas.setForeground(fForeground); fCanvas.addPaintListener(new PaintListener() { + @Override public void paintControl(PaintEvent event) { if (fCachedTextViewer != null) doubleBufferPaint(event.gc); @@ -627,6 +615,7 @@ public class LineNumberRulerColumn implements IVerticalRulerColumn { }); fCanvas.addDisposeListener(new DisposeListener() { + @Override public void widgetDisposed(DisposeEvent e) { handleDispose(); fCachedTextViewer= null; @@ -724,6 +713,7 @@ public class LineNumberRulerColumn implements IVerticalRulerColumn { * @deprecated as of 3.2 the number of lines in the viewport cannot be computed because * StyledText supports variable line heights */ + @Deprecated protected int getVisibleLinesInViewport() { return getVisibleLinesInViewport(fCachedTextWidget); } @@ -870,9 +860,7 @@ public class LineNumberRulerColumn implements IVerticalRulerColumn { } } - /* - * @see IVerticalRulerColumn#redraw() - */ + @Override public void redraw() { if (fRelayoutRequired) { @@ -892,15 +880,11 @@ public class LineNumberRulerColumn implements IVerticalRulerColumn { } } - /* - * @see IVerticalRulerColumn#setModel(IAnnotationModel) - */ + @Override public void setModel(IAnnotationModel model) { } - /* - * @see IVerticalRulerColumn#setFont(Font) - */ + @Override public void setFont(Font font) { fFont= font; if (fCanvas != null && !fCanvas.isDisposed()) { @@ -950,6 +934,7 @@ public class LineNumberRulerColumn implements IVerticalRulerColumn { * @deprecated this method should not be used - it relies on the widget using a uniform line * height */ + @Deprecated static int getVisibleLinesInViewport(StyledText textWidget) { if (textWidget != null) { Rectangle clArea= textWidget.getClientArea(); diff --git a/org.eclipse.jface.text/src/org/eclipse/jface/text/source/LineRange.java b/org.eclipse.jface.text/src/org/eclipse/jface/text/source/LineRange.java index 2223e0ebc86..a55a7456e0c 100644 --- a/org.eclipse.jface.text/src/org/eclipse/jface/text/source/LineRange.java +++ b/org.eclipse.jface.text/src/org/eclipse/jface/text/source/LineRange.java @@ -31,16 +31,12 @@ public final class LineRange implements ILineRange { fNumberOfLines= numberOfLines; } - /* - * @see org.eclipse.jface.text.source.ILineRange#getStartLine() - */ + @Override public int getStartLine() { return fStartLine; } - /* - * @see org.eclipse.jface.text.source.ILineRange#getNumberOfLines() - */ + @Override public int getNumberOfLines() { return fNumberOfLines; } diff --git a/org.eclipse.jface.text/src/org/eclipse/jface/text/source/MatchingCharacterPainter.java b/org.eclipse.jface.text/src/org/eclipse/jface/text/source/MatchingCharacterPainter.java index e8157155b5f..5c89834eb06 100644 --- a/org.eclipse.jface.text/src/org/eclipse/jface/text/source/MatchingCharacterPainter.java +++ b/org.eclipse.jface.text/src/org/eclipse/jface/text/source/MatchingCharacterPainter.java @@ -148,9 +148,7 @@ public final class MatchingCharacterPainter implements IPainter, PaintListener { fColor= color; } - /* - * @see org.eclipse.jface.text.IPainter#dispose() - */ + @Override public void dispose() { if (fMatcher != null) { if (fMatcher instanceof ICharacterPairMatcherExtension && fTextListener != null) { @@ -165,9 +163,7 @@ public final class MatchingCharacterPainter implements IPainter, PaintListener { fTextWidget= null; } - /* - * @see org.eclipse.jface.text.IPainter#deactivate(boolean) - */ + @Override public void deactivate(boolean redraw) { if (fIsActive) { fIsActive= false; @@ -180,9 +176,7 @@ public final class MatchingCharacterPainter implements IPainter, PaintListener { fPreviousSelection= null; } - /* - * @see org.eclipse.swt.events.PaintListener#paintControl(org.eclipse.swt.events.PaintEvent) - */ + @Override public void paintControl(PaintEvent event) { if (fTextWidget != null) handleDrawRequest(event.gc); @@ -303,9 +297,7 @@ public final class MatchingCharacterPainter implements IPainter, PaintListener { return new Region(viewerSelection.x, viewerSelection.y); } - /* - * @see org.eclipse.jface.text.IPainter#paint(int) - */ + @Override public void paint(int reason) { IDocument document= fSourceViewer.getDocument(); @@ -405,9 +397,7 @@ public final class MatchingCharacterPainter implements IPainter, PaintListener { } } - /* - * @see org.eclipse.jface.text.IPainter#setPositionManager(org.eclipse.jface.text.IPaintPositionManager) - */ + @Override public void setPositionManager(IPaintPositionManager manager) { fPaintPositionManager= manager; } @@ -445,6 +435,7 @@ public final class MatchingCharacterPainter implements IPainter, PaintListener { /** * @see org.eclipse.jface.text.ITextListener#textChanged(org.eclipse.jface.text.TextEvent) */ + @Override public void textChanged(TextEvent event) { if (!fHighlightEnclosingPeerCharacters || !(fMatcher instanceof ICharacterPairMatcherExtension)) return; diff --git a/org.eclipse.jface.text/src/org/eclipse/jface/text/source/OverviewRuler.java b/org.eclipse.jface.text/src/org/eclipse/jface/text/source/OverviewRuler.java index 1407e9d2620..153fc777685 100644 --- a/org.eclipse.jface.text/src/org/eclipse/jface/text/source/OverviewRuler.java +++ b/org.eclipse.jface.text/src/org/eclipse/jface/text/source/OverviewRuler.java @@ -80,6 +80,7 @@ public class OverviewRuler implements IOverviewRulerExtension, IOverviewRuler { /* * @see ITextListener#textChanged */ + @Override public void textChanged(TextEvent e) { if (fTextViewer != null && e.getDocumentEvent() == null && e.getViewerRedrawState()) { // handle only changes of visible document @@ -87,17 +88,12 @@ public class OverviewRuler implements IOverviewRulerExtension, IOverviewRuler { } } - /* - * @see IAnnotationModelListener#modelChanged(IAnnotationModel) - */ + @Override public void modelChanged(IAnnotationModel model) { update(); } - /* - * @see org.eclipse.jface.text.source.IAnnotationModelListenerExtension#modelChanged(org.eclipse.jface.text.source.AnnotationModelEvent) - * @since 3.3 - */ + @Override public void modelChanged(AnnotationModelEvent event) { if (!event.isValid()) return; @@ -215,15 +211,11 @@ public class OverviewRuler implements IOverviewRulerExtension, IOverviewRuler { return fType.equals(annotationType); } - /* - * @see Iterator#hasNext() - */ + @Override public boolean hasNext() { return fNext != null; } - /* - * @see Iterator#next() - */ + @Override public Object next() { try { return fNext; @@ -232,9 +224,7 @@ public class OverviewRuler implements IOverviewRulerExtension, IOverviewRuler { skip(); } } - /* - * @see Iterator#remove() - */ + @Override public void remove() { throw new UnsupportedOperationException(); } @@ -274,6 +264,7 @@ public class OverviewRuler implements IOverviewRulerExtension, IOverviewRuler { gc.drawLine(x, y + h, x + w, y + h); } + @Override public void paintControl(PaintEvent e) { if (fIndicatorColor == null) return; @@ -469,6 +460,7 @@ public class OverviewRuler implements IOverviewRulerExtension, IOverviewRuler { * @since 3.3 */ private Runnable fRunnable= new Runnable() { + @Override public void run() { synchronized (fRunnableLock) { fIsRunnablePosted= false; @@ -526,23 +518,17 @@ public class OverviewRuler implements IOverviewRulerExtension, IOverviewRuler { fIsTemporaryAnnotationDiscolored= discolorTemporaryAnnotation; } - /* - * @see org.eclipse.jface.text.source.IVerticalRulerInfo#getControl() - */ + @Override public Control getControl() { return fCanvas; } - /* - * @see org.eclipse.jface.text.source.IVerticalRulerInfo#getWidth() - */ + @Override public int getWidth() { return fWidth; } - /* - * @see org.eclipse.jface.text.source.IVerticalRuler#setModel(org.eclipse.jface.text.source.IAnnotationModel) - */ + @Override public void setModel(IAnnotationModel model) { if (model != fModel || model != null) { @@ -558,9 +544,7 @@ public class OverviewRuler implements IOverviewRulerExtension, IOverviewRuler { } } - /* - * @see org.eclipse.jface.text.source.IVerticalRuler#createControl(org.eclipse.swt.widgets.Composite, org.eclipse.jface.text.ITextViewer) - */ + @Override public Control createControl(Composite parent, ITextViewer textViewer) { fTextViewer= textViewer; @@ -575,6 +559,7 @@ public class OverviewRuler implements IOverviewRulerExtension, IOverviewRuler { * @see org.eclipse.swt.events.MouseTrackAdapter#mouseHover(org.eclipse.swt.events.MouseEvent) * @since 3.3 */ + @Override public void mouseEnter(MouseEvent e) { updateHeaderToolTipText(); } @@ -584,6 +569,7 @@ public class OverviewRuler implements IOverviewRulerExtension, IOverviewRuler { fCanvas= new Canvas(parent, SWT.NO_BACKGROUND); fCanvas.addPaintListener(new PaintListener() { + @Override public void paintControl(PaintEvent event) { if (fTextViewer != null) doubleBufferPaint(event.gc); @@ -591,6 +577,7 @@ public class OverviewRuler implements IOverviewRulerExtension, IOverviewRuler { }); fCanvas.addDisposeListener(new DisposeListener() { + @Override public void widgetDisposed(DisposeEvent event) { handleDispose(); fTextViewer= null; @@ -598,18 +585,21 @@ public class OverviewRuler implements IOverviewRulerExtension, IOverviewRuler { }); fCanvas.addMouseListener(new MouseAdapter() { + @Override public void mouseDown(MouseEvent event) { handleMouseDown(event); } }); fCanvas.addMouseMoveListener(new MouseMoveListener() { + @Override public void mouseMove(MouseEvent event) { handleMouseMove(event); } }); fCanvas.addMouseWheelListener(new MouseWheelListener() { + @Override public void mouseScrolled(MouseEvent e) { handleMouseScrolled(e); } @@ -619,6 +609,7 @@ public class OverviewRuler implements IOverviewRulerExtension, IOverviewRuler { fTextViewer.addTextListener(fInternalListener); // on word wrap toggle a "resized" ControlEvent is fired: suggest a redraw of the ruler fTextViewer.getTextWidget().addControlListener(new ControlAdapter() { + @Override public void controlResized(ControlEvent e) { if (fTextViewer == null) { return; @@ -886,10 +877,8 @@ public class OverviewRuler implements IOverviewRulerExtension, IOverviewRuler { return yy; } - /* - * @see org.eclipse.jface.text.source.IVerticalRuler#update() - */ - public void update() { + @Override + public void update() { if (fCanvas != null && !fCanvas.isDisposed()) { Display d= fCanvas.getDisplay(); if (d != null) { @@ -1163,9 +1152,7 @@ public class OverviewRuler implements IOverviewRulerExtension, IOverviewRuler { } } - /* - * @see org.eclipse.jface.text.source.IOverviewRuler#addAnnotationType(java.lang.Object) - */ + @Override public void addAnnotationType(Object annotationType) { synchronized (fRunnableLock){ fConfiguredAnnotationTypes.add(annotationType); @@ -1173,9 +1160,7 @@ public class OverviewRuler implements IOverviewRulerExtension, IOverviewRuler { } } - /* - * @see org.eclipse.jface.text.source.IOverviewRuler#removeAnnotationType(java.lang.Object) - */ + @Override public void removeAnnotationType(Object annotationType) { synchronized (fRunnableLock){ fConfiguredAnnotationTypes.remove(annotationType); @@ -1183,9 +1168,7 @@ public class OverviewRuler implements IOverviewRulerExtension, IOverviewRuler { } } - /* - * @see org.eclipse.jface.text.source.IOverviewRuler#setAnnotationTypeLayer(java.lang.Object, int) - */ + @Override public void setAnnotationTypeLayer(Object annotationType, int layer) { int j= fAnnotationsSortedByLayer.indexOf(annotationType); if (j != -1) { @@ -1204,9 +1187,7 @@ public class OverviewRuler implements IOverviewRulerExtension, IOverviewRuler { } } - /* - * @see org.eclipse.jface.text.source.IOverviewRuler#setAnnotationTypeColor(java.lang.Object, org.eclipse.swt.graphics.Color) - */ + @Override public void setAnnotationTypeColor(Object annotationType, Color color) { if (color != null) fAnnotationTypes2Colors.put(annotationType, color); @@ -1397,18 +1378,14 @@ public class OverviewRuler implements IOverviewRulerExtension, IOverviewRuler { return getColor(annotationType, temporary && fIsTemporaryAnnotationDiscolored ? 0.9 : 0.75); } - /* - * @see IVerticalRulerInfo#getLineOfLastMouseButtonActivity() - */ + @Override public int getLineOfLastMouseButtonActivity() { if (fLastMouseButtonActivityLine >= fTextViewer.getDocument().getNumberOfLines()) fLastMouseButtonActivityLine= -1; return fLastMouseButtonActivityLine; } - /* - * @see IVerticalRulerInfo#toDocumentLineNumber(int) - */ + @Override public int toDocumentLineNumber(int y_coordinate) { if (fTextViewer == null || y_coordinate == -1) @@ -1423,37 +1400,27 @@ public class OverviewRuler implements IOverviewRulerExtension, IOverviewRuler { return bestLine; } - /* - * @see org.eclipse.jface.text.source.IVerticalRuler#getModel() - */ + @Override public IAnnotationModel getModel() { return fModel; } - /* - * @see org.eclipse.jface.text.source.IOverviewRuler#getAnnotationHeight() - */ + @Override public int getAnnotationHeight() { return fAnnotationHeight; } - /* - * @see org.eclipse.jface.text.source.IOverviewRuler#hasAnnotation(int) - */ + @Override public boolean hasAnnotation(int y) { return findBestMatchingLineNumber(toLineNumbers(y, true)) != -1; } - /* - * @see org.eclipse.jface.text.source.IOverviewRuler#getHeaderControl() - */ + @Override public Control getHeaderControl() { return fHeader; } - /* - * @see org.eclipse.jface.text.source.IOverviewRuler#addHeaderAnnotationType(java.lang.Object) - */ + @Override public void addHeaderAnnotationType(Object annotationType) { synchronized (fRunnableLock) { fConfiguredHeaderAnnotationTypes.add(annotationType); @@ -1461,9 +1428,7 @@ public class OverviewRuler implements IOverviewRulerExtension, IOverviewRuler { } } - /* - * @see org.eclipse.jface.text.source.IOverviewRuler#removeHeaderAnnotationType(java.lang.Object) - */ + @Override public void removeHeaderAnnotationType(Object annotationType) { synchronized (fRunnableLock) { fConfiguredHeaderAnnotationTypes.remove(annotationType); @@ -1562,6 +1527,7 @@ public class OverviewRuler implements IOverviewRulerExtension, IOverviewRuler { * * @since 3.8 */ + @Override public void setUseSaturatedColors(boolean useSaturatedColor) { fUseSaturatedColors= useSaturatedColor; } diff --git a/org.eclipse.jface.text/src/org/eclipse/jface/text/source/OverviewRulerHoverManager.java b/org.eclipse.jface.text/src/org/eclipse/jface/text/source/OverviewRulerHoverManager.java index e10f80eb998..2ac3927ab89 100644 --- a/org.eclipse.jface.text/src/org/eclipse/jface/text/source/OverviewRulerHoverManager.java +++ b/org.eclipse.jface.text/src/org/eclipse/jface/text/source/OverviewRulerHoverManager.java @@ -46,9 +46,7 @@ class OverviewRulerHoverManager extends AnnotationBarHoverManager { } } - /* - * @see AbstractHoverInformationControlManager#computeInformation() - */ + @Override protected void computeInformation() { Point location= getHoverEventLocation(); int line= getVerticalRulerInfo().toDocumentLineNumber(location.y); diff --git a/org.eclipse.jface.text/src/org/eclipse/jface/text/source/SourceViewer.java b/org.eclipse.jface.text/src/org/eclipse/jface/text/source/SourceViewer.java index 58c90f58870..29ed1c65b3c 100644 --- a/org.eclipse.jface.text/src/org/eclipse/jface/text/source/SourceViewer.java +++ b/org.eclipse.jface.text/src/org/eclipse/jface/text/source/SourceViewer.java @@ -108,9 +108,7 @@ public class SourceViewer extends TextViewer implements ISourceViewer, ISourceVi fGap= gap; } - /* - * @see Layout#computeSize(Composite, int, int, boolean) - */ + @Override protected Point computeSize(Composite composite, int wHint, int hHint, boolean flushCache) { Control[] children= composite.getChildren(); Point s= children[children.length - 1].computeSize(SWT.DEFAULT, SWT.DEFAULT, flushCache); @@ -119,9 +117,7 @@ public class SourceViewer extends TextViewer implements ISourceViewer, ISourceVi return s; } - /* - * @see Layout#layout(Composite, boolean) - */ + @Override protected void layout(Composite composite, boolean flushCache) { Rectangle clArea= composite.getClientArea(); StyledText textWidget= getTextWidget(); @@ -388,9 +384,7 @@ public class SourceViewer extends TextViewer implements ISourceViewer, ISourceVi createControl(parent, styles); } - /* - * @see TextViewer#createControl(Composite, int) - */ + @Override protected void createControl(Composite parent, int styles) { if (fVerticalRuler != null || fOverviewRuler != null) { @@ -419,18 +413,14 @@ public class SourceViewer extends TextViewer implements ISourceViewer, ISourceVi return new RulerLayout(GAP_SIZE_1); } - /* - * @see TextViewer#getControl() - */ + @Override public Control getControl() { if (fComposite != null) return fComposite; return super.getControl(); } - /* - * @see ISourceViewer#setAnnotationHover(IAnnotationHover) - */ + @Override public void setAnnotationHover(IAnnotationHover annotationHover) { fAnnotationHover= annotationHover; } @@ -448,9 +438,7 @@ public class SourceViewer extends TextViewer implements ISourceViewer, ISourceVi fOverviewRulerAnnotationHover= annotationHover; } - /* - * @see ISourceViewer#configure(SourceViewerConfiguration) - */ + @Override public void configure(SourceViewerConfiguration configuration) { if (getTextWidget() == null) @@ -554,10 +542,7 @@ public class SourceViewer extends TextViewer implements ISourceViewer, ISourceVi } } - /* - * @see org.eclipse.jface.text.TextViewer#setHoverEnrichMode(org.eclipse.jface.text.ITextViewerExtension8.EnrichMode) - * @since 3.4 - */ + @Override public void setHoverEnrichMode(EnrichMode mode) { super.setHoverEnrichMode(mode); if (fVerticalRulerHoveringController != null) @@ -566,32 +551,24 @@ public class SourceViewer extends TextViewer implements ISourceViewer, ISourceVi fOverviewRulerHoveringController.getInternalAccessor().setHoverEnrichMode(mode); } - /* - * @see TextViewer#activatePlugins() - */ + @Override public void activatePlugins() { ensureAnnotationHoverManagerInstalled(); ensureOverviewHoverManagerInstalled(); super.activatePlugins(); } - /* - * @see ISourceViewer#setDocument(IDocument, IAnnotationModel) - */ + @Override public void setDocument(IDocument document) { setDocument(document, null, -1, -1); } - /* - * @see ISourceViewer#setDocument(IDocument, IAnnotationModel, int, int) - */ + @Override public void setDocument(IDocument document, int visibleRegionOffset, int visibleRegionLength) { setDocument(document, null, visibleRegionOffset, visibleRegionLength); } - /* - * @see ISourceViewer#setDocument(IDocument, IAnnotationModel) - */ + @Override public void setDocument(IDocument document, IAnnotationModel annotationModel) { setDocument(document, annotationModel, -1, -1); } @@ -626,9 +603,7 @@ public class SourceViewer extends TextViewer implements ISourceViewer, ISourceVi } } - /* - * @see ISourceViewer#setDocument(IDocument, IAnnotationModel, int, int) - */ + @Override public void setDocument(IDocument document, IAnnotationModel annotationModel, int modelRangeOffset, int modelRangeLength) { disposeVisualAnnotationModel(); @@ -656,9 +631,7 @@ public class SourceViewer extends TextViewer implements ISourceViewer, ISourceVi fOverviewRuler.setModel(fVisualAnnotationModel); } - /* - * @see ISourceViewer#getAnnotationModel() - */ + @Override public IAnnotationModel getAnnotationModel() { if (fVisualAnnotationModel instanceof IAnnotationModelExtension) { IAnnotationModelExtension extension= (IAnnotationModelExtension) fVisualAnnotationModel; @@ -667,10 +640,7 @@ public class SourceViewer extends TextViewer implements ISourceViewer, ISourceVi return null; } - /* - * @see org.eclipse.jface.text.source.ISourceViewerExtension3#getQuickAssistAssistant() - * @since 3.2 - */ + @Override public IQuickAssistAssistant getQuickAssistAssistant() { return fQuickAssistAssistant; } @@ -680,31 +650,23 @@ public class SourceViewer extends TextViewer implements ISourceViewer, ISourceVi * * @since 3.4 */ + @Override public final ContentAssistantFacade getContentAssistantFacade() { return fContentAssistantFacade; } - /* - * @see org.eclipse.jface.text.source.ISourceViewerExtension3#getQuickAssistInvocationContext() - * @since 3.2 - */ + @Override public IQuickAssistInvocationContext getQuickAssistInvocationContext() { Point selection= getSelectedRange(); return new TextInvocationContext(this, selection.x, selection.y); } - /* - * @see org.eclipse.jface.text.source.ISourceViewerExtension2#getVisualAnnotationModel() - * @since 3.0 - */ + @Override public IAnnotationModel getVisualAnnotationModel() { return fVisualAnnotationModel; } - /* - * @see org.eclipse.jface.text.source.ISourceViewerExtension2#unconfigure() - * @since 3.0 - */ + @Override public void unconfigure() { clearRememberedSelection(); @@ -763,9 +725,7 @@ public class SourceViewer extends TextViewer implements ISourceViewer, ISourceVi setHyperlinkDetectors(null, SWT.NONE); } - /* - * @see org.eclipse.jface.text.TextViewer#handleDispose() - */ + @Override protected void handleDispose() { unconfigure(); @@ -781,9 +741,7 @@ public class SourceViewer extends TextViewer implements ISourceViewer, ISourceVi super.handleDispose(); } - /* - * @see ITextOperationTarget#canDoOperation(int) - */ + @Override public boolean canDoOperation(int operation) { if (getTextWidget() == null || (!redraws() && operation != FORMAT)) @@ -959,9 +917,7 @@ public class SourceViewer extends TextViewer implements ISourceViewer, ISourceVi fSelectionCategory= null; } - /* - * @see ITextOperationTarget#doOperation(int) - */ + @Override public void doOperation(int operation) { if (getTextWidget() == null || (!redraws() && operation != FORMAT)) @@ -1090,10 +1046,7 @@ public class SourceViewer extends TextViewer implements ISourceViewer, ISourceVi } } - /* - * @see ITextOperationTargetExtension#enableOperation(int, boolean) - * @since 2.0 - */ + @Override public void enableOperation(int operation, boolean enable) { switch (operation) { @@ -1132,16 +1085,12 @@ public class SourceViewer extends TextViewer implements ISourceViewer, ISourceVi } } - /* - * @see ISourceViewer#setRangeIndicator(Annotation) - */ + @Override public void setRangeIndicator(Annotation rangeIndicator) { fRangeIndicator= rangeIndicator; } - /* - * @see ISourceViewer#setRangeIndication(int, int, boolean) - */ + @Override public void setRangeIndication(int start, int length, boolean moveCursor) { if (moveCursor) { @@ -1155,9 +1104,7 @@ public class SourceViewer extends TextViewer implements ISourceViewer, ISourceVi } } - /* - * @see ISourceViewer#getRangeIndication() - */ + @Override public IRegion getRangeIndication() { if (fRangeIndicator != null && fVisualAnnotationModel != null) { Position position= fVisualAnnotationModel.getPosition(fRangeIndicator); @@ -1168,17 +1115,13 @@ public class SourceViewer extends TextViewer implements ISourceViewer, ISourceVi return null; } - /* - * @see ISourceViewer#removeRangeIndication() - */ + @Override public void removeRangeIndication() { if (fRangeIndicator != null && fVisualAnnotationModel != null) fVisualAnnotationModel.removeAnnotation(fRangeIndicator); } - /* - * @see ISourceViewer#showAnnotations(boolean) - */ + @Override public void showAnnotations(boolean show) { boolean old= fIsVerticalRulerVisible; @@ -1249,10 +1192,7 @@ public class SourceViewer extends TextViewer implements ISourceViewer, ISourceVi } } - /* - * @see org.eclipse.jface.text.source.ISourceViewerExtension#showAnnotationsOverview(boolean) - * @since 2.1 - */ + @Override public void showAnnotationsOverview(boolean show) { boolean old= fIsOverviewRulerVisible; fIsOverviewRulerVisible= (show && fOverviewRuler != null); @@ -1268,11 +1208,8 @@ public class SourceViewer extends TextViewer implements ISourceViewer, ISourceVi } } - /* - * @see org.eclipse.jface.text.source.ISourceViewerExtension3#getCurrentAnnotationHover() - * @since 3.2 - */ - public IAnnotationHover getCurrentAnnotationHover() { + @Override + public IAnnotationHover getCurrentAnnotationHover() { if (fVerticalRulerHoveringController == null) return null; return fVerticalRulerHoveringController.getCurrentAnnotationHover(); diff --git a/org.eclipse.jface.text/src/org/eclipse/jface/text/source/SourceViewerConfiguration.java b/org.eclipse.jface.text/src/org/eclipse/jface/text/source/SourceViewerConfiguration.java index 4e87f5ec3e6..54e96502d42 100644 --- a/org.eclipse.jface.text/src/org/eclipse/jface/text/source/SourceViewerConfiguration.java +++ b/org.eclipse.jface.text/src/org/eclipse/jface/text/source/SourceViewerConfiguration.java @@ -160,6 +160,7 @@ public class SourceViewerConfiguration { * @return the auto indent strategy or <code>null</code> if automatic indentation is not to be enabled * @deprecated since 3.1 use {@link #getAutoEditStrategies(ISourceViewer, String)} instead */ + @Deprecated public org.eclipse.jface.text.IAutoIndentStrategy getAutoIndentStrategy(ISourceViewer sourceViewer, String contentType) { return new org.eclipse.jface.text.DefaultAutoIndentStrategy(); } @@ -328,6 +329,7 @@ public class SourceViewerConfiguration { */ public IInformationControlCreator getInformationControlCreator(ISourceViewer sourceViewer) { return new IInformationControlCreator() { + @Override public IInformationControl createInformationControl(Shell parent) { return new DefaultInformationControl(parent); } diff --git a/org.eclipse.jface.text/src/org/eclipse/jface/text/source/TextInvocationContext.java b/org.eclipse.jface.text/src/org/eclipse/jface/text/source/TextInvocationContext.java index 11ba045cc81..87a9fa05d4d 100644 --- a/org.eclipse.jface.text/src/org/eclipse/jface/text/source/TextInvocationContext.java +++ b/org.eclipse.jface.text/src/org/eclipse/jface/text/source/TextInvocationContext.java @@ -33,23 +33,17 @@ public class TextInvocationContext implements IQuickAssistInvocationContext { fLength= length; } - /* - * @see org.eclipse.jface.text.quickassist.IQuickAssistInvocationContext#getOffset() - */ + @Override public int getOffset() { return fOffset; } - /* - * @see org.eclipse.jface.text.quickassist.IQuickAssistInvocationContext#getLength() - */ + @Override public int getLength() { return fLength; } - /* - * @see org.eclipse.jface.text.quickassist.IQuickAssistInvocationContext#getSourceViewer() - */ + @Override public ISourceViewer getSourceViewer() { return fSourceViewer; } diff --git a/org.eclipse.jface.text/src/org/eclipse/jface/text/source/VerticalRuler.java b/org.eclipse.jface.text/src/org/eclipse/jface/text/source/VerticalRuler.java index 4efa04e9dab..005c8c21a90 100644 --- a/org.eclipse.jface.text/src/org/eclipse/jface/text/source/VerticalRuler.java +++ b/org.eclipse.jface.text/src/org/eclipse/jface/text/source/VerticalRuler.java @@ -63,24 +63,18 @@ public final class VerticalRuler implements IVerticalRuler, IVerticalRulerExtens */ class InternalListener implements IViewportListener, IAnnotationModelListener, ITextListener { - /* - * @see IViewportListener#viewportChanged(int) - */ + @Override public void viewportChanged(int verticalPosition) { if (verticalPosition != fScrollPos) redraw(); } - /* - * @see IAnnotationModelListener#modelChanged(IAnnotationModel) - */ + @Override public void modelChanged(IAnnotationModel model) { update(); } - /* - * @see ITextListener#textChanged(TextEvent) - */ + @Override public void textChanged(TextEvent e) { if (fTextViewer != null && e.getViewerRedrawState()) redraw(); @@ -138,16 +132,12 @@ public final class VerticalRuler implements IVerticalRuler, IVerticalRulerExtens fAnnotationAccess= annotationAcccess; } - /* - * @see IVerticalRuler#getControl() - */ + @Override public Control getControl() { return fCanvas; } - /* - * @see IVerticalRuler#createControl(Composite, ITextViewer) - */ + @Override public Control createControl(Composite parent, ITextViewer textViewer) { fTextViewer= textViewer; @@ -155,6 +145,7 @@ public final class VerticalRuler implements IVerticalRuler, IVerticalRulerExtens fCanvas= new Canvas(parent, SWT.NO_BACKGROUND); fCanvas.addPaintListener(new PaintListener() { + @Override public void paintControl(PaintEvent event) { if (fTextViewer != null) doubleBufferPaint(event.gc); @@ -162,6 +153,7 @@ public final class VerticalRuler implements IVerticalRuler, IVerticalRulerExtens }); fCanvas.addDisposeListener(new DisposeListener() { + @Override public void widgetDisposed(DisposeEvent e) { handleDispose(); fTextViewer= null; @@ -169,13 +161,16 @@ public final class VerticalRuler implements IVerticalRuler, IVerticalRulerExtens }); fCanvas.addMouseListener(new MouseListener() { + @Override public void mouseUp(MouseEvent event) { } + @Override public void mouseDown(MouseEvent event) { fLastMouseButtonActivityLine= toDocumentLineNumber(event.y); } + @Override public void mouseDoubleClick(MouseEvent event) { fLastMouseButtonActivityLine= toDocumentLineNumber(event.y); } @@ -451,14 +446,13 @@ public final class VerticalRuler implements IVerticalRuler, IVerticalRulerExtens * Thread-safe implementation. * Can be called from any thread. */ - /* - * @see IVerticalRuler#update() - */ + @Override public void update() { if (fCanvas != null && !fCanvas.isDisposed()) { Display d= fCanvas.getDisplay(); if (d != null) { d.asyncExec(new Runnable() { + @Override public void run() { redraw(); } @@ -483,9 +477,7 @@ public final class VerticalRuler implements IVerticalRuler, IVerticalRulerExtens } } - /* - * @see IVerticalRuler#setModel(IAnnotationModel) - */ + @Override public void setModel(IAnnotationModel model) { if (model != fModel) { @@ -501,23 +493,17 @@ public final class VerticalRuler implements IVerticalRuler, IVerticalRulerExtens } } - /* - * @see IVerticalRuler#getModel() - */ + @Override public IAnnotationModel getModel() { return fModel; } - /* - * @see IVerticalRulerInfo#getWidth() - */ + @Override public int getWidth() { return fWidth; } - /* - * @see IVerticalRulerInfo#getLineOfLastMouseButtonActivity() - */ + @Override public int getLineOfLastMouseButtonActivity() { IDocument doc= fTextViewer.getDocument(); if (doc == null || fLastMouseButtonActivityLine >= fTextViewer.getDocument().getNumberOfLines()) @@ -525,9 +511,7 @@ public final class VerticalRuler implements IVerticalRuler, IVerticalRulerExtens return fLastMouseButtonActivityLine; } - /* - * @see IVerticalRulerInfo#toDocumentLineNumber(int) - */ + @Override public int toDocumentLineNumber(int y_coordinate) { if (fTextViewer == null || y_coordinate == -1) return -1; @@ -568,17 +552,11 @@ public final class VerticalRuler implements IVerticalRuler, IVerticalRulerExtens return widgetLine; } - /* - * @see IVerticalRulerExtension#setFont(Font) - * @since 2.0 - */ + @Override public void setFont(Font font) { } - /* - * @see IVerticalRulerExtension#setLocationOfLastMouseButtonActivity(int, int) - * @since 2.0 - */ + @Override public void setLocationOfLastMouseButtonActivity(int x, int y) { fLastMouseButtonActivityLine= toDocumentLineNumber(y); } @@ -590,6 +568,7 @@ public final class VerticalRuler implements IVerticalRuler, IVerticalRulerExtens * @deprecated will be removed * @since 2.0 */ + @Deprecated public void addMouseListener(MouseListener listener) { if (fCanvas != null && !fCanvas.isDisposed()) fCanvas.addMouseListener(listener); @@ -602,6 +581,7 @@ public final class VerticalRuler implements IVerticalRuler, IVerticalRulerExtens * @deprecated will be removed * @since 2.0 */ + @Deprecated public void removeMouseListener(MouseListener listener) { if (fCanvas != null && !fCanvas.isDisposed()) fCanvas.removeMouseListener(listener); diff --git a/org.eclipse.jface.text/src/org/eclipse/jface/text/templates/InclusivePositionUpdater.java b/org.eclipse.jface.text/src/org/eclipse/jface/text/templates/InclusivePositionUpdater.java index ae720402dfc..56843437a89 100644 --- a/org.eclipse.jface.text/src/org/eclipse/jface/text/templates/InclusivePositionUpdater.java +++ b/org.eclipse.jface.text/src/org/eclipse/jface/text/templates/InclusivePositionUpdater.java @@ -35,9 +35,7 @@ class InclusivePositionUpdater implements IPositionUpdater { fCategory= category; } - /* - * @see org.eclipse.jface.text.IPositionUpdater#update(org.eclipse.jface.text.DocumentEvent) - */ + @Override public void update(DocumentEvent event) { int eventOffset= event.getOffset(); diff --git a/org.eclipse.jface.text/src/org/eclipse/jface/text/templates/PositionBasedCompletionProposal.java b/org.eclipse.jface.text/src/org/eclipse/jface/text/templates/PositionBasedCompletionProposal.java index f969eae1cac..e4d3de3bf63 100644 --- a/org.eclipse.jface.text/src/org/eclipse/jface/text/templates/PositionBasedCompletionProposal.java +++ b/org.eclipse.jface.text/src/org/eclipse/jface/text/templates/PositionBasedCompletionProposal.java @@ -85,9 +85,7 @@ final class PositionBasedCompletionProposal implements ICompletionProposal, ICom fAdditionalProposalInfo= additionalProposalInfo; } - /* - * @see ICompletionProposal#apply(IDocument) - */ + @Override public void apply(IDocument document) { try { document.replace(fReplacementPosition.getOffset(), fReplacementPosition.getLength(), fReplacementString); @@ -96,65 +94,47 @@ final class PositionBasedCompletionProposal implements ICompletionProposal, ICom } } - /* - * @see ICompletionProposal#getSelection(IDocument) - */ + @Override public Point getSelection(IDocument document) { return new Point(fReplacementPosition.getOffset() + fCursorPosition, 0); } - /* - * @see ICompletionProposal#getContextInformation() - */ + @Override public IContextInformation getContextInformation() { return fContextInformation; } - /* - * @see ICompletionProposal#getImage() - */ + @Override public Image getImage() { return fImage; } - /* - * @see org.eclipse.jface.text.contentassist.ICompletionProposal#getDisplayString() - */ + @Override public String getDisplayString() { if (fDisplayString != null) return fDisplayString; return fReplacementString; } - /* - * @see ICompletionProposal#getAdditionalProposalInfo() - */ + @Override public String getAdditionalProposalInfo() { return fAdditionalProposalInfo; } - /* - * @see org.eclipse.jface.text.contentassist.ICompletionProposalExtension2#apply(org.eclipse.jface.text.ITextViewer, char, int, int) - */ + @Override public void apply(ITextViewer viewer, char trigger, int stateMask, int offset) { apply(viewer.getDocument()); } - /* - * @see org.eclipse.jface.text.contentassist.ICompletionProposalExtension2#selected(org.eclipse.jface.text.ITextViewer, boolean) - */ + @Override public void selected(ITextViewer viewer, boolean smartToggle) { } - /* - * @see org.eclipse.jface.text.contentassist.ICompletionProposalExtension2#unselected(org.eclipse.jface.text.ITextViewer) - */ + @Override public void unselected(ITextViewer viewer) { } - /* - * @see org.eclipse.jface.text.contentassist.ICompletionProposalExtension2#validate(org.eclipse.jface.text.IDocument, int, org.eclipse.jface.text.DocumentEvent) - */ + @Override public boolean validate(IDocument document, int offset, DocumentEvent event) { try { String content= document.get(fReplacementPosition.getOffset(), offset - fReplacementPosition.getOffset()); diff --git a/org.eclipse.jface.text/src/org/eclipse/jface/text/templates/TemplateCompletionProcessor.java b/org.eclipse.jface.text/src/org/eclipse/jface/text/templates/TemplateCompletionProcessor.java index ed90bca39b7..f3d6e7ae19e 100644 --- a/org.eclipse.jface.text/src/org/eclipse/jface/text/templates/TemplateCompletionProcessor.java +++ b/org.eclipse.jface.text/src/org/eclipse/jface/text/templates/TemplateCompletionProcessor.java @@ -39,6 +39,7 @@ import org.eclipse.jface.text.contentassist.IContextInformationValidator; public abstract class TemplateCompletionProcessor implements IContentAssistProcessor { private static final class ProposalComparator implements Comparator { + @Override public int compare(Object o1, Object o2) { return ((TemplateProposal) o2).getRelevance() - ((TemplateProposal) o1).getRelevance(); } @@ -46,10 +47,7 @@ public abstract class TemplateCompletionProcessor implements IContentAssistProce private static final Comparator fgProposalComparator= new ProposalComparator(); - /* - * @see org.eclipse.jface.text.contentassist.IContentAssistProcessor#computeCompletionProposals(org.eclipse.jface.text.ITextViewer, - * int) - */ + @Override public ICompletionProposal[] computeCompletionProposals(ITextViewer viewer, int offset) { ITextSelection selection= (ITextSelection) viewer.getSelectionProvider().getSelection(); @@ -101,6 +99,7 @@ public abstract class TemplateCompletionProcessor implements IContentAssistProce * @deprecated use the version specifying <code>IRegion</code> as third parameter * @since 3.1 */ + @Deprecated protected ICompletionProposal createProposal(Template template, TemplateContext context, Region region, int relevance) { return createProposal(template, context, (IRegion) region, relevance); } @@ -214,37 +213,27 @@ public abstract class TemplateCompletionProcessor implements IContentAssistProce */ protected abstract Image getImage(Template template); - /* - * @see org.eclipse.jface.text.contentassist.IContentAssistProcessor#computeContextInformation(org.eclipse.jface.text.ITextViewer, int) - */ + @Override public IContextInformation[] computeContextInformation(ITextViewer viewer, int documentOffset) { return null; } - /* - * @see org.eclipse.jface.text.contentassist.IContentAssistProcessor#getCompletionProposalAutoActivationCharacters() - */ + @Override public char[] getCompletionProposalAutoActivationCharacters() { return null; } - /* - * @see org.eclipse.jface.text.contentassist.IContentAssistProcessor#getContextInformationAutoActivationCharacters() - */ + @Override public char[] getContextInformationAutoActivationCharacters() { return null; } - /* - * @see org.eclipse.jface.text.contentassist.IContentAssistProcessor#getErrorMessage() - */ + @Override public String getErrorMessage() { return null; } - /* - * @see org.eclipse.jface.text.contentassist.IContentAssistProcessor#getContextInformationValidator() - */ + @Override public IContextInformationValidator getContextInformationValidator() { return null; } diff --git a/org.eclipse.jface.text/src/org/eclipse/jface/text/templates/TemplateProposal.java b/org.eclipse.jface.text/src/org/eclipse/jface/text/templates/TemplateProposal.java index b4449a75a7d..3e10c2bef56 100644 --- a/org.eclipse.jface.text/src/org/eclipse/jface/text/templates/TemplateProposal.java +++ b/org.eclipse.jface.text/src/org/eclipse/jface/text/templates/TemplateProposal.java @@ -132,6 +132,8 @@ public class TemplateProposal implements ICompletionProposal, ICompletionProposa * @deprecated This method is no longer called by the framework and clients should overwrite * {@link #apply(ITextViewer, char, int, int)} instead */ + @Deprecated + @Override public final void apply(IDocument document) { // not called anymore } @@ -146,6 +148,7 @@ public class TemplateProposal implements ICompletionProposal, ICompletionProposa * @param stateMask {@inheritDoc} * @param offset {@inheritDoc} */ + @Override public void apply(ITextViewer viewer, char trigger, int stateMask, int offset) { IDocument document= viewer.getDocument(); @@ -245,14 +248,14 @@ public class TemplateProposal implements ICompletionProposal, ICompletionProposa model.addLinkingListener(new ILinkedModeListener() { - /* - * @see org.eclipse.jface.text.link.ILinkedModeListener#left(org.eclipse.jface.text.link.LinkedModeModel, int) - */ + @Override public void left(LinkedModeModel environment, int flags) { ensurePositionCategoryRemoved(document); } + @Override public void suspend(LinkedModeModel environment) {} + @Override public void resume(LinkedModeModel environment, int flags) {} }); } @@ -323,16 +326,12 @@ public class TemplateProposal implements ICompletionProposal, ICompletionProposa return end; } - /* - * @see ICompletionProposal#getSelection(IDocument) - */ + @Override public Point getSelection(IDocument document) { return new Point(fSelectedRegion.getOffset(), fSelectedRegion.getLength()); } - /* - * @see ICompletionProposal#getAdditionalProposalInfo() - */ + @Override public String getAdditionalProposalInfo() { try { fContext.setReadOnly(true); @@ -350,9 +349,7 @@ public class TemplateProposal implements ICompletionProposal, ICompletionProposa } } - /* - * @see ICompletionProposal#getDisplayString() - */ + @Override public String getDisplayString() { if (fDisplayString == null) { String[] arguments= new String[] { fTemplate.getName(), fTemplate.getDescription() }; @@ -361,16 +358,12 @@ public class TemplateProposal implements ICompletionProposal, ICompletionProposa return fDisplayString; } - /* - * @see ICompletionProposal#getImage() - */ + @Override public Image getImage() { return fImage; } - /* - * @see ICompletionProposal#getContextInformation() - */ + @Override public IContextInformation getContextInformation() { return null; } @@ -388,28 +381,20 @@ public class TemplateProposal implements ICompletionProposal, ICompletionProposa return fRelevance; } - /* - * @see org.eclipse.jface.text.contentassist.ICompletionProposalExtension3#getInformationControlCreator() - */ + @Override public IInformationControlCreator getInformationControlCreator() { return fInformationControlCreator; } - /* - * @see org.eclipse.jface.text.contentassist.ICompletionProposalExtension2#selected(org.eclipse.jface.text.ITextViewer, boolean) - */ + @Override public void selected(ITextViewer viewer, boolean smartToggle) { } - /* - * @see org.eclipse.jface.text.contentassist.ICompletionProposalExtension2#unselected(org.eclipse.jface.text.ITextViewer) - */ + @Override public void unselected(ITextViewer viewer) { } - /* - * @see org.eclipse.jface.text.contentassist.ICompletionProposalExtension2#validate(org.eclipse.jface.text.IDocument, int, org.eclipse.jface.text.DocumentEvent) - */ + @Override public boolean validate(IDocument document, int offset, DocumentEvent event) { try { int replaceOffset= getReplaceOffset(); @@ -423,16 +408,12 @@ public class TemplateProposal implements ICompletionProposal, ICompletionProposa return false; } - /* - * @see org.eclipse.jface.text.contentassist.ICompletionProposalExtension3#getPrefixCompletionText(org.eclipse.jface.text.IDocument, int) - */ + @Override public CharSequence getPrefixCompletionText(IDocument document, int completionOffset) { return fTemplate.getName(); } - /* - * @see org.eclipse.jface.text.contentassist.ICompletionProposalExtension3#getPrefixCompletionStart(org.eclipse.jface.text.IDocument, int) - */ + @Override public int getPrefixCompletionStart(IDocument document, int completionOffset) { return getReplaceOffset(); } @@ -443,29 +424,25 @@ public class TemplateProposal implements ICompletionProposal, ICompletionProposa * @deprecated This method is no longer called by the framework and clients should overwrite * {@link #apply(ITextViewer, char, int, int)} instead */ + @Deprecated + @Override public void apply(IDocument document, char trigger, int offset) { // not called any longer } - /* - * @see org.eclipse.jface.text.contentassist.ICompletionProposalExtension#isValidFor(org.eclipse.jface.text.IDocument, int) - */ + @Override public boolean isValidFor(IDocument document, int offset) { // not called any longer return false; } - /* - * @see org.eclipse.jface.text.contentassist.ICompletionProposalExtension#getTriggerCharacters() - */ + @Override public char[] getTriggerCharacters() { // no triggers return new char[0]; } - /* - * @see org.eclipse.jface.text.contentassist.ICompletionProposalExtension#getContextInformationPosition() - */ + @Override public int getContextInformationPosition() { return fRegion.getOffset(); } diff --git a/org.eclipse.jface.text/src/org/eclipse/jface/text/templates/persistence/TemplateStore.java b/org.eclipse.jface.text/src/org/eclipse/jface/text/templates/persistence/TemplateStore.java index c4fb28d3c47..edbdbcab920 100644 --- a/org.eclipse.jface.text/src/org/eclipse/jface/text/templates/persistence/TemplateStore.java +++ b/org.eclipse.jface.text/src/org/eclipse/jface/text/templates/persistence/TemplateStore.java @@ -120,6 +120,7 @@ public class TemplateStore { public final void startListeningForPreferenceChanges() { if (fPropertyListener == null) { fPropertyListener= new IPropertyChangeListener() { + @Override public void propertyChange(PropertyChangeEvent event) { /* * Don't load if we are in the process of saving ourselves. We are in sync anyway after the diff --git a/org.eclipse.search.tests/src/org/eclipse/search/core/tests/LineConversionTest.java b/org.eclipse.search.tests/src/org/eclipse/search/core/tests/LineConversionTest.java index 7066d89bbf2..21ebb12cf3d 100644 --- a/org.eclipse.search.tests/src/org/eclipse/search/core/tests/LineConversionTest.java +++ b/org.eclipse.search.tests/src/org/eclipse/search/core/tests/LineConversionTest.java @@ -41,6 +41,7 @@ public class LineConversionTest extends TestCase { private static final String LINE_ONE= "This is the first line\n"; private static final String LINE_THREE= "This is the third line"; + @Override protected void setUp() throws Exception { IProject project= ResourcesPlugin.getWorkspace().getRoot().getProject("Test"); project.create(null); @@ -50,6 +51,7 @@ public class LineConversionTest extends TestCase { super.setUp(); } + @Override protected void tearDown() throws Exception { SearchPlugin.getActivePage().closeAllEditors(false); fFile.getProject().delete(true, true, null); diff --git a/org.eclipse.search.tests/src/org/eclipse/search/core/tests/LongQuery.java b/org.eclipse.search.tests/src/org/eclipse/search/core/tests/LongQuery.java index 8f7697a3e10..c772f96e422 100644 --- a/org.eclipse.search.tests/src/org/eclipse/search/core/tests/LongQuery.java +++ b/org.eclipse.search.tests/src/org/eclipse/search/core/tests/LongQuery.java @@ -20,10 +20,12 @@ public class LongQuery extends NullQuery { private boolean fIsRunning= false; + @Override public boolean canRunInBackground() { return true; } + @Override public IStatus run(IProgressMonitor monitor) { fIsRunning= true; while (!monitor.isCanceled()) { diff --git a/org.eclipse.search.tests/src/org/eclipse/search/core/tests/NullQuery.java b/org.eclipse.search.tests/src/org/eclipse/search/core/tests/NullQuery.java index 7cc6ee36099..d923c9a5dce 100644 --- a/org.eclipse.search.tests/src/org/eclipse/search/core/tests/NullQuery.java +++ b/org.eclipse.search.tests/src/org/eclipse/search/core/tests/NullQuery.java @@ -18,24 +18,26 @@ import org.eclipse.search.ui.ISearchResult; public class NullQuery implements ISearchQuery { + @Override public IStatus run(IProgressMonitor monitor) { return null; } - /* (non-Javadoc) - * @see org.eclipse.search.ui.ISearchQuery#getName() - */ + @Override public String getLabel() { return "Null Query"; //$NON-NLS-1$ } + @Override public boolean canRerun() { return true; } + @Override public boolean canRunInBackground() { return true; } + @Override public ISearchResult getSearchResult() { return new NullSearchResult(this); } diff --git a/org.eclipse.search.tests/src/org/eclipse/search/core/tests/NullSearchResult.java b/org.eclipse.search.tests/src/org/eclipse/search/core/tests/NullSearchResult.java index 666a258191c..00793f460a3 100644 --- a/org.eclipse.search.tests/src/org/eclipse/search/core/tests/NullSearchResult.java +++ b/org.eclipse.search.tests/src/org/eclipse/search/core/tests/NullSearchResult.java @@ -25,39 +25,27 @@ public class NullSearchResult extends FileSearchResult { // inherit from FileSea super(null); fNullQuery= query; } - /* (non-Javadoc) - * @see org.eclipse.search.ui.ISearchResult#getText(org.eclipse.search.ui.ISearchResult) - */ + @Override public String getLabel() { return "Null Query"; //$NON-NLS-1$ } - /* (non-Javadoc) - * @see org.eclipse.search.ui.ISearchResult#getTooltip(org.eclipse.search.ui.ISearchResult) - */ + @Override public String getTooltip() { return "Null Query"; //$NON-NLS-1$ } - /* (non-Javadoc) - * @see org.eclipse.search.ui.ISearchResult#getImageDescriptor(org.eclipse.search.ui.ISearchResult) - */ + @Override public ImageDescriptor getImageDescriptor() { return null; } - /* (non-Javadoc) - * @see org.eclipse.search.ui.ISearchResult#getQuery() - */ + @Override public ISearchQuery getQuery() { return fNullQuery; } - /* (non-Javadoc) - * @see org.eclipse.search.ui.text.AbstractTextSearchResult#getEditorMatchAdapter() - */ + @Override public IEditorMatchAdapter getEditorMatchAdapter() { return null; } - /* (non-Javadoc) - * @see org.eclipse.search.ui.text.AbstractTextSearchResult#getFileMatchAdapter() - */ + @Override public IFileMatchAdapter getFileMatchAdapter() { return null; } diff --git a/org.eclipse.search.tests/src/org/eclipse/search/core/tests/QueryManagerTest.java b/org.eclipse.search.tests/src/org/eclipse/search/core/tests/QueryManagerTest.java index da1a406fe2e..b846ab5a07a 100644 --- a/org.eclipse.search.tests/src/org/eclipse/search/core/tests/QueryManagerTest.java +++ b/org.eclipse.search.tests/src/org/eclipse/search/core/tests/QueryManagerTest.java @@ -45,21 +45,19 @@ public class QueryManagerTest extends TestCase { final boolean [] wasAdded= { false }; final boolean [] wasRemoved= { false }; IQueryListener l= new IQueryListener() { - /* (non-Javadoc) - * @see org.eclipse.search.ui.IQueryListener#queryAdded(org.eclipse.search.ui.ISearchQuery) - */ + @Override public void queryAdded(ISearchQuery query) { wasAdded[0]= true; } - /* (non-Javadoc) - * @see org.eclipse.search.ui.IQueryListener#queryRemoved(org.eclipse.search.ui.ISearchQuery) - */ + @Override public void queryRemoved(ISearchQuery query) { wasRemoved[0]= true; } + @Override public void queryStarting(ISearchQuery query) { // not interested } + @Override public void queryFinished(ISearchQuery query) { // not interested } diff --git a/org.eclipse.search.tests/src/org/eclipse/search/core/tests/TestSearchResult.java b/org.eclipse.search.tests/src/org/eclipse/search/core/tests/TestSearchResult.java index fe093699b9e..dcf767326bd 100644 --- a/org.eclipse.search.tests/src/org/eclipse/search/core/tests/TestSearchResult.java +++ b/org.eclipse.search.tests/src/org/eclipse/search/core/tests/TestSearchResult.java @@ -166,6 +166,7 @@ public class TestSearchResult extends TestCase { AbstractTextSearchResult result= (AbstractTextSearchResult) query.getSearchResult(); result.addListener(new ISearchResultListener() { + @Override public void searchResultChanged(SearchResultEvent e) { if (e instanceof MatchEvent) { MatchEvent evt= (MatchEvent) e; @@ -208,6 +209,7 @@ public class TestSearchResult extends TestCase { AbstractTextSearchResult result= (AbstractTextSearchResult) query.getSearchResult(); result.addListener(new ISearchResultListener() { + @Override public void searchResultChanged(SearchResultEvent e) { if (e instanceof MatchEvent) { MatchEvent evt= (MatchEvent) e; diff --git a/org.eclipse.search.tests/src/org/eclipse/search/tests/ResourceHelper.java b/org.eclipse.search.tests/src/org/eclipse/search/tests/ResourceHelper.java index ba81e9bec92..fe28661ccf1 100644 --- a/org.eclipse.search.tests/src/org/eclipse/search/tests/ResourceHelper.java +++ b/org.eclipse.search.tests/src/org/eclipse/search/tests/ResourceHelper.java @@ -68,6 +68,7 @@ public class ResourceHelper { public static void delete(final IResource resource) throws CoreException { IWorkspaceRunnable runnable= new IWorkspaceRunnable() { + @Override public void run(IProgressMonitor monitor) throws CoreException { for (int i= 0; i < MAX_RETRY; i++) { try { diff --git a/org.eclipse.search.tests/src/org/eclipse/search/tests/filesearch/AnnotationManagerTest.java b/org.eclipse.search.tests/src/org/eclipse/search/tests/filesearch/AnnotationManagerTest.java index 24eef965fad..e7e8856a337 100644 --- a/org.eclipse.search.tests/src/org/eclipse/search/tests/filesearch/AnnotationManagerTest.java +++ b/org.eclipse.search.tests/src/org/eclipse/search/tests/filesearch/AnnotationManagerTest.java @@ -65,6 +65,7 @@ public class AnnotationManagerTest extends TestCase { return new JUnitSourceSetup(test); } + @Override protected void setUp() throws Exception { super.setUp(); SearchTestPlugin.ensureWelcomePageClosed(); @@ -75,6 +76,7 @@ public class AnnotationManagerTest extends TestCase { fQuery2= new FileSearchQuery("Test", false, true, scope); //$NON-NLS-1$//$NON-NLS-2$ } + @Override protected void tearDown() throws Exception { InternalSearchUI.getInstance().removeAllQueries(); fQuery1= null; diff --git a/org.eclipse.search.tests/src/org/eclipse/search/tests/filesearch/FileCharSequenceTests.java b/org.eclipse.search.tests/src/org/eclipse/search/tests/filesearch/FileCharSequenceTests.java index 388756dfce2..0a20f6679f5 100644 --- a/org.eclipse.search.tests/src/org/eclipse/search/tests/filesearch/FileCharSequenceTests.java +++ b/org.eclipse.search.tests/src/org/eclipse/search/tests/filesearch/FileCharSequenceTests.java @@ -47,10 +47,12 @@ public class FileCharSequenceTests extends TestCase { return allTests(); } + @Override protected void setUp() throws Exception { fProject= ResourceHelper.createProject("my-project"); //$NON-NLS-1$ } + @Override protected void tearDown() throws Exception { ResourceHelper.deleteProject("my-project"); //$NON-NLS-1$ } diff --git a/org.eclipse.search.tests/src/org/eclipse/search/tests/filesearch/FileSearchTests.java b/org.eclipse.search.tests/src/org/eclipse/search/tests/filesearch/FileSearchTests.java index 5f25845f593..097516acecd 100644 --- a/org.eclipse.search.tests/src/org/eclipse/search/tests/filesearch/FileSearchTests.java +++ b/org.eclipse.search.tests/src/org/eclipse/search/tests/filesearch/FileSearchTests.java @@ -77,10 +77,12 @@ public class FileSearchTests extends TestCase { private static class SerialTestResultCollector extends TestResultCollector { + @Override public boolean canRunInParallel() { return false; } + @Override public boolean acceptPatternMatch(TextSearchMatchAccess match) throws CoreException { fResult.add(new TestResult(match.getFile(), match.getMatchOffset(), match.getMatchLength())); return true; @@ -90,10 +92,12 @@ public class FileSearchTests extends TestCase { private static class ParallelTestResultCollector extends TestResultCollector { + @Override public boolean canRunInParallel() { return true; } + @Override public boolean acceptPatternMatch(TextSearchMatchAccess match) throws CoreException { synchronized(fResult) { fResult.add(new TestResult(match.getFile(), match.getMatchOffset(), match.getMatchLength())); @@ -121,10 +125,12 @@ public class FileSearchTests extends TestCase { return allTests(); } + @Override protected void setUp() throws Exception { fProject= ResourceHelper.createProject("my-project"); //$NON-NLS-1$ } + @Override protected void tearDown() throws Exception { ResourceHelper.deleteProject("my-project"); //$NON-NLS-1$ } diff --git a/org.eclipse.search.tests/src/org/eclipse/search/tests/filesearch/JUnitSourceSetup.java b/org.eclipse.search.tests/src/org/eclipse/search/tests/filesearch/JUnitSourceSetup.java index 8b81c0fc605..8c3066cb47f 100644 --- a/org.eclipse.search.tests/src/org/eclipse/search/tests/filesearch/JUnitSourceSetup.java +++ b/org.eclipse.search.tests/src/org/eclipse/search/tests/filesearch/JUnitSourceSetup.java @@ -38,6 +38,7 @@ public class JUnitSourceSetup extends TestSetup { fProjectName= projectName; } + @Override protected void setUp() throws Exception { IProject project= ResourcesPlugin.getWorkspace().getRoot().getProject(fProjectName); if (!project.exists()) { // allow nesting of JUnitSetups @@ -45,6 +46,7 @@ public class JUnitSourceSetup extends TestSetup { } } + @Override protected void tearDown() throws Exception { if (fProject != null) { // delete only by the setup who created the project ResourceHelper.deleteProject(fProjectName); diff --git a/org.eclipse.search.tests/src/org/eclipse/search/tests/filesearch/LineAnnotationManagerTest.java b/org.eclipse.search.tests/src/org/eclipse/search/tests/filesearch/LineAnnotationManagerTest.java index 2cbc53ff69b..efc1708dea6 100644 --- a/org.eclipse.search.tests/src/org/eclipse/search/tests/filesearch/LineAnnotationManagerTest.java +++ b/org.eclipse.search.tests/src/org/eclipse/search/tests/filesearch/LineAnnotationManagerTest.java @@ -63,6 +63,7 @@ public class LineAnnotationManagerTest extends TestCase { return new JUnitSourceSetup(test); } + @Override protected void setUp() throws Exception { super.setUp(); EditorAnnotationManager.debugSetHighlighterType(EditorAnnotationManager.HIGHLIGHTER_ANNOTATION); @@ -73,6 +74,7 @@ public class LineAnnotationManagerTest extends TestCase { fLineQuery= new LineBasedFileSearch(scope, false, true, "Test"); } + @Override protected void tearDown() throws Exception { InternalSearchUI.getInstance().removeAllQueries(); fLineQuery= null; diff --git a/org.eclipse.search.tests/src/org/eclipse/search/tests/filesearch/LineBasedFileSearch.java b/org.eclipse.search.tests/src/org/eclipse/search/tests/filesearch/LineBasedFileSearch.java index 251c7f11b3e..a8d969940d5 100644 --- a/org.eclipse.search.tests/src/org/eclipse/search/tests/filesearch/LineBasedFileSearch.java +++ b/org.eclipse.search.tests/src/org/eclipse/search/tests/filesearch/LineBasedFileSearch.java @@ -54,13 +54,12 @@ public class LineBasedFileSearch extends FileSearchQuery { fLastDocument= null; } + @Override public boolean canRunInParallel() { return true; } - /* (non-Javadoc) - * @see org.eclipse.search.core.text.FileSearchRequestor#acceptPatternMatch(org.eclipse.search.core.text.FileSearchMatchRequestor) - */ + @Override public boolean acceptPatternMatch(TextSearchMatchAccess matchRequestor) throws CoreException { IFile file= matchRequestor.getFile(); try { @@ -94,9 +93,7 @@ public class LineBasedFileSearch extends FileSearchQuery { return fLastDocument; } - /* (non-Javadoc) - * @see org.eclipse.search.core.text.FileSearchRequestor#endReporting() - */ + @Override public void endReporting() { if (fLastFile != null) { try { @@ -116,6 +113,7 @@ public class LineBasedFileSearch extends FileSearchQuery { } + @Override public IStatus run(IProgressMonitor monitor) { AbstractTextSearchResult textResult= (AbstractTextSearchResult) getSearchResult(); textResult.removeAll(); diff --git a/org.eclipse.search.tests/src/org/eclipse/search/tests/filesearch/PositionTrackerTest.java b/org.eclipse.search.tests/src/org/eclipse/search/tests/filesearch/PositionTrackerTest.java index 274f57f8134..7846c1c944d 100644 --- a/org.eclipse.search.tests/src/org/eclipse/search/tests/filesearch/PositionTrackerTest.java +++ b/org.eclipse.search.tests/src/org/eclipse/search/tests/filesearch/PositionTrackerTest.java @@ -56,6 +56,7 @@ public class PositionTrackerTest extends TestCase { return new JUnitSourceSetup(test); } + @Override protected void setUp() throws Exception { super.setUp(); diff --git a/org.eclipse.search.tests/src/org/eclipse/search/tests/filesearch/ResultUpdaterTest.java b/org.eclipse.search.tests/src/org/eclipse/search/tests/filesearch/ResultUpdaterTest.java index 98abb34d9ac..f2520164d5e 100644 --- a/org.eclipse.search.tests/src/org/eclipse/search/tests/filesearch/ResultUpdaterTest.java +++ b/org.eclipse.search.tests/src/org/eclipse/search/tests/filesearch/ResultUpdaterTest.java @@ -49,6 +49,7 @@ public class ResultUpdaterTest extends TestCase { return allTests(); } + @Override protected void setUp() throws Exception { super.setUp(); // create a own project to make modifications @@ -60,9 +61,7 @@ public class ResultUpdaterTest extends TestCase { fQuery1= new FileSearchQuery("Test", false, true, scope); } - /* (non-Javadoc) - * @see junit.framework.TestCase#tearDown() - */ + @Override protected void tearDown() throws Exception { ResourceHelper.deleteProject(PROJECT_TO_MODIFY); } diff --git a/org.eclipse.search.tests/src/org/eclipse/search/tests/filesearch/SearchResultPageTest.java b/org.eclipse.search.tests/src/org/eclipse/search/tests/filesearch/SearchResultPageTest.java index 274ad176cd6..c023d1c14df 100644 --- a/org.eclipse.search.tests/src/org/eclipse/search/tests/filesearch/SearchResultPageTest.java +++ b/org.eclipse.search.tests/src/org/eclipse/search/tests/filesearch/SearchResultPageTest.java @@ -57,6 +57,7 @@ public class SearchResultPageTest extends TestCase { return allTests(); } + @Override protected void setUp() throws Exception { super.setUp(); SearchTestPlugin.ensureWelcomePageClosed(); diff --git a/org.eclipse.search.tests/src/org/eclipse/search/tests/filesearch/SortingTest.java b/org.eclipse.search.tests/src/org/eclipse/search/tests/filesearch/SortingTest.java index 1753cf20050..7595720a65b 100644 --- a/org.eclipse.search.tests/src/org/eclipse/search/tests/filesearch/SortingTest.java +++ b/org.eclipse.search.tests/src/org/eclipse/search/tests/filesearch/SortingTest.java @@ -43,6 +43,7 @@ public class SortingTest extends TestCase { return allTests(); } + @Override protected void setUp() throws Exception { super.setUp(); diff --git a/org.eclipse.search/new search/org/eclipse/search/core/text/TextSearchEngine.java b/org.eclipse.search/new search/org/eclipse/search/core/text/TextSearchEngine.java index 1417a673c8c..5faab706dd0 100644 --- a/org.eclipse.search/new search/org/eclipse/search/core/text/TextSearchEngine.java +++ b/org.eclipse.search/new search/org/eclipse/search/core/text/TextSearchEngine.java @@ -52,10 +52,12 @@ public abstract class TextSearchEngine { */ public static TextSearchEngine createDefault() { return new TextSearchEngine() { + @Override public IStatus search(TextSearchScope scope, TextSearchRequestor requestor, Pattern searchPattern, IProgressMonitor monitor) { return new TextSearchVisitor(requestor, searchPattern).search(scope, monitor); } + @Override public IStatus search(IFile[] scope, TextSearchRequestor requestor, Pattern searchPattern, IProgressMonitor monitor) { return new TextSearchVisitor(requestor, searchPattern).search(scope, monitor); } diff --git a/org.eclipse.search/new search/org/eclipse/search/ui/NewSearchUI.java b/org.eclipse.search/new search/org/eclipse/search/ui/NewSearchUI.java index 90db67b9fdd..01232f82a97 100644 --- a/org.eclipse.search/new search/org/eclipse/search/ui/NewSearchUI.java +++ b/org.eclipse.search/new search/org/eclipse/search/ui/NewSearchUI.java @@ -64,6 +64,7 @@ public class NewSearchUI { * Use {@link #runQueryInBackground(ISearchQuery)} to run a query in background * or {@link #runQueryInForeground(IRunnableContext, ISearchQuery)} to run it in foreground */ + @Deprecated public static void runQuery(ISearchQuery query) { if (query == null) { throw new IllegalArgumentException("query must not be null"); //$NON-NLS-1$ diff --git a/org.eclipse.search/new search/org/eclipse/search/ui/actions/TextSearchGroup.java b/org.eclipse.search/new search/org/eclipse/search/ui/actions/TextSearchGroup.java index c0425222042..c81126d104f 100644 --- a/org.eclipse.search/new search/org/eclipse/search/ui/actions/TextSearchGroup.java +++ b/org.eclipse.search/new search/org/eclipse/search/ui/actions/TextSearchGroup.java @@ -82,9 +82,7 @@ public class TextSearchGroup extends ActionGroup { } } - /* (non-Javadoc) - * @see org.eclipse.ui.actions.ActionGroup#fillContextMenu(org.eclipse.jface.action.IMenuManager) - */ + @Override public void fillContextMenu(IMenuManager menu) { MenuManager textSearchMM= new MenuManager(fMenuText, CTX_MENU_ID); int i=0; diff --git a/org.eclipse.search/new search/org/eclipse/search/ui/text/AbstractTextSearchResult.java b/org.eclipse.search/new search/org/eclipse/search/ui/text/AbstractTextSearchResult.java index f2e6f852a96..fbd75957f9b 100644 --- a/org.eclipse.search/new search/org/eclipse/search/ui/text/AbstractTextSearchResult.java +++ b/org.eclipse.search/new search/org/eclipse/search/ui/text/AbstractTextSearchResult.java @@ -229,18 +229,14 @@ public abstract class AbstractTextSearchResult implements ISearchResult { return existed; } - /** - * {@inheritDoc} - */ + @Override public void addListener(ISearchResultListener l) { synchronized (fListeners) { fListeners.add(l); } } - /** - * {@inheritDoc} - */ + @Override public void removeListener(ISearchResultListener l) { synchronized (fListeners) { fListeners.remove(l); diff --git a/org.eclipse.search/new search/org/eclipse/search/ui/text/AbstractTextSearchViewPage.java b/org.eclipse.search/new search/org/eclipse/search/ui/text/AbstractTextSearchViewPage.java index 7dd80a2f1b1..f7578dddcfe 100644 --- a/org.eclipse.search/new search/org/eclipse/search/ui/text/AbstractTextSearchViewPage.java +++ b/org.eclipse.search/new search/org/eclipse/search/ui/text/AbstractTextSearchViewPage.java @@ -136,6 +136,7 @@ public abstract class AbstractTextSearchViewPage extends Page implements ISearch setSystem(true); } + @Override public IStatus runInUIThread(IProgressMonitor monitor) { Control control= getControl(); if (control == null || control.isDisposed()) { @@ -165,6 +166,7 @@ public abstract class AbstractTextSearchViewPage extends Page implements ISearch /* * Undocumented for testing only. Used to find UpdateUIJobs. */ + @Override public boolean belongsTo(Object family) { return family == AbstractTextSearchViewPage.this; } @@ -174,22 +176,27 @@ public abstract class AbstractTextSearchViewPage extends Page implements ISearch private class SelectionProviderAdapter implements ISelectionProvider, ISelectionChangedListener { private ArrayList fListeners= new ArrayList(5); + @Override public void addSelectionChangedListener(ISelectionChangedListener listener) { fListeners.add(listener); } + @Override public ISelection getSelection() { return fViewer.getSelection(); } + @Override public void removeSelectionChangedListener(ISelectionChangedListener listener) { fListeners.remove(listener); } + @Override public void setSelection(ISelection selection) { fViewer.setSelection(selection); } + @Override public void selectionChanged(SelectionChangedEvent event) { // forward to my listeners SelectionChangedEvent wrappedEvent= new SelectionChangedEvent(this, event.getSelection()); @@ -293,6 +300,7 @@ public abstract class AbstractTextSearchViewPage extends Page implements ISearch fBatchedClearAll= false; fListener = new ISearchResultListener() { + @Override public void searchResultChanged(SearchResultEvent e) { handleSearchResultChanged(e); } @@ -356,23 +364,17 @@ public abstract class AbstractTextSearchViewPage extends Page implements ISearch return settings; } - /** - * {@inheritDoc} - */ + @Override public void setID(String id) { fId = id; } - /** - * {@inheritDoc} - */ + @Override public String getID() { return fId; } - /** - * {@inheritDoc} - */ + @Override public String getLabel() { AbstractTextSearchResult result= getInput(); if (result == null) @@ -394,6 +396,7 @@ public abstract class AbstractTextSearchViewPage extends Page implements ISearch * @see IFileMatchAdapter * @deprecated Use {@link #showMatch(Match, int, int, boolean)} instead */ + @Deprecated protected void showMatch(Match match, int currentOffset, int currentLength) throws PartInitException { } @@ -536,15 +539,14 @@ public abstract class AbstractTextSearchViewPage extends Page implements ISearch return !selection.isEmpty(); } - /** - * {@inheritDoc} - */ + @Override public void createControl(Composite parent) { fQueryListener = createQueryListener(); fMenu = new MenuManager("#PopUp"); //$NON-NLS-1$ fMenu.setRemoveAllWhenShown(true); fMenu.setParent(getSite().getActionBars().getMenuManager()); fMenu.addMenuListener(new IMenuListener() { + @Override public void menuAboutToShow(IMenuManager mgr) { SearchView.createContextMenuGroups(mgr); fillContextMenu(mgr); @@ -588,16 +590,20 @@ public abstract class AbstractTextSearchViewPage extends Page implements ISearch private IQueryListener createQueryListener() { return new IQueryListener() { + @Override public void queryAdded(ISearchQuery query) { // ignore } + @Override public void queryRemoved(ISearchQuery query) { // ignore } + @Override public void queryStarting(final ISearchQuery query) { final Runnable runnable1 = new Runnable() { + @Override public void run() { updateBusyLabel(); AbstractTextSearchResult result = getInput(); @@ -614,6 +620,7 @@ public abstract class AbstractTextSearchViewPage extends Page implements ISearch asyncExec(runnable1); } + @Override public void queryFinished(final ISearchQuery query) { // handle the end of the query in the UIUpdateJob, as ui updates // may not be finished here. @@ -738,6 +745,7 @@ public abstract class AbstractTextSearchViewPage extends Page implements ISearch new OpenAndLinkWithEditorHelper(fViewer) { + @Override protected void activate(ISelection selection) { final int currentMode= OpenStrategy.getOpenMethod(); try { @@ -748,10 +756,12 @@ public abstract class AbstractTextSearchViewPage extends Page implements ISearch } } + @Override protected void linkToEditor(ISelection selection) { // not supported by this part } + @Override protected void open(ISelection selection, boolean activate) { handleOpen(new OpenEvent(fViewer, selection)); } @@ -759,6 +769,7 @@ public abstract class AbstractTextSearchViewPage extends Page implements ISearch }; fViewer.addSelectionChangedListener(new ISelectionChangedListener() { + @Override public void selectionChanged(SelectionChangedEvent event) { fCurrentMatchIndex = -1; fRemoveSelectedMatches.setEnabled(canRemoveMatchesWith(event.getSelection())); @@ -796,25 +807,19 @@ public abstract class AbstractTextSearchViewPage extends Page implements ISearch return new TableViewer(parent, SWT.MULTI | SWT.H_SCROLL | SWT.V_SCROLL); } - /** - * {@inheritDoc} - */ + @Override public void setFocus() { Control control = fViewer.getControl(); if (control != null && !control.isDisposed()) control.setFocus(); } - /** - * {@inheritDoc} - */ + @Override public Control getControl() { return fPagebook; } - /** - * {@inheritDoc} - */ + @Override public void setInput(ISearchResult newSearch, Object viewState) { if (newSearch != null && !(newSearch instanceof AbstractTextSearchResult)) return; // ignore @@ -899,9 +904,7 @@ public abstract class AbstractTextSearchViewPage extends Page implements ISearch } } - /** - * {@inheritDoc} - */ + @Override public Object getUIState() { return fViewer.getSelection(); } @@ -926,6 +929,7 @@ public abstract class AbstractTextSearchViewPage extends Page implements ISearch private void showMatch(final Match match, final boolean activateEditor) { ISafeRunnable runnable = new ISafeRunnable() { + @Override public void handleException(Throwable exception) { if (exception instanceof PartInitException) { PartInitException pie = (PartInitException) exception; @@ -933,6 +937,7 @@ public abstract class AbstractTextSearchViewPage extends Page implements ISearch } } + @Override public void run() throws Exception { IRegion location= getCurrentMatchLocation(match); showMatch(match, location.getOffset(), location.getLength(), activateEditor); @@ -1128,9 +1133,7 @@ public abstract class AbstractTextSearchViewPage extends Page implements ISearch return null; } - /** - * {@inheritDoc} - */ + @Override public void dispose() { AbstractTextSearchResult oldSearch = getInput(); if (oldSearch != null) @@ -1139,9 +1142,7 @@ public abstract class AbstractTextSearchViewPage extends Page implements ISearch NewSearchUI.removeQueryListener(fQueryListener); } - /** - * {@inheritDoc} - */ + @Override public void init(IPageSite pageSite) { super.init(pageSite); IMenuManager menuManager= pageSite.getActionBars().getMenuManager(); @@ -1195,6 +1196,7 @@ public abstract class AbstractTextSearchViewPage extends Page implements ISearch * Sets the view part * @param part View part to set */ + @Override public void setViewPart(ISearchResultViewPart part) { fViewPart = part; } @@ -1293,6 +1295,7 @@ public abstract class AbstractTextSearchViewPage extends Page implements ISearch // meaning we're not executing on the display thread of the // control control.getDisplay().asyncExec(new Runnable() { + @Override public void run() { if (!control.isDisposed()) runnable.run(); @@ -1307,6 +1310,7 @@ public abstract class AbstractTextSearchViewPage extends Page implements ISearch * {@inheritDoc} * Subclasses may extend this method. */ + @Override public void restoreState(IMemento memento) { if (countBits(fSupportedLayouts) > 1) { try { @@ -1329,9 +1333,7 @@ public abstract class AbstractTextSearchViewPage extends Page implements ISearch } } - /* (non-Javadoc) - * @see org.eclipse.search.ui.ISearchResultPage#saveState(org.eclipse.ui.IMemento) - */ + @Override public void saveState(IMemento memento) { if (countBits(fSupportedLayouts) > 1) { memento.putInteger(KEY_LAYOUT, fCurrentLayout); diff --git a/org.eclipse.search/new search/org/eclipse/search/ui/text/FileTextSearchScope.java b/org.eclipse.search/new search/org/eclipse/search/ui/text/FileTextSearchScope.java index 003a30611bb..0a1c9e5c66f 100644 --- a/org.eclipse.search/new search/org/eclipse/search/ui/text/FileTextSearchScope.java +++ b/org.eclipse.search/new search/org/eclipse/search/ui/text/FileTextSearchScope.java @@ -209,16 +209,12 @@ public final class FileTextSearchScope extends TextSearchScope { return fVisitDerived; } - /* (non-Javadoc) - * @see org.eclipse.search.core.text.FileSearchScope#getRoots() - */ + @Override public IResource[] getRoots() { return fRootElements; } - /* (non-Javadoc) - * @see org.eclipse.search.core.text.FileSearchScope#contains(org.eclipse.core.resources.IResourceProxy) - */ + @Override public boolean contains(IResourceProxy proxy) { if (!fVisitDerived && proxy.isDerived()) { return false; // all resources in a derived folder are considered to be derived, see bug 103576 diff --git a/org.eclipse.search/new search/org/eclipse/search2/internal/ui/CancelSearchAction.java b/org.eclipse.search/new search/org/eclipse/search2/internal/ui/CancelSearchAction.java index 60538f95b50..03b0c77c42a 100644 --- a/org.eclipse.search/new search/org/eclipse/search2/internal/ui/CancelSearchAction.java +++ b/org.eclipse.search/new search/org/eclipse/search2/internal/ui/CancelSearchAction.java @@ -26,6 +26,7 @@ public class CancelSearchAction extends Action { SearchPluginImages.setImageDescriptors(this, SearchPluginImages.T_LCL, SearchPluginImages.IMG_LCL_SEARCH_CANCEL); } + @Override public void run() { ISearchResult result= fView.getCurrentSearchResult(); if (result != null) { diff --git a/org.eclipse.search/new search/org/eclipse/search2/internal/ui/InternalSearchUI.java b/org.eclipse.search/new search/org/eclipse/search2/internal/ui/InternalSearchUI.java index 1735ee3bb9f..77ab976a716 100644 --- a/org.eclipse.search/new search/org/eclipse/search2/internal/ui/InternalSearchUI.java +++ b/org.eclipse.search/new search/org/eclipse/search2/internal/ui/InternalSearchUI.java @@ -78,6 +78,7 @@ public class InternalSearchUI { fSearchJobRecord= sjr; } + @Override protected IStatus run(IProgressMonitor monitor) { fSearchJobRecord.job= this; searchJobStarted(fSearchJobRecord); @@ -99,6 +100,7 @@ public class InternalSearchUI { fSearchJobRecord.job= null; return status; } + @Override public boolean belongsTo(Object family) { return family == InternalSearchUI.FAMILY_SEARCH; } @@ -214,6 +216,7 @@ public class InternalSearchUI { private IStatus doRunSearchInForeground(final SearchJobRecord rec, IRunnableContext context) { try { context.run(true, true, new IRunnableWithProgress() { + @Override public void run(IProgressMonitor monitor) throws InvocationTargetException, InterruptedException { searchJobStarted(rec); try { diff --git a/org.eclipse.search/new search/org/eclipse/search2/internal/ui/MatchFilterAction.java b/org.eclipse.search/new search/org/eclipse/search2/internal/ui/MatchFilterAction.java index a8802be015c..63c78167762 100644 --- a/org.eclipse.search/new search/org/eclipse/search2/internal/ui/MatchFilterAction.java +++ b/org.eclipse.search/new search/org/eclipse/search2/internal/ui/MatchFilterAction.java @@ -35,6 +35,7 @@ public class MatchFilterAction extends Action implements IUpdate { setChecked(isActiveMatchFilter()); } + @Override public void run() { AbstractTextSearchResult input= fPage.getInput(); if (input == null) { @@ -75,9 +76,7 @@ public class MatchFilterAction extends Action implements IUpdate { return false; } - /* (non-Javadoc) - * @see org.eclipse.ui.texteditor.IUpdate#update() - */ + @Override public void update() { setChecked(isActiveMatchFilter()); } diff --git a/org.eclipse.search/new search/org/eclipse/search2/internal/ui/MatchFilterSelectionAction.java b/org.eclipse.search/new search/org/eclipse/search2/internal/ui/MatchFilterSelectionAction.java index dedde507304..9a2ade5cc00 100644 --- a/org.eclipse.search/new search/org/eclipse/search2/internal/ui/MatchFilterSelectionAction.java +++ b/org.eclipse.search/new search/org/eclipse/search2/internal/ui/MatchFilterSelectionAction.java @@ -34,6 +34,7 @@ public class MatchFilterSelectionAction extends Action { fPage= page; } + @Override public void run() { Shell shell= fPage.getSite().getShell(); diff --git a/org.eclipse.search/new search/org/eclipse/search2/internal/ui/MatchFilterSelectionDialog.java b/org.eclipse.search/new search/org/eclipse/search2/internal/ui/MatchFilterSelectionDialog.java index c34b60c8f4c..79340fd4fb4 100644 --- a/org.eclipse.search/new search/org/eclipse/search2/internal/ui/MatchFilterSelectionDialog.java +++ b/org.eclipse.search/new search/org/eclipse/search2/internal/ui/MatchFilterSelectionDialog.java @@ -95,17 +95,12 @@ public class MatchFilterSelectionDialog extends StatusDialog { fLastLimit= limit != -1 ? limit : 1000; } - /* (non-Javadoc) - * @see org.eclipse.jface.dialogs.Dialog#isResizable() - * @since 3.4 - */ + @Override protected boolean isResizable() { return true; } - /* (non-Javadoc) - * @see org.eclipse.jface.dialogs.Dialog#getDialogBoundsSettings() - */ + @Override protected IDialogSettings getDialogBoundsSettings() { String name= "MatchFilterSelectionDialog_" + String.valueOf(fShowLimitConfigurationControls) + '.' + String.valueOf(fEnableMatchFilterConfiguration); //$NON-NLS-1$ return SearchPlugin.getDefault().getDialogSettingsSection(name); @@ -130,9 +125,7 @@ public class MatchFilterSelectionDialog extends StatusDialog { return fLimitElementCount; } - /* (non-Javadoc) - * @see org.eclipse.jface.dialogs.Dialog#createDialogArea(org.eclipse.swt.widgets.Composite) - */ + @Override protected Control createDialogArea(Composite composite) { Composite parent = (Composite) super.createDialogArea(composite); initializeDialogUnits(composite); @@ -161,14 +154,17 @@ public class MatchFilterSelectionDialog extends StatusDialog { table.setLayoutData(data); class ListenerAndLabelProvider extends LabelProvider implements ISelectionChangedListener, ICheckStateListener { + @Override public void selectionChanged(SelectionChangedEvent event) { performFilterListSelectionChanged(); } + @Override public void checkStateChanged(CheckStateChangedEvent event) { performFilterListCheckStateChanged(); } + @Override public String getText(Object element) { return ((MatchFilter) element).getName(); } @@ -216,12 +212,14 @@ public class MatchFilterSelectionDialog extends StatusDialog { fLimitElementsField.setLayoutData(gd); fLimitElementsCheckbox.addSelectionListener(new SelectionAdapter() { + @Override public void widgetSelected(SelectionEvent e) { performLimitCheckboxChanged(); } }); fLimitElementsField.addModifyListener(new ModifyListener() { + @Override public void modifyText(ModifyEvent e) { performLimitTextModified(); } diff --git a/org.eclipse.search/new search/org/eclipse/search2/internal/ui/OpenSearchPreferencesAction.java b/org.eclipse.search/new search/org/eclipse/search2/internal/ui/OpenSearchPreferencesAction.java index 5a3349ea8f8..7dd5a0ea5fd 100644 --- a/org.eclipse.search/new search/org/eclipse/search2/internal/ui/OpenSearchPreferencesAction.java +++ b/org.eclipse.search/new search/org/eclipse/search2/internal/ui/OpenSearchPreferencesAction.java @@ -30,9 +30,7 @@ public class OpenSearchPreferencesAction extends Action { //PlatformUI.getWorkbench().getHelpSystem().setHelp(this, IWorkbenchHelpContextIds.OPEN_PREFERENCES_ACTION); } - /* (non-Javadoc) - * Method declared on Action. - */ + @Override public void run() { Shell shell= SearchPlugin.getActiveWorkbenchShell(); String[] displayedPages= { SearchPreferencePage.PAGE_ID, diff --git a/org.eclipse.search/new search/org/eclipse/search2/internal/ui/PinSearchViewAction.java b/org.eclipse.search/new search/org/eclipse/search2/internal/ui/PinSearchViewAction.java index bd112f52db5..f1e72d6cfb0 100644 --- a/org.eclipse.search/new search/org/eclipse/search2/internal/ui/PinSearchViewAction.java +++ b/org.eclipse.search/new search/org/eclipse/search2/internal/ui/PinSearchViewAction.java @@ -36,17 +36,13 @@ public class PinSearchViewAction extends Action implements IUpdate { update(); } - /* (non-Javadoc) - * @see org.eclipse.jface.action.IAction#run() - */ + @Override public void run() { fView.setPinned(isChecked()); fView.updatePartName(); } - /* (non-Javadoc) - * @see org.eclipse.ui.texteditor.IUpdate#update() - */ + @Override public void update() { //setEnabled(fView.getConsole() != null); setChecked(fView.isPinned()); diff --git a/org.eclipse.search/new search/org/eclipse/search2/internal/ui/RemoveAllSearchesAction.java b/org.eclipse.search/new search/org/eclipse/search2/internal/ui/RemoveAllSearchesAction.java index 5dcc4710b74..9f540be75b0 100644 --- a/org.eclipse.search/new search/org/eclipse/search2/internal/ui/RemoveAllSearchesAction.java +++ b/org.eclipse.search/new search/org/eclipse/search2/internal/ui/RemoveAllSearchesAction.java @@ -23,6 +23,7 @@ class RemoveAllSearchesAction extends Action { setToolTipText(SearchMessages.RemoveAllSearchesAction_tooltip); } + @Override public void run() { ISearchQuery[] queries= NewSearchUI.getQueries(); for (int i = 0; i < queries.length; i++) { diff --git a/org.eclipse.search/new search/org/eclipse/search2/internal/ui/SearchAgainAction.java b/org.eclipse.search/new search/org/eclipse/search2/internal/ui/SearchAgainAction.java index c3b7401d581..24a57ccfe16 100644 --- a/org.eclipse.search/new search/org/eclipse/search2/internal/ui/SearchAgainAction.java +++ b/org.eclipse.search/new search/org/eclipse/search2/internal/ui/SearchAgainAction.java @@ -34,6 +34,7 @@ class SearchAgainAction extends Action { fView= view; } + @Override public void run() { final ISearchResult search= fView.getCurrentSearchResult(); if (search != null) { diff --git a/org.eclipse.search/new search/org/eclipse/search2/internal/ui/SearchHistoryDropDownAction.java b/org.eclipse.search/new search/org/eclipse/search2/internal/ui/SearchHistoryDropDownAction.java index aa7003ca2b7..7b695e09266 100644 --- a/org.eclipse.search/new search/org/eclipse/search2/internal/ui/SearchHistoryDropDownAction.java +++ b/org.eclipse.search/new search/org/eclipse/search2/internal/ui/SearchHistoryDropDownAction.java @@ -59,10 +59,12 @@ class SearchHistoryDropDownAction extends Action implements IMenuCreator { return buf.toString(); } + @Override public void runWithEvent(Event event) { runIfChecked(event.stateMask == SWT.CTRL); } + @Override public void run() { runIfChecked(false); } @@ -91,6 +93,7 @@ class SearchHistoryDropDownAction extends Action implements IMenuCreator { setEnabled(hasQueries); } + @Override public void dispose() { disposeMenu(); } @@ -100,10 +103,12 @@ class SearchHistoryDropDownAction extends Action implements IMenuCreator { fMenu.dispose(); } + @Override public Menu getMenu(Menu parent) { return null; } + @Override public Menu getMenu(Control parent) { ISearchResult currentSearch= fSearchView.getCurrentSearchResult(); disposeMenu(); @@ -130,6 +135,7 @@ class SearchHistoryDropDownAction extends Action implements IMenuCreator { item.fill(parent, -1); } + @Override public void run() { new ShowSearchHistoryDialogAction(fSearchView).run(); } diff --git a/org.eclipse.search/new search/org/eclipse/search2/internal/ui/SearchHistorySelectionDialog.java b/org.eclipse.search/new search/org/eclipse/search2/internal/ui/SearchHistorySelectionDialog.java index bd95ce791e7..aa6a69aadbc 100644 --- a/org.eclipse.search/new search/org/eclipse/search2/internal/ui/SearchHistorySelectionDialog.java +++ b/org.eclipse.search/new search/org/eclipse/search2/internal/ui/SearchHistorySelectionDialog.java @@ -94,10 +94,7 @@ public class SearchHistorySelectionDialog extends SelectionDialog { setHelpAvailable(false); } - /* (non-Javadoc) - * @see org.eclipse.jface.dialogs.Dialog#isResizable() - * @since 3.4 - */ + @Override protected boolean isResizable() { return true; } @@ -105,6 +102,7 @@ public class SearchHistorySelectionDialog extends SelectionDialog { /* * Overrides method from Dialog */ + @Override protected Control createDialogArea(Composite container) { Composite ancestor= (Composite) super.createDialogArea(container); GridLayout layout= (GridLayout) ancestor.getLayout(); @@ -119,6 +117,7 @@ public class SearchHistorySelectionDialog extends SelectionDialog { fHistorySizeTextField.setTextLimit(2); fHistorySizeTextField.setText(String.valueOf(fHistorySize)); fHistorySizeTextField.addModifyListener(new ModifyListener() { + @Override public void modifyText(ModifyEvent e) { validateDialogState(); } @@ -133,17 +132,13 @@ public class SearchHistorySelectionDialog extends SelectionDialog { return ancestor; } - /* (non-Javadoc) - * @see org.eclipse.jface.dialogs.StatusDialog#createButtonsForButtonBar(org.eclipse.swt.widgets.Composite) - */ + @Override protected void createButtonsForButtonBar(Composite parent) { createButton(parent, DEFAULT_ID, SearchMessages.SearchHistorySelectionDialog_restore_default_button, false); super.createButtonsForButtonBar(parent); } - /* (non-Javadoc) - * @see org.eclipse.jface.dialogs.Dialog#buttonPressed(int) - */ + @Override protected void buttonPressed(int buttonId) { if (buttonId == DEFAULT_ID) { IPreferenceStore store= SearchPlugin.getDefault().getPreferenceStore(); @@ -174,9 +169,7 @@ public class SearchHistorySelectionDialog extends SelectionDialog { return !status.matches(IStatus.ERROR); } - /* (non-Javadoc) - * @see org.eclipse.jface.dialogs.Dialog#okPressed() - */ + @Override protected void okPressed() { IPreferenceStore store= SearchPlugin.getDefault().getPreferenceStore(); store.setValue(SearchPreferencePage.LIMIT_HISTORY, fHistorySize); @@ -195,10 +188,12 @@ public class SearchHistorySelectionDialog extends SelectionDialog { private ArrayList fImages= new ArrayList(); + @Override public String getText(Object element) { return ((ISearchResult)element).getLabel(); } + @Override public Image getImage(Object element) { ImageDescriptor imageDescriptor= ((ISearchResult)element).getImageDescriptor(); @@ -211,6 +206,7 @@ public class SearchHistorySelectionDialog extends SelectionDialog { return image; } + @Override public void dispose() { Iterator iter= fImages.iterator(); while (iter.hasNext()) @@ -236,16 +232,12 @@ public class SearchHistorySelectionDialog extends SelectionDialog { return fIsOpenInNewView; } - /* (non-Javadoc) - * @see org.eclipse.jface.dialogs.Dialog#getDialogBoundsSettings() - */ + @Override protected IDialogSettings getDialogBoundsSettings() { return SearchPlugin.getDefault().getDialogSettingsSection("DialogBounds_SearchHistorySelectionDialog"); //$NON-NLS-1$ } - /* (non-Javadoc) - * @see org.eclipse.jface.dialogs.Dialog#getDialogBoundsStrategy() - */ + @Override protected int getDialogBoundsStrategy() { return DIALOG_PERSISTSIZE; } @@ -254,6 +246,7 @@ public class SearchHistorySelectionDialog extends SelectionDialog { /* * Overrides method from Dialog */ + @Override protected Label createMessageArea(Composite composite) { Composite parent= new Composite(composite, SWT.NONE); GridLayout layout= new GridLayout(); @@ -276,9 +269,7 @@ public class SearchHistorySelectionDialog extends SelectionDialog { - /* (non-Javadoc) - * @see org.eclipse.jface.window.Window#create() - */ + @Override public void create() { super.create(); @@ -292,6 +283,7 @@ public class SearchHistorySelectionDialog extends SelectionDialog { /* * Overrides method from Dialog */ + @Override protected Control createDialogArea(Composite container) { Composite ancestor= (Composite) super.createDialogArea(container); @@ -311,6 +303,7 @@ public class SearchHistorySelectionDialog extends SelectionDialog { final Table table= fViewer.getTable(); table.addMouseListener(new MouseAdapter() { + @Override public void mouseDoubleClick(MouseEvent e) { okPressed(); } @@ -325,7 +318,8 @@ public class SearchHistorySelectionDialog extends SelectionDialog { fRemoveButton= new Button(parent, SWT.PUSH); fRemoveButton.setText(SearchMessages.SearchesDialog_remove_label); fRemoveButton.addSelectionListener(new SelectionAdapter() { - public void widgetSelected(SelectionEvent event) { + @Override + public void widgetSelected(SelectionEvent event) { buttonPressed(REMOVE_ID); } }); @@ -333,6 +327,7 @@ public class SearchHistorySelectionDialog extends SelectionDialog { SWTUtil.setButtonDimensionHint(fRemoveButton); fViewer.addSelectionChangedListener(new ISelectionChangedListener() { + @Override public void selectionChanged(SelectionChangedEvent event) { validateDialogState(); } @@ -341,6 +336,7 @@ public class SearchHistorySelectionDialog extends SelectionDialog { fLink= new Link(parent, SWT.NONE); configureHistoryLink(); fLink.addSelectionListener(new SelectionAdapter() { + @Override public void widgetSelected(SelectionEvent e) { HistoryConfigurationDialog dialog= new HistoryConfigurationDialog(getShell(), fInput, fRemovedEntries); if (dialog.open() == Window.OK) { @@ -380,9 +376,7 @@ public class SearchHistorySelectionDialog extends SelectionDialog { } } - /* (non-Javadoc) - * @see org.eclipse.ui.dialogs.SelectionDialog#createButtonsForButtonBar(org.eclipse.swt.widgets.Composite) - */ + @Override protected void createButtonsForButtonBar(Composite parent) { createButton(parent, IDialogConstants.OK_ID, IDialogConstants.OPEN_LABEL, true); createButton(parent, IDialogConstants.OPEN_ID, SearchMessages.SearchHistorySelectionDialog_open_in_new_button, false); @@ -390,6 +384,7 @@ public class SearchHistorySelectionDialog extends SelectionDialog { } + @Override protected void buttonPressed(int buttonId) { if (buttonId == REMOVE_ID) { IStructuredSelection selection= (IStructuredSelection) fViewer.getSelection(); @@ -415,6 +410,7 @@ public class SearchHistorySelectionDialog extends SelectionDialog { /* * Overrides method from Dialog */ + @Override protected void okPressed() { // Build a list of selected children. ISelection selection= fViewer.getSelection(); diff --git a/org.eclipse.search/new search/org/eclipse/search2/internal/ui/SearchPageRegistry.java b/org.eclipse.search/new search/org/eclipse/search2/internal/ui/SearchPageRegistry.java index 9afa545daef..821322c02a9 100644 --- a/org.eclipse.search/new search/org/eclipse/search2/internal/ui/SearchPageRegistry.java +++ b/org.eclipse.search/new search/org/eclipse/search2/internal/ui/SearchPageRegistry.java @@ -87,9 +87,11 @@ public class SearchPageRegistry { final Object[] result= new Object[1]; ISafeRunnable safeRunnable= new SafeRunnable(SearchMessages.SearchPageRegistry_error_creating_extensionpoint) { + @Override public void run() throws Exception { result[0]= configElement.createExecutableExtension("class"); //$NON-NLS-1$ } + @Override public void handleException(Throwable e) { // invalid contribution SearchPlugin.log(e); diff --git a/org.eclipse.search/new search/org/eclipse/search2/internal/ui/SearchView.java b/org.eclipse.search/new search/org/eclipse/search2/internal/ui/SearchView.java index c6f1c1ba637..2260a087749 100644 --- a/org.eclipse.search/new search/org/eclipse/search2/internal/ui/SearchView.java +++ b/org.eclipse.search/new search/org/eclipse/search2/internal/ui/SearchView.java @@ -191,21 +191,31 @@ public class SearchView extends PageBookView implements ISearchResultViewPart, I return fLastActivation; } + @Override public void dispose() { fSite= null; } + @Override public IWorkbenchPartSite getSite() { return fSite; } + @Override public void addPropertyListener(IPropertyListener listener) {/*dummy*/} + @Override public void createPartControl(Composite parent) {/*dummy*/} + @Override public String getTitle() { return null; } + @Override public Image getTitleImage() { return null; } + @Override public String getTitleToolTip() { return null; } + @Override public void removePropertyListener(IPropertyListener listener) {/*dummy*/} + @Override public void setFocus() {/*dummy*/} + @Override public Object getAdapter(Class adapter) { return null; } } @@ -213,6 +223,7 @@ public class SearchView extends PageBookView implements ISearchResultViewPart, I private Composite fControl; private String fId; + @Override public void createControl(Composite parent) { Color background= parent.getDisplay().getSystemColor(SWT.COLOR_LIST_BACKGROUND); @@ -226,6 +237,7 @@ public class SearchView extends PageBookView implements ISearchResultViewPart, I link.setLayoutData(new GridData(SWT.BEGINNING, SWT.CENTER, true, false)); link.setBackground(background); link.addSelectionListener(new SelectionAdapter() { + @Override public void widgetSelected(SelectionEvent e) { new OpenSearchDialogAction().run(); } @@ -234,35 +246,35 @@ public class SearchView extends PageBookView implements ISearchResultViewPart, I fControl= composite; } + @Override public Control getControl() { return fControl; } + @Override public void setFocus() { if (fControl != null) fControl.setFocus(); } - /* (non-Javadoc) - * @see org.eclipse.search2.ui.ISearchResultsPage#setInput(org.eclipse.search2.ui.ISearchResult, java.lang.Object) - */ + @Override public void setInput(ISearchResult search, Object viewState) { // do nothing } - /* (non-Javadoc) - * @see org.eclipse.search2.ui.ISearchResultsPage#setViewPart(org.eclipse.search2.ui.ISearchResultView) - */ + @Override public void setViewPart(ISearchResultViewPart part) { // do nothing } + @Override public Object getUIState() { // empty implementation return null; } + @Override public void init(IPageSite pageSite) { super.init(pageSite); getSite().setSelectionProvider(null); @@ -271,38 +283,28 @@ public class SearchView extends PageBookView implements ISearchResultViewPart, I menuManager.appendToGroup(IContextMenuConstants.GROUP_PROPERTIES, new OpenSearchPreferencesAction()); } - /* (non-Javadoc) - * @see org.eclipse.search.ui.ISearchResultPage#saveState(org.eclipse.ui.IMemento) - */ + @Override public void saveState(IMemento memento) { // do nothing } - /* (non-Javadoc) - * @see org.eclipse.search.ui.ISearchResultPage#restoreState(org.eclipse.ui.IMemento) - */ + @Override public void restoreState(IMemento memento) { // do nothing } - /* (non-Javadoc) - * @see org.eclipse.search.ui.ISearchResultPage#setID(java.lang.String) - */ + @Override public void setID(String id) { fId= id; } - /* (non-Javadoc) - * @see org.eclipse.search.ui.ISearchResultPage#getID() - */ + @Override public String getID() { return fId; } - /* (non-Javadoc) - * @see org.eclipse.search.ui.ISearchResultPage#getLabel() - */ + @Override public String getLabel() { return ""; //$NON-NLS-1$ } @@ -324,9 +326,7 @@ public class SearchView extends PageBookView implements ISearchResultViewPart, I return fSearchViewPageService; } - /* (non-Javadoc) - * @see org.eclipse.ui.part.PageBookView#partActivated(org.eclipse.ui.IWorkbenchPart) - */ + @Override public void partActivated(IWorkbenchPart part) { super.partActivated(part); if (part == this) { @@ -335,6 +335,7 @@ public class SearchView extends PageBookView implements ISearchResultViewPart, I } + @Override protected IPage createDefaultPage(PageBook book) { IPageBookViewPage page= new EmptySearchView(); page.createControl(book); @@ -346,6 +347,7 @@ public class SearchView extends PageBookView implements ISearchResultViewPart, I return page; } + @Override protected PageRec doCreatePage(IWorkbenchPart part) { IPageBookViewPage page = (IPageBookViewPage) fPartsToPages.get(part); initPage(page); @@ -354,6 +356,7 @@ public class SearchView extends PageBookView implements ISearchResultViewPart, I return rec; } + @Override protected void doDestroyPage(IWorkbenchPart part, PageRec pageRecord) { IPage page = pageRecord.page; page.dispose(); @@ -363,10 +366,12 @@ public class SearchView extends PageBookView implements ISearchResultViewPart, I fPartsToPages.remove(part); } + @Override protected IWorkbenchPart getBootstrapPart() { return null; } + @Override protected boolean isImportant(IWorkbenchPart part) { return part instanceof DummyPart; } @@ -444,6 +449,7 @@ public class SearchView extends PageBookView implements ISearchResultViewPart, I PlatformUI.getWorkbench().getHelpSystem().setHelp(fPageContent.getParent(), helpContextId); } + @Override public void updateLabel() { ISearchResultPage page= getActivePage(); String label= ""; //$NON-NLS-1$ @@ -489,6 +495,7 @@ public class SearchView extends PageBookView implements ISearchResultViewPart, I return fCurrentSearch; } + @Override public void createPartControl(Composite parent) { createActions(); @@ -518,21 +525,25 @@ public class SearchView extends PageBookView implements ISearchResultViewPart, I private void initializePageSwitcher() { new PageSwitcher(this) { + @Override public void activatePage(Object page) { ISearchResult searchResult= ((ISearchQuery) page).getSearchResult(); InternalSearchUI.getInstance().showSearchResult(SearchView.this, searchResult, false); } + @Override public ImageDescriptor getImageDescriptor(Object page) { ISearchResult searchResult= ((ISearchQuery) page).getSearchResult(); return searchResult.getImageDescriptor(); } + @Override public String getName(Object page) { ISearchResult searchResult= ((ISearchQuery) page).getSearchResult(); return searchResult.getLabel(); } + @Override public Object[] getPages() { return NewSearchUI.getQueries(); } @@ -589,6 +600,7 @@ public class SearchView extends PageBookView implements ISearchResultViewPart, I fUndoRedoActionGroup= new UndoRedoActionGroup(getViewSite(), workspaceContext, true); } + @Override public void dispose() { if (fUndoRedoActionGroup != null) { fUndoRedoActionGroup.dispose(); @@ -598,12 +610,14 @@ public class SearchView extends PageBookView implements ISearchResultViewPart, I super.dispose(); } + @Override public void queryStarting(ISearchQuery query) { if (fCurrentSearch != null && fCurrentSearch.equals(query.getSearchResult())) { updateCancelAction(); } } + @Override public void queryFinished(ISearchQuery query) { if (fCurrentSearch != null && fCurrentSearch.equals(query.getSearchResult())) { updateCancelAction(); @@ -620,10 +634,12 @@ public class SearchView extends PageBookView implements ISearchResultViewPart, I fSearchAgainAction.setEnabled(!queryRunning && result != null && result.getQuery().canRerun()); } + @Override public void queryAdded(ISearchQuery query) { fSearchesDropDownAction.updateEnablement(); } + @Override public void queryRemoved(ISearchQuery query) { InternalSearchUI.getInstance().cancelSearch(query); if (query.getSearchResult().equals(fCurrentSearch)) { @@ -635,9 +651,7 @@ public class SearchView extends PageBookView implements ISearchResultViewPart, I fSearchesDropDownAction.updateEnablement(); } - /* (non-Javadoc) - * @see org.eclipse.search2.ui.ISearchView#fillContextMenu(org.eclipse.jface.action.IMenuManager) - */ + @Override public void fillContextMenu(IMenuManager menuManager) { ISearchResult result= getCurrentSearchResult(); if (result != null) { @@ -674,6 +688,7 @@ public class SearchView extends PageBookView implements ISearchResultViewPart, I // Methods related to saving page state. ------------------------------------------- + @Override public void saveState(IMemento memento) { for (Iterator iter= fPagesToParts.entrySet().iterator(); iter.hasNext();) { Map.Entry entry= (Map.Entry) iter.next(); @@ -688,6 +703,7 @@ public class SearchView extends PageBookView implements ISearchResultViewPart, I } + @Override public void init(IViewSite site, IMemento memento) throws PartInitException { super.init(site, memento); IMenuManager menuManager= site.getActionBars().getMenuManager(); @@ -696,6 +712,7 @@ public class SearchView extends PageBookView implements ISearchResultViewPart, I } + @Override protected void initPage(IPageBookViewPage page) { super.initPage(page); IActionBars actionBars= page.getSite().getActionBars(); @@ -728,6 +745,7 @@ public class SearchView extends PageBookView implements ISearchResultViewPart, I * TODO workaround for focus problem. Clarify focus behavior. * @see org.eclipse.ui.IWorkbenchPart#setFocus() */ + @Override public void setFocus() { IPage currentPage= getCurrentPage(); if (currentPage != null) @@ -736,6 +754,7 @@ public class SearchView extends PageBookView implements ISearchResultViewPart, I super.setFocus(); } + @Override public ISearchResultPage getActivePage() { IPage page= getCurrentPage(); if (page instanceof ISearchResultPage) @@ -752,18 +771,21 @@ public class SearchView extends PageBookView implements ISearchResultViewPart, I return service; } + @Override public void showBusy(boolean busy) { super.showBusy(busy); if (!busy) getProgressService().warnOfContentChange(); } + @Override public Object getAdapter(Class adapter) { Object superAdapter= super.getAdapter(adapter); if (superAdapter != null) return superAdapter; if (adapter == IShowInSource.class) { return new IShowInSource() { + @Override public ShowInContext getShowInContext() { return new ShowInContext(null, getSelectionProvider().getSelection()); } diff --git a/org.eclipse.search/new search/org/eclipse/search2/internal/ui/SearchViewManager.java b/org.eclipse.search/new search/org/eclipse/search2/internal/ui/SearchViewManager.java index 017c558c257..e4d1e7f3b3a 100644 --- a/org.eclipse.search/new search/org/eclipse/search2/internal/ui/SearchViewManager.java +++ b/org.eclipse.search/new search/org/eclipse/search2/internal/ui/SearchViewManager.java @@ -44,12 +44,16 @@ public class SearchViewManager { public SearchViewManager(QueryManager queryManager) { fNewQueryListener= new IQueryListener() { + @Override public void queryAdded(ISearchQuery query) { showNewSearchQuery(query); } + @Override public void queryRemoved(ISearchQuery query) {} + @Override public void queryStarting(ISearchQuery query) {} + @Override public void queryFinished(ISearchQuery query) {} }; diff --git a/org.eclipse.search/new search/org/eclipse/search2/internal/ui/ShowSearchHistoryDialogAction.java b/org.eclipse.search/new search/org/eclipse/search2/internal/ui/ShowSearchHistoryDialogAction.java index 94cb6ccfd04..ca3d107fd62 100644 --- a/org.eclipse.search/new search/org/eclipse/search2/internal/ui/ShowSearchHistoryDialogAction.java +++ b/org.eclipse.search/new search/org/eclipse/search2/internal/ui/ShowSearchHistoryDialogAction.java @@ -39,6 +39,7 @@ class ShowSearchHistoryDialogAction extends Action { fSearchView= searchView; } + @Override public void run() { ISearchQuery[] queries= NewSearchUI.getQueries(); diff --git a/org.eclipse.search/new search/org/eclipse/search2/internal/ui/basic/views/CollapseAllAction.java b/org.eclipse.search/new search/org/eclipse/search2/internal/ui/basic/views/CollapseAllAction.java index cc8307e0eed..97bae0aa0bf 100644 --- a/org.eclipse.search/new search/org/eclipse/search2/internal/ui/basic/views/CollapseAllAction.java +++ b/org.eclipse.search/new search/org/eclipse/search2/internal/ui/basic/views/CollapseAllAction.java @@ -31,6 +31,7 @@ public class CollapseAllAction extends Action { fViewer= viewer; } + @Override public void run() { if (fViewer != null) { fViewer.collapseAll(); diff --git a/org.eclipse.search/new search/org/eclipse/search2/internal/ui/basic/views/ExpandAllAction.java b/org.eclipse.search/new search/org/eclipse/search2/internal/ui/basic/views/ExpandAllAction.java index f7ecabc782f..f649eb24bcb 100644 --- a/org.eclipse.search/new search/org/eclipse/search2/internal/ui/basic/views/ExpandAllAction.java +++ b/org.eclipse.search/new search/org/eclipse/search2/internal/ui/basic/views/ExpandAllAction.java @@ -31,6 +31,7 @@ public class ExpandAllAction extends Action { fViewer= viewer; } + @Override public void run() { if (fViewer != null) { fViewer.expandAll(); diff --git a/org.eclipse.search/new search/org/eclipse/search2/internal/ui/basic/views/RemoveAllMatchesAction.java b/org.eclipse.search/new search/org/eclipse/search2/internal/ui/basic/views/RemoveAllMatchesAction.java index 6df0ff59d09..01e4ab546ea 100644 --- a/org.eclipse.search/new search/org/eclipse/search2/internal/ui/basic/views/RemoveAllMatchesAction.java +++ b/org.eclipse.search/new search/org/eclipse/search2/internal/ui/basic/views/RemoveAllMatchesAction.java @@ -28,6 +28,7 @@ public class RemoveAllMatchesAction extends Action { fPage= page; } + @Override public void run() { AbstractTextSearchResult search= fPage.getInput(); if (search != null) diff --git a/org.eclipse.search/new search/org/eclipse/search2/internal/ui/basic/views/RemoveMatchAction.java b/org.eclipse.search/new search/org/eclipse/search2/internal/ui/basic/views/RemoveMatchAction.java index da87b7d9cd1..fb9407d6b5b 100644 --- a/org.eclipse.search/new search/org/eclipse/search2/internal/ui/basic/views/RemoveMatchAction.java +++ b/org.eclipse.search/new search/org/eclipse/search2/internal/ui/basic/views/RemoveMatchAction.java @@ -30,6 +30,7 @@ public class RemoveMatchAction extends Action { SearchPluginImages.setImageDescriptors(this, SearchPluginImages.T_LCL, SearchPluginImages.IMG_LCL_SEARCH_REM); } + @Override public void run() { Match match= fPage.getCurrentMatch(); AbstractTextSearchResult result= fPage.getInput(); diff --git a/org.eclipse.search/new search/org/eclipse/search2/internal/ui/basic/views/RemoveSelectedMatchesAction.java b/org.eclipse.search/new search/org/eclipse/search2/internal/ui/basic/views/RemoveSelectedMatchesAction.java index 5a2cf6f3621..4ca4a75eb5d 100644 --- a/org.eclipse.search/new search/org/eclipse/search2/internal/ui/basic/views/RemoveSelectedMatchesAction.java +++ b/org.eclipse.search/new search/org/eclipse/search2/internal/ui/basic/views/RemoveSelectedMatchesAction.java @@ -28,6 +28,7 @@ public class RemoveSelectedMatchesAction extends Action { SearchPluginImages.setImageDescriptors(this, SearchPluginImages.T_LCL, SearchPluginImages.IMG_LCL_SEARCH_REM); } + @Override public void run() { fPage.internalRemoveSelected(); } diff --git a/org.eclipse.search/new search/org/eclipse/search2/internal/ui/basic/views/SetLayoutAction.java b/org.eclipse.search/new search/org/eclipse/search2/internal/ui/basic/views/SetLayoutAction.java index 05d5998585a..6355c5a1cbc 100644 --- a/org.eclipse.search/new search/org/eclipse/search2/internal/ui/basic/views/SetLayoutAction.java +++ b/org.eclipse.search/new search/org/eclipse/search2/internal/ui/basic/views/SetLayoutAction.java @@ -27,6 +27,7 @@ public class SetLayoutAction extends Action { fLayout= layout; } + @Override public void run() { fPage.setLayout(fLayout); } diff --git a/org.eclipse.search/new search/org/eclipse/search2/internal/ui/basic/views/ShowNextResultAction.java b/org.eclipse.search/new search/org/eclipse/search2/internal/ui/basic/views/ShowNextResultAction.java index f56f6ae912d..ff5e14b11cc 100644 --- a/org.eclipse.search/new search/org/eclipse/search2/internal/ui/basic/views/ShowNextResultAction.java +++ b/org.eclipse.search/new search/org/eclipse/search2/internal/ui/basic/views/ShowNextResultAction.java @@ -28,6 +28,7 @@ public class ShowNextResultAction extends Action { fPage= page; } + @Override public void run() { fPage.gotoNextMatch(); } diff --git a/org.eclipse.search/new search/org/eclipse/search2/internal/ui/basic/views/ShowPreviousResultAction.java b/org.eclipse.search/new search/org/eclipse/search2/internal/ui/basic/views/ShowPreviousResultAction.java index 9a66c8ad4be..d42c171aac2 100644 --- a/org.eclipse.search/new search/org/eclipse/search2/internal/ui/basic/views/ShowPreviousResultAction.java +++ b/org.eclipse.search/new search/org/eclipse/search2/internal/ui/basic/views/ShowPreviousResultAction.java @@ -28,6 +28,7 @@ public class ShowPreviousResultAction extends Action { fPage= page; } + @Override public void run() { fPage.gotoPreviousMatch(); } diff --git a/org.eclipse.search/new search/org/eclipse/search2/internal/ui/basic/views/TableViewerNavigator.java b/org.eclipse.search/new search/org/eclipse/search2/internal/ui/basic/views/TableViewerNavigator.java index 12339a18a15..3a51361229c 100644 --- a/org.eclipse.search/new search/org/eclipse/search2/internal/ui/basic/views/TableViewerNavigator.java +++ b/org.eclipse.search/new search/org/eclipse/search2/internal/ui/basic/views/TableViewerNavigator.java @@ -19,6 +19,7 @@ public class TableViewerNavigator implements INavigate { public TableViewerNavigator(TableViewer viewer) { fViewer = viewer; } + @Override public void navigateNext(boolean forward) { int itemCount = fViewer.getTable().getItemCount(); if (itemCount == 0) diff --git a/org.eclipse.search/new search/org/eclipse/search2/internal/ui/basic/views/TreeViewerNavigator.java b/org.eclipse.search/new search/org/eclipse/search2/internal/ui/basic/views/TreeViewerNavigator.java index 7e575fa88d4..c9d03ab00fc 100644 --- a/org.eclipse.search/new search/org/eclipse/search2/internal/ui/basic/views/TreeViewerNavigator.java +++ b/org.eclipse.search/new search/org/eclipse/search2/internal/ui/basic/views/TreeViewerNavigator.java @@ -28,6 +28,7 @@ public class TreeViewerNavigator implements INavigate { fPage= page; } + @Override public void navigateNext(boolean forward) { TreeItem currentItem= getCurrentItem(forward); if (currentItem == null) diff --git a/org.eclipse.search/new search/org/eclipse/search2/internal/ui/text/AnnotationHighlighter.java b/org.eclipse.search/new search/org/eclipse/search2/internal/ui/text/AnnotationHighlighter.java index 63a8435c8ed..278661bc74a 100644 --- a/org.eclipse.search/new search/org/eclipse/search2/internal/ui/text/AnnotationHighlighter.java +++ b/org.eclipse.search/new search/org/eclipse/search2/internal/ui/text/AnnotationHighlighter.java @@ -49,6 +49,7 @@ public class AnnotationHighlighter extends Highlighter { fMatchesToAnnotations= new HashMap(); } + @Override public void addHighlights(Match[] matches) { HashMap map= new HashMap(matches.length); for (int i= 0; i < matches.length; i++) { @@ -92,6 +93,7 @@ public class AnnotationHighlighter extends Highlighter { return position; } + @Override public void removeHighlights(Match[] matches) { HashSet annotations= new HashSet(matches.length); for (int i= 0; i < matches.length; i++) { @@ -103,6 +105,7 @@ public class AnnotationHighlighter extends Highlighter { removeAnnotations(annotations); } + @Override public void removeAll() { Collection matchSet= fMatchesToAnnotations.values(); removeAnnotations(matchSet); @@ -142,6 +145,7 @@ public class AnnotationHighlighter extends Highlighter { } } + @Override protected void handleContentReplaced(IFileBuffer buffer) { if (!(buffer instanceof ITextFileBuffer)) return; diff --git a/org.eclipse.search/new search/org/eclipse/search2/internal/ui/text/AnnotationManagers.java b/org.eclipse.search/new search/org/eclipse/search2/internal/ui/text/AnnotationManagers.java index 3fd69bd21fa..15f69f08e18 100644 --- a/org.eclipse.search/new search/org/eclipse/search2/internal/ui/text/AnnotationManagers.java +++ b/org.eclipse.search/new search/org/eclipse/search2/internal/ui/text/AnnotationManagers.java @@ -23,18 +23,22 @@ public class AnnotationManagers { static { fgManagerMap = new HashMap(); IWindowListener listener = new IWindowListener() { + @Override public void windowActivated(IWorkbenchWindow window) { // ignore } + @Override public void windowDeactivated(IWorkbenchWindow window) { // ignore } + @Override public void windowClosed(IWorkbenchWindow window) { disposeAnnotationManager(window); } + @Override public void windowOpened(IWorkbenchWindow window) { // ignore } diff --git a/org.eclipse.search/new search/org/eclipse/search2/internal/ui/text/EditorAccessHighlighter.java b/org.eclipse.search/new search/org/eclipse/search2/internal/ui/text/EditorAccessHighlighter.java index 62e983ba999..7312e2308ec 100644 --- a/org.eclipse.search/new search/org/eclipse/search2/internal/ui/text/EditorAccessHighlighter.java +++ b/org.eclipse.search/new search/org/eclipse/search2/internal/ui/text/EditorAccessHighlighter.java @@ -47,6 +47,7 @@ public class EditorAccessHighlighter extends Highlighter { fMatchesToAnnotations= new HashMap(); } + @Override public void addHighlights(Match[] matches) { Map mapsByAnnotationModel= new HashMap(); for (int i= 0; i < matches.length; i++) { @@ -121,6 +122,7 @@ public class EditorAccessHighlighter extends Highlighter { return set; } + @Override public void removeHighlights(Match[] matches) { Map setsByAnnotationModel= new HashMap(); for (int i= 0; i < matches.length; i++) { @@ -173,12 +175,14 @@ public class EditorAccessHighlighter extends Highlighter { } } + @Override public void removeAll() { Set matchSet= fMatchesToAnnotations.keySet(); Match[] matches= new Match[matchSet.size()]; removeHighlights((Match[]) matchSet.toArray(matches)); } + @Override protected void handleContentReplaced(IFileBuffer buffer) { if (!(buffer instanceof ITextFileBuffer)) return; diff --git a/org.eclipse.search/new search/org/eclipse/search2/internal/ui/text/EditorAnnotationManager.java b/org.eclipse.search/new search/org/eclipse/search2/internal/ui/text/EditorAnnotationManager.java index e4d6ea3c771..c9f86f42139 100644 --- a/org.eclipse.search/new search/org/eclipse/search2/internal/ui/text/EditorAnnotationManager.java +++ b/org.eclipse.search/new search/org/eclipse/search2/internal/ui/text/EditorAnnotationManager.java @@ -116,6 +116,7 @@ public class EditorAnnotationManager implements ISearchResultListener { } + @Override public synchronized void searchResultChanged(SearchResultEvent e) { ISearchResult searchResult= e.getSearchResult(); if (searchResult instanceof AbstractTextSearchResult) { diff --git a/org.eclipse.search/new search/org/eclipse/search2/internal/ui/text/Highlighter.java b/org.eclipse.search/new search/org/eclipse/search2/internal/ui/text/Highlighter.java index 359120feaea..f3c42f6071b 100644 --- a/org.eclipse.search/new search/org/eclipse/search2/internal/ui/text/Highlighter.java +++ b/org.eclipse.search/new search/org/eclipse/search2/internal/ui/text/Highlighter.java @@ -23,34 +23,44 @@ public class Highlighter { public Highlighter() { fBufferListener= new IFileBufferListener() { + @Override public void bufferCreated(IFileBuffer buffer) { } + @Override public void bufferDisposed(IFileBuffer buffer) { } + @Override public void bufferContentAboutToBeReplaced(IFileBuffer buffer) { } + @Override public void bufferContentReplaced(IFileBuffer buffer) { handleContentReplaced(buffer); } + @Override public void stateChanging(IFileBuffer buffer) { } + @Override public void dirtyStateChanged(IFileBuffer buffer, boolean isDirty) { } + @Override public void stateValidationChanged(IFileBuffer buffer, boolean isStateValidated) { } + @Override public void underlyingFileMoved(IFileBuffer buffer, IPath path) { } + @Override public void underlyingFileDeleted(IFileBuffer buffer) { } + @Override public void stateChangeFailed(IFileBuffer buffer) { } }; diff --git a/org.eclipse.search/new search/org/eclipse/search2/internal/ui/text/MarkerHighlighter.java b/org.eclipse.search/new search/org/eclipse/search2/internal/ui/text/MarkerHighlighter.java index aeb4b756363..e4b1e81d20a 100644 --- a/org.eclipse.search/new search/org/eclipse/search2/internal/ui/text/MarkerHighlighter.java +++ b/org.eclipse.search/new search/org/eclipse/search2/internal/ui/text/MarkerHighlighter.java @@ -41,9 +41,11 @@ public class MarkerHighlighter extends Highlighter { fMatchesToAnnotations= new HashMap(); } + @Override public void addHighlights(final Match[] matches) { try { SearchPlugin.getWorkspace().run(new IWorkspaceRunnable() { + @Override public void run(IProgressMonitor monitor) throws CoreException { for (int i = 0; i < matches.length; i++) { IMarker marker; @@ -83,6 +85,7 @@ public class MarkerHighlighter extends Highlighter { return marker; } + @Override public void removeHighlights(Match[] matches) { for (int i= 0; i < matches.length; i++) { IMarker marker= (IMarker) fMatchesToAnnotations.remove(matches[i]); @@ -97,6 +100,7 @@ public class MarkerHighlighter extends Highlighter { } } + @Override public void removeAll() { try { fFile.deleteMarkers(NewSearchUI.SEARCH_MARKER, true, IResource.DEPTH_INFINITE); @@ -108,6 +112,7 @@ public class MarkerHighlighter extends Highlighter { } } + @Override protected void handleContentReplaced(IFileBuffer buffer) { if (!buffer.getLocation().equals(fFile.getFullPath())) return; diff --git a/org.eclipse.search/new search/org/eclipse/search2/internal/ui/text/PositionTracker.java b/org.eclipse.search/new search/org/eclipse/search2/internal/ui/text/PositionTracker.java index c6a46d1e957..3a28913fcf4 100644 --- a/org.eclipse.search/new search/org/eclipse/search2/internal/ui/text/PositionTracker.java +++ b/org.eclipse.search/new search/org/eclipse/search2/internal/ui/text/PositionTracker.java @@ -62,12 +62,14 @@ public class PositionTracker implements IQueryListener, ISearchResultListener, I } // tracking search results -------------------------------------------------------------- + @Override public void queryAdded(ISearchQuery query) { if (query.getSearchResult() instanceof AbstractTextSearchResult) { query.getSearchResult().addListener(this); } } + @Override public void queryRemoved(ISearchQuery query) { ISearchResult result= query.getSearchResult(); if (result instanceof AbstractTextSearchResult) { @@ -77,6 +79,7 @@ public class PositionTracker implements IQueryListener, ISearchResultListener, I } // tracking matches --------------------------------------------------------------------- + @Override public void searchResultChanged(SearchResultEvent e) { if (e instanceof MatchEvent) { MatchEvent evt= (MatchEvent)e; @@ -231,9 +234,7 @@ public class PositionTracker implements IQueryListener, ISearchResultListener, I } // IFileBufferListener implementation --------------------------------------------------------------------- - /* (non-Javadoc) - * @see org.eclipse.core.filebuffers.IFileBufferListener#bufferCreated(org.eclipse.core.filebuffers.IFileBuffer) - */ + @Override public void bufferCreated(IFileBuffer buffer) { final int[] trackCount= new int[1]; if (!(buffer instanceof ITextFileBuffer)) @@ -278,15 +279,11 @@ public class PositionTracker implements IQueryListener, ISearchResultListener, I } - /* (non-Javadoc) - * @see org.eclipse.core.filebuffers.IFileBufferListener#bufferDisposed(org.eclipse.core.filebuffers.IFileBuffer) - */ + @Override public void bufferDisposed(IFileBuffer buffer) { final int[] trackCount= new int[1]; doForExistingMatchesIn(buffer, new IFileBufferMatchOperation() { - /* (non-Javadoc) - * @see org.eclipse.search.internal.model.PositionTracker.FileBufferMatchRunnable#run(org.eclipse.core.filebuffers.ITextFileBuffer, org.eclipse.search.ui.model.text.Match) - */ + @Override public void run(ITextFileBuffer textBuffer, Match match) { trackCount[0]++; untrackPosition(textBuffer, match); @@ -294,16 +291,16 @@ public class PositionTracker implements IQueryListener, ISearchResultListener, I }); } - /* (non-Javadoc) - * @see org.eclipse.core.filebuffers.IFileBufferListener#bufferContentAboutToBeReplaced(org.eclipse.core.filebuffers.IFileBuffer) - */ + @Override public void bufferContentAboutToBeReplaced(IFileBuffer buffer) { // not interesting for us. } + @Override public void bufferContentReplaced(IFileBuffer buffer) { final int[] trackCount= new int[1]; doForExistingMatchesIn(buffer, new IFileBufferMatchOperation() { + @Override public void run(ITextFileBuffer textBuffer, Match match) { trackCount[0]++; AbstractTextSearchResult result= (AbstractTextSearchResult) fMatchesToSearchResults.get(match); @@ -313,24 +310,18 @@ public class PositionTracker implements IQueryListener, ISearchResultListener, I }); } - /* (non-Javadoc) - * @see org.eclipse.core.filebuffers.IFileBufferListener#stateChanging(org.eclipse.core.filebuffers.IFileBuffer) - */ + @Override public void stateChanging(IFileBuffer buffer) { // not interesting for us } - /* (non-Javadoc) - * @see org.eclipse.core.filebuffers.IFileBufferListener#dirtyStateChanged(org.eclipse.core.filebuffers.IFileBuffer, boolean) - */ + @Override public void dirtyStateChanged(IFileBuffer buffer, boolean isDirty) { if (isDirty) return; final int[] trackCount= new int[1]; doForExistingMatchesIn(buffer, new IFileBufferMatchOperation() { - /* (non-Javadoc) - * @see org.eclipse.search.internal.model.PositionTracker.FileBufferMatchRunnable#run(org.eclipse.core.filebuffers.ITextFileBuffer, org.eclipse.search.ui.model.text.Match) - */ + @Override public void run(ITextFileBuffer textBuffer, Match match) { trackCount[0]++; Position pos= (Position) fMatchesToPositions.get(match); @@ -358,44 +349,32 @@ public class PositionTracker implements IQueryListener, ISearchResultListener, I }); } - /* (non-Javadoc) - * @see org.eclipse.core.filebuffers.IFileBufferListener#stateValidationChanged(org.eclipse.core.filebuffers.IFileBuffer, boolean) - */ + @Override public void stateValidationChanged(IFileBuffer buffer, boolean isStateValidated) { // not interesting for us. } - /* (non-Javadoc) - * @see org.eclipse.core.filebuffers.IFileBufferListener#underlyingFileMoved(org.eclipse.core.filebuffers.IFileBuffer, org.eclipse.core.runtime.IPath) - */ + @Override public void underlyingFileMoved(IFileBuffer buffer, IPath path) { // not interesting for us. } - /* (non-Javadoc) - * @see org.eclipse.core.filebuffers.IFileBufferListener#underlyingFileDeleted(org.eclipse.core.filebuffers.IFileBuffer) - */ + @Override public void underlyingFileDeleted(IFileBuffer buffer) { // not interesting for us. } - /* (non-Javadoc) - * @see org.eclipse.core.filebuffers.IFileBufferListener#stateChangeFailed(org.eclipse.core.filebuffers.IFileBuffer) - */ + @Override public void stateChangeFailed(IFileBuffer buffer) { // not interesting for us. } - /* (non-Javadoc) - * @see org.eclipse.search.ui.IQueryListener#queryStarting(org.eclipse.search.ui.ISearchQuery) - */ + @Override public void queryStarting(ISearchQuery query) { // not interested here } - /* (non-Javadoc) - * @see org.eclipse.search.ui.IQueryListener#queryFinished(org.eclipse.search.ui.ISearchQuery) - */ + @Override public void queryFinished(ISearchQuery query) { // not interested } diff --git a/org.eclipse.search/new search/org/eclipse/search2/internal/ui/text/WindowAnnotationManager.java b/org.eclipse.search/new search/org/eclipse/search2/internal/ui/text/WindowAnnotationManager.java index be2fb3ab8c4..a35c52d645e 100644 --- a/org.eclipse.search/new search/org/eclipse/search2/internal/ui/text/WindowAnnotationManager.java +++ b/org.eclipse.search/new search/org/eclipse/search2/internal/ui/text/WindowAnnotationManager.java @@ -38,32 +38,40 @@ public class WindowAnnotationManager { initEditors(); fPartListener= new IPartListener2() { + @Override public void partActivated(IWorkbenchPartReference partRef) { startHighlighting(getEditor(partRef)); } + @Override public void partBroughtToTop(IWorkbenchPartReference partRef) { startHighlighting(getEditor(partRef)); } + @Override public void partClosed(IWorkbenchPartReference partRef) { stopHighlighting(getEditor(partRef)); } + @Override public void partDeactivated(IWorkbenchPartReference partRef) { } + @Override public void partOpened(IWorkbenchPartReference partRef) { } + @Override public void partHidden(IWorkbenchPartReference partRef) { stopHighlighting(getEditor(partRef)); } + @Override public void partVisible(IWorkbenchPartReference partRef) { startHighlighting(getEditor(partRef)); } + @Override public void partInputChanged(IWorkbenchPartReference partRef) { updateHighlighting(getEditor(partRef)); } diff --git a/org.eclipse.search/new search/org/eclipse/search2/internal/ui/text2/DefaultTextSearchQueryProvider.java b/org.eclipse.search/new search/org/eclipse/search2/internal/ui/text2/DefaultTextSearchQueryProvider.java index 4d7adb347c5..9783eadd5a3 100644 --- a/org.eclipse.search/new search/org/eclipse/search2/internal/ui/text2/DefaultTextSearchQueryProvider.java +++ b/org.eclipse.search/new search/org/eclipse/search2/internal/ui/text2/DefaultTextSearchQueryProvider.java @@ -25,9 +25,7 @@ import org.eclipse.search.ui.text.TextSearchQueryProvider; public class DefaultTextSearchQueryProvider extends TextSearchQueryProvider { - /* (non-Javadoc) - * @see org.eclipse.search.ui.text.TextSearchQueryProvider#createQuery(TextSearchInput) - */ + @Override public ISearchQuery createQuery(TextSearchInput input) { FileTextSearchScope scope= input.getScope(); String text= input.getSearchText(); @@ -39,25 +37,19 @@ public class DefaultTextSearchQueryProvider extends TextSearchQueryProvider { return new FileSearchQuery(text, regEx, caseSensitive, wholeWord, searchInBinaries, scope); } - /* (non-Javadoc) - * @see org.eclipse.search.ui.text.TextSearchQueryProvider#createQuery(java.lang.String) - */ + @Override public ISearchQuery createQuery(String searchForString) { FileTextSearchScope scope= FileTextSearchScope.newWorkspaceScope(getPreviousFileNamePatterns(), false); return new FileSearchQuery(searchForString, false, true, scope); } - /* (non-Javadoc) - * @see org.eclipse.search.ui.text.TextSearchQueryProvider#createQuery(java.lang.String, org.eclipse.core.resources.IResource[]) - */ + @Override public ISearchQuery createQuery(String selectedText, IResource[] resources) { FileTextSearchScope scope= FileTextSearchScope.newSearchScope(resources, getPreviousFileNamePatterns(), false); return new FileSearchQuery(selectedText, false, true, scope); } - /* (non-Javadoc) - * @see org.eclipse.search.ui.text.TextSearchQueryProvider#createQuery(java.lang.String, org.eclipse.ui.IWorkingSet[]) - */ + @Override public ISearchQuery createQuery(String selectedText, IWorkingSet[] ws) { FileTextSearchScope scope= FileTextSearchScope.newSearchScope(ws, getPreviousFileNamePatterns(), false); return new FileSearchQuery(selectedText, false, true, scope); diff --git a/org.eclipse.search/new search/org/eclipse/search2/internal/ui/text2/FindInFileActionDelegate.java b/org.eclipse.search/new search/org/eclipse/search2/internal/ui/text2/FindInFileActionDelegate.java index 144f5b339e7..394ab78ced2 100644 --- a/org.eclipse.search/new search/org/eclipse/search2/internal/ui/text2/FindInFileActionDelegate.java +++ b/org.eclipse.search/new search/org/eclipse/search2/internal/ui/text2/FindInFileActionDelegate.java @@ -39,6 +39,7 @@ public class FindInFileActionDelegate extends FindInRecentScopeActionDelegate { setActionDefinitionId("org.eclipse.search.ui.performTextSearchFile"); //$NON-NLS-1$ } + @Override public void selectionChanged(IAction action, ISelection selection) { fEditor= null; IWorkbenchPage page= getWorkbenchPage(); @@ -54,6 +55,7 @@ public class FindInFileActionDelegate extends FindInRecentScopeActionDelegate { action.setEnabled(fEditor != null); } + @Override public void setActiveEditor(IAction action, IEditorPart editor) { if (editor != null && editor.getEditorInput() instanceof IFileEditorInput) { fEditor= editor; @@ -74,6 +76,7 @@ public class FindInFileActionDelegate extends FindInRecentScopeActionDelegate { return null; } + @Override protected ISearchQuery createQuery(TextSearchQueryProvider provider, String searchForString) throws CoreException { return provider.createQuery(searchForString, new IResource[] { getFile() }); } diff --git a/org.eclipse.search/new search/org/eclipse/search2/internal/ui/text2/FindInProjectActionDelegate.java b/org.eclipse.search/new search/org/eclipse/search2/internal/ui/text2/FindInProjectActionDelegate.java index b238ad92f7a..1426a737947 100644 --- a/org.eclipse.search/new search/org/eclipse/search2/internal/ui/text2/FindInProjectActionDelegate.java +++ b/org.eclipse.search/new search/org/eclipse/search2/internal/ui/text2/FindInProjectActionDelegate.java @@ -38,6 +38,7 @@ public class FindInProjectActionDelegate extends FindInRecentScopeActionDelegate setActionDefinitionId("org.eclipse.search.ui.performTextSearchProject"); //$NON-NLS-1$ } + @Override public void selectionChanged(IAction action, ISelection selection) { fEditor= null; IWorkbenchPage page= getWorkbenchPage(); @@ -53,6 +54,7 @@ public class FindInProjectActionDelegate extends FindInRecentScopeActionDelegate action.setEnabled(fEditor != null); } + @Override public void setActiveEditor(IAction action, IEditorPart editor) { if (editor != null && editor.getEditorInput() instanceof IFileEditorInput) { fEditor= editor; @@ -72,6 +74,7 @@ public class FindInProjectActionDelegate extends FindInRecentScopeActionDelegate return null; } + @Override protected ISearchQuery createQuery(TextSearchQueryProvider provider, String searchForString) throws CoreException { IProject proj= getCurrentProject(); if (proj != null) { diff --git a/org.eclipse.search/new search/org/eclipse/search2/internal/ui/text2/FindInRecentScopeActionDelegate.java b/org.eclipse.search/new search/org/eclipse/search2/internal/ui/text2/FindInRecentScopeActionDelegate.java index 385cbdcef2b..228a90f6ff5 100644 --- a/org.eclipse.search/new search/org/eclipse/search2/internal/ui/text2/FindInRecentScopeActionDelegate.java +++ b/org.eclipse.search/new search/org/eclipse/search2/internal/ui/text2/FindInRecentScopeActionDelegate.java @@ -37,16 +37,19 @@ abstract public class FindInRecentScopeActionDelegate extends RetrieverAction im } // IWorkbenchWindowActionDelegate + @Override public void dispose() { fWindow= null; } // IWorkbenchWindowActionDelegate + @Override public void init(IWorkbenchWindow window) { fWindow= window; } // IEditorActionDelegate + @Override public void setActiveEditor(IAction action, IEditorPart targetEditor) { fWindow= null; if (targetEditor != null) { @@ -55,15 +58,18 @@ abstract public class FindInRecentScopeActionDelegate extends RetrieverAction im } // IActionDelegate + @Override public void selectionChanged(IAction action, ISelection selection) { } // IActionDelegate + @Override final public void run(IAction action) { run(); } // RetrieverAction + @Override protected IWorkbenchPage getWorkbenchPage() { if (fWindow != null) { return fWindow.getActivePage(); @@ -71,5 +77,6 @@ abstract public class FindInRecentScopeActionDelegate extends RetrieverAction im return null; } + @Override abstract protected ISearchQuery createQuery(TextSearchQueryProvider provider, String searchForString) throws CoreException; } diff --git a/org.eclipse.search/new search/org/eclipse/search2/internal/ui/text2/FindInWorkingSetActionDelegate.java b/org.eclipse.search/new search/org/eclipse/search2/internal/ui/text2/FindInWorkingSetActionDelegate.java index 224bba37b8d..9fdd7b19ee8 100644 --- a/org.eclipse.search/new search/org/eclipse/search2/internal/ui/text2/FindInWorkingSetActionDelegate.java +++ b/org.eclipse.search/new search/org/eclipse/search2/internal/ui/text2/FindInWorkingSetActionDelegate.java @@ -34,6 +34,7 @@ public class FindInWorkingSetActionDelegate extends FindInRecentScopeActionDeleg setActionDefinitionId("org.eclipse.search.ui.performTextSearchWorkingSet"); //$NON-NLS-1$ } + @Override protected ISearchQuery createQuery(TextSearchQueryProvider provider, String searchForString) throws CoreException { IWorkbenchPage page= getWorkbenchPage(); if (page != null) { diff --git a/org.eclipse.search/new search/org/eclipse/search2/internal/ui/text2/FindInWorkspaceActionDelegate.java b/org.eclipse.search/new search/org/eclipse/search2/internal/ui/text2/FindInWorkspaceActionDelegate.java index d16fa2c4dfa..aa6642e4aca 100644 --- a/org.eclipse.search/new search/org/eclipse/search2/internal/ui/text2/FindInWorkspaceActionDelegate.java +++ b/org.eclipse.search/new search/org/eclipse/search2/internal/ui/text2/FindInWorkspaceActionDelegate.java @@ -29,6 +29,7 @@ public class FindInWorkspaceActionDelegate extends FindInRecentScopeActionDelega setActionDefinitionId("org.eclipse.search.ui.performTextSearchWorkspace"); //$NON-NLS-1$ } + @Override protected ISearchQuery createQuery(TextSearchQueryProvider provider, String searchForString) throws CoreException { return provider.createQuery(searchForString); } diff --git a/org.eclipse.search/new search/org/eclipse/search2/internal/ui/text2/RetrieverAction.java b/org.eclipse.search/new search/org/eclipse/search2/internal/ui/text2/RetrieverAction.java index eaa454c5b4e..edacdb2ac72 100644 --- a/org.eclipse.search/new search/org/eclipse/search2/internal/ui/text2/RetrieverAction.java +++ b/org.eclipse.search/new search/org/eclipse/search2/internal/ui/text2/RetrieverAction.java @@ -60,6 +60,7 @@ abstract public class RetrieverAction extends Action { public RetrieverAction() { } + @Override public void run() { IWorkbenchPage page= getWorkbenchPage(); if (page == null) { diff --git a/org.eclipse.search/new search/org/eclipse/search2/internal/ui/text2/TextSearchQueryProviderRegistry.java b/org.eclipse.search/new search/org/eclipse/search2/internal/ui/text2/TextSearchQueryProviderRegistry.java index c502536e71d..fe12c0aee1d 100644 --- a/org.eclipse.search/new search/org/eclipse/search2/internal/ui/text2/TextSearchQueryProviderRegistry.java +++ b/org.eclipse.search/new search/org/eclipse/search2/internal/ui/text2/TextSearchQueryProviderRegistry.java @@ -70,6 +70,7 @@ public class TextSearchQueryProviderRegistry { final TextSearchQueryProvider[] res= new TextSearchQueryProvider[] { null }; SafeRunnable safe= new SafeRunnable() { + @Override public void run() throws Exception { IConfigurationElement[] extensions= Platform.getExtensionRegistry().getConfigurationElementsFor(EXTENSION_POINT_ID); for (int i= 0; i < extensions.length; i++) { @@ -80,6 +81,7 @@ public class TextSearchQueryProviderRegistry { } } } + @Override public void handleException(Throwable e) { SearchPlugin.log(e); } diff --git a/org.eclipse.search/search/org/eclipse/search/internal/core/text/DocumentCharSequence.java b/org.eclipse.search/search/org/eclipse/search/internal/core/text/DocumentCharSequence.java index 06a690597bf..c4fc26e1ffa 100644 --- a/org.eclipse.search/search/org/eclipse/search/internal/core/text/DocumentCharSequence.java +++ b/org.eclipse.search/search/org/eclipse/search/internal/core/text/DocumentCharSequence.java @@ -27,16 +27,12 @@ public class DocumentCharSequence implements CharSequence { fDocument= document; } - /* (non-Javadoc) - * @see java.lang.CharSequence#length() - */ + @Override public int length() { return fDocument.getLength(); } - /* (non-Javadoc) - * @see java.lang.CharSequence#charAt(int) - */ + @Override public char charAt(int index) { try { return fDocument.getChar(index); @@ -45,9 +41,7 @@ public class DocumentCharSequence implements CharSequence { } } - /* (non-Javadoc) - * @see java.lang.CharSequence#subSequence(int, int) - */ + @Override public CharSequence subSequence(int start, int end) { try { return fDocument.get(start, end - start); diff --git a/org.eclipse.search/search/org/eclipse/search/internal/core/text/FileCharSequenceProvider.java b/org.eclipse.search/search/org/eclipse/search/internal/core/text/FileCharSequenceProvider.java index 66a8a6a17ad..cbc22757063 100644 --- a/org.eclipse.search/search/org/eclipse/search/internal/core/text/FileCharSequenceProvider.java +++ b/org.eclipse.search/search/org/eclipse/search/internal/core/text/FileCharSequenceProvider.java @@ -89,16 +89,12 @@ public class FileCharSequenceProvider { fSequenceLength= length; } - /* (non-Javadoc) - * @see java.lang.CharSequence#length() - */ + @Override public int length() { return fSequenceLength; } - /* (non-Javadoc) - * @see java.lang.CharSequence#charAt(int) - */ + @Override public char charAt(int index) { if (index < 0) { throw new IndexOutOfBoundsException("index must be larger than 0"); //$NON-NLS-1$ @@ -109,9 +105,7 @@ public class FileCharSequenceProvider { return fParent.charAt(fSequenceOffset + index); } - /* (non-Javadoc) - * @see java.lang.CharSequence#subSequence(int, int) - */ + @Override public CharSequence subSequence(int start, int end) { if (end < start) { throw new IndexOutOfBoundsException("end cannot be smaller than start"); //$NON-NLS-1$ @@ -125,9 +119,7 @@ public class FileCharSequenceProvider { return fParent.subSequence(fSequenceOffset + start, fSequenceOffset + end); } - /* (non-Javadoc) - * @see java.lang.Object#toString() - */ + @Override public String toString() { try { return fParent.getSubstring(fSequenceOffset, fSequenceLength); @@ -327,9 +319,7 @@ public class FileCharSequenceProvider { fReaderPos= Integer.MAX_VALUE; } - /* (non-Javadoc) - * @see java.lang.CharSequence#length() - */ + @Override public int length() { if (fLength == null) { try { @@ -394,9 +384,7 @@ public class FileCharSequenceProvider { return true; } - /* (non-Javadoc) - * @see java.lang.CharSequence#charAt(int) - */ + @Override public char charAt(final int index) { final Buffer current= fMostCurrentBuffer; if (current != null && current.contains(index)) { @@ -455,9 +443,7 @@ public class FileCharSequenceProvider { } - /* (non-Javadoc) - * @see java.lang.CharSequence#subSequence(int, int) - */ + @Override public CharSequence subSequence(int start, int end) { if (end < start) { throw new IndexOutOfBoundsException("end cannot be smaller than start"); //$NON-NLS-1$ @@ -475,9 +461,7 @@ public class FileCharSequenceProvider { clearReader(); } - /* (non-Javadoc) - * @see java.lang.Object#toString() - */ + @Override public String toString() { int len= fLength != null ? fLength.intValue() : 4000; StringBuffer res= new StringBuffer(len); diff --git a/org.eclipse.search/search/org/eclipse/search/internal/core/text/FileNamePatternSearchScope.java b/org.eclipse.search/search/org/eclipse/search/internal/core/text/FileNamePatternSearchScope.java index e3e217179bc..dd01d712e76 100644 --- a/org.eclipse.search/search/org/eclipse/search/internal/core/text/FileNamePatternSearchScope.java +++ b/org.eclipse.search/search/org/eclipse/search/internal/core/text/FileNamePatternSearchScope.java @@ -66,16 +66,12 @@ public class FileNamePatternSearchScope extends TextSearchScope { return fDescription; } - /* (non-Javadoc) - * @see org.eclipse.search.core.text.FileSearchScope#getRoots() - */ + @Override public IResource[] getRoots() { return fRootElements; } - /* (non-Javadoc) - * @see org.eclipse.search.core.text.FileSearchScope#contains(org.eclipse.core.resources.IResourceProxy) - */ + @Override public boolean contains(IResourceProxy proxy) { if (!fVisitDerived && proxy.isDerived()) { return false; // all resources in a derived folder are considered to be derived, see bug 103576 diff --git a/org.eclipse.search/search/org/eclipse/search/internal/core/text/FilesOfScopeCalculator.java b/org.eclipse.search/search/org/eclipse/search/internal/core/text/FilesOfScopeCalculator.java index c49ac15c055..4f9eea1a77f 100644 --- a/org.eclipse.search/search/org/eclipse/search/internal/core/text/FilesOfScopeCalculator.java +++ b/org.eclipse.search/search/org/eclipse/search/internal/core/text/FilesOfScopeCalculator.java @@ -33,6 +33,7 @@ public class FilesOfScopeCalculator implements IResourceProxyVisitor { fStatus= status; } + @Override public boolean visit(IResourceProxy proxy) { boolean inScope= fScope.contains(proxy); diff --git a/org.eclipse.search/search/org/eclipse/search/internal/core/text/TextSearchEngineRegistry.java b/org.eclipse.search/search/org/eclipse/search/internal/core/text/TextSearchEngineRegistry.java index be6f566a544..82476a46060 100644 --- a/org.eclipse.search/search/org/eclipse/search/internal/core/text/TextSearchEngineRegistry.java +++ b/org.eclipse.search/search/org/eclipse/search/internal/core/text/TextSearchEngineRegistry.java @@ -79,6 +79,7 @@ public class TextSearchEngineRegistry { final TextSearchEngine[] res= new TextSearchEngine[] { null }; SafeRunnable safe= new SafeRunnable() { + @Override public void run() throws Exception { IConfigurationElement[] extensions= Platform.getExtensionRegistry().getConfigurationElementsFor(EXTENSION_POINT_ID); for (int i= 0; i < extensions.length; i++) { @@ -89,6 +90,7 @@ public class TextSearchEngineRegistry { } } } + @Override public void handleException(Throwable e) { SearchPlugin.log(e); } diff --git a/org.eclipse.search/search/org/eclipse/search/internal/core/text/TextSearchVisitor.java b/org.eclipse.search/search/org/eclipse/search/internal/core/text/TextSearchVisitor.java index 179fd7a4474..b50496b8980 100644 --- a/org.eclipse.search/search/org/eclipse/search/internal/core/text/TextSearchVisitor.java +++ b/org.eclipse.search/search/org/eclipse/search/internal/core/text/TextSearchVisitor.java @@ -89,26 +89,32 @@ public class TextSearchVisitor { fContent= content; } + @Override public IFile getFile() { return fFile; } + @Override public int getMatchOffset() { return fOffset; } + @Override public int getMatchLength() { return fLength; } + @Override public int getFileContentLength() { return fContent.length(); } + @Override public char getFileContentChar(int offset) { return fContent.charAt(offset); } + @Override public String getFileContent(int offset, int length) { return fContent.subSequence(offset, offset + length).toString(); // must pass a copy! } @@ -123,6 +129,7 @@ public class TextSearchVisitor { } // Always continue processing all other files, even if errors are encountered in individual files. + @Override protected boolean shouldCancel(IStatus lastCompletedJobResult, int numberOfFailedJobs, int numberOfCancelledJobs) { return false; } @@ -156,6 +163,7 @@ public class TextSearchVisitor { fDocumentsInEditors = documentsInEditors; } + @Override protected IStatus run(IProgressMonitor inner) { fMonitor= inner; MultiStatus multiStatus= @@ -231,6 +239,7 @@ public class TextSearchVisitor { Job monitorUpdateJob= new Job(SearchMessages.TextSearchVisitor_progress_updating_job) { private int fLastNumberOfScannedFiles= 0; + @Override public IStatus run(IProgressMonitor inner) { while (!inner.isCanceled()) { // Propagate user cancellation to the JobGroup. diff --git a/org.eclipse.search/search/org/eclipse/search/internal/ui/CopyToClipboardAction.java b/org.eclipse.search/search/org/eclipse/search/internal/ui/CopyToClipboardAction.java index f92bce387b4..696ad75105d 100644 --- a/org.eclipse.search/search/org/eclipse/search/internal/ui/CopyToClipboardAction.java +++ b/org.eclipse.search/search/org/eclipse/search/internal/ui/CopyToClipboardAction.java @@ -69,6 +69,7 @@ public class CopyToClipboardAction extends Action { fViewer= viewer; } + @Override public void runWithEvent(Event event) { // bugzilla 126062: allow combos and text fields of the view to fill // the clipboard @@ -99,6 +100,7 @@ public class CopyToClipboardAction extends Action { /* * Implements method from IAction */ + @Override public void run() { Shell shell= SearchPlugin.getActiveWorkbenchShell(); if (shell == null || fViewer == null) diff --git a/org.eclipse.search/search/org/eclipse/search/internal/ui/GotoMarkerAction.java b/org.eclipse.search/search/org/eclipse/search/internal/ui/GotoMarkerAction.java index 412972c66e8..879060c7714 100644 --- a/org.eclipse.search/search/org/eclipse/search/internal/ui/GotoMarkerAction.java +++ b/org.eclipse.search/search/org/eclipse/search/internal/ui/GotoMarkerAction.java @@ -15,6 +15,7 @@ import org.eclipse.jface.action.Action; /** * @deprecated old search */ +@Deprecated class GotoMarkerAction extends Action { private SearchResultViewer fViewer; @@ -26,6 +27,7 @@ class GotoMarkerAction extends Action { fViewer= viewer; } + @Override public void run() { fViewer.showResult(); } diff --git a/org.eclipse.search/search/org/eclipse/search/internal/ui/OpenFileSearchPageAction.java b/org.eclipse.search/search/org/eclipse/search/internal/ui/OpenFileSearchPageAction.java index 83090e57156..5d2333d36b1 100644 --- a/org.eclipse.search/search/org/eclipse/search/internal/ui/OpenFileSearchPageAction.java +++ b/org.eclipse.search/search/org/eclipse/search/internal/ui/OpenFileSearchPageAction.java @@ -33,10 +33,12 @@ public class OpenFileSearchPageAction implements IWorkbenchWindowActionDelegate public OpenFileSearchPageAction() { } + @Override public void init(IWorkbenchWindow window) { fWindow= window; } + @Override public void run(IAction action) { if (fWindow == null || fWindow.getActivePage() == null) { SearchPlugin.beep(); @@ -46,10 +48,12 @@ public class OpenFileSearchPageAction implements IWorkbenchWindowActionDelegate NewSearchUI.openSearchDialog(fWindow, TEXT_SEARCH_PAGE_ID); } + @Override public void selectionChanged(IAction action, ISelection selection) { // do nothing since the action isn't selection dependent. } + @Override public void dispose() { fWindow= null; } diff --git a/org.eclipse.search/search/org/eclipse/search/internal/ui/OpenSearchDialogAction.java b/org.eclipse.search/search/org/eclipse/search/internal/ui/OpenSearchDialogAction.java index 28b3a97710c..bc93e11ef68 100644 --- a/org.eclipse.search/search/org/eclipse/search/internal/ui/OpenSearchDialogAction.java +++ b/org.eclipse.search/search/org/eclipse/search/internal/ui/OpenSearchDialogAction.java @@ -37,14 +37,17 @@ public class OpenSearchDialogAction extends Action implements IWorkbenchWindowAc fWindow= window; } + @Override public void init(IWorkbenchWindow window) { fWindow= window; } + @Override public void run(IAction action) { run(); } + @Override public void run() { if (getWorkbenchWindow().getActivePage() == null) { SearchPlugin.beep(); @@ -54,6 +57,7 @@ public class OpenSearchDialogAction extends Action implements IWorkbenchWindowAc dialog.open(); } + @Override public void selectionChanged(IAction action, ISelection selection) { // do nothing since the action isn't selection dependent. } @@ -64,6 +68,7 @@ public class OpenSearchDialogAction extends Action implements IWorkbenchWindowAc return fWindow; } + @Override public void dispose() { fWindow= null; } diff --git a/org.eclipse.search/search/org/eclipse/search/internal/ui/OpenSearchDialogPageAction.java b/org.eclipse.search/search/org/eclipse/search/internal/ui/OpenSearchDialogPageAction.java index 4794d6e2984..8740ee84117 100644 --- a/org.eclipse.search/search/org/eclipse/search/internal/ui/OpenSearchDialogPageAction.java +++ b/org.eclipse.search/search/org/eclipse/search/internal/ui/OpenSearchDialogPageAction.java @@ -35,43 +35,33 @@ public class OpenSearchDialogPageAction implements IWorkbenchWindowPulldownDeleg private IWorkbenchWindow fWorkbenchWindow; private OpenSearchDialogAction fOpenSearchDialogAction; - /* - * @see org.eclipse.ui.IWorkbenchWindowPulldownDelegate2#getMenu(org.eclipse.swt.widgets.Menu) - */ + @Override public Menu getMenu(Menu parent) { Menu menu= new Menu(parent); fillMenu(menu); return menu; } - /* - * @see org.eclipse.ui.IWorkbenchWindowPulldownDelegate#getMenu(org.eclipse.swt.widgets.Control) - */ + @Override public Menu getMenu(Control parent) { Menu menu= new Menu(parent); fillMenu(menu); return menu; } - /* - * @see org.eclipse.ui.IWorkbenchWindowActionDelegate#dispose() - */ + @Override public void dispose() { if (fOpenSearchDialogAction != null) { fOpenSearchDialogAction.dispose(); } } - /* - * @see org.eclipse.ui.IWorkbenchWindowActionDelegate#init(org.eclipse.ui.IWorkbenchWindow) - */ + @Override public void init(IWorkbenchWindow window) { fWorkbenchWindow= window; } - /* - * @see org.eclipse.ui.IActionDelegate#run(org.eclipse.jface.action.IAction) - */ + @Override public void run(IAction action) { if (fOpenSearchDialogAction == null) { fOpenSearchDialogAction= new OpenSearchDialogAction(); @@ -79,9 +69,7 @@ public class OpenSearchDialogPageAction implements IWorkbenchWindowPulldownDeleg fOpenSearchDialogAction.run(action); } - /* - * @see org.eclipse.ui.IActionDelegate#selectionChanged(org.eclipse.jface.action.IAction, org.eclipse.jface.viewers.ISelection) - */ + @Override public void selectionChanged(IAction action, ISelection sel) { // Empty } @@ -97,8 +85,10 @@ public class OpenSearchDialogPageAction implements IWorkbenchWindowPulldownDeleg } } localMenu.addMenuListener(new MenuAdapter() { + @Override public void menuHidden(MenuEvent e) { e.display.asyncExec(new Runnable() { + @Override public void run() { localMenu.dispose(); } @@ -140,6 +130,7 @@ public class OpenSearchDialogPageAction implements IWorkbenchWindowPulldownDeleg } } + @Override public void run() { fOpenSearchDialogAction.run(this); } diff --git a/org.eclipse.search/search/org/eclipse/search/internal/ui/RemoveAllResultsAction.java b/org.eclipse.search/search/org/eclipse/search/internal/ui/RemoveAllResultsAction.java index 07705f96b5f..c9e566948d6 100644 --- a/org.eclipse.search/search/org/eclipse/search/internal/ui/RemoveAllResultsAction.java +++ b/org.eclipse.search/search/org/eclipse/search/internal/ui/RemoveAllResultsAction.java @@ -15,6 +15,7 @@ import org.eclipse.jface.action.Action; /** * @deprecated old search */ +@Deprecated class RemoveAllResultsAction extends Action { public RemoveAllResultsAction() { @@ -23,6 +24,7 @@ class RemoveAllResultsAction extends Action { setToolTipText(SearchMessages.SearchResultView_removeAllResults_tooltip); } + @Override public void run() { SearchManager.getDefault().removeAllResults(); } diff --git a/org.eclipse.search/search/org/eclipse/search/internal/ui/RemoveAllSearchesAction.java b/org.eclipse.search/search/org/eclipse/search/internal/ui/RemoveAllSearchesAction.java index c0f671ab952..e492c2f6cee 100644 --- a/org.eclipse.search/search/org/eclipse/search/internal/ui/RemoveAllSearchesAction.java +++ b/org.eclipse.search/search/org/eclipse/search/internal/ui/RemoveAllSearchesAction.java @@ -15,6 +15,7 @@ import org.eclipse.jface.action.Action; /** * @deprecated old search */ +@Deprecated class RemoveAllSearchesAction extends Action { public RemoveAllSearchesAction() { @@ -23,6 +24,7 @@ class RemoveAllSearchesAction extends Action { setToolTipText(SearchMessages.SearchResultView_removeAllSearches_tooltip); } + @Override public void run() { SearchManager.getDefault().removeAllSearches(); } diff --git a/org.eclipse.search/search/org/eclipse/search/internal/ui/RemoveMatchAction.java b/org.eclipse.search/search/org/eclipse/search/internal/ui/RemoveMatchAction.java index a3ea5bd3b2c..6b74804ccaf 100644 --- a/org.eclipse.search/search/org/eclipse/search/internal/ui/RemoveMatchAction.java +++ b/org.eclipse.search/search/org/eclipse/search/internal/ui/RemoveMatchAction.java @@ -25,6 +25,7 @@ import org.eclipse.search.ui.ISearchResultViewEntry; /** * @deprecated old search */ +@Deprecated class RemoveMatchAction extends Action { private ISelectionProvider fSelectionProvider; @@ -35,6 +36,7 @@ class RemoveMatchAction extends Action { fSelectionProvider= provider; } + @Override public void run() { IMarker[] markers= getMarkers(fSelectionProvider.getSelection()); if (markers != null) diff --git a/org.eclipse.search/search/org/eclipse/search/internal/ui/RemovePotentialMatchesAction.java b/org.eclipse.search/search/org/eclipse/search/internal/ui/RemovePotentialMatchesAction.java index 27369e53569..e30dfd45a52 100644 --- a/org.eclipse.search/search/org/eclipse/search/internal/ui/RemovePotentialMatchesAction.java +++ b/org.eclipse.search/search/org/eclipse/search/internal/ui/RemovePotentialMatchesAction.java @@ -30,6 +30,7 @@ import org.eclipse.search.ui.SearchUI; /** * @deprecated old search */ +@Deprecated class RemovePotentialMatchesAction extends Action { private IWorkbenchSite fSite; @@ -47,6 +48,7 @@ class RemovePotentialMatchesAction extends Action { } } + @Override public void run() { IMarker[] markers= getMarkers(); if (markers != null) diff --git a/org.eclipse.search/search/org/eclipse/search/internal/ui/RemoveResultAction.java b/org.eclipse.search/search/org/eclipse/search/internal/ui/RemoveResultAction.java index ac2dad2e1b3..c60a0aaa4af 100644 --- a/org.eclipse.search/search/org/eclipse/search/internal/ui/RemoveResultAction.java +++ b/org.eclipse.search/search/org/eclipse/search/internal/ui/RemoveResultAction.java @@ -30,6 +30,7 @@ import org.eclipse.search.ui.ISearchResultViewEntry; /** * @deprecated old search */ +@Deprecated class RemoveResultAction extends Action { private ISelectionProvider fSelectionProvider; @@ -47,10 +48,12 @@ class RemoveResultAction extends Action { SearchPluginImages.setImageDescriptors(this, SearchPluginImages.T_LCL, SearchPluginImages.IMG_LCL_SEARCH_REM); } + @Override public void run() { final IMarker[] markers= getMarkers(fSelectionProvider.getSelection()); if (markers != null) { BusyIndicator.showWhile(SearchPlugin.getActiveWorkbenchShell().getDisplay(), new Runnable() { + @Override public void run() { try { SearchPlugin.getWorkspace().deleteMarkers(markers); diff --git a/org.eclipse.search/search/org/eclipse/search/internal/ui/ResourceToItemsMapper.java b/org.eclipse.search/search/org/eclipse/search/internal/ui/ResourceToItemsMapper.java index 2d78d0ac123..0546843fff7 100644 --- a/org.eclipse.search/search/org/eclipse/search/internal/ui/ResourceToItemsMapper.java +++ b/org.eclipse.search/search/org/eclipse/search/internal/ui/ResourceToItemsMapper.java @@ -32,6 +32,7 @@ import org.eclipse.search.ui.ISearchResultViewEntry; * elements. * @deprecated old search */ +@Deprecated class ResourceToItemsMapper { private static final int NUMBER_LIST_REUSE= 10; diff --git a/org.eclipse.search/search/org/eclipse/search/internal/ui/ScopePart.java b/org.eclipse.search/search/org/eclipse/search/internal/ui/ScopePart.java index 0ba1eee95ee..279e9710635 100644 --- a/org.eclipse.search/search/org/eclipse/search/internal/ui/ScopePart.java +++ b/org.eclipse.search/search/org/eclipse/search/internal/ui/ScopePart.java @@ -309,6 +309,7 @@ public class ScopePart { fUseWorkingSet.setText(SearchMessages.ScopePart_workingSetScope_text); fWorkingSetText= new Text(fPart, SWT.SINGLE | SWT.BORDER | SWT.READ_ONLY); fWorkingSetText.getAccessible().addAccessibleListener(new AccessibleAdapter() { + @Override public void getName(AccessibleEvent e) { e.result= SearchMessages.ScopePart_workingSetText_accessible_label; } @@ -319,6 +320,7 @@ public class ScopePart { chooseWorkingSet.setText(SearchMessages.ScopePart_workingSetChooseButton_text); SWTUtil.setButtonDimensionHint(chooseWorkingSet); chooseWorkingSet.addSelectionListener(new SelectionAdapter() { + @Override public void widgetSelected(SelectionEvent e) { if (handleChooseWorkingSet()) { setSelectedScope(ISearchPageContainer.WORKING_SET_SCOPE); @@ -333,6 +335,7 @@ public class ScopePart { // Add scope change listeners SelectionAdapter scopeChangedLister= new SelectionAdapter() { + @Override public void widgetSelected(SelectionEvent e) { handleScopeChanged(e); } diff --git a/org.eclipse.search/search/org/eclipse/search/internal/ui/Search.java b/org.eclipse.search/search/org/eclipse/search/internal/ui/Search.java index 2f80efdb79b..e9c4d970b20 100644 --- a/org.eclipse.search/search/org/eclipse/search/internal/ui/Search.java +++ b/org.eclipse.search/search/org/eclipse/search/internal/ui/Search.java @@ -34,6 +34,7 @@ import org.eclipse.search.ui.ISearchResultViewEntry; /** * @deprecated old search */ +@Deprecated public class Search extends Object { private String fPageId; private String fSingularLabel; diff --git a/org.eclipse.search/search/org/eclipse/search/internal/ui/SearchAgainAction.java b/org.eclipse.search/search/org/eclipse/search/internal/ui/SearchAgainAction.java index a5675504fd0..d99aa28e6b5 100644 --- a/org.eclipse.search/search/org/eclipse/search/internal/ui/SearchAgainAction.java +++ b/org.eclipse.search/search/org/eclipse/search/internal/ui/SearchAgainAction.java @@ -15,6 +15,7 @@ import org.eclipse.jface.action.Action; /** * @deprecated old search */ +@Deprecated class SearchAgainAction extends Action { public SearchAgainAction() { @@ -22,6 +23,7 @@ class SearchAgainAction extends Action { setToolTipText(SearchMessages.SearchResultView_searchAgain_tooltip); } + @Override public void run() { Search selected= SearchManager.getDefault().getCurrentSearch(); if (selected != null) diff --git a/org.eclipse.search/search/org/eclipse/search/internal/ui/SearchDialog.java b/org.eclipse.search/search/org/eclipse/search/internal/ui/SearchDialog.java index 5c6374d898f..f76c7f85c94 100644 --- a/org.eclipse.search/search/org/eclipse/search/internal/ui/SearchDialog.java +++ b/org.eclipse.search/search/org/eclipse/search/internal/ui/SearchDialog.java @@ -99,6 +99,7 @@ public class SearchDialog extends ExtendedDialogWindow implements ISearchPageCon private class TabFolderLayout extends Layout { + @Override protected Point computeSize(Composite composite, int wHint, int hHint, boolean flushCache) { if (wHint != SWT.DEFAULT && hHint != SWT.DEFAULT) return new Point(wHint, hHint); @@ -122,6 +123,7 @@ public class SearchDialog extends ExtendedDialogWindow implements ISearchPageCon y= hHint; return new Point(x, y); } + @Override protected void layout(Composite composite, boolean flushCache) { Rectangle rect= composite.getClientArea(); @@ -231,13 +233,12 @@ public class SearchDialog extends ExtendedDialogWindow implements ISearchPageCon return new String[0]; } - /* (non-Javadoc) - * @see org.eclipse.jface.dialogs.Dialog#getDialogBoundsSettings() - */ + @Override protected IDialogSettings getDialogBoundsSettings() { return SearchPlugin.getDefault().getDialogSettingsSection("DialogBounds_SearchDialog"); //$NON-NLS-1$ } + @Override protected Point getInitialSize() { Point requiredSize= getShell().computeSize(SWT.DEFAULT, SWT.DEFAULT, true); Point lastSize= super.getInitialSize(); @@ -247,9 +248,7 @@ public class SearchDialog extends ExtendedDialogWindow implements ISearchPageCon return lastSize; } - /* (non-Javadoc) - * Method declared in Window. - */ + @Override protected void configureShell(Shell shell) { super.configureShell(shell); shell.setText(SearchMessages.SearchDialog_title); @@ -260,6 +259,7 @@ public class SearchDialog extends ExtendedDialogWindow implements ISearchPageCon return fWorkbenchWindow; } + @Override public ISelection getSelection() { return fCurrentSelection; } @@ -288,6 +288,7 @@ public class SearchDialog extends ExtendedDialogWindow implements ISearchPageCon * @deprecated old ('classic') search is deprecated * @since 3.7 */ + @Deprecated private static boolean isOldSearchView(IWorkbenchPart part) { return org.eclipse.search.ui.SearchUI.SEARCH_RESULT_VIEW_ID.equals(part.getSite().getId()); } @@ -297,6 +298,7 @@ public class SearchDialog extends ExtendedDialogWindow implements ISearchPageCon /* * Overrides method from Window */ + @Override public void create() { super.create(); if (fCurrentPage != null) { @@ -310,11 +312,13 @@ public class SearchDialog extends ExtendedDialogWindow implements ISearchPageCon final ArrayList createdImages= new ArrayList(input.size()); ILabelProvider labelProvider= new LabelProvider() { + @Override public String getText(Object element) { if (element instanceof SearchPageDescriptor) return LegacyActionTools.removeMnemonics(((SearchPageDescriptor)element).getLabel()); return null; } + @Override public Image getImage(Object element) { if (element instanceof SearchPageDescriptor) { ImageDescriptor imageDesc= ((SearchPageDescriptor)element).getImage(); @@ -334,16 +338,19 @@ public class SearchDialog extends ExtendedDialogWindow implements ISearchPageCon ListSelectionDialog dialog= new ListSelectionDialog(getShell(), input, new ArrayContentProvider(), labelProvider, message) { Button fLastUsedPageButton; + @Override public void create() { super.create(); final CheckboxTableViewer viewer= getViewer(); final Button okButton= this.getOkButton(); viewer.addCheckStateListener(new ICheckStateListener() { + @Override public void checkStateChanged(CheckStateChangedEvent event) { okButton.setEnabled(viewer.getCheckedElements().length > 0); } }); SelectionListener listener = new SelectionAdapter() { + @Override public void widgetSelected(SelectionEvent e) { okButton.setEnabled(viewer.getCheckedElements().length > 0); } @@ -352,6 +359,7 @@ public class SearchDialog extends ExtendedDialogWindow implements ISearchPageCon this.getButton(IDialogConstants.DESELECT_ALL_ID).addSelectionListener(listener); } + @Override protected Control createDialogArea(Composite parent) { Composite control= (Composite)super.createDialogArea(parent); fLastUsedPageButton= new Button(control, SWT.CHECK); @@ -360,6 +368,7 @@ public class SearchDialog extends ExtendedDialogWindow implements ISearchPageCon return control; } + @Override protected void okPressed() { fDialogSettings.put(STORE_IS_OPEN_PREVIOUS_PAGE, fLastUsedPageButton.getSelection()); super.okPressed(); @@ -374,6 +383,7 @@ public class SearchDialog extends ExtendedDialogWindow implements ISearchPageCon if (display != null && !display.isDisposed()) { display.asyncExec( new Runnable() { + @Override public void run() { new OpenSearchDialogAction().run(); } @@ -403,6 +413,7 @@ public class SearchDialog extends ExtendedDialogWindow implements ISearchPageCon } } + @Override protected Control createPageArea(Composite parent) { int numPages= fDescriptors.size(); fScopeParts= new ScopePart[numPages]; @@ -438,6 +449,7 @@ public class SearchDialog extends ExtendedDialogWindow implements ISearchPageCon item.setData("descriptor", descriptor); //$NON-NLS-1$ item.setText(descriptor.getLabel()); item.addDisposeListener(new DisposeListener() { + @Override public void widgetDisposed(DisposeEvent e) { item.setData("descriptor", null); //$NON-NLS-1$ if (item.getImage() != null) @@ -458,6 +470,7 @@ public class SearchDialog extends ExtendedDialogWindow implements ISearchPageCon } folder.addSelectionListener(new SelectionAdapter() { + @Override public void widgetSelected(SelectionEvent event) { turnToPage(event); } @@ -468,6 +481,7 @@ public class SearchDialog extends ExtendedDialogWindow implements ISearchPageCon return composite; } + @Override protected Control createButtonBar(Composite parent) { Composite composite= new Composite(parent, SWT.NONE); GridLayout layout= new GridLayout(); @@ -499,6 +513,7 @@ public class SearchDialog extends ExtendedDialogWindow implements ISearchPageCon return composite; } + @Override protected boolean performAction(int actionID) { switch (actionID) { case CUSTOMIZE_ID: @@ -617,6 +632,7 @@ public class SearchDialog extends ExtendedDialogWindow implements ISearchPageCon /* * Implements method from ISearchPageContainer */ + @Override public IRunnableContext getRunnableContext() { return this; } @@ -624,6 +640,7 @@ public class SearchDialog extends ExtendedDialogWindow implements ISearchPageCon /* * Implements method from ISearchPageContainer */ + @Override public int getSelectedScope() { if (fScopeParts[fCurrentIndex] == null) // safe code - should not happen @@ -635,6 +652,7 @@ public class SearchDialog extends ExtendedDialogWindow implements ISearchPageCon /* * Implements method from ISearchPageContainer */ + @Override public IWorkingSet[] getSelectedWorkingSets() { if (fScopeParts[fCurrentIndex] == null) // safe code - should not happen @@ -648,6 +666,7 @@ public class SearchDialog extends ExtendedDialogWindow implements ISearchPageCon } + @Override public String[] getSelectedProjectNames() { if (getSelectedScope() == SELECTED_PROJECTS_SCOPE) { return getEnclosingProjectNames(); @@ -658,6 +677,7 @@ public class SearchDialog extends ExtendedDialogWindow implements ISearchPageCon /* * Implements method from ISearchPageContainer */ + @Override public void setSelectedScope(int scope) { if (fScopeParts[fCurrentIndex] != null) fScopeParts[fCurrentIndex].setSelectedScope(scope); @@ -667,15 +687,13 @@ public class SearchDialog extends ExtendedDialogWindow implements ISearchPageCon * @see org.eclipse.search.ui.ISearchPageContainer#allowsActiveEditorAsScope(boolean) * @since 3.7 */ + @Override public void setActiveEditorCanProvideScopeSelection(boolean state) { if (fScopeParts[fCurrentIndex] != null) fScopeParts[fCurrentIndex].setActiveEditorCanProvideScopeSelection(state); } - /* - * @see org.eclipse.search.ui.ISearchPageContainer#getActiveEditorInput() - * @since 3.7 - */ + @Override public IEditorInput getActiveEditorInput() { IEditorPart editor= getActiveEditor(); if (editor == null) @@ -696,6 +714,7 @@ public class SearchDialog extends ExtendedDialogWindow implements ISearchPageCon /* * Implements method from ISearchPageContainer */ + @Override public boolean hasValidScope() { return getSelectedScope() != WORKING_SET_SCOPE || getSelectedWorkingSets() != null; } @@ -703,6 +722,7 @@ public class SearchDialog extends ExtendedDialogWindow implements ISearchPageCon /* * Implements method from ISearchPageContainer */ + @Override public void setSelectedWorkingSets(IWorkingSet[] workingSets) { if (fScopeParts[fCurrentIndex] != null) fScopeParts[fCurrentIndex].setSelectedWorkingSets(workingSets); @@ -711,6 +731,7 @@ public class SearchDialog extends ExtendedDialogWindow implements ISearchPageCon /* * Overrides method from ExtendedDialogWindow */ + @Override public void setPerformActionEnabled(boolean state) { fLastEnableState= state; super.setPerformActionEnabled(state && hasValidScope()); @@ -738,8 +759,10 @@ public class SearchDialog extends ExtendedDialogWindow implements ISearchPageCon applyDialogFont(pageWrapper); BusyIndicator.showWhile(getShell().getDisplay(), new Runnable() { + @Override public void run() { SafeRunner.run(new ISafeRunnable() { + @Override public void run() throws Exception { // create page and control ISearchPage page= descriptor.createObject(SearchDialog.this); @@ -747,6 +770,7 @@ public class SearchDialog extends ExtendedDialogWindow implements ISearchPageCon page.createControl(pageWrapper); } } + @Override public void handleException(Throwable ex) { if (ex instanceof CoreException) { ExceptionHandler.handle((CoreException) ex, getShell(), SearchMessages.Search_Error_createSearchPage_title, Messages.format(SearchMessages.Search_Error_createSearchPage_message, descriptor.getLabel())); @@ -807,9 +831,7 @@ public class SearchDialog extends ExtendedDialogWindow implements ISearchPageCon return currentSize.x < newSize.x || currentSize.y < newSize.y; } - /* (non-Javadoc) - * @see org.eclipse.jface.dialogs.Dialog#close() - */ + @Override public boolean close() { for (int i= 0; i < fDescriptors.size(); i++) { SearchPageDescriptor desc= (SearchPageDescriptor) fDescriptors.get(i); @@ -818,16 +840,12 @@ public class SearchDialog extends ExtendedDialogWindow implements ISearchPageCon return super.close(); } - /* (non-Javadoc) - * @see org.eclipse.jface.dialogs.IPageChangeProvider#getSelectedPage() - */ + @Override public Object getSelectedPage() { return fCurrentPage; } - /* (non-Javadoc) - * @see org.eclipse.jface.dialogs.IPageChangeProvider#addPageChangedListener(org.eclipse.jface.dialogs.IPageChangedListener) - */ + @Override public void addPageChangedListener(IPageChangedListener listener) { if (fPageChangeListeners == null) { fPageChangeListeners= new ListenerList(); @@ -835,9 +853,7 @@ public class SearchDialog extends ExtendedDialogWindow implements ISearchPageCon fPageChangeListeners.add(listener); } - /* (non-Javadoc) - * @see org.eclipse.jface.dialogs.IPageChangeProvider#removePageChangedListener(org.eclipse.jface.dialogs.IPageChangedListener) - */ + @Override public void removePageChangedListener(IPageChangedListener listener) { fPageChangeListeners.remove(listener); } @@ -850,6 +866,7 @@ public class SearchDialog extends ExtendedDialogWindow implements ISearchPageCon for (int i= 0; i < listeners.length; ++i) { final IPageChangedListener l= (IPageChangedListener) listeners[i]; SafeRunner.run(new SafeRunnable() { + @Override public void run() { l.pageChanged(event); } diff --git a/org.eclipse.search/search/org/eclipse/search/internal/ui/SearchDropDownAction.java b/org.eclipse.search/search/org/eclipse/search/internal/ui/SearchDropDownAction.java index c9973dc1b57..1fe05775b1c 100644 --- a/org.eclipse.search/search/org/eclipse/search/internal/ui/SearchDropDownAction.java +++ b/org.eclipse.search/search/org/eclipse/search/internal/ui/SearchDropDownAction.java @@ -24,6 +24,7 @@ import org.eclipse.jface.action.IMenuCreator; /** * @deprecated old search */ +@Deprecated class SearchDropDownAction extends Action implements IMenuCreator { @@ -38,6 +39,7 @@ class SearchDropDownAction extends Action implements IMenuCreator { setMenuCreator(this); } + @Override public void dispose() { if (fMenu != null) { fMenu.dispose(); @@ -45,10 +47,12 @@ class SearchDropDownAction extends Action implements IMenuCreator { } } + @Override public Menu getMenu(Menu parent) { return null; } + @Override public Menu getMenu(Control parent) { if (fMenu != null) fMenu.dispose(); @@ -81,6 +85,7 @@ class SearchDropDownAction extends Action implements IMenuCreator { item.fill(parent, -1); } + @Override public void run() { new ShowSearchesAction().run(true); } diff --git a/org.eclipse.search/search/org/eclipse/search/internal/ui/SearchManager.java b/org.eclipse.search/search/org/eclipse/search/internal/ui/SearchManager.java index 9ea4905edae..253bf416ebc 100644 --- a/org.eclipse.search/search/org/eclipse/search/internal/ui/SearchManager.java +++ b/org.eclipse.search/search/org/eclipse/search/internal/ui/SearchManager.java @@ -47,6 +47,7 @@ import org.eclipse.search.ui.SearchUI; * Manage search results * @deprecated old search */ +@Deprecated public class SearchManager implements IResourceChangeListener { static SearchManager fgDefault; @@ -95,6 +96,7 @@ public class SearchManager implements IResourceChangeListener { void removeAllSearches() { SearchPlugin.getWorkspace().removeResourceChangeListener(this); WorkspaceModifyOperation op= new WorkspaceModifyOperation(null) { + @Override protected void execute(IProgressMonitor monitor) throws CoreException { monitor.beginTask(SearchMessages.SearchManager_updating, 100); SearchPlugin.getWorkspace().getRoot().deleteMarkers(SearchUI.SEARCH_MARKER, true, IResource.DEPTH_INFINITE); @@ -137,6 +139,7 @@ public class SearchManager implements IResourceChangeListener { SearchPlugin.getWorkspace().removeResourceChangeListener(this); WorkspaceModifyOperation op= new WorkspaceModifyOperation(null) { + @Override protected void execute(IProgressMonitor monitor) throws CoreException { internalSetCurrentSearch(search, monitor); } @@ -234,6 +237,7 @@ public class SearchManager implements IResourceChangeListener { final String warningTitle= SearchMessages.SearchManager_resourceChangedWarning; final String warningMsg= warningMessage; display.syncExec(new Runnable() { + @Override public void run() { MessageDialog.openWarning(getShell(), warningTitle, warningMsg); } @@ -248,6 +252,7 @@ public class SearchManager implements IResourceChangeListener { while (iter.hasNext()) { final SearchResultViewer viewer= (SearchResultViewer)iter.next(); display.syncExec(new Runnable() { + @Override public void run() { if (previousSearch != null && viewer == visibleViewer) previousSearch.setSelection(viewer.getSelection()); @@ -298,6 +303,7 @@ public class SearchManager implements IResourceChangeListener { while (iter.hasNext()) { final SearchResultViewer viewer= (SearchResultViewer)iter.next(); display.syncExec(new Runnable() { + @Override public void run() { if (fCurrentSearch != null && viewer == visibleViewer) fCurrentSearch.setSelection(viewer.getSelection()); @@ -336,6 +342,7 @@ public class SearchManager implements IResourceChangeListener { handleNewSearchResult(); else { display.syncExec(new Runnable() { + @Override public void run() { handleNewSearchResult(); } @@ -453,6 +460,7 @@ public class SearchManager implements IResourceChangeListener { * display thread. * @param event the event */ + @Override public final void resourceChanged(final IResourceChangeEvent event) { if (event == null) return; @@ -466,6 +474,7 @@ public class SearchManager implements IResourceChangeListener { return; Runnable runnable= new Runnable() { + @Override public void run() { if (getCurrentSearch() != null) { handleSearchMarkersChanged(markerDeltas); diff --git a/org.eclipse.search/search/org/eclipse/search/internal/ui/SearchPageDescriptor.java b/org.eclipse.search/search/org/eclipse/search/internal/ui/SearchPageDescriptor.java index c06861f84bb..683d61c863f 100644 --- a/org.eclipse.search/search/org/eclipse/search/internal/ui/SearchPageDescriptor.java +++ b/org.eclipse.search/search/org/eclipse/search/internal/ui/SearchPageDescriptor.java @@ -292,6 +292,7 @@ class SearchPageDescriptor implements IPluginContribution, Comparable { /* * Implements a method from IComparable */ + @Override public int compareTo(Object o) { int myPos= getTabPosition(); int objsPos= ((SearchPageDescriptor)o).getTabPosition(); @@ -366,17 +367,13 @@ class SearchPageDescriptor implements IPluginContribution, Comparable { } } - /* (non-Javadoc) - * @see org.eclipse.ui.IPluginContribution#getLocalId() - */ - public String getLocalId() { + @Override + public String getLocalId() { return getId(); } - /* (non-Javadoc) - * @see org.eclipse.ui.IPluginContribution#getPluginId() - */ - public String getPluginId() { + @Override + public String getPluginId() { return fElement.getContributor().getName(); } } diff --git a/org.eclipse.search/search/org/eclipse/search/internal/ui/SearchPlugin.java b/org.eclipse.search/search/org/eclipse/search/internal/ui/SearchPlugin.java index b8bd60d093f..538a67eccfc 100644 --- a/org.eclipse.search/search/org/eclipse/search/internal/ui/SearchPlugin.java +++ b/org.eclipse.search/search/org/eclipse/search/internal/ui/SearchPlugin.java @@ -114,6 +114,7 @@ public class SearchPlugin extends AbstractUIPlugin { if (window == null) { final WindowRef windowRef= new WindowRef(); Display.getDefault().syncExec(new Runnable() { + @Override public void run() { setActiveWorkbenchWindow(windowRef); } @@ -200,16 +201,12 @@ public class SearchPlugin extends AbstractUIPlugin { return isAutobuilding; } - /* - * @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext) - */ + @Override public void start(BundleContext context) throws Exception { super.start(context); } - /* - * @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext) - */ + @Override public void stop(BundleContext context) throws Exception { InternalSearchUI.shutdown(); disposeOldSearchManager(); @@ -220,6 +217,7 @@ public class SearchPlugin extends AbstractUIPlugin { /** * @deprecated old search */ + @Deprecated private void disposeOldSearchManager() { if (SearchManager.fgDefault != null) SearchManager.fgDefault.dispose(); @@ -258,6 +256,7 @@ public class SearchPlugin extends AbstractUIPlugin { * @since 3.0 * @deprecated old search */ + @Deprecated public String getSearchViewHelpContextId() { Search currentSearch= SearchManager.getDefault().getCurrentSearch(); if (currentSearch != null) { @@ -367,6 +366,7 @@ public class SearchPlugin extends AbstractUIPlugin { * @param menu the menu to create in * @deprecated old search */ + @Deprecated public static void createStandardGroups(IMenuManager menu) { if (!menu.isEmpty()) return; diff --git a/org.eclipse.search/search/org/eclipse/search/internal/ui/SearchPreferenceInitializer.java b/org.eclipse.search/search/org/eclipse/search/internal/ui/SearchPreferenceInitializer.java index 7981a728ae9..762820e1fe9 100644 --- a/org.eclipse.search/search/org/eclipse/search/internal/ui/SearchPreferenceInitializer.java +++ b/org.eclipse.search/search/org/eclipse/search/internal/ui/SearchPreferenceInitializer.java @@ -18,6 +18,7 @@ public class SearchPreferenceInitializer extends AbstractPreferenceInitializer { public SearchPreferenceInitializer() { } + @Override public void initializeDefaultPreferences() { SearchPreferencePage.initDefaults(SearchPlugin.getDefault().getPreferenceStore()); } diff --git a/org.eclipse.search/search/org/eclipse/search/internal/ui/SearchPreferencePage.java b/org.eclipse.search/search/org/eclipse/search/internal/ui/SearchPreferencePage.java index 40624945a5b..01c47faadfb 100644 --- a/org.eclipse.search/search/org/eclipse/search/internal/ui/SearchPreferencePage.java +++ b/org.eclipse.search/search/org/eclipse/search/internal/ui/SearchPreferencePage.java @@ -60,9 +60,7 @@ public class SearchPreferencePage extends FieldEditorPreferencePage implements I private static class PerspectiveDescriptorComparator implements Comparator { - /* - * @see java.util.Comparator#compare(java.lang.Object, java.lang.Object) - */ + @Override public int compare(Object o1, Object o2) { if (o1 instanceof IPerspectiveDescriptor && o2 instanceof IPerspectiveDescriptor) { String id1= ((IPerspectiveDescriptor)o1).getLabel(); @@ -94,11 +92,13 @@ public class SearchPreferencePage extends FieldEditorPreferencePage implements I } + @Override public void createControl(Composite parent) { super.createControl(parent); PlatformUI.getWorkbench().getHelpSystem().setHelp(getControl(), ISearchHelpContextIds.SEARCH_PREFERENCE_PAGE); } + @Override protected void createFieldEditors() { addField(new BooleanFieldEditor(REUSE_EDITOR, SearchMessages.SearchPreferencePage_reuseEditor, getFieldEditorParent())); addField(new BooleanFieldEditor(BRING_VIEW_TO_FRONT, SearchMessages.SearchPreferencePage_bringToFront, getFieldEditorParent())); @@ -147,18 +147,22 @@ public class SearchPreferencePage extends FieldEditorPreferencePage implements I } } + @Override public void setVisible(boolean state) { handleDeletedPerspectives(); super.setVisible(state); } + @Override public void propertyChange(PropertyChangeEvent event) { updateFieldEnablement(); } + @Override public void init(IWorkbench workbench) { } + @Override protected void performDefaults() { super.performDefaults(); updateFieldEnablement(); diff --git a/org.eclipse.search/search/org/eclipse/search/internal/ui/SearchResultLabelProvider.java b/org.eclipse.search/search/org/eclipse/search/internal/ui/SearchResultLabelProvider.java index 5b126752253..3b4dd7ea892 100644 --- a/org.eclipse.search/search/org/eclipse/search/internal/ui/SearchResultLabelProvider.java +++ b/org.eclipse.search/search/org/eclipse/search/internal/ui/SearchResultLabelProvider.java @@ -23,6 +23,7 @@ import org.eclipse.search.ui.ISearchResultViewEntry; /** * @deprecated old search */ +@Deprecated class SearchResultLabelProvider extends LabelProvider { private static final String MATCHES_POSTFIX= " " + SearchMessages.SearchResultView_matches + ")"; //$NON-NLS-1$ //$NON-NLS-2$ @@ -34,6 +35,7 @@ class SearchResultLabelProvider extends LabelProvider { fLabelProvider= provider; } + @Override public String getText(Object element) { StringBuffer buf= new StringBuffer(getLabelProvider().getText(element)); int count= ((ISearchResultViewEntry)element).getMatchCount(); @@ -45,11 +47,13 @@ class SearchResultLabelProvider extends LabelProvider { return buf.toString(); } + @Override public Image getImage(Object element) { return fLabelProvider.getImage(element); } // Don't dispose since label providers are reused. + @Override public void dispose() { } @@ -57,16 +61,19 @@ class SearchResultLabelProvider extends LabelProvider { return fLabelProvider; } + @Override public void addListener(ILabelProviderListener listener) { super.addListener(listener); fLabelProvider.addListener(listener); PlatformUI.getWorkbench().getDecoratorManager().getLabelDecorator().addListener(listener); } + @Override public boolean isLabelProperty(Object element, String property) { return fLabelProvider.isLabelProperty(element, property); } + @Override public void removeListener(ILabelProviderListener listener) { super.removeListener(listener); fLabelProvider.removeListener(listener); diff --git a/org.eclipse.search/search/org/eclipse/search/internal/ui/SearchResultView.java b/org.eclipse.search/search/org/eclipse/search/internal/ui/SearchResultView.java index 00fe29697e8..953f26e6984 100644 --- a/org.eclipse.search/search/org/eclipse/search/internal/ui/SearchResultView.java +++ b/org.eclipse.search/search/org/eclipse/search/internal/ui/SearchResultView.java @@ -53,6 +53,7 @@ import org.eclipse.search.ui.ISearchResultView; /** * @deprecated old search */ +@Deprecated public class SearchResultView extends ViewPart implements ISearchResultView { @@ -68,6 +69,7 @@ public class SearchResultView extends ViewPart implements ISearchResultView { /* * Implements method from IViewPart. */ + @Override public void init(IViewSite site, IMemento memento) throws PartInitException { super.init(site, memento); fMemento= memento; @@ -76,6 +78,7 @@ public class SearchResultView extends ViewPart implements ISearchResultView { /* * Implements method from IViewPart. */ + @Override public void saveState(IMemento memento) { if (fViewer == null) { // part has not been created @@ -90,6 +93,7 @@ public class SearchResultView extends ViewPart implements ISearchResultView { * Creates the search list inner viewer. * @param parent the parent */ + @Override public void createPartControl(Composite parent) { Assert.isTrue(fViewer == null); fViewer= new SearchResultViewer(this, parent); @@ -108,6 +112,7 @@ public class SearchResultView extends ViewPart implements ISearchResultView { fillActionBars(getViewSite().getActionBars()); fPropertyChangeListener= new IPropertyChangeListener() { + @Override public void propertyChange(PropertyChangeEvent event) { if (SearchPreferencePage.POTENTIAL_MATCH_FG_COLOR.equals(event.getProperty()) || SearchPreferencePage.EMPHASIZE_POTENTIAL_MATCHES.equals(event.getProperty())) if (fViewer != null) @@ -131,10 +136,12 @@ public class SearchResultView extends ViewPart implements ISearchResultView { //---- IWorkbenchPart ------------------------------------------------------ + @Override public void setFocus() { fViewer.getControl().setFocus(); } + @Override public void dispose() { if (fViewer != null) { SearchManager.getDefault().removeSearchChangeListener(fViewer); @@ -149,10 +156,12 @@ public class SearchResultView extends ViewPart implements ISearchResultView { super.dispose(); } + @Override protected void setContentDescription(String title) { super.setContentDescription(title); } + @Override protected void setTitleToolTip(String text) { super.setTitleToolTip(text); } @@ -178,6 +187,7 @@ public class SearchResultView extends ViewPart implements ISearchResultView { return null; } + @Override public ILabelProvider getLabelProvider() { if (fViewer == null) return null; @@ -191,6 +201,7 @@ public class SearchResultView extends ViewPart implements ISearchResultView { private void setGotoMarkerAction(final IAction gotoMarkerAction) { // Make sure we are doing it in the right thread. getDisplay().syncExec(new Runnable() { + @Override public void run() { getViewer().setGotoMarkerAction(gotoMarkerAction); } @@ -209,6 +220,7 @@ public class SearchResultView extends ViewPart implements ISearchResultView { /* * Implements method from ISearchResultView */ + @Override public ISelection getSelection() { return fViewer.getSelection(); } @@ -216,6 +228,7 @@ public class SearchResultView extends ViewPart implements ISearchResultView { /* * Implements method from ISearchResultView */ + @Override public void searchStarted( IActionGroupFactory groupFactory, String singularLabel, @@ -253,9 +266,7 @@ public class SearchResultView extends ViewPart implements ISearchResultView { operation)); } - /* (non-Javadoc) - * @see org.eclipse.search.ui.ISearchResultView#searchStarted(java.lang.String, java.lang.String, org.eclipse.jface.resource.ImageDescriptor, org.eclipse.search.ui.IContextMenuContributor, org.eclipse.jface.viewers.ILabelProvider, org.eclipse.jface.action.IAction, org.eclipse.search.ui.IGroupByKeyComputer, org.eclipse.jface.operation.IRunnableWithProgress) - */ + @Override public void searchStarted( String pageId, String label, @@ -273,6 +284,7 @@ public class SearchResultView extends ViewPart implements ISearchResultView { * Implements method from ISearchResultView * @deprecated As of build > 20020514 */ + @Override public void searchStarted( String pageId, String singularLabel, @@ -313,6 +325,7 @@ public class SearchResultView extends ViewPart implements ISearchResultView { /* * Implements method from ISearchResultView */ + @Override public void addMatch(String description, Object groupByKey, IResource resource, IMarker marker) { SearchResultViewEntry entry= (SearchResultViewEntry)fResponse.get(groupByKey); if (entry == null) { @@ -326,6 +339,7 @@ public class SearchResultView extends ViewPart implements ISearchResultView { /* * Implements method from ISearchResultView */ + @Override public void searchFinished() { SearchManager.getDefault().searchFinished(new ArrayList(fResponse.values())); fResponse= null; diff --git a/org.eclipse.search/search/org/eclipse/search/internal/ui/SearchResultViewEntry.java b/org.eclipse.search/search/org/eclipse/search/internal/ui/SearchResultViewEntry.java index 83adec1bb9f..5e73850e8a2 100644 --- a/org.eclipse.search/search/org/eclipse/search/internal/ui/SearchResultViewEntry.java +++ b/org.eclipse.search/search/org/eclipse/search/internal/ui/SearchResultViewEntry.java @@ -28,6 +28,7 @@ import org.eclipse.search.ui.SearchUI; * Represents an entry in the search result view * @deprecated old search */ +@Deprecated public class SearchResultViewEntry extends PlatformObject implements ISearchResultViewEntry { private Object fGroupByKey= null; @@ -47,6 +48,7 @@ public class SearchResultViewEntry extends PlatformObject implements ISearchResu } //---- Accessors ------------------------------------------------ + @Override public Object getGroupByKey() { return fGroupByKey; } @@ -55,10 +57,12 @@ public class SearchResultViewEntry extends PlatformObject implements ISearchResu fGroupByKey= groupByKey; } + @Override public IResource getResource() { return fResource; } + @Override public int getMatchCount() { if (fMarkers != null) return fMarkers.size(); @@ -115,6 +119,7 @@ public class SearchResultViewEntry extends PlatformObject implements ISearchResu fSelectedMarkerIndex= index; } + @Override public IMarker getSelectedMarker() { fSelectedMarkerIndex= Math.min(fSelectedMarkerIndex, getMatchCount() - 1); if (fMarkers == null && fMarker == null) @@ -196,9 +201,7 @@ public class SearchResultViewEntry extends PlatformObject implements ISearchResu fMarker= marker; } - /* (non-Javadoc) - * @see org.eclipse.core.runtime.PlatformObject#getAdapter(java.lang.Class) - */ + @Override public Object getAdapter(Class adapter) { return super.getAdapter(adapter); } diff --git a/org.eclipse.search/search/org/eclipse/search/internal/ui/SearchResultViewEntryAdapterFactory.java b/org.eclipse.search/search/org/eclipse/search/internal/ui/SearchResultViewEntryAdapterFactory.java index fa7fd16a0df..7151156a8bd 100644 --- a/org.eclipse.search/search/org/eclipse/search/internal/ui/SearchResultViewEntryAdapterFactory.java +++ b/org.eclipse.search/search/org/eclipse/search/internal/ui/SearchResultViewEntryAdapterFactory.java @@ -24,6 +24,7 @@ import org.eclipse.search.ui.ISearchResultViewEntry; * Implements handle to persistent support for Java elements. * @deprecated old search */ +@Deprecated public class SearchResultViewEntryAdapterFactory implements IAdapterFactory { private static Class[] PROPERTIES= new Class[] { @@ -31,10 +32,12 @@ public class SearchResultViewEntryAdapterFactory implements IAdapterFactory { }; + @Override public Class[] getAdapterList() { return PROPERTIES; } + @Override public Object getAdapter(Object element, Class key) { ISearchResultViewEntry entry= (ISearchResultViewEntry) element; diff --git a/org.eclipse.search/search/org/eclipse/search/internal/ui/SearchResultViewer.java b/org.eclipse.search/search/org/eclipse/search/internal/ui/SearchResultViewer.java index 7b44290696d..dc57a1a41be 100644 --- a/org.eclipse.search/search/org/eclipse/search/internal/ui/SearchResultViewer.java +++ b/org.eclipse.search/search/org/eclipse/search/internal/ui/SearchResultViewer.java @@ -79,6 +79,7 @@ import org.eclipse.search.ui.SearchUI; * a java search. * @deprecated old search */ +@Deprecated public class SearchResultViewer extends TableViewer { private SearchResultView fOuterPart; @@ -144,6 +145,7 @@ public class SearchResultViewer extends TableViewer { addSelectionChangedListener( new ISelectionChangedListener() { + @Override public void selectionChanged(SelectionChangedEvent event) { if (fLastSelection == null || !fLastSelection.equals(event.getSelection())) { fLastSelection= event.getSelection(); @@ -154,6 +156,7 @@ public class SearchResultViewer extends TableViewer { ); addOpenListener(new IOpenListener() { + @Override public void open(OpenEvent event) { showResult(); } @@ -163,6 +166,7 @@ public class SearchResultViewer extends TableViewer { menuMgr.setRemoveAllWhenShown(true); menuMgr.addMenuListener( new IMenuListener() { + @Override public void menuAboutToShow(IMenuManager mgr) { SearchPlugin.createStandardGroups(mgr); fillContextMenu(mgr); @@ -195,6 +199,7 @@ public class SearchResultViewer extends TableViewer { } } + @Override protected void doUpdateItem(Widget item, Object element, boolean fullMap) { super.doUpdateItem(item, element, fullMap); if (((SearchResultViewEntry)element).isPotentialMatch()) { @@ -263,6 +268,7 @@ public class SearchResultViewer extends TableViewer { } + @Override protected void inputChanged(Object input, Object oldInput) { fLastSelection= null; getTable().removeAll(); @@ -411,6 +417,7 @@ public class SearchResultViewer extends TableViewer { // need to hook F5 to table getTable().addKeyListener(new KeyAdapter() { + @Override public void keyReleased(KeyEvent e) { if (e.keyCode == SWT.F5) { fSearchAgainAction.run(); @@ -596,6 +603,7 @@ public class SearchResultViewer extends TableViewer { } + @Override protected void handleDispose(DisposeEvent event) { fLastSelection= null; Menu menu= getTable().getMenu(); @@ -665,9 +673,7 @@ public class SearchResultViewer extends TableViewer { fSortDropDownAction.saveState(memento); } - /* - * @see ContentViewer#handleLabelProviderChanged(LabelProviderChangedEvent) - */ + @Override protected void handleLabelProviderChanged(LabelProviderChangedEvent event) { Object[] changed= event.getElements(); if (changed != null && !fResourceToItemsMapper.isEmpty()) { @@ -691,9 +697,7 @@ public class SearchResultViewer extends TableViewer { super.handleLabelProviderChanged(event); } - /* - * @see StructuredViewer#mapElement(Object, Widget) - */ + @Override protected void mapElement(Object element, Widget item) { super.mapElement(element, item); if (item instanceof Item) { @@ -701,9 +705,7 @@ public class SearchResultViewer extends TableViewer { } } - /* - * @see StructuredViewer#unmapElement(Object, Widget) - */ + @Override protected void unmapElement(Object element, Widget item) { if (item instanceof Item) { fResourceToItemsMapper.removeFromMap(element, (Item)item); @@ -711,14 +713,13 @@ public class SearchResultViewer extends TableViewer { super.unmapElement(element, item); } - /* - * @see StructuredViewer#unmapAllElements() - */ + @Override protected void unmapAllElements() { fResourceToItemsMapper.clearMap(); super.unmapAllElements(); } + @Override protected void internalRefresh(Object element, boolean updateLabels) { // see bug 44891 getTable().setRedraw(false); diff --git a/org.eclipse.search/search/org/eclipse/search/internal/ui/SelectAllAction.java b/org.eclipse.search/search/org/eclipse/search/internal/ui/SelectAllAction.java index a7e4463b19a..1b4be53d703 100644 --- a/org.eclipse.search/search/org/eclipse/search/internal/ui/SelectAllAction.java +++ b/org.eclipse.search/search/org/eclipse/search/internal/ui/SelectAllAction.java @@ -57,6 +57,7 @@ public class SelectAllAction extends Action { /** * Selects all resources in the view. */ + @Override public void run() { if (fViewer == null || fViewer.getControl().isDisposed()) { return; diff --git a/org.eclipse.search/search/org/eclipse/search/internal/ui/ShowNextResultAction.java b/org.eclipse.search/search/org/eclipse/search/internal/ui/ShowNextResultAction.java index fb491a87ea6..d9cbbf817ae 100644 --- a/org.eclipse.search/search/org/eclipse/search/internal/ui/ShowNextResultAction.java +++ b/org.eclipse.search/search/org/eclipse/search/internal/ui/ShowNextResultAction.java @@ -17,6 +17,7 @@ import org.eclipse.ui.IWorkbenchCommandConstants; /** * @deprecated old search */ +@Deprecated class ShowNextResultAction extends Action { private SearchResultViewer fViewer; @@ -29,6 +30,7 @@ class ShowNextResultAction extends Action { setActionDefinitionId(IWorkbenchCommandConstants.NAVIGATE_NEXT); } + @Override public void run() { fViewer.showNextResult(); } diff --git a/org.eclipse.search/search/org/eclipse/search/internal/ui/ShowPreviousResultAction.java b/org.eclipse.search/search/org/eclipse/search/internal/ui/ShowPreviousResultAction.java index 9868ba09e90..d6440690d88 100644 --- a/org.eclipse.search/search/org/eclipse/search/internal/ui/ShowPreviousResultAction.java +++ b/org.eclipse.search/search/org/eclipse/search/internal/ui/ShowPreviousResultAction.java @@ -17,6 +17,7 @@ import org.eclipse.ui.IWorkbenchCommandConstants; /** * @deprecated old search */ +@Deprecated class ShowPreviousResultAction extends Action { private SearchResultViewer fViewer; @@ -29,6 +30,7 @@ class ShowPreviousResultAction extends Action { fViewer= viewer; } + @Override public void run() { fViewer.showPreviousResult(); } diff --git a/org.eclipse.search/search/org/eclipse/search/internal/ui/ShowSearchAction.java b/org.eclipse.search/search/org/eclipse/search/internal/ui/ShowSearchAction.java index bde807c5322..aaf56521623 100644 --- a/org.eclipse.search/search/org/eclipse/search/internal/ui/ShowSearchAction.java +++ b/org.eclipse.search/search/org/eclipse/search/internal/ui/ShowSearchAction.java @@ -15,6 +15,7 @@ import org.eclipse.jface.action.Action; /** * @deprecated old search */ +@Deprecated class ShowSearchAction extends Action { private Search fSearch; @@ -33,6 +34,7 @@ class ShowSearchAction extends Action { /** * Invoke the resource wizard selection wizard */ + @Override public void run() { if (fSearch != SearchManager.getDefault().getCurrentSearch()) SearchManager.getDefault().setCurrentSearch(fSearch); diff --git a/org.eclipse.search/search/org/eclipse/search/internal/ui/ShowSearchesAction.java b/org.eclipse.search/search/org/eclipse/search/internal/ui/ShowSearchesAction.java index 29afab8612d..10ee4dd15e5 100644 --- a/org.eclipse.search/search/org/eclipse/search/internal/ui/ShowSearchesAction.java +++ b/org.eclipse.search/search/org/eclipse/search/internal/ui/ShowSearchesAction.java @@ -31,17 +31,20 @@ import org.eclipse.ui.dialogs.ListDialog; * This action will retarget to the active view. * @deprecated old search */ +@Deprecated class ShowSearchesAction extends Action { private static final class SearchesLabelProvider extends LabelProvider { private ArrayList fImages= new ArrayList(); + @Override public String getText(Object element) { if (!(element instanceof ShowSearchAction)) return ""; //$NON-NLS-1$ return ((ShowSearchAction)element).getText(); } + @Override public Image getImage(Object element) { if (!(element instanceof ShowSearchAction)) return null; @@ -56,6 +59,7 @@ class ShowSearchesAction extends Action { return image; } + @Override public void dispose() { Iterator iter= fImages.iterator(); while (iter.hasNext()) @@ -75,6 +79,7 @@ class ShowSearchesAction extends Action { /* * Overrides method from Action */ + @Override public void run() { run(false); } diff --git a/org.eclipse.search/search/org/eclipse/search/internal/ui/SortDropDownAction.java b/org.eclipse.search/search/org/eclipse/search/internal/ui/SortDropDownAction.java index 46c8f4212fd..8e973814622 100644 --- a/org.eclipse.search/search/org/eclipse/search/internal/ui/SortDropDownAction.java +++ b/org.eclipse.search/search/org/eclipse/search/internal/ui/SortDropDownAction.java @@ -30,6 +30,7 @@ import org.eclipse.ui.model.WorkbenchViewerSorter; * Drop down action that holds the currently registered sort actions. * @deprecated old search */ +@Deprecated class SortDropDownAction extends Action implements IMenuCreator { // Persistance tags. @@ -55,12 +56,14 @@ class SortDropDownAction extends Action implements IMenuCreator { fLastCheckedForType= new HashMap(5); } + @Override public void dispose() { if (fMenu != null && !fMenu.isDisposed()) fMenu.dispose(); fMenu= null; } + @Override public Menu getMenu(Control parent) { return null; } @@ -81,6 +84,7 @@ class SortDropDownAction extends Action implements IMenuCreator { } } + @Override public Menu getMenu(final Menu parent) { dispose(); // ensure old menu gets disposed @@ -101,10 +105,12 @@ class SortDropDownAction extends Action implements IMenuCreator { final ViewerSorter sorter= sorterDesc.createObject(); if (sorter != null) { final Action action= new Action() { + @Override public void run() { if (!checkedId.equals(sorterDesc.getId())) { SortDropDownAction.this.setChecked(sorterDesc); BusyIndicator.showWhile(parent.getDisplay(), new Runnable() { + @Override public void run() { fViewer.setSorter(sorter); } @@ -127,7 +133,8 @@ class SortDropDownAction extends Action implements IMenuCreator { item.fill(parent, -1); } - public void run() { + @Override + public void run() { // nothing to do } diff --git a/org.eclipse.search/search/org/eclipse/search/internal/ui/WorkingSetComparator.java b/org.eclipse.search/search/org/eclipse/search/internal/ui/WorkingSetComparator.java index 34db2efc33c..9fbc46976b7 100644 --- a/org.eclipse.search/search/org/eclipse/search/internal/ui/WorkingSetComparator.java +++ b/org.eclipse.search/search/org/eclipse/search/internal/ui/WorkingSetComparator.java @@ -20,9 +20,7 @@ public class WorkingSetComparator implements Comparator { private Collator fCollator= Collator.getInstance(); - /* - * @see Comparator#compare(Object, Object) - */ + @Override public int compare(Object o1, Object o2) { String name1= null; String name2= null; diff --git a/org.eclipse.search/search/org/eclipse/search/internal/ui/text/DecoratingFileSearchLabelProvider.java b/org.eclipse.search/search/org/eclipse/search/internal/ui/text/DecoratingFileSearchLabelProvider.java index b29f35a6b41..32ad46749a3 100644 --- a/org.eclipse.search/search/org/eclipse/search/internal/ui/text/DecoratingFileSearchLabelProvider.java +++ b/org.eclipse.search/search/org/eclipse/search/internal/ui/text/DecoratingFileSearchLabelProvider.java @@ -39,6 +39,7 @@ public class DecoratingFileSearchLabelProvider extends DecoratingStyledCellLabel super(provider, PlatformUI.getWorkbench().getDecoratorManager().getLabelDecorator(), null); } + @Override public void initialize(ColumnViewer viewer, ViewerColumn column) { PlatformUI.getPreferenceStore().addPropertyChangeListener(this); JFaceResources.getColorRegistry().addListener(this); @@ -48,6 +49,7 @@ public class DecoratingFileSearchLabelProvider extends DecoratingStyledCellLabel super.initialize(viewer, column); } + @Override public void dispose() { super.dispose(); PlatformUI.getPreferenceStore().removePropertyChangeListener(this); @@ -69,6 +71,7 @@ public class DecoratingFileSearchLabelProvider extends DecoratingStyledCellLabel } } + @Override protected StyleRange prepareStyleRange(StyleRange styleRange, boolean applyColors) { if (!applyColors && styleRange.background != null) { styleRange= super.prepareStyleRange(styleRange, applyColors); @@ -82,11 +85,13 @@ public class DecoratingFileSearchLabelProvider extends DecoratingStyledCellLabel return PlatformUI.getPreferenceStore().getBoolean(IWorkbenchPreferenceConstants.USE_COLORED_LABELS); } + @Override public void propertyChange(PropertyChangeEvent event) { String property= event.getProperty(); if (property.equals(JFacePreferences.QUALIFIER_COLOR) || property.equals(JFacePreferences.COUNTER_COLOR) || property.equals(JFacePreferences.DECORATIONS_COLOR) || property.equals(HIGHLIGHT_BG_COLOR_NAME) || property.equals(IWorkbenchPreferenceConstants.USE_COLORED_LABELS)) { Display.getDefault().asyncExec(new Runnable() { + @Override public void run() { refresh(); } @@ -94,6 +99,7 @@ public class DecoratingFileSearchLabelProvider extends DecoratingStyledCellLabel } } + @Override public String getText(Object element) { return getStyledText(element).getString(); } diff --git a/org.eclipse.search/search/org/eclipse/search/internal/ui/text/FileLabelProvider.java b/org.eclipse.search/search/org/eclipse/search/internal/ui/text/FileLabelProvider.java index 6779d084d30..6d90937d259 100644 --- a/org.eclipse.search/search/org/eclipse/search/internal/ui/text/FileLabelProvider.java +++ b/org.eclipse.search/search/org/eclipse/search/internal/ui/text/FileLabelProvider.java @@ -60,6 +60,7 @@ public class FileLabelProvider extends LabelProvider implements IStyledLabelProv fPage= page; fLineMatchImage= SearchPluginImages.get(SearchPluginImages.IMG_OBJ_TEXT_SEARCH_LINE); fMatchComparator= new Comparator() { + @Override public int compare(Object o1, Object o2) { return ((FileMatch) o1).getOriginalOffset() - ((FileMatch) o2).getOriginalOffset(); } @@ -74,13 +75,12 @@ public class FileLabelProvider extends LabelProvider implements IStyledLabelProv return fOrder; } - /* (non-Javadoc) - * @see org.eclipse.jface.viewers.LabelProvider#getText(java.lang.Object) - */ + @Override public String getText(Object object) { return getStyledText(object).getString(); } + @Override public StyledString getStyledText(Object element) { if (element instanceof LineElement) return getLineElementLabel((LineElement) element); @@ -225,9 +225,7 @@ public class FileLabelProvider extends LabelProvider implements IStyledLabelProv return coloredName; } - /* (non-Javadoc) - * @see org.eclipse.jface.viewers.LabelProvider#getImage(java.lang.Object) - */ + @Override public Image getImage(Object element) { if (element instanceof LineElement) { return fLineMatchImage; @@ -240,32 +238,24 @@ public class FileLabelProvider extends LabelProvider implements IStyledLabelProv return image; } - /* (non-Javadoc) - * @see org.eclipse.jface.viewers.BaseLabelProvider#dispose() - */ + @Override public void dispose() { super.dispose(); fLabelProvider.dispose(); } - /* (non-Javadoc) - * @see org.eclipse.jface.viewers.BaseLabelProvider#isLabelProperty(java.lang.Object, java.lang.String) - */ + @Override public boolean isLabelProperty(Object element, String property) { return fLabelProvider.isLabelProperty(element, property); } - /* (non-Javadoc) - * @see org.eclipse.jface.viewers.BaseLabelProvider#removeListener(org.eclipse.jface.viewers.ILabelProviderListener) - */ + @Override public void removeListener(ILabelProviderListener listener) { super.removeListener(listener); fLabelProvider.removeListener(listener); } - /* (non-Javadoc) - * @see org.eclipse.jface.viewers.BaseLabelProvider#addListener(org.eclipse.jface.viewers.ILabelProviderListener) - */ + @Override public void addListener(ILabelProviderListener listener) { super.addListener(listener); fLabelProvider.addListener(listener); diff --git a/org.eclipse.search/search/org/eclipse/search/internal/ui/text/FileMatch.java b/org.eclipse.search/search/org/eclipse/search/internal/ui/text/FileMatch.java index 6e93634904c..0f688ead928 100644 --- a/org.eclipse.search/search/org/eclipse/search/internal/ui/text/FileMatch.java +++ b/org.eclipse.search/search/org/eclipse/search/internal/ui/text/FileMatch.java @@ -37,6 +37,7 @@ public class FileMatch extends Match { fLineElement= lineEntry; } + @Override public void setOffset(int offset) { if (fOriginalLocation == null) { // remember the original location before changing it @@ -45,6 +46,7 @@ public class FileMatch extends Match { super.setOffset(offset); } + @Override public void setLength(int length) { if (fOriginalLocation == null) { // remember the original location before changing it diff --git a/org.eclipse.search/search/org/eclipse/search/internal/ui/text/FileSearchPage.java b/org.eclipse.search/search/org/eclipse/search/internal/ui/text/FileSearchPage.java index 2e8c6606da0..a40dcf2e78e 100644 --- a/org.eclipse.search/search/org/eclipse/search/internal/ui/text/FileSearchPage.java +++ b/org.eclipse.search/search/org/eclipse/search/internal/ui/text/FileSearchPage.java @@ -75,9 +75,7 @@ public class FileSearchPage extends AbstractTextSearchViewPage implements IAdapt fLabelProvider= labelProvider; } - /* (non-Javadoc) - * @see org.eclipse.jface.viewers.ViewerComparator#category(java.lang.Object) - */ + @Override public int category(Object element) { if (element instanceof IContainer) { return 1; @@ -85,7 +83,8 @@ public class FileSearchPage extends AbstractTextSearchViewPage implements IAdapt return 2; } - public int compare(Viewer viewer, Object e1, Object e2) { + @Override + public int compare(Viewer viewer, Object e1, Object e2) { int cat1 = category(e1); int cat2 = category(e2); @@ -123,6 +122,7 @@ public class FileSearchPage extends AbstractTextSearchViewPage implements IAdapt private static final String[] SHOW_IN_TARGETS= new String[] { IPageLayout.ID_RES_NAV }; private static final IShowInTargetList SHOW_IN_TARGET_LIST= new IShowInTargetList() { + @Override public String[] getShowInTargetIds() { return SHOW_IN_TARGETS; } @@ -135,12 +135,14 @@ public class FileSearchPage extends AbstractTextSearchViewPage implements IAdapt setElementLimit(new Integer(DEFAULT_ELEMENT_LIMIT)); } + @Override public void setElementLimit(Integer elementLimit) { super.setElementLimit(elementLimit); int limit= elementLimit.intValue(); getSettings().put(KEY_LIMIT, limit); } + @Override public StructuredViewer getViewer() { return super.getViewer(); } @@ -151,6 +153,7 @@ public class FileSearchPage extends AbstractTextSearchViewPage implements IAdapt viewer.addDragSupport(ops, transfers, new NavigatorDragAdapter(viewer)); } + @Override protected void configureTableViewer(TableViewer viewer) { viewer.setUseHashlookup(true); FileLabelProvider innerLabelProvider= new FileLabelProvider(this, fCurrentSortOrder); @@ -161,6 +164,7 @@ public class FileSearchPage extends AbstractTextSearchViewPage implements IAdapt addDragAdapters(viewer); } + @Override protected void configureTreeViewer(TreeViewer viewer) { viewer.setUseHashlookup(true); FileLabelProvider innerLabelProvider= new FileLabelProvider(this, FileLabelProvider.SHOW_LABEL); @@ -171,6 +175,7 @@ public class FileSearchPage extends AbstractTextSearchViewPage implements IAdapt addDragAdapters(viewer); } + @Override protected void showMatch(Match match, int offset, int length, boolean activate) throws PartInitException { IFile file= (IFile) match.getElement(); IWorkbenchPage page= getSite().getPage(); @@ -181,6 +186,7 @@ public class FileSearchPage extends AbstractTextSearchViewPage implements IAdapt } } + @Override protected void handleOpen(OpenEvent event) { if (showLineMatches()) { Object firstElement= ((IStructuredSelection)event.getSelection()).getFirstElement(); @@ -198,6 +204,7 @@ public class FileSearchPage extends AbstractTextSearchViewPage implements IAdapt super.handleOpen(event); } + @Override protected void fillContextMenu(IMenuManager mgr) { super.fillContextMenu(mgr); addSortActions(mgr); @@ -231,27 +238,32 @@ public class FileSearchPage extends AbstractTextSearchViewPage implements IAdapt mgr.appendToGroup(IContextMenuConstants.GROUP_VIEWER_SETUP, sortMenu); } + @Override public void setViewPart(ISearchResultViewPart part) { super.setViewPart(part); fActionGroup= new NewTextSearchActionGroup(part); } + @Override public void init(IPageSite site) { super.init(site); IMenuManager menuManager = site.getActionBars().getMenuManager(); menuManager.appendToGroup(IContextMenuConstants.GROUP_PROPERTIES, new OpenSearchPreferencesAction()); } + @Override public void dispose() { fActionGroup.dispose(); super.dispose(); } + @Override protected void elementsChanged(Object[] objects) { if (fContentProvider != null) fContentProvider.elementsChanged(objects); } + @Override protected void clear() { if (fContentProvider != null) fContentProvider.clear(); @@ -265,6 +277,7 @@ public class FileSearchPage extends AbstractTextSearchViewPage implements IAdapt getSettings().put(KEY_SORTING, fCurrentSortOrder); } + @Override public void restoreState(IMemento memento) { super.restoreState(memento); try { @@ -288,12 +301,14 @@ public class FileSearchPage extends AbstractTextSearchViewPage implements IAdapt } setElementLimit(new Integer(elementLimit)); } + @Override public void saveState(IMemento memento) { super.saveState(memento); memento.putInteger(KEY_SORTING, fCurrentSortOrder); memento.putInteger(KEY_LIMIT, getElementLimit().intValue()); } + @Override public Object getAdapter(Class adapter) { if (IShowInTargetList.class.equals(adapter)) { return SHOW_IN_TARGET_LIST; @@ -317,6 +332,7 @@ public class FileSearchPage extends AbstractTextSearchViewPage implements IAdapt } return new IShowInSource() { + @Override public ShowInContext getShowInContext() { return new ShowInContext(null, new StructuredSelection(new ArrayList(newSelection))); } @@ -328,6 +344,7 @@ public class FileSearchPage extends AbstractTextSearchViewPage implements IAdapt return null; } + @Override public String getLabel() { String label= super.getLabel(); StructuredViewer viewer= getViewer(); @@ -353,6 +370,7 @@ public class FileSearchPage extends AbstractTextSearchViewPage implements IAdapt return label; } + @Override public int getDisplayedMatchCount(Object element) { if (showLineMatches()) { if (element instanceof LineElement) { @@ -364,6 +382,7 @@ public class FileSearchPage extends AbstractTextSearchViewPage implements IAdapt return super.getDisplayedMatchCount(element); } + @Override public Match[] getDisplayedMatches(Object element) { if (showLineMatches()) { if (element instanceof LineElement) { @@ -375,6 +394,7 @@ public class FileSearchPage extends AbstractTextSearchViewPage implements IAdapt return super.getDisplayedMatches(element); } + @Override protected void evaluateChangedElements(Match[] matches, Set changedElements) { if (showLineMatches()) { for (int i = 0; i < matches.length; i++) { diff --git a/org.eclipse.search/search/org/eclipse/search/internal/ui/text/FileSearchQuery.java b/org.eclipse.search/search/org/eclipse/search/internal/ui/text/FileSearchQuery.java index 6f2ae63e464..04328300593 100644 --- a/org.eclipse.search/search/org/eclipse/search/internal/ui/text/FileSearchQuery.java +++ b/org.eclipse.search/search/org/eclipse/search/internal/ui/text/FileSearchQuery.java @@ -63,10 +63,12 @@ public class FileSearchQuery implements ISearchQuery { } + @Override public boolean canRunInParallel() { return true; } + @Override public boolean acceptFile(IFile file) throws CoreException { if (fIsLightweightAutoRefresh && !file.exists()) return false; @@ -80,13 +82,12 @@ public class FileSearchQuery implements ISearchQuery { return true; } - /* (non-Javadoc) - * @see org.eclipse.search.core.text.TextSearchRequestor#reportBinaryFile(org.eclipse.core.resources.IFile) - */ + @Override public boolean reportBinaryFile(IFile file) { return fSearchInBinaries; } + @Override public boolean acceptPatternMatch(TextSearchMatchAccess matchRequestor) throws CoreException { ArrayList matches; synchronized(fLock) { @@ -185,10 +186,12 @@ public class FileSearchQuery implements ISearchQuery { return buf.toString(); } + @Override public void beginReporting() { fCachedMatches= new HashMap(); } + @Override public void endReporting() { flushMatches(); synchronized (fLock) { @@ -236,10 +239,12 @@ public class FileSearchQuery implements ISearchQuery { return fScope; } + @Override public boolean canRunInBackground() { return true; } + @Override public IStatus run(final IProgressMonitor monitor) { AbstractTextSearchResult textResult= (AbstractTextSearchResult) getSearchResult(); textResult.removeAll(); @@ -263,6 +268,7 @@ public class FileSearchQuery implements ISearchQuery { } + @Override public String getLabel() { return SearchMessages.FileSearchQuery_label; } @@ -336,10 +342,12 @@ public class FileSearchQuery implements ISearchQuery { return fIsWholeWord; } + @Override public boolean canRerun() { return true; } + @Override public ISearchResult getSearchResult() { if (fResult == null) { fResult= new FileSearchResult(this); diff --git a/org.eclipse.search/search/org/eclipse/search/internal/ui/text/FileSearchResult.java b/org.eclipse.search/search/org/eclipse/search/internal/ui/text/FileSearchResult.java index 8b5f886d13e..33fd6c72a4c 100644 --- a/org.eclipse.search/search/org/eclipse/search/internal/ui/text/FileSearchResult.java +++ b/org.eclipse.search/search/org/eclipse/search/internal/ui/text/FileSearchResult.java @@ -33,26 +33,32 @@ public class FileSearchResult extends AbstractTextSearchResult implements IEdito public FileSearchResult(FileSearchQuery job) { fQuery= job; } + @Override public ImageDescriptor getImageDescriptor() { return SearchPluginImages.DESC_OBJ_TSEARCH_DPDN; } + @Override public String getLabel() { return fQuery.getResultLabel(getMatchCount()); } + @Override public String getTooltip() { return getLabel(); } + @Override public Match[] computeContainedMatches(AbstractTextSearchResult result, IFile file) { return getMatches(file); } + @Override public IFile getFile(Object element) { if (element instanceof IFile) return (IFile)element; return null; } + @Override public boolean isShownInEditor(Match match, IEditorPart editor) { IEditorInput ei= editor.getEditorInput(); if (ei instanceof IFileEditorInput) { @@ -62,6 +68,7 @@ public class FileSearchResult extends AbstractTextSearchResult implements IEdito return false; } + @Override public Match[] computeContainedMatches(AbstractTextSearchResult result, IEditorPart editor) { IEditorInput ei= editor.getEditorInput(); if (ei instanceof IFileEditorInput) { @@ -71,14 +78,17 @@ public class FileSearchResult extends AbstractTextSearchResult implements IEdito return EMPTY_ARR; } + @Override public ISearchQuery getQuery() { return fQuery; } + @Override public IFileMatchAdapter getFileMatchAdapter() { return this; } + @Override public IEditorMatchAdapter getEditorMatchAdapter() { return this; } diff --git a/org.eclipse.search/search/org/eclipse/search/internal/ui/text/FileTableContentProvider.java b/org.eclipse.search/search/org/eclipse/search/internal/ui/text/FileTableContentProvider.java index 84d60a7f382..2f8121cca99 100644 --- a/org.eclipse.search/search/org/eclipse/search/internal/ui/text/FileTableContentProvider.java +++ b/org.eclipse.search/search/org/eclipse/search/internal/ui/text/FileTableContentProvider.java @@ -27,10 +27,12 @@ public class FileTableContentProvider implements IStructuredContentProvider, IFi fPage= page; } + @Override public void dispose() { // nothing to do } + @Override public Object[] getElements(Object inputElement) { if (inputElement instanceof FileSearchResult) { int elementLimit= getElementLimit(); @@ -45,12 +47,14 @@ public class FileTableContentProvider implements IStructuredContentProvider, IFi return EMPTY_ARR; } + @Override public void inputChanged(Viewer viewer, Object oldInput, Object newInput) { if (newInput instanceof FileSearchResult) { fResult= (FileSearchResult) newInput; } } + @Override public void elementsChanged(Object[] updatedElements) { TableViewer viewer= getViewer(); int elementLimit= getElementLimit(); @@ -76,6 +80,7 @@ public class FileTableContentProvider implements IStructuredContentProvider, IFi return (TableViewer) fPage.getViewer(); } + @Override public void clear() { getViewer().refresh(); } diff --git a/org.eclipse.search/search/org/eclipse/search/internal/ui/text/FileTreeContentProvider.java b/org.eclipse.search/search/org/eclipse/search/internal/ui/text/FileTreeContentProvider.java index c29d799d423..d891cd5e2e7 100644 --- a/org.eclipse.search/search/org/eclipse/search/internal/ui/text/FileTreeContentProvider.java +++ b/org.eclipse.search/search/org/eclipse/search/internal/ui/text/FileTreeContentProvider.java @@ -43,6 +43,7 @@ public class FileTreeContentProvider implements ITreeContentProvider, IFileSearc fTreeViewer= viewer; } + @Override public Object[] getElements(Object inputElement) { Object[] children= getChildren(inputElement); int elementLimit= getElementLimit(); @@ -58,10 +59,12 @@ public class FileTreeContentProvider implements ITreeContentProvider, IFileSearc return fPage.getElementLimit().intValue(); } + @Override public void dispose() { // nothing to do } + @Override public void inputChanged(Viewer viewer, Object oldInput, Object newInput) { if (newInput instanceof FileSearchResult) { initialize((FileSearchResult) newInput); @@ -173,6 +176,7 @@ public class FileTreeContentProvider implements ITreeContentProvider, IFileSearc } } + @Override public Object[] getChildren(Object parentElement) { Set children= (Set) fChildrenMap.get(parentElement); if (children == null) @@ -180,14 +184,12 @@ public class FileTreeContentProvider implements ITreeContentProvider, IFileSearc return children.toArray(); } + @Override public boolean hasChildren(Object element) { return getChildren(element).length > 0; } - /* - * (non-Javadoc) - * @see org.eclipse.search.internal.ui.text.IFileSearchContentProvider#elementsChanged(java.lang.Object[]) - */ + @Override public synchronized void elementsChanged(Object[] updatedElements) { for (int i= 0; i < updatedElements.length; i++) { if (!(updatedElements[i] instanceof LineElement)) { @@ -213,11 +215,13 @@ public class FileTreeContentProvider implements ITreeContentProvider, IFileSearc } } + @Override public void clear() { initialize(fResult); fTreeViewer.refresh(); } + @Override public Object getParent(Object element) { if (element instanceof IProject) return null; diff --git a/org.eclipse.search/search/org/eclipse/search/internal/ui/text/NewTextSearchActionGroup.java b/org.eclipse.search/search/org/eclipse/search/internal/ui/text/NewTextSearchActionGroup.java index f20cac17726..aaa77f8252f 100644 --- a/org.eclipse.search/search/org/eclipse/search/internal/ui/text/NewTextSearchActionGroup.java +++ b/org.eclipse.search/search/org/eclipse/search/internal/ui/text/NewTextSearchActionGroup.java @@ -65,6 +65,7 @@ public class NewTextSearchActionGroup extends ActionGroup { } + @Override public void fillContextMenu(IMenuManager menu) { // view must exist if we create a context menu for it. @@ -102,9 +103,7 @@ public class NewTextSearchActionGroup extends ActionGroup { menu.appendToGroup(IContextMenuConstants.GROUP_OPEN, submenu); } - /* (non-Javadoc) - * Method declared in ActionGroup - */ + @Override public void fillActionBars(IActionBars actionBar) { super.fillActionBars(actionBar); setGlobalActionHandlers(actionBar); diff --git a/org.eclipse.search/search/org/eclipse/search/internal/ui/text/ReplaceAction.java b/org.eclipse.search/search/org/eclipse/search/internal/ui/text/ReplaceAction.java index 62c474184c6..67ee6401a23 100644 --- a/org.eclipse.search/search/org/eclipse/search/internal/ui/text/ReplaceAction.java +++ b/org.eclipse.search/search/org/eclipse/search/internal/ui/text/ReplaceAction.java @@ -26,9 +26,7 @@ public class ReplaceAction extends Action { super(refactoring, RefactoringWizard.DIALOG_BASED_USER_INTERFACE); } - /* (non-Javadoc) - * @see org.eclipse.ltk.ui.refactoring.RefactoringWizard#addUserInputPages() - */ + @Override protected void addUserInputPages() { addPage(new ReplaceConfigurationPage((ReplaceRefactoring) getRefactoring())); } @@ -50,9 +48,7 @@ public class ReplaceAction extends Action { fSelection= selection; } - /* (non-Javadoc) - * @see org.eclipse.jface.action.Action#run() - */ + @Override public void run() { try { ReplaceRefactoring refactoring= new ReplaceRefactoring(fResult, fSelection); diff --git a/org.eclipse.search/search/org/eclipse/search/internal/ui/text/ReplaceConfigurationPage.java b/org.eclipse.search/search/org/eclipse/search/internal/ui/text/ReplaceConfigurationPage.java index c8a5046edd6..838c4a6828e 100644 --- a/org.eclipse.search/search/org/eclipse/search/internal/ui/text/ReplaceConfigurationPage.java +++ b/org.eclipse.search/search/org/eclipse/search/internal/ui/text/ReplaceConfigurationPage.java @@ -64,10 +64,8 @@ public class ReplaceConfigurationPage extends UserInputWizardPage { fReplaceRefactoring= refactoring; } - /* (non-Javadoc) - * @see org.eclipse.jface.dialogs.IDialogPage#createControl(org.eclipse.swt.widgets.Composite) - */ - public void createControl(Composite parent) { + @Override + public void createControl(Composite parent) { Composite result= new Composite(parent, SWT.NONE); GridLayout layout= new GridLayout(2, false); result.setLayout(layout); @@ -106,6 +104,7 @@ public class ReplaceConfigurationPage extends UserInputWizardPage { fTextField.setLayoutData(gd); fTextField.setFocus(); fTextField.addModifyListener(new ModifyListener() { + @Override public void modifyText(ModifyEvent e) { updateOKStatus(); } @@ -133,6 +132,7 @@ public class ReplaceConfigurationPage extends UserInputWizardPage { fReplaceWithRegex= new Button(result, SWT.CHECK); fReplaceWithRegex.setText(SearchMessages.ReplaceConfigurationPage_isRegex_label); fReplaceWithRegex.addSelectionListener(new SelectionAdapter() { + @Override public void widgetSelected(SelectionEvent e) { setContentAssistsEnablement(fReplaceWithRegex.getSelection()); } @@ -180,18 +180,14 @@ public class ReplaceConfigurationPage extends UserInputWizardPage { fTextFieldContentAssist.setEnabled(enable); } - /* (non-Javadoc) - * @see org.eclipse.ltk.ui.refactoring.UserInputWizardPage#performFinish() - */ - protected boolean performFinish() { + @Override + protected boolean performFinish() { initializeRefactoring(); storeSettings(); return super.performFinish(); } - /* (non-Javadoc) - * @see org.eclipse.ltk.ui.refactoring.UserInputWizardPage#getNextPage() - */ + @Override public IWizardPage getNextPage() { initializeRefactoring(); storeSettings(); diff --git a/org.eclipse.search/search/org/eclipse/search/internal/ui/text/ReplaceRefactoring.java b/org.eclipse.search/search/org/eclipse/search/internal/ui/text/ReplaceRefactoring.java index d642be1891b..67bde0296be 100644 --- a/org.eclipse.search/search/org/eclipse/search/internal/ui/text/ReplaceRefactoring.java +++ b/org.eclipse.search/search/org/eclipse/search/internal/ui/text/ReplaceRefactoring.java @@ -103,17 +103,21 @@ public class ReplaceRefactoring extends Refactoring { fIsRemove= isRemove; } + @Override public Object getModifiedElement() { return null; } + @Override public String getName() { return SearchMessages.ReplaceRefactoring_result_update_name; } + @Override public void initializeValidationData(IProgressMonitor pm) { } + @Override public RefactoringStatus isValid(IProgressMonitor pm) throws CoreException, OperationCanceledException { return new RefactoringStatus(); } @@ -146,6 +150,7 @@ public class ReplaceRefactoring extends Refactoring { return fMatches; } + @Override public Change perform(IProgressMonitor pm) throws CoreException { Match[] matches= getMatches(); if (fIsRemove) { @@ -187,9 +192,7 @@ public class ReplaceRefactoring extends Refactoring { fReplaceString= null; } - /* (non-Javadoc) - * @see org.eclipse.ltk.core.refactoring.Refactoring#getName() - */ + @Override public String getName() { return SearchMessages.ReplaceRefactoring_refactoring_name; } @@ -198,9 +201,7 @@ public class ReplaceRefactoring extends Refactoring { fReplaceString= string; } - /* (non-Javadoc) - * @see org.eclipse.ltk.core.refactoring.Refactoring#checkInitialConditions(org.eclipse.core.runtime.IProgressMonitor) - */ + @Override public RefactoringStatus checkInitialConditions(IProgressMonitor pm) throws CoreException, OperationCanceledException { String searchString= getQuery().getSearchString(); if (searchString.length() == 0) { @@ -320,9 +321,7 @@ public class ReplaceRefactoring extends Refactoring { return col; } - /* (non-Javadoc) - * @see org.eclipse.ltk.core.refactoring.Refactoring#checkFinalConditions(org.eclipse.core.runtime.IProgressMonitor) - */ + @Override public RefactoringStatus checkFinalConditions(IProgressMonitor pm) throws CoreException, OperationCanceledException { if (fReplaceString == null) { return RefactoringStatus.createFatalErrorStatus(SearchMessages.ReplaceRefactoring_error_no_replace_string); @@ -340,6 +339,7 @@ public class ReplaceRefactoring extends Refactoring { IFile[] allFiles= (IFile[]) allFilesSet.toArray(new IFile[allFilesSet.size()]); Arrays.sort(allFiles, new Comparator() { private Collator fCollator= Collator.getInstance(); + @Override public int compare(Object o1, Object o2) { String p1= ((IFile) o1).getFullPath().toString(); String p2= ((IFile) o2).getFullPath().toString(); @@ -500,9 +500,7 @@ public class ReplaceRefactoring extends Refactoring { } - /* (non-Javadoc) - * @see org.eclipse.ltk.core.refactoring.Refactoring#createChange(org.eclipse.core.runtime.IProgressMonitor) - */ + @Override public Change createChange(IProgressMonitor pm) throws CoreException, OperationCanceledException { return fChange; } diff --git a/org.eclipse.search/search/org/eclipse/search/internal/ui/text/SearchResultUpdater.java b/org.eclipse.search/search/org/eclipse/search/internal/ui/text/SearchResultUpdater.java index fd90f69d7ff..100baa75d8e 100644 --- a/org.eclipse.search/search/org/eclipse/search/internal/ui/text/SearchResultUpdater.java +++ b/org.eclipse.search/search/org/eclipse/search/internal/ui/text/SearchResultUpdater.java @@ -36,6 +36,7 @@ public class SearchResultUpdater implements IResourceChangeListener, IQueryListe ResourcesPlugin.getWorkspace().addResourceChangeListener(this); } + @Override public void resourceChanged(IResourceChangeEvent event) { IResourceDelta delta= event.getDelta(); if (delta != null) @@ -45,6 +46,7 @@ public class SearchResultUpdater implements IResourceChangeListener, IQueryListe private void handleDelta(IResourceDelta d) { try { d.accept(new IResourceDeltaVisitor() { + @Override public boolean visit(IResourceDelta delta) throws CoreException { switch (delta.getKind()) { case IResourceDelta.ADDED : @@ -68,10 +70,12 @@ public class SearchResultUpdater implements IResourceChangeListener, IQueryListe } } + @Override public void queryAdded(ISearchQuery query) { // don't care } + @Override public void queryRemoved(ISearchQuery query) { if (fResult.equals(query.getSearchResult())) { ResourcesPlugin.getWorkspace().removeResourceChangeListener(this); @@ -79,10 +83,12 @@ public class SearchResultUpdater implements IResourceChangeListener, IQueryListe } } + @Override public void queryStarting(ISearchQuery query) { // don't care } + @Override public void queryFinished(ISearchQuery query) { // don't care } diff --git a/org.eclipse.search/search/org/eclipse/search/internal/ui/text/SortAction.java b/org.eclipse.search/search/org/eclipse/search/internal/ui/text/SortAction.java index 8652246dea0..f538ebd6bd0 100644 --- a/org.eclipse.search/search/org/eclipse/search/internal/ui/text/SortAction.java +++ b/org.eclipse.search/search/org/eclipse/search/internal/ui/text/SortAction.java @@ -22,6 +22,7 @@ public class SortAction extends Action { fSortOrder= sortOrder; } + @Override public void run() { fPage.setSortOrder(fSortOrder); } diff --git a/org.eclipse.search/search/org/eclipse/search/internal/ui/text/TextSearchPage.java b/org.eclipse.search/search/org/eclipse/search/internal/ui/text/TextSearchPage.java index dd0fae05391..c41b120757b 100644 --- a/org.eclipse.search/search/org/eclipse/search/internal/ui/text/TextSearchPage.java +++ b/org.eclipse.search/search/org/eclipse/search/internal/ui/text/TextSearchPage.java @@ -231,26 +231,32 @@ public class TextSearchPage extends DialogPage implements ISearchPage, IReplaceP fScope= scope; } + @Override public String getSearchText() { return fSearchText; } + @Override public boolean isCaseSensitiveSearch() { return fIsCaseSensitive; } + @Override public boolean isRegExSearch() { return fIsRegEx; } + @Override public boolean isWholeWordSearch() { return fIsWholeWord; } + @Override public boolean searchInBinaries() { return fSearchInBinaries; } + @Override public FileTextSearchScope getScope() { return fScope; } @@ -265,6 +271,7 @@ public class TextSearchPage extends DialogPage implements ISearchPage, IReplaceP return TextSearchQueryProvider.getPreferred().createQuery(input); } + @Override public boolean performAction() { try { NewSearchUI.runQueryInBackground(newQuery()); @@ -275,9 +282,7 @@ public class TextSearchPage extends DialogPage implements ISearchPage, IReplaceP return true; } - /* (non-Javadoc) - * @see org.eclipse.search.ui.IReplacePage#performReplace() - */ + @Override public boolean performReplace() { try { IStatus status= NewSearchUI.runQueryInForeground(getContainer().getRunnableContext(), newQuery()); @@ -289,6 +294,7 @@ public class TextSearchPage extends DialogPage implements ISearchPage, IReplaceP } Display.getCurrent().asyncExec(new Runnable() { + @Override public void run() { ISearchResultViewPart view= NewSearchUI.activateSearchResultView(); if (view != null) { @@ -446,6 +452,7 @@ public class TextSearchPage extends DialogPage implements ISearchPage, IReplaceP /* * Implements method from IDialogPage */ + @Override public void setVisible(boolean visible) { if (visible && fPattern != null) { if (fFirstTime) { @@ -479,6 +486,7 @@ public class TextSearchPage extends DialogPage implements ISearchPage, IReplaceP //---- Widget creation ------------------------------------------------ + @Override public void createControl(Composite parent) { initializeDialogUnits(parent); readConfiguration(); @@ -537,6 +545,7 @@ public class TextSearchPage extends DialogPage implements ISearchPage, IReplaceP // Not done here to prevent page from resizing // fPattern.setItems(getPreviousSearchPatterns()); fPattern.addSelectionListener(new SelectionAdapter() { + @Override public void widgetSelected(SelectionEvent e) { handleWidgetSelected(); updateOKStatus(); @@ -544,6 +553,7 @@ public class TextSearchPage extends DialogPage implements ISearchPage, IReplaceP }); // add some listeners for regex syntax checking fPattern.addModifyListener(new ModifyListener() { + @Override public void modifyText(ModifyEvent e) { updateOKStatus(); } @@ -568,6 +578,7 @@ public class TextSearchPage extends DialogPage implements ISearchPage, IReplaceP fIsCaseSensitiveCheckbox.setText(SearchMessages.SearchPage_caseSensitive); fIsCaseSensitiveCheckbox.setSelection(fIsCaseSensitive); fIsCaseSensitiveCheckbox.addSelectionListener(new SelectionAdapter() { + @Override public void widgetSelected(SelectionEvent e) { fIsCaseSensitive= fIsCaseSensitiveCheckbox.getSelection(); } @@ -581,6 +592,7 @@ public class TextSearchPage extends DialogPage implements ISearchPage, IReplaceP fIsRegExCheckbox.setSelection(fIsRegExSearch); fIsRegExCheckbox.addSelectionListener(new SelectionAdapter() { + @Override public void widgetSelected(SelectionEvent e) { fIsRegExSearch= fIsRegExCheckbox.getSelection(); updateOKStatus(); @@ -606,6 +618,7 @@ public class TextSearchPage extends DialogPage implements ISearchPage, IReplaceP fIsWholeWordCheckbox.setSelection(fIsWholeWord); fIsWholeWordCheckbox.setEnabled(!fIsRegExSearch); fIsWholeWordCheckbox.addSelectionListener(new SelectionAdapter() { + @Override public void widgetSelected(SelectionEvent e) { fIsWholeWord= fIsWholeWordCheckbox.getSelection(); } @@ -717,6 +730,7 @@ public class TextSearchPage extends DialogPage implements ISearchPage, IReplaceP fExtensions= new Combo(group, SWT.SINGLE | SWT.BORDER); fExtensions.addModifyListener(new ModifyListener() { + @Override public void modifyText(ModifyEvent e) { updateOKStatus(); } @@ -752,6 +766,7 @@ public class TextSearchPage extends DialogPage implements ISearchPage, IReplaceP fSearchDerivedCheckbox.setSelection(fSearchDerived); fSearchDerivedCheckbox.addSelectionListener(new SelectionAdapter() { + @Override public void widgetSelected(SelectionEvent e) { fSearchDerived= fSearchDerivedCheckbox.getSelection(); writeConfiguration(); @@ -765,6 +780,7 @@ public class TextSearchPage extends DialogPage implements ISearchPage, IReplaceP fSearchBinaryCheckbox.setSelection(fSearchBinaries); fSearchBinaryCheckbox.addSelectionListener(new SelectionAdapter() { + @Override public void widgetSelected(SelectionEvent e) { fSearchBinaries= fSearchBinaryCheckbox.getSelection(); writeConfiguration(); @@ -778,6 +794,7 @@ public class TextSearchPage extends DialogPage implements ISearchPage, IReplaceP * Sets the search page's container. * @param container the container to set */ + @Override public void setContainer(ISearchPageContainer container) { fContainer= container; } @@ -793,9 +810,7 @@ public class TextSearchPage extends DialogPage implements ISearchPage, IReplaceP //--------------- Configuration handling -------------- - /* (non-Javadoc) - * @see org.eclipse.jface.dialogs.DialogPage#dispose() - */ + @Override public void dispose() { writeConfiguration(); super.dispose(); diff --git a/org.eclipse.search/search/org/eclipse/search/internal/ui/util/ExtendedDialogWindow.java b/org.eclipse.search/search/org/eclipse/search/internal/ui/util/ExtendedDialogWindow.java index fd9c50af09e..c479282aaa0 100644 --- a/org.eclipse.search/search/org/eclipse/search/internal/ui/util/ExtendedDialogWindow.java +++ b/org.eclipse.search/search/org/eclipse/search/internal/ui/util/ExtendedDialogWindow.java @@ -63,10 +63,7 @@ public abstract class ExtendedDialogWindow extends TrayDialog implements IRunnab fActionButtons= new ArrayList(); } - /* (non-Javadoc) - * @see org.eclipse.jface.dialogs.Dialog#isResizable() - * @since 3.4 - */ + @Override protected boolean isResizable() { return true; } @@ -119,6 +116,7 @@ public abstract class ExtendedDialogWindow extends TrayDialog implements IRunnab * * @param parent the button bar composite */ + @Override protected void createButtonsForButtonBar(Composite parent) { fCancelButton= createButton(parent, IDialogConstants.CANCEL_ID, IDialogConstants.CANCEL_LABEL, false); } @@ -135,6 +133,7 @@ public abstract class ExtendedDialogWindow extends TrayDialog implements IRunnab * @param parent The parent composite * @return The created control */ + @Override protected Control createDialogArea(Composite parent) { Composite result= (Composite) super.createDialogArea(parent); @@ -155,6 +154,7 @@ public abstract class ExtendedDialogWindow extends TrayDialog implements IRunnab return result; } + @Override protected void buttonPressed(int buttonId) { switch (buttonId) { case IDialogConstants.CANCEL_ID: @@ -183,9 +183,7 @@ public abstract class ExtendedDialogWindow extends TrayDialog implements IRunnab //---- Operation stuff ------------------------------------------------------ - /* (non-Javadoc) - * @see org.eclipse.jface.operation.IRunnableContext#run(boolean, boolean, org.eclipse.jface.operation.IRunnableWithProgress) - */ + @Override public void run(boolean fork, boolean cancelable, IRunnableWithProgress runnable) throws InvocationTargetException, InterruptedException { // The operation can only be canceled if it is executed in a separate thread. // Otherwise the UI is blocked anyway. @@ -318,6 +316,7 @@ public abstract class ExtendedDialogWindow extends TrayDialog implements IRunnab } } + @Override protected void handleShellCloseEvent() { if (okToClose()) super.handleShellCloseEvent(); diff --git a/org.eclipse.search/search/org/eclipse/search/internal/ui/util/FileLabelProvider.java b/org.eclipse.search/search/org/eclipse/search/internal/ui/util/FileLabelProvider.java index 08356f30e69..9c7418971d8 100644 --- a/org.eclipse.search/search/org/eclipse/search/internal/ui/util/FileLabelProvider.java +++ b/org.eclipse.search/search/org/eclipse/search/internal/ui/util/FileLabelProvider.java @@ -31,6 +31,7 @@ import org.eclipse.search.ui.ISearchResultViewEntry; /** * @deprecated Old search view */ +@Deprecated public class FileLabelProvider extends LabelProvider { public static final int SHOW_LABEL= 1; @@ -56,6 +57,7 @@ public class FileLabelProvider extends LabelProvider { fOrder= orderFlag; } + @Override public String getText(Object element) { if (!(element instanceof ISearchResultViewEntry)) return ""; //$NON-NLS-1$ @@ -99,6 +101,7 @@ public class FileLabelProvider extends LabelProvider { return text; } + @Override public Image getImage(Object element) { if (!(element instanceof ISearchResultViewEntry)) return null; @@ -113,20 +116,24 @@ public class FileLabelProvider extends LabelProvider { return image; } + @Override public void dispose() { super.dispose(); fLabelProvider.dispose(); } + @Override public boolean isLabelProperty(Object element, String property) { return fLabelProvider.isLabelProperty(element, property); } + @Override public void removeListener(ILabelProviderListener listener) { super.removeListener(listener); fLabelProvider.removeListener(listener); } + @Override public void addListener(ILabelProviderListener listener) { super.addListener(listener); fLabelProvider.addListener(listener); diff --git a/org.eclipse.search/search/org/eclipse/search/internal/ui/util/FileTypeEditor.java b/org.eclipse.search/search/org/eclipse/search/internal/ui/util/FileTypeEditor.java index 9b1e5544670..e5fb3e9cacc 100644 --- a/org.eclipse.search/search/org/eclipse/search/internal/ui/util/FileTypeEditor.java +++ b/org.eclipse.search/search/org/eclipse/search/internal/ui/util/FileTypeEditor.java @@ -39,6 +39,7 @@ public class FileTypeEditor extends SelectionAdapter implements DisposeListener public final static String FILE_PATTERN_NEGATOR= "!"; //$NON-NLS-1$ private static final Comparator FILE_TYPES_COMPARATOR= new Comparator() { + @Override public int compare(Object o1, Object o2) { return compare((String) o1, (String) o2); } @@ -61,6 +62,7 @@ public class FileTypeEditor extends SelectionAdapter implements DisposeListener fBrowseButton.addSelectionListener(this); } + @Override public void widgetDisposed(DisposeEvent event) { Widget widget= event.widget; if (widget == fTextField) @@ -69,6 +71,7 @@ public class FileTypeEditor extends SelectionAdapter implements DisposeListener fBrowseButton= null; } + @Override public void widgetSelected(SelectionEvent event) { if (event.widget == fBrowseButton) handleBrowseButton(); diff --git a/org.eclipse.search/search/org/eclipse/search/ui/IActionGroupFactory.java b/org.eclipse.search/search/org/eclipse/search/ui/IActionGroupFactory.java index 9ceb9f1e1a3..168407b7521 100644 --- a/org.eclipse.search/search/org/eclipse/search/ui/IActionGroupFactory.java +++ b/org.eclipse.search/search/org/eclipse/search/ui/IActionGroupFactory.java @@ -35,6 +35,7 @@ import org.eclipse.ui.actions.ActionGroup; * @deprecated Part of the old ('classic') search result view. Since 3.0 clients can create their own search result view pages (see {@link ISearchResultPage}), leaving it up to the page * how to create actions. */ +@Deprecated public interface IActionGroupFactory { /** diff --git a/org.eclipse.search/search/org/eclipse/search/ui/IContextMenuContributor.java b/org.eclipse.search/search/org/eclipse/search/ui/IContextMenuContributor.java index a1bd4571d87..43620f8efc9 100644 --- a/org.eclipse.search/search/org/eclipse/search/ui/IContextMenuContributor.java +++ b/org.eclipse.search/search/org/eclipse/search/ui/IContextMenuContributor.java @@ -28,6 +28,7 @@ import org.eclipse.jface.viewers.ILabelProvider; * @deprecated Part of the old ('classic') search result view. Since 3.0 clients can create their own search result view pages (see {@link ISearchResultPage}), leaving it up to the page * how to create actions in context menus. */ +@Deprecated public interface IContextMenuContributor { /** diff --git a/org.eclipse.search/search/org/eclipse/search/ui/IGroupByKeyComputer.java b/org.eclipse.search/search/org/eclipse/search/ui/IGroupByKeyComputer.java index ea4563a2f8a..43841e69b8d 100644 --- a/org.eclipse.search/search/org/eclipse/search/ui/IGroupByKeyComputer.java +++ b/org.eclipse.search/search/org/eclipse/search/ui/IGroupByKeyComputer.java @@ -23,6 +23,7 @@ import org.eclipse.core.resources.IMarker; * @deprecated Part of the old ('classic') search result view. Since 3.0 clients can create their own search result view pages (see {@link ISearchResultPage}), leaving it up to the page * how to group search results. */ +@Deprecated public interface IGroupByKeyComputer { /** diff --git a/org.eclipse.search/search/org/eclipse/search/ui/ISearchResultView.java b/org.eclipse.search/search/org/eclipse/search/ui/ISearchResultView.java index d3969c6316d..05c321491ac 100644 --- a/org.eclipse.search/search/org/eclipse/search/ui/ISearchResultView.java +++ b/org.eclipse.search/search/org/eclipse/search/ui/ISearchResultView.java @@ -40,6 +40,7 @@ import org.eclipse.ui.IViewPart; * @noimplement This interface is not intended to be implemented by clients. * @noextend This interface is not intended to be extended by clients. */ +@Deprecated public interface ISearchResultView extends IViewPart { /** @@ -110,6 +111,7 @@ public interface ISearchResultView extends IViewPart { * @param operation the runnable used by the view to repeat the search * @deprecated As of build > 20011107, replaced by the new version with additional parameter */ + @Deprecated public void searchStarted( String pageId, String label, @@ -147,6 +149,7 @@ public interface ISearchResultView extends IViewPart { * @since 2.0 * @deprecated As of build > 20020514, replaced by the new version which provides an action group factory */ + @Deprecated public void searchStarted( String pageId, String singularLabel, diff --git a/org.eclipse.search/search/org/eclipse/search/ui/ISearchResultViewEntry.java b/org.eclipse.search/search/org/eclipse/search/ui/ISearchResultViewEntry.java index 52ab336b9bb..5fcf95581c5 100644 --- a/org.eclipse.search/search/org/eclipse/search/ui/ISearchResultViewEntry.java +++ b/org.eclipse.search/search/org/eclipse/search/ui/ISearchResultViewEntry.java @@ -30,6 +30,7 @@ import org.eclipse.core.resources.IResource; * @noimplement This interface is not intended to be implemented by clients. * @noextend This interface is not intended to be extended by clients. */ +@Deprecated public interface ISearchResultViewEntry { /** diff --git a/org.eclipse.search/search/org/eclipse/search/ui/SearchUI.java b/org.eclipse.search/search/org/eclipse/search/ui/SearchUI.java index a74352fc457..72704fa385e 100644 --- a/org.eclipse.search/search/org/eclipse/search/ui/SearchUI.java +++ b/org.eclipse.search/search/org/eclipse/search/ui/SearchUI.java @@ -40,12 +40,14 @@ import org.eclipse.search.internal.ui.util.ExceptionHandler; * * @noinstantiate This class is not intended to be instantiated by clients. */ +@Deprecated public final class SearchUI { /** * Search Plug-in Id (value <code>"org.eclipse.search"</code>). * @deprecated Use {@link NewSearchUI#PLUGIN_ID} instead. */ + @Deprecated public static final String PLUGIN_ID= NewSearchUI.PLUGIN_ID; /** @@ -54,6 +56,7 @@ public final class SearchUI { * @see org.eclipse.core.resources.IMarker * @deprecated Use {@link NewSearchUI#SEARCH_MARKER} instead. */ + @Deprecated public static final String SEARCH_MARKER= NewSearchUI.SEARCH_MARKER; /** @@ -93,6 +96,7 @@ public final class SearchUI { * (value <code>"org.eclipse.search.ui.views.SearchView"</code>). * @deprecated Use {@link NewSearchUI#SEARCH_VIEW_ID} instead. */ + @Deprecated public static final String SEARCH_VIEW_ID= NewSearchUI.SEARCH_VIEW_ID; /** @@ -102,6 +106,7 @@ public final class SearchUI { * @since 2.0 * @deprecated Use {@link NewSearchUI#ACTION_SET_ID} instead. */ + @Deprecated public static final String ACTION_SET_ID= NewSearchUI.ACTION_SET_ID; /** @@ -112,6 +117,7 @@ public final class SearchUI { * @return <code>true</code> if the search result view could be activated * @deprecated Use {@link NewSearchUI#activateSearchResultView()} instead. */ + @Deprecated public static boolean activateSearchResultView() { String defaultPerspectiveId= SearchUI.getDefaultPerspectiveId(); if (defaultPerspectiveId != null) { @@ -148,6 +154,7 @@ public final class SearchUI { * @since 2.0 * @deprecated Use {@link NewSearchUI#openSearchDialog(IWorkbenchWindow, String)} instead. */ + @Deprecated public static void openSearchDialog(IWorkbenchWindow window, String pageId) { NewSearchUI.openSearchDialog(window, pageId); } @@ -161,6 +168,7 @@ public final class SearchUI { * if there is no active search result view * @deprecated Use {@link NewSearchUI#getSearchResultView()} instead. */ + @Deprecated public static ISearchResultView getSearchResultView() { IViewPart part= SearchPlugin.getActivePage().findView(SearchUI.SEARCH_RESULT_VIEW_ID); if (part instanceof ISearchResultView) @@ -190,6 +198,7 @@ public final class SearchUI { * @since 2.0 * @deprecated Use {@link NewSearchUI#reuseEditor()} instead. */ + @Deprecated public static boolean reuseEditor() { return NewSearchUI.reuseEditor(); } @@ -206,6 +215,7 @@ public final class SearchUI { * @since 2.1 * @deprecated Use {@link NewSearchUI#arePotentialMatchesIgnored()} instead. */ + @Deprecated public static boolean arePotentialMatchesIgnored() { return NewSearchUI.arePotentialMatchesIgnored(); } @@ -221,6 +231,7 @@ public final class SearchUI { * @since 2.1 * @deprecated Use {@link NewSearchUI#getDefaultPerspectiveId()} instead. */ + @Deprecated public static String getDefaultPerspectiveId() { return NewSearchUI.getDefaultPerspectiveId(); } diff --git a/org.eclipse.text.tests/projection/org/eclipse/text/tests/ProjectionDocumentTest.java b/org.eclipse.text.tests/projection/org/eclipse/text/tests/ProjectionDocumentTest.java index baf5a85f484..314073d9094 100644 --- a/org.eclipse.text.tests/projection/org/eclipse/text/tests/ProjectionDocumentTest.java +++ b/org.eclipse.text.tests/projection/org/eclipse/text/tests/ProjectionDocumentTest.java @@ -60,18 +60,14 @@ public class ProjectionDocumentTest extends TestCase { return super.adaptProjectionToMasterChange(masterEvent); } - /* - * @see org.eclipse.jface.text.projection.ProjectionDocument#isUpdating() - */ + @Override protected boolean isUpdating() { return super.isUpdating() || isUpdating; } } static private class ProjectionDocumentManager extends org.eclipse.jface.text.projection.ProjectionDocumentManager { - /* - * @see org.eclipse.jface.text.projection.ProjectionDocumentManager#createProjectionDocument(org.eclipse.jface.text.IDocument) - */ + @Override protected org.eclipse.jface.text.projection.ProjectionDocument createProjectionDocument(IDocument master) { return new ProjectionDocument(master); } @@ -112,6 +108,7 @@ public class ProjectionDocumentTest extends TestCase { "99999999999999999999"; } + @Override protected void setUp() { fMasterDocument= new Document(); fMasterDocument.set(getOriginalMasterContents()); @@ -119,6 +116,7 @@ public class ProjectionDocumentTest extends TestCase { fSlaveDocument= (ProjectionDocument) fSlaveDocumentManager.createSlaveDocument(fMasterDocument); } + @Override protected void tearDown () { fSlaveDocumentManager.freeSlaveDocument(fSlaveDocument); fSlaveDocument= null; @@ -1581,7 +1579,9 @@ public class ProjectionDocumentTest extends TestCase { final List receivedEvents= new ArrayList(); IDocumentListener listener= new IDocumentListener() { + @Override public void documentAboutToBeChanged(DocumentEvent event) {} + @Override public void documentChanged(DocumentEvent event) { receivedEvents.add(event); } @@ -1609,7 +1609,9 @@ public class ProjectionDocumentTest extends TestCase { final List receivedEvents= new ArrayList(); IDocumentListener listener= new IDocumentListener() { + @Override public void documentAboutToBeChanged(DocumentEvent event) {} + @Override public void documentChanged(DocumentEvent event) { receivedEvents.add(event); } diff --git a/org.eclipse.text.tests/projection/org/eclipse/text/tests/ProjectionMappingTest.java b/org.eclipse.text.tests/projection/org/eclipse/text/tests/ProjectionMappingTest.java index 3b47cb32c89..56860db2997 100644 --- a/org.eclipse.text.tests/projection/org/eclipse/text/tests/ProjectionMappingTest.java +++ b/org.eclipse.text.tests/projection/org/eclipse/text/tests/ProjectionMappingTest.java @@ -103,9 +103,7 @@ public class ProjectionMappingTest extends TestCase { addProjection(70, 30, 10); } - /* - * @see junit.framework.TestCase#setUp() - */ + @Override protected void setUp() throws Exception { fMasterDocument= new Document(); fSlaveDocument= new Document(); @@ -117,9 +115,7 @@ public class ProjectionMappingTest extends TestCase { } - /* - * @see junit.framework.TestCase#tearDown() - */ + @Override protected void tearDown() throws Exception { fMasterDocument= null; fSlaveDocument= null; diff --git a/org.eclipse.text.tests/src/org/eclipse/text/tests/AbstractGapTextTest.java b/org.eclipse.text.tests/src/org/eclipse/text/tests/AbstractGapTextTest.java index 00d9e35ce65..589678cc682 100644 --- a/org.eclipse.text.tests/src/org/eclipse/text/tests/AbstractGapTextTest.java +++ b/org.eclipse.text.tests/src/org/eclipse/text/tests/AbstractGapTextTest.java @@ -31,6 +31,7 @@ public class AbstractGapTextTest extends TestCase { * shrunken (>= 0) * @deprecated use {@link GapTextStore#GapTextStore(int, int, float)} instead */ + @Deprecated public GapText(int lowWatermark, int highWatermark) { super(lowWatermark, highWatermark); } diff --git a/org.eclipse.text.tests/src/org/eclipse/text/tests/AdaptiveGapTextTest.java b/org.eclipse.text.tests/src/org/eclipse/text/tests/AdaptiveGapTextTest.java index 3d040cfe6da..ec3905b9392 100644 --- a/org.eclipse.text.tests/src/org/eclipse/text/tests/AdaptiveGapTextTest.java +++ b/org.eclipse.text.tests/src/org/eclipse/text/tests/AdaptiveGapTextTest.java @@ -15,6 +15,7 @@ import junit.framework.TestSuite; public class AdaptiveGapTextTest extends AbstractGapTextTest { + @Override protected void setUp() { fText= new GapText(2, 10, 0.5f); fText.set("xxxxx"); @@ -24,6 +25,7 @@ public class AdaptiveGapTextTest extends AbstractGapTextTest { return new TestSuite(AdaptiveGapTextTest.class); } + @Override protected void tearDown () { fText= null; } diff --git a/org.eclipse.text.tests/src/org/eclipse/text/tests/AnnotationModelExtension2Test.java b/org.eclipse.text.tests/src/org/eclipse/text/tests/AnnotationModelExtension2Test.java index 68b41860c8e..764712c150b 100644 --- a/org.eclipse.text.tests/src/org/eclipse/text/tests/AnnotationModelExtension2Test.java +++ b/org.eclipse.text.tests/src/org/eclipse/text/tests/AnnotationModelExtension2Test.java @@ -40,31 +40,39 @@ public class AnnotationModelExtension2Test extends TestCase { private final HashMap fAnnotations= new HashMap(); + @Override public void addAnnotation(Annotation annotation, Position position) { fAnnotations.put(annotation, position); } + @Override public void addAnnotationModelListener(IAnnotationModelListener listener) { } + @Override public void connect(IDocument document) { } + @Override public void disconnect(IDocument document) { } + @Override public Iterator getAnnotationIterator() { return fAnnotations.keySet().iterator(); } + @Override public Position getPosition(Annotation annotation) { return (Position) fAnnotations.get(annotation); } + @Override public void removeAnnotation(Annotation annotation) { fAnnotations.remove(annotation); } + @Override public void removeAnnotationModelListener(IAnnotationModelListener listener) { } @@ -94,9 +102,7 @@ public class AnnotationModelExtension2Test extends TestCase { return new TestSuite(AnnotationModelExtension2Test.class); } - /** - * {@inheritDoc} - */ + @Override protected void setUp() throws Exception { fDocument= new Document("How much wood\nwould a woodchuck chuck\nif a woodchuck\ncould chuck wood?\n42"); @@ -123,9 +129,7 @@ public class AnnotationModelExtension2Test extends TestCase { fAnnotationModel.connect(fDocument); } - /** - * {@inheritDoc} - */ + @Override protected void tearDown() throws Exception { fAnnotationModel.disconnect(fDocument); } diff --git a/org.eclipse.text.tests/src/org/eclipse/text/tests/AnnotationModelStressTest.java b/org.eclipse.text.tests/src/org/eclipse/text/tests/AnnotationModelStressTest.java index 898868a0843..6926f671e90 100644 --- a/org.eclipse.text.tests/src/org/eclipse/text/tests/AnnotationModelStressTest.java +++ b/org.eclipse.text.tests/src/org/eclipse/text/tests/AnnotationModelStressTest.java @@ -1214,9 +1214,7 @@ public class AnnotationModelStressTest extends TestCase { return new TestSuite(AnnotationModelStressTest.class); } - /** - * {@inheritDoc} - */ + @Override protected void setUp() throws Exception { fDocument= new Document(RANDOM_CONTENT); @@ -1231,9 +1229,7 @@ public class AnnotationModelStressTest extends TestCase { fAnnotationModel.connect(fDocument); } - /** - * {@inheritDoc} - */ + @Override protected void tearDown() throws Exception { fAnnotationModel.disconnect(fDocument); diff --git a/org.eclipse.text.tests/src/org/eclipse/text/tests/ChildDocumentTest.java b/org.eclipse.text.tests/src/org/eclipse/text/tests/ChildDocumentTest.java index 96633cd7729..85b79f9c135 100644 --- a/org.eclipse.text.tests/src/org/eclipse/text/tests/ChildDocumentTest.java +++ b/org.eclipse.text.tests/src/org/eclipse/text/tests/ChildDocumentTest.java @@ -90,6 +90,7 @@ public class ChildDocumentTest extends TestCase { } } + @Override protected void setUp() { fParent= new Document(); @@ -139,6 +140,7 @@ public class ChildDocumentTest extends TestCase { return new TestSuite(ChildDocumentTest.class); } + @Override protected void tearDown () { fDocument= null; } diff --git a/org.eclipse.text.tests/src/org/eclipse/text/tests/CopyOnWriteTextStoreTest.java b/org.eclipse.text.tests/src/org/eclipse/text/tests/CopyOnWriteTextStoreTest.java index 48ebaa243a8..569dfd9484e 100644 --- a/org.eclipse.text.tests/src/org/eclipse/text/tests/CopyOnWriteTextStoreTest.java +++ b/org.eclipse.text.tests/src/org/eclipse/text/tests/CopyOnWriteTextStoreTest.java @@ -48,6 +48,7 @@ public class CopyOnWriteTextStoreTest extends TestCase { } + @Override protected void setUp() { fText= new COWTextStore(); @@ -58,6 +59,7 @@ public class CopyOnWriteTextStoreTest extends TestCase { return new TestSuite(CopyOnWriteTextStoreTest.class); } + @Override protected void tearDown () { fText= null; } diff --git a/org.eclipse.text.tests/src/org/eclipse/text/tests/DocumentExtensionTest.java b/org.eclipse.text.tests/src/org/eclipse/text/tests/DocumentExtensionTest.java index 615213ab949..47ed07ee7d9 100644 --- a/org.eclipse.text.tests/src/org/eclipse/text/tests/DocumentExtensionTest.java +++ b/org.eclipse.text.tests/src/org/eclipse/text/tests/DocumentExtensionTest.java @@ -38,10 +38,12 @@ public class DocumentExtensionTest extends TestCase { private int fInvocations= 0; private boolean fIsPostNotificationSupported= true; + @Override public void documentAboutToBeChanged(DocumentEvent e) { ++ fInvocations; } + @Override public void documentChanged(DocumentEvent e) { if (fInvocations > fRepetitions) { @@ -87,9 +89,7 @@ public class DocumentExtensionTest extends TestCase { public Replace() { } - /* - * @see IReplace#perform(IDocument, IDocumentListener) - */ + @Override public void perform(IDocument document, IDocumentListener owner) { try { document.replace(fOffset, fLength, fText); @@ -130,6 +130,7 @@ public class DocumentExtensionTest extends TestCase { fTrace2= t2; } + @Override public void documentAboutToBeChanged(DocumentEvent received) { if (!fPopped) { fPopped= true; @@ -141,6 +142,7 @@ public class DocumentExtensionTest extends TestCase { assertTrue(e.isSameAs(received)); } + @Override public void documentChanged(DocumentEvent received) { TestDocumentEvent e= (received.getDocument() == fDocument1 ? fExpected1 : fExpected2); assertTrue(e.isSameAs(received)); @@ -161,6 +163,7 @@ public class DocumentExtensionTest extends TestCase { public void testAppend() { Listener listener= new Listener() { + @Override protected Replace getReplace(DocumentEvent e) { String t= e.getText(); if (t != null && t.length() > 0) { @@ -190,6 +193,7 @@ public class DocumentExtensionTest extends TestCase { public void testRemove() { Listener listener= new Listener() { + @Override protected Replace getReplace(DocumentEvent e) { String t= e.getText(); if (t == null || t.length() == 0) { @@ -219,6 +223,7 @@ public class DocumentExtensionTest extends TestCase { public void testRepeatedAppend() { Listener listener= new Listener() { + @Override protected Replace getReplace(DocumentEvent e) { String t= e.getText(); if (t != null && t.length() > 0) { @@ -286,6 +291,7 @@ public class DocumentExtensionTest extends TestCase { childDocument.addDocumentListener(l); Listener modifier= new Listener() { + @Override protected Replace getReplace(DocumentEvent e) { String t= e.getText(); if (t != null && t.length() > 0) { diff --git a/org.eclipse.text.tests/src/org/eclipse/text/tests/DocumentTest.java b/org.eclipse.text.tests/src/org/eclipse/text/tests/DocumentTest.java index b31bf346310..1bb465913fa 100644 --- a/org.eclipse.text.tests/src/org/eclipse/text/tests/DocumentTest.java +++ b/org.eclipse.text.tests/src/org/eclipse/text/tests/DocumentTest.java @@ -54,6 +54,7 @@ public class DocumentTest extends TestCase { } + @Override protected void setUp() { fDocument= new Document(); @@ -93,6 +94,7 @@ public class DocumentTest extends TestCase { return new TestSuite(DocumentTest.class); } + @Override protected void tearDown () { fDocument= null; } diff --git a/org.eclipse.text.tests/src/org/eclipse/text/tests/DocumentUndoManagerTest.java b/org.eclipse.text.tests/src/org/eclipse/text/tests/DocumentUndoManagerTest.java index 67dd80cc94f..4c82803bb4c 100644 --- a/org.eclipse.text.tests/src/org/eclipse/text/tests/DocumentUndoManagerTest.java +++ b/org.eclipse.text.tests/src/org/eclipse/text/tests/DocumentUndoManagerTest.java @@ -59,17 +59,13 @@ public class DocumentUndoManagerTest extends TestCase { /** The undo manager. */ private IDocumentUndoManager fUndoManager; - /* - * @see TestCase#setUp() - */ + @Override protected void setUp() { fUndoManager= null; } - /* - * @see TestCase#tearDown() - */ + @Override protected void tearDown() { fUndoManager.disconnect(this); fUndoManager= null; diff --git a/org.eclipse.text.tests/src/org/eclipse/text/tests/ExclusivePositionUpdaterTest.java b/org.eclipse.text.tests/src/org/eclipse/text/tests/ExclusivePositionUpdaterTest.java index fcd662a5faa..98121c63640 100644 --- a/org.eclipse.text.tests/src/org/eclipse/text/tests/ExclusivePositionUpdaterTest.java +++ b/org.eclipse.text.tests/src/org/eclipse/text/tests/ExclusivePositionUpdaterTest.java @@ -36,9 +36,7 @@ public class ExclusivePositionUpdaterTest extends TestCase { private static final String CATEGORY= "testcategory"; private Position fPos; private IDocument fDoc; - /* - * @see junit.framework.TestCase#setUp() - */ + @Override protected void setUp() throws Exception { fUpdater= new DefaultPositionUpdater(CATEGORY); fDoc= new Document("ccccccccccccccccccccccccccccccccccccccccccccc"); @@ -49,9 +47,7 @@ public class ExclusivePositionUpdaterTest extends TestCase { fDoc.addPosition(CATEGORY, fPos); } - /* - * @see junit.framework.TestCase#tearDown() - */ + @Override protected void tearDown() throws Exception { fDoc.removePositionUpdater(fUpdater); fDoc.removePositionCategory(CATEGORY); diff --git a/org.eclipse.text.tests/src/org/eclipse/text/tests/FindReplaceDocumentAdapterTest.java b/org.eclipse.text.tests/src/org/eclipse/text/tests/FindReplaceDocumentAdapterTest.java index 65863fe6f7a..d9c4fd5a008 100644 --- a/org.eclipse.text.tests/src/org/eclipse/text/tests/FindReplaceDocumentAdapterTest.java +++ b/org.eclipse.text.tests/src/org/eclipse/text/tests/FindReplaceDocumentAdapterTest.java @@ -45,6 +45,7 @@ public class FindReplaceDocumentAdapterTest extends TestCase { } + @Override protected void setUp() { fDocument= new Document(); @@ -71,6 +72,7 @@ public class FindReplaceDocumentAdapterTest extends TestCase { return new TestSuite(FindReplaceDocumentAdapterTest.class); } + @Override protected void tearDown () { fDocument= null; } diff --git a/org.eclipse.text.tests/src/org/eclipse/text/tests/GapTextStoreTest.java b/org.eclipse.text.tests/src/org/eclipse/text/tests/GapTextStoreTest.java index 30cbd723c0f..d09f5cad1de 100644 --- a/org.eclipse.text.tests/src/org/eclipse/text/tests/GapTextStoreTest.java +++ b/org.eclipse.text.tests/src/org/eclipse/text/tests/GapTextStoreTest.java @@ -22,6 +22,7 @@ public class GapTextStoreTest extends TextStoreTest { return new TestSuite(GapTextStoreTest.class); } + @Override protected ITextStore createTextStore() { return new GapTextStore(256, 4096, 0.1f); } diff --git a/org.eclipse.text.tests/src/org/eclipse/text/tests/GapTextTest.java b/org.eclipse.text.tests/src/org/eclipse/text/tests/GapTextTest.java index 566c1cb95b7..f62f97221be 100644 --- a/org.eclipse.text.tests/src/org/eclipse/text/tests/GapTextTest.java +++ b/org.eclipse.text.tests/src/org/eclipse/text/tests/GapTextTest.java @@ -17,6 +17,8 @@ public class GapTextTest extends AbstractGapTextTest { /** * @deprecated tests the legacy constructor of GapTextStore */ + @Deprecated + @Override protected void setUp() { fText= new GapText(5, 10); fText.set("xxxxx"); @@ -26,6 +28,7 @@ public class GapTextTest extends AbstractGapTextTest { return new TestSuite(GapTextTest.class); } + @Override protected void tearDown () { fText= null; } diff --git a/org.eclipse.text.tests/src/org/eclipse/text/tests/LineTrackerTest3.java b/org.eclipse.text.tests/src/org/eclipse/text/tests/LineTrackerTest3.java index d793786f933..ddf7876c32d 100644 --- a/org.eclipse.text.tests/src/org/eclipse/text/tests/LineTrackerTest3.java +++ b/org.eclipse.text.tests/src/org/eclipse/text/tests/LineTrackerTest3.java @@ -28,17 +28,20 @@ public class LineTrackerTest3 extends AbstractLineTrackerTest { super(name); } + @Override protected void setUp() { fText= new GapTextStore(); fTracker= new ConfigurableLineTracker(new String[] { "\n" }); set("x\nx\nx\nx\nx\n"); } + @Override protected void tearDown() { fTracker= null; fText= null; } + @Override protected int getLineOffset(int line, int[] lines) { int offset= 0; for (int i= 0; i < line; i++) diff --git a/org.eclipse.text.tests/src/org/eclipse/text/tests/LineTrackerTest4.java b/org.eclipse.text.tests/src/org/eclipse/text/tests/LineTrackerTest4.java index 32c391d68ac..70bf030e14c 100644 --- a/org.eclipse.text.tests/src/org/eclipse/text/tests/LineTrackerTest4.java +++ b/org.eclipse.text.tests/src/org/eclipse/text/tests/LineTrackerTest4.java @@ -27,17 +27,20 @@ public class LineTrackerTest4 extends AbstractLineTrackerTest { super(name); } + @Override protected void setUp() { fText= new GapTextStore(); fTracker= new ConfigurableLineTracker(new String[] { "\r\n" }); set("x\r\nx\r\nx\r\nx\r\nx\r\n"); } + @Override protected void tearDown() { fTracker= null; fText= null; } + @Override protected int getLineOffset(int line, int[] lines) { int offset= 0; for (int i= 0; i < line; i++) diff --git a/org.eclipse.text.tests/src/org/eclipse/text/tests/PositionUpdatingCornerCasesTest.java b/org.eclipse.text.tests/src/org/eclipse/text/tests/PositionUpdatingCornerCasesTest.java index 07d80a7ab06..8123d6a3c67 100644 --- a/org.eclipse.text.tests/src/org/eclipse/text/tests/PositionUpdatingCornerCasesTest.java +++ b/org.eclipse.text.tests/src/org/eclipse/text/tests/PositionUpdatingCornerCasesTest.java @@ -45,6 +45,7 @@ public class PositionUpdatingCornerCasesTest extends TestCase { return new TestSuite(PositionUpdatingCornerCasesTest.class); } + @Override protected void tearDown() { fDocument= null; } diff --git a/org.eclipse.text.tests/src/org/eclipse/text/tests/TextEditTests.java b/org.eclipse.text.tests/src/org/eclipse/text/tests/TextEditTests.java index 7ab10747516..c5c7b687ba6 100644 --- a/org.eclipse.text.tests/src/org/eclipse/text/tests/TextEditTests.java +++ b/org.eclipse.text.tests/src/org/eclipse/text/tests/TextEditTests.java @@ -57,11 +57,13 @@ public class TextEditTests extends TestCase { return new TestSuite(THIS); } + @Override protected void setUp() throws Exception { fDocument= new Document("0123456789"); fRoot= new MultiTextEdit(); } + @Override protected void tearDown() throws Exception { fRoot= null; fRoot= null; @@ -1226,9 +1228,11 @@ public class TextEditTests extends TestCase { RangeMarker r1= new RangeMarker(3,2); ms.addChild(r1); ms.setSourceModifier(new ISourceModifier() { + @Override public ISourceModifier copy() { return this; } + @Override public ReplaceEdit[] getModifications(String source) { return new ReplaceEdit[] { new ReplaceEdit(1,1,"aa") }; } @@ -1252,9 +1256,11 @@ public class TextEditTests extends TestCase { RangeMarker r3= new RangeMarker(4,2); ms.addChild(r3); ms.setSourceModifier(new ISourceModifier() { + @Override public ISourceModifier copy() { return this; } + @Override public ReplaceEdit[] getModifications(String source) { return new ReplaceEdit[] { new ReplaceEdit(0,2,"aa") }; } @@ -1275,9 +1281,11 @@ public class TextEditTests extends TestCase { RangeMarker r1= new RangeMarker(3,2); ms.addChild(r1); ms.setSourceModifier(new ISourceModifier() { + @Override public ISourceModifier copy() { return this; } + @Override public ReplaceEdit[] getModifications(String source) { return new ReplaceEdit[] { new ReplaceEdit(0,2,"aa") }; } @@ -1296,9 +1304,11 @@ public class TextEditTests extends TestCase { RangeMarker r1= new RangeMarker(3,2); ms.addChild(r1); ms.setSourceModifier(new ISourceModifier() { + @Override public ISourceModifier copy() { return this; } + @Override public ReplaceEdit[] getModifications(String source) { return new ReplaceEdit[] { new ReplaceEdit(2,2,"aa") }; } diff --git a/org.eclipse.text.tests/src/org/eclipse/text/tests/TextStoreTest.java b/org.eclipse.text.tests/src/org/eclipse/text/tests/TextStoreTest.java index 802bec9a476..efb218b761b 100644 --- a/org.eclipse.text.tests/src/org/eclipse/text/tests/TextStoreTest.java +++ b/org.eclipse.text.tests/src/org/eclipse/text/tests/TextStoreTest.java @@ -28,6 +28,7 @@ public abstract class TextStoreTest extends TestCase { private ITextStore fTextStore; private ILineTracker fTracker; + @Override protected void setUp() { fTextStore= createTextStore(); @@ -51,6 +52,7 @@ public abstract class TextStoreTest extends TestCase { abstract protected ITextStore createTextStore(); + @Override protected void tearDown() { fTextStore= null; fTracker= null; diff --git a/org.eclipse.text.tests/src/org/eclipse/text/tests/TextUtilitiesTest.java b/org.eclipse.text.tests/src/org/eclipse/text/tests/TextUtilitiesTest.java index 82d56f9f687..9bddfec24a4 100644 --- a/org.eclipse.text.tests/src/org/eclipse/text/tests/TextUtilitiesTest.java +++ b/org.eclipse.text.tests/src/org/eclipse/text/tests/TextUtilitiesTest.java @@ -44,7 +44,9 @@ public class TextUtilitiesTest extends TestCase { private static class LazilyMirroredDocument extends Document { private final class DocumentListener implements IDocumentListener { + @Override public void documentAboutToBeChanged(DocumentEvent event) {} + @Override public void documentChanged(DocumentEvent event) { fEvents.add(event); } @@ -74,6 +76,7 @@ public class TextUtilitiesTest extends TestCase { * * @see org.eclipse.jface.text.IDocument#get() */ + @Override public String get() { try { flush(); @@ -91,7 +94,9 @@ public class TextUtilitiesTest extends TestCase { private static class LazilyMirroredDocument2 extends Document { private final class DocumentListener implements IDocumentListener { + @Override public void documentAboutToBeChanged(DocumentEvent event) {} + @Override public void documentChanged(DocumentEvent event) { event= new DocumentEvent(event.getDocument(), event.getOffset(), event.getLength(), event.getText()); fEvents.add(event); @@ -122,6 +127,7 @@ public class TextUtilitiesTest extends TestCase { * * @see org.eclipse.jface.text.IDocument#get() */ + @Override public String get() { try { flush(); diff --git a/org.eclipse.text.tests/src/org/eclipse/text/tests/link/InclusivePositionUpdaterTest.java b/org.eclipse.text.tests/src/org/eclipse/text/tests/link/InclusivePositionUpdaterTest.java index fad146cc204..c5f485eeb22 100644 --- a/org.eclipse.text.tests/src/org/eclipse/text/tests/link/InclusivePositionUpdaterTest.java +++ b/org.eclipse.text.tests/src/org/eclipse/text/tests/link/InclusivePositionUpdaterTest.java @@ -27,9 +27,7 @@ public class InclusivePositionUpdaterTest extends TestCase { private static final String CATEGORY= "testcategory"; private Position fPos; private IDocument fDoc; - /* - * @see junit.framework.TestCase#setUp() - */ + @Override protected void setUp() throws Exception { fUpdater= new InclusivePositionUpdater(CATEGORY); fDoc= new Document("ccccccccccccccccccccccccccccccccccccccccccccc"); @@ -39,9 +37,7 @@ public class InclusivePositionUpdaterTest extends TestCase { fDoc.addPosition(CATEGORY, fPos); } - /* - * @see junit.framework.TestCase#tearDown() - */ + @Override protected void tearDown() throws Exception { fDoc.removePositionUpdater(fUpdater); fDoc.removePositionCategory(CATEGORY); diff --git a/org.eclipse.text.tests/src/org/eclipse/text/tests/link/LinkedModeModelTest.java b/org.eclipse.text.tests/src/org/eclipse/text/tests/link/LinkedModeModelTest.java index 5c16c06da74..eb145a344b0 100644 --- a/org.eclipse.text.tests/src/org/eclipse/text/tests/link/LinkedModeModelTest.java +++ b/org.eclipse.text.tests/src/org/eclipse/text/tests/link/LinkedModeModelTest.java @@ -312,6 +312,7 @@ public class LinkedModeModelTest extends TestCase { final boolean[] isExit= { false } ; env.addLinkingListener(new LinkedAdapter() { + @Override public void left(LinkedModeModel environment, int flags) { isExit[0]= true; } @@ -366,6 +367,7 @@ public class LinkedModeModelTest extends TestCase { final boolean[] isExit= { false } ; env.addLinkingListener(new LinkedAdapter() { + @Override public void left(LinkedModeModel environment, int flags) { isExit[0]= true; } @@ -391,6 +393,7 @@ public class LinkedModeModelTest extends TestCase { LinkedModeModel env= new LinkedModeModel(); final boolean[] isExit= { false } ; env.addLinkingListener(new LinkedAdapter() { + @Override public void left(LinkedModeModel environment, int flags) { isExit[0]= true; } @@ -418,6 +421,7 @@ public class LinkedModeModelTest extends TestCase { LinkedModeModel env= new LinkedModeModel(); final boolean[] isExit= { false } ; env.addLinkingListener(new LinkedAdapter() { + @Override public void left(LinkedModeModel environment, int flags) { isExit[0]= true; } @@ -445,6 +449,7 @@ public class LinkedModeModelTest extends TestCase { LinkedModeModel env= new LinkedModeModel(); final boolean[] isExit= { false } ; env.addLinkingListener(new LinkedAdapter() { + @Override public void left(LinkedModeModel environment, int flags) { isExit[0]= true; } @@ -476,6 +481,7 @@ public class LinkedModeModelTest extends TestCase { LinkedModeModel env= new LinkedModeModel(); final boolean[] isExit= { false } ; env.addLinkingListener(new LinkedAdapter() { + @Override public void left(LinkedModeModel environment, int flags) { isExit[0]= true; } @@ -506,6 +512,7 @@ public class LinkedModeModelTest extends TestCase { LinkedModeModel env= new LinkedModeModel(); final boolean[] isExit= { false } ; env.addLinkingListener(new LinkedAdapter() { + @Override public void left(LinkedModeModel environment, int flags) { isExit[0]= true; } @@ -582,9 +589,7 @@ public class LinkedModeModelTest extends TestCase { } - /** - * {@inheritDoc} - */ + @Override protected void setUp() throws Exception { fPositions.clear(); fDocumentMap.clear(); @@ -801,13 +806,17 @@ public class LinkedModeModelTest extends TestCase { " Das mir zu tun fast nichts mehr ubrigbleibt."; private class LinkedAdapter implements ILinkedModeListener { + @Override public void left(LinkedModeModel environment, int flags) {} + @Override public void suspend(LinkedModeModel environment) {} + @Override public void resume(LinkedModeModel environment, int flags) {} } public class PositionComparator implements Comparator { + @Override public int compare(Object o1, Object o2) { LinkedPosition p1= (LinkedPosition) o1; LinkedPosition p2= (LinkedPosition) o2; diff --git a/org.eclipse.text.tests/src/org/eclipse/text/tests/link/LinkedPositionTest.java b/org.eclipse.text.tests/src/org/eclipse/text/tests/link/LinkedPositionTest.java index 31db5c20310..8ff9df77420 100644 --- a/org.eclipse.text.tests/src/org/eclipse/text/tests/link/LinkedPositionTest.java +++ b/org.eclipse.text.tests/src/org/eclipse/text/tests/link/LinkedPositionTest.java @@ -23,6 +23,7 @@ import org.eclipse.jface.text.link.LinkedPositionGroup; public class LinkedPositionTest extends TestCase { + @Override public void setUp() { fDoc= new Document(GARTEN1); fPos= new LinkedPosition(fDoc, 3, 10); diff --git a/org.eclipse.text.tests/src/org/eclipse/text/tests/templates/TemplateTranslatorTest.java b/org.eclipse.text.tests/src/org/eclipse/text/tests/templates/TemplateTranslatorTest.java index 07276e32435..7ded6114746 100644 --- a/org.eclipse.text.tests/src/org/eclipse/text/tests/templates/TemplateTranslatorTest.java +++ b/org.eclipse.text.tests/src/org/eclipse/text/tests/templates/TemplateTranslatorTest.java @@ -34,10 +34,7 @@ public class TemplateTranslatorTest extends TestCase { private TemplateTranslator fTranslator; - /* - * @see junit.framework.TestCase#setUp() - * @since 3.3 - */ + @Override protected void setUp() throws Exception { super.setUp(); fTranslator= new TemplateTranslator(); diff --git a/org.eclipse.text/projection/org/eclipse/jface/text/projection/ChildDocument.java b/org.eclipse.text/projection/org/eclipse/jface/text/projection/ChildDocument.java index c88e59e3567..f92da76b972 100644 --- a/org.eclipse.text/projection/org/eclipse/jface/text/projection/ChildDocument.java +++ b/org.eclipse.text/projection/org/eclipse/jface/text/projection/ChildDocument.java @@ -50,6 +50,7 @@ public class ChildDocument extends ProjectionDocument { * * @see org.eclipse.jface.text.Position#overlapsWith(int, int) */ + @Override public boolean overlapsWith(int regionOffset, int regionLength) { boolean appending= (regionOffset == offset + length) && regionLength == 0; return appending || super.overlapsWith(regionOffset, regionLength); diff --git a/org.eclipse.text/projection/org/eclipse/jface/text/projection/ChildDocumentManager.java b/org.eclipse.text/projection/org/eclipse/jface/text/projection/ChildDocumentManager.java index c844eeb7128..443d64e3b0e 100644 --- a/org.eclipse.text/projection/org/eclipse/jface/text/projection/ChildDocumentManager.java +++ b/org.eclipse.text/projection/org/eclipse/jface/text/projection/ChildDocumentManager.java @@ -27,9 +27,7 @@ import org.eclipse.jface.text.IDocument; */ public class ChildDocumentManager extends ProjectionDocumentManager { - /* - * @see org.eclipse.jface.text.projection.ProjectionDocumentManager#createProjectionDocument(org.eclipse.jface.text.IDocument) - */ + @Override protected ProjectionDocument createProjectionDocument(IDocument master) { return new ChildDocument(master); } diff --git a/org.eclipse.text/projection/org/eclipse/jface/text/projection/FragmentUpdater.java b/org.eclipse.text/projection/org/eclipse/jface/text/projection/FragmentUpdater.java index bc441e287e9..cf591448bb1 100644 --- a/org.eclipse.text/projection/org/eclipse/jface/text/projection/FragmentUpdater.java +++ b/org.eclipse.text/projection/org/eclipse/jface/text/projection/FragmentUpdater.java @@ -41,9 +41,7 @@ class FragmentUpdater extends DefaultPositionUpdater { super(fragmentCategory); } - /* - * @see org.eclipse.jface.text.IPositionUpdater#update(org.eclipse.jface.text.DocumentEvent) - */ + @Override public void update(DocumentEvent event) { try { @@ -72,9 +70,7 @@ class FragmentUpdater extends DefaultPositionUpdater { } } - /* - * @see org.eclipse.jface.text.DefaultPositionUpdater#adaptToInsert() - */ + @Override protected void adaptToInsert() { int myStart= fPosition.offset; int myEnd= Math.max(myStart, fPosition.offset + fPosition.length - (fIsLast || isAffectingReplace() ? 0 : 1)); diff --git a/org.eclipse.text/projection/org/eclipse/jface/text/projection/ProjectionDocument.java b/org.eclipse.text/projection/org/eclipse/jface/text/projection/ProjectionDocument.java index 0fe28d233ef..7b3b6d0453f 100644 --- a/org.eclipse.text/projection/org/eclipse/jface/text/projection/ProjectionDocument.java +++ b/org.eclipse.text/projection/org/eclipse/jface/text/projection/ProjectionDocument.java @@ -187,6 +187,7 @@ public class ProjectionDocument extends AbstractDocument { * @return the projection mapping used by this document * @deprecated As of 3.4, replaced by {@link #getDocumentInformationMapping()} */ + @Deprecated public ProjectionMapping getProjectionMapping(){ return fMapping; } @@ -210,10 +211,7 @@ public class ProjectionDocument extends AbstractDocument { return fMasterDocument; } - /* - * @see org.eclipse.jface.text.IDocumentExtension4#getDefaultLineDelimiter() - * @since 3.1 - */ + @Override public String getDefaultLineDelimiter() { return TextUtilities.getDefaultLineDelimiter(fMasterDocument); } @@ -618,9 +616,7 @@ public class ProjectionDocument extends AbstractDocument { return fIsUpdating; } - /* - * @see org.eclipse.jface.text.IDocument#replace(int, int, java.lang.String) - */ + @Override public void replace(int offset, int length, String text) throws BadLocationException { try { fIsUpdating= true; @@ -634,9 +630,7 @@ public class ProjectionDocument extends AbstractDocument { } } - /* - * @see org.eclipse.jface.text.IDocument#set(java.lang.String) - */ + @Override public void set(String text) { try { fIsUpdating= true; @@ -752,9 +746,7 @@ public class ProjectionDocument extends AbstractDocument { } } - /* - * @see org.eclipse.jface.text.AbstractDocument#fireDocumentAboutToBeChanged(org.eclipse.jface.text.DocumentEvent) - */ + @Override protected void fireDocumentAboutToBeChanged(DocumentEvent event) { fOriginalEvent= event; // delay it until there is a notification from the master document @@ -773,13 +765,12 @@ public class ProjectionDocument extends AbstractDocument { * * @param event the event to be ignored */ + @Override protected void fireDocumentChanged(DocumentEvent event) { super.fireDocumentChanged(fSlaveEvent); } - /* - * @see org.eclipse.jface.text.AbstractDocument#updateDocumentStructures(org.eclipse.jface.text.DocumentEvent) - */ + @Override protected void updateDocumentStructures(DocumentEvent event) { super.updateDocumentStructures(event); ensureWellFormedSegmentation(computeAnchor(event)); @@ -846,9 +837,7 @@ public class ProjectionDocument extends AbstractDocument { return changed; } - /* - * @see IDocumentExtension#registerPostNotificationReplace(IDocumentListener, IDocumentExtension.IReplace) - */ + @Override public void registerPostNotificationReplace(IDocumentListener owner, IDocumentExtension.IReplace replace) { if (!isUpdating()) throw new UnsupportedOperationException(); diff --git a/org.eclipse.text/projection/org/eclipse/jface/text/projection/ProjectionDocumentManager.java b/org.eclipse.text/projection/org/eclipse/jface/text/projection/ProjectionDocumentManager.java index 4f3cde301ec..9d154107510 100644 --- a/org.eclipse.text/projection/org/eclipse/jface/text/projection/ProjectionDocumentManager.java +++ b/org.eclipse.text/projection/org/eclipse/jface/text/projection/ProjectionDocumentManager.java @@ -124,23 +124,17 @@ public class ProjectionDocumentManager implements IDocumentListener, ISlaveDocum } } - /* - * @see org.eclipse.jface.text.IDocumentListener#documentChanged(org.eclipse.jface.text.DocumentEvent) - */ + @Override public void documentChanged(DocumentEvent event) { fireDocumentEvent(false, event); } - /* - * @see org.eclipse.jface.text.IDocumentListener#documentAboutToBeChanged(org.eclipse.jface.text.DocumentEvent) - */ + @Override public void documentAboutToBeChanged(DocumentEvent event) { fireDocumentEvent(true, event); } - /* - * @see org.eclipse.jface.text.ISlaveDocumentManager#createMasterSlaveMapping(org.eclipse.jface.text.IDocument) - */ + @Override public IDocumentInformationMapping createMasterSlaveMapping(IDocument slave) { if (slave instanceof ProjectionDocument) { ProjectionDocument projectionDocument= (ProjectionDocument) slave; @@ -149,9 +143,7 @@ public class ProjectionDocumentManager implements IDocumentListener, ISlaveDocum return null; } - /* - * @see org.eclipse.jface.text.ISlaveDocumentManager#createSlaveDocument(org.eclipse.jface.text.IDocument) - */ + @Override public IDocument createSlaveDocument(IDocument master) { if (!hasProjection(master)) master.addDocumentListener(this); @@ -170,9 +162,7 @@ public class ProjectionDocumentManager implements IDocumentListener, ISlaveDocum return new ProjectionDocument(master); } - /* - * @see org.eclipse.jface.text.ISlaveDocumentManager#freeSlaveDocument(org.eclipse.jface.text.IDocument) - */ + @Override public void freeSlaveDocument(IDocument slave) { if (slave instanceof ProjectionDocument) { ProjectionDocument projectionDocument= (ProjectionDocument) slave; @@ -184,33 +174,25 @@ public class ProjectionDocumentManager implements IDocumentListener, ISlaveDocum } } - /* - * @see org.eclipse.jface.text.ISlaveDocumentManager#getMasterDocument(org.eclipse.jface.text.IDocument) - */ + @Override public IDocument getMasterDocument(IDocument slave) { if (slave instanceof ProjectionDocument) return ((ProjectionDocument) slave).getMasterDocument(); return null; } - /* - * @see org.eclipse.jface.text.ISlaveDocumentManager#isSlaveDocument(org.eclipse.jface.text.IDocument) - */ + @Override public boolean isSlaveDocument(IDocument document) { return (document instanceof ProjectionDocument); } - /* - * @see org.eclipse.jface.text.ISlaveDocumentManager#setAutoExpandMode(org.eclipse.jface.text.IDocument, boolean) - */ + @Override public void setAutoExpandMode(IDocument slave, boolean autoExpanding) { if (slave instanceof ProjectionDocument) ((ProjectionDocument) slave).setAutoExpandMode(autoExpanding); } - /* - * @see org.eclipse.jface.text.ISlaveDocumentManagerExtension#getSlaveDocuments(org.eclipse.jface.text.IDocument) - */ + @Override public IDocument[] getSlaveDocuments(IDocument master) { List list= (List) fProjectionRegistry.get(master); if (list != null) { diff --git a/org.eclipse.text/projection/org/eclipse/jface/text/projection/ProjectionMapping.java b/org.eclipse.text/projection/org/eclipse/jface/text/projection/ProjectionMapping.java index a162d298aca..81d788dfaff 100644 --- a/org.eclipse.text/projection/org/eclipse/jface/text/projection/ProjectionMapping.java +++ b/org.eclipse.text/projection/org/eclipse/jface/text/projection/ProjectionMapping.java @@ -355,9 +355,7 @@ public class ProjectionMapping implements IDocumentInformationMapping , IDocumen return new Region(offset, exclusiveEndOffset - offset); } - /* - * @see org.eclipse.jface.text.IDocumentInformationMapping#getCoverage() - */ + @Override public IRegion getCoverage() { Position[] fragments= getFragments(); if (fragments != null && fragments.length > 0) { @@ -368,18 +366,14 @@ public class ProjectionMapping implements IDocumentInformationMapping , IDocumen return new Region(0, 0); } - /* - * @see org.eclipse.jface.text.IDocumentInformationMapping#toOriginOffset(int) - */ + @Override public int toOriginOffset(int imageOffset) throws BadLocationException { Segment segment= findSegment(imageOffset); int relative= imageOffset - segment.offset; return segment.fragment.offset + relative; } - /* - * @see org.eclipse.jface.text.IDocumentInformationMapping#toOriginRegion(org.eclipse.jface.text.IRegion) - */ + @Override public IRegion toOriginRegion(IRegion imageRegion) throws BadLocationException { int imageOffset= imageRegion.getOffset(); int imageLength= imageRegion.getLength(); @@ -400,9 +394,7 @@ public class ProjectionMapping implements IDocumentInformationMapping , IDocumen return new Region(originOffset, (inclusiveOriginEndOffset + 1) - originOffset); } - /* - * @see org.eclipse.jface.text.IDocumentInformationMapping#toOriginLines(int) - */ + @Override public IRegion toOriginLines(int imageLine) throws BadLocationException { IRegion imageRegion= fSlaveDocument.getLineInformation(imageLine); IRegion originRegion= toOriginRegion(imageRegion); @@ -415,17 +407,13 @@ public class ProjectionMapping implements IDocumentInformationMapping , IDocumen return new Region(originStartLine, (originEndLine + 1) - originStartLine); } - /* - * @see org.eclipse.jface.text.IDocumentInformationMapping#toOriginLine(int) - */ + @Override public int toOriginLine(int imageLine) throws BadLocationException { IRegion lines= toOriginLines(imageLine); return (lines.getLength() > 1 ? -1 : lines.getOffset()); } - /* - * @see org.eclipse.jface.text.IDocumentInformationMapping#toImageOffset(int) - */ + @Override public int toImageOffset(int originOffset) throws BadLocationException { Fragment fragment= findFragment(originOffset); if (fragment != null) { @@ -435,31 +423,22 @@ public class ProjectionMapping implements IDocumentInformationMapping , IDocumen return -1; } - /* - * @see org.eclipse.jface.text.IDocumentInformationMappingExtension#toExactImageRegion(org.eclipse.jface.text.IRegion) - */ + @Override public IRegion toExactImageRegion(IRegion originRegion) throws BadLocationException { return toImageRegion(originRegion, true, false); } - /* - * @see org.eclipse.jface.text.IDocumentInformationMapping#toImageRegion(org.eclipse.jface.text.IRegion) - */ + @Override public IRegion toImageRegion(IRegion originRegion) throws BadLocationException { return toImageRegion(originRegion, false, false); } - /* - * @see org.eclipse.jface.text.IDocumentInformationMappingExtension2#toClosestImageRegion(org.eclipse.jface.text.IRegion) - * @since 3.1 - */ + @Override public IRegion toClosestImageRegion(IRegion originRegion) throws BadLocationException { return toImageRegion(originRegion, false, true); } - /* - * @see org.eclipse.jface.text.IDocumentInformationMapping#toImageLine(int) - */ + @Override public int toImageLine(int originLine) throws BadLocationException { IRegion originRegion= fMasterDocument.getLineInformation(originLine); IRegion imageRegion= toImageRegion(originRegion); @@ -482,9 +461,7 @@ public class ProjectionMapping implements IDocumentInformationMapping , IDocumen return startLine; } - /* - * @see org.eclipse.jface.text.IDocumentInformationMapping#toClosestImageLine(int) - */ + @Override public int toClosestImageLine(int originLine) throws BadLocationException { try { @@ -526,9 +503,7 @@ public class ProjectionMapping implements IDocumentInformationMapping , IDocumen return -1; } - /* - * @see org.eclipse.jface.text.IDocumentInformationMappingExtension#toExactOriginRegions(org.eclipse.jface.text.IRegion) - */ + @Override public IRegion[] toExactOriginRegions(IRegion imageRegion) throws BadLocationException { if (imageRegion.getLength() == 0) @@ -566,9 +541,7 @@ public class ProjectionMapping implements IDocumentInformationMapping , IDocumen return result; } - /* - * @see org.eclipse.jface.text.IDocumentInformationMappingExtension#getImageLength() - */ + @Override public int getImageLength() { Position[] segments= getSegments(); int length= 0; @@ -577,9 +550,7 @@ public class ProjectionMapping implements IDocumentInformationMapping , IDocumen return length; } - /* - * @see org.eclipse.jface.text.IDocumentInformationMappingExtension#toExactImageRegions(org.eclipse.jface.text.IRegion) - */ + @Override public IRegion[] toExactImageRegions(IRegion originRegion) throws BadLocationException { int offset= originRegion.getOffset(); @@ -622,9 +593,7 @@ public class ProjectionMapping implements IDocumentInformationMapping , IDocumen return result; } - /* - * @see org.eclipse.jface.text.IDocumentInformationMappingExtension#getExactCoverage(org.eclipse.jface.text.IRegion) - */ + @Override public IRegion[] getExactCoverage(IRegion originRegion) throws BadLocationException { int originOffset= originRegion.getOffset(); diff --git a/org.eclipse.text/projection/org/eclipse/jface/text/projection/ProjectionTextStore.java b/org.eclipse.text/projection/org/eclipse/jface/text/projection/ProjectionTextStore.java index 516c2b4fba3..f593e30b973 100644 --- a/org.eclipse.text/projection/org/eclipse/jface/text/projection/ProjectionTextStore.java +++ b/org.eclipse.text/projection/org/eclipse/jface/text/projection/ProjectionTextStore.java @@ -35,16 +35,12 @@ class ProjectionTextStore implements ITextStore { private int fOffset; private int fLength; - /* - * @see org.eclipse.jface.text.IRegion#getLength() - */ + @Override public int getLength() { return fLength; } - /* - * @see org.eclipse.jface.text.IRegion#getOffset() - */ + @Override public int getOffset() { return fOffset; } @@ -85,9 +81,7 @@ class ProjectionTextStore implements ITextStore { throw new IllegalStateException(); } - /* - * @see org.eclipse.jface.text.ITextStore#set(java.lang.String) - */ + @Override public void set(String contents) { IRegion masterRegion= fMapping.getCoverage(); @@ -101,9 +95,7 @@ class ProjectionTextStore implements ITextStore { } } - /* - * @see org.eclipse.jface.text.ITextStore#replace(int, int, java.lang.String) - */ + @Override public void replace(int offset, int length, String text) { fReusableRegion.update(offset, length); try { @@ -114,16 +106,12 @@ class ProjectionTextStore implements ITextStore { } } - /* - * @see org.eclipse.jface.text.ITextStore#getLength() - */ + @Override public int getLength() { return fMapping.getImageLength(); } - /* - * @see org.eclipse.jface.text.ITextStore#get(int) - */ + @Override public char get(int offset) { try { int originOffset= fMapping.toOriginOffset(offset); @@ -136,9 +124,7 @@ class ProjectionTextStore implements ITextStore { return (char) 0; } - /* - * @see ITextStore#get(int, int) - */ + @Override public String get(int offset, int length) { try { IRegion[] fragments= fMapping.toExactOriginRegions(new Region(offset, length)); diff --git a/org.eclipse.text/projection/org/eclipse/jface/text/projection/SegmentUpdater.java b/org.eclipse.text/projection/org/eclipse/jface/text/projection/SegmentUpdater.java index 16146b1680c..e388bdac2e2 100644 --- a/org.eclipse.text/projection/org/eclipse/jface/text/projection/SegmentUpdater.java +++ b/org.eclipse.text/projection/org/eclipse/jface/text/projection/SegmentUpdater.java @@ -42,9 +42,7 @@ class SegmentUpdater extends DefaultPositionUpdater { super(segmentCategory); } - /* - * @see org.eclipse.jface.text.IPositionUpdater#update(org.eclipse.jface.text.DocumentEvent) - */ + @Override public void update(DocumentEvent event) { Assert.isTrue(event instanceof ProjectionDocumentEvent); @@ -82,9 +80,7 @@ class SegmentUpdater extends DefaultPositionUpdater { } } - /* - * @see org.eclipse.jface.text.DefaultPositionUpdater#adaptToInsert() - */ + @Override protected void adaptToInsert() { Segment segment= (Segment) fPosition; diff --git a/org.eclipse.text/src/org/eclipse/jface/text/AbstractDocument.java b/org.eclipse.text/src/org/eclipse/jface/text/AbstractDocument.java index a4e5095b579..ba2fe5ac7d2 100644 --- a/org.eclipse.text/src/org/eclipse/jface/text/AbstractDocument.java +++ b/org.eclipse.text/src/org/eclipse/jface/text/AbstractDocument.java @@ -238,9 +238,7 @@ public abstract class AbstractDocument implements IDocument, IDocumentExtension, return fPositions; } - /* - * @see org.eclipse.jface.text.IDocument#getDocumentPartitioner() - */ + @Override public IDocumentPartitioner getDocumentPartitioner() { return getDocumentPartitioner(DEFAULT_PARTITIONING); } @@ -269,9 +267,7 @@ public abstract class AbstractDocument implements IDocument, IDocumentExtension, fTracker= tracker; } - /* - * @see org.eclipse.jface.text.IDocument#setDocumentPartitioner(org.eclipse.jface.text.IDocumentPartitioner) - */ + @Override public void setDocumentPartitioner(IDocumentPartitioner partitioner) { setDocumentPartitioner(DEFAULT_PARTITIONING, partitioner); } @@ -298,57 +294,43 @@ public abstract class AbstractDocument implements IDocument, IDocumentExtension, //------------------------------------------------------- - /* - * @see org.eclipse.jface.text.IDocument#addDocumentListener(org.eclipse.jface.text.IDocumentListener) - */ + @Override public void addDocumentListener(IDocumentListener listener) { Assert.isNotNull(listener); fDocumentListeners.add(listener); } - /* - * @see org.eclipse.jface.text.IDocument#removeDocumentListener(org.eclipse.jface.text.IDocumentListener) - */ + @Override public void removeDocumentListener(IDocumentListener listener) { Assert.isNotNull(listener); fDocumentListeners.remove(listener); } - /* - * @see org.eclipse.jface.text.IDocument#addPrenotifiedDocumentListener(org.eclipse.jface.text.IDocumentListener) - */ + @Override public void addPrenotifiedDocumentListener(IDocumentListener listener) { Assert.isNotNull(listener); fPrenotifiedDocumentListeners.add(listener); } - /* - * @see org.eclipse.jface.text.IDocument#removePrenotifiedDocumentListener(org.eclipse.jface.text.IDocumentListener) - */ + @Override public void removePrenotifiedDocumentListener(IDocumentListener listener) { Assert.isNotNull(listener); fPrenotifiedDocumentListeners.remove(listener); } - /* - * @see org.eclipse.jface.text.IDocument#addDocumentPartitioningListener(org.eclipse.jface.text.IDocumentPartitioningListener) - */ + @Override public void addDocumentPartitioningListener(IDocumentPartitioningListener listener) { Assert.isNotNull(listener); fDocumentPartitioningListeners.add(listener); } - /* - * @see org.eclipse.jface.text.IDocument#removeDocumentPartitioningListener(org.eclipse.jface.text.IDocumentPartitioningListener) - */ + @Override public void removeDocumentPartitioningListener(IDocumentPartitioningListener listener) { Assert.isNotNull(listener); fDocumentPartitioningListeners.remove(listener); } - /* - * @see org.eclipse.jface.text.IDocument#addPosition(java.lang.String, org.eclipse.jface.text.Position) - */ + @Override public void addPosition(String category, Position position) throws BadLocationException, BadPositionCategoryException { if ((0 > position.offset) || (0 > position.length) || (position.offset + position.length > getLength())) @@ -368,9 +350,7 @@ public abstract class AbstractDocument implements IDocument, IDocumentExtension, endPositions.add(computeIndexInPositionList(endPositions, position.offset + position.length - 1, false), position); } - /* - * @see org.eclipse.jface.text.IDocument#addPosition(org.eclipse.jface.text.Position) - */ + @Override public void addPosition(Position position) throws BadLocationException { try { addPosition(DEFAULT_CATEGORY, position); @@ -378,9 +358,7 @@ public abstract class AbstractDocument implements IDocument, IDocumentExtension, } } - /* - * @see org.eclipse.jface.text.IDocument#addPositionCategory(java.lang.String) - */ + @Override public void addPositionCategory(String category) { if (category == null) @@ -392,16 +370,12 @@ public abstract class AbstractDocument implements IDocument, IDocumentExtension, } } - /* - * @see org.eclipse.jface.text.IDocument#addPositionUpdater(org.eclipse.jface.text.IPositionUpdater) - */ + @Override public void addPositionUpdater(IPositionUpdater updater) { insertPositionUpdater(updater, fPositionUpdaters.size()); } - /* - * @see org.eclipse.jface.text.IDocument#containsPosition(java.lang.String, int, int) - */ + @Override public boolean containsPosition(String category, int offset, int length) { if (category == null) @@ -429,9 +403,7 @@ public abstract class AbstractDocument implements IDocument, IDocumentExtension, return false; } - /* - * @see org.eclipse.jface.text.IDocument#containsPositionCategory(java.lang.String) - */ + @Override public boolean containsPositionCategory(String category) { if (category != null) return fPositions.containsKey(category); @@ -451,6 +423,7 @@ public abstract class AbstractDocument implements IDocument, IDocumentExtension, * @see IDocument#computeIndexInCategory(String, int) * @deprecated As of 3.4, replaced by {@link #computeIndexInPositionList(List, int, boolean)} */ + @Deprecated protected int computeIndexInPositionList(List positions, int offset) { return computeIndexInPositionList(positions, offset, true); } @@ -529,9 +502,7 @@ public abstract class AbstractDocument implements IDocument, IDocumentExtension, return position.getOffset() + position.getLength() - 1; } - /* - * @see org.eclipse.jface.text.IDocument#computeIndexInCategory(java.lang.String, int) - */ + @Override public int computeIndexInCategory(String category, int offset) throws BadLocationException, BadPositionCategoryException { if (0 > offset || offset > getLength()) @@ -550,6 +521,7 @@ public abstract class AbstractDocument implements IDocument, IDocumentExtension, * * @deprecated as of 2.0. Use <code>fireDocumentPartitioningChanged(IRegion)</code> instead. */ + @Deprecated protected void fireDocumentPartitioningChanged() { if (fDocumentPartitioningListeners == null) return; @@ -571,6 +543,7 @@ public abstract class AbstractDocument implements IDocument, IDocumentExtension, * <code>fireDocumentPartitioningChanged(DocumentPartitioningChangedEvent)</code> * instead. */ + @Deprecated protected void fireDocumentPartitioningChanged(IRegion region) { if (fDocumentPartitioningListeners == null) return; @@ -732,6 +705,7 @@ public abstract class AbstractDocument implements IDocument, IDocumentExtension, * @since 2.0 * @deprecated as of 3.0. Use <code>doFireDocumentChanged2(DocumentEvent)</code> instead; this method will be removed. */ + @Deprecated protected void doFireDocumentChanged(DocumentEvent event, boolean firePartitionChange, IRegion partitionChange) { doFireDocumentChanged2(event); } @@ -798,18 +772,14 @@ public abstract class AbstractDocument implements IDocument, IDocumentExtension, fDeferredDocumentEvent= event; } - /* - * @see org.eclipse.jface.text.IDocument#getChar(int) - */ + @Override public char getChar(int pos) throws BadLocationException { if ((0 > pos) || (pos >= getLength())) throw new BadLocationException(); return getStore().get(pos); } - /* - * @see org.eclipse.jface.text.IDocument#getContentType(int) - */ + @Override public String getContentType(int offset) throws BadLocationException { String contentType= null; try { @@ -821,9 +791,7 @@ public abstract class AbstractDocument implements IDocument, IDocumentExtension, return contentType; } - /* - * @see org.eclipse.jface.text.IDocument#getLegalContentTypes() - */ + @Override public String[] getLegalContentTypes() { String[] contentTypes= null; try { @@ -835,31 +803,22 @@ public abstract class AbstractDocument implements IDocument, IDocumentExtension, return contentTypes; } - /* - * @see org.eclipse.jface.text.IDocument#getLength() - */ + @Override public int getLength() { return getStore().getLength(); } - /* - * @see org.eclipse.jface.text.IDocument#getLineDelimiter(int) - */ + @Override public String getLineDelimiter(int line) throws BadLocationException { return getTracker().getLineDelimiter(line); } - /* - * @see org.eclipse.jface.text.IDocument#getLegalLineDelimiters() - */ + @Override public String[] getLegalLineDelimiters() { return getTracker().getLegalLineDelimiters(); } - /* - * @see org.eclipse.jface.text.IDocumentExtension4#getDefaultLineDelimiter() - * @since 3.1 - */ + @Override public String getDefaultLineDelimiter() { String lineDelimiter= null; @@ -892,74 +851,53 @@ public abstract class AbstractDocument implements IDocument, IDocumentExtension, } - /* - * @see org.eclipse.jface.text.IDocumentExtension4#setInitialLineDelimiter(java.lang.String) - * @since 3.1 - */ + @Override public void setInitialLineDelimiter(String lineDelimiter) { Assert.isNotNull(lineDelimiter); fInitialLineDelimiter= lineDelimiter; } - /* - * @see org.eclipse.jface.text.IDocument#getLineLength(int) - */ + @Override public int getLineLength(int line) throws BadLocationException { return getTracker().getLineLength(line); } - /* - * @see org.eclipse.jface.text.IDocument#getLineOfOffset(int) - */ + @Override public int getLineOfOffset(int pos) throws BadLocationException { return getTracker().getLineNumberOfOffset(pos); } - /* - * @see org.eclipse.jface.text.IDocument#getLineOffset(int) - */ + @Override public int getLineOffset(int line) throws BadLocationException { return getTracker().getLineOffset(line); } - /* - * @see org.eclipse.jface.text.IDocument#getLineInformation(int) - */ + @Override public IRegion getLineInformation(int line) throws BadLocationException { return getTracker().getLineInformation(line); } - /* - * @see org.eclipse.jface.text.IDocument#getLineInformationOfOffset(int) - */ + @Override public IRegion getLineInformationOfOffset(int offset) throws BadLocationException { return getTracker().getLineInformationOfOffset(offset); } - /* - * @see org.eclipse.jface.text.IDocument#getNumberOfLines() - */ + @Override public int getNumberOfLines() { return getTracker().getNumberOfLines(); } - /* - * @see org.eclipse.jface.text.IDocument#getNumberOfLines(int, int) - */ + @Override public int getNumberOfLines(int offset, int length) throws BadLocationException { return getTracker().getNumberOfLines(offset, length); } - /* - * @see org.eclipse.jface.text.IDocument#computeNumberOfLines(java.lang.String) - */ + @Override public int computeNumberOfLines(String text) { return getTracker().computeNumberOfLines(text); } - /* - * @see org.eclipse.jface.text.IDocument#getPartition(int) - */ + @Override public ITypedRegion getPartition(int offset) throws BadLocationException { ITypedRegion partition= null; try { @@ -971,9 +909,7 @@ public abstract class AbstractDocument implements IDocument, IDocumentExtension, return partition; } - /* - * @see org.eclipse.jface.text.IDocument#computePartitioning(int, int) - */ + @Override public ITypedRegion[] computePartitioning(int offset, int length) throws BadLocationException { ITypedRegion[] partitioning= null; try { @@ -985,9 +921,7 @@ public abstract class AbstractDocument implements IDocument, IDocumentExtension, return partitioning; } - /* - * @see org.eclipse.jface.text.IDocument#getPositions(java.lang.String) - */ + @Override public Position[] getPositions(String category) throws BadPositionCategoryException { if (category == null) @@ -1002,9 +936,7 @@ public abstract class AbstractDocument implements IDocument, IDocumentExtension, return positions; } - /* - * @see org.eclipse.jface.text.IDocument#getPositionCategories() - */ + @Override public String[] getPositionCategories() { String[] categories= new String[fPositions.size()]; Iterator keys= fPositions.keySet().iterator(); @@ -1013,25 +945,19 @@ public abstract class AbstractDocument implements IDocument, IDocumentExtension, return categories; } - /* - * @see org.eclipse.jface.text.IDocument#getPositionUpdaters() - */ + @Override public IPositionUpdater[] getPositionUpdaters() { IPositionUpdater[] updaters= new IPositionUpdater[fPositionUpdaters.size()]; fPositionUpdaters.toArray(updaters); return updaters; } - /* - * @see org.eclipse.jface.text.IDocument#get() - */ + @Override public String get() { return getStore().get(0, getLength()); } - /* - * @see org.eclipse.jface.text.IDocument#get(int, int) - */ + @Override public String get(int pos, int length) throws BadLocationException { int myLength= getLength(); if ((0 > pos) || (0 > length) || (pos + length > myLength)) @@ -1039,9 +965,7 @@ public abstract class AbstractDocument implements IDocument, IDocumentExtension, return getStore().get(pos, length); } - /* - * @see org.eclipse.jface.text.IDocument#insertPositionUpdater(org.eclipse.jface.text.IPositionUpdater, int) - */ + @Override public void insertPositionUpdater(IPositionUpdater updater, int index) { for (int i= fPositionUpdaters.size() - 1; i >= 0; i--) { @@ -1055,9 +979,7 @@ public abstract class AbstractDocument implements IDocument, IDocumentExtension, fPositionUpdaters.add(index, updater); } - /* - * @see org.eclipse.jface.text.IDocument#removePosition(java.lang.String, org.eclipse.jface.text.Position) - */ + @Override public void removePosition(String category, Position position) throws BadPositionCategoryException { if (position == null) @@ -1116,9 +1038,7 @@ public abstract class AbstractDocument implements IDocument, IDocumentExtension, } } - /* - * @see org.eclipse.jface.text.IDocument#removePosition(org.eclipse.jface.text.Position) - */ + @Override public void removePosition(Position position) { try { removePosition(DEFAULT_CATEGORY, position); @@ -1126,9 +1046,7 @@ public abstract class AbstractDocument implements IDocument, IDocumentExtension, } } - /* - * @see org.eclipse.jface.text.IDocument#removePositionCategory(java.lang.String) - */ + @Override public void removePositionCategory(String category) throws BadPositionCategoryException { if (category == null) @@ -1141,9 +1059,7 @@ public abstract class AbstractDocument implements IDocument, IDocumentExtension, fEndPositions.remove(category); } - /* - * @see org.eclipse.jface.text.IDocument#removePositionUpdater(org.eclipse.jface.text.IPositionUpdater) - */ + @Override public void removePositionUpdater(IPositionUpdater updater) { for (int i= fPositionUpdaters.size() - 1; i >= 0; i--) { if (fPositionUpdaters.get(i) == updater) { @@ -1162,18 +1078,12 @@ public abstract class AbstractDocument implements IDocument, IDocumentExtension, return fNextModificationStamp; } - /* - * @see org.eclipse.jface.text.IDocumentExtension4#getModificationStamp() - * @since 3.1 - */ + @Override public long getModificationStamp() { return fModificationStamp; } - /* - * @see org.eclipse.jface.text.IDocument#replace(int, int, java.lang.String) - * @since 3.1 - */ + @Override public void replace(int pos, int length, String text, long modificationStamp) throws BadLocationException { if ((0 > pos) || (0 > length) || (pos + length > getLength())) throw new BadLocationException(); @@ -1196,13 +1106,12 @@ public abstract class AbstractDocument implements IDocument, IDocumentExtension, * * @since 3.4 */ + @Override public boolean isLineInformationRepairNeeded(int offset, int length, String text) throws BadLocationException { return false; } - /* - * @see org.eclipse.jface.text.IDocument#replace(int, int, java.lang.String) - */ + @Override public void replace(int pos, int length, String text) throws BadLocationException { if (length == 0 && (text == null || text.length() == 0)) replace(pos, length, text, getModificationStamp()); @@ -1210,17 +1119,12 @@ public abstract class AbstractDocument implements IDocument, IDocumentExtension, replace(pos, length, text, getNextModificationStamp()); } - /* - * @see org.eclipse.jface.text.IDocument#set(java.lang.String) - */ + @Override public void set(String text) { set(text, getNextModificationStamp()); } - /* - * @see org.eclipse.jface.text.IDocumentExtension4#set(java.lang.String, long) - * @since 3.1 - */ + @Override public void set(String text, long modificationStamp) { int length= getStore().getLength(); @@ -1259,6 +1163,8 @@ public abstract class AbstractDocument implements IDocument, IDocumentExtension, * * @deprecated as of 3.0 search is provided by {@link FindReplaceDocumentAdapter} */ + @Deprecated + @Override public int search(int startPosition, String findString, boolean forwardSearch, boolean caseSensitive, boolean wholeWord) throws BadLocationException { try { IRegion region= getFindReplaceDocumentAdapter().find(startPosition, findString, forwardSearch, caseSensitive, wholeWord, false); @@ -1316,26 +1222,17 @@ public abstract class AbstractDocument implements IDocument, IDocumentExtension, } } - /* - * @see org.eclipse.jface.text.IDocumentExtension2#acceptPostNotificationReplaces() - * @since 2.1 - */ + @Override public void acceptPostNotificationReplaces() { fAcceptPostNotificationReplaces= true; } - /* - * @see org.eclipse.jface.text.IDocumentExtension2#ignorePostNotificationReplaces() - * @since 2.1 - */ + @Override public void ignorePostNotificationReplaces() { fAcceptPostNotificationReplaces= false; } - /* - * @see org.eclipse.jface.text.IDocumentExtension#registerPostNotificationReplace(org.eclipse.jface.text.IDocumentListener, org.eclipse.jface.text.IDocumentExtension.IReplace) - * @since 2.0 - */ + @Override public void registerPostNotificationReplace(IDocumentListener owner, IDocumentExtension.IReplace replace) { if (fAcceptPostNotificationReplaces) { if (fPostNotificationChanges == null) @@ -1344,18 +1241,12 @@ public abstract class AbstractDocument implements IDocument, IDocumentExtension, } } - /* - * @see org.eclipse.jface.text.IDocumentExtension#stopPostNotificationProcessing() - * @since 2.0 - */ + @Override public void stopPostNotificationProcessing() { ++ fStoppedCount; } - /* - * @see org.eclipse.jface.text.IDocumentExtension#resumePostNotificationProcessing() - * @since 2.0 - */ + @Override public void resumePostNotificationProcessing() { -- fStoppedCount; if (fStoppedCount == 0 && fReentranceCount == 0) @@ -1370,6 +1261,8 @@ public abstract class AbstractDocument implements IDocument, IDocumentExtension, * {@link IDocumentExtension4#startRewriteSession(DocumentRewriteSessionType)} * instead. */ + @Deprecated + @Override public void startSequentialRewrite(boolean normalized) { } @@ -1379,13 +1272,12 @@ public abstract class AbstractDocument implements IDocument, IDocumentExtension, * @since 2.0 * @deprecated As of 3.1, replaced by {@link IDocumentExtension4#stopRewriteSession(DocumentRewriteSession)} */ + @Deprecated + @Override public void stopSequentialRewrite() { } - /* - * @see org.eclipse.jface.text.IDocumentExtension2#resumeListenerNotification() - * @since 2.1 - */ + @Override public void resumeListenerNotification() { -- fStoppedListenerNotification; if (fStoppedListenerNotification == 0) { @@ -1393,10 +1285,7 @@ public abstract class AbstractDocument implements IDocument, IDocumentExtension, } } - /* - * @see org.eclipse.jface.text.IDocumentExtension2#stopListenerNotification() - * @since 2.1 - */ + @Override public void stopListenerNotification() { ++ fStoppedListenerNotification; } @@ -1419,6 +1308,7 @@ public abstract class AbstractDocument implements IDocument, IDocumentExtension, * @see org.eclipse.jface.text.IDocumentExtension3#computeZeroLengthPartitioning(java.lang.String, int, int) * @since 3.0 */ + @Override public ITypedRegion[] computePartitioning(String partitioning, int offset, int length, boolean includeZeroLengthPartitions) throws BadLocationException, BadPartitioningException { if ((0 > offset) || (0 > length) || (offset + length > getLength())) throw new BadLocationException(); @@ -1441,6 +1331,7 @@ public abstract class AbstractDocument implements IDocument, IDocumentExtension, * @see org.eclipse.jface.text.IDocumentExtension3#getZeroLengthContentType(java.lang.String, int) * @since 3.0 */ + @Override public String getContentType(String partitioning, int offset, boolean preferOpenPartitions) throws BadLocationException, BadPartitioningException { if ((0 > offset) || (offset > getLength())) throw new BadLocationException(); @@ -1459,18 +1350,12 @@ public abstract class AbstractDocument implements IDocument, IDocumentExtension, throw new BadPartitioningException(); } - /* - * @see org.eclipse.jface.text.IDocumentExtension3#getDocumentPartitioner(java.lang.String) - * @since 3.0 - */ + @Override public IDocumentPartitioner getDocumentPartitioner(String partitioning) { return fDocumentPartitioners != null ? (IDocumentPartitioner) fDocumentPartitioners.get(partitioning) : null; } - /* - * @see org.eclipse.jface.text.IDocumentExtension3#getLegalContentTypes(java.lang.String) - * @since 3.0 - */ + @Override public String[] getLegalContentTypes(String partitioning) throws BadPartitioningException { IDocumentPartitioner partitioner= getDocumentPartitioner(partitioning); if (partitioner != null) @@ -1484,6 +1369,7 @@ public abstract class AbstractDocument implements IDocument, IDocumentExtension, * @see org.eclipse.jface.text.IDocumentExtension3#getZeroLengthPartition(java.lang.String, int) * @since 3.0 */ + @Override public ITypedRegion getPartition(String partitioning, int offset, boolean preferOpenPartitions) throws BadLocationException, BadPartitioningException { if ((0 > offset) || (offset > getLength())) throw new BadLocationException(); @@ -1502,10 +1388,7 @@ public abstract class AbstractDocument implements IDocument, IDocumentExtension, throw new BadPartitioningException(); } - /* - * @see org.eclipse.jface.text.IDocumentExtension3#getPartitionings() - * @since 3.0 - */ + @Override public String[] getPartitionings() { if (fDocumentPartitioners == null) return new String[0]; @@ -1514,10 +1397,7 @@ public abstract class AbstractDocument implements IDocument, IDocumentExtension, return partitionings; } - /* - * @see org.eclipse.jface.text.IDocumentExtension3#setDocumentPartitioner(java.lang.String, org.eclipse.jface.text.IDocumentPartitioner) - * @since 3.0 - */ + @Override public void setDocumentPartitioner(String partitioning, IDocumentPartitioner partitioner) { if (partitioner == null) { if (fDocumentPartitioners != null) { @@ -1535,10 +1415,7 @@ public abstract class AbstractDocument implements IDocument, IDocumentExtension, fireDocumentPartitioningChanged(event); } - /* - * @see org.eclipse.jface.text.IRepairableDocument#repairLineInformation() - * @since 3.0 - */ + @Override public void repairLineInformation() { getTracker().set(get()); } @@ -1564,17 +1441,12 @@ public abstract class AbstractDocument implements IDocument, IDocumentExtension, } } - /* - * @see org.eclipse.jface.text.IDocumentExtension4#getActiveRewriteSession() - */ + @Override public final DocumentRewriteSession getActiveRewriteSession() { return fDocumentRewriteSession; } - /* - * @see org.eclipse.jface.text.IDocumentExtension4#startRewriteSession(org.eclipse.jface.text.DocumentRewriteSessionType) - * @since 3.1 - */ + @Override public DocumentRewriteSession startRewriteSession(DocumentRewriteSessionType sessionType) { if (getActiveRewriteSession() != null) @@ -1622,10 +1494,7 @@ public abstract class AbstractDocument implements IDocument, IDocumentExtension, } } - /* - * @see org.eclipse.jface.text.IDocumentExtension4#stopRewriteSession(org.eclipse.jface.text.DocumentRewriteSession) - * @since 3.1 - */ + @Override public void stopRewriteSession(DocumentRewriteSession session) { if (fDocumentRewriteSession == session) { @@ -1673,20 +1542,14 @@ public abstract class AbstractDocument implements IDocument, IDocumentExtension, } } - /* - * @see org.eclipse.jface.text.IDocumentExtension4#addDocumentRewriteSessionListener(org.eclipse.jface.text.IDocumentRewriteSessionListener) - * @since 3.1 - */ + @Override public void addDocumentRewriteSessionListener(IDocumentRewriteSessionListener listener) { Assert.isNotNull(listener); if (! fDocumentRewriteSessionListeners.contains(listener)) fDocumentRewriteSessionListeners.add(listener); } - /* - * @see org.eclipse.jface.text.IDocumentExtension4#removeDocumentRewriteSessionListener(org.eclipse.jface.text.IDocumentRewriteSessionListener) - * @since 3.1 - */ + @Override public void removeDocumentRewriteSessionListener(IDocumentRewriteSessionListener listener) { Assert.isNotNull(listener); fDocumentRewriteSessionListeners.remove(listener); @@ -1842,10 +1705,12 @@ public abstract class AbstractDocument implements IDocument, IDocumentExtension, */ private static void log(final Exception ex) { SafeRunner.run(new ISafeRunnable() { + @Override public void run() throws Exception { throw ex; } + @Override public void handleException(Throwable exception) { // NOTE: Logging is done by SafeRunner } diff --git a/org.eclipse.text/src/org/eclipse/jface/text/AbstractLineTracker.java b/org.eclipse.text/src/org/eclipse/jface/text/AbstractLineTracker.java index 86a80ef9fcc..ba4f3ac17a3 100644 --- a/org.eclipse.text/src/org/eclipse/jface/text/AbstractLineTracker.java +++ b/org.eclipse.text/src/org/eclipse/jface/text/AbstractLineTracker.java @@ -95,10 +95,12 @@ public abstract class AbstractLineTracker implements ILineTracker, ILineTrackerE * @since 3.2 */ private ILineTracker fDelegate= new ListLineTracker() { + @Override public String[] getLegalLineDelimiters() { return AbstractLineTracker.this.getLegalLineDelimiters(); } + @Override protected DelimiterInfo nextDelimiterInfo(String text, int offset) { return AbstractLineTracker.this.nextDelimiterInfo(text, offset); } @@ -114,64 +116,48 @@ public abstract class AbstractLineTracker implements ILineTracker, ILineTrackerE protected AbstractLineTracker() { } - /* - * @see org.eclipse.jface.text.ILineTracker#computeNumberOfLines(java.lang.String) - */ + @Override public int computeNumberOfLines(String text) { return fDelegate.computeNumberOfLines(text); } - /* - * @see org.eclipse.jface.text.ILineTracker#getLineDelimiter(int) - */ + @Override public String getLineDelimiter(int line) throws BadLocationException { checkRewriteSession(); return fDelegate.getLineDelimiter(line); } - /* - * @see org.eclipse.jface.text.ILineTracker#getLineInformation(int) - */ + @Override public IRegion getLineInformation(int line) throws BadLocationException { checkRewriteSession(); return fDelegate.getLineInformation(line); } - /* - * @see org.eclipse.jface.text.ILineTracker#getLineInformationOfOffset(int) - */ + @Override public IRegion getLineInformationOfOffset(int offset) throws BadLocationException { checkRewriteSession(); return fDelegate.getLineInformationOfOffset(offset); } - /* - * @see org.eclipse.jface.text.ILineTracker#getLineLength(int) - */ + @Override public int getLineLength(int line) throws BadLocationException { checkRewriteSession(); return fDelegate.getLineLength(line); } - /* - * @see org.eclipse.jface.text.ILineTracker#getLineNumberOfOffset(int) - */ + @Override public int getLineNumberOfOffset(int offset) throws BadLocationException { checkRewriteSession(); return fDelegate.getLineNumberOfOffset(offset); } - /* - * @see org.eclipse.jface.text.ILineTracker#getLineOffset(int) - */ + @Override public int getLineOffset(int line) throws BadLocationException { checkRewriteSession(); return fDelegate.getLineOffset(line); } - /* - * @see org.eclipse.jface.text.ILineTracker#getNumberOfLines() - */ + @Override public int getNumberOfLines() { try { checkRewriteSession(); @@ -181,17 +167,13 @@ public abstract class AbstractLineTracker implements ILineTracker, ILineTrackerE return fDelegate.getNumberOfLines(); } - /* - * @see org.eclipse.jface.text.ILineTracker#getNumberOfLines(int, int) - */ + @Override public int getNumberOfLines(int offset, int length) throws BadLocationException { checkRewriteSession(); return fDelegate.getNumberOfLines(offset, length); } - /* - * @see org.eclipse.jface.text.ILineTracker#set(java.lang.String) - */ + @Override public void set(String text) { if (hasActiveRewriteSession()) { fPendingRequests.clear(); @@ -202,9 +184,7 @@ public abstract class AbstractLineTracker implements ILineTracker, ILineTrackerE fDelegate.set(text); } - /* - * @see org.eclipse.jface.text.ILineTracker#replace(int, int, java.lang.String) - */ + @Override public void replace(int offset, int length, String text) throws BadLocationException { if (hasActiveRewriteSession()) { fPendingRequests.add(new Request(offset, length, text)); @@ -225,10 +205,12 @@ public abstract class AbstractLineTracker implements ILineTracker, ILineTrackerE if (fNeedsConversion) { fNeedsConversion= false; fDelegate= new TreeLineTracker((ListLineTracker) fDelegate) { + @Override protected DelimiterInfo nextDelimiterInfo(String text, int offset) { return AbstractLineTracker.this.nextDelimiterInfo(text, offset); } + @Override public String[] getLegalLineDelimiters() { return AbstractLineTracker.this.getLegalLineDelimiters(); } @@ -246,10 +228,7 @@ public abstract class AbstractLineTracker implements ILineTracker, ILineTrackerE */ protected abstract DelimiterInfo nextDelimiterInfo(String text, int offset); - /* - * @see org.eclipse.jface.text.ILineTrackerExtension#startRewriteSession(org.eclipse.jface.text.DocumentRewriteSession) - * @since 3.1 - */ + @Override public final void startRewriteSession(DocumentRewriteSession session) { if (fActiveRewriteSession != null) throw new IllegalStateException(); @@ -257,10 +236,7 @@ public abstract class AbstractLineTracker implements ILineTracker, ILineTrackerE fPendingRequests= new ArrayList(20); } - /* - * @see org.eclipse.jface.text.ILineTrackerExtension#stopRewriteSession(org.eclipse.jface.text.DocumentRewriteSession, java.lang.String) - * @since 3.1 - */ + @Override public final void stopRewriteSession(DocumentRewriteSession session, String text) { if (fActiveRewriteSession == session) { fActiveRewriteSession= null; diff --git a/org.eclipse.text/src/org/eclipse/jface/text/Assert.java b/org.eclipse.text/src/org/eclipse/jface/text/Assert.java index da5e9d6dca7..e75ce25d9f7 100644 --- a/org.eclipse.text/src/org/eclipse/jface/text/Assert.java +++ b/org.eclipse.text/src/org/eclipse/jface/text/Assert.java @@ -31,6 +31,7 @@ package org.eclipse.jface.text; * @deprecated As of 3.3, replaced by {@link org.eclipse.core.runtime.Assert} * @noinstantiate This class is not intended to be instantiated by clients. */ +@Deprecated public final class Assert { /** diff --git a/org.eclipse.text/src/org/eclipse/jface/text/ConfigurableLineTracker.java b/org.eclipse.text/src/org/eclipse/jface/text/ConfigurableLineTracker.java index 3310baced21..88a7b7c2477 100644 --- a/org.eclipse.text/src/org/eclipse/jface/text/ConfigurableLineTracker.java +++ b/org.eclipse.text/src/org/eclipse/jface/text/ConfigurableLineTracker.java @@ -46,16 +46,12 @@ public class ConfigurableLineTracker extends AbstractLineTracker { fDelimiters= TextUtilities.copy(legalLineDelimiters); } - /* - * @see org.eclipse.jface.text.ILineTracker#getLegalLineDelimiters() - */ + @Override public String[] getLegalLineDelimiters() { return TextUtilities.copy(fDelimiters); } - /* - * @see org.eclipse.jface.text.AbstractLineTracker#nextDelimiterInfo(java.lang.String, int) - */ + @Override protected DelimiterInfo nextDelimiterInfo(String text, int offset) { if (fDelimiters.length > 1) { int[] info= TextUtilities.indexOf(fDelimiters, text, offset); diff --git a/org.eclipse.text/src/org/eclipse/jface/text/CopyOnWriteTextStore.java b/org.eclipse.text/src/org/eclipse/jface/text/CopyOnWriteTextStore.java index 002b907149a..12d1bbf5627 100644 --- a/org.eclipse.text/src/org/eclipse/jface/text/CopyOnWriteTextStore.java +++ b/org.eclipse.text/src/org/eclipse/jface/text/CopyOnWriteTextStore.java @@ -63,16 +63,12 @@ public class CopyOnWriteTextStore implements ITextStore { fCopyLimit= fText.length() > SMALL_TEXT_LIMIT ? fText.length() / 2 : 0; } - /* - * @see org.eclipse.jface.text.ITextStore#get(int) - */ + @Override public char get(int offset) { return fText.charAt(offset); } - /* - * @see org.eclipse.jface.text.ITextStore#get(int, int) - */ + @Override public String get(int offset, int length) { if (length < fCopyLimit) { // create a copy to avoid sharing of contained char[] - bug 292664 @@ -81,24 +77,18 @@ public class CopyOnWriteTextStore implements ITextStore { return fText.substring(offset, offset + length); } - /* - * @see org.eclipse.jface.text.ITextStore#getLength() - */ + @Override public int getLength() { return fText.length(); } - /* - * @see org.eclipse.jface.text.ITextStore#replace(int, int, java.lang.String) - */ + @Override public void replace(int offset, int length, String text) { // modification not supported throw new UnsupportedOperationException(); } - /* - * @see org.eclipse.jface.text.ITextStore#set(java.lang.String) - */ + @Override public void set(String text) { // modification not supported throw new UnsupportedOperationException(); @@ -125,30 +115,22 @@ public class CopyOnWriteTextStore implements ITextStore { fModifiableTextStore= modifiableTextStore; } - /* - * @see org.eclipse.jface.text.ITextStore#get(int) - */ + @Override public char get(int offset) { return fTextStore.get(offset); } - /* - * @see org.eclipse.jface.text.ITextStore#get(int, int) - */ + @Override public String get(int offset, int length) { return fTextStore.get(offset, length); } - /* - * @see org.eclipse.jface.text.ITextStore#getLength() - */ + @Override public int getLength() { return fTextStore.getLength(); } - /* - * @see org.eclipse.jface.text.ITextStore#replace(int, int, java.lang.String) - */ + @Override public void replace(int offset, int length, String text) { if (fTextStore != fModifiableTextStore) { String content= fTextStore.get(0, fTextStore.getLength()); @@ -158,9 +140,7 @@ public class CopyOnWriteTextStore implements ITextStore { fTextStore.replace(offset, length, text); } - /* - * @see org.eclipse.jface.text.ITextStore#set(java.lang.String) - */ + @Override public void set(String text) { fTextStore= new StringTextStore(text); fModifiableTextStore.set(""); //$NON-NLS-1$ diff --git a/org.eclipse.text/src/org/eclipse/jface/text/DefaultLineTracker.java b/org.eclipse.text/src/org/eclipse/jface/text/DefaultLineTracker.java index b069c25cb23..8f801470d6f 100644 --- a/org.eclipse.text/src/org/eclipse/jface/text/DefaultLineTracker.java +++ b/org.eclipse.text/src/org/eclipse/jface/text/DefaultLineTracker.java @@ -35,16 +35,12 @@ public class DefaultLineTracker extends AbstractLineTracker { public DefaultLineTracker() { } - /* - * @see org.eclipse.jface.text.ILineTracker#getLegalLineDelimiters() - */ + @Override public String[] getLegalLineDelimiters() { return TextUtilities.copy(DELIMITERS); } - /* - * @see org.eclipse.jface.text.AbstractLineTracker#nextDelimiterInfo(java.lang.String, int) - */ + @Override protected DelimiterInfo nextDelimiterInfo(String text, int offset) { char ch; diff --git a/org.eclipse.text/src/org/eclipse/jface/text/DefaultPositionUpdater.java b/org.eclipse.text/src/org/eclipse/jface/text/DefaultPositionUpdater.java index c79124fdc87..e9de513d3ea 100644 --- a/org.eclipse.text/src/org/eclipse/jface/text/DefaultPositionUpdater.java +++ b/org.eclipse.text/src/org/eclipse/jface/text/DefaultPositionUpdater.java @@ -200,9 +200,7 @@ public class DefaultPositionUpdater implements IPositionUpdater { return true; } - /* - * @see org.eclipse.jface.text.IPositionUpdater#update(org.eclipse.jface.text.DocumentEvent) - */ + @Override public void update(DocumentEvent event) { try { diff --git a/org.eclipse.text/src/org/eclipse/jface/text/Document.java b/org.eclipse.text/src/org/eclipse/jface/text/Document.java index 6be4fb9a73d..1f9ba5a4e0e 100644 --- a/org.eclipse.text/src/org/eclipse/jface/text/Document.java +++ b/org.eclipse.text/src/org/eclipse/jface/text/Document.java @@ -65,10 +65,7 @@ public class Document extends AbstractDocument { completeInitialization(); } - /* - * @see org.eclipse.jface.text.IRepairableDocumentExtension#isLineInformationRepairNeeded(int, int, java.lang.String) - * @since 3.4 - */ + @Override public boolean isLineInformationRepairNeeded(int offset, int length, String text) throws BadLocationException { if ((0 > offset) || (0 > length) || (offset + length > getLength())) throw new BadLocationException(); diff --git a/org.eclipse.text/src/org/eclipse/jface/text/DocumentEvent.java b/org.eclipse.text/src/org/eclipse/jface/text/DocumentEvent.java index 2b6e563156a..57c54aa8da8 100644 --- a/org.eclipse.text/src/org/eclipse/jface/text/DocumentEvent.java +++ b/org.eclipse.text/src/org/eclipse/jface/text/DocumentEvent.java @@ -129,10 +129,7 @@ public class DocumentEvent { return fModificationStamp; } - /* - * @see java.lang.Object#toString() - * @since 3.4 - */ + @Override public String toString() { StringBuffer buffer= new StringBuffer(); buffer.append("offset: " ); //$NON-NLS-1$ diff --git a/org.eclipse.text/src/org/eclipse/jface/text/DocumentRewriteSession.java b/org.eclipse.text/src/org/eclipse/jface/text/DocumentRewriteSession.java index 478b3093dac..8787fbe4ccc 100644 --- a/org.eclipse.text/src/org/eclipse/jface/text/DocumentRewriteSession.java +++ b/org.eclipse.text/src/org/eclipse/jface/text/DocumentRewriteSession.java @@ -41,9 +41,7 @@ public class DocumentRewriteSession { return fSessionType; } - /* - * @see java.lang.Object#toString() - */ + @Override public String toString() { return new StringBuffer().append(hashCode()).toString(); } diff --git a/org.eclipse.text/src/org/eclipse/jface/text/FindReplaceDocumentAdapter.java b/org.eclipse.text/src/org/eclipse/jface/text/FindReplaceDocumentAdapter.java index 8ec45f3b142..101966307af 100644 --- a/org.eclipse.text/src/org/eclipse/jface/text/FindReplaceDocumentAdapter.java +++ b/org.eclipse.text/src/org/eclipse/jface/text/FindReplaceDocumentAdapter.java @@ -606,16 +606,12 @@ public class FindReplaceDocumentAdapter implements CharSequence { // ---------- CharSequence implementation ---------- - /* - * @see java.lang.CharSequence#length() - */ + @Override public int length() { return fDocument.getLength(); } - /* - * @see java.lang.CharSequence#charAt(int) - */ + @Override public char charAt(int index) { try { return fDocument.getChar(index); @@ -624,9 +620,7 @@ public class FindReplaceDocumentAdapter implements CharSequence { } } - /* - * @see java.lang.CharSequence#subSequence(int, int) - */ + @Override public CharSequence subSequence(int start, int end) { try { return fDocument.get(start, end - start); @@ -635,9 +629,7 @@ public class FindReplaceDocumentAdapter implements CharSequence { } } - /* - * @see java.lang.Object#toString() - */ + @Override public String toString() { return fDocument.get(); } diff --git a/org.eclipse.text/src/org/eclipse/jface/text/GapTextStore.java b/org.eclipse.text/src/org/eclipse/jface/text/GapTextStore.java index 4102107caae..2e886537c19 100644 --- a/org.eclipse.text/src/org/eclipse/jface/text/GapTextStore.java +++ b/org.eclipse.text/src/org/eclipse/jface/text/GapTextStore.java @@ -77,6 +77,7 @@ public class GapTextStore implements ITextStore { * (>= 0) * @deprecated use {@link GapTextStore#GapTextStore(int, int, float)} instead */ + @Deprecated public GapTextStore(int lowWatermark, int highWatermark) { /* * Legacy constructor. The API contract states that highWatermark is the upper bound for the @@ -137,9 +138,7 @@ public class GapTextStore implements ITextStore { fSizeMultiplier= 1 / (1 - maxGapFactor / 2); } - /* - * @see org.eclipse.jface.text.ITextStore#get(int) - */ + @Override public final char get(int offset) { if (offset < fGapStart) return fContent[offset]; @@ -147,9 +146,7 @@ public class GapTextStore implements ITextStore { return fContent[offset + gapSize()]; } - /* - * @see org.eclipse.jface.text.ITextStore#get(int, int) - */ + @Override public final String get(int offset, int length) { if (fGapStart <= offset) return new String(fContent, offset + gapSize() , length); @@ -165,16 +162,12 @@ public class GapTextStore implements ITextStore { return buf.toString(); } - /* - * @see org.eclipse.jface.text.ITextStore#getLength() - */ + @Override public final int getLength() { return fContent.length - gapSize(); } - /* - * @see org.eclipse.jface.text.ITextStore#set(java.lang.String) - */ + @Override public final void set(String text) { /* * Moves the gap to the end of the content. There is no sensible prediction of where the @@ -185,9 +178,7 @@ public class GapTextStore implements ITextStore { replace(0, getLength(), text); } - /* - * @see org.eclipse.jface.text.ITextStore#replace(int, int, java.lang.String) - */ + @Override public final void replace(int offset, int length, String text) { if (text == null) { adjustGap(offset, length, 0); diff --git a/org.eclipse.text/src/org/eclipse/jface/text/IDocument.java b/org.eclipse.text/src/org/eclipse/jface/text/IDocument.java index 32581aa0364..6c106405773 100644 --- a/org.eclipse.text/src/org/eclipse/jface/text/IDocument.java +++ b/org.eclipse.text/src/org/eclipse/jface/text/IDocument.java @@ -646,5 +646,6 @@ public interface IDocument { * @exception BadLocationException if startOffset is an invalid document offset * @deprecated as of 3.0 search is provided by {@link FindReplaceDocumentAdapter} */ + @Deprecated int search(int startOffset, String findString, boolean forwardSearch, boolean caseSensitive, boolean wholeWord) throws BadLocationException; } diff --git a/org.eclipse.text/src/org/eclipse/jface/text/IDocumentExtension.java b/org.eclipse.text/src/org/eclipse/jface/text/IDocumentExtension.java index f66feac19e2..804d17fa32e 100644 --- a/org.eclipse.text/src/org/eclipse/jface/text/IDocumentExtension.java +++ b/org.eclipse.text/src/org/eclipse/jface/text/IDocumentExtension.java @@ -79,6 +79,7 @@ public interface IDocumentExtension { * @param normalize <code>true</code> if performed from the start to the end of the document * @deprecated since 3.1. Use {@link IDocumentExtension4#startRewriteSession(DocumentRewriteSessionType)} instead. */ + @Deprecated void startSequentialRewrite(boolean normalize); /** @@ -86,5 +87,6 @@ public interface IDocumentExtension { * has only any effect if <code>startSequentialRewrite</code> has been called before. * @deprecated since 3.1. Use {@link IDocumentExtension4#stopRewriteSession(DocumentRewriteSession)} instead. */ + @Deprecated void stopSequentialRewrite(); } diff --git a/org.eclipse.text/src/org/eclipse/jface/text/Line.java b/org.eclipse.text/src/org/eclipse/jface/text/Line.java index 0f810df505d..9e1dd7a4f0b 100644 --- a/org.eclipse.text/src/org/eclipse/jface/text/Line.java +++ b/org.eclipse.text/src/org/eclipse/jface/text/Line.java @@ -50,16 +50,12 @@ final class Line implements IRegion { this.delimiter= null; } - /* - * @see org.eclipse.jface.text.IRegion#getOffset() - */ + @Override public int getOffset() { return offset; } - /* - * @see org.eclipse.jface.text.IRegion#getLength() - */ + @Override public int getLength() { return length; } diff --git a/org.eclipse.text/src/org/eclipse/jface/text/ListLineTracker.java b/org.eclipse.text/src/org/eclipse/jface/text/ListLineTracker.java index 591c2492d48..11fcf70c977 100644 --- a/org.eclipse.text/src/org/eclipse/jface/text/ListLineTracker.java +++ b/org.eclipse.text/src/org/eclipse/jface/text/ListLineTracker.java @@ -116,9 +116,7 @@ abstract class ListLineTracker implements ILineTracker { return getLineNumberOfOffset(target) - startLine + 1; } - /* - * @see org.eclipse.jface.text.ILineTracker#getLineLength(int) - */ + @Override public final int getLineLength(int line) throws BadLocationException { int lines= fLines.size(); @@ -132,9 +130,7 @@ abstract class ListLineTracker implements ILineTracker { return l.length; } - /* - * @see org.eclipse.jface.text.ILineTracker#getLineNumberOfOffset(int) - */ + @Override public final int getLineNumberOfOffset(int position) throws BadLocationException { if (position < 0 || position > fTextLength) throw new BadLocationException(); @@ -152,9 +148,7 @@ abstract class ListLineTracker implements ILineTracker { return findLine(position); } - /* - * @see org.eclipse.jface.text.ILineTracker#getLineInformationOfOffset(int) - */ + @Override public final IRegion getLineInformationOfOffset(int position) throws BadLocationException { if (position > fTextLength) throw new BadLocationException(); @@ -170,9 +164,7 @@ abstract class ListLineTracker implements ILineTracker { return getLineInformation(findLine(position)); } - /* - * @see org.eclipse.jface.text.ILineTracker#getLineInformation(int) - */ + @Override public final IRegion getLineInformation(int line) throws BadLocationException { int lines= fLines.size(); @@ -191,9 +183,7 @@ abstract class ListLineTracker implements ILineTracker { return (l.delimiter != null ? new Line(l.offset, l.length - l.delimiter.length()) : l); } - /* - * @see org.eclipse.jface.text.ILineTracker#getLineOffset(int) - */ + @Override public final int getLineOffset(int line) throws BadLocationException { int lines= fLines.size(); @@ -214,9 +204,7 @@ abstract class ListLineTracker implements ILineTracker { return l.offset; } - /* - * @see org.eclipse.jface.text.ILineTracker#getNumberOfLines() - */ + @Override public final int getNumberOfLines() { int lines= fLines.size(); @@ -227,9 +215,7 @@ abstract class ListLineTracker implements ILineTracker { return (l.delimiter != null ? lines + 1 : lines); } - /* - * @see org.eclipse.jface.text.ILineTracker#getNumberOfLines(int, int) - */ + @Override public final int getNumberOfLines(int position, int length) throws BadLocationException { if (position < 0 || position + length > fTextLength) @@ -241,9 +227,7 @@ abstract class ListLineTracker implements ILineTracker { return getNumberOfLines(getLineNumberOfOffset(position), position, length); } - /* - * @see org.eclipse.jface.text.ILineTracker#computeNumberOfLines(java.lang.String) - */ + @Override public final int computeNumberOfLines(String text) { int count= 0; int start= 0; @@ -256,9 +240,7 @@ abstract class ListLineTracker implements ILineTracker { return count; } - /* - * @see org.eclipse.jface.text.ILineTracker#getLineDelimiter(int) - */ + @Override public final String getLineDelimiter(int line) throws BadLocationException { int lines= fLines.size(); @@ -331,16 +313,12 @@ abstract class ListLineTracker implements ILineTracker { return count; } - /* - * @see org.eclipse.jface.text.ILineTracker#replace(int, int, java.lang.String) - */ + @Override public final void replace(int position, int length, String text) throws BadLocationException { throw new UnsupportedOperationException(); } - /* - * @see org.eclipse.jface.text.ILineTracker#set(java.lang.String) - */ + @Override public final void set(String text) { fLines.clear(); if (text != null) { diff --git a/org.eclipse.text/src/org/eclipse/jface/text/Position.java b/org.eclipse.text/src/org/eclipse/jface/text/Position.java index 98c2ff79060..12f36e458e1 100644 --- a/org.eclipse.text/src/org/eclipse/jface/text/Position.java +++ b/org.eclipse.text/src/org/eclipse/jface/text/Position.java @@ -71,9 +71,7 @@ public class Position { protected Position() { } - /* - * @see java.lang.Object#hashCode() - */ + @Override public int hashCode() { int deleted= isDeleted ? 0 : 1; return (offset << 24) | (length << 16) | deleted; @@ -95,9 +93,7 @@ public class Position { isDeleted= false; } - /* - * @see java.lang.Object#equals(java.lang.Object) - */ + @Override public boolean equals(Object other) { if (other instanceof Position) { Position rp= (Position) other; @@ -196,10 +192,7 @@ public class Position { this.offset= offset; } - /* - * @see java.lang.Object#toString() - * @since 3.5 - */ + @Override public String toString() { String position= "offset: " + offset + ", length: " + length; //$NON-NLS-1$//$NON-NLS-2$ return isDeleted ? position + " (deleted)" : position; //$NON-NLS-1$ diff --git a/org.eclipse.text/src/org/eclipse/jface/text/Region.java b/org.eclipse.text/src/org/eclipse/jface/text/Region.java index c5b97357739..ac1f93141bf 100644 --- a/org.eclipse.text/src/org/eclipse/jface/text/Region.java +++ b/org.eclipse.text/src/org/eclipse/jface/text/Region.java @@ -32,23 +32,17 @@ public class Region implements IRegion { fLength= length; } - /* - * @see org.eclipse.jface.text.IRegion#getLength() - */ + @Override public int getLength() { return fLength; } - /* - * @see org.eclipse.jface.text.IRegion#getOffset() - */ + @Override public int getOffset() { return fOffset; } - /* - * @see java.lang.Object#equals(java.lang.Object) - */ + @Override public boolean equals(Object o) { if (o instanceof IRegion) { IRegion r= (IRegion) o; @@ -57,16 +51,12 @@ public class Region implements IRegion { return false; } - /* - * @see java.lang.Object#hashCode() - */ + @Override public int hashCode() { return (fOffset << 24) | (fLength << 16); } - /* - * @see java.lang.Object#toString() - */ + @Override public String toString() { return "offset: " + fOffset + ", length: " + fLength; //$NON-NLS-1$ //$NON-NLS-2$; } diff --git a/org.eclipse.text/src/org/eclipse/jface/text/RewriteSessionEditProcessor.java b/org.eclipse.text/src/org/eclipse/jface/text/RewriteSessionEditProcessor.java index 06e02a096fe..86550d63519 100644 --- a/org.eclipse.text/src/org/eclipse/jface/text/RewriteSessionEditProcessor.java +++ b/org.eclipse.text/src/org/eclipse/jface/text/RewriteSessionEditProcessor.java @@ -36,26 +36,31 @@ public final class RewriteSessionEditProcessor extends TextEditProcessor { private static final class SizeVisitor extends TextEditVisitor { int fSize= 0; + @Override public boolean visit(CopyTargetEdit edit) { fSize += edit.getLength(); return super.visit(edit); } + @Override public boolean visit(DeleteEdit edit) { fSize += edit.getLength(); return super.visit(edit); } + @Override public boolean visit(InsertEdit edit) { fSize += edit.getText().length(); return super.visit(edit); } + @Override public boolean visit(MoveTargetEdit edit) { fSize += edit.getLength(); return super.visit(edit); } + @Override public boolean visit(ReplaceEdit edit) { fSize += Math.max(edit.getLength(), edit.getText().length()); return super.visit(edit); @@ -76,9 +81,7 @@ public final class RewriteSessionEditProcessor extends TextEditProcessor { super(document, root, style); } - /* - * @see org.eclipse.text.edits.TextEditProcessor#performEdits() - */ + @Override public UndoEdit performEdits() throws MalformedTreeException, BadLocationException { IDocument document= getDocument(); if (!(document instanceof IDocumentExtension4)) diff --git a/org.eclipse.text/src/org/eclipse/jface/text/SequentialRewriteTextStore.java b/org.eclipse.text/src/org/eclipse/jface/text/SequentialRewriteTextStore.java index e7b8e5fb00b..3c26c5de467 100644 --- a/org.eclipse.text/src/org/eclipse/jface/text/SequentialRewriteTextStore.java +++ b/org.eclipse.text/src/org/eclipse/jface/text/SequentialRewriteTextStore.java @@ -24,6 +24,7 @@ import java.util.LinkedList; * @since 2.0 * @deprecated since 3.3 as {@link GapTextStore} performs better even for sequential rewrite scenarios */ +@Deprecated public class SequentialRewriteTextStore implements ITextStore { /** @@ -71,9 +72,7 @@ public class SequentialRewriteTextStore implements ITextStore { return fSource; } - /* - * @see org.eclipse.jface.text.ITextStore#replace(int, int, java.lang.String) - */ + @Override public void replace(int offset, int length, String text) { if (text == null) text= ""; //$NON-NLS-1$ @@ -112,17 +111,13 @@ public class SequentialRewriteTextStore implements ITextStore { } } - /* - * @see org.eclipse.jface.text.ITextStore#set(java.lang.String) - */ + @Override public void set(String text) { fSource.set(text); fReplaceList.clear(); } - /* - * @see org.eclipse.jface.text.ITextStore#get(int, int) - */ + @Override public String get(int offset, int length) { if (fReplaceList.isEmpty()) @@ -182,9 +177,7 @@ public class SequentialRewriteTextStore implements ITextStore { return replace.newOffset - replace.offset + replace.text.length() - replace.length; } - /* - * @see org.eclipse.jface.text.ITextStore#get(int) - */ + @Override public char get(int offset) { if (fReplaceList.isEmpty()) return fSource.get(offset); @@ -223,9 +216,7 @@ public class SequentialRewriteTextStore implements ITextStore { } } - /* - * @see org.eclipse.jface.text.ITextStore#getLength() - */ + @Override public int getLength() { if (fReplaceList.isEmpty()) return fSource.getLength(); diff --git a/org.eclipse.text/src/org/eclipse/jface/text/TextUtilities.java b/org.eclipse.text/src/org/eclipse/jface/text/TextUtilities.java index b30eef61bc1..64fcf4c94c7 100644 --- a/org.eclipse.text/src/org/eclipse/jface/text/TextUtilities.java +++ b/org.eclipse.text/src/org/eclipse/jface/text/TextUtilities.java @@ -41,6 +41,7 @@ public class TextUtilities { * * @deprecated use DELIMITERS instead */ + @Deprecated public final static String[] fgDelimiters= DELIMITERS; diff --git a/org.eclipse.text/src/org/eclipse/jface/text/TreeLineTracker.java b/org.eclipse.text/src/org/eclipse/jface/text/TreeLineTracker.java index e25c1e00164..faede932120 100755 --- a/org.eclipse.text/src/org/eclipse/jface/text/TreeLineTracker.java +++ b/org.eclipse.text/src/org/eclipse/jface/text/TreeLineTracker.java @@ -118,9 +118,7 @@ abstract class TreeLineTracker implements ILineTracker { /** The balance factor. */ byte balance; - /* - * @see java.lang.Object#toString() - */ + @Override public final String toString() { String bal; switch (balance) { @@ -593,9 +591,7 @@ abstract class TreeLineTracker implements ILineTracker { } } - /* - * @see org.eclipse.jface.text.ILineTracker#replace(int, int, java.lang.String) - */ + @Override public final void replace(int offset, int length, String text) throws BadLocationException { if (ASSERT) checkTree(); @@ -1065,17 +1061,13 @@ abstract class TreeLineTracker implements ILineTracker { */ protected abstract DelimiterInfo nextDelimiterInfo(String text, int offset); - /* - * @see org.eclipse.jface.text.ILineTracker#getLineDelimiter(int) - */ + @Override public final String getLineDelimiter(int line) throws BadLocationException { Node node= nodeByLine(line); return node.delimiter == NO_DELIM ? null : node.delimiter; } - /* - * @see org.eclipse.jface.text.ILineTracker#computeNumberOfLines(java.lang.String) - */ + @Override public final int computeNumberOfLines(String text) { int count= 0; int start= 0; @@ -1088,9 +1080,7 @@ abstract class TreeLineTracker implements ILineTracker { return count; } - /* - * @see org.eclipse.jface.text.ILineTracker#getNumberOfLines() - */ + @Override public final int getNumberOfLines() { // TODO track separately? Node node= fRoot; @@ -1102,9 +1092,7 @@ abstract class TreeLineTracker implements ILineTracker { return lines; } - /* - * @see org.eclipse.jface.text.ILineTracker#getNumberOfLines(int, int) - */ + @Override public final int getNumberOfLines(int offset, int length) throws BadLocationException { if (length == 0) return 1; @@ -1115,31 +1103,23 @@ abstract class TreeLineTracker implements ILineTracker { return endLine - startLine + 1; } - /* - * @see org.eclipse.jface.text.ILineTracker#getLineOffset(int) - */ + @Override public final int getLineOffset(int line) throws BadLocationException { return offsetByLine(line); } - /* - * @see org.eclipse.jface.text.ILineTracker#getLineLength(int) - */ + @Override public final int getLineLength(int line) throws BadLocationException { Node node= nodeByLine(line); return node.length; } - /* - * @see org.eclipse.jface.text.ILineTracker#getLineNumberOfOffset(int) - */ + @Override public final int getLineNumberOfOffset(int offset) throws BadLocationException { return lineByOffset(offset); } - /* - * @see org.eclipse.jface.text.ILineTracker#getLineInformationOfOffset(int) - */ + @Override public final IRegion getLineInformationOfOffset(final int offset) throws BadLocationException { // Inline nodeByOffset start as we need both node and offset int remaining= offset; @@ -1167,9 +1147,7 @@ abstract class TreeLineTracker implements ILineTracker { return new Region(lineOffset, node.pureLength()); } - /* - * @see org.eclipse.jface.text.ILineTracker#getLineInformation(int) - */ + @Override public final IRegion getLineInformation(int line) throws BadLocationException { try { // Inline nodeByLine start @@ -1233,9 +1211,7 @@ abstract class TreeLineTracker implements ILineTracker { } } - /* - * @see org.eclipse.jface.text.ILineTracker#set(java.lang.String) - */ + @Override public final void set(String text) { fRoot= new Node(0, NO_DELIM); try { @@ -1245,9 +1221,7 @@ abstract class TreeLineTracker implements ILineTracker { } } - /* - * @see java.lang.Object#toString() - */ + @Override public String toString() { int depth= computeDepth(fRoot); int WIDTH= 30; diff --git a/org.eclipse.text/src/org/eclipse/jface/text/TypedPosition.java b/org.eclipse.text/src/org/eclipse/jface/text/TypedPosition.java index a0cf55c43e4..420d62557c5 100644 --- a/org.eclipse.text/src/org/eclipse/jface/text/TypedPosition.java +++ b/org.eclipse.text/src/org/eclipse/jface/text/TypedPosition.java @@ -55,9 +55,7 @@ public class TypedPosition extends Position { return fType; } - /* - * @see java.lang.Object#equals(java.lang.Object) - */ + @Override public boolean equals(Object o) { if (o instanceof TypedPosition) { if (super.equals(o)) { @@ -68,18 +66,13 @@ public class TypedPosition extends Position { return false; } - /* - * @see java.lang.Object#hashCode() - */ + @Override public int hashCode() { int type= fType == null ? 0 : fType.hashCode(); return super.hashCode() | type; } - /* - * @see org.eclipse.jface.text.Region#toString() - * @since 3.5 - */ + @Override public String toString() { return fType + " - " + super.toString(); //$NON-NLS-1$ } diff --git a/org.eclipse.text/src/org/eclipse/jface/text/TypedRegion.java b/org.eclipse.text/src/org/eclipse/jface/text/TypedRegion.java index 189d4913c3c..85962a36c6c 100644 --- a/org.eclipse.text/src/org/eclipse/jface/text/TypedRegion.java +++ b/org.eclipse.text/src/org/eclipse/jface/text/TypedRegion.java @@ -32,16 +32,12 @@ public class TypedRegion extends Region implements ITypedRegion { fType= type; } - /* - * @see org.eclipse.jface.text.ITypedRegion#getType() - */ + @Override public String getType() { return fType; } - /* - * @see java.lang.Object#equals(java.lang.Object) - */ + @Override public boolean equals(Object o) { if (o instanceof TypedRegion) { TypedRegion r= (TypedRegion) o; @@ -50,18 +46,13 @@ public class TypedRegion extends Region implements ITypedRegion { return false; } - /* - * @see java.lang.Object#hashCode() - */ + @Override public int hashCode() { int type= fType == null ? 0 : fType.hashCode(); return super.hashCode() | type; } - /* - * @see org.eclipse.jface.text.Region#toString() - * @since 3.5 - */ + @Override public String toString() { return fType + " - " + super.toString(); //$NON-NLS-1$ } diff --git a/org.eclipse.text/src/org/eclipse/jface/text/link/InclusivePositionUpdater.java b/org.eclipse.text/src/org/eclipse/jface/text/link/InclusivePositionUpdater.java index c785eaa960e..9bb54abe265 100644 --- a/org.eclipse.text/src/org/eclipse/jface/text/link/InclusivePositionUpdater.java +++ b/org.eclipse.text/src/org/eclipse/jface/text/link/InclusivePositionUpdater.java @@ -38,9 +38,7 @@ public class InclusivePositionUpdater implements IPositionUpdater { fCategory= category; } - /* - * @see org.eclipse.jface.text.IPositionUpdater#update(org.eclipse.jface.text.DocumentEvent) - */ + @Override public void update(DocumentEvent event) { int eventOffset= event.getOffset(); diff --git a/org.eclipse.text/src/org/eclipse/jface/text/link/LinkedModeManager.java b/org.eclipse.text/src/org/eclipse/jface/text/link/LinkedModeManager.java index 16af314a0c3..d91f4a119ed 100644 --- a/org.eclipse.text/src/org/eclipse/jface/text/link/LinkedModeManager.java +++ b/org.eclipse.text/src/org/eclipse/jface/text/link/LinkedModeManager.java @@ -37,23 +37,17 @@ class LinkedModeManager { */ private class Listener implements ILinkedModeListener { - /* - * @see org.eclipse.jdt.internal.ui.text.link2.LinkedModeModel.ILinkedModeListener#left(org.eclipse.jdt.internal.ui.text.link2.LinkedModeModel, int) - */ + @Override public void left(LinkedModeModel model, int flags) { LinkedModeManager.this.left(model, flags); } - /* - * @see org.eclipse.jdt.internal.ui.text.link2.LinkedModeModel.ILinkedModeListener#suspend(org.eclipse.jdt.internal.ui.text.link2.LinkedModeModel) - */ + @Override public void suspend(LinkedModeModel model) { // not interested } - /* - * @see org.eclipse.jdt.internal.ui.text.link2.LinkedModeModel.ILinkedModeListener#resume(org.eclipse.jdt.internal.ui.text.link2.LinkedModeModel, int) - */ + @Override public void resume(LinkedModeModel model, int flags) { // not interested } diff --git a/org.eclipse.text/src/org/eclipse/jface/text/link/LinkedModeModel.java b/org.eclipse.text/src/org/eclipse/jface/text/link/LinkedModeModel.java index f85439bf063..d6ad8897ef9 100644 --- a/org.eclipse.text/src/org/eclipse/jface/text/link/LinkedModeModel.java +++ b/org.eclipse.text/src/org/eclipse/jface/text/link/LinkedModeModel.java @@ -143,9 +143,7 @@ public class LinkedModeModel { fEdit= edit; } - /* - * @see org.eclipse.jface.text.IDocumentExtension.IReplace#perform(org.eclipse.jface.text.IDocument, org.eclipse.jface.text.IDocumentListener) - */ + @Override public void perform(IDocument document, IDocumentListener owner) throws RuntimeException, MalformedTreeException { document.removeDocumentListener(owner); fIsChanging= true; @@ -178,6 +176,7 @@ public class LinkedModeModel { * * @param event {@inheritDoc} */ + @Override public void documentAboutToBeChanged(DocumentEvent event) { // don't react on changes executed by the parent model if (fParentEnvironment != null && fParentEnvironment.isChanging()) @@ -197,6 +196,7 @@ public class LinkedModeModel { * * @param event {@inheritDoc} */ + @Override public void documentChanged(DocumentEvent event) { if (fExit) { LinkedModeModel.this.exit(ILinkedModeListener.EXTERNAL_MODIFICATION); diff --git a/org.eclipse.text/src/org/eclipse/jface/text/link/LinkedPosition.java b/org.eclipse.text/src/org/eclipse/jface/text/link/LinkedPosition.java index 4d3ddbc3d87..079ff6177c1 100644 --- a/org.eclipse.text/src/org/eclipse/jface/text/link/LinkedPosition.java +++ b/org.eclipse.text/src/org/eclipse/jface/text/link/LinkedPosition.java @@ -65,9 +65,7 @@ public class LinkedPosition extends Position { return fDocument; } - /* - * @see org.eclipse.jface.text.Position#equals(java.lang.Object) - */ + @Override public boolean equals(Object other) { if (other instanceof LinkedPosition) { LinkedPosition p= (LinkedPosition) other; @@ -118,6 +116,7 @@ public class LinkedPosition extends Position { * @return <code>true</code> if <code>pOffset</code> is in * <code>[offset, offset + length]</code> */ + @Override public boolean includes(int pOffset) { return this.offset <= pOffset && pOffset <= this.offset + this.length; } @@ -169,9 +168,7 @@ public class LinkedPosition extends Position { fSequenceNumber= sequence; } - /* - * @see org.eclipse.jface.text.Position#hashCode() - */ + @Override public int hashCode() { return fDocument.hashCode() | super.hashCode() | fSequenceNumber; } diff --git a/org.eclipse.text/src/org/eclipse/jface/text/link/LinkedPositionGroup.java b/org.eclipse.text/src/org/eclipse/jface/text/link/LinkedPositionGroup.java index a2c10a401c0..9c8450d316a 100644 --- a/org.eclipse.text/src/org/eclipse/jface/text/link/LinkedPositionGroup.java +++ b/org.eclipse.text/src/org/eclipse/jface/text/link/LinkedPositionGroup.java @@ -407,6 +407,7 @@ public class LinkedPositionGroup { * @return <code>true</code> if this group is empty, <code>false</code> otherwise * @deprecated As of 3.1, replaced by {@link #isEmpty()} */ + @Deprecated public boolean isEmtpy() { return isEmpty(); } diff --git a/org.eclipse.text/src/org/eclipse/jface/text/source/AnnotationMap.java b/org.eclipse.text/src/org/eclipse/jface/text/source/AnnotationMap.java index 4cf6c1642e7..490083414c3 100644 --- a/org.eclipse.text/src/org/eclipse/jface/text/source/AnnotationMap.java +++ b/org.eclipse.text/src/org/eclipse/jface/text/source/AnnotationMap.java @@ -49,142 +49,110 @@ class AnnotationMap implements IAnnotationMap { fInternalMap= new HashMap(capacity); } - /* - * @see org.eclipse.jface.text.source.ISynchronizable#setLockObject(java.lang.Object) - */ - public synchronized void setLockObject(Object lockObject) { + @Override + public synchronized void setLockObject(Object lockObject) { fLockObject= lockObject; } - /* - * @see org.eclipse.jface.text.source.ISynchronizable#getLockObject() - */ - public synchronized Object getLockObject() { + @Override + public synchronized Object getLockObject() { if (fLockObject == null) return fInternalLockObject; return fLockObject; } - /* - * @see org.eclipse.jface.text.source.IAnnotationMap#valuesIterator() - */ - public Iterator valuesIterator() { + @Override + public Iterator valuesIterator() { synchronized (getLockObject()) { return new ArrayList(fInternalMap.values()).iterator(); } } - /* - * @see org.eclipse.jface.text.source.IAnnotationMap#keySetIterator() - */ - public Iterator keySetIterator() { + @Override + public Iterator keySetIterator() { synchronized (getLockObject()) { return new ArrayList(fInternalMap.keySet()).iterator(); } } - /* - * @see java.util.Map#containsKey(java.lang.Object) - */ - public boolean containsKey(Object annotation) { + @Override + public boolean containsKey(Object annotation) { synchronized (getLockObject()) { return fInternalMap.containsKey(annotation); } } - /* - * @see java.util.Map#put(java.lang.Object, java.lang.Object) - */ - public Object put(Object annotation, Object position) { + @Override + public Object put(Object annotation, Object position) { synchronized (getLockObject()) { return fInternalMap.put(annotation, position); } } - /* - * @see java.util.Map#get(java.lang.Object) - */ - public Object get(Object annotation) { + @Override + public Object get(Object annotation) { synchronized (getLockObject()) { return fInternalMap.get(annotation); } } - /* - * @see java.util.Map#clear() - */ - public void clear() { + @Override + public void clear() { synchronized (getLockObject()) { fInternalMap.clear(); } } - /* - * @see java.util.Map#remove(java.lang.Object) - */ - public Object remove(Object annotation) { + @Override + public Object remove(Object annotation) { synchronized (getLockObject()) { return fInternalMap.remove(annotation); } } - /* - * @see java.util.Map#size() - */ - public int size() { + @Override + public int size() { synchronized (getLockObject()) { return fInternalMap.size(); } } - /* - * @see java.util.Map#isEmpty() - */ - public boolean isEmpty() { + @Override + public boolean isEmpty() { synchronized (getLockObject()) { return fInternalMap.isEmpty(); } } - /* - * @see java.util.Map#containsValue(java.lang.Object) - */ + @Override public boolean containsValue(Object value) { synchronized(getLockObject()) { return fInternalMap.containsValue(value); } } - /* - * @see java.util.Map#putAll(java.util.Map) - */ + @Override public void putAll(Map map) { synchronized (getLockObject()) { fInternalMap.putAll(map); } } - /* - * @see IAnnotationMap#entrySet() - */ + @Override public Set entrySet() { synchronized (getLockObject()) { return fInternalMap.entrySet(); } } - /* - * @see IAnnotationMap#keySet() - */ + @Override public Set keySet() { synchronized (getLockObject()) { return fInternalMap.keySet(); } } - /* - * @see IAnnotationMap#values() - */ + @Override public Collection values() { synchronized (getLockObject()) { return fInternalMap.values(); diff --git a/org.eclipse.text/src/org/eclipse/jface/text/source/AnnotationModel.java b/org.eclipse.text/src/org/eclipse/jface/text/source/AnnotationModel.java index b23cc3a6960..3631aee4f0d 100644 --- a/org.eclipse.text/src/org/eclipse/jface/text/source/AnnotationModel.java +++ b/org.eclipse.text/src/org/eclipse/jface/text/source/AnnotationModel.java @@ -83,16 +83,12 @@ public class AnnotationModel implements IAnnotationModel, IAnnotationModelExtens fNext= findNext(); } - /* - * @see java.util.Iterator#hasNext() - */ + @Override public boolean hasNext() { return fNext != null; } - /* - * @see java.util.Iterator#next() - */ + @Override public Object next() { if (!hasNext()) throw new NoSuchElementException(); @@ -102,9 +98,7 @@ public class AnnotationModel implements IAnnotationModel, IAnnotationModelExtens return result; } - /* - * @see java.util.Iterator#remove() - */ + @Override public void remove() { throw new UnsupportedOperationException(); } @@ -158,25 +152,19 @@ public class AnnotationModel implements IAnnotationModel, IAnnotationModelExtens fNext= findNext(); } - /* (non-Javadoc) - * @see java.util.Iterator#hasNext() - */ + @Override public boolean hasNext() { return fNext != null; } - /* (non-Javadoc) - * @see java.util.Iterator#next() - */ + @Override public Object next() { Object result= fNext; fNext= findNext(); return result; } - /* (non-Javadoc) - * @see java.util.Iterator#remove() - */ + @Override public void remove() { throw new UnsupportedOperationException(); } @@ -213,10 +201,12 @@ public class AnnotationModel implements IAnnotationModel, IAnnotationModelExtens fCurrent= (Iterator) fSuperIterator.next(); // there is at least one. } + @Override public void remove() { throw new UnsupportedOperationException(); } + @Override public boolean hasNext() { if (fCurrentElement != null) return true; @@ -231,6 +221,7 @@ public class AnnotationModel implements IAnnotationModel, IAnnotationModelExtens return false; } + @Override public Object next() { if (!hasNext()) throw new NoSuchElementException(); @@ -249,16 +240,12 @@ public class AnnotationModel implements IAnnotationModel, IAnnotationModelExtens */ private class InternalModelListener implements IAnnotationModelListener, IAnnotationModelListenerExtension { - /* - * @see org.eclipse.jface.text.source.IAnnotationModelListener#modelChanged(org.eclipse.jface.text.source.IAnnotationModel) - */ + @Override public void modelChanged(IAnnotationModel model) { AnnotationModel.this.fireModelChanged(new AnnotationModelEvent(model, true)); } - /* - * @see org.eclipse.jface.text.source.IAnnotationModelListenerExtension#modelChanged(org.eclipse.jface.text.source.AnnotationModelEvent) - */ + @Override public void modelChanged(AnnotationModelEvent event) { AnnotationModel.this.fireModelChanged(event); } @@ -268,6 +255,7 @@ public class AnnotationModel implements IAnnotationModel, IAnnotationModelExtens * The list of managed annotations * @deprecated since 3.0 use <code>getAnnotationMap</code> instead */ + @Deprecated protected Map fAnnotations; /** * The map which maps {@link Position} to {@link Annotation}. @@ -316,9 +304,11 @@ public class AnnotationModel implements IAnnotationModel, IAnnotationModelExtens fDocumentListener= new IDocumentListener() { + @Override public void documentAboutToBeChanged(DocumentEvent event) { } + @Override public void documentChanged(DocumentEvent event) { fDocumentChanged= true; } @@ -335,19 +325,13 @@ public class AnnotationModel implements IAnnotationModel, IAnnotationModelExtens return (IAnnotationMap) fAnnotations; } - /* - * @see org.eclipse.jface.text.ISynchronizable#getLockObject() - * @since 3.0 - */ - public Object getLockObject() { + @Override + public Object getLockObject() { return getAnnotationMap().getLockObject(); } - /* - * @see org.eclipse.jface.text.ISynchronizable#setLockObject(java.lang.Object) - * @since 3.0 - */ - public void setLockObject(Object lockObject) { + @Override + public void setLockObject(Object lockObject) { getAnnotationMap().setLockObject(lockObject); } @@ -369,9 +353,7 @@ public class AnnotationModel implements IAnnotationModel, IAnnotationModelExtens } } - /* - * @see org.eclipse.jface.text.source.IAnnotationModel#addAnnotation(org.eclipse.jface.text.source.Annotation, org.eclipse.jface.text.Position) - */ + @Override public void addAnnotation(Annotation annotation, Position position) { try { addAnnotation(annotation, position, true); @@ -380,10 +362,7 @@ public class AnnotationModel implements IAnnotationModel, IAnnotationModelExtens } } - /* - * @see org.eclipse.jface.text.source.IAnnotationModelExtension#replaceAnnotations(org.eclipse.jface.text.source.Annotation[], java.util.Map) - * @since 3.0 - */ + @Override public void replaceAnnotations(Annotation[] annotationsToRemove, Map annotationsToAdd) { try { replaceAnnotations(annotationsToRemove, annotationsToAdd, true); @@ -450,9 +429,7 @@ public class AnnotationModel implements IAnnotationModel, IAnnotationModelExtens } } - /* - * @see org.eclipse.jface.text.source.IAnnotationModel#addAnnotationModelListener(org.eclipse.jface.text.source.IAnnotationModelListener) - */ + @Override public void addAnnotationModelListener(IAnnotationModelListener listener) { if (!fAnnotationModelListeners.contains(listener)) { fAnnotationModelListeners.add(listener); @@ -493,9 +470,7 @@ public class AnnotationModel implements IAnnotationModel, IAnnotationModelExtens document.removePosition(position); } - /* - * @see org.eclipse.jface.text.source.IAnnotationModel#connect(org.eclipse.jface.text.IDocument) - */ + @Override public void connect(IDocument document) { Assert.isTrue(fDocument == null || fDocument == document); @@ -536,9 +511,7 @@ public class AnnotationModel implements IAnnotationModel, IAnnotationModelExtens protected void disconnected() { } - /* - * @see org.eclipse.jface.text.source.IAnnotationModel#disconnect(org.eclipse.jface.text.IDocument) - */ + @Override public void disconnect(IDocument document) { Assert.isTrue(fDocument == document); @@ -675,6 +648,7 @@ public class AnnotationModel implements IAnnotationModel, IAnnotationModelExtens synchronized (getLockObject()) { if (fModelEvent != null) new Thread() { + @Override public void run() { fireModelChanged(); } @@ -685,9 +659,7 @@ public class AnnotationModel implements IAnnotationModel, IAnnotationModelExtens } } - /* - * @see org.eclipse.jface.text.source.IAnnotationModel#getAnnotationIterator() - */ + @Override public Iterator getAnnotationIterator() { return getAnnotationIterator(true, true); } @@ -697,6 +669,7 @@ public class AnnotationModel implements IAnnotationModel, IAnnotationModelExtens * * @since 3.4 */ + @Override public Iterator getAnnotationIterator(int offset, int length, boolean canStartBefore, boolean canEndAfter) { Iterator regionIterator= getRegionAnnotationIterator(offset, length, canStartBefore, canEndAfter); @@ -784,9 +757,7 @@ public class AnnotationModel implements IAnnotationModel, IAnnotationModelExtens return getAnnotationMap().keySetIterator(); } - /* - * @see org.eclipse.jface.text.source.IAnnotationModel#getPosition(org.eclipse.jface.text.source.Annotation) - */ + @Override public Position getPosition(Annotation annotation) { Position position= (Position) fAnnotations.get(annotation); if (position != null) @@ -798,10 +769,7 @@ public class AnnotationModel implements IAnnotationModel, IAnnotationModelExtens return position; } - /* - * @see org.eclipse.jface.text.source.IAnnotationModelExtension#removeAllAnnotations() - * @since 3.0 - */ + @Override public void removeAllAnnotations() { removeAllAnnotations(true); } @@ -834,9 +802,7 @@ public class AnnotationModel implements IAnnotationModel, IAnnotationModelExtens fireModelChanged(); } - /* - * @see org.eclipse.jface.text.source.IAnnotationModel#removeAnnotation(org.eclipse.jface.text.source.Annotation) - */ + @Override public void removeAnnotation(Annotation annotation) { removeAnnotation(annotation, true); } @@ -869,10 +835,7 @@ public class AnnotationModel implements IAnnotationModel, IAnnotationModelExtens } } - /* - * @see org.eclipse.jface.text.source.IAnnotationModelExtension#modifyAnnotationPosition(org.eclipse.jface.text.source.Annotation, org.eclipse.jface.text.Position) - * @since 3.0 - */ + @Override public void modifyAnnotationPosition(Annotation annotation, Position position) { modifyAnnotationPosition(annotation, position, true); } @@ -947,9 +910,7 @@ public class AnnotationModel implements IAnnotationModel, IAnnotationModelExtens } } - /* - * @see IAnnotationModel#removeAnnotationModelListener(IAnnotationModelListener) - */ + @Override public void removeAnnotationModelListener(IAnnotationModelListener listener) { fAnnotationModelListeners.remove(listener); } @@ -958,6 +919,7 @@ public class AnnotationModel implements IAnnotationModel, IAnnotationModelExtens * @see org.eclipse.jface.text.source.IAnnotationModelExtension#attach(java.lang.Object, java.lang.Object) * @since 3.0 */ + @Override public void addAnnotationModel(Object key, IAnnotationModel attachment) { Assert.isNotNull(attachment); if (!fAttachments.containsValue(attachment)) { @@ -972,6 +934,7 @@ public class AnnotationModel implements IAnnotationModel, IAnnotationModelExtens * @see org.eclipse.jface.text.source.IAnnotationModelExtension#get(java.lang.Object) * @since 3.0 */ + @Override public IAnnotationModel getAnnotationModel(Object key) { return (IAnnotationModel) fAttachments.get(key); } @@ -980,6 +943,7 @@ public class AnnotationModel implements IAnnotationModel, IAnnotationModelExtens * @see org.eclipse.jface.text.source.IAnnotationModelExtension#detach(java.lang.Object) * @since 3.0 */ + @Override public IAnnotationModel removeAnnotationModel(Object key) { IAnnotationModel ret= (IAnnotationModel) fAttachments.remove(key); if (ret != null) { @@ -990,10 +954,7 @@ public class AnnotationModel implements IAnnotationModel, IAnnotationModelExtens return ret; } - /* - * @see org.eclipse.jface.text.source.IAnnotationModelExtension#getModificationStamp() - * @since 3.0 - */ + @Override public Object getModificationStamp() { return fModificationStamp; } diff --git a/org.eclipse.text/src/org/eclipse/jface/text/source/IAnnotationMap.java b/org.eclipse.text/src/org/eclipse/jface/text/source/IAnnotationMap.java index 5812ded4089..4c73d8045d7 100644 --- a/org.eclipse.text/src/org/eclipse/jface/text/source/IAnnotationMap.java +++ b/org.eclipse.text/src/org/eclipse/jface/text/source/IAnnotationMap.java @@ -57,6 +57,7 @@ public interface IAnnotationMap extends Map, ISynchronizable { * * The returned set is not synchronized on this annotation map's lock object. */ + @Override Set entrySet(); /** @@ -64,6 +65,7 @@ public interface IAnnotationMap extends Map, ISynchronizable { * * The returned set is not synchronized on this annotation map's lock object. */ + @Override Set keySet(); /** @@ -71,5 +73,6 @@ public interface IAnnotationMap extends Map, ISynchronizable { * * The returned collection is not synchronized on this annotation map's lock object. */ + @Override Collection values(); } diff --git a/org.eclipse.text/src/org/eclipse/jface/text/templates/DocumentTemplateContext.java b/org.eclipse.text/src/org/eclipse/jface/text/templates/DocumentTemplateContext.java index cc01386f2a0..b16623cc240 100644 --- a/org.eclipse.text/src/org/eclipse/jface/text/templates/DocumentTemplateContext.java +++ b/org.eclipse.text/src/org/eclipse/jface/text/templates/DocumentTemplateContext.java @@ -165,16 +165,12 @@ public class DocumentTemplateContext extends TemplateContext { return fPosition.getOffset() + fPosition.getLength(); } - /* - * @see org.eclipse.jface.text.templates.TemplateContext#canEvaluate(org.eclipse.jface.text.templates.Template) - */ + @Override public boolean canEvaluate(Template template) { return true; } - /* - * @see org.eclipse.jface.text.templates.TemplateContext#evaluate(org.eclipse.jface.text.templates.Template) - */ + @Override public TemplateBuffer evaluate(Template template) throws BadLocationException, TemplateException { if (!canEvaluate(template)) return null; diff --git a/org.eclipse.text/src/org/eclipse/jface/text/templates/GlobalTemplateVariables.java b/org.eclipse.text/src/org/eclipse/jface/text/templates/GlobalTemplateVariables.java index 19f27f6415e..3a3b4d2d9a3 100644 --- a/org.eclipse.text/src/org/eclipse/jface/text/templates/GlobalTemplateVariables.java +++ b/org.eclipse.text/src/org/eclipse/jface/text/templates/GlobalTemplateVariables.java @@ -59,6 +59,7 @@ public class GlobalTemplateVariables { public WordSelection() { super(NAME, TextTemplateMessages.getString("GlobalVariables.variable.description.selectedWord")); //$NON-NLS-1$ } + @Override protected String resolve(TemplateContext context) { String selection= context.getVariable(SELECTION); if (selection == null) @@ -82,6 +83,7 @@ public class GlobalTemplateVariables { public LineSelection() { super(NAME, TextTemplateMessages.getString("GlobalVariables.variable.description.selectedLines")); //$NON-NLS-1$ } + @Override protected String resolve(TemplateContext context) { String selection= context.getVariable(SELECTION); if (selection == null) @@ -113,6 +115,7 @@ public class GlobalTemplateVariables { public Date() { super("date", TextTemplateMessages.getString("GlobalVariables.variable.description.date")); //$NON-NLS-1$ //$NON-NLS-2$ } + @Override protected String resolve(TemplateContext context) { return DateFormat.getDateInstance().format(new java.util.Date()); } @@ -128,6 +131,7 @@ public class GlobalTemplateVariables { public Year() { super("year", TextTemplateMessages.getString("GlobalVariables.variable.description.year")); //$NON-NLS-1$ //$NON-NLS-2$ } + @Override protected String resolve(TemplateContext context) { return Integer.toString(Calendar.getInstance().get(Calendar.YEAR)); } @@ -144,9 +148,7 @@ public class GlobalTemplateVariables { super("time", TextTemplateMessages.getString("GlobalVariables.variable.description.time")); //$NON-NLS-1$ //$NON-NLS-2$ } - /** - * {@inheritDoc} - */ + @Override protected String resolve(TemplateContext context) { return DateFormat.getTimeInstance().format(new java.util.Date()); } @@ -163,9 +165,7 @@ public class GlobalTemplateVariables { super("user", TextTemplateMessages.getString("GlobalVariables.variable.description.user")); //$NON-NLS-1$ //$NON-NLS-2$ } - /** - * {@inheritDoc} - */ + @Override protected String resolve(TemplateContext context) { return System.getProperty("user.name"); //$NON-NLS-1$ } diff --git a/org.eclipse.text/src/org/eclipse/jface/text/templates/SimpleTemplateVariableResolver.java b/org.eclipse.text/src/org/eclipse/jface/text/templates/SimpleTemplateVariableResolver.java index 6597d60e95e..5885d70fd49 100644 --- a/org.eclipse.text/src/org/eclipse/jface/text/templates/SimpleTemplateVariableResolver.java +++ b/org.eclipse.text/src/org/eclipse/jface/text/templates/SimpleTemplateVariableResolver.java @@ -43,6 +43,7 @@ public class SimpleTemplateVariableResolver extends TemplateVariableResolver { /* * @see TemplateVariableResolver#evaluate(TemplateContext) */ + @Override protected String resolve(TemplateContext context) { return fEvaluationString; } @@ -54,6 +55,7 @@ public class SimpleTemplateVariableResolver extends TemplateVariableResolver { * @param context {@inheritDoc} * @return <code>true</code> */ + @Override protected boolean isUnambiguous(TemplateContext context) { return true; } diff --git a/org.eclipse.text/src/org/eclipse/jface/text/templates/Template.java b/org.eclipse.text/src/org/eclipse/jface/text/templates/Template.java index 9c6d5728ece..c58b972ccf7 100644 --- a/org.eclipse.text/src/org/eclipse/jface/text/templates/Template.java +++ b/org.eclipse.text/src/org/eclipse/jface/text/templates/Template.java @@ -62,6 +62,7 @@ public class Template { * @param pattern the template pattern * @deprecated as of 3.1 replaced by {@link #Template(String, String, String, String, boolean)} */ + @Deprecated public Template(String name, String description, String contextTypeId, String pattern) { this(name, description, contextTypeId, pattern, true); // templates are auto insertable per default } @@ -86,9 +87,7 @@ public class Template { fIsAutoInsertable= isAutoInsertable; } - /* - * @see Object#hashCode() - */ + @Override public int hashCode() { return fName.hashCode() ^ fPattern.hashCode() ^ fContextTypeId.hashCode(); } @@ -99,6 +98,7 @@ public class Template { * @param description the new description * @deprecated Templates should never be modified */ + @Deprecated public void setDescription(String description) { Assert.isNotNull(description); fDescription= description; @@ -119,6 +119,7 @@ public class Template { * @param contextTypeId the new context type name * @deprecated Templates should never be modified */ + @Deprecated public void setContextTypeId(String contextTypeId) { Assert.isNotNull(contextTypeId); fContextTypeId= contextTypeId; @@ -139,6 +140,7 @@ public class Template { * @param name the name of the template * @deprecated Templates should never be modified */ + @Deprecated public void setName(String name) { fName= name; } @@ -158,6 +160,7 @@ public class Template { * @param pattern the new pattern of the template * @deprecated Templates should never be modified */ + @Deprecated public void setPattern(String pattern) { fPattern= pattern; } @@ -184,9 +187,7 @@ public class Template { return fContextTypeId.equals(contextTypeId); } - /* - * @see java.lang.Object#equals(java.lang.Object) - */ + @Override public boolean equals(Object o) { if (!(o instanceof Template)) return false; diff --git a/org.eclipse.text/src/org/eclipse/jface/text/templates/TemplateTranslator.java b/org.eclipse.text/src/org/eclipse/jface/text/templates/TemplateTranslator.java index a67e51477fd..9cf79156f27 100644 --- a/org.eclipse.text/src/org/eclipse/jface/text/templates/TemplateTranslator.java +++ b/org.eclipse.text/src/org/eclipse/jface/text/templates/TemplateTranslator.java @@ -313,6 +313,7 @@ public class TemplateTranslator { * @return a new instance of <code>TemplateVariable</code> * @deprecated as of 3.3 use {@link #createVariable(TemplateVariableType, String, int[])} instead */ + @Deprecated protected TemplateVariable createVariable(String type, String name, int[] offsets) { return createVariable(fCurrentType, name, offsets); } diff --git a/org.eclipse.text/src/org/eclipse/jface/text/templates/TemplateVariableType.java b/org.eclipse.text/src/org/eclipse/jface/text/templates/TemplateVariableType.java index 9d9b4ca5df5..e3b705f1354 100644 --- a/org.eclipse.text/src/org/eclipse/jface/text/templates/TemplateVariableType.java +++ b/org.eclipse.text/src/org/eclipse/jface/text/templates/TemplateVariableType.java @@ -61,9 +61,7 @@ public final class TemplateVariableType { return fParams; } - /* - * @see java.lang.Object#equals(java.lang.Object) - */ + @Override public boolean equals(Object obj) { if (obj instanceof TemplateVariableType) { TemplateVariableType other= (TemplateVariableType) obj; @@ -72,17 +70,12 @@ public final class TemplateVariableType { return false; } - /* - * @see java.lang.Object#hashCode() - */ + @Override public int hashCode() { return fName.hashCode() + fParams.hashCode(); } - /* - * @see java.lang.Object#toString() - * @since 3.3 - */ + @Override public String toString() { return fName + fParams.toString(); } diff --git a/org.eclipse.text/src/org/eclipse/text/edits/CopySourceEdit.java b/org.eclipse.text/src/org/eclipse/text/edits/CopySourceEdit.java index 117f7663a9a..d6c513c18d6 100644 --- a/org.eclipse.text/src/org/eclipse/text/edits/CopySourceEdit.java +++ b/org.eclipse.text/src/org/eclipse/text/edits/CopySourceEdit.java @@ -62,25 +62,31 @@ public final class CopySourceEdit extends TextEdit { fParents.add(fCurrentParent); fCurrentParent= copy; } + @Override public void postVisit(TextEdit edit) { fCurrentParent= (TextEdit)fParents.remove(fParents.size() - 1); } + @Override public boolean visitNode(TextEdit edit) { manageCopy(edit.doCopy()); return true; } + @Override public boolean visit(CopySourceEdit edit) { manageCopy(new RangeMarker(edit.getOffset(), edit.getLength())); return true; } + @Override public boolean visit(CopyTargetEdit edit) { manageCopy(new InsertEdit(edit.getOffset(), edit.getSourceEdit().getContent())); return true; } + @Override public boolean visit(MoveSourceEdit edit) { manageCopy(new DeleteEdit(edit.getOffset(), edit.getLength())); return true; } + @Override public boolean visit(MoveTargetEdit edit) { manageCopy(new InsertEdit(edit.getOffset(), edit.getSourceEdit().getContent())); return true; @@ -167,6 +173,7 @@ public final class CopySourceEdit extends TextEdit { /* * @see TextEdit#doCopy */ + @Override protected TextEdit doCopy() { return new CopySourceEdit(this); } @@ -174,6 +181,7 @@ public final class CopySourceEdit extends TextEdit { /* * @see TextEdit#accept0 */ + @Override protected void accept0(TextEditVisitor visitor) { boolean visitChildren= visitor.visit(this); if (visitChildren) { @@ -199,6 +207,7 @@ public final class CopySourceEdit extends TextEdit { /* * @see TextEdit#postProcessCopy */ + @Override protected void postProcessCopy(TextEditCopier copier) { if (fTarget != null) { CopySourceEdit source= (CopySourceEdit)copier.getCopy(this); @@ -210,6 +219,7 @@ public final class CopySourceEdit extends TextEdit { //---- consistency check ---------------------------------------------------- + @Override int traverseConsistencyCheck(TextEditProcessor processor, IDocument document, List sourceEdits) { int result= super.traverseConsistencyCheck(processor, document, sourceEdits); // Since source computation takes place in a recursive fashion (see @@ -234,6 +244,7 @@ public final class CopySourceEdit extends TextEdit { return result; } + @Override void performConsistencyCheck(TextEditProcessor processor, IDocument document) throws MalformedTreeException { if (fTarget == null) throw new MalformedTreeException(getParent(), this, TextEditMessages.getString("CopySourceEdit.no_target")); //$NON-NLS-1$ @@ -247,6 +258,7 @@ public final class CopySourceEdit extends TextEdit { //---- source computation ------------------------------------------------------- + @Override void traverseSourceComputation(TextEditProcessor processor, IDocument document) { // always perform source computation independent of processor.considerEdit // The target might need the source and the source is computed in a @@ -254,6 +266,7 @@ public final class CopySourceEdit extends TextEdit { performSourceComputation(processor, document); } + @Override void performSourceComputation(TextEditProcessor processor, IDocument document) { try { MultiTextEdit root= new MultiTextEdit(getOffset(), getLength()); @@ -300,6 +313,7 @@ public final class CopySourceEdit extends TextEdit { //---- document updating ---------------------------------------------------------------- + @Override int performDocumentUpdating(IDocument document) throws BadLocationException { fDelta= 0; return fDelta; @@ -310,6 +324,7 @@ public final class CopySourceEdit extends TextEdit { /* * @see TextEdit#deleteChildren */ + @Override boolean deleteChildren() { return false; } diff --git a/org.eclipse.text/src/org/eclipse/text/edits/CopyTargetEdit.java b/org.eclipse.text/src/org/eclipse/text/edits/CopyTargetEdit.java index f0cf3a1a7e7..1c6569e3bdb 100644 --- a/org.eclipse.text/src/org/eclipse/text/edits/CopyTargetEdit.java +++ b/org.eclipse.text/src/org/eclipse/text/edits/CopyTargetEdit.java @@ -99,6 +99,7 @@ public final class CopyTargetEdit extends TextEdit { /* * @see TextEdit#doCopy */ + @Override protected TextEdit doCopy() { return new CopyTargetEdit(this); } @@ -106,6 +107,7 @@ public final class CopyTargetEdit extends TextEdit { /* * @see TextEdit#postProcessCopy */ + @Override protected void postProcessCopy(TextEditCopier copier) { if (fSource != null) { CopyTargetEdit target= (CopyTargetEdit)copier.getCopy(this); @@ -118,6 +120,7 @@ public final class CopyTargetEdit extends TextEdit { /* * @see TextEdit#accept0 */ + @Override protected void accept0(TextEditVisitor visitor) { boolean visitChildren= visitor.visit(this); if (visitChildren) { @@ -128,6 +131,7 @@ public final class CopyTargetEdit extends TextEdit { /* * @see TextEdit#traverseConsistencyCheck */ + @Override int traverseConsistencyCheck(TextEditProcessor processor, IDocument document, List sourceEdits) { return super.traverseConsistencyCheck(processor, document, sourceEdits) + 1; } @@ -135,6 +139,7 @@ public final class CopyTargetEdit extends TextEdit { /* * @see TextEdit#performConsistencyCheck */ + @Override void performConsistencyCheck(TextEditProcessor processor, IDocument document) throws MalformedTreeException { if (fSource == null) throw new MalformedTreeException(getParent(), this, TextEditMessages.getString("CopyTargetEdit.no_source")); //$NON-NLS-1$ @@ -145,6 +150,7 @@ public final class CopyTargetEdit extends TextEdit { /* * @see TextEdit#performDocumentUpdating */ + @Override int performDocumentUpdating(IDocument document) throws BadLocationException { String source= fSource.getContent(); document.replace(getOffset(), getLength(), source); @@ -156,6 +162,7 @@ public final class CopyTargetEdit extends TextEdit { /* * @see TextEdit#deleteChildren */ + @Override boolean deleteChildren() { return false; } diff --git a/org.eclipse.text/src/org/eclipse/text/edits/CopyingRangeMarker.java b/org.eclipse.text/src/org/eclipse/text/edits/CopyingRangeMarker.java index f5c08386107..8338b4a865d 100644 --- a/org.eclipse.text/src/org/eclipse/text/edits/CopyingRangeMarker.java +++ b/org.eclipse.text/src/org/eclipse/text/edits/CopyingRangeMarker.java @@ -46,6 +46,7 @@ public final class CopyingRangeMarker extends TextEdit { /* * @see TextEdit#doCopy */ + @Override protected TextEdit doCopy() { return new CopyingRangeMarker(this); } @@ -53,6 +54,7 @@ public final class CopyingRangeMarker extends TextEdit { /* * @see TextEdit#accept0 */ + @Override protected void accept0(TextEditVisitor visitor) { boolean visitChildren= visitor.visit(this); if (visitChildren) { @@ -63,6 +65,7 @@ public final class CopyingRangeMarker extends TextEdit { /* * @see TextEdit#performDocumentUpdating */ + @Override int performDocumentUpdating(IDocument document) throws BadLocationException { fText= document.get(getOffset(), getLength()); fDelta= 0; @@ -72,6 +75,7 @@ public final class CopyingRangeMarker extends TextEdit { /* * @see TextEdit#deleteChildren */ + @Override boolean deleteChildren() { return false; } diff --git a/org.eclipse.text/src/org/eclipse/text/edits/DeleteEdit.java b/org.eclipse.text/src/org/eclipse/text/edits/DeleteEdit.java index 9eb364ebde3..041cb7d53b5 100644 --- a/org.eclipse.text/src/org/eclipse/text/edits/DeleteEdit.java +++ b/org.eclipse.text/src/org/eclipse/text/edits/DeleteEdit.java @@ -43,6 +43,7 @@ public final class DeleteEdit extends TextEdit { /* * @see TextEdit#doCopy */ + @Override protected TextEdit doCopy() { return new DeleteEdit(this); } @@ -50,6 +51,7 @@ public final class DeleteEdit extends TextEdit { /* * @see TextEdit#accept0 */ + @Override protected void accept0(TextEditVisitor visitor) { boolean visitChildren= visitor.visit(this); if (visitChildren) { @@ -60,6 +62,7 @@ public final class DeleteEdit extends TextEdit { /* * @see TextEdit#performDocumentUpdating */ + @Override int performDocumentUpdating(IDocument document) throws BadLocationException { document.replace(getOffset(), getLength(), ""); //$NON-NLS-1$ fDelta= -getLength(); @@ -69,6 +72,7 @@ public final class DeleteEdit extends TextEdit { /* * @see TextEdit#deleteChildren */ + @Override boolean deleteChildren() { return true; } diff --git a/org.eclipse.text/src/org/eclipse/text/edits/EditDocument.java b/org.eclipse.text/src/org/eclipse/text/edits/EditDocument.java index 872256385c4..981c94a4560 100644 --- a/org.eclipse.text/src/org/eclipse/text/edits/EditDocument.java +++ b/org.eclipse.text/src/org/eclipse/text/edits/EditDocument.java @@ -30,166 +30,207 @@ class EditDocument implements IDocument { fBuffer= new StringBuffer(content); } + @Override public void addDocumentListener(IDocumentListener listener) { throw new UnsupportedOperationException(); } + @Override public void addDocumentPartitioningListener(IDocumentPartitioningListener listener) { throw new UnsupportedOperationException(); } + @Override public void addPosition(Position position) throws BadLocationException { throw new UnsupportedOperationException(); } + @Override public void addPosition(String category, Position position) throws BadLocationException, BadPositionCategoryException { throw new UnsupportedOperationException(); } + @Override public void addPositionCategory(String category) { throw new UnsupportedOperationException(); } + @Override public void addPositionUpdater(IPositionUpdater updater) { throw new UnsupportedOperationException(); } + @Override public void addPrenotifiedDocumentListener(IDocumentListener documentAdapter) { throw new UnsupportedOperationException(); } + @Override public int computeIndexInCategory(String category, int offset) throws BadLocationException, BadPositionCategoryException { throw new UnsupportedOperationException(); } + @Override public int computeNumberOfLines(String text) { throw new UnsupportedOperationException(); } + @Override public ITypedRegion[] computePartitioning(int offset, int length) throws BadLocationException { throw new UnsupportedOperationException(); } + @Override public boolean containsPosition(String category, int offset, int length) { throw new UnsupportedOperationException(); } + @Override public boolean containsPositionCategory(String category) { throw new UnsupportedOperationException(); } + @Override public String get() { return fBuffer.toString(); } + @Override public String get(int offset, int length) throws BadLocationException { return fBuffer.substring(offset, offset + length); } + @Override public char getChar(int offset) throws BadLocationException { throw new UnsupportedOperationException(); } + @Override public String getContentType(int offset) throws BadLocationException { throw new UnsupportedOperationException(); } + @Override public IDocumentPartitioner getDocumentPartitioner() { throw new UnsupportedOperationException(); } + @Override public String[] getLegalContentTypes() { throw new UnsupportedOperationException(); } + @Override public String[] getLegalLineDelimiters() { throw new UnsupportedOperationException(); } + @Override public int getLength() { return fBuffer.length(); } + @Override public String getLineDelimiter(int line) throws BadLocationException { throw new UnsupportedOperationException(); } + @Override public IRegion getLineInformation(int line) throws BadLocationException { throw new UnsupportedOperationException(); } + @Override public IRegion getLineInformationOfOffset(int offset) throws BadLocationException { throw new UnsupportedOperationException(); } + @Override public int getLineLength(int line) throws BadLocationException { throw new UnsupportedOperationException(); } + @Override public int getLineOffset(int line) throws BadLocationException { throw new UnsupportedOperationException(); } + @Override public int getLineOfOffset(int offset) throws BadLocationException { throw new UnsupportedOperationException(); } + @Override public int getNumberOfLines() { throw new UnsupportedOperationException(); } + @Override public int getNumberOfLines(int offset, int length) throws BadLocationException { throw new UnsupportedOperationException(); } + @Override public ITypedRegion getPartition(int offset) throws BadLocationException { throw new UnsupportedOperationException(); } + @Override public String[] getPositionCategories() { throw new UnsupportedOperationException(); } + @Override public Position[] getPositions(String category) throws BadPositionCategoryException { throw new UnsupportedOperationException(); } + @Override public IPositionUpdater[] getPositionUpdaters() { throw new UnsupportedOperationException(); } + @Override public void insertPositionUpdater(IPositionUpdater updater, int index) { throw new UnsupportedOperationException(); } + @Override public void removeDocumentListener(IDocumentListener listener) { throw new UnsupportedOperationException(); } + @Override public void removeDocumentPartitioningListener(IDocumentPartitioningListener listener) { throw new UnsupportedOperationException(); } + @Override public void removePosition(Position position) { throw new UnsupportedOperationException(); } + @Override public void removePosition(String category, Position position) throws BadPositionCategoryException { throw new UnsupportedOperationException(); } + @Override public void removePositionCategory(String category) throws BadPositionCategoryException { throw new UnsupportedOperationException(); } + @Override public void removePositionUpdater(IPositionUpdater updater) { throw new UnsupportedOperationException(); } + @Override public void removePrenotifiedDocumentListener(IDocumentListener documentAdapter) { throw new UnsupportedOperationException(); } + @Override public void replace(int offset, int length, String text) throws BadLocationException { fBuffer.replace(offset, offset + length, text); } @@ -199,14 +240,18 @@ class EditDocument implements IDocument { * * @deprecated As of 3.0 search is provided by {@link FindReplaceDocumentAdapter} */ + @Deprecated + @Override public int search(int startOffset, String findString, boolean forwardSearch, boolean caseSensitive, boolean wholeWord) throws BadLocationException { throw new UnsupportedOperationException(); } + @Override public void set(String text) { throw new UnsupportedOperationException(); } + @Override public void setDocumentPartitioner(IDocumentPartitioner partitioner) { throw new UnsupportedOperationException(); } diff --git a/org.eclipse.text/src/org/eclipse/text/edits/InsertEdit.java b/org.eclipse.text/src/org/eclipse/text/edits/InsertEdit.java index 226fded3733..5d0a5dd6c59 100644 --- a/org.eclipse.text/src/org/eclipse/text/edits/InsertEdit.java +++ b/org.eclipse.text/src/org/eclipse/text/edits/InsertEdit.java @@ -60,6 +60,7 @@ public final class InsertEdit extends TextEdit { /* * @see TextEdit#doCopy */ + @Override protected TextEdit doCopy() { return new InsertEdit(this); } @@ -67,6 +68,7 @@ public final class InsertEdit extends TextEdit { /* * @see TextEdit#accept0 */ + @Override protected void accept0(TextEditVisitor visitor) { boolean visitChildren= visitor.visit(this); if (visitChildren) { @@ -77,6 +79,7 @@ public final class InsertEdit extends TextEdit { /* * @see TextEdit#performDocumentUpdating */ + @Override int performDocumentUpdating(IDocument document) throws BadLocationException { document.replace(getOffset(), getLength(), fText); fDelta= fText.length() - getLength(); @@ -86,14 +89,12 @@ public final class InsertEdit extends TextEdit { /* * @see TextEdit#deleteChildren */ + @Override boolean deleteChildren() { return false; } - /* - * @see org.eclipse.text.edits.TextEdit#internalToString(java.lang.StringBuffer, int) - * @since 3.3 - */ + @Override void internalToString(StringBuffer buffer, int indent) { super.internalToString(buffer, indent); buffer.append(" <<").append(fText); //$NON-NLS-1$ diff --git a/org.eclipse.text/src/org/eclipse/text/edits/MoveSourceEdit.java b/org.eclipse.text/src/org/eclipse/text/edits/MoveSourceEdit.java index e720c144e95..25f56b4010e 100644 --- a/org.eclipse.text/src/org/eclipse/text/edits/MoveSourceEdit.java +++ b/org.eclipse.text/src/org/eclipse/text/edits/MoveSourceEdit.java @@ -149,6 +149,7 @@ public final class MoveSourceEdit extends TextEdit { /* * @see TextEdit#doCopy */ + @Override protected TextEdit doCopy() { return new MoveSourceEdit(this); } @@ -156,6 +157,7 @@ public final class MoveSourceEdit extends TextEdit { /* * @see TextEdit#postProcessCopy */ + @Override protected void postProcessCopy(TextEditCopier copier) { if (fTarget != null) { MoveSourceEdit source= (MoveSourceEdit)copier.getCopy(this); @@ -170,6 +172,7 @@ public final class MoveSourceEdit extends TextEdit { /* * @see TextEdit#accept0 */ + @Override protected void accept0(TextEditVisitor visitor) { boolean visitChildren= visitor.visit(this); if (visitChildren) { @@ -179,6 +182,7 @@ public final class MoveSourceEdit extends TextEdit { //---- consistency check ---------------------------------------------------------------- + @Override int traverseConsistencyCheck(TextEditProcessor processor, IDocument document, List sourceEdits) { int result= super.traverseConsistencyCheck(processor, document, sourceEdits); // Since source computation takes place in a recursive fashion (see @@ -203,6 +207,7 @@ public final class MoveSourceEdit extends TextEdit { return result; } + @Override void performConsistencyCheck(TextEditProcessor processor, IDocument document) throws MalformedTreeException { if (fTarget == null) throw new MalformedTreeException(getParent(), this, TextEditMessages.getString("MoveSourceEdit.no_target")); //$NON-NLS-1$ @@ -216,6 +221,7 @@ public final class MoveSourceEdit extends TextEdit { //---- source computation -------------------------------------------------------------- + @Override void traverseSourceComputation(TextEditProcessor processor, IDocument document) { // always perform source computation independent of processor.considerEdit // The target might need the source and the source is computed in a @@ -223,6 +229,7 @@ public final class MoveSourceEdit extends TextEdit { performSourceComputation(processor, document); } + @Override void performSourceComputation(TextEditProcessor processor, IDocument document) { try { TextEdit[] children= removeChildren(); @@ -260,6 +267,7 @@ public final class MoveSourceEdit extends TextEdit { //---- document updating ---------------------------------------------------------------- + @Override int performDocumentUpdating(IDocument document) throws BadLocationException { document.replace(getOffset(), getLength(), ""); //$NON-NLS-1$ fDelta= -getLength(); @@ -271,6 +279,7 @@ public final class MoveSourceEdit extends TextEdit { /* * @see TextEdit#deleteChildren */ + @Override boolean deleteChildren() { return false; } diff --git a/org.eclipse.text/src/org/eclipse/text/edits/MoveTargetEdit.java b/org.eclipse.text/src/org/eclipse/text/edits/MoveTargetEdit.java index 0a812a21b79..1815ca28545 100644 --- a/org.eclipse.text/src/org/eclipse/text/edits/MoveTargetEdit.java +++ b/org.eclipse.text/src/org/eclipse/text/edits/MoveTargetEdit.java @@ -98,6 +98,7 @@ public final class MoveTargetEdit extends TextEdit { /* * @see TextEdit#doCopy */ + @Override protected TextEdit doCopy() { return new MoveTargetEdit(this); } @@ -105,6 +106,7 @@ public final class MoveTargetEdit extends TextEdit { /* * @see TextEdit#postProcessCopy */ + @Override protected void postProcessCopy(TextEditCopier copier) { if (fSource != null) { MoveTargetEdit target= (MoveTargetEdit)copier.getCopy(this); @@ -117,6 +119,7 @@ public final class MoveTargetEdit extends TextEdit { /* * @see TextEdit#accept0 */ + @Override protected void accept0(TextEditVisitor visitor) { boolean visitChildren= visitor.visit(this); if (visitChildren) { @@ -129,6 +132,7 @@ public final class MoveTargetEdit extends TextEdit { /* * @see TextEdit#traverseConsistencyCheck */ + @Override int traverseConsistencyCheck(TextEditProcessor processor, IDocument document, List sourceEdits) { return super.traverseConsistencyCheck(processor, document, sourceEdits) + 1; } @@ -136,6 +140,7 @@ public final class MoveTargetEdit extends TextEdit { /* * @see TextEdit#performConsistencyCheck */ + @Override void performConsistencyCheck(TextEditProcessor processor, IDocument document) throws MalformedTreeException { if (fSource == null) throw new MalformedTreeException(getParent(), this, TextEditMessages.getString("MoveTargetEdit.no_source")); //$NON-NLS-1$ @@ -148,6 +153,7 @@ public final class MoveTargetEdit extends TextEdit { /* * @see TextEdit#performDocumentUpdating */ + @Override int performDocumentUpdating(IDocument document) throws BadLocationException { String source= fSource.getContent(); document.replace(getOffset(), getLength(), source); @@ -174,6 +180,7 @@ public final class MoveTargetEdit extends TextEdit { /* * @see org.eclipse.text.edits.TextEdit#traversePassThree */ + @Override int traverseRegionUpdating(TextEditProcessor processor, IDocument document, int accumulatedDelta, boolean delete) { // the children got already updated / normalized while they got removed // from the source edit. So we only have to adjust the offset computed to @@ -186,6 +193,7 @@ public final class MoveTargetEdit extends TextEdit { return accumulatedDelta + fDelta; } + @Override boolean deleteChildren() { return false; } diff --git a/org.eclipse.text/src/org/eclipse/text/edits/MultiTextEdit.java b/org.eclipse.text/src/org/eclipse/text/edits/MultiTextEdit.java index b32b348a313..c1dcb81f555 100644 --- a/org.eclipse.text/src/org/eclipse/text/edits/MultiTextEdit.java +++ b/org.eclipse.text/src/org/eclipse/text/edits/MultiTextEdit.java @@ -86,18 +86,14 @@ public class MultiTextEdit extends TextEdit { // does nothing } - /** - * {@inheritDoc} - */ + @Override final boolean isDefined() { if (fDefined) return true; return hasChildren(); } - /** - * {@inheritDoc} - */ + @Override public final int getOffset() { if (fDefined) return super.getOffset(); @@ -109,9 +105,7 @@ public class MultiTextEdit extends TextEdit { return ((TextEdit)children.get(0)).getOffset(); } - /** - * {@inheritDoc} - */ + @Override public final int getLength() { if (fDefined) return super.getLength(); @@ -125,9 +119,7 @@ public class MultiTextEdit extends TextEdit { return last.getOffset() - first.getOffset() + last.getLength(); } - /** - * {@inheritDoc} - */ + @Override public final boolean covers(TextEdit other) { if (fDefined) return super.covers(other); @@ -135,9 +127,7 @@ public class MultiTextEdit extends TextEdit { return true; } - /* - * @see org.eclipse.text.edits.TextEdit#canZeroLengthCover() - */ + @Override protected boolean canZeroLengthCover() { return true; } @@ -145,6 +135,7 @@ public class MultiTextEdit extends TextEdit { /* * @see TextEdit#copy */ + @Override protected TextEdit doCopy() { Assert.isTrue(MultiTextEdit.class == getClass(), "Subclasses must reimplement copy0"); //$NON-NLS-1$ return new MultiTextEdit(this); @@ -153,6 +144,7 @@ public class MultiTextEdit extends TextEdit { /* * @see TextEdit#accept0 */ + @Override protected void accept0(TextEditVisitor visitor) { boolean visitChildren= visitor.visit(this); if (visitChildren) { @@ -160,19 +152,13 @@ public class MultiTextEdit extends TextEdit { } } - /* - * @see org.eclipse.text.edits.TextEdit#adjustOffset(int) - * @since 3.1 - */ + @Override void adjustOffset(int delta) { if (fDefined) super.adjustOffset(delta); } - /* - * @see org.eclipse.text.edits.TextEdit#adjustLength(int) - * @since 3.1 - */ + @Override void adjustLength(int delta) { if (fDefined) super.adjustLength(delta); @@ -181,6 +167,7 @@ public class MultiTextEdit extends TextEdit { /* * @see TextEdit#performConsistencyCheck */ + @Override void performConsistencyCheck(TextEditProcessor processor, IDocument document) throws MalformedTreeException { checkIntegrity(); } @@ -188,6 +175,7 @@ public class MultiTextEdit extends TextEdit { /* * @see TextEdit#performDocumentUpdating */ + @Override int performDocumentUpdating(IDocument document) throws BadLocationException { fDelta= 0; return fDelta; @@ -196,10 +184,12 @@ public class MultiTextEdit extends TextEdit { /* * @see TextEdit#deleteChildren */ + @Override boolean deleteChildren() { return false; } + @Override void aboutToBeAdded(TextEdit parent) { defineRegion(parent.getOffset()); } @@ -218,10 +208,7 @@ public class MultiTextEdit extends TextEdit { fDefined= true; } - /* - * @see org.eclipse.text.edits.TextEdit#internalToString(java.lang.StringBuffer, int) - * @since 3.3 - */ + @Override void internalToString(StringBuffer buffer, int indent) { super.internalToString(buffer, indent); if (! fDefined) diff --git a/org.eclipse.text/src/org/eclipse/text/edits/RangeMarker.java b/org.eclipse.text/src/org/eclipse/text/edits/RangeMarker.java index 68a43e55fa7..673ed497296 100644 --- a/org.eclipse.text/src/org/eclipse/text/edits/RangeMarker.java +++ b/org.eclipse.text/src/org/eclipse/text/edits/RangeMarker.java @@ -41,6 +41,7 @@ public final class RangeMarker extends TextEdit { /* * @see TextEdit#copy */ + @Override protected TextEdit doCopy() { return new RangeMarker(this); } @@ -48,6 +49,7 @@ public final class RangeMarker extends TextEdit { /* * @see TextEdit#accept0 */ + @Override protected void accept0(TextEditVisitor visitor) { boolean visitChildren= visitor.visit(this); if (visitChildren) { @@ -58,6 +60,7 @@ public final class RangeMarker extends TextEdit { /* * @see TextEdit#performDocumentUpdating */ + @Override int performDocumentUpdating(IDocument document) throws BadLocationException { fDelta= 0; return fDelta; @@ -66,6 +69,7 @@ public final class RangeMarker extends TextEdit { /* * @see TextEdit#deleteChildren */ + @Override boolean deleteChildren() { return false; } diff --git a/org.eclipse.text/src/org/eclipse/text/edits/ReplaceEdit.java b/org.eclipse.text/src/org/eclipse/text/edits/ReplaceEdit.java index b8b488762fb..bd13a6911fc 100644 --- a/org.eclipse.text/src/org/eclipse/text/edits/ReplaceEdit.java +++ b/org.eclipse.text/src/org/eclipse/text/edits/ReplaceEdit.java @@ -61,6 +61,7 @@ public final class ReplaceEdit extends TextEdit { /* * @see TextEdit#doCopy */ + @Override protected TextEdit doCopy() { return new ReplaceEdit(this); } @@ -68,6 +69,7 @@ public final class ReplaceEdit extends TextEdit { /* * @see TextEdit#accept0 */ + @Override protected void accept0(TextEditVisitor visitor) { boolean visitChildren= visitor.visit(this); if (visitChildren) { @@ -78,6 +80,7 @@ public final class ReplaceEdit extends TextEdit { /* * @see TextEdit#performDocumentUpdating */ + @Override int performDocumentUpdating(IDocument document) throws BadLocationException { document.replace(getOffset(), getLength(), fText); fDelta= fText.length() - getLength(); @@ -87,14 +90,12 @@ public final class ReplaceEdit extends TextEdit { /* * @see TextEdit#deleteChildren */ + @Override boolean deleteChildren() { return true; } - /* - * @see org.eclipse.text.edits.TextEdit#internalToString(java.lang.StringBuffer, int) - * @since 3.3 - */ + @Override void internalToString(StringBuffer buffer, int indent) { super.internalToString(buffer, indent); buffer.append(" <<").append(fText); //$NON-NLS-1$ diff --git a/org.eclipse.text/src/org/eclipse/text/edits/TextEdit.java b/org.eclipse.text/src/org/eclipse/text/edits/TextEdit.java index c304a12270f..b3aba990a9c 100644 --- a/org.eclipse.text/src/org/eclipse/text/edits/TextEdit.java +++ b/org.eclipse.text/src/org/eclipse/text/edits/TextEdit.java @@ -99,6 +99,7 @@ public abstract class TextEdit { public static final int UPDATE_REGIONS= 1 << 1; private static class InsertionComparator implements Comparator { + @Override public int compare(Object o1, Object o2) throws MalformedTreeException { TextEdit edit1= (TextEdit)o1; TextEdit edit2= (TextEdit)o2; @@ -496,6 +497,7 @@ public abstract class TextEdit { * * @see Object#equals(java.lang.Object) */ + @Override public final boolean equals(Object obj) { return this == obj; // equivalent to Object.equals } @@ -509,13 +511,12 @@ public abstract class TextEdit { * * @see Object#hashCode() */ + @Override public final int hashCode() { return super.hashCode(); } - /* - * @see java.lang.Object#toString() - */ + @Override public String toString() { StringBuffer buffer= new StringBuffer(); toStringWithChildren(buffer, 0); diff --git a/org.eclipse.text/src/org/eclipse/text/edits/UndoCollector.java b/org.eclipse.text/src/org/eclipse/text/edits/UndoCollector.java index d69e60e7a02..86f8e1861fc 100644 --- a/org.eclipse.text/src/org/eclipse/text/edits/UndoCollector.java +++ b/org.eclipse.text/src/org/eclipse/text/edits/UndoCollector.java @@ -46,6 +46,7 @@ class UndoCollector implements IDocumentListener { } } + @Override public void documentChanged(DocumentEvent event) { fLength+= getDelta(event); } @@ -55,6 +56,7 @@ class UndoCollector implements IDocumentListener { return text == null ? -event.getLength() : (text.length() - event.getLength()); } + @Override public void documentAboutToBeChanged(DocumentEvent event) { int offset= event.getOffset(); int currentLength= event.getLength(); diff --git a/org.eclipse.text/src/org/eclipse/text/edits/UndoEdit.java b/org.eclipse.text/src/org/eclipse/text/edits/UndoEdit.java index ed714f6c694..57601327cab 100644 --- a/org.eclipse.text/src/org/eclipse/text/edits/UndoEdit.java +++ b/org.eclipse.text/src/org/eclipse/text/edits/UndoEdit.java @@ -39,31 +39,27 @@ public final class UndoEdit extends TextEdit { super(other); } - /* - * @see org.eclipse.text.edits.TextEdit#internalAdd(org.eclipse.text.edits.TextEdit) - */ + @Override void internalAdd(TextEdit child) throws MalformedTreeException { throw new MalformedTreeException(null, this, TextEditMessages.getString("UndoEdit.no_children")); //$NON-NLS-1$ } - /* - * @see org.eclipse.text.edits.MultiTextEdit#aboutToBeAdded(org.eclipse.text.edits.TextEdit) - */ + @Override void aboutToBeAdded(TextEdit parent) { throw new MalformedTreeException(parent, this, TextEditMessages.getString("UndoEdit.can_not_be_added")); //$NON-NLS-1$ } + @Override UndoEdit dispatchPerformEdits(TextEditProcessor processor) throws BadLocationException { return processor.executeUndo(); } + @Override void dispatchCheckIntegrity(TextEditProcessor processor) throws MalformedTreeException { processor.checkIntegrityUndo(); } - /* - * @see org.eclipse.text.edits.TextEdit#doCopy() - */ + @Override protected TextEdit doCopy() { return new UndoEdit(this); } @@ -71,6 +67,7 @@ public final class UndoEdit extends TextEdit { /* * @see TextEdit#accept0 */ + @Override protected void accept0(TextEditVisitor visitor) { boolean visitChildren= visitor.visit(this); if (visitChildren) { @@ -81,6 +78,7 @@ public final class UndoEdit extends TextEdit { /* * @see TextEdit#performDocumentUpdating */ + @Override int performDocumentUpdating(IDocument document) throws BadLocationException { fDelta= 0; return fDelta; @@ -100,6 +98,7 @@ public final class UndoEdit extends TextEdit { internalSetLength(length); } + @Override boolean deleteChildren() { return false; } diff --git a/org.eclipse.text/src/org/eclipse/text/undo/DocumentUndoManager.java b/org.eclipse.text/src/org/eclipse/text/undo/DocumentUndoManager.java index 6f36f682d37..7f15f60f664 100644 --- a/org.eclipse.text/src/org/eclipse/text/undo/DocumentUndoManager.java +++ b/org.eclipse.text/src/org/eclipse/text/undo/DocumentUndoManager.java @@ -128,9 +128,7 @@ public class DocumentUndoManager implements IDocumentUndoManager { fPreservedText= null; } - /* - * @see org.eclipse.core.commands.operations.IUndoableOperation#dispose() - */ + @Override public void dispose() { reinitialize(); } @@ -150,9 +148,7 @@ public class DocumentUndoManager implements IDocumentUndoManager { } } - /* - * @see org.eclipse.core.commands.operations.IUndoableOperation#canUndo() - */ + @Override public boolean canUndo() { if (isValid()) { if (fDocumentUndoManager.fDocument instanceof IDocumentExtension4) { @@ -220,9 +216,7 @@ public class DocumentUndoManager implements IDocumentUndoManager { return false; } - /* - * @see org.eclipse.core.commands.operations.IUndoableOperation#canRedo() - */ + @Override public boolean canRedo() { if (isValid()) { if (fDocumentUndoManager.fDocument instanceof IDocumentExtension4) { @@ -238,16 +232,12 @@ public class DocumentUndoManager implements IDocumentUndoManager { return false; } - /* - * @see org.eclipse.core.commands.operations.IUndoableOperation#canExecute() - */ + @Override public boolean canExecute() { return fDocumentUndoManager.isConnected(); } - /* - * @see org.eclipse.core.commands.operations.IUndoableOperation.IUndoableOperation#execute(IProgressMonitor, IAdaptable) - */ + @Override public IStatus execute(IProgressMonitor monitor, IAdaptable uiInfo) { // Text changes execute as they are typed, so executing one has no // effect. @@ -258,6 +248,7 @@ public class DocumentUndoManager implements IDocumentUndoManager { * {@inheritDoc} * Notifies clients about the undo. */ + @Override public IStatus undo(IProgressMonitor monitor, IAdaptable uiInfo) { if (isValid()) { fDocumentUndoManager.fireDocumentUndo(fStart, fPreservedText, fText, uiInfo, DocumentUndoEvent.ABOUT_TO_UNDO, false); @@ -290,6 +281,7 @@ public class DocumentUndoManager implements IDocumentUndoManager { * @param uiInfo an adaptable that can provide UI info if needed * @return the status */ + @Override public IStatus redo(IProgressMonitor monitor, IAdaptable uiInfo) { if (isValid()) { fDocumentUndoManager.fireDocumentUndo(fStart, fText, fPreservedText, uiInfo, DocumentUndoEvent.ABOUT_TO_REDO, false); @@ -377,9 +369,7 @@ public class DocumentUndoManager implements IDocumentUndoManager { return fStart > -1 && fEnd > -1 && fText != null; } - /* - * @see java.lang.Object#toString() - */ + @Override public String toString() { String delimiter= ", "; //$NON-NLS-1$ StringBuffer text= new StringBuffer(super.toString()); @@ -452,9 +442,7 @@ public class DocumentUndoManager implements IDocumentUndoManager { fChanges.add(change); } - /* - * @see org.eclipse.text.undo.UndoableTextChange#undo(org.eclipse.core.runtime.IProgressMonitor, org.eclipse.core.runtime.IAdaptable) - */ + @Override public IStatus undo(IProgressMonitor monitor, IAdaptable uiInfo) { int size= fChanges.size(); @@ -475,9 +463,7 @@ public class DocumentUndoManager implements IDocumentUndoManager { return Status.OK_STATUS; } - /* - * @see org.eclipse.text.undo.UndoableTextChange#redo(org.eclipse.core.runtime.IProgressMonitor, org.eclipse.core.runtime.IAdaptable) - */ + @Override public IStatus redo(IProgressMonitor monitor, IAdaptable uiInfo) { int size= fChanges.size(); @@ -498,9 +484,7 @@ public class DocumentUndoManager implements IDocumentUndoManager { return Status.OK_STATUS; } - /* - * @see org.eclipse.text.undo.UndoableTextChange#updateTextChange() - */ + @Override protected void updateTextChange() { // first gather the data from the buffers super.updateTextChange(); @@ -519,9 +503,7 @@ public class DocumentUndoManager implements IDocumentUndoManager { reinitialize(); } - /* - * @see org.eclipse.text.undo.UndoableTextChange#createCurrent() - */ + @Override protected UndoableTextChange createCurrent() { if (!fDocumentUndoManager.fFoldingIntoCompoundChange) @@ -531,9 +513,7 @@ public class DocumentUndoManager implements IDocumentUndoManager { return this; } - /* - * @see org.eclipse.text.undo.UndoableTextChange#commit() - */ + @Override protected void commit() { // if there is pending data, update the text change if (fStart > -1) @@ -542,16 +522,12 @@ public class DocumentUndoManager implements IDocumentUndoManager { fDocumentUndoManager.resetProcessChangeState(); } - /* - * @see org.eclipse.text.undo.UndoableTextChange#isValid() - */ + @Override protected boolean isValid() { return fStart > -1 || fChanges.size() > 0; } - /* - * @see org.eclipse.text.undo.UndoableTextChange#getUndoModificationStamp() - */ + @Override protected long getUndoModificationStamp() { if (fStart > -1) return super.getUndoModificationStamp(); @@ -562,9 +538,7 @@ public class DocumentUndoManager implements IDocumentUndoManager { return fUndoModificationStamp; } - /* - * @see org.eclipse.text.undo.UndoableTextChange#getRedoModificationStamp() - */ + @Override protected long getRedoModificationStamp() { if (fStart > -1) return super.getRedoModificationStamp(); @@ -584,9 +558,7 @@ public class DocumentUndoManager implements IDocumentUndoManager { private String fReplacedText; - /* - * @see org.eclipse.jface.text.IDocumentListener#documentAboutToBeChanged(org.eclipse.jface.text.DocumentEvent) - */ + @Override public void documentAboutToBeChanged(DocumentEvent event) { try { fReplacedText= event.getDocument().get(event.getOffset(), @@ -597,9 +569,7 @@ public class DocumentUndoManager implements IDocumentUndoManager { } } - /* - * @see org.eclipse.jface.text.IDocumentListener#documentChanged(org.eclipse.jface.text.DocumentEvent) - */ + @Override public void documentChanged(DocumentEvent event) { fPreservedRedoModificationStamp= event.getModificationStamp(); @@ -646,6 +616,7 @@ public class DocumentUndoManager implements IDocumentUndoManager { private IUndoableOperation fOperation; + @Override public void historyNotification(final OperationHistoryEvent event) { final int type= event.getEventType(); switch (type) { @@ -785,30 +756,22 @@ public class DocumentUndoManager implements IDocumentUndoManager { fDocumentUndoListeners= new ListenerList(ListenerList.IDENTITY); } - /* - * @see org.eclipse.jface.text.IDocumentUndoManager#addDocumentUndoListener(org.eclipse.jface.text.IDocumentUndoListener) - */ + @Override public void addDocumentUndoListener(IDocumentUndoListener listener) { fDocumentUndoListeners.add(listener); } - /* - * @see org.eclipse.jface.text.IDocumentUndoManager#removeDocumentUndoListener(org.eclipse.jface.text.IDocumentUndoListener) - */ + @Override public void removeDocumentUndoListener(IDocumentUndoListener listener) { fDocumentUndoListeners.remove(listener); } - /* - * @see org.eclipse.jface.text.IDocumentUndoManager#getUndoContext() - */ + @Override public IUndoContext getUndoContext() { return fUndoContext; } - /* - * @see org.eclipse.jface.text.IDocumentUndoManager#commit() - */ + @Override public void commit() { // if fCurrent has never been placed on the history, do so now. // this can happen when there are multiple programmatically commits in a @@ -821,9 +784,7 @@ public class DocumentUndoManager implements IDocumentUndoManager { fCurrent.commit(); } - /* - * @see org.eclipse.text.undo.IDocumentUndoManager#reset() - */ + @Override public void reset() { if (isConnected()) { shutdown(); @@ -831,16 +792,12 @@ public class DocumentUndoManager implements IDocumentUndoManager { } } - /* - * @see org.eclipse.text.undo.IDocumentUndoManager#redoable() - */ + @Override public boolean redoable() { return OperationHistoryFactory.getOperationHistory().canRedo(fUndoContext); } - /* - * @see org.eclipse.text.undo.IDocumentUndoManager#undoable() - */ + @Override public boolean undoable() { return OperationHistoryFactory.getOperationHistory().canUndo(fUndoContext); } @@ -848,22 +805,19 @@ public class DocumentUndoManager implements IDocumentUndoManager { /* * @see org.eclipse.text.undo.IDocumentUndoManager#undo() */ + @Override public void redo() throws ExecutionException { if (isConnected() && redoable()) OperationHistoryFactory.getOperationHistory().redo(getUndoContext(), null, null); } - /* - * @see org.eclipse.text.undo.IDocumentUndoManager#undo() - */ + @Override public void undo() throws ExecutionException { if (undoable()) OperationHistoryFactory.getOperationHistory().undo(fUndoContext, null, null); } - /* - * @see org.eclipse.jface.text.IDocumentUndoManager#connect(java.lang.Object) - */ + @Override public void connect(Object client) { if (!isConnected()) { initialize(); @@ -872,9 +826,7 @@ public class DocumentUndoManager implements IDocumentUndoManager { fConnected.add(client); } - /* - * @see org.eclipse.jface.text.IDocumentUndoManager#disconnect(java.lang.Object) - */ + @Override public void disconnect(Object client) { fConnected.remove(client); if (!isConnected()) { @@ -882,9 +834,7 @@ public class DocumentUndoManager implements IDocumentUndoManager { } } - /* - * @see org.eclipse.jface.text.IDocumentUndoManager#beginCompoundChange() - */ + @Override public void beginCompoundChange() { if (isConnected()) { fFoldingIntoCompoundChange= true; @@ -892,9 +842,7 @@ public class DocumentUndoManager implements IDocumentUndoManager { } } - /* - * @see org.eclipse.jface.text.IDocumentUndoManager#endCompoundChange() - */ + @Override public void endCompoundChange() { if (isConnected()) { fFoldingIntoCompoundChange= false; @@ -905,6 +853,7 @@ public class DocumentUndoManager implements IDocumentUndoManager { /* * @see org.eclipse.jface.text.IDocumentUndoManager#setUndoLimit(int) */ + @Override public void setMaximalUndoLevel(int undoLimit) { fHistory.setLimit(fUndoContext, undoLimit); } @@ -1237,9 +1186,7 @@ public class DocumentUndoManager implements IDocumentUndoManager { return !fConnected.isEmpty(); } - /* - * @see org.eclipse.jface.text.IDocumentUndoManager#transferUndoHistory(IDocumentUndoManager) - */ + @Override public void transferUndoHistory(IDocumentUndoManager manager) { IUndoContext oldUndoContext= manager.getUndoContext(); // Get the history for the old undo context. diff --git a/org.eclipse.ui.editors.tests/src/org/eclipse/ui/editors/tests/ChainedPreferenceStoreTest.java b/org.eclipse.ui.editors.tests/src/org/eclipse/ui/editors/tests/ChainedPreferenceStoreTest.java index a020b28d449..8ddf3d09acc 100644 --- a/org.eclipse.ui.editors.tests/src/org/eclipse/ui/editors/tests/ChainedPreferenceStoreTest.java +++ b/org.eclipse.ui.editors.tests/src/org/eclipse/ui/editors/tests/ChainedPreferenceStoreTest.java @@ -29,6 +29,7 @@ public class ChainedPreferenceStoreTest extends TestCase { private class PropertyChangeListener implements IPropertyChangeListener { + @Override public void propertyChange(PropertyChangeEvent event) { fEvents.add(event); } diff --git a/org.eclipse.ui.editors.tests/src/org/eclipse/ui/editors/tests/EncodingChangeTests.java b/org.eclipse.ui.editors.tests/src/org/eclipse/ui/editors/tests/EncodingChangeTests.java index 7478d5fc31d..ad3feb1c2a4 100644 --- a/org.eclipse.ui.editors.tests/src/org/eclipse/ui/editors/tests/EncodingChangeTests.java +++ b/org.eclipse.ui.editors.tests/src/org/eclipse/ui/editors/tests/EncodingChangeTests.java @@ -77,9 +77,7 @@ public class EncodingChangeTests extends TestCase { return ORIGINAL_CONTENT; } - /* - * @see junit.framework.TestCase#setUp() - */ + @Override protected void setUp() throws Exception { IFolder folder= ResourceHelper.createFolder("EncodingChangeTestProject/EncodingChangeTests/"); fFile= ResourceHelper.createFile(folder, "file" + fCount + ".txt", getOriginalContent()); @@ -87,9 +85,7 @@ public class EncodingChangeTests extends TestCase { fCount++; } - /* - * @see junit.framework.TestCase#tearDown() - */ + @Override protected void tearDown() throws Exception { closeEditor(fEditor); fEditor= null; diff --git a/org.eclipse.ui.editors.tests/src/org/eclipse/ui/editors/tests/GotoLineTest.java b/org.eclipse.ui.editors.tests/src/org/eclipse/ui/editors/tests/GotoLineTest.java index c7418d833a6..1ec6f4e58e4 100644 --- a/org.eclipse.ui.editors.tests/src/org/eclipse/ui/editors/tests/GotoLineTest.java +++ b/org.eclipse.ui.editors.tests/src/org/eclipse/ui/editors/tests/GotoLineTest.java @@ -59,17 +59,13 @@ public class GotoLineTest extends TestCase { return ORIGINAL_CONTENT; } - /* - * @see junit.framework.TestCase#setUp() - */ + @Override protected void setUp() throws Exception { IFolder folder= ResourceHelper.createFolder("GoToLineTestProject/goToLineTests/"); fFile= ResourceHelper.createFile(folder, "file.txt", getOriginalContent()); } - /* - * @see junit.framework.TestCase#tearDown() - */ + @Override protected void tearDown() throws Exception { ResourceHelper.deleteProject("GoToLineTestProject"); fFile= null; diff --git a/org.eclipse.ui.editors.tests/src/org/eclipse/ui/editors/tests/MarkerAnnotationOrderTest.java b/org.eclipse.ui.editors.tests/src/org/eclipse/ui/editors/tests/MarkerAnnotationOrderTest.java index cd79c0e6601..6820ccc2467 100644 --- a/org.eclipse.ui.editors.tests/src/org/eclipse/ui/editors/tests/MarkerAnnotationOrderTest.java +++ b/org.eclipse.ui.editors.tests/src/org/eclipse/ui/editors/tests/MarkerAnnotationOrderTest.java @@ -50,6 +50,7 @@ public class MarkerAnnotationOrderTest extends TestCase { return new TestSuite(MarkerAnnotationOrderTest.class); } + @Override protected void setUp() throws Exception { //add the marker updater extension point IExtensionRegistry registry= Platform.getExtensionRegistry(); @@ -70,6 +71,7 @@ public class MarkerAnnotationOrderTest extends TestCase { } } + @Override protected void tearDown() throws Exception { // remove the marker updater extension point IExtensionRegistry registry= Platform.getExtensionRegistry(); @@ -86,6 +88,7 @@ public class MarkerAnnotationOrderTest extends TestCase { ILog log= Platform.getLog(bundle); log.addLogListener(new ILogListener() { + @Override public void logging(IStatus status, String plugin) { list.add(status); } @@ -115,16 +118,20 @@ public class MarkerAnnotationOrderTest extends TestCase { } public class TestMarkerAnnotationModel extends AbstractMarkerAnnotationModel { + @Override protected IMarker[] retrieveMarkers() throws CoreException { return null; } + @Override protected void deleteMarkers(IMarker[] markers) throws CoreException { } + @Override protected void listenToMarkerChanges(boolean listen) { } + @Override protected boolean isAcceptable(IMarker marker) { return false; } diff --git a/org.eclipse.ui.editors.tests/src/org/eclipse/ui/editors/tests/SegmentedModeTest.java b/org.eclipse.ui.editors.tests/src/org/eclipse/ui/editors/tests/SegmentedModeTest.java index b3481fed05f..2c72eb47663 100644 --- a/org.eclipse.ui.editors.tests/src/org/eclipse/ui/editors/tests/SegmentedModeTest.java +++ b/org.eclipse.ui.editors.tests/src/org/eclipse/ui/editors/tests/SegmentedModeTest.java @@ -50,17 +50,13 @@ public class SegmentedModeTest extends TestCase { return ORIGINAL_CONTENT; } - /* - * @see junit.framework.TestCase#setUp() - */ + @Override protected void setUp() throws Exception { IFolder folder= ResourceHelper.createFolder("project/folderA/folderB/"); fFile= ResourceHelper.createFile(folder, "file.txt", getOriginalContent()); } - /* - * @see junit.framework.TestCase#tearDown() - */ + @Override protected void tearDown() throws Exception { ResourceHelper.deleteProject("project"); } diff --git a/org.eclipse.ui.editors/src/org/eclipse/ui/editors/text/DefaultEncodingSupport.java b/org.eclipse.ui.editors/src/org/eclipse/ui/editors/text/DefaultEncodingSupport.java index 8dede43cc36..146c202d52d 100644 --- a/org.eclipse.ui.editors/src/org/eclipse/ui/editors/text/DefaultEncodingSupport.java +++ b/org.eclipse.ui.editors/src/org/eclipse/ui/editors/text/DefaultEncodingSupport.java @@ -76,9 +76,11 @@ public class DefaultEncodingSupport implements IEncodingSupport { IEclipsePreferences prefs= InstanceScope.INSTANCE.getNode(ResourcesPlugin.PI_RESOURCES); fPreferenceChangeListener= new IPreferenceChangeListener() { + @Override public void preferenceChange(PreferenceChangeEvent event) { if (ResourcesPlugin.PREF_ENCODING.equals(event.getKey())) { Runnable runnable= new Runnable() { + @Override public void run() { setEncoding(null, false); // null means: use default } @@ -142,7 +144,8 @@ public class DefaultEncodingSupport implements IEncodingSupport { provider.setEncoding(input, encoding); Runnable encodingSetter= new Runnable() { - public void run() { + @Override + public void run() { fTextEditor.doRevertToSaved(); } }; @@ -156,16 +159,12 @@ public class DefaultEncodingSupport implements IEncodingSupport { } } - /* - * @see IEncodingSupport#setEncoding(String) - */ + @Override public void setEncoding(String encoding) { setEncoding(encoding, true); } - /* - * @see IEncodingSupport#getEncoding() - */ + @Override public String getEncoding() { IDocumentProvider p= fTextEditor.getDocumentProvider(); if (p instanceof IStorageDocumentProvider) { @@ -175,9 +174,7 @@ public class DefaultEncodingSupport implements IEncodingSupport { return null; } - /* - * @see IEncodingSupport#getDefaultEncoding() - */ + @Override public String getDefaultEncoding() { IDocumentProvider p= fTextEditor.getDocumentProvider(); if (p instanceof IStorageDocumentProvider) { @@ -297,6 +294,7 @@ public class DefaultEncodingSupport implements IEncodingSupport { /* * @see org.eclipse.swt.events.SelectionAdapter#widgetDefaultSelected(org.eclipse.swt.events.SelectionEvent) */ + @Override public void widgetSelected(SelectionEvent e) { action.run(); } diff --git a/org.eclipse.ui.editors/src/org/eclipse/ui/editors/text/DocumentReader.java b/org.eclipse.ui.editors/src/org/eclipse/ui/editors/text/DocumentReader.java index 870f3d11d31..e545e2a00f2 100644 --- a/org.eclipse.ui.editors/src/org/eclipse/ui/editors/text/DocumentReader.java +++ b/org.eclipse.ui.editors/src/org/eclipse/ui/editors/text/DocumentReader.java @@ -52,16 +52,12 @@ class DocumentReader extends Reader { fDocument= document; } - /* - * @see java.lang.CharSequence#length() - */ + @Override public int length() { return fDocument.getLength(); } - /* - * @see java.lang.CharSequence#charAt(int) - */ + @Override public char charAt(int index) { try { return fDocument.getChar(index); @@ -70,9 +66,7 @@ class DocumentReader extends Reader { } } - /* - * @see java.lang.CharSequence#subSequence(int, int) - */ + @Override public CharSequence subSequence(int start, int end) { try { return fDocument.get(start, end - start); @@ -87,16 +81,12 @@ class DocumentReader extends Reader { */ private class InternalDocumentListener implements IDocumentListener { - /* - * @see org.eclipse.jface.text.IDocumentListener#documentAboutToBeChanged(org.eclipse.jface.text.DocumentEvent) - */ + @Override public void documentAboutToBeChanged(DocumentEvent event) { handleDocumentAboutToBeChanged(); } - /* - * @see org.eclipse.jface.text.IDocumentListener#documentChanged(org.eclipse.jface.text.DocumentEvent) - */ + @Override public void documentChanged(DocumentEvent event) { } } @@ -130,9 +120,7 @@ class DocumentReader extends Reader { fLength= fCharSequence.length(); } - /* - * @see java.io.InputStream#close() - */ + @Override public void close() throws IOException { synchronized (this) { fCharSequence= null; @@ -166,10 +154,7 @@ class DocumentReader extends Reader { fDocumentListener= null; } - /* - * @see java.io.Reader#read(char[], int, int) - * @since 3.1 - */ + @Override public int read(char[] cbuf, int off, int len) throws IOException { int i= 0; try { diff --git a/org.eclipse.ui.editors/src/org/eclipse/ui/editors/text/EditorsUI.java b/org.eclipse.ui.editors/src/org/eclipse/ui/editors/text/EditorsUI.java index 1e625d2614e..dbcd3f53426 100644 --- a/org.eclipse.ui.editors/src/org/eclipse/ui/editors/text/EditorsUI.java +++ b/org.eclipse.ui.editors/src/org/eclipse/ui/editors/text/EditorsUI.java @@ -152,6 +152,7 @@ public final class EditorsUI { * @see org.eclipse.core.runtime.Plugin#getPluginPreferences() * @deprecated As of 3.5, replaced by {@link #getPreferenceStore()} */ + @Deprecated public static org.eclipse.core.runtime.Preferences getPluginPreferences() { return EditorsPlugin.getDefault().getPluginPreferences(); } diff --git a/org.eclipse.ui.editors/src/org/eclipse/ui/editors/text/EncodingActionGroup.java b/org.eclipse.ui.editors/src/org/eclipse/ui/editors/text/EncodingActionGroup.java index 3000cb58445..8eec21f8c94 100644 --- a/org.eclipse.ui.editors/src/org/eclipse/ui/editors/text/EncodingActionGroup.java +++ b/org.eclipse.ui.editors/src/org/eclipse/ui/editors/text/EncodingActionGroup.java @@ -48,6 +48,7 @@ import org.eclipse.ui.texteditor.TextEditorAction; * @since 2.0 * @deprecated As of 3.1, encoding needs to be changed via properties dialog */ +@Deprecated public class EncodingActionGroup extends ActionGroup { private static final String FILE_CONTENT_ENCODING_FORMAT= TextEditorMessages.ResourceInfo_fileContentEncodingFormat; @@ -109,9 +110,7 @@ public class EncodingActionGroup extends ActionGroup { return null; } - /* - * @see IAction#run() - */ + @Override public void run() { IEncodingSupport s= getEncodingSupport(); if (s != null) @@ -146,9 +145,7 @@ public class EncodingActionGroup extends ActionGroup { return null; } - /* - * @see IUpdate#update() - */ + @Override public void update() { if (fEncoding == null) { @@ -243,17 +240,13 @@ public class EncodingActionGroup extends ActionGroup { super(bundle, prefix, editor); } - /* - * @see IUpdate#update() - */ + @Override public void update() { ITextEditor editor= getTextEditor(); setEnabled(editor != null && !editor.isDirty()); } - /* - * @see IAction#run() - */ + @Override public void run() { ITextEditor editor= getTextEditor(); @@ -267,6 +260,7 @@ public class EncodingActionGroup extends ActionGroup { String title= TextEditorMessages.Editor_ConvertEncoding_Custom_dialog_title; String message= TextEditorMessages.Editor_ConvertEncoding_Custom_dialog_message; IInputValidator inputValidator = new IInputValidator() { + @Override public String isValid(String newText) { return (newText == null || newText.length() == 0) ? " " : null; //$NON-NLS-1$ } @@ -350,15 +344,14 @@ public class EncodingActionGroup extends ActionGroup { fRetargetActions.add(new RetargetTextEditorAction(TextEditorMessages.getBundleForConstructedKeys(), "Editor.ConvertEncoding.Custom.", IEncodingActionsConstants.CUSTOM, IAction.AS_PUSH_BUTTON)); //$NON-NLS-1$ } - /* - * @see ActionGroup#fillActionBars(org.eclipse.ui.IActionBars) - */ + @Override public void fillActionBars(IActionBars actionBars) { IMenuManager menuManager= actionBars.getMenuManager(); IMenuManager editMenu= menuManager.findMenuUsingPath(IWorkbenchActionConstants.M_EDIT); if (editMenu != null && fRetargetActions.size() > 0) { MenuManager subMenu= new MenuManager(TextEditorMessages.Editor_ConvertEncoding_submenu_label); subMenu.addMenuListener(new IMenuListener() { + @Override public void menuAboutToShow(IMenuManager manager) { update(); } @@ -447,9 +440,7 @@ public class EncodingActionGroup extends ActionGroup { ((IUpdate) a).update(); } - /* - * @see ActionGroup#dispose() - */ + @Override public void dispose() { if (fTextEditor != null) { fTextEditor.setAction(IEncodingActionsConstants.SYSTEM, null); diff --git a/org.eclipse.ui.editors/src/org/eclipse/ui/editors/text/FileBufferOperationAction.java b/org.eclipse.ui.editors/src/org/eclipse/ui/editors/text/FileBufferOperationAction.java index 59b7e96d3c1..598ecb548f7 100644 --- a/org.eclipse.ui.editors/src/org/eclipse/ui/editors/text/FileBufferOperationAction.java +++ b/org.eclipse.ui.editors/src/org/eclipse/ui/editors/text/FileBufferOperationAction.java @@ -65,25 +65,19 @@ public class FileBufferOperationAction extends Action implements IWorkbenchWindo fFileBufferOperation= fileBufferOperation; } - /* - * @see org.eclipse.ui.IWorkbenchWindowActionDelegate#dispose() - */ + @Override public void dispose() { fResources= null; fWindow= null; fFileBufferOperation= null; } - /* - * @see org.eclipse.ui.IWorkbenchWindowActionDelegate#init(org.eclipse.ui.IWorkbenchWindow) - */ + @Override public void init(IWorkbenchWindow window) { fWindow= window; } - /* - * @see org.eclipse.ui.IActionDelegate#selectionChanged(org.eclipse.jface.action.IAction, org.eclipse.jface.viewers.ISelection) - */ + @Override public void selectionChanged(IAction action, ISelection selection) { fResources= new HashSet(); @@ -142,9 +136,7 @@ public class FileBufferOperationAction extends Action implements IWorkbenchWindo return window == null ? null : window.getShell(); } - /* - * @see org.eclipse.ui.IActionDelegate#run(org.eclipse.jface.action.IAction) - */ + @Override public void run(IAction action) { if (fResources != null && !fResources.isEmpty()) { IFile[] files= collectFiles((IResource[]) fResources.toArray(new IResource[fResources.size()])); @@ -173,6 +165,7 @@ public class FileBufferOperationAction extends Action implements IWorkbenchWindo protected final void doRun(final IFile[] files, final IPath location, final IFileBufferOperation fileBufferOperation) { Job job= new Job(fileBufferOperation.getOperationName()) { + @Override protected IStatus run(IProgressMonitor monitor) { IStatus status; diff --git a/org.eclipse.ui.editors/src/org/eclipse/ui/editors/text/FileBufferOperationHandler.java b/org.eclipse.ui.editors/src/org/eclipse/ui/editors/text/FileBufferOperationHandler.java index 7cc261c11af..24ec9c2fe76 100644 --- a/org.eclipse.ui.editors/src/org/eclipse/ui/editors/text/FileBufferOperationHandler.java +++ b/org.eclipse.ui.editors/src/org/eclipse/ui/editors/text/FileBufferOperationHandler.java @@ -188,6 +188,7 @@ public class FileBufferOperationHandler extends AbstractHandler { */ protected final void doRun(final IFile[] files, final IPath location, final IFileBufferOperation fileBufferOperation) { Job job= new Job(fileBufferOperation.getOperationName()) { + @Override protected IStatus run(IProgressMonitor monitor) { IStatus status; @@ -269,10 +270,7 @@ public class FileBufferOperationHandler extends AbstractHandler { return true; } - /* - * @see org.eclipse.core.commands.IHandler#execute(org.eclipse.core.commands.ExecutionEvent) - * @since 3.1 - */ + @Override public Object execute(ExecutionEvent event) throws ExecutionException { computeSelectedResources(); try { diff --git a/org.eclipse.ui.editors/src/org/eclipse/ui/editors/text/FileDocumentProvider.java b/org.eclipse.ui.editors/src/org/eclipse/ui/editors/text/FileDocumentProvider.java index 1704124bf43..61e86952eab 100644 --- a/org.eclipse.ui.editors/src/org/eclipse/ui/editors/text/FileDocumentProvider.java +++ b/org.eclipse.ui.editors/src/org/eclipse/ui/editors/text/FileDocumentProvider.java @@ -149,9 +149,7 @@ public class FileDocumentProvider extends StorageDocumentProvider { protected void execute(IFileEditorInput input) throws Exception { } - /* - * @see java.lang.Runnable#run() - */ + @Override public void run() { if (getElementInfo(fInput) == null) { @@ -197,6 +195,7 @@ public class FileDocumentProvider extends StorageDocumentProvider { * @param fileEditorInput the editor input to be synchronized * @deprecated use <code>FileSynchronizer(IFileEditorInput)</code> */ + @Deprecated public FileSynchronizer(FileEditorInput fileEditorInput) { fFileEditorInput= fileEditorInput; } @@ -226,9 +225,7 @@ public class FileDocumentProvider extends StorageDocumentProvider { fIsInstalled= false; } - /* - * @see IResourceChangeListener#resourceChanged(IResourceChangeEvent) - */ + @Override public void resourceChanged(IResourceChangeEvent e) { IResourceDelta delta= e.getDelta(); try { @@ -239,9 +236,7 @@ public class FileDocumentProvider extends StorageDocumentProvider { } } - /* - * @see IResourceDeltaVisitor#visit(org.eclipse.core.resources.IResourceDelta) - */ + @Override public boolean visit(IResourceDelta delta) throws CoreException { if (delta == null) return false; @@ -262,6 +257,7 @@ public class FileDocumentProvider extends StorageDocumentProvider { boolean isSynchronized= computeModificationStamp(getFile()) == info.fModificationStamp; if ((IResourceDelta.ENCODING & delta.getFlags()) != 0 && isSynchronized) { runnable= new SafeChange(fFileEditorInput) { + @Override protected void execute(IFileEditorInput input) throws Exception { handleElementContentChanged(input); } @@ -270,6 +266,7 @@ public class FileDocumentProvider extends StorageDocumentProvider { if (runnable == null && (IResourceDelta.CONTENT & delta.getFlags()) != 0 && !isSynchronized) { runnable= new SafeChange(fFileEditorInput) { + @Override protected void execute(IFileEditorInput input) throws Exception { handleElementContentChanged(input); } @@ -281,6 +278,7 @@ public class FileDocumentProvider extends StorageDocumentProvider { if ((IResourceDelta.MOVED_TO & delta.getFlags()) != 0) { final IPath path= delta.getMovedToPath(); runnable= new SafeChange(fFileEditorInput) { + @Override protected void execute(IFileEditorInput input) throws Exception { handleElementMoved(input, path); } @@ -289,6 +287,7 @@ public class FileDocumentProvider extends StorageDocumentProvider { info= (FileInfo) getElementInfo(fFileEditorInput); if (info != null && !info.fCanBeSaved) { runnable= new SafeChange(fFileEditorInput) { + @Override protected void execute(IFileEditorInput input) throws Exception { handleElementDeleted(input); } @@ -372,6 +371,8 @@ public class FileDocumentProvider extends StorageDocumentProvider { * @deprecated use file encoding based version * @since 2.0 */ + @Deprecated + @Override protected boolean setDocumentContent(IDocument document, IEditorInput editorInput) throws CoreException { if (editorInput instanceof IFileEditorInput) { IFile file= ((IFileEditorInput) editorInput).getFile(); @@ -389,10 +390,7 @@ public class FileDocumentProvider extends StorageDocumentProvider { return super.setDocumentContent(document, editorInput); } - /* - * @see StorageDocumentProvider#setDocumentContent(IDocument, IEditorInput, String) - * @since 2.0 - */ + @Override protected boolean setDocumentContent(IDocument document, IEditorInput editorInput, String encoding) throws CoreException { if (editorInput instanceof IFileEditorInput) { IFile file= ((IFileEditorInput) editorInput).getFile(); @@ -440,9 +438,7 @@ public class FileDocumentProvider extends StorageDocumentProvider { return super.setDocumentContent(document, editorInput, encoding); } - /* - * @see AbstractDocumentProvider#createAnnotationModel(Object) - */ + @Override protected IAnnotationModel createAnnotationModel(Object element) throws CoreException { if (element instanceof IFileEditorInput) { IFileEditorInput input= (IFileEditorInput) element; @@ -486,9 +482,7 @@ public class FileDocumentProvider extends StorageDocumentProvider { return modificationStamp; } - /* - * @see IDocumentProvider#getModificationStamp(Object) - */ + @Override public long getModificationStamp(Object element) { if (element instanceof IFileEditorInput) { @@ -499,9 +493,7 @@ public class FileDocumentProvider extends StorageDocumentProvider { return super.getModificationStamp(element); } - /* - * @see IDocumentProvider#getSynchronizationStamp(Object) - */ + @Override public long getSynchronizationStamp(Object element) { if (element instanceof IFileEditorInput) { @@ -513,10 +505,7 @@ public class FileDocumentProvider extends StorageDocumentProvider { return super.getSynchronizationStamp(element); } - /* - * @see org.eclipse.ui.texteditor.AbstractDocumentProvider#doSynchronize(java.lang.Object) - * @since 3.0 - */ + @Override protected void doSynchronize(Object element, IProgressMonitor monitor) throws CoreException { if (element instanceof IFileEditorInput) { @@ -541,9 +530,7 @@ public class FileDocumentProvider extends StorageDocumentProvider { super.doSynchronize(element, monitor); } - /* - * @see IDocumentProvider#isDeleted(Object) - */ + @Override public boolean isDeleted(Object element) { if (element instanceof IFileEditorInput) { @@ -559,9 +546,7 @@ public class FileDocumentProvider extends StorageDocumentProvider { return super.isDeleted(element); } - /* - * @see AbstractDocumentProvider#doSaveDocument(IProgressMonitor, Object, IDocument, boolean) - */ + @Override protected void doSaveDocument(IProgressMonitor monitor, Object element, IDocument document, boolean overwrite) throws CoreException { if (element instanceof IFileEditorInput) { @@ -716,9 +701,7 @@ public class FileDocumentProvider extends StorageDocumentProvider { } } - /* - * @see AbstractDocumentProvider#createElementInfo(Object) - */ + @Override protected ElementInfo createElementInfo(Object element) throws CoreException { if (element instanceof IFileEditorInput) { @@ -793,9 +776,7 @@ public class FileDocumentProvider extends StorageDocumentProvider { return Platform.getPreferencesService().getString(Platform.PI_RUNTIME, Platform.PREF_LINE_SEPARATOR, null, scopeContext); } - /* - * @see AbstractDocumentProvider#disposeElementInfo(Object, ElementInfo) - */ + @Override protected void disposeElementInfo(Object element, ElementInfo info) { if (info instanceof FileInfo) { FileInfo fileInfo= (FileInfo) info; @@ -894,14 +875,12 @@ public class FileDocumentProvider extends StorageDocumentProvider { * @see AbstractDocumentProvider#getElementInfo(Object) * It's only here to circumvent visibility issues with certain compilers. */ + @Override protected ElementInfo getElementInfo(Object element) { return super.getElementInfo(element); } - /* - * @see AbstractDocumentProvider#doValidateState(Object, Object) - * @since 2.0 - */ + @Override protected void doValidateState(Object element, Object computationContext) throws CoreException { if (element instanceof IFileEditorInput) { @@ -940,10 +919,7 @@ public class FileDocumentProvider extends StorageDocumentProvider { return false; } - /* - * @see IDocumentProviderExtension#isModifiable(Object) - * @since 2.0 - */ + @Override public boolean isModifiable(Object element) { if (!isStateValidated(element)) { if (element instanceof IFileEditorInput) @@ -952,10 +928,7 @@ public class FileDocumentProvider extends StorageDocumentProvider { return super.isModifiable(element); } - /* - * @see org.eclipse.ui.texteditor.AbstractDocumentProvider#doResetDocument(java.lang.Object, org.eclipse.core.runtime.IProgressMonitor) - * @since 3.0 - */ + @Override protected void doResetDocument(Object element, IProgressMonitor monitor) throws CoreException { if (element instanceof IFileEditorInput) { IFileEditorInput input= (IFileEditorInput) element; @@ -1002,10 +975,7 @@ public class FileDocumentProvider extends StorageDocumentProvider { } } - /* - * @see org.eclipse.ui.texteditor.IDocumentProviderExtension3#isSynchronized(java.lang.Object) - * @since 3.0 - */ + @Override public boolean isSynchronized(Object element) { if (element instanceof IFileEditorInput) { if (getElementInfo(element) != null) { @@ -1018,10 +988,7 @@ public class FileDocumentProvider extends StorageDocumentProvider { return super.isSynchronized(element); } - /* - * @see org.eclipse.ui.texteditor.IDocumentProviderExtension4#getContentType(java.lang.Object) - * @since 3.1 - */ + @Override public IContentType getContentType(Object element) throws CoreException { IContentType contentType= null; if (!canSaveDocument(element) && element instanceof IFileEditorInput) @@ -1062,6 +1029,7 @@ public class FileDocumentProvider extends StorageDocumentProvider { * @return the persisted encoding * @since 2.1 */ + @Override protected String getPersistedEncoding(Object element) { if (element instanceof IFileEditorInput) { IFileEditorInput editorInput= (IFileEditorInput)element; @@ -1103,6 +1071,7 @@ public class FileDocumentProvider extends StorageDocumentProvider { * @throws org.eclipse.core.runtime.CoreException if persisting the encoding fails * @since 2.1 */ + @Override protected void persistEncoding(Object element, String encoding) throws CoreException { if (element instanceof IFileEditorInput) { IFileEditorInput editorInput= (IFileEditorInput)element; @@ -1120,10 +1089,7 @@ public class FileDocumentProvider extends StorageDocumentProvider { } } - /* - * @see org.eclipse.ui.texteditor.AbstractDocumentProvider#getOperationRunner(org.eclipse.core.runtime.IProgressMonitor) - * @since 3.0 - */ + @Override protected IRunnableContext getOperationRunner(IProgressMonitor monitor) { if (fOperationRunner == null) fOperationRunner = new WorkspaceOperationRunner(); @@ -1131,10 +1097,7 @@ public class FileDocumentProvider extends StorageDocumentProvider { return fOperationRunner; } - /* - * @see org.eclipse.ui.texteditor.AbstractDocumentProvider#getResetRule(java.lang.Object) - * @since 3.0 - */ + @Override protected ISchedulingRule getResetRule(Object element) { if (element instanceof IFileEditorInput) { IFileEditorInput input= (IFileEditorInput) element; @@ -1143,10 +1106,7 @@ public class FileDocumentProvider extends StorageDocumentProvider { return null; } - /* - * @see org.eclipse.ui.texteditor.AbstractDocumentProvider#getSaveRule(java.lang.Object) - * @since 3.0 - */ + @Override protected ISchedulingRule getSaveRule(Object element) { if (element instanceof IFileEditorInput) { IFileEditorInput input= (IFileEditorInput) element; @@ -1155,10 +1115,7 @@ public class FileDocumentProvider extends StorageDocumentProvider { return null; } - /* - * @see org.eclipse.ui.texteditor.AbstractDocumentProvider#getSynchronizeRule(java.lang.Object) - * @since 3.0 - */ + @Override protected ISchedulingRule getSynchronizeRule(Object element) { if (element instanceof IFileEditorInput) { IFileEditorInput input= (IFileEditorInput) element; @@ -1167,10 +1124,7 @@ public class FileDocumentProvider extends StorageDocumentProvider { return null; } - /* - * @see org.eclipse.ui.texteditor.AbstractDocumentProvider#getValidateStateRule(java.lang.Object) - * @since 3.0 - */ + @Override protected ISchedulingRule getValidateStateRule(Object element) { if (element instanceof IFileEditorInput) { IFileEditorInput input= (IFileEditorInput) element; @@ -1215,6 +1169,7 @@ public class FileDocumentProvider extends StorageDocumentProvider { * @since 3.0 * @deprecated as of 3.0 this method is no longer in use and does nothing */ + @Deprecated protected void readUTF8BOM(IFile file, String encoding, Object element) throws CoreException { } diff --git a/org.eclipse.ui.editors/src/org/eclipse/ui/editors/text/ForwardingDocumentProvider.java b/org.eclipse.ui.editors/src/org/eclipse/ui/editors/text/ForwardingDocumentProvider.java index 4a24195ffa0..f83346edd25 100644 --- a/org.eclipse.ui.editors/src/org/eclipse/ui/editors/text/ForwardingDocumentProvider.java +++ b/org.eclipse.ui.editors/src/org/eclipse/ui/editors/text/ForwardingDocumentProvider.java @@ -107,9 +107,7 @@ public class ForwardingDocumentProvider implements IDocumentProvider, IDocumentP fParentProvider= parentProvider; } - /* - * @see org.eclipse.ui.texteditor.IDocumentProvider#connect(java.lang.Object) - */ + @Override public void connect(Object element) throws CoreException { fParentProvider.connect(element); IDocument document= fParentProvider.getDocument(element); @@ -120,107 +118,77 @@ public class ForwardingDocumentProvider implements IDocumentProvider, IDocumentP } } - /* - * @see org.eclipse.ui.texteditor.IDocumentProvider#disconnect(java.lang.Object) - */ + @Override public void disconnect(Object element) { fParentProvider.disconnect(element); } - /* - * @see org.eclipse.ui.texteditor.IDocumentProvider#getDocument(java.lang.Object) - */ + @Override public IDocument getDocument(Object element) { return fParentProvider.getDocument(element); } - /* - * @see org.eclipse.ui.texteditor.IDocumentProvider#resetDocument(java.lang.Object) - */ + @Override public void resetDocument(Object element) throws CoreException { fParentProvider.resetDocument(element); } - /* - * @see org.eclipse.ui.texteditor.IDocumentProvider#saveDocument(org.eclipse.core.runtime.IProgressMonitor, java.lang.Object, org.eclipse.jface.text.IDocument, boolean) - */ + @Override public void saveDocument(IProgressMonitor monitor, Object element, IDocument document, boolean overwrite) throws CoreException { fParentProvider.saveDocument(monitor, element, document, overwrite); } - /* - * @see org.eclipse.ui.texteditor.IDocumentProvider#getModificationStamp(java.lang.Object) - */ + @Override public long getModificationStamp(Object element) { return fParentProvider.getModificationStamp(element); } - /* - * @see org.eclipse.ui.texteditor.IDocumentProvider#getSynchronizationStamp(java.lang.Object) - */ + @Override public long getSynchronizationStamp(Object element) { return fParentProvider.getSynchronizationStamp(element); } - /* - * @see org.eclipse.ui.texteditor.IDocumentProvider#isDeleted(java.lang.Object) - */ + @Override public boolean isDeleted(Object element) { return fParentProvider.isDeleted(element); } - /* - * @see org.eclipse.ui.texteditor.IDocumentProvider#mustSaveDocument(java.lang.Object) - */ + @Override public boolean mustSaveDocument(Object element) { return fParentProvider.mustSaveDocument(element); } - /* - * @see org.eclipse.ui.texteditor.IDocumentProvider#canSaveDocument(java.lang.Object) - */ + @Override public boolean canSaveDocument(Object element) { return fParentProvider.canSaveDocument(element); } - /* - * @see org.eclipse.ui.texteditor.IDocumentProvider#getAnnotationModel(java.lang.Object) - */ + @Override public IAnnotationModel getAnnotationModel(Object element) { return fParentProvider.getAnnotationModel(element); } - /* - * @see org.eclipse.ui.texteditor.IDocumentProvider#aboutToChange(java.lang.Object) - */ + @Override public void aboutToChange(Object element) { fParentProvider.aboutToChange(element); } - /* - * @see org.eclipse.ui.texteditor.IDocumentProvider#changed(java.lang.Object) - */ + @Override public void changed(Object element) { fParentProvider.changed(element); } - /* - * @see org.eclipse.ui.texteditor.IDocumentProvider#addElementStateListener(org.eclipse.ui.texteditor.IElementStateListener) - */ + @Override public void addElementStateListener(IElementStateListener listener) { fParentProvider.addElementStateListener(listener); } - /* - * @see org.eclipse.ui.texteditor.IDocumentProvider#removeElementStateListener(org.eclipse.ui.texteditor.IElementStateListener) - */ + @Override public void removeElementStateListener(IElementStateListener listener) { fParentProvider.removeElementStateListener(listener); } - /* - * @see org.eclipse.ui.texteditor.IDocumentProviderExtension#isReadOnly(java.lang.Object) - */ + @Override public boolean isReadOnly(Object element) { if (fParentProvider instanceof IDocumentProviderExtension) { IDocumentProviderExtension extension= (IDocumentProviderExtension)fParentProvider; @@ -229,9 +197,7 @@ public class ForwardingDocumentProvider implements IDocumentProvider, IDocumentP return false; } - /* - * @see org.eclipse.ui.texteditor.IDocumentProviderExtension#isModifiable(java.lang.Object) - */ + @Override public boolean isModifiable(Object element) { if (fParentProvider instanceof IDocumentProviderExtension) { IDocumentProviderExtension extension= (IDocumentProviderExtension)fParentProvider; @@ -240,9 +206,7 @@ public class ForwardingDocumentProvider implements IDocumentProvider, IDocumentP return true; } - /* - * @see org.eclipse.ui.texteditor.IDocumentProviderExtension#validateState(java.lang.Object, java.lang.Object) - */ + @Override public void validateState(Object element, Object computationContext) throws CoreException { if (fParentProvider instanceof IDocumentProviderExtension) { IDocumentProviderExtension extension= (IDocumentProviderExtension)fParentProvider; @@ -250,9 +214,7 @@ public class ForwardingDocumentProvider implements IDocumentProvider, IDocumentP } } - /* - * @see org.eclipse.ui.texteditor.IDocumentProviderExtension#isStateValidated(java.lang.Object) - */ + @Override public boolean isStateValidated(Object element) { if (fParentProvider instanceof IDocumentProviderExtension) { IDocumentProviderExtension extension= (IDocumentProviderExtension)fParentProvider; @@ -261,9 +223,7 @@ public class ForwardingDocumentProvider implements IDocumentProvider, IDocumentP return true; } - /* - * @see org.eclipse.ui.texteditor.IDocumentProviderExtension#updateStateCache(java.lang.Object) - */ + @Override public void updateStateCache(Object element) throws CoreException { if (fParentProvider instanceof IDocumentProviderExtension) { IDocumentProviderExtension extension= (IDocumentProviderExtension)fParentProvider; @@ -271,9 +231,7 @@ public class ForwardingDocumentProvider implements IDocumentProvider, IDocumentP } } - /* - * @see org.eclipse.ui.texteditor.IDocumentProviderExtension#setCanSaveDocument(java.lang.Object) - */ + @Override public void setCanSaveDocument(Object element) { if (fParentProvider instanceof IDocumentProviderExtension) { IDocumentProviderExtension extension= (IDocumentProviderExtension)fParentProvider; @@ -281,9 +239,7 @@ public class ForwardingDocumentProvider implements IDocumentProvider, IDocumentP } } - /* - * @see org.eclipse.ui.texteditor.IDocumentProviderExtension#getStatus(java.lang.Object) - */ + @Override public IStatus getStatus(Object element) { if (fParentProvider instanceof IDocumentProviderExtension) { IDocumentProviderExtension extension= (IDocumentProviderExtension)fParentProvider; @@ -292,9 +248,7 @@ public class ForwardingDocumentProvider implements IDocumentProvider, IDocumentP return null; } - /* - * @see org.eclipse.ui.texteditor.IDocumentProviderExtension#synchronize(java.lang.Object) - */ + @Override public void synchronize(Object element) throws CoreException { if (fParentProvider instanceof IDocumentProviderExtension) { IDocumentProviderExtension extension= (IDocumentProviderExtension)fParentProvider; @@ -302,9 +256,7 @@ public class ForwardingDocumentProvider implements IDocumentProvider, IDocumentP } } - /* - * @see org.eclipse.ui.texteditor.IDocumentProviderExtension2#setProgressMonitor(org.eclipse.core.runtime.IProgressMonitor) - */ + @Override public void setProgressMonitor(IProgressMonitor progressMonitor) { if (fParentProvider instanceof IDocumentProviderExtension2) { IDocumentProviderExtension2 extension= (IDocumentProviderExtension2)fParentProvider; @@ -312,9 +264,7 @@ public class ForwardingDocumentProvider implements IDocumentProvider, IDocumentP } } - /* - * @see org.eclipse.ui.texteditor.IDocumentProviderExtension2#getProgressMonitor() - */ + @Override public IProgressMonitor getProgressMonitor() { if (fParentProvider instanceof IDocumentProviderExtension2) { IDocumentProviderExtension2 extension= (IDocumentProviderExtension2)fParentProvider; @@ -323,9 +273,7 @@ public class ForwardingDocumentProvider implements IDocumentProvider, IDocumentP return null; } - /* - * @see org.eclipse.ui.texteditor.IDocumentProviderExtension3#isSynchronized(java.lang.Object) - */ + @Override public boolean isSynchronized(Object element) { if (fParentProvider instanceof IDocumentProviderExtension3) { IDocumentProviderExtension3 extension= (IDocumentProviderExtension3)fParentProvider; @@ -334,10 +282,7 @@ public class ForwardingDocumentProvider implements IDocumentProvider, IDocumentP return true; } - /* - * @see org.eclipse.ui.texteditor.IDocumentProviderExtension5#isNotSynchronizedException(Object, CoreException) - * @since 3.2 - */ + @Override public boolean isNotSynchronizedException(Object element, CoreException ex) { if (fParentProvider instanceof IDocumentProviderExtension5) { IDocumentProviderExtension5 extension= (IDocumentProviderExtension5)fParentProvider; @@ -346,10 +291,7 @@ public class ForwardingDocumentProvider implements IDocumentProvider, IDocumentP return false; } - /* - * @see org.eclipse.ui.texteditor.IDocumentProviderExtension4#getContentType(java.lang.Object) - * @since 3.1 - */ + @Override public IContentType getContentType(Object element) throws CoreException { if (fParentProvider instanceof IDocumentProviderExtension4) { IDocumentProviderExtension4 extension= (IDocumentProviderExtension4)fParentProvider; @@ -358,9 +300,7 @@ public class ForwardingDocumentProvider implements IDocumentProvider, IDocumentP return null; } - /* - * @see org.eclipse.ui.editors.text.IStorageDocumentProvider#getDefaultEncoding() - */ + @Override public String getDefaultEncoding() { if (fParentProvider instanceof IStorageDocumentProvider) { IStorageDocumentProvider provider= (IStorageDocumentProvider)fParentProvider; @@ -369,9 +309,7 @@ public class ForwardingDocumentProvider implements IDocumentProvider, IDocumentP return null; } - /* - * @see org.eclipse.ui.editors.text.IStorageDocumentProvider#getEncoding(java.lang.Object) - */ + @Override public String getEncoding(Object element) { if (fParentProvider instanceof IStorageDocumentProvider) { IStorageDocumentProvider provider= (IStorageDocumentProvider)fParentProvider; @@ -380,9 +318,7 @@ public class ForwardingDocumentProvider implements IDocumentProvider, IDocumentP return null; } - /* - * @see org.eclipse.ui.editors.text.IStorageDocumentProvider#setEncoding(java.lang.Object, java.lang.String) - */ + @Override public void setEncoding(Object element, String encoding) { if (fParentProvider instanceof IStorageDocumentProvider) { IStorageDocumentProvider provider= (IStorageDocumentProvider)fParentProvider; diff --git a/org.eclipse.ui.editors/src/org/eclipse/ui/editors/text/IEncodingActionsConstants.java b/org.eclipse.ui.editors/src/org/eclipse/ui/editors/text/IEncodingActionsConstants.java index 5dd863a2a00..3217edef174 100644 --- a/org.eclipse.ui.editors/src/org/eclipse/ui/editors/text/IEncodingActionsConstants.java +++ b/org.eclipse.ui.editors/src/org/eclipse/ui/editors/text/IEncodingActionsConstants.java @@ -22,6 +22,7 @@ package org.eclipse.ui.editors.text; * @noextend This interface is not intended to be extended by clients. * */ +@Deprecated public interface IEncodingActionsConstants { /** diff --git a/org.eclipse.ui.editors/src/org/eclipse/ui/editors/text/IEncodingActionsDefinitionIds.java b/org.eclipse.ui.editors/src/org/eclipse/ui/editors/text/IEncodingActionsDefinitionIds.java index 2466c67b406..16cf31c6b7a 100644 --- a/org.eclipse.ui.editors/src/org/eclipse/ui/editors/text/IEncodingActionsDefinitionIds.java +++ b/org.eclipse.ui.editors/src/org/eclipse/ui/editors/text/IEncodingActionsDefinitionIds.java @@ -21,6 +21,7 @@ package org.eclipse.ui.editors.text; * @noimplement This interface is not intended to be implemented by clients. * @noextend This interface is not intended to be extended by clients. */ +@Deprecated public interface IEncodingActionsDefinitionIds { /** * Action definition id of the action to change the encoding into default. diff --git a/org.eclipse.ui.editors/src/org/eclipse/ui/editors/text/IEncodingActionsHelpContextIds.java b/org.eclipse.ui.editors/src/org/eclipse/ui/editors/text/IEncodingActionsHelpContextIds.java index fdb13d9d136..e322991c56d 100644 --- a/org.eclipse.ui.editors/src/org/eclipse/ui/editors/text/IEncodingActionsHelpContextIds.java +++ b/org.eclipse.ui.editors/src/org/eclipse/ui/editors/text/IEncodingActionsHelpContextIds.java @@ -23,6 +23,7 @@ import org.eclipse.ui.texteditor.IAbstractTextEditorHelpContextIds; * @noimplement This interface is not intended to be implemented by clients. * @noextend This interface is not intended to be extended by clients. */ +@Deprecated public interface IEncodingActionsHelpContextIds { /** diff --git a/org.eclipse.ui.editors/src/org/eclipse/ui/editors/text/StorageDocumentProvider.java b/org.eclipse.ui.editors/src/org/eclipse/ui/editors/text/StorageDocumentProvider.java index 6f2d4b89675..d3d573795c3 100644 --- a/org.eclipse.ui.editors/src/org/eclipse/ui/editors/text/StorageDocumentProvider.java +++ b/org.eclipse.ui.editors/src/org/eclipse/ui/editors/text/StorageDocumentProvider.java @@ -114,6 +114,7 @@ public class StorageDocumentProvider extends AbstractDocumentProvider implements * * @deprecated use encoding based version instead */ + @Deprecated protected void setDocumentContent(IDocument document, InputStream contentStream) throws CoreException { setDocumentContent(document, contentStream, null); } @@ -172,6 +173,7 @@ public class StorageDocumentProvider extends AbstractDocumentProvider implements * @deprecated use the encoding based version instead * @since 2.0 */ + @Deprecated protected boolean setDocumentContent(IDocument document, IEditorInput editorInput) throws CoreException { return setDocumentContent(document, editorInput, null); } @@ -203,9 +205,7 @@ public class StorageDocumentProvider extends AbstractDocumentProvider implements return false; } - /* - * @see AbstractDocumentProvider#createAnnotationModel(Object) - */ + @Override protected IAnnotationModel createAnnotationModel(Object element) throws CoreException { return null; } @@ -219,9 +219,7 @@ public class StorageDocumentProvider extends AbstractDocumentProvider implements return new Document(); } - /* - * @see AbstractDocumentProvider#createDocument(Object) - */ + @Override protected IDocument createDocument(Object element) throws CoreException { if (element instanceof IEditorInput) { @@ -247,10 +245,7 @@ public class StorageDocumentProvider extends AbstractDocumentProvider implements protected void setupDocument(Object element, IDocument document) { } - /* - * @see AbstractDocumentProvider#createElementInfo(Object) - * @since 2.0 - */ + @Override protected ElementInfo createElementInfo(Object element) throws CoreException { if (element instanceof IStorageEditorInput) { @@ -274,9 +269,7 @@ public class StorageDocumentProvider extends AbstractDocumentProvider implements return super.createElementInfo(element); } - /* - * @see AbstractDocumentProvider#doSaveDocument(IProgressMonitor, Object, IDocument, boolean) - */ + @Override protected void doSaveDocument(IProgressMonitor monitor, Object element, IDocument document, boolean overwrite) throws CoreException { } @@ -323,10 +316,7 @@ public class StorageDocumentProvider extends AbstractDocumentProvider implements } } - /* - * @see IDocumentProviderExtension#isReadOnly(Object) - * @since 2.0 - */ + @Override public boolean isReadOnly(Object element) { if (element instanceof IStorageEditorInput) { StorageInfo info= (StorageInfo) getElementInfo(element); @@ -344,10 +334,7 @@ public class StorageDocumentProvider extends AbstractDocumentProvider implements return super.isReadOnly(element); } - /* - * @see org.eclipse.ui.texteditor.IDocumentProviderExtension5#isNotSynchronizedException(Object, CoreException) - * @since 3.2 - */ + @Override public boolean isNotSynchronizedException(Object element, CoreException ex) { IStatus status= ex.getStatus(); if (status == null || status instanceof MultiStatus) @@ -359,10 +346,7 @@ public class StorageDocumentProvider extends AbstractDocumentProvider implements return status.getCode() == IResourceStatus.OUT_OF_SYNC_LOCAL; } - /* - * @see IDocumentProviderExtension#isModifiable(Object) - * @since 2.0 - */ + @Override public boolean isModifiable(Object element) { if (element instanceof IStorageEditorInput) { StorageInfo info= (StorageInfo) getElementInfo(element); @@ -380,10 +364,7 @@ public class StorageDocumentProvider extends AbstractDocumentProvider implements return super.isModifiable(element); } - /* - * @see AbstractDocumentProvider#doUpdateStateCache(Object) - * @since 2.0 - */ + @Override protected void doUpdateStateCache(Object element) throws CoreException { if (element instanceof IStorageEditorInput) { StorageInfo info= (StorageInfo) getElementInfo(element); @@ -393,18 +374,12 @@ public class StorageDocumentProvider extends AbstractDocumentProvider implements super.doUpdateStateCache(element); } - /* - * @see IStorageDocumentProvider#getDefaultEncoding() - * @since 2.0 - */ + @Override public String getDefaultEncoding() { return ResourcesPlugin.getEncoding(); } - /* - * @see IStorageDocumentProvider#getEncoding(Object) - * @since 2.0 - */ + @Override public String getEncoding(Object element) { if (element instanceof IStorageEditorInput) { StorageInfo info= (StorageInfo) getElementInfo(element); @@ -415,10 +390,7 @@ public class StorageDocumentProvider extends AbstractDocumentProvider implements return null; } - /* - * @see IStorageDocumentProvider#setEncoding(Object, String) - * @since 2.0 - */ + @Override public void setEncoding(Object element, String encoding) { if (element instanceof IStorageEditorInput) { StorageInfo info= (StorageInfo) getElementInfo(element); @@ -433,10 +405,7 @@ public class StorageDocumentProvider extends AbstractDocumentProvider implements } } - /* - * @see org.eclipse.ui.texteditor.IDocumentProviderExtension4#getContentType(java.lang.Object) - * @since 3.1 - */ + @Override public IContentType getContentType(Object element) throws CoreException { if (element instanceof IStorageEditorInput) { IStorage storage= ((IStorageEditorInput) element).getStorage(); @@ -514,10 +483,7 @@ public class StorageDocumentProvider extends AbstractDocumentProvider implements // Default is to do nothing } - /* - * @see org.eclipse.ui.texteditor.AbstractDocumentProvider#getOperationRunner(org.eclipse.core.runtime.IProgressMonitor) - * @since 3.0 - */ + @Override protected IRunnableContext getOperationRunner(IProgressMonitor monitor) { return null; } diff --git a/org.eclipse.ui.editors/src/org/eclipse/ui/editors/text/TextEditor.java b/org.eclipse.ui.editors/src/org/eclipse/ui/editors/text/TextEditor.java index a8895cb3bda..7493d9094b8 100644 --- a/org.eclipse.ui.editors/src/org/eclipse/ui/editors/text/TextEditor.java +++ b/org.eclipse.ui.editors/src/org/eclipse/ui/editors/text/TextEditor.java @@ -71,6 +71,7 @@ public class TextEditor extends AbstractDecoratedTextEditor { * providing a custom source viewer configuration, subclasses may extend * this method. */ + @Override protected void initializeEditor() { super.initializeEditor(); setEditorContextMenuId("#TextEditorContext"); //$NON-NLS-1$ @@ -80,10 +81,7 @@ public class TextEditor extends AbstractDecoratedTextEditor { setInsertMode(INSERT); } - /* - * @see IWorkbenchPart#dispose() - * @since 2.0 - */ + @Override public void dispose() { if (fEncodingSupport != null) { fEncodingSupport.dispose(); @@ -106,26 +104,18 @@ public class TextEditor extends AbstractDecoratedTextEditor { fEncodingSupport.initialize(this); } - /* - * @see org.eclipse.ui.part.EditorPart#isSaveAsAllowed() - */ + @Override public boolean isSaveAsAllowed() { return true; } - /* - * @see AbstractTextEditor#createActions() - * @since 2.0 - */ + @Override protected void createActions() { installEncodingSupport(); super.createActions(); } - /* - * @see StatusTextEditor#getStatusHeader(IStatus) - * @since 2.0 - */ + @Override protected String getStatusHeader(IStatus status) { if (fEncodingSupport != null) { String message= fEncodingSupport.getStatusHeader(status); @@ -135,10 +125,7 @@ public class TextEditor extends AbstractDecoratedTextEditor { return super.getStatusHeader(status); } - /* - * @see StatusTextEditor#getStatusBanner(IStatus) - * @since 2.0 - */ + @Override protected String getStatusBanner(IStatus status) { if (fEncodingSupport != null) { String message= fEncodingSupport.getStatusBanner(status); @@ -148,10 +135,7 @@ public class TextEditor extends AbstractDecoratedTextEditor { return super.getStatusBanner(status); } - /* - * @see StatusTextEditor#getStatusMessage(IStatus) - * @since 2.0 - */ + @Override protected String getStatusMessage(IStatus status) { if (fEncodingSupport != null) { String message= fEncodingSupport.getStatusMessage(status); @@ -161,40 +145,28 @@ public class TextEditor extends AbstractDecoratedTextEditor { return super.getStatusMessage(status); } - /* - * @see AbstractTextEditor#doSetInput(IEditorInput) - * @since 2.0 - */ + @Override protected void doSetInput(IEditorInput input) throws CoreException { super.doSetInput(input); if (fEncodingSupport != null) fEncodingSupport.reset(); } - /* - * @see IAdaptable#getAdapter(java.lang.Class) - * @since 2.0 - */ + @Override public Object getAdapter(Class adapter) { if (IEncodingSupport.class.equals(adapter)) return fEncodingSupport; return super.getAdapter(adapter); } - /* - * @see org.eclipse.ui.texteditor.AbstractTextEditor#updatePropertyDependentActions() - * @since 2.0 - */ + @Override protected void updatePropertyDependentActions() { super.updatePropertyDependentActions(); if (fEncodingSupport != null) fEncodingSupport.reset(); } - /* - * @see org.eclipse.ui.texteditor.AbstractDecoratedTextEditor#handlePreferenceStoreChanged(org.eclipse.jface.util.PropertyChangeEvent) - * @since 3.3 - */ + @Override protected void handlePreferenceStoreChanged(PropertyChangeEvent event) { if (event.getProperty().equals(SpellingService.PREFERENCE_SPELLING_ENABLED)) { ISourceViewer viewer= getSourceViewer(); @@ -218,10 +190,7 @@ public class TextEditor extends AbstractDecoratedTextEditor { super.handlePreferenceStoreChanged(event); } - /* - * @see org.eclipse.ui.texteditor.AbstractTextEditor#editorContextMenuAboutToShow(org.eclipse.jface.action.IMenuManager) - * @since 3.0 - */ + @Override protected void editorContextMenuAboutToShow(IMenuManager menu) { super.editorContextMenuAboutToShow(menu); addAction(menu, ITextEditorActionConstants.GROUP_EDIT, ITextEditorActionConstants.SHIFT_RIGHT); diff --git a/org.eclipse.ui.editors/src/org/eclipse/ui/editors/text/TextEditorActionContributor.java b/org.eclipse.ui.editors/src/org/eclipse/ui/editors/text/TextEditorActionContributor.java index bd89a8c6a05..d5300ca4e2d 100644 --- a/org.eclipse.ui.editors/src/org/eclipse/ui/editors/text/TextEditorActionContributor.java +++ b/org.eclipse.ui.editors/src/org/eclipse/ui/editors/text/TextEditorActionContributor.java @@ -121,10 +121,7 @@ public class TextEditorActionContributor extends BasicTextEditorActionContributo fRetargetShowInformationAction.setAction(getAction(textEditor, ITextEditorActionConstants.SHOW_INFORMATION)); } - /* - * @see org.eclipse.ui.texteditor.BasicTextEditorActionContributor#contributeToMenu(org.eclipse.jface.action.IMenuManager) - * @since 3.3 - */ + @Override public void contributeToMenu(IMenuManager menu) { super.contributeToMenu(menu); @@ -136,25 +133,19 @@ public class TextEditorActionContributor extends BasicTextEditorActionContributo } } - /* - * @see IEditorActionBarContributor#setActiveEditor(org.eclipse.ui.IEditorPart) - */ + @Override public void setActiveEditor(IEditorPart part) { super.setActiveEditor(part); doSetActiveEditor(part); } - /* - * @see IEditorActionBarContributor#dispose() - */ + @Override public void dispose() { doSetActiveEditor(null); super.dispose(); } - /* - * @see EditorActionBarContributor#init(org.eclipse.ui.IActionBars) - */ + @Override public void init(IActionBars bars) { super.init(bars); diff --git a/org.eclipse.ui.editors/src/org/eclipse/ui/editors/text/TextEditorPreferenceConstants.java b/org.eclipse.ui.editors/src/org/eclipse/ui/editors/text/TextEditorPreferenceConstants.java index a50e0d63521..194cad4de0b 100644 --- a/org.eclipse.ui.editors/src/org/eclipse/ui/editors/text/TextEditorPreferenceConstants.java +++ b/org.eclipse.ui.editors/src/org/eclipse/ui/editors/text/TextEditorPreferenceConstants.java @@ -38,6 +38,7 @@ public class TextEditorPreferenceConstants { * </p> * @deprecated As of 3.0, replaced by {@link org.eclipse.ui.texteditor.AbstractDecoratedTextEditorPreferenceConstants} */ + @Deprecated public final static String EDITOR_CURRENT_LINE= "currentLine"; //$NON-NLS-1$ /** @@ -51,6 +52,7 @@ public class TextEditorPreferenceConstants { * @see org.eclipse.jface.preference.PreferenceConverter * @deprecated As of 3.0, replaced by {@link org.eclipse.ui.texteditor.AbstractDecoratedTextEditorPreferenceConstants} */ + @Deprecated public final static String EDITOR_CURRENT_LINE_COLOR= "currentLineColor"; //$NON-NLS-1$ /** @@ -61,6 +63,7 @@ public class TextEditorPreferenceConstants { * </p> * @deprecated As of 3.0, replaced by {@link org.eclipse.ui.texteditor.AbstractDecoratedTextEditorPreferenceConstants} */ + @Deprecated public final static String EDITOR_PRINT_MARGIN= "printMargin"; //$NON-NLS-1$ /** @@ -74,6 +77,7 @@ public class TextEditorPreferenceConstants { * @see org.eclipse.jface.preference.PreferenceConverter * @deprecated As of 3.0,, replaced by {@link org.eclipse.ui.texteditor.AbstractDecoratedTextEditorPreferenceConstants} */ + @Deprecated public final static String EDITOR_PRINT_MARGIN_COLOR= "printMarginColor"; //$NON-NLS-1$ /** @@ -84,6 +88,7 @@ public class TextEditorPreferenceConstants { * </p> * @deprecated As of 3.0,, replaced by {@link org.eclipse.ui.texteditor.AbstractDecoratedTextEditorPreferenceConstants} */ + @Deprecated public final static String EDITOR_PRINT_MARGIN_COLUMN= "printMarginColumn"; //$NON-NLS-1$ /** @@ -96,6 +101,7 @@ public class TextEditorPreferenceConstants { * @since 2.1 * @deprecated As of 3.0, replaced by {@link org.eclipse.ui.texteditor.AbstractDecoratedTextEditorPreferenceConstants} */ + @Deprecated public final static String EDITOR_UNKNOWN_INDICATION= "othersIndication"; //$NON-NLS-1$ /** @@ -111,6 +117,7 @@ public class TextEditorPreferenceConstants { * @since 2.1 * @deprecated As of 3.0, replaced by {@link org.eclipse.ui.texteditor.AbstractDecoratedTextEditorPreferenceConstants} */ + @Deprecated public final static String EDITOR_UNKNOWN_INDICATION_COLOR= "othersIndicationColor"; //$NON-NLS-1$ /** @@ -122,6 +129,7 @@ public class TextEditorPreferenceConstants { * @since 2.1 * @deprecated As of 3.0, replaced by {@link org.eclipse.ui.texteditor.AbstractDecoratedTextEditorPreferenceConstants} */ + @Deprecated public final static String EDITOR_UNKNOWN_INDICATION_IN_OVERVIEW_RULER= "othersIndicationInOverviewRuler"; //$NON-NLS-1$ /** @@ -132,6 +140,7 @@ public class TextEditorPreferenceConstants { * </p> * @deprecated As of 3.0, replaced by {@link org.eclipse.ui.texteditor.AbstractDecoratedTextEditorPreferenceConstants} */ + @Deprecated public final static String EDITOR_OVERVIEW_RULER= "overviewRuler"; //$NON-NLS-1$ /** @@ -142,6 +151,7 @@ public class TextEditorPreferenceConstants { * </p> * @deprecated As of 3.0, replaced by {@link org.eclipse.ui.texteditor.AbstractDecoratedTextEditorPreferenceConstants} */ + @Deprecated public final static String EDITOR_LINE_NUMBER_RULER= "lineNumberRuler"; //$NON-NLS-1$ /** @@ -156,96 +166,115 @@ public class TextEditorPreferenceConstants { * @see #EDITOR_LINE_NUMBER_RULER * @deprecated As of 3.0, replaced by {@link org.eclipse.ui.texteditor.AbstractDecoratedTextEditorPreferenceConstants} */ + @Deprecated public final static String EDITOR_LINE_NUMBER_RULER_COLOR= "lineNumberColor"; //$NON-NLS-1$ /** * @deprecated As of 2.1, provided by <code>org.eclipse.ui.editors.markerAnnotationSpecification</code> extension point */ + @Deprecated public final static String EDITOR_PROBLEM_INDICATION= "problemIndication"; //$NON-NLS-1$ /** * @deprecated As of 2.1, provided by <code>org.eclipse.ui.editors.markerAnnotationSpecification</code> extension point */ + @Deprecated public final static String EDITOR_PROBLEM_INDICATION_COLOR= "problemIndicationColor"; //$NON-NLS-1$ /** * @deprecated As of 2.1, provided by <code>org.eclipse.ui.editors.markerAnnotationSpecification</code> extension point */ + @Deprecated public final static String EDITOR_WARNING_INDICATION= "warningIndication"; //$NON-NLS-1$ /** * @deprecated As of 2.1, provided by <code>org.eclipse.ui.editors.markerAnnotationSpecification</code> extension point */ + @Deprecated public final static String EDITOR_WARNING_INDICATION_COLOR= "warningIndicationColor"; //$NON-NLS-1$ /** * @deprecated As of 2.1, provided by <code>org.eclipse.ui.editors.markerAnnotationSpecification</code> extension point */ + @Deprecated public final static String EDITOR_INFO_INDICATION= "infoIndication"; //$NON-NLS-1$ /** * @deprecated As of 2.1, provided by <code>org.eclipse.ui.editors.markerAnnotationSpecification</code> extension point */ + @Deprecated public final static String EDITOR_INFO_INDICATION_COLOR= "infoIndicationColor"; //$NON-NLS-1$ /** * @deprecated As of 2.1, provided by <code>org.eclipse.ui.editors.markerAnnotationSpecification</code> extension point */ + @Deprecated public final static String EDITOR_TASK_INDICATION= "taskIndication"; //$NON-NLS-1$ /** * @deprecated As of 2.1, provided by <code>org.eclipse.ui.editors.markerAnnotationSpecification</code> extension point */ + @Deprecated public final static String EDITOR_TASK_INDICATION_COLOR= "taskIndicationColor"; //$NON-NLS-1$ /** * @deprecated As of 2.1, provided by <code>org.eclipse.ui.editors.markerAnnotationSpecification</code> extension point */ + @Deprecated public final static String EDITOR_BOOKMARK_INDICATION= "bookmarkIndication"; //$NON-NLS-1$ /** * @deprecated As of 2.1, provided by <code>org.eclipse.ui.editors.markerAnnotationSpecification</code> extension point */ + @Deprecated public final static String EDITOR_BOOKMARK_INDICATION_COLOR= "bookmarkIndicationColor"; //$NON-NLS-1$ /** * @deprecated As of 2.1, provided by <code>org.eclipse.ui.editors.markerAnnotationSpecification</code> extension point */ + @Deprecated public final static String EDITOR_SEARCH_RESULT_INDICATION= "searchResultIndication"; //$NON-NLS-1$ /** * @deprecated As of 2.1, provided by <code>org.eclipse.ui.editors.markerAnnotationSpecification</code> extension point */ + @Deprecated public final static String EDITOR_SEARCH_RESULT_INDICATION_COLOR= "searchResultIndicationColor"; //$NON-NLS-1$ /** * @deprecated As of 2.1, provided by <code>org.eclipse.ui.editors.markerAnnotationSpecification</code> extension point */ + @Deprecated public final static String EDITOR_ERROR_INDICATION_IN_OVERVIEW_RULER= "errorIndicationInOverviewRuler"; //$NON-NLS-1$ /** * @deprecated As of 2.1, provided by <code>org.eclipse.ui.editors.markerAnnotationSpecification</code> extension point */ + @Deprecated public final static String EDITOR_WARNING_INDICATION_IN_OVERVIEW_RULER= "warningIndicationInOverviewRuler"; //$NON-NLS-1$ /** * @deprecated As of 2.1, provided by <code>org.eclipse.ui.editors.markerAnnotationSpecification</code> extension point */ + @Deprecated public final static String EDITOR_INFO_INDICATION_IN_OVERVIEW_RULER= "infoIndicationInOverviewRuler"; //$NON-NLS-1$ /** * @deprecated As of 2.1, provided by <code>org.eclipse.ui.editors.markerAnnotationSpecification</code> extension point */ + @Deprecated public final static String EDITOR_TASK_INDICATION_IN_OVERVIEW_RULER= "taskIndicationInOverviewRuler"; //$NON-NLS-1$ /** * @deprecated As of 2.1, provided by <code>org.eclipse.ui.editors.markerAnnotationSpecification</code> extension point */ + @Deprecated public final static String EDITOR_BOOKMARK_INDICATION_IN_OVERVIEW_RULER= "bookmarkIndicationInOverviewRuler"; //$NON-NLS-1$ /** * @deprecated As of 2.1, provided by <code>org.eclipse.ui.editors.markerAnnotationSpecification</code> extension point */ + @Deprecated public final static String EDITOR_SEARCH_RESULT_INDICATION_IN_OVERVIEW_RULER= "searchResultIndicationInOverviewRuler"; //$NON-NLS-1$ /** diff --git a/org.eclipse.ui.editors/src/org/eclipse/ui/editors/text/TextEditorPreferencePage.java b/org.eclipse.ui.editors/src/org/eclipse/ui/editors/text/TextEditorPreferencePage.java index 7a0ccdb6e38..a99b4f1e717 100644 --- a/org.eclipse.ui.editors/src/org/eclipse/ui/editors/text/TextEditorPreferencePage.java +++ b/org.eclipse.ui.editors/src/org/eclipse/ui/editors/text/TextEditorPreferencePage.java @@ -43,6 +43,7 @@ import org.eclipse.ui.texteditor.AbstractTextEditor; * </p> * @deprecated As of 2.1, fonts are managed by the workbench, no longer supported */ +@Deprecated public class TextEditorPreferencePage extends FieldEditorPreferencePage implements IWorkbenchPreferencePage { /** @@ -62,24 +63,18 @@ public class TextEditorPreferencePage extends FieldEditorPreferencePage implemen setPreferenceStore(new ScopedPreferenceStore(InstanceScope.INSTANCE, "org.eclipse.ui.workbench")); //$NON-NLS-1$ } - /* - * @see IDialogPage#createControl(org.eclipse.swt.widgets.Composite) - */ + @Override public void createControl(Composite parent) { super.createControl(parent); PlatformUI.getWorkbench().getHelpSystem().setHelp(getControl(), ITextEditorHelpContextIds.TEXT_EDITOR_PREFERENCE_PAGE); } - /* - * @see FieldEditorPreferencePage#createFieldEditors() - */ + @Override public void createFieldEditors() { addField(new FontFieldEditor(JFaceResources.TEXT_FONT, TextEditorMessages.PreferencePage_fontEditor, getFieldEditorParent())); } - /* - * @see IWorkbenchPreferencePage#init(org.eclipse.ui.IWorkbench) - */ + @Override public void init(IWorkbench workbench) { } diff --git a/org.eclipse.ui.editors/src/org/eclipse/ui/editors/text/TextFileDocumentProvider.java b/org.eclipse.ui.editors/src/org/eclipse/ui/editors/text/TextFileDocumentProvider.java index 8d0509ee86b..b7b051a8cbe 100644 --- a/org.eclipse.ui.editors/src/org/eclipse/ui/editors/text/TextFileDocumentProvider.java +++ b/org.eclipse.ui.editors/src/org/eclipse/ui/editors/text/TextFileDocumentProvider.java @@ -124,9 +124,7 @@ public class TextFileDocumentProvider implements IDocumentProvider, IDocumentPro */ protected abstract void execute(IProgressMonitor monitor) throws CoreException; - /* - * @see org.eclipse.jface.operation.IRunnableWithProgress#run(org.eclipse.core.runtime.IProgressMonitor) - */ + @Override public void run(IProgressMonitor monitor) throws InvocationTargetException, InterruptedException { try { execute(monitor); @@ -135,9 +133,7 @@ public class TextFileDocumentProvider implements IDocumentProvider, IDocumentPro } } - /* - * @see org.eclipse.ui.texteditor.ISchedulingRuleProvider#getSchedulingRule() - */ + @Override public ISchedulingRule getSchedulingRule() { return ResourcesPlugin.getWorkspace().getRoot(); } @@ -146,40 +142,72 @@ public class TextFileDocumentProvider implements IDocumentProvider, IDocumentPro /** * @deprecated As of 3.3 - do not use */ + @Deprecated static protected class NullProvider implements IDocumentProvider, IDocumentProviderExtension, IDocumentProviderExtension2, IDocumentProviderExtension3, IDocumentProviderExtension4, IDocumentProviderExtension5, IStorageDocumentProvider { static final private IStatus STATUS_ERROR= new Status(IStatus.ERROR, EditorsUI.PLUGIN_ID, IStatus.OK, TextEditorMessages.NullProvider_error, null); + @Override public void connect(Object element) throws CoreException {} + @Override public void disconnect(Object element) {} + @Override public IDocument getDocument(Object element) { return null; } + @Override public void resetDocument(Object element) throws CoreException {} + @Override public void saveDocument(IProgressMonitor monitor, Object element, IDocument document, boolean overwrite) throws CoreException {} + @Override public long getModificationStamp(Object element) { return 0; } + @Override public long getSynchronizationStamp(Object element) { return 0; } + @Override public boolean isDeleted(Object element) { return true; } + @Override public boolean mustSaveDocument(Object element) { return false; } + @Override public boolean canSaveDocument(Object element) { return false; } + @Override public IAnnotationModel getAnnotationModel(Object element) { return null; } + @Override public void aboutToChange(Object element) {} + @Override public void changed(Object element) {} + @Override public void addElementStateListener(IElementStateListener listener) {} + @Override public void removeElementStateListener(IElementStateListener listener) {} + @Override public boolean isReadOnly(Object element) { return true; } + @Override public boolean isModifiable(Object element) { return false; } + @Override public void validateState(Object element, Object computationContext) throws CoreException {} + @Override public boolean isStateValidated(Object element) { return true; } + @Override public void updateStateCache(Object element) throws CoreException {} + @Override public void setCanSaveDocument(Object element) {} + @Override public IStatus getStatus(Object element) { return STATUS_ERROR; } + @Override public void synchronize(Object element) throws CoreException {} + @Override public void setProgressMonitor(IProgressMonitor progressMonitor) {} + @Override public IProgressMonitor getProgressMonitor() { return new NullProgressMonitor(); } + @Override public boolean isSynchronized(Object element) { return true; } + @Override public boolean isNotSynchronizedException(Object element, CoreException ex) { return false; } + @Override public String getDefaultEncoding() { return null; } + @Override public String getEncoding(Object element) { return null; } + @Override public void setEncoding(Object element, String encoding) {} + @Override public IContentType getContentType(Object element) throws CoreException { return null; } } @@ -206,16 +234,12 @@ public class TextFileDocumentProvider implements IDocumentProvider, IDocumentPro fElement= element; } - /* - * @see java.util.Iterator#hasNext() - */ + @Override public boolean hasNext() { return fElement != null; } - /* - * @see java.util.Iterator#next() - */ + @Override public Object next() { if (fElement != null) { Object result= fElement; @@ -225,9 +249,7 @@ public class TextFileDocumentProvider implements IDocumentProvider, IDocumentPro throw new NoSuchElementException(); } - /* - * @see java.util.Iterator#remove() - */ + @Override public void remove() { throw new UnsupportedOperationException(); } @@ -238,9 +260,7 @@ public class TextFileDocumentProvider implements IDocumentProvider, IDocumentPro public FileBufferListener() { } - /* - * @see org.eclipse.core.buffer.text.IBufferedFileListener#bufferContentAboutToBeReplaced(org.eclipse.core.buffer.text.IBufferedFile) - */ + @Override public void bufferContentAboutToBeReplaced(IFileBuffer file) { List list= new ArrayList(fElementStateListeners); Iterator e= list.iterator(); @@ -252,9 +272,7 @@ public class TextFileDocumentProvider implements IDocumentProvider, IDocumentPro } } - /* - * @see org.eclipse.core.buffer.text.IBufferedFileListener#bufferContentReplaced(org.eclipse.core.buffer.text.IBufferedFile) - */ + @Override public void bufferContentReplaced(IFileBuffer file) { List list= new ArrayList(fElementStateListeners); Iterator e= list.iterator(); @@ -266,18 +284,14 @@ public class TextFileDocumentProvider implements IDocumentProvider, IDocumentPro } } - /* - * @see org.eclipse.core.buffer.text.IBufferedFileListener#stateChanging(org.eclipse.core.buffer.text.IBufferedFile) - */ + @Override public void stateChanging(IFileBuffer file) { Iterator i= getElements(file); while (i.hasNext()) fireElementStateChanging(i.next()); } - /* - * @see org.eclipse.core.buffer.text.IBufferedFileListener#dirtyStateChanged(org.eclipse.core.buffer.text.IBufferedFile, boolean) - */ + @Override public void dirtyStateChanged(IFileBuffer file, boolean isDirty) { List list= new ArrayList(fElementStateListeners); Iterator e= list.iterator(); @@ -289,9 +303,7 @@ public class TextFileDocumentProvider implements IDocumentProvider, IDocumentPro } } - /* - * @see org.eclipse.core.buffer.text.IBufferedFileListener#stateValidationChanged(org.eclipse.core.buffer.text.IBufferedFile, boolean) - */ + @Override public void stateValidationChanged(IFileBuffer file, boolean isStateValidated) { List list= new ArrayList(fElementStateListeners); Iterator e= list.iterator(); @@ -306,9 +318,7 @@ public class TextFileDocumentProvider implements IDocumentProvider, IDocumentPro } } - /* - * @see org.eclipse.core.buffer.text.IBufferedFileListener#underlyingFileMoved(org.eclipse.core.buffer.text.IBufferedFile, org.eclipse.core.runtime.IPath) - */ + @Override public void underlyingFileMoved(IFileBuffer file, IPath newLocation) { IWorkspace workspace=ResourcesPlugin.getWorkspace(); IFile newFile= workspace.getRoot().getFile(newLocation); @@ -323,9 +333,7 @@ public class TextFileDocumentProvider implements IDocumentProvider, IDocumentPro } } - /* - * @see org.eclipse.core.buffer.text.IBufferedFileListener#underlyingFileDeleted(org.eclipse.core.buffer.text.IBufferedFile) - */ + @Override public void underlyingFileDeleted(IFileBuffer file) { List list= new ArrayList(fElementStateListeners); Iterator e= list.iterator(); @@ -337,25 +345,19 @@ public class TextFileDocumentProvider implements IDocumentProvider, IDocumentPro } } - /* - * @see org.eclipse.core.buffer.text.IBufferedFileListener#stateChangeFailed(org.eclipse.core.buffer.text.IBufferedFile) - */ + @Override public void stateChangeFailed(IFileBuffer file) { Iterator i= getElements(file); while (i.hasNext()) fireElementStateChangeFailed(i.next()); } - /* - * @see org.eclipse.core.filebuffers.IFileBufferListener#bufferCreated(org.eclipse.core.filebuffers.IFileBuffer) - */ + @Override public void bufferCreated(IFileBuffer buffer) { // ignore } - /* - * @see org.eclipse.core.filebuffers.IFileBufferListener#bufferDisposed(org.eclipse.core.filebuffers.IFileBuffer) - */ + @Override public void bufferDisposed(IFileBuffer buffer) { // ignore } @@ -468,9 +470,7 @@ public class TextFileDocumentProvider implements IDocumentProvider, IDocumentPro } } - /* - * @see org.eclipse.ui.texteditor.IDocumentProvider#connect(java.lang.Object) - */ + @Override public void connect(Object element) throws CoreException { FileInfo info= (FileInfo) fFileInfoMap.get(element); if (info == null) { @@ -635,9 +635,7 @@ public class TextFileDocumentProvider implements IDocumentProvider, IDocumentPro return null; } - /* - * @see org.eclipse.ui.texteditor.IDocumentProvider#disconnect(java.lang.Object) - */ + @Override public void disconnect(Object element) { FileInfo info= (FileInfo) fFileInfoMap.get(element); @@ -714,9 +712,7 @@ public class TextFileDocumentProvider implements IDocumentProvider, IDocumentPro return new SingleElementIterator(value); } - /* - * @see org.eclipse.ui.texteditor.IDocumentProvider#getDocument(java.lang.Object) - */ + @Override public IDocument getDocument(Object element) { FileInfo info= (FileInfo) fFileInfoMap.get(element); if (info != null) @@ -724,16 +720,12 @@ public class TextFileDocumentProvider implements IDocumentProvider, IDocumentPro return getParentProvider().getDocument(element); } - /* - * @see org.eclipse.ui.texteditor.IDocumentProvider#resetDocument(java.lang.Object) - */ + @Override public void resetDocument(Object element) throws CoreException { final FileInfo info= (FileInfo) fFileInfoMap.get(element); if (info != null) { DocumentProviderOperation operation= new DocumentProviderOperation() { - /* - * @see org.eclipse.ui.editors.text.TextFileDocumentProvider.DocumentProviderOperation#execute(org.eclipse.core.runtime.IProgressMonitor) - */ + @Override protected void execute(IProgressMonitor monitor) throws CoreException { info.fTextFileBuffer.revert(monitor); @@ -742,9 +734,7 @@ public class TextFileDocumentProvider implements IDocumentProvider, IDocumentPro markerModel.resetMarkers(); } } - /* - * @see org.eclipse.ui.editors.text.TextFileDocumentProvider.DocumentProviderOperation#getSchedulingRule() - */ + @Override public ISchedulingRule getSchedulingRule() { if (info.fElement instanceof IFileEditorInput) { IFileEditorInput input= (IFileEditorInput) info.fElement; @@ -759,9 +749,7 @@ public class TextFileDocumentProvider implements IDocumentProvider, IDocumentPro } } - /* - * @see IDocumentProvider#saveDocument(IProgressMonitor, Object, IDocument, boolean) - */ + @Override public final void saveDocument(IProgressMonitor monitor, Object element, IDocument document, boolean overwrite) throws CoreException { if (element == null) @@ -788,15 +776,11 @@ public class TextFileDocumentProvider implements IDocumentProvider, IDocumentPro } return new DocumentProviderOperation() { - /* - * @see org.eclipse.ui.editors.text.TextFileDocumentProvider.DocumentProviderOperation#execute(org.eclipse.core.runtime.IProgressMonitor) - */ + @Override public void execute(IProgressMonitor monitor) throws CoreException { commitFileBuffer(monitor, info, overwrite); } - /* - * @see org.eclipse.ui.editors.text.TextFileDocumentProvider.DocumentProviderOperation#getSchedulingRule() - */ + @Override public ISchedulingRule getSchedulingRule() { if (info.fElement instanceof IFileEditorInput) { IFileEditorInput input= (IFileEditorInput) info.fElement; @@ -810,15 +794,11 @@ public class TextFileDocumentProvider implements IDocumentProvider, IDocumentPro final IFile file= ((IFileEditorInput) element).getFile(); return new DocumentProviderOperation() { - /* - * @see org.eclipse.ui.editors.text.TextFileDocumentProvider.DocumentProviderOperation#execute(org.eclipse.core.runtime.IProgressMonitor) - */ + @Override public void execute(IProgressMonitor monitor) throws CoreException { createFileFromDocument(monitor, file, document); } - /* - * @see org.eclipse.ui.editors.text.TextFileDocumentProvider.DocumentProviderOperation#getSchedulingRule() - */ + @Override public ISchedulingRule getSchedulingRule() { return computeSchedulingRule(file); } @@ -826,15 +806,11 @@ public class TextFileDocumentProvider implements IDocumentProvider, IDocumentPro } else if (element instanceof IURIEditorInput) { final URI uri= ((IURIEditorInput)element).getURI(); return new DocumentProviderOperation() { - /* - * @see org.eclipse.ui.editors.text.TextFileDocumentProvider.DocumentProviderOperation#execute(org.eclipse.core.runtime.IProgressMonitor) - */ + @Override public void execute(IProgressMonitor monitor) throws CoreException { createFileStoreFromDocument(monitor, uri, document); } - /* - * @see org.eclipse.ui.editors.text.TextFileDocumentProvider.DocumentProviderOperation#getSchedulingRule() - */ + @Override public ISchedulingRule getSchedulingRule() { return null; } @@ -920,9 +896,7 @@ public class TextFileDocumentProvider implements IDocumentProvider, IDocumentPro } } - /* - * @see org.eclipse.ui.texteditor.IDocumentProvider#getModificationStamp(java.lang.Object) - */ + @Override public long getModificationStamp(Object element) { FileInfo info= (FileInfo) fFileInfoMap.get(element); if (info != null) @@ -930,9 +904,7 @@ public class TextFileDocumentProvider implements IDocumentProvider, IDocumentPro return getParentProvider().getModificationStamp(element); } - /* - * @see org.eclipse.ui.texteditor.IDocumentProvider#getSynchronizationStamp(java.lang.Object) - */ + @Override public long getSynchronizationStamp(Object element) { FileInfo info= (FileInfo) fFileInfoMap.get(element); if (info != null) @@ -940,9 +912,7 @@ public class TextFileDocumentProvider implements IDocumentProvider, IDocumentPro return getParentProvider().getSynchronizationStamp(element); } - /* - * @see org.eclipse.ui.texteditor.IDocumentProvider#isDeleted(java.lang.Object) - */ + @Override public boolean isDeleted(Object element) { FileInfo info= (FileInfo) fFileInfoMap.get(element); if (info != null) { @@ -952,9 +922,7 @@ public class TextFileDocumentProvider implements IDocumentProvider, IDocumentPro return getParentProvider().isDeleted(element); } - /* - * @see org.eclipse.ui.texteditor.IDocumentProvider#mustSaveDocument(java.lang.Object) - */ + @Override public boolean mustSaveDocument(Object element) { FileInfo info= (FileInfo) fFileInfoMap.get(element); if (info != null) @@ -962,9 +930,7 @@ public class TextFileDocumentProvider implements IDocumentProvider, IDocumentPro return getParentProvider().mustSaveDocument(element); } - /* - * @see org.eclipse.ui.texteditor.IDocumentProvider#canSaveDocument(java.lang.Object) - */ + @Override public boolean canSaveDocument(Object element) { FileInfo info= (FileInfo) fFileInfoMap.get(element); if (info != null) @@ -972,9 +938,7 @@ public class TextFileDocumentProvider implements IDocumentProvider, IDocumentPro return getParentProvider().canSaveDocument(element); } - /* - * @see org.eclipse.ui.texteditor.IDocumentProvider#getAnnotationModel(java.lang.Object) - */ + @Override public IAnnotationModel getAnnotationModel(Object element) { FileInfo info= (FileInfo) fFileInfoMap.get(element); if (info != null) @@ -982,27 +946,21 @@ public class TextFileDocumentProvider implements IDocumentProvider, IDocumentPro return getParentProvider().getAnnotationModel(element); } - /* - * @see org.eclipse.ui.texteditor.IDocumentProvider#aboutToChange(java.lang.Object) - */ + @Override public void aboutToChange(Object element) { FileInfo info= (FileInfo) fFileInfoMap.get(element); if (info == null) getParentProvider().aboutToChange(element); } - /* - * @see org.eclipse.ui.texteditor.IDocumentProvider#changed(java.lang.Object) - */ + @Override public void changed(Object element) { FileInfo info= (FileInfo) fFileInfoMap.get(element); if (info == null) getParentProvider().changed(element); } - /* - * @see org.eclipse.ui.texteditor.IDocumentProvider#addElementStateListener(org.eclipse.ui.texteditor.IElementStateListener) - */ + @Override public void addElementStateListener(IElementStateListener listener) { Assert.isNotNull(listener); if (!fElementStateListeners.contains(listener)) { @@ -1015,9 +973,7 @@ public class TextFileDocumentProvider implements IDocumentProvider, IDocumentPro getParentProvider().addElementStateListener(listener); } - /* - * @see org.eclipse.ui.texteditor.IDocumentProvider#removeElementStateListener(org.eclipse.ui.texteditor.IElementStateListener) - */ + @Override public void removeElementStateListener(IElementStateListener listener) { Assert.isNotNull(listener); fElementStateListeners.remove(listener); @@ -1028,9 +984,7 @@ public class TextFileDocumentProvider implements IDocumentProvider, IDocumentPro getParentProvider().removeElementStateListener(listener); } - /* - * @see org.eclipse.ui.texteditor.IDocumentProviderExtension#isReadOnly(java.lang.Object) - */ + @Override public boolean isReadOnly(Object element) { FileInfo info= (FileInfo) fFileInfoMap.get(element); if (info != null) @@ -1038,9 +992,7 @@ public class TextFileDocumentProvider implements IDocumentProvider, IDocumentPro return ((IDocumentProviderExtension) getParentProvider()).isReadOnly(element); } - /* - * @see org.eclipse.ui.texteditor.IDocumentProviderExtension#isModifiable(java.lang.Object) - */ + @Override public boolean isModifiable(Object element) { FileInfo info= (FileInfo) fFileInfoMap.get(element); if (info != null) @@ -1048,22 +1000,16 @@ public class TextFileDocumentProvider implements IDocumentProvider, IDocumentPro return ((IDocumentProviderExtension) getParentProvider()).isModifiable(element); } - /* - * @see org.eclipse.ui.texteditor.IDocumentProviderExtension#validateState(java.lang.Object, java.lang.Object) - */ + @Override public void validateState(Object element, final Object computationContext) throws CoreException { final FileInfo info= (FileInfo) fFileInfoMap.get(element); if (info != null) { DocumentProviderOperation operation= new DocumentProviderOperation() { - /* - * @see org.eclipse.ui.editors.text.TextFileDocumentProvider.DocumentProviderOperation#execute(org.eclipse.core.runtime.IProgressMonitor) - */ + @Override protected void execute(IProgressMonitor monitor) throws CoreException { info.fTextFileBuffer.validateState(monitor, computationContext); } - /* - * @see org.eclipse.ui.editors.text.TextFileDocumentProvider.DocumentProviderOperation#getSchedulingRule() - */ + @Override public ISchedulingRule getSchedulingRule() { if (info.fElement instanceof IFileEditorInput) { IFileEditorInput input= (IFileEditorInput) info.fElement; @@ -1077,9 +1023,7 @@ public class TextFileDocumentProvider implements IDocumentProvider, IDocumentPro ((IDocumentProviderExtension) getParentProvider()).validateState(element, computationContext); } - /* - * @see org.eclipse.ui.texteditor.IDocumentProviderExtension#isStateValidated(java.lang.Object) - */ + @Override public boolean isStateValidated(Object element) { FileInfo info= (FileInfo) fFileInfoMap.get(element); if (info != null) @@ -1087,9 +1031,7 @@ public class TextFileDocumentProvider implements IDocumentProvider, IDocumentPro return ((IDocumentProviderExtension) getParentProvider()).isStateValidated(element); } - /* - * @see org.eclipse.ui.texteditor.IDocumentProviderExtension#updateStateCache(java.lang.Object) - */ + @Override public void updateStateCache(Object element) throws CoreException { FileInfo info= (FileInfo) fFileInfoMap.get(element); if (info != null) { @@ -1104,18 +1046,14 @@ public class TextFileDocumentProvider implements IDocumentProvider, IDocumentPro } } - /* - * @see org.eclipse.ui.texteditor.IDocumentProviderExtension#setCanSaveDocument(java.lang.Object) - */ + @Override public void setCanSaveDocument(Object element) { FileInfo info= (FileInfo) fFileInfoMap.get(element); if (info == null) ((IDocumentProviderExtension) getParentProvider()).setCanSaveDocument(element); } - /* - * @see org.eclipse.ui.texteditor.IDocumentProviderExtension#getStatus(java.lang.Object) - */ + @Override public IStatus getStatus(Object element) { FileInfo info= (FileInfo) fFileInfoMap.get(element); if (info == null) @@ -1146,22 +1084,16 @@ public class TextFileDocumentProvider implements IDocumentProvider, IDocumentPro return status; } - /* - * @see org.eclipse.ui.texteditor.IDocumentProviderExtension#synchronize(java.lang.Object) - */ + @Override public void synchronize(Object element) throws CoreException { final FileInfo info= (FileInfo) fFileInfoMap.get(element); if (info != null) { DocumentProviderOperation operation= new DocumentProviderOperation() { - /* - * @see org.eclipse.ui.editors.text.TextFileDocumentProvider.DocumentProviderOperation#execute(org.eclipse.core.runtime.IProgressMonitor) - */ + @Override protected void execute(IProgressMonitor monitor) throws CoreException { info.fTextFileBuffer.revert(monitor); } - /* - * @see org.eclipse.ui.editors.text.TextFileDocumentProvider.DocumentProviderOperation#getSchedulingRule() - */ + @Override public ISchedulingRule getSchedulingRule() { if (info.fElement instanceof IFileEditorInput) { IFileEditorInput input= (IFileEditorInput) info.fElement; @@ -1176,24 +1108,18 @@ public class TextFileDocumentProvider implements IDocumentProvider, IDocumentPro } } - /* - * @see org.eclipse.ui.texteditor.IDocumentProviderExtension2#setProgressMonitor(org.eclipse.core.runtime.IProgressMonitor) - */ + @Override public void setProgressMonitor(IProgressMonitor progressMonitor) { fProgressMonitor= progressMonitor; ((IDocumentProviderExtension2) getParentProvider()).setProgressMonitor(progressMonitor); } - /* - * @see org.eclipse.ui.texteditor.IDocumentProviderExtension2#getProgressMonitor() - */ + @Override public IProgressMonitor getProgressMonitor() { return fProgressMonitor; } - /* - * @see org.eclipse.ui.texteditor.IDocumentProviderExtension3#isSynchronized(java.lang.Object) - */ + @Override public boolean isSynchronized(Object element) { FileInfo info= (FileInfo) fFileInfoMap.get(element); if (info != null) @@ -1201,10 +1127,7 @@ public class TextFileDocumentProvider implements IDocumentProvider, IDocumentPro return ((IDocumentProviderExtension3) getParentProvider()).isSynchronized(element); } - /* - * @see org.eclipse.ui.texteditor.IDocumentProviderExtension5#isNotSynchronizedException(Object, CoreException) - * @since 3.2 - */ + @Override public boolean isNotSynchronizedException(Object element, CoreException ex) { IStatus status= ex.getStatus(); if (status == null || status instanceof MultiStatus) @@ -1216,16 +1139,12 @@ public class TextFileDocumentProvider implements IDocumentProvider, IDocumentPro return status.getCode() == IResourceStatus.OUT_OF_SYNC_LOCAL; } - /* - * @see org.eclipse.ui.editors.text.IStorageDocumentProvider#getDefaultEncoding() - */ + @Override public String getDefaultEncoding() { return FileBuffers.getTextFileBufferManager().getDefaultEncoding(); } - /* - * @see org.eclipse.ui.editors.text.IStorageDocumentProvider#getEncoding(java.lang.Object) - */ + @Override public String getEncoding(Object element) { FileInfo info= (FileInfo) fFileInfoMap.get(element); if (info != null) @@ -1233,9 +1152,7 @@ public class TextFileDocumentProvider implements IDocumentProvider, IDocumentPro return ((IStorageDocumentProvider) getParentProvider()).getEncoding(element); } - /* - * @see org.eclipse.ui.editors.text.IStorageDocumentProvider#setEncoding(java.lang.Object, java.lang.String) - */ + @Override public void setEncoding(Object element, String encoding) { FileInfo info= (FileInfo) fFileInfoMap.get(element); if (info != null) @@ -1244,10 +1161,7 @@ public class TextFileDocumentProvider implements IDocumentProvider, IDocumentPro ((IStorageDocumentProvider) getParentProvider()).setEncoding(element, encoding); } - /* - * @see org.eclipse.ui.texteditor.IDocumentProviderExtension4#getContentType(java.lang.Object) - * @since 3.1 - */ + @Override public IContentType getContentType(Object element) throws CoreException { FileInfo info= (FileInfo) fFileInfoMap.get(element); if (info != null) @@ -1290,6 +1204,7 @@ public class TextFileDocumentProvider implements IDocumentProvider, IDocumentPro * @return the system file for the given file info * @deprecated As of 3.2, replaced by {@link #getFileStore(org.eclipse.ui.editors.text.TextFileDocumentProvider.FileInfo)} */ + @Deprecated protected File getSystemFile(FileInfo info) { IPath path= info.fTextFileBuffer.getLocation(); return FileBuffers.getSystemFileAtLocation(path); diff --git a/org.eclipse.ui.editors/src/org/eclipse/ui/editors/text/TextSourceViewerConfiguration.java b/org.eclipse.ui.editors/src/org/eclipse/ui/editors/text/TextSourceViewerConfiguration.java index 0360565af0f..db85c0dc6fe 100644 --- a/org.eclipse.ui.editors/src/org/eclipse/ui/editors/text/TextSourceViewerConfiguration.java +++ b/org.eclipse.ui.editors/src/org/eclipse/ui/editors/text/TextSourceViewerConfiguration.java @@ -90,11 +90,10 @@ public class TextSourceViewerConfiguration extends SourceViewerConfiguration { fPreferenceStore= preferenceStore; } - /* - * @see org.eclipse.jface.text.source.SourceViewerConfiguration#getAnnotationHover(org.eclipse.jface.text.source.ISourceViewer) - */ + @Override public IAnnotationHover getAnnotationHover(ISourceViewer sourceViewer) { return new DefaultAnnotationHover() { + @Override protected boolean isIncluded(Annotation annotation) { return isShowInVerticalRuler(annotation); } @@ -117,12 +116,10 @@ public class TextSourceViewerConfiguration extends SourceViewerConfiguration { return true; } - /* - * @see org.eclipse.jface.text.source.SourceViewerConfiguration#getOverviewRulerAnnotationHover(org.eclipse.jface.text.source.ISourceViewer) - * @since 3.2 - */ + @Override public IAnnotationHover getOverviewRulerAnnotationHover(ISourceViewer sourceViewer) { return new DefaultAnnotationHover(true) { + @Override protected boolean isIncluded(Annotation annotation) { return isShowInOverviewRuler(annotation); } @@ -144,18 +141,12 @@ public class TextSourceViewerConfiguration extends SourceViewerConfiguration { return true; } - /* - * @see SourceViewerConfiguration#getConfiguredTextHoverStateMasks(ISourceViewer, String) - * @since 3.2 - */ + @Override public int[] getConfiguredTextHoverStateMasks(ISourceViewer sourceViewer, String contentType) { return new int[] { ITextViewerExtension2.DEFAULT_HOVER_STATE_MASK }; } - /* - * @see SourceViewerConfiguration#getTextHover(ISourceViewer, String) - * @since 3.2 - */ + @Override public ITextHover getTextHover(ISourceViewer sourceViewer, String contentType) { return new TextHover(sourceViewer); } @@ -193,19 +184,14 @@ public class TextSourceViewerConfiguration extends SourceViewerConfiguration { return EditorsUI.getAnnotationPreferenceLookup().getAnnotationPreference(annotation); } - /* - * @see org.eclipse.jface.text.source.SourceViewerConfiguration#getTabWidth(org.eclipse.jface.text.source.ISourceViewer) - */ + @Override public int getTabWidth(ISourceViewer sourceViewer) { if (fPreferenceStore == null) return super.getTabWidth(sourceViewer); return fPreferenceStore.getInt(AbstractDecoratedTextEditorPreferenceConstants.EDITOR_TAB_WIDTH); } - /* - * @see org.eclipse.jface.text.source.SourceViewerConfiguration#getIndentPrefixes(org.eclipse.jface.text.source.ISourceViewer, java.lang.String) - * @since 3.3 - */ + @Override public String[] getIndentPrefixes(ISourceViewer sourceViewer, String contentType) { String[] indentPrefixes= getIndentPrefixesForTab(getTabWidth(sourceViewer)); if (indentPrefixes == null) @@ -222,10 +208,7 @@ public class TextSourceViewerConfiguration extends SourceViewerConfiguration { return indentPrefixes; } - /* - * @see org.eclipse.jface.text.source.SourceViewerConfiguration#getHyperlinkDetectors(org.eclipse.jface.text.source.ISourceViewer) - * @since 3.1 - */ + @Override public IHyperlinkDetector[] getHyperlinkDetectors(ISourceViewer sourceViewer) { if (sourceViewer == null || fPreferenceStore == null) return super.getHyperlinkDetectors(sourceViewer); @@ -279,10 +262,7 @@ public class TextSourceViewerConfiguration extends SourceViewerConfiguration { return targets; } - /* - * @see org.eclipse.jface.text.source.SourceViewerConfiguration#getHyperlinkStateMask(org.eclipse.jface.text.source.ISourceViewer) - * @since 3.1 - */ + @Override public int getHyperlinkStateMask(ISourceViewer sourceViewer) { if (fPreferenceStore == null) return super.getHyperlinkStateMask(sourceViewer); @@ -296,10 +276,7 @@ public class TextSourceViewerConfiguration extends SourceViewerConfiguration { return modifierMask; } - /* - * @see org.eclipse.jface.text.source.SourceViewerConfiguration#getHyperlinkPresenter(org.eclipse.jface.text.source.ISourceViewer) - * @since 3.1 - */ + @Override public IHyperlinkPresenter getHyperlinkPresenter(ISourceViewer sourceViewer) { if (fPreferenceStore == null) return new MultipleHyperlinkPresenter(new RGB(0, 0, 255)); @@ -356,10 +333,7 @@ public class TextSourceViewerConfiguration extends SourceViewerConfiguration { return stateMask; } - /* - * @see org.eclipse.jface.text.source.SourceViewerConfiguration#getUndoManager(org.eclipse.jface.text.source.ISourceViewer) - * @since 3.1 - */ + @Override public IUndoManager getUndoManager(ISourceViewer sourceViewer) { if (fPreferenceStore == null || !fPreferenceStore.contains(AbstractDecoratedTextEditorPreferenceConstants.EDITOR_UNDO_HISTORY_SIZE)) return super.getUndoManager(sourceViewer); @@ -378,6 +352,7 @@ public class TextSourceViewerConfiguration extends SourceViewerConfiguration { * @see org.eclipse.jface.text.source.SourceViewerConfiguration#getReconciler(org.eclipse.jface.text.source.ISourceViewer) * @since 3.3 */ + @Override public IReconciler getReconciler(ISourceViewer sourceViewer) { if (fPreferenceStore == null || !fPreferenceStore.getBoolean(SpellingService.PREFERENCE_SPELLING_ENABLED)) return null; @@ -392,10 +367,7 @@ public class TextSourceViewerConfiguration extends SourceViewerConfiguration { return reconciler; } - /* - * @see org.eclipse.jface.text.source.SourceViewerConfiguration#getQuickAssistAssistant(org.eclipse.jface.text.source.ISourceViewer) - * @since 3.3 - */ + @Override public IQuickAssistAssistant getQuickAssistAssistant(ISourceViewer sourceViewer) { if (fPreferenceStore == null || !fPreferenceStore.getBoolean(SpellingService.PREFERENCE_SPELLING_ENABLED)) return null; @@ -416,6 +388,7 @@ public class TextSourceViewerConfiguration extends SourceViewerConfiguration { */ private IInformationControlCreator getQuickAssistAssistantInformationControlCreator() { return new IInformationControlCreator() { + @Override public IInformationControl createInformationControl(Shell parent) { return new DefaultInformationControl(parent, EditorsPlugin.getAdditionalInfoAffordanceString()); } @@ -458,15 +431,15 @@ public class TextSourceViewerConfiguration extends SourceViewerConfiguration { super(sourceViewer); } + @Override protected boolean isIncluded(Annotation annotation) { return isShownInText(annotation); } - /* - * @see org.eclipse.jface.text.ITextHoverExtension#getHoverControlCreator() - */ + @Override public IInformationControlCreator getHoverControlCreator() { return new IInformationControlCreator() { + @Override public IInformationControl createInformationControl(Shell parent) { return new DefaultInformationControl(parent, EditorsUI.getTooltipAffordanceString()); } diff --git a/org.eclipse.ui.editors/src/org/eclipse/ui/editors/text/templates/ContributionTemplateStore.java b/org.eclipse.ui.editors/src/org/eclipse/ui/editors/text/templates/ContributionTemplateStore.java index c8e265c69c5..83f1c579cc9 100644 --- a/org.eclipse.ui.editors/src/org/eclipse/ui/editors/text/templates/ContributionTemplateStore.java +++ b/org.eclipse.ui.editors/src/org/eclipse/ui/editors/text/templates/ContributionTemplateStore.java @@ -102,6 +102,7 @@ public class ContributionTemplateStore extends TemplateStore { * * @throws IOException {@inheritDoc} */ + @Override protected void loadContributedTemplates() throws IOException { IConfigurationElement[] extensions= getTemplateExtensions(); Collection contributed= readContributedTemplates(extensions); @@ -255,10 +256,7 @@ public class ContributionTemplateStore extends TemplateStore { return id != null && id.trim().length() != 0; // TODO test validity? } - /* - * @see org.eclipse.jface.text.templates.persistence.TemplateStore#handleException(java.io.IOException) - * @since 3.2 - */ + @Override protected void handleException(IOException x) { EditorsPlugin.log(x); } diff --git a/org.eclipse.ui.editors/src/org/eclipse/ui/internal/editors/quickdiff/CompositeRevertAction.java b/org.eclipse.ui.editors/src/org/eclipse/ui/internal/editors/quickdiff/CompositeRevertAction.java index 081a961f7df..b1a60d2d4cc 100644 --- a/org.eclipse.ui.editors/src/org/eclipse/ui/internal/editors/quickdiff/CompositeRevertAction.java +++ b/org.eclipse.ui.editors/src/org/eclipse/ui/internal/editors/quickdiff/CompositeRevertAction.java @@ -56,9 +56,7 @@ public final class CompositeRevertAction extends Action implements IUpdate, ISel update(); } - /* - * @see org.eclipse.ui.texteditor.IUpdate#update() - */ + @Override public void update() { for (int i= 0; i < fActions.length; i++) { if (fActions[i] instanceof IUpdate) @@ -72,17 +70,12 @@ public final class CompositeRevertAction extends Action implements IUpdate, ISel setToolTipText(action.getToolTipText()); } - /* - * @see org.eclipse.jface.viewers.ISelectionChangedListener#selectionChanged(org.eclipse.jface.viewers.SelectionChangedEvent) - * @since 3.3 - */ + @Override public void selectionChanged(SelectionChangedEvent event) { update(); } - /* - * @see org.eclipse.jface.action.IAction#run() - */ + @Override public void run() { IAction action= getEnabledAction(); if (action != null) diff --git a/org.eclipse.ui.editors/src/org/eclipse/ui/internal/editors/quickdiff/LastSaveReferenceProvider.java b/org.eclipse.ui.editors/src/org/eclipse/ui/internal/editors/quickdiff/LastSaveReferenceProvider.java index bc84f2a4495..aa339139162 100644 --- a/org.eclipse.ui.editors/src/org/eclipse/ui/internal/editors/quickdiff/LastSaveReferenceProvider.java +++ b/org.eclipse.ui.editors/src/org/eclipse/ui/internal/editors/quickdiff/LastSaveReferenceProvider.java @@ -110,24 +110,21 @@ public class LastSaveReferenceProvider implements IQuickDiffReferenceProvider, I * @param monitor {@inheritDoc} * @return {@link Status#OK_STATUS} */ + @Override protected IStatus run(IProgressMonitor monitor) { readDocument(monitor, false); return Status.OK_STATUS; } } - /* - * @see org.eclipse.ui.texteditor.quickdiff.IQuickDiffReferenceProvider#getReference(org.eclipse.core.runtime.IProgressMonitor) - */ + @Override public IDocument getReference(IProgressMonitor monitor) { if (!fDocumentRead) readDocument(monitor, true); // force reading it return fReference; } - /* - * @see org.eclipse.ui.texteditor.quickdiff.IQuickDiffReferenceProvider#dispose() - */ + @Override public void dispose() { IProgressMonitor monitor= fProgressMonitor; if (monitor != null) { @@ -148,16 +145,12 @@ public class LastSaveReferenceProvider implements IQuickDiffReferenceProvider, I } } - /* - * @see org.eclipse.ui.texteditor.quickdiff.IQuickDiffReferenceProvider#getId() - */ + @Override public String getId() { return fId; } - /* - * @see org.eclipse.ui.texteditor.quickdiff.IQuickDiffProviderImplementation#setActiveEditor(org.eclipse.ui.texteditor.ITextEditor) - */ + @Override public void setActiveEditor(ITextEditor targetEditor) { IDocumentProvider provider= null; IEditorInput input= null; @@ -179,16 +172,12 @@ public class LastSaveReferenceProvider implements IQuickDiffReferenceProvider, I } } - /* - * @see org.eclipse.ui.texteditor.quickdiff.IQuickDiffProviderImplementation#isEnabled() - */ + @Override public boolean isEnabled() { return fEditorInput != null && fDocumentProvider != null; } - /* - * @see org.eclipse.ui.texteditor.quickdiff.IQuickDiffProviderImplementation#setId(java.lang.String) - */ + @Override public void setId(String id) { fId= id; } @@ -324,6 +313,7 @@ public class LastSaveReferenceProvider implements IQuickDiffReferenceProvider, I // see https://bugs.eclipse.org/bugs/show_bug.cgi?id=56871 Runnable runnable= new Runnable() { + @Override public void run() { synchronized (fLock) { if (fDocumentProvider == provider) @@ -443,9 +433,7 @@ public class LastSaveReferenceProvider implements IQuickDiffReferenceProvider, I /* IElementStateListener implementation */ - /* - * @see org.eclipse.ui.texteditor.IElementStateListener#elementDirtyStateChanged(java.lang.Object, boolean) - */ + @Override public void elementDirtyStateChanged(Object element, boolean isDirty) { if (!isDirty && element == fEditorInput) { // document has been saved or reverted - recreate reference @@ -453,15 +441,11 @@ public class LastSaveReferenceProvider implements IQuickDiffReferenceProvider, I } } - /* - * @see org.eclipse.ui.texteditor.IElementStateListener#elementContentAboutToBeReplaced(java.lang.Object) - */ + @Override public void elementContentAboutToBeReplaced(Object element) { } - /* - * @see org.eclipse.ui.texteditor.IElementStateListener#elementContentReplaced(java.lang.Object) - */ + @Override public void elementContentReplaced(Object element) { if (element == fEditorInput) { // document has been reverted or replaced @@ -469,15 +453,11 @@ public class LastSaveReferenceProvider implements IQuickDiffReferenceProvider, I } } - /* - * @see org.eclipse.ui.texteditor.IElementStateListener#elementDeleted(java.lang.Object) - */ + @Override public void elementDeleted(Object element) { } - /* - * @see org.eclipse.ui.texteditor.IElementStateListener#elementMoved(java.lang.Object, java.lang.Object) - */ + @Override public void elementMoved(Object originalElement, Object movedElement) { } } diff --git a/org.eclipse.ui.editors/src/org/eclipse/ui/internal/editors/quickdiff/QuickDiffRestoreAction.java b/org.eclipse.ui.editors/src/org/eclipse/ui/internal/editors/quickdiff/QuickDiffRestoreAction.java index 42b7f136958..438b1e8e8f5 100644 --- a/org.eclipse.ui.editors/src/org/eclipse/ui/internal/editors/quickdiff/QuickDiffRestoreAction.java +++ b/org.eclipse.ui.editors/src/org/eclipse/ui/internal/editors/quickdiff/QuickDiffRestoreAction.java @@ -70,9 +70,7 @@ public abstract class QuickDiffRestoreAction extends TextEditorAction implements */ protected abstract void runCompoundChange(); - /* - * @see org.eclipse.jface.action.IAction#run() - */ + @Override public void run() { ITextEditor editor= getTextEditor(); if (editor == null || !validateEditorInputState()) @@ -86,9 +84,7 @@ public abstract class QuickDiffRestoreAction extends TextEditorAction implements } - /* - * @see org.eclipse.ui.texteditor.IUpdate#update() - */ + @Override public void update() { /* * Update only works if we're updated from the ruler action @@ -99,10 +95,7 @@ public abstract class QuickDiffRestoreAction extends TextEditorAction implements setEnabled(computeEnablement()); } - /* - * @see org.eclipse.jface.viewers.ISelectionChangedListener#selectionChanged(org.eclipse.jface.viewers.SelectionChangedEvent) - * @since 3.3 - */ + @Override public void selectionChanged(SelectionChangedEvent event) { update(); } diff --git a/org.eclipse.ui.editors/src/org/eclipse/ui/internal/editors/quickdiff/RestoreAction.java b/org.eclipse.ui.editors/src/org/eclipse/ui/internal/editors/quickdiff/RestoreAction.java index 31227501574..295f0c4463e 100644 --- a/org.eclipse.ui.editors/src/org/eclipse/ui/internal/editors/quickdiff/RestoreAction.java +++ b/org.eclipse.ui.editors/src/org/eclipse/ui/internal/editors/quickdiff/RestoreAction.java @@ -41,9 +41,7 @@ public class RestoreAction extends QuickDiffRestoreAction { super(QuickDiffMessages.getResourceBundle(), PREFIX, editor, isRulerAction); } - /* - * @see org.eclipse.ui.internal.texteditor.quickdiff.QuickDiffRestoreAction#computeEnablement() - */ + @Override public boolean computeEnablement() { if (!super.computeEnablement()) return false; @@ -73,9 +71,7 @@ public class RestoreAction extends QuickDiffRestoreAction { return true; } - /* - * @see org.eclipse.ui.internal.editors.quickdiff.QuickDiffRestoreAction#runCompoundChange() - */ + @Override public void runCompoundChange() { if (!isEnabled()) return; diff --git a/org.eclipse.ui.editors/src/org/eclipse/ui/internal/editors/quickdiff/RevertBlockAction.java b/org.eclipse.ui.editors/src/org/eclipse/ui/internal/editors/quickdiff/RevertBlockAction.java index 890a38a4d2f..ad6b4707fec 100644 --- a/org.eclipse.ui.editors/src/org/eclipse/ui/internal/editors/quickdiff/RevertBlockAction.java +++ b/org.eclipse.ui.editors/src/org/eclipse/ui/internal/editors/quickdiff/RevertBlockAction.java @@ -40,9 +40,7 @@ public class RevertBlockAction extends QuickDiffRestoreAction { super(QuickDiffMessages.getResourceBundle(), PREFIX, editor, isRulerAction); } - /* - * @see org.eclipse.ui.internal.texteditor.quickdiff.QuickDiffRestoreAction#computeEnablement() - */ + @Override public boolean computeEnablement() { if (!super.computeEnablement()) return false; @@ -72,9 +70,7 @@ public class RevertBlockAction extends QuickDiffRestoreAction { return false; } - /* - * @see org.eclipse.ui.internal.editors.quickdiff.QuickDiffRestoreAction#runCompoundChange() - */ + @Override public void runCompoundChange() { if (!isEnabled()) return; diff --git a/org.eclipse.ui.editors/src/org/eclipse/ui/internal/editors/quickdiff/RevertLineAction.java b/org.eclipse.ui.editors/src/org/eclipse/ui/internal/editors/quickdiff/RevertLineAction.java index dbb7daa7d73..aa1cc5e9901 100644 --- a/org.eclipse.ui.editors/src/org/eclipse/ui/internal/editors/quickdiff/RevertLineAction.java +++ b/org.eclipse.ui.editors/src/org/eclipse/ui/internal/editors/quickdiff/RevertLineAction.java @@ -38,9 +38,7 @@ public class RevertLineAction extends QuickDiffRestoreAction { super(QuickDiffMessages.getResourceBundle(), "RevertLineAction.", editor, isRulerAction); //$NON-NLS-1$ } - /* - * @see org.eclipse.ui.internal.texteditor.quickdiff.QuickDiffRestoreAction#computeEnablement() - */ + @Override public boolean computeEnablement() { if (!super.computeEnablement()) return false; @@ -62,9 +60,7 @@ public class RevertLineAction extends QuickDiffRestoreAction { return true; } - /* - * @see org.eclipse.ui.internal.editors.quickdiff.QuickDiffRestoreAction#runCompoundChange() - */ + @Override public void runCompoundChange() { if (!isEnabled()) return; diff --git a/org.eclipse.ui.editors/src/org/eclipse/ui/internal/editors/quickdiff/RevertSelectionAction.java b/org.eclipse.ui.editors/src/org/eclipse/ui/internal/editors/quickdiff/RevertSelectionAction.java index 55d1d7035dd..0f2599b20fd 100644 --- a/org.eclipse.ui.editors/src/org/eclipse/ui/internal/editors/quickdiff/RevertSelectionAction.java +++ b/org.eclipse.ui.editors/src/org/eclipse/ui/internal/editors/quickdiff/RevertSelectionAction.java @@ -40,9 +40,7 @@ public class RevertSelectionAction extends QuickDiffRestoreAction { super(QuickDiffMessages.getResourceBundle(), "RevertSelectionAction.", editor, isRulerAction); //$NON-NLS-1$ } - /* - * @see org.eclipse.ui.internal.texteditor.quickdiff.QuickDiffRestoreAction#computeEnablement() - */ + @Override public boolean computeEnablement() { if (!super.computeEnablement()) return false; @@ -72,9 +70,7 @@ public class RevertSelectionAction extends QuickDiffRestoreAction { return false; } - /* - * @see org.eclipse.ui.internal.editors.quickdiff.QuickDiffRestoreAction#runCompoundChange() - */ + @Override public void runCompoundChange() { // recheck if run without being enabled if (!isEnabled()) diff --git a/org.eclipse.ui.editors/src/org/eclipse/ui/internal/editors/text/AbstractConfigurationBlockPreferencePage.java b/org.eclipse.ui.editors/src/org/eclipse/ui/internal/editors/text/AbstractConfigurationBlockPreferencePage.java index d4d51edffd5..89ee31ce476 100644 --- a/org.eclipse.ui.editors/src/org/eclipse/ui/internal/editors/text/AbstractConfigurationBlockPreferencePage.java +++ b/org.eclipse.ui.editors/src/org/eclipse/ui/internal/editors/text/AbstractConfigurationBlockPreferencePage.java @@ -49,23 +49,17 @@ abstract class AbstractConfigurationBlockPreferencePage extends PreferencePage i protected abstract void setDescription(); protected abstract void setPreferenceStore(); - /* - * @see IWorkbenchPreferencePage#init() - */ + @Override public void init(IWorkbench workbench) { } - /* - * @see PreferencePage#createControl(Composite) - */ + @Override public void createControl(Composite parent) { super.createControl(parent); PlatformUI.getWorkbench().getHelpSystem().setHelp(getControl(), getHelpId()); } - /* - * @see PreferencePage#createContents(Composite) - */ + @Override protected Control createContents(Composite parent) { fOverlayStore.load(); @@ -83,9 +77,7 @@ abstract class AbstractConfigurationBlockPreferencePage extends PreferencePage i fConfigurationBlock.initialize(); } - /* - * @see PreferencePage#performOk() - */ + @Override public boolean performOk() { if (!fConfigurationBlock.canPerformOk()) @@ -98,9 +90,7 @@ abstract class AbstractConfigurationBlockPreferencePage extends PreferencePage i return true; } - /* - * @see PreferencePage#performDefaults() - */ + @Override public void performDefaults() { fOverlayStore.loadDefaults(); @@ -109,9 +99,7 @@ abstract class AbstractConfigurationBlockPreferencePage extends PreferencePage i super.performDefaults(); } - /* - * @see DialogPage#dispose() - */ + @Override public void dispose() { fConfigurationBlock.dispose(); @@ -124,10 +112,7 @@ abstract class AbstractConfigurationBlockPreferencePage extends PreferencePage i super.dispose(); } - /* - * @see org.eclipse.jface.preference.PreferencePage#applyData(java.lang.Object) - * @since 3.4 - */ + @Override public void applyData(Object data) { fConfigurationBlock.applyData(data); } diff --git a/org.eclipse.ui.editors/src/org/eclipse/ui/internal/editors/text/AccessibilityPreferencePage.java b/org.eclipse.ui.editors/src/org/eclipse/ui/internal/editors/text/AccessibilityPreferencePage.java index 5fafdcd8b69..63c1bccbd55 100644 --- a/org.eclipse.ui.editors/src/org/eclipse/ui/internal/editors/text/AccessibilityPreferencePage.java +++ b/org.eclipse.ui.editors/src/org/eclipse/ui/internal/editors/text/AccessibilityPreferencePage.java @@ -76,6 +76,7 @@ public class AccessibilityPreferencePage extends PreferencePage implements IWork super(preference); fText= control; } + @Override public void initialize() { String value= fOverlayStore.getString(fPreference.getKey()); fText.setText(value); @@ -89,6 +90,7 @@ public class AccessibilityPreferencePage extends PreferencePage implements IWork super(preference); fControl= control; } + @Override public void initialize() { boolean value= fOverlayStore.getBoolean(fPreference.getKey()); fControl.setSelection(value); @@ -104,6 +106,7 @@ public class AccessibilityPreferencePage extends PreferencePage implements IWork fControl= control; fDomain= domain; } + @Override public void initialize() { int value= fOverlayStore.getInt(fPreference.getKey()); EnumValue enumValue= fDomain.getValueByInteger(value); @@ -151,6 +154,7 @@ public class AccessibilityPreferencePage extends PreferencePage implements IWork fMin= min; } + @Override public IStatus validate(Object value) { StatusInfo status= new StatusInfo(); if (value instanceof String && ((String)value).length() == 0) { @@ -191,9 +195,11 @@ public class AccessibilityPreferencePage extends PreferencePage implements IWork public int getIntValue() { return fValue; } + @Override public final int hashCode() { return getIntValue(); } + @Override public boolean equals(Object obj) { if (obj instanceof EnumValue) { return ((EnumValue) obj).getIntValue() == fValue; @@ -247,6 +253,7 @@ public class AccessibilityPreferencePage extends PreferencePage implements IWork addValue(from++); } + @Override public IStatus validate(Object value) { StatusInfo status= new StatusInfo(); if (value instanceof String && ((String)value).length() == 0) { @@ -274,6 +281,7 @@ public class AccessibilityPreferencePage extends PreferencePage implements IWork } static class BooleanDomain extends Domain { + @Override public IStatus validate(Object value) { StatusInfo status= new StatusInfo(); if (value instanceof String && ((String)value).length() == 0) { @@ -352,6 +360,7 @@ public class AccessibilityPreferencePage extends PreferencePage implements IWork } + @Override protected Label createDescriptionLabel(Composite parent) { return null; // no description for new look } @@ -370,15 +379,11 @@ public class AccessibilityPreferencePage extends PreferencePage implements IWork return new OverlayPreferenceStore(getPreferenceStore(), keys); } - /* - * @see IWorkbenchPreferencePage#init() - */ + @Override public void init(IWorkbench workbench) { } - /* - * @see PreferencePage#createControl(Composite) - */ + @Override public void createControl(Composite parent) { super.createControl(parent); PlatformUI.getWorkbench().getHelpSystem().setHelp(getControl(), ITextEditorHelpContextIds.ACCESSIBILITY_PREFERENCE_PAGE); @@ -415,9 +420,7 @@ public class AccessibilityPreferencePage extends PreferencePage implements IWork return appearanceComposite; } - /* - * @see PreferencePage#createContents(Composite) - */ + @Override protected Control createContents(Composite parent) { fOverlayStore.load(); @@ -447,17 +450,13 @@ public class AccessibilityPreferencePage extends PreferencePage implements IWork } - /* - * @see PreferencePage#performOk() - */ + @Override public boolean performOk() { fOverlayStore.propagate(); return true; } - /* - * @see PreferencePage#performDefaults() - */ + @Override protected void performDefaults() { fOverlayStore.loadDefaults(); @@ -472,9 +471,7 @@ public class AccessibilityPreferencePage extends PreferencePage implements IWork super.performDefaults(); } - /* - * @see DialogPage#dispose() - */ + @Override public void dispose() { if (fOverlayStore != null) { @@ -497,6 +494,7 @@ public class AccessibilityPreferencePage extends PreferencePage implements IWork gd.horizontalSpan= 2; checkBox.setLayoutData(gd); checkBox.addSelectionListener(new SelectionAdapter() { + @Override public void widgetSelected(SelectionEvent e) { boolean value= checkBox.getSelection(); IStatus status= domain.validate(Boolean.valueOf(value)); @@ -520,6 +518,7 @@ public class AccessibilityPreferencePage extends PreferencePage implements IWork } SelectionListener listener= new SelectionListener() { + @Override public void widgetSelected(SelectionEvent e) { boolean state= master.getSelection(); for (int i= 0; i < slaves.length; i++) { @@ -527,6 +526,7 @@ public class AccessibilityPreferencePage extends PreferencePage implements IWork } } + @Override public void widgetDefaultSelected(SelectionEvent e) {} }; master.addSelectionListener(listener); diff --git a/org.eclipse.ui.editors/src/org/eclipse/ui/internal/editors/text/AnnotationsConfigurationBlock.java b/org.eclipse.ui.editors/src/org/eclipse/ui/internal/editors/text/AnnotationsConfigurationBlock.java index a11004f0163..a0d8f4018d5 100644 --- a/org.eclipse.ui.editors/src/org/eclipse/ui/internal/editors/text/AnnotationsConfigurationBlock.java +++ b/org.eclipse.ui.editors/src/org/eclipse/ui/internal/editors/text/AnnotationsConfigurationBlock.java @@ -94,13 +94,16 @@ class AnnotationsConfigurationBlock implements IPreferenceConfigurationBlock { private static final class ItemContentProvider implements IStructuredContentProvider { + @Override public Object[] getElements(Object inputElement) { return (ListItem[]) inputElement; } + @Override public void dispose() { } + @Override public void inputChanged(Viewer viewer, Object oldInput, Object newInput) { } } @@ -108,10 +111,12 @@ class AnnotationsConfigurationBlock implements IPreferenceConfigurationBlock { private final class ItemLabelProvider extends LabelProvider { + @Override public String getText(Object element) { return ((ListItem)element).label; } + @Override public Image getImage(Object element) { ListItem item= (ListItem)element; return item.image; @@ -120,6 +125,7 @@ class AnnotationsConfigurationBlock implements IPreferenceConfigurationBlock { private static class ArrayLabelProvider extends LabelProvider { + @Override public String getText(Object element) { return ((String[]) element)[0].toString(); } @@ -182,9 +188,7 @@ class AnnotationsConfigurationBlock implements IPreferenceConfigurationBlock { return keys; } - /* - * @see org.eclipse.ui.internal.editors.text.IPreferenceConfigurationBlock#createControl(org.eclipse.swt.widgets.Composite) - */ + @Override public Control createControl(Composite parent) { PixelConverter pixelConverter= new PixelConverter(parent); @@ -294,16 +298,19 @@ class AnnotationsConfigurationBlock implements IPreferenceConfigurationBlock { fAnnotationTypeViewer.addSelectionChangedListener(new ISelectionChangedListener() { + @Override public void selectionChanged(SelectionChangedEvent event) { handleAnnotationListSelection(); } }); fShowInTextCheckBox.addSelectionListener(new SelectionListener() { + @Override public void widgetDefaultSelected(SelectionEvent e) { // do nothing } + @Override public void widgetSelected(SelectionEvent e) { ListItem item= getSelectedItem(); final boolean value= fShowInTextCheckBox.getSelection(); @@ -328,10 +335,12 @@ class AnnotationsConfigurationBlock implements IPreferenceConfigurationBlock { }); fShowInOverviewRulerCheckBox.addSelectionListener(new SelectionListener() { + @Override public void widgetDefaultSelected(SelectionEvent e) { // do nothing } + @Override public void widgetSelected(SelectionEvent e) { ListItem item= getSelectedItem(); fStore.setValue(item.overviewRulerKey, fShowInOverviewRulerCheckBox.getSelection()); @@ -340,10 +349,12 @@ class AnnotationsConfigurationBlock implements IPreferenceConfigurationBlock { }); fShowInVerticalRulerCheckBox.addSelectionListener(new SelectionListener() { + @Override public void widgetDefaultSelected(SelectionEvent e) { // do nothing } + @Override public void widgetSelected(SelectionEvent e) { ListItem item= getSelectedItem(); fStore.setValue(item.verticalRulerKey, fShowInVerticalRulerCheckBox.getSelection()); @@ -352,10 +363,12 @@ class AnnotationsConfigurationBlock implements IPreferenceConfigurationBlock { }); fIsNextPreviousTargetCheckBox.addSelectionListener(new SelectionListener() { + @Override public void widgetDefaultSelected(SelectionEvent e) { // do nothing } + @Override public void widgetSelected(SelectionEvent e) { ListItem item= getSelectedItem(); fStore.setValue(item.isNextPreviousNavigationKey, fIsNextPreviousTargetCheckBox.getSelection()); @@ -364,10 +377,12 @@ class AnnotationsConfigurationBlock implements IPreferenceConfigurationBlock { }); foregroundColorButton.addSelectionListener(new SelectionListener() { + @Override public void widgetDefaultSelected(SelectionEvent e) { // do nothing } + @Override public void widgetSelected(SelectionEvent e) { ListItem item= getSelectedItem(); PreferenceConverter.setValue(fStore, item.colorKey, fAnnotationForegroundColorEditor.getColorValue()); @@ -377,9 +392,7 @@ class AnnotationsConfigurationBlock implements IPreferenceConfigurationBlock { fDecorationViewer.addSelectionChangedListener(new ISelectionChangedListener() { - /* - * @see org.eclipse.jface.viewers.ISelectionChangedListener#selectionChanged(org.eclipse.jface.viewers.SelectionChangedEvent) - */ + @Override public void selectionChanged(SelectionChangedEvent event) { String[] decoration= (String[]) ((IStructuredSelection) fDecorationViewer.getSelection()).getFirstElement(); ListItem item= getSelectedItem(); @@ -428,6 +441,7 @@ class AnnotationsConfigurationBlock implements IPreferenceConfigurationBlock { * @see org.eclipse.ui.internal.editors.text.IPreferenceConfigurationBlock#applyData(java.lang.Object) * @since 3.4 */ + @Override public void applyData(Object data) { if (!(data instanceof String)) return; @@ -437,6 +451,7 @@ class AnnotationsConfigurationBlock implements IPreferenceConfigurationBlock { if (data.equals(element.label)) { final Control control= fAnnotationTypeViewer.getControl(); control.getDisplay().asyncExec(new Runnable() { + @Override public void run() { control.setFocus(); fAnnotationTypeViewer.setSelection(new StructuredSelection(element), true); @@ -447,22 +462,16 @@ class AnnotationsConfigurationBlock implements IPreferenceConfigurationBlock { } } - /* - * @see org.eclipse.ui.internal.editors.text.IPreferenceConfigurationBlock#canPerformOk() - */ + @Override public boolean canPerformOk() { return true; } - /* - * @see PreferencePage#performOk() - */ + @Override public void performOk() { } - /* - * @see PreferencePage#performDefaults() - */ + @Override public void performDefaults() { fStore.loadDefaults(); fAnnotationTypeViewer.refresh(); @@ -502,10 +511,12 @@ class AnnotationsConfigurationBlock implements IPreferenceConfigurationBlock { + @Override public void initialize() { fAnnotationTypeViewer.setInput(fListModel); fAnnotationTypeViewer.getControl().getDisplay().asyncExec(new Runnable() { + @Override public void run() { if (fAnnotationTypeViewer != null && !fAnnotationTypeViewer.getControl().isDisposed()) { fAnnotationTypeViewer.setSelection(new StructuredSelection(fListModel[0])); @@ -534,9 +545,7 @@ class AnnotationsConfigurationBlock implements IPreferenceConfigurationBlock { } Comparator comparator= new Comparator() { - /* - * @see java.util.Comparator#compare(java.lang.Object, java.lang.Object) - */ + @Override public int compare(Object o1, Object o2) { if (!(o2 instanceof ListItem)) return -1; @@ -655,9 +664,7 @@ class AnnotationsConfigurationBlock implements IPreferenceConfigurationBlock { return false; } - /* - * @see IPreferenceConfigurationBlock#dispose() - */ + @Override public void dispose() { ImageRegistry registry= EditorsPlugin.getDefault().getImageRegistry(); diff --git a/org.eclipse.ui.editors/src/org/eclipse/ui/internal/editors/text/AnnotationsPreferencePage.java b/org.eclipse.ui.editors/src/org/eclipse/ui/internal/editors/text/AnnotationsPreferencePage.java index c4771d20d14..fa0c2618463 100644 --- a/org.eclipse.ui.editors/src/org/eclipse/ui/internal/editors/text/AnnotationsPreferencePage.java +++ b/org.eclipse.ui.editors/src/org/eclipse/ui/internal/editors/text/AnnotationsPreferencePage.java @@ -27,38 +27,28 @@ import org.eclipse.ui.editors.text.ITextEditorHelpContextIds; */ public class AnnotationsPreferencePage extends AbstractConfigurationBlockPreferencePage { - /* - * @see org.eclipse.ui.internal.editors.text.AbstractConfigureationBlockPreferencePage#getHelpId() - */ + @Override protected String getHelpId() { return ITextEditorHelpContextIds.TEXT_EDITOR_PREFERENCE_PAGE; } - /* - * @see org.eclipse.ui.internal.editors.text.AbstractConfigurationBlockPreferencePage#setDescription() - */ + @Override protected void setDescription() { String description= TextEditorMessages.AnnotationsConfigurationBlock_description; setDescription(description); } - /* - * @see org.eclipse.jface.preference.PreferencePage#createDescriptionLabel(org.eclipse.swt.widgets.Composite) - */ + @Override protected Label createDescriptionLabel(Composite parent) { return null; } - /* - * @see org.eclipse.ui.internal.editors.text.AbstractConfigurationBlockPreferencePage#setPreferenceStore() - */ + @Override protected void setPreferenceStore() { setPreferenceStore(EditorsPlugin.getDefault().getPreferenceStore()); } - /* - * @see org.eclipse.ui.internal.editors.text.AbstractConfigureationBlockPreferencePage#createConfigurationBlock(org.eclipse.ui.internal.editors.text.OverlayPreferenceStore) - */ + @Override protected IPreferenceConfigurationBlock createConfigurationBlock(OverlayPreferenceStore overlayPreferenceStore) { return new AnnotationsConfigurationBlock(overlayPreferenceStore); } diff --git a/org.eclipse.ui.editors/src/org/eclipse/ui/internal/editors/text/ConvertLineDelimitersAction.java b/org.eclipse.ui.editors/src/org/eclipse/ui/internal/editors/text/ConvertLineDelimitersAction.java index 5dd535b02a1..f635e2aeaca 100644 --- a/org.eclipse.ui.editors/src/org/eclipse/ui/internal/editors/text/ConvertLineDelimitersAction.java +++ b/org.eclipse.ui.editors/src/org/eclipse/ui/internal/editors/text/ConvertLineDelimitersAction.java @@ -67,16 +67,19 @@ public class ConvertLineDelimitersAction extends FileBufferOperationAction { return label; } + @Override protected boolean isAcceptableLocation(IPath location) { ITextFileBufferManager manager= FileBuffers.getTextFileBufferManager(); return location != null && manager.isTextFileLocation(location, fStrictCheckIfTextLocation); } + @Override public void selectionChanged(IAction action, ISelection selection) { super.selectionChanged(action, selection); fStrictCheckIfTextLocation= !(selection instanceof ITextSelection); } + @Override protected IFile[] collectFiles(final IResource[] resources) { fStrictCheckIfTextLocation= fStrictCheckIfTextLocation || resources.length != 1 || resources[0].getType() != IResource.FILE; if (containsOnlyFiles(resources)) { @@ -85,12 +88,14 @@ public class ConvertLineDelimitersAction extends FileBufferOperationAction { } final IFilter filter= new IFilter() { + @Override public boolean accept(IResource resource) { return resource != null && isAcceptableLocation(resource.getFullPath()); } }; SelectResourcesDialog dialog= new SelectResourcesDialog(getShell(), getDialogTitle(), TextEditorMessages.ConvertLineDelimitersAction_dialog_description, filter) { + @Override protected Composite createSelectionButtonGroup(Composite parent) { Composite buttonGroup= super.createSelectionButtonGroup(parent); @@ -100,6 +105,7 @@ public class ConvertLineDelimitersAction extends FileBufferOperationAction { button.setFont(JFaceResources.getDialogFont()); button.setSelection(fStrictCheckIfTextLocation); button.addSelectionListener(new SelectionAdapter() { + @Override public void widgetSelected(SelectionEvent event) { fStrictCheckIfTextLocation= button.getSelection(); refresh(); diff --git a/org.eclipse.ui.editors/src/org/eclipse/ui/internal/editors/text/EditorsPlugin.java b/org.eclipse.ui.editors/src/org/eclipse/ui/internal/editors/text/EditorsPlugin.java index 80574942c49..9c1367dd1bc 100644 --- a/org.eclipse.ui.editors/src/org/eclipse/ui/internal/editors/text/EditorsPlugin.java +++ b/org.eclipse.ui.editors/src/org/eclipse/ui/internal/editors/text/EditorsPlugin.java @@ -197,15 +197,13 @@ public class EditorsPlugin extends AbstractUIPlugin { return fMarkerAnnotationPreferences; } - /* - * @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext) - * @since 3.3 - */ + @Override public void start(BundleContext context) throws Exception { super.start(context); if (PlatformUI.isWorkbenchRunning()) { fThemeListener= new IPropertyChangeListener() { + @Override public void propertyChange(PropertyChangeEvent event) { if (IThemeManager.CHANGE_CURRENT_THEME.equals(event.getProperty())) EditorsPluginPreferenceInitializer.setThemeBasedPreferences(getPreferenceStore(), true); @@ -215,10 +213,7 @@ public class EditorsPlugin extends AbstractUIPlugin { } } - /* - * @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext) - * @since 3.0 - */ + @Override public void stop(BundleContext context) throws Exception { if (fSharedTextColors != null) { fSharedTextColors.dispose(); diff --git a/org.eclipse.ui.editors/src/org/eclipse/ui/internal/editors/text/EditorsPluginPreferenceInitializer.java b/org.eclipse.ui.editors/src/org/eclipse/ui/internal/editors/text/EditorsPluginPreferenceInitializer.java index 1a4050a09cf..13d068bf263 100644 --- a/org.eclipse.ui.editors/src/org/eclipse/ui/internal/editors/text/EditorsPluginPreferenceInitializer.java +++ b/org.eclipse.ui.editors/src/org/eclipse/ui/internal/editors/text/EditorsPluginPreferenceInitializer.java @@ -34,10 +34,7 @@ import org.eclipse.ui.editors.text.TextEditorPreferenceConstants; */ public class EditorsPluginPreferenceInitializer extends AbstractPreferenceInitializer { - /* - * @see org.eclipse.core.runtime.preferences.AbstractPreferenceInitializer#initializeDefaultPreferences() - * @since 3.1 - */ + @Override public void initializeDefaultPreferences() { IPreferenceStore store= EditorsPlugin.getDefault().getPreferenceStore(); TextEditorPreferenceConstants.initializeDefaultValues(store); diff --git a/org.eclipse.ui.editors/src/org/eclipse/ui/internal/editors/text/FileEditorInputAdapterFactory.java b/org.eclipse.ui.editors/src/org/eclipse/ui/internal/editors/text/FileEditorInputAdapterFactory.java index 2afe6ddc7ea..e7f5a3d18bb 100644 --- a/org.eclipse.ui.editors/src/org/eclipse/ui/internal/editors/text/FileEditorInputAdapterFactory.java +++ b/org.eclipse.ui.editors/src/org/eclipse/ui/internal/editors/text/FileEditorInputAdapterFactory.java @@ -29,6 +29,7 @@ public class FileEditorInputAdapterFactory implements IAdapterFactory { /* * @see org.eclipse.ui.editors.text.ILocationProvider#getLocation(java.lang.Object) */ + @Override public IPath getPath(Object element) { if (element instanceof IFileEditorInput) { IFileEditorInput input= (IFileEditorInput) element; @@ -44,9 +45,7 @@ public class FileEditorInputAdapterFactory implements IAdapterFactory { /** The provided location provider */ private ILocationProvider fLocationProvider= new LocationProvider(); - /* - * @see org.eclipse.core.runtime.IAdapterFactory#getAdapter(java.lang.Object, java.lang.Class) - */ + @Override public Object getAdapter(Object adaptableObject, Class adapterType) { if (ILocationProvider.class.equals(adapterType)) { if (adaptableObject instanceof IFile) @@ -55,9 +54,7 @@ public class FileEditorInputAdapterFactory implements IAdapterFactory { return null; } - /* - * @see org.eclipse.core.runtime.IAdapterFactory#getAdapterList() - */ + @Override public Class[] getAdapterList() { return ADAPTER_LIST; } diff --git a/org.eclipse.ui.editors/src/org/eclipse/ui/internal/editors/text/HyperlinkDetectorsConfigurationBlock.java b/org.eclipse.ui.editors/src/org/eclipse/ui/internal/editors/text/HyperlinkDetectorsConfigurationBlock.java index 060b8e34347..2724db09139 100644 --- a/org.eclipse.ui.editors/src/org/eclipse/ui/internal/editors/text/HyperlinkDetectorsConfigurationBlock.java +++ b/org.eclipse.ui.editors/src/org/eclipse/ui/internal/editors/text/HyperlinkDetectorsConfigurationBlock.java @@ -89,13 +89,16 @@ class HyperlinkDetectorsConfigurationBlock implements IPreferenceConfigurationBl private static final class ItemContentProvider implements IStructuredContentProvider { + @Override public Object[] getElements(Object inputElement) { return (ListItem[]) inputElement; } + @Override public void dispose() { } + @Override public void inputChanged(Viewer viewer, Object oldInput, Object newInput) { } } @@ -103,16 +106,12 @@ class HyperlinkDetectorsConfigurationBlock implements IPreferenceConfigurationBl private final class ItemLabelProvider implements ITableLabelProvider { - /* - * @see org.eclipse.jface.viewers.ITableLabelProvider#getColumnImage(java.lang.Object, int) - */ + @Override public Image getColumnImage(Object element, int columnIndex) { return null; } - /* - * @see org.eclipse.jface.viewers.ITableLabelProvider#getColumnText(java.lang.Object, int) - */ + @Override public String getColumnText(Object element, int columnIndex) { switch (columnIndex) { case 0: @@ -130,28 +129,20 @@ class HyperlinkDetectorsConfigurationBlock implements IPreferenceConfigurationBl return null; // cannot happen } - /* - * @see org.eclipse.jface.viewers.IBaseLabelProvider#addListener(org.eclipse.jface.viewers.ILabelProviderListener) - */ + @Override public void addListener(ILabelProviderListener listener) { } - /* - * @see org.eclipse.jface.viewers.IBaseLabelProvider#dispose() - */ + @Override public void dispose() { } - /* - * @see org.eclipse.jface.viewers.IBaseLabelProvider#isLabelProperty(java.lang.Object, java.lang.String) - */ + @Override public boolean isLabelProperty(Object element, String property) { return false; } - /* - * @see org.eclipse.jface.viewers.IBaseLabelProvider#removeListener(org.eclipse.jface.viewers.ILabelProviderListener) - */ + @Override public void removeListener(ILabelProviderListener listener) { } } @@ -200,9 +191,7 @@ class HyperlinkDetectorsConfigurationBlock implements IPreferenceConfigurationBl return keys; } - /* - * @see org.eclipse.ui.internal.editors.text.IPreferenceConfigurationBlock#createControl(org.eclipse.swt.widgets.Composite) - */ + @Override public Control createControl(Composite parent) { PixelConverter pixelConverter= new PixelConverter(parent); @@ -219,6 +208,7 @@ class HyperlinkDetectorsConfigurationBlock implements IPreferenceConfigurationBl String label= TextEditorMessages.HyperlinksEnabled_label; fHyperlinksEnabledCheckBox= addCheckBox(composite, label, AbstractDecoratedTextEditorPreferenceConstants.EDITOR_HYPERLINKS_ENABLED, 0); fHyperlinksEnabledCheckBox.addSelectionListener(new SelectionListener() { + @Override public void widgetSelected(SelectionEvent e) { boolean state= fHyperlinksEnabledCheckBox.getSelection(); fHyperlinkDefaultKeyModifierText.setEnabled(state); @@ -226,6 +216,7 @@ class HyperlinkDetectorsConfigurationBlock implements IPreferenceConfigurationBl fHyperlinkDetectorsViewer.getTable().setEnabled(state); handleHyperlinkKeyModifierModified(); } + @Override public void widgetDefaultSelected(SelectionEvent e) { } }); @@ -236,10 +227,12 @@ class HyperlinkDetectorsConfigurationBlock implements IPreferenceConfigurationBl fHyperlinkDefaultKeyModifierText.addKeyListener(new KeyListener() { private boolean isModifierCandidate; + @Override public void keyPressed(KeyEvent e) { isModifierCandidate= e.keyCode > 0 && e.character == 0 && e.stateMask == 0; } + @Override public void keyReleased(KeyEvent e) { if (isModifierCandidate && e.stateMask > 0 && e.stateMask == e.stateMask && e.character == 0) {// && e.time -time < 1000) { String modifierString= fHyperlinkDefaultKeyModifierText.getText(); @@ -273,6 +266,7 @@ class HyperlinkDetectorsConfigurationBlock implements IPreferenceConfigurationBl }); fHyperlinkDefaultKeyModifierText.addModifyListener(new ModifyListener() { + @Override public void modifyText(ModifyEvent e) { handleHyperlinkDefaultKeyModifierModified(); } @@ -297,9 +291,11 @@ class HyperlinkDetectorsConfigurationBlock implements IPreferenceConfigurationBl hyperlinkDetectorTable.setFont(parent.getFont()); hyperlinkDetectorTable.addSelectionListener(new SelectionListener() { + @Override public void widgetSelected(SelectionEvent e) { handleListSelection(); } + @Override public void widgetDefaultSelected(SelectionEvent e) { } }); @@ -322,9 +318,7 @@ class HyperlinkDetectorsConfigurationBlock implements IPreferenceConfigurationBl fHyperlinkDetectorsViewer.setUseHashlookup(true); fHyperlinkDetectorsViewer.addCheckStateListener(new ICheckStateListener() { - /* - * @see org.eclipse.jface.viewers.ICheckStateListener#checkStateChanged(org.eclipse.jface.viewers.CheckStateChangedEvent) - */ + @Override public void checkStateChanged(CheckStateChangedEvent event) { String id= ((ListItem)event.getElement()).id; if (id == null) @@ -347,10 +341,12 @@ class HyperlinkDetectorsConfigurationBlock implements IPreferenceConfigurationBl fHyperlinkKeyModifierText.addKeyListener(new KeyListener() { private boolean isModifierCandidate; + @Override public void keyPressed(KeyEvent e) { isModifierCandidate= e.keyCode > 0 && e.character == 0 && e.stateMask == 0; } + @Override public void keyReleased(KeyEvent e) { if (isModifierCandidate && e.stateMask > 0 && e.stateMask == e.stateMask && e.character == 0) {// && e.time -time < 1000) { String modifierString= fHyperlinkKeyModifierText.getText(); @@ -384,6 +380,7 @@ class HyperlinkDetectorsConfigurationBlock implements IPreferenceConfigurationBl }); fHyperlinkKeyModifierText.addModifyListener(new ModifyListener() { + @Override public void modifyText(ModifyEvent e) { handleHyperlinkKeyModifierModified(); } @@ -392,10 +389,7 @@ class HyperlinkDetectorsConfigurationBlock implements IPreferenceConfigurationBl return composite; } - /* - * @see org.eclipse.ui.internal.editors.text.IPreferenceConfigurationBlock#applyData(java.lang.Object) - * @since 3.4 - */ + @Override public void applyData(Object data) { } @@ -417,6 +411,7 @@ class HyperlinkDetectorsConfigurationBlock implements IPreferenceConfigurationBl gd.horizontalSpan= 2; checkBox.setLayoutData(gd); checkBox.addSelectionListener(new SelectionAdapter() { + @Override public void widgetSelected(SelectionEvent e) { boolean value= checkBox.getSelection(); fStore.setValue(key, value); @@ -440,6 +435,7 @@ class HyperlinkDetectorsConfigurationBlock implements IPreferenceConfigurationBl textControl.setTextLimit(textLimit); textControl.addModifyListener(new ModifyListener() { + @Override public void modifyText(ModifyEvent e) { String value= textControl.getText(); if (key != null) @@ -458,23 +454,17 @@ class HyperlinkDetectorsConfigurationBlock implements IPreferenceConfigurationBl return result.toArray(); } - /* - * @see org.eclipse.ui.internal.editors.text.IPreferenceConfigurationBlock#canPerformOk() - */ + @Override public boolean canPerformOk() { return true; } - /* - * @see PreferencePage#performOk() - */ + @Override public void performOk() { fStore.setValue(AbstractDecoratedTextEditorPreferenceConstants.EDITOR_HYPERLINK_KEY_MODIFIER_MASK, computeStateMask(fHyperlinkKeyModifierText.getText())); } - /* - * @see PreferencePage#performDefaults() - */ + @Override public void performDefaults() { fStore.loadDefaults(); initialize(); @@ -494,6 +484,7 @@ class HyperlinkDetectorsConfigurationBlock implements IPreferenceConfigurationBl } + @Override public void initialize() { String modifierString= fStore.getString(AbstractDecoratedTextEditorPreferenceConstants.EDITOR_HYPERLINK_KEY_MODIFIER); if (computeStateMask(modifierString) == -1) { @@ -534,9 +525,7 @@ class HyperlinkDetectorsConfigurationBlock implements IPreferenceConfigurationBl } Comparator comparator= new Comparator() { - /* - * @see java.util.Comparator#compare(java.lang.Object, java.lang.Object) - */ + @Override public int compare(Object o1, Object o2) { if (!(o2 instanceof ListItem)) return -1; @@ -733,9 +722,7 @@ class HyperlinkDetectorsConfigurationBlock implements IPreferenceConfigurationBl } } - /* - * @see org.eclipse.ui.internal.editors.text.IPreferenceConfigurationBlock#dispose() - */ + @Override public void dispose() { } diff --git a/org.eclipse.ui.editors/src/org/eclipse/ui/internal/editors/text/HyperlinkDetectorsPreferencePage.java b/org.eclipse.ui.editors/src/org/eclipse/ui/internal/editors/text/HyperlinkDetectorsPreferencePage.java index 508b0cf25de..3b5c6fa8787 100644 --- a/org.eclipse.ui.editors/src/org/eclipse/ui/internal/editors/text/HyperlinkDetectorsPreferencePage.java +++ b/org.eclipse.ui.editors/src/org/eclipse/ui/internal/editors/text/HyperlinkDetectorsPreferencePage.java @@ -27,38 +27,28 @@ import org.eclipse.ui.editors.text.ITextEditorHelpContextIds; */ public class HyperlinkDetectorsPreferencePage extends AbstractConfigurationBlockPreferencePage { - /* - * @see org.eclipse.ui.internal.editors.text.AbstractConfigureationBlockPreferencePage#getHelpId() - */ + @Override protected String getHelpId() { return ITextEditorHelpContextIds.TEXT_EDITOR_PREFERENCE_PAGE; } - /* - * @see org.eclipse.ui.internal.editors.text.AbstractConfigurationBlockPreferencePage#setDescription() - */ + @Override protected void setDescription() { String description= TextEditorMessages.HyperlinkDetectorsConfigurationBlock_description; setDescription(description); } - /* - * @see org.eclipse.jface.preference.PreferencePage#createDescriptionLabel(org.eclipse.swt.widgets.Composite) - */ + @Override protected Label createDescriptionLabel(Composite parent) { return super.createDescriptionLabel(parent); } - /* - * @see org.eclipse.ui.internal.editors.text.AbstractConfigurationBlockPreferencePage#setPreferenceStore() - */ + @Override protected void setPreferenceStore() { setPreferenceStore(EditorsPlugin.getDefault().getPreferenceStore()); } - /* - * @see org.eclipse.ui.internal.editors.text.AbstractConfigureationBlockPreferencePage#createConfigurationBlock(org.eclipse.ui.internal.editors.text.OverlayPreferenceStore) - */ + @Override protected IPreferenceConfigurationBlock createConfigurationBlock(OverlayPreferenceStore overlayPreferenceStore) { return new HyperlinkDetectorsConfigurationBlock(this, overlayPreferenceStore); } diff --git a/org.eclipse.ui.editors/src/org/eclipse/ui/internal/editors/text/IURIEditorInputAdapterFactory.java b/org.eclipse.ui.editors/src/org/eclipse/ui/internal/editors/text/IURIEditorInputAdapterFactory.java index 59ac9442fd3..10023802fee 100644 --- a/org.eclipse.ui.editors/src/org/eclipse/ui/internal/editors/text/IURIEditorInputAdapterFactory.java +++ b/org.eclipse.ui.editors/src/org/eclipse/ui/internal/editors/text/IURIEditorInputAdapterFactory.java @@ -34,6 +34,7 @@ public class IURIEditorInputAdapterFactory implements IAdapterFactory { /* * @see org.eclipse.ui.editors.text.ILocationProvider#getLocation(java.lang.Object) */ + @Override public IPath getPath(Object element) { URI uri= getURI(element); if (uri != null) @@ -41,9 +42,7 @@ public class IURIEditorInputAdapterFactory implements IAdapterFactory { return null; } - /* - * @see org.eclipse.ui.editors.text.ILocationProviderExtension#getURI(java.lang.Object) - */ + @Override public URI getURI(Object element) { if (element instanceof IURIEditorInput) { IURIEditorInput input= (IURIEditorInput)element; @@ -60,9 +59,7 @@ public class IURIEditorInputAdapterFactory implements IAdapterFactory { /** The provided location provider */ private ILocationProvider fLocationProvider= new LocationProvider(); - /* - * @see org.eclipse.core.runtime.IAdapterFactory#getAdapter(java.lang.Object, java.lang.Class) - */ + @Override public Object getAdapter(Object adaptableObject, Class adapterType) { if (ILocationProvider.class.equals(adapterType)) { if (adaptableObject instanceof IURIEditorInput) @@ -71,9 +68,7 @@ public class IURIEditorInputAdapterFactory implements IAdapterFactory { return null; } - /* - * @see org.eclipse.core.runtime.IAdapterFactory#getAdapterList() - */ + @Override public Class[] getAdapterList() { return ADAPTER_LIST; } diff --git a/org.eclipse.ui.editors/src/org/eclipse/ui/internal/editors/text/LanguageEditorPreferencePage.java b/org.eclipse.ui.editors/src/org/eclipse/ui/internal/editors/text/LanguageEditorPreferencePage.java index 8b60b2803ee..d6d28628f39 100644 --- a/org.eclipse.ui.editors/src/org/eclipse/ui/internal/editors/text/LanguageEditorPreferencePage.java +++ b/org.eclipse.ui.editors/src/org/eclipse/ui/internal/editors/text/LanguageEditorPreferencePage.java @@ -44,32 +44,24 @@ public class LanguageEditorPreferencePage extends PreferencePage implements IWor setPreferenceStore(EditorsPlugin.getDefault().getPreferenceStore()); } - /* - * @see IWorkbenchPreferencePage#init() - */ + @Override public void init(IWorkbench workbench) { } - /* - * @see PreferencePage#createControl(Composite) - */ + @Override public void createControl(Composite parent) { super.createControl(parent); PlatformUI.getWorkbench().getHelpSystem().setHelp(getControl(), ITextEditorHelpContextIds.TEXT_EDITOR_PREFERENCE_PAGE); } - /* - * @see PreferencePage#createContents(Composite) - */ + @Override protected Control createContents(Composite parent) { Composite composite= new Composite(parent, SWT.NONE); return composite; } - /* - * @see PreferencePage#performOk() - */ + @Override public boolean performOk() { return true; } diff --git a/org.eclipse.ui.editors/src/org/eclipse/ui/internal/editors/text/LinkedModeConfigurationBlock.java b/org.eclipse.ui.editors/src/org/eclipse/ui/internal/editors/text/LinkedModeConfigurationBlock.java index 648fe3fadbf..38a5dae7801 100755 --- a/org.eclipse.ui.editors/src/org/eclipse/ui/internal/editors/text/LinkedModeConfigurationBlock.java +++ b/org.eclipse.ui.editors/src/org/eclipse/ui/internal/editors/text/LinkedModeConfigurationBlock.java @@ -93,25 +93,30 @@ class LinkedModeConfigurationBlock implements IPreferenceConfigurationBlock { private static final class ItemContentProvider implements IStructuredContentProvider { + @Override public Object[] getElements(Object inputElement) { return (ListItem[]) inputElement; } + @Override public void dispose() { } + @Override public void inputChanged(Viewer viewer, Object oldInput, Object newInput) { } } private final class ItemLabelProvider extends LabelProvider { + @Override public String getText(Object element) { return ((ListItem) element).label; } } private static class ArrayLabelProvider extends LabelProvider { + @Override public String getText(Object element) { return ((String[]) element)[0].toString(); } @@ -214,6 +219,7 @@ class LinkedModeConfigurationBlock implements IPreferenceConfigurationBlock { * @param parent the parent composite * @return the control for the preference page */ + @Override public Control createControl(Composite parent) { OverlayPreferenceStore store= getPreferenceStore(); store.load(); @@ -289,16 +295,19 @@ class LinkedModeConfigurationBlock implements IPreferenceConfigurationBlock { createDependency(fShowInTextCheckBox, new Control[] {label, foregroundColorButton}); fAnnotationTypeViewer.addSelectionChangedListener(new ISelectionChangedListener() { + @Override public void selectionChanged(SelectionChangedEvent event) { handleAnnotationListSelection(); } }); fShowInTextCheckBox.addSelectionListener(new SelectionListener() { + @Override public void widgetDefaultSelected(SelectionEvent e) { // do nothing } + @Override public void widgetSelected(SelectionEvent e) { ListItem item= getSelectedItem(); final boolean value= fShowInTextCheckBox.getSelection(); @@ -320,10 +329,12 @@ class LinkedModeConfigurationBlock implements IPreferenceConfigurationBlock { }); foregroundColorButton.addSelectionListener(new SelectionListener() { + @Override public void widgetDefaultSelected(SelectionEvent e) { // do nothing } + @Override public void widgetSelected(SelectionEvent e) { ListItem item= getSelectedItem(); PreferenceConverter.setValue(getPreferenceStore(), item.colorKey, fAnnotationForegroundColorEditor.getColorValue()); @@ -332,9 +343,7 @@ class LinkedModeConfigurationBlock implements IPreferenceConfigurationBlock { fDecorationViewer.addSelectionChangedListener(new ISelectionChangedListener() { - /* - * @see org.eclipse.jface.viewers.ISelectionChangedListener#selectionChanged(org.eclipse.jface.viewers.SelectionChangedEvent) - */ + @Override public void selectionChanged(SelectionChangedEvent event) { String[] decoration= (String[]) ((IStructuredSelection) fDecorationViewer.getSelection()).getFirstElement(); ListItem item= getSelectedItem(); @@ -357,10 +366,7 @@ class LinkedModeConfigurationBlock implements IPreferenceConfigurationBlock { } - /* - * @see org.eclipse.ui.internal.editors.text.IPreferenceConfigurationBlock#applyData(java.lang.Object) - * @since 3.4 - */ + @Override public void applyData(Object data) { } @@ -432,14 +438,13 @@ class LinkedModeConfigurationBlock implements IPreferenceConfigurationBlock { updateDecorationViewer(item, true); } - /* - * @see org.eclipse.jdt.internal.ui.preferences.IPreferenceConfigurationBlock#initialize() - */ + @Override public void initialize() { initializeFields(); fAnnotationTypeViewer.setInput(fListModel); fAnnotationTypeViewer.getControl().getDisplay().asyncExec(new Runnable() { + @Override public void run() { if (fAnnotationTypeViewer != null && !fAnnotationTypeViewer.getControl().isDisposed()) { fAnnotationTypeViewer.setSelection(new StructuredSelection(fListModel[0])); @@ -488,6 +493,7 @@ class LinkedModeConfigurationBlock implements IPreferenceConfigurationBlock { } + @Override public void performOk() { getPreferenceStore().propagate(); @@ -499,6 +505,7 @@ class LinkedModeConfigurationBlock implements IPreferenceConfigurationBlock { } + @Override public void performDefaults() { getPreferenceStore().loadDefaults(); @@ -511,6 +518,7 @@ class LinkedModeConfigurationBlock implements IPreferenceConfigurationBlock { initializeFields(); } + @Override public void dispose() { OverlayPreferenceStore store= getPreferenceStore(); if (store != null) { @@ -526,6 +534,7 @@ class LinkedModeConfigurationBlock implements IPreferenceConfigurationBlock { Assert.isTrue(slaves.length > 0); indent(slaves[0]); SelectionListener listener= new SelectionListener() { + @Override public void widgetSelected(SelectionEvent e) { boolean state= master.getSelection(); for (int i= 0; i < slaves.length; i++) { @@ -533,6 +542,7 @@ class LinkedModeConfigurationBlock implements IPreferenceConfigurationBlock { } } + @Override public void widgetDefaultSelected(SelectionEvent e) {} }; master.addSelectionListener(listener); @@ -553,9 +563,7 @@ class LinkedModeConfigurationBlock implements IPreferenceConfigurationBlock { } } - /* - * @see org.eclipse.ui.internal.editors.text.IPreferenceConfigurationBlock#canPerformOk() - */ + @Override public boolean canPerformOk() { return true; } diff --git a/org.eclipse.ui.editors/src/org/eclipse/ui/internal/editors/text/LinkedModePreferencePage.java b/org.eclipse.ui.editors/src/org/eclipse/ui/internal/editors/text/LinkedModePreferencePage.java index 8c5015a97ce..f1ebb227d4c 100644 --- a/org.eclipse.ui.editors/src/org/eclipse/ui/internal/editors/text/LinkedModePreferencePage.java +++ b/org.eclipse.ui.editors/src/org/eclipse/ui/internal/editors/text/LinkedModePreferencePage.java @@ -25,36 +25,29 @@ import org.eclipse.ui.editors.text.ITextEditorHelpContextIds; */ public final class LinkedModePreferencePage extends AbstractConfigurationBlockPreferencePage { - /* - * @see org.eclipse.ui.internal.editors.text.AbstractConfigureationBlockPreferencePage#getHelpId() - */ + @Override protected String getHelpId() { return ITextEditorHelpContextIds.TEXT_EDITOR_PREFERENCE_PAGE; } - /* - * @see org.eclipse.ui.internal.editors.text.AbstractConfigurationBlockPreferencePage#setDescription() - */ + @Override protected void setDescription() { String description= TextEditorMessages.LinkedModeConfigurationBlock_linking_title; setDescription(description); } - /* - * @see org.org.eclipse.ui.internal.editors.text.AbstractConfigurationBlockPreferencePage#setPreferenceStore() - */ + @Override protected void setPreferenceStore() { setPreferenceStore(EditorsUI.getPreferenceStore()); } + @Override protected Label createDescriptionLabel(Composite parent) { return null; // no description for new look. } - /* - * @see org.eclipse.ui.internal.editors.text.AbstractConfigureationBlockPreferencePage#createConfigurationBlock(org.eclipse.ui.internal.editors.text.OverlayPreferenceStore) - */ + @Override protected IPreferenceConfigurationBlock createConfigurationBlock(OverlayPreferenceStore overlayPreferenceStore) { return new LinkedModeConfigurationBlock(overlayPreferenceStore); } diff --git a/org.eclipse.ui.editors/src/org/eclipse/ui/internal/editors/text/NextPreviousPulldownActionDelegate.java b/org.eclipse.ui.editors/src/org/eclipse/ui/internal/editors/text/NextPreviousPulldownActionDelegate.java index 3ad8857614a..64e5392e00c 100644 --- a/org.eclipse.ui.editors/src/org/eclipse/ui/internal/editors/text/NextPreviousPulldownActionDelegate.java +++ b/org.eclipse.ui.editors/src/org/eclipse/ui/internal/editors/text/NextPreviousPulldownActionDelegate.java @@ -76,17 +76,12 @@ public abstract class NextPreviousPulldownActionDelegate extends Action implemen setChecked(fStore.getBoolean(fKey)); } - /* - * @see IAction#run() - */ + @Override public void run() { fStore.setValue(fKey, isChecked()); } - /* - * @see java.lang.Comparable#compareTo(java.lang.Object) - * @since 3.2 - */ + @Override public int compareTo(Object o) { if (!(o instanceof NavigationEnablementAction)) return -1; @@ -106,9 +101,7 @@ public abstract class NextPreviousPulldownActionDelegate extends Action implemen */ public abstract String getPreferenceKey(AnnotationPreference annotationPreference); - /* - * @see org.eclipse.jface.action.IMenuCreator#getMenu(org.eclipse.swt.widgets.Control) - */ + @Override public Menu getMenu(Control parent) { if (fMenu != null) fMenu.dispose(); @@ -126,9 +119,7 @@ public abstract class NextPreviousPulldownActionDelegate extends Action implemen fStore= EditorsPlugin.getDefault().getPreferenceStore(); } - /* - * @see org.eclipse.jface.action.IMenuCreator#getMenu(org.eclipse.swt.widgets.Menu) - */ + @Override public Menu getMenu(Menu parent) { if (fMenu == null) { fMenu= new Menu(parent); @@ -138,9 +129,7 @@ public abstract class NextPreviousPulldownActionDelegate extends Action implemen return fMenu; } - /* - * @see org.eclipse.jface.action.IMenuCreator#dispose() - */ + @Override public void dispose() { if (fMenu != null) { fMenu.dispose(); @@ -196,21 +185,15 @@ public abstract class NextPreviousPulldownActionDelegate extends Action implemen return (IAction[]) containers.toArray(new Action[containers.size()]); } - /* - * @see org.eclipse.ui.IWorkbenchWindowActionDelegate#init(org.eclipse.ui.IWorkbenchWindow) - */ + @Override public void init(IWorkbenchWindow window) { } - /* - * @see org.eclipse.ui.IActionDelegate#run(org.eclipse.jface.action.IAction) - */ + @Override public void run(IAction action) { } - /* - * @see org.eclipse.ui.IActionDelegate#selectionChanged(org.eclipse.jface.action.IAction, org.eclipse.jface.viewers.ISelection) - */ + @Override public void selectionChanged(IAction action, ISelection selection) { } } diff --git a/org.eclipse.ui.editors/src/org/eclipse/ui/internal/editors/text/NextPulldownActionDelegate.java b/org.eclipse.ui.editors/src/org/eclipse/ui/internal/editors/text/NextPulldownActionDelegate.java index b997d82b8aa..8fe3dd06e3b 100644 --- a/org.eclipse.ui.editors/src/org/eclipse/ui/internal/editors/text/NextPulldownActionDelegate.java +++ b/org.eclipse.ui.editors/src/org/eclipse/ui/internal/editors/text/NextPulldownActionDelegate.java @@ -20,9 +20,7 @@ import org.eclipse.ui.texteditor.AnnotationPreference; */ public class NextPulldownActionDelegate extends NextPreviousPulldownActionDelegate { - /* - * @see org.eclipse.ui.internal.texteditor.NextPreviousPulldownActionDelegate#getPreferenceKey(AnnotationPreference) - */ + @Override public String getPreferenceKey(AnnotationPreference annotationPreference) { return annotationPreference.getIsGoToNextNavigationTargetKey(); } diff --git a/org.eclipse.ui.editors/src/org/eclipse/ui/internal/editors/text/NonExistingFileEditorInput.java b/org.eclipse.ui.editors/src/org/eclipse/ui/internal/editors/text/NonExistingFileEditorInput.java index 3d68ea5a7c0..33b3670648b 100644 --- a/org.eclipse.ui.editors/src/org/eclipse/ui/internal/editors/text/NonExistingFileEditorInput.java +++ b/org.eclipse.ui.editors/src/org/eclipse/ui/internal/editors/text/NonExistingFileEditorInput.java @@ -44,53 +44,39 @@ public class NonExistingFileEditorInput implements IEditorInput, ILocationProvid fName= namePrefix + " " + fgNonExisting; //$NON-NLS-1$ } - /* - * @see org.eclipse.ui.IEditorInput#exists() - */ + @Override public boolean exists() { return false; } - /* - * @see org.eclipse.ui.IEditorInput#getImageDescriptor() - */ + @Override public ImageDescriptor getImageDescriptor() { return PlatformUI.getWorkbench().getEditorRegistry().getImageDescriptor(fName); } - /* - * @see org.eclipse.ui.IEditorInput#getName() - */ + @Override public String getName() { return fName; } - /* - * @see org.eclipse.ui.IEditorInput#getPersistable() - */ + @Override public IPersistableElement getPersistable() { return null; } - /* - * @see org.eclipse.ui.IEditorInput#getToolTipText() - */ + @Override public String getToolTipText() { return fName; } - /* - * @see org.eclipse.core.runtime.IAdaptable#getAdapter(java.lang.Class) - */ + @Override public Object getAdapter(Class adapter) { if (ILocationProvider.class.equals(adapter)) return this; return Platform.getAdapterManager().getAdapter(this, adapter); } - /* - * @see org.eclipse.ui.editors.text.ILocationProvider#getPath(java.lang.Object) - */ + @Override public IPath getPath(Object element) { if (element instanceof NonExistingFileEditorInput) { NonExistingFileEditorInput input= (NonExistingFileEditorInput)element; @@ -99,9 +85,7 @@ public class NonExistingFileEditorInput implements IEditorInput, ILocationProvid return null; } - /* - * @see java.lang.Object#equals(java.lang.Object) - */ + @Override public boolean equals(Object o) { if (o == this) return true; @@ -114,9 +98,7 @@ public class NonExistingFileEditorInput implements IEditorInput, ILocationProvid return false; } - /* - * @see java.lang.Object#hashCode() - */ + @Override public int hashCode() { return fFileStore.hashCode(); } diff --git a/org.eclipse.ui.editors/src/org/eclipse/ui/internal/editors/text/OverlayPreferenceStore.java b/org.eclipse.ui.editors/src/org/eclipse/ui/internal/editors/text/OverlayPreferenceStore.java index 99e57d289e5..91fe56cf462 100644 --- a/org.eclipse.ui.editors/src/org/eclipse/ui/internal/editors/text/OverlayPreferenceStore.java +++ b/org.eclipse.ui.editors/src/org/eclipse/ui/internal/editors/text/OverlayPreferenceStore.java @@ -60,9 +60,7 @@ class OverlayPreferenceStore implements IPreferenceStore { */ private class PropertyListener implements IPropertyChangeListener { - /* - * @see IPropertyChangeListener#propertyChange(PropertyChangeEvent) - */ + @Override public void propertyChange(PropertyChangeEvent event) { OverlayKey key= findOverlayKey(event.getProperty()); if (key != null) @@ -281,238 +279,174 @@ class OverlayPreferenceStore implements IPreferenceStore { } } - /* - * @see IPreferenceStore#addPropertyChangeListener(org.eclipse.jface.util.IPropertyChangeListener) - */ + @Override public void addPropertyChangeListener(IPropertyChangeListener listener) { fStore.addPropertyChangeListener(listener); } - /* - * @see IPreferenceStore#removePropertyChangeListener(org.eclipse.jface.util.IPropertyChangeListener) - */ + @Override public void removePropertyChangeListener(IPropertyChangeListener listener) { fStore.removePropertyChangeListener(listener); } - /* - * @see IPreferenceStore#firePropertyChangeEvent(java.lang.String, java.lang.Object, java.lang.Object) - */ + @Override public void firePropertyChangeEvent(String name, Object oldValue, Object newValue) { fStore.firePropertyChangeEvent(name, oldValue, newValue); } - /* - * @see IPreferenceStore#contains(java.lang.String) - */ + @Override public boolean contains(String name) { return fStore.contains(name); } - /* - * @see IPreferenceStore#getBoolean(java.lang.String) - */ + @Override public boolean getBoolean(String name) { return fStore.getBoolean(name); } - /* - * @see IPreferenceStore#getDefaultBoolean(java.lang.String) - */ + @Override public boolean getDefaultBoolean(String name) { return fStore.getDefaultBoolean(name); } - /* - * @see IPreferenceStore#getDefaultDouble(java.lang.String) - */ + @Override public double getDefaultDouble(String name) { return fStore.getDefaultDouble(name); } - /* - * @see IPreferenceStore#getDefaultFloat(String) - */ + @Override public float getDefaultFloat(String name) { return fStore.getDefaultFloat(name); } - /* - * @see IPreferenceStore#getDefaultInt(String) - */ + @Override public int getDefaultInt(String name) { return fStore.getDefaultInt(name); } - /* - * @see IPreferenceStore#getDefaultLong(String) - */ + @Override public long getDefaultLong(String name) { return fStore.getDefaultLong(name); } - /* - * @see IPreferenceStore#getDefaultString(String) - */ + @Override public String getDefaultString(String name) { return fStore.getDefaultString(name); } - /* - * @see IPreferenceStore#getDouble(String) - */ + @Override public double getDouble(String name) { return fStore.getDouble(name); } - /* - * @see IPreferenceStore#getFloat(String) - */ + @Override public float getFloat(String name) { return fStore.getFloat(name); } - /* - * @see IPreferenceStore#getInt(String) - */ + @Override public int getInt(String name) { return fStore.getInt(name); } - /* - * @see IPreferenceStore#getLong(String) - */ + @Override public long getLong(String name) { return fStore.getLong(name); } - /* - * @see IPreferenceStore#getString(String) - */ + @Override public String getString(String name) { return fStore.getString(name); } - /* - * @see IPreferenceStore#isDefault(String) - */ + @Override public boolean isDefault(String name) { return fStore.isDefault(name); } - /* - * @see IPreferenceStore#needsSaving() - */ + @Override public boolean needsSaving() { return fStore.needsSaving(); } - /* - * @see IPreferenceStore#putValue(String, String) - */ + @Override public void putValue(String name, String value) { if (covers(name)) fStore.putValue(name, value); } - /* - * @see IPreferenceStore#setDefault(String, double) - */ + @Override public void setDefault(String name, double value) { if (covers(name)) fStore.setDefault(name, value); } - /* - * @see IPreferenceStore#setDefault(String, float) - */ + @Override public void setDefault(String name, float value) { if (covers(name)) fStore.setDefault(name, value); } - /* - * @see IPreferenceStore#setDefault(String, int) - */ + @Override public void setDefault(String name, int value) { if (covers(name)) fStore.setDefault(name, value); } - /* - * @see IPreferenceStore#setDefault(String, long) - */ + @Override public void setDefault(String name, long value) { if (covers(name)) fStore.setDefault(name, value); } - /* - * @see IPreferenceStore#setDefault(String, String) - */ + @Override public void setDefault(String name, String value) { if (covers(name)) fStore.setDefault(name, value); } - /* - * @see IPreferenceStore#setDefault(String, boolean) - */ + @Override public void setDefault(String name, boolean value) { if (covers(name)) fStore.setDefault(name, value); } - /* - * @see IPreferenceStore#setToDefault(String) - */ + @Override public void setToDefault(String name) { fStore.setToDefault(name); } - /* - * @see IPreferenceStore#setValue(String, double) - */ + @Override public void setValue(String name, double value) { if (covers(name)) fStore.setValue(name, value); } - /* - * @see IPreferenceStore#setValue(String, float) - */ + @Override public void setValue(String name, float value) { if (covers(name)) fStore.setValue(name, value); } - /* - * @see IPreferenceStore#setValue(String, int) - */ + @Override public void setValue(String name, int value) { if (covers(name)) fStore.setValue(name, value); } - /* - * @see IPreferenceStore#setValue(String, long) - */ + @Override public void setValue(String name, long value) { if (covers(name)) fStore.setValue(name, value); } - /* - * @see IPreferenceStore#setValue(String, String) - */ + @Override public void setValue(String name, String value) { if (covers(name)) fStore.setValue(name, value); } - /* - * @see IPreferenceStore#setValue(String, boolean) - */ + @Override public void setValue(String name, boolean value) { if (covers(name)) fStore.setValue(name, value); diff --git a/org.eclipse.ui.editors/src/org/eclipse/ui/internal/editors/text/PreviousPulldownActionDelegate.java b/org.eclipse.ui.editors/src/org/eclipse/ui/internal/editors/text/PreviousPulldownActionDelegate.java index 749bf2958c1..1c14ed60a95 100644 --- a/org.eclipse.ui.editors/src/org/eclipse/ui/internal/editors/text/PreviousPulldownActionDelegate.java +++ b/org.eclipse.ui.editors/src/org/eclipse/ui/internal/editors/text/PreviousPulldownActionDelegate.java @@ -20,10 +20,8 @@ import org.eclipse.ui.texteditor.AnnotationPreference; */ public class PreviousPulldownActionDelegate extends NextPreviousPulldownActionDelegate { - /* - * @see org.eclipse.ui.internal.texteditor.NextPreviousPulldownActionDelegate#getPreferenceKey(AnnotationPreference) - */ - public String getPreferenceKey(AnnotationPreference annotationPreference) { + @Override +public String getPreferenceKey(AnnotationPreference annotationPreference) { return annotationPreference.getIsGoToPreviousNavigationTargetKey(); } diff --git a/org.eclipse.ui.editors/src/org/eclipse/ui/internal/editors/text/QuickDiffConfigurationBlock.java b/org.eclipse.ui.editors/src/org/eclipse/ui/internal/editors/text/QuickDiffConfigurationBlock.java index a8944b8690c..fc48a4af8ac 100644 --- a/org.eclipse.ui.editors/src/org/eclipse/ui/internal/editors/text/QuickDiffConfigurationBlock.java +++ b/org.eclipse.ui.editors/src/org/eclipse/ui/internal/editors/text/QuickDiffConfigurationBlock.java @@ -56,8 +56,10 @@ class QuickDiffConfigurationBlock implements IPreferenceConfigurationBlock { private Map fCheckBoxes= new HashMap(); private SelectionListener fCheckBoxListener= new SelectionListener() { + @Override public void widgetDefaultSelected(SelectionEvent e) { } + @Override public void widgetSelected(SelectionEvent e) { Button button= (Button) e.widget; fStore.setValue((String) fCheckBoxes.get(button), button.getSelection()); @@ -212,6 +214,7 @@ class QuickDiffConfigurationBlock implements IPreferenceConfigurationBlock { * @param parent the parent composite * @return the created child composite */ + @Override public Control createControl(Composite parent) { Composite composite= new Composite(parent, SWT.NONE); GridLayout layout= new GridLayout(); @@ -223,12 +226,14 @@ class QuickDiffConfigurationBlock implements IPreferenceConfigurationBlock { String label= TextEditorMessages.QuickDiffConfigurationBlock_showForNewEditors; fEnablementCheckbox= addCheckBox(composite, label, AbstractDecoratedTextEditorPreferenceConstants.QUICK_DIFF_ALWAYS_ON, 0); fEnablementCheckbox.addSelectionListener(new SelectionListener() { + @Override public void widgetSelected(SelectionEvent e) { boolean enabled= fEnablementCheckbox.getSelection(); fStore.setValue(SpellingService.PREFERENCE_SPELLING_ENABLED, enabled); updateEnablement(); } + @Override public void widgetDefaultSelected(SelectionEvent e) { } }); @@ -245,12 +250,14 @@ class QuickDiffConfigurationBlock implements IPreferenceConfigurationBlock { gd.horizontalIndent= 10; fQuickDiffOverviewRulerCheckBox.setLayoutData(gd); fQuickDiffOverviewRulerCheckBox.addSelectionListener(new SelectionListener() { + @Override public void widgetSelected(SelectionEvent e) { for (int i= 0; i < fQuickDiffModel.length; i++) { fStore.setValue(fQuickDiffModel[i][1], fQuickDiffOverviewRulerCheckBox.getSelection()); } } + @Override public void widgetDefaultSelected(SelectionEvent e) { } }); @@ -286,10 +293,12 @@ class QuickDiffConfigurationBlock implements IPreferenceConfigurationBlock { changeColorButton.setLayoutData(gd); final int index= i; changeColorButton.addSelectionListener(new SelectionListener() { + @Override public void widgetDefaultSelected(SelectionEvent e) { // do nothing } + @Override public void widgetSelected(SelectionEvent e) { String key= fQuickDiffModel[index][0]; PreferenceConverter.setValue(fStore, key, editor.getColorValue()); @@ -322,10 +331,12 @@ class QuickDiffConfigurationBlock implements IPreferenceConfigurationBlock { fQuickDiffProviderCombo.setLayoutData(gd); fQuickDiffProviderCombo.addSelectionListener(new SelectionListener() { + @Override public void widgetDefaultSelected(SelectionEvent e) { // do nothing } + @Override public void widgetSelected(SelectionEvent e) { int i= fQuickDiffProviderCombo.getSelectionIndex(); fStore.setValue(AbstractDecoratedTextEditorPreferenceConstants.QUICK_DIFF_DEFAULT_PROVIDER, fQuickDiffProviderListModel[i][0]); @@ -342,10 +353,7 @@ class QuickDiffConfigurationBlock implements IPreferenceConfigurationBlock { return composite; } - /* - * @see org.eclipse.ui.internal.editors.text.IPreferenceConfigurationBlock#applyData(java.lang.Object) - * @since 3.4 - */ + @Override public void applyData(Object data) { } @@ -382,6 +390,7 @@ class QuickDiffConfigurationBlock implements IPreferenceConfigurationBlock { fQuickDiffProviderCombo.redraw(); } + @Override public void initialize() { for (int i= 0; i < fQuickDiffProviderListModel.length; i++) { @@ -389,6 +398,7 @@ class QuickDiffConfigurationBlock implements IPreferenceConfigurationBlock { fQuickDiffProviderCombo.add(label); } fQuickDiffProviderCombo.getDisplay().asyncExec(new Runnable() { + @Override public void run() { updateProviderList(); } @@ -408,13 +418,16 @@ class QuickDiffConfigurationBlock implements IPreferenceConfigurationBlock { updateQuickDiffControls(); } + @Override public boolean canPerformOk() { return true; } + @Override public void performOk() { } + @Override public void performDefaults() { initializeFields(); updateProviderList(); @@ -430,10 +443,7 @@ class QuickDiffConfigurationBlock implements IPreferenceConfigurationBlock { fQuickDiffOverviewRulerCheckBox.setSelection(quickdiffOverviewRuler); } - /* - * @see org.eclipse.ui.internal.editors.text.IPreferenceConfigurationBlock#dispose() - * @since 3.0 - */ + @Override public void dispose() { } } diff --git a/org.eclipse.ui.editors/src/org/eclipse/ui/internal/editors/text/QuickDiffPreferencePage.java b/org.eclipse.ui.editors/src/org/eclipse/ui/internal/editors/text/QuickDiffPreferencePage.java index 06bb9b2bf99..af9cad305c8 100644 --- a/org.eclipse.ui.editors/src/org/eclipse/ui/internal/editors/text/QuickDiffPreferencePage.java +++ b/org.eclipse.ui.editors/src/org/eclipse/ui/internal/editors/text/QuickDiffPreferencePage.java @@ -27,38 +27,28 @@ import org.eclipse.ui.editors.text.ITextEditorHelpContextIds; */ public class QuickDiffPreferencePage extends AbstractConfigurationBlockPreferencePage { - /* - * @see org.eclipse.ui.internal.editors.text.AbstractConfigureationBlockPreferencePage#getHelpId() - */ + @Override protected String getHelpId() { return ITextEditorHelpContextIds.TEXT_EDITOR_PREFERENCE_PAGE; } - /* - * @see org.eclipse.jface.preference.PreferencePage#createDescriptionLabel(org.eclipse.swt.widgets.Composite) - */ + @Override protected Label createDescriptionLabel(Composite parent) { return null; // no description for new look } - /* - * @see org.eclipse.ui.internal.editors.text.AbstractConfigurationBlockPreferencePage#setDescription() - */ + @Override protected void setDescription() { String description= TextEditorMessages.QuickDiffConfigurationBlock_description; setDescription(description); } - /* - * @see org.org.eclipse.ui.internal.editors.text.AbstractConfigurationBlockPreferencePage#setPreferenceStore() - */ + @Override protected void setPreferenceStore() { setPreferenceStore(EditorsPlugin.getDefault().getPreferenceStore()); } - /* - * @see org.eclipse.ui.internal.editors.text.AbstractConfigureationBlockPreferencePage#createConfigurationBlock(org.eclipse.ui.internal.editors.text.OverlayPreferenceStore) - */ + @Override protected IPreferenceConfigurationBlock createConfigurationBlock(OverlayPreferenceStore overlayPreferenceStore) { return new QuickDiffConfigurationBlock(overlayPreferenceStore); } diff --git a/org.eclipse.ui.editors/src/org/eclipse/ui/internal/editors/text/RefreshEditorAction.java b/org.eclipse.ui.editors/src/org/eclipse/ui/internal/editors/text/RefreshEditorAction.java index 48d69da3ec9..d574dc90f01 100644 --- a/org.eclipse.ui.editors/src/org/eclipse/ui/internal/editors/text/RefreshEditorAction.java +++ b/org.eclipse.ui.editors/src/org/eclipse/ui/internal/editors/text/RefreshEditorAction.java @@ -35,9 +35,7 @@ public class RefreshEditorAction extends RefreshAction implements IUpdate { update(); } - /* - * @see org.eclipse.ui.texteditor.IUpdate#update() - */ + @Override public void update() { final IResource resource= fTextEditor == null ? null : (IResource)fTextEditor.getEditorInput().getAdapter(IResource.class); if (resource != null) diff --git a/org.eclipse.ui.editors/src/org/eclipse/ui/internal/editors/text/RemoveTrailingWhitespaceHandler.java b/org.eclipse.ui.editors/src/org/eclipse/ui/internal/editors/text/RemoveTrailingWhitespaceHandler.java index f98113b7ef1..3ab60367b19 100644 --- a/org.eclipse.ui.editors/src/org/eclipse/ui/internal/editors/text/RemoveTrailingWhitespaceHandler.java +++ b/org.eclipse.ui.editors/src/org/eclipse/ui/internal/editors/text/RemoveTrailingWhitespaceHandler.java @@ -49,17 +49,13 @@ public class RemoveTrailingWhitespaceHandler extends FileBufferOperationHandler super(new RemoveTrailingWhitespaceOperation()); } - /* - * @see org.eclipse.ui.editors.text.FileBufferOperationHandler#isAcceptableLocation(org.eclipse.core.runtime.IPath) - */ + @Override protected boolean isAcceptableLocation(IPath location) { ITextFileBufferManager manager= FileBuffers.getTextFileBufferManager(); return location != null && manager.isTextFileLocation(location, fStrictCheckIfTextLocation); } - /* - * @see org.eclipse.ui.editors.text.FileBufferOperationHandler#collectFiles(org.eclipse.core.resources.IResource[]) - */ + @Override protected IFile[] collectFiles(IResource[] resources) { IFile[] files= super.collectFiles(resources); files= filterUnacceptableFiles(files); @@ -67,6 +63,7 @@ public class RemoveTrailingWhitespaceHandler extends FileBufferOperationHandler return files; final IFilter filter= new IFilter() { + @Override public boolean accept(IResource resource) { return resource != null && isAcceptableLocation(resource.getFullPath()); } @@ -116,10 +113,7 @@ public class RemoveTrailingWhitespaceHandler extends FileBufferOperationHandler return (IFile[]) filtered.toArray(new IFile[filtered.size()]); } - /* - * @see org.eclipse.core.commands.AbstractHandler#setEnabled(java.lang.Object) - * @since 3.7 - */ + @Override public void setEnabled(Object evaluationContext) { fStrictCheckIfTextLocation= true; if (evaluationContext instanceof IEvaluationContext) { diff --git a/org.eclipse.ui.editors/src/org/eclipse/ui/internal/editors/text/SelectResourcesBlock.java b/org.eclipse.ui.editors/src/org/eclipse/ui/internal/editors/text/SelectResourcesBlock.java index 2d9a0154443..ac6e768c5f1 100644 --- a/org.eclipse.ui.editors/src/org/eclipse/ui/internal/editors/text/SelectResourcesBlock.java +++ b/org.eclipse.ui.editors/src/org/eclipse/ui/internal/editors/text/SelectResourcesBlock.java @@ -160,10 +160,12 @@ class SelectResourcesBlock implements ICheckStateListener, ISelectionChangedList * @param event the check state event * @see org.eclipse.jface.viewers.ICheckStateListener#checkStateChanged(org.eclipse.jface.viewers.CheckStateChangedEvent) */ + @Override public void checkStateChanged(final CheckStateChangedEvent event) { //Potentially long operation - show a busy cursor BusyIndicator.showWhile(treeViewer.getControl().getDisplay(), new Runnable() { + @Override public void run() { if (event.getCheckable().equals(treeViewer)) treeItemChecked(event.getElement(), event.getChecked()); @@ -288,6 +290,7 @@ class SelectResourcesBlock implements ICheckStateListener, ISelectionChangedList */ private void expandTreeElement(final Object element) { BusyIndicator.showWhile(treeViewer.getControl().getDisplay(), new Runnable() { + @Override public void run() { // First see if the children need to be given their checked @@ -407,10 +410,12 @@ class SelectResourcesBlock implements ICheckStateListener, ISelectionChangedList IElementFilter passThroughFilter= new IElementFilter() { + @Override public void filterElements(Collection elements) throws InterruptedException { returnValue.addAll(elements); } + @Override public void filterElements(Object[] elements) throws InterruptedException { for (int i= 0; i < elements.length; i++) { returnValue.add(elements[i]); @@ -561,6 +566,7 @@ class SelectResourcesBlock implements ICheckStateListener, ISelectionChangedList for (int i= 0; i < array.length; i++) { final ICheckStateListener l= (ICheckStateListener) array[i]; SafeRunner.run(new SafeRunnable() { + @Override public void run() { l.checkStateChanged(event); } @@ -583,6 +589,7 @@ class SelectResourcesBlock implements ICheckStateListener, ISelectionChangedList //Potentially long operation - show a busy cursor BusyIndicator.showWhile(treeViewer.getControl().getDisplay(), new Runnable() { + @Override public void run() { setListForWhiteSelection(treeElement); listViewer.setAllChecked(true); @@ -640,6 +647,7 @@ class SelectResourcesBlock implements ICheckStateListener, ISelectionChangedList * * @param event SelectionChangedEvent */ + @Override public void selectionChanged(SelectionChangedEvent event) { IStructuredSelection selection= (IStructuredSelection) event.getSelection(); Object selectedElement= selection.getFirstElement(); @@ -672,6 +680,7 @@ class SelectResourcesBlock implements ICheckStateListener, ISelectionChangedList //Potentially long operation - show a busy cursor BusyIndicator.showWhile(treeViewer.getControl().getDisplay(), new Runnable() { + @Override public void run() { setTreeChecked(root, selection); listViewer.setAllChecked(selection); @@ -682,6 +691,7 @@ class SelectResourcesBlock implements ICheckStateListener, ISelectionChangedList public void refresh() { //Potentially long operation - show a busy cursor BusyIndicator.showWhile(treeViewer.getControl().getDisplay(), new Runnable() { + @Override public void run() { treeViewer.refresh(); populateListViewer(currentTreeSelection); @@ -778,6 +788,7 @@ class SelectResourcesBlock implements ICheckStateListener, ISelectionChangedList * * @param event the collapse event */ + @Override public void treeCollapsed(TreeExpansionEvent event) { // We don't need to do anything with this } @@ -787,6 +798,7 @@ class SelectResourcesBlock implements ICheckStateListener, ISelectionChangedList * * @param event the expansion event */ + @Override public void treeExpanded(TreeExpansionEvent event) { expandTreeElement(event.getElement()); } diff --git a/org.eclipse.ui.editors/src/org/eclipse/ui/internal/editors/text/SelectResourcesDialog.java b/org.eclipse.ui.editors/src/org/eclipse/ui/internal/editors/text/SelectResourcesDialog.java index 897ffeb0fb8..87cd0b0b723 100644 --- a/org.eclipse.ui.editors/src/org/eclipse/ui/internal/editors/text/SelectResourcesDialog.java +++ b/org.eclipse.ui.editors/src/org/eclipse/ui/internal/editors/text/SelectResourcesDialog.java @@ -77,10 +77,7 @@ class SelectResourcesDialog extends Dialog { fAcceptableLocationsFilter= acceptableLocationsFilter; } - /* - * @see org.eclipse.jface.dialogs.Dialog#isResizable() - * @since 3.4 - */ + @Override protected boolean isResizable() { return true; } @@ -99,9 +96,7 @@ class SelectResourcesDialog extends Dialog { return (IResource[]) items.toArray(new IResource[items.size()]); } - /* - * @see org.eclipse.jface.window.Window#configureShell(org.eclipse.swt.widgets.Shell) - */ + @Override protected void configureShell(Shell newShell) { super.configureShell(newShell); @@ -109,9 +104,7 @@ class SelectResourcesDialog extends Dialog { newShell.setText(fTitle); } - /* - * @see org.eclipse.jface.dialogs.Dialog#createDialogArea(org.eclipse.swt.widgets.Composite) - */ + @Override protected Control createDialogArea(Composite parent) { Composite composite= (Composite) super.createDialogArea(parent); Label label= new Label(composite, SWT.LEFT); @@ -120,6 +113,7 @@ class SelectResourcesDialog extends Dialog { fResourceGroup= new SelectResourcesBlock(composite, ResourcesPlugin.getWorkspace().getRoot(), getResourceProvider(IResource.FOLDER | IResource.PROJECT), WorkbenchLabelProvider.getDecoratingWorkbenchLabelProvider(), getResourceProvider(IResource.FILE), WorkbenchLabelProvider.getDecoratingWorkbenchLabelProvider(), SWT.NONE, useHeightHint(parent)); fResourceGroup.addCheckStateListener(new ICheckStateListener() { + @Override public void checkStateChanged(CheckStateChangedEvent event) { updateSelectionCount(); } @@ -142,7 +136,8 @@ class SelectResourcesDialog extends Dialog { private ITreeContentProvider getResourceProvider(final int resourceType) { return new WorkbenchContentProvider() { - public Object[] getChildren(Object o) { + @Override + public Object[] getChildren(Object o) { if (o instanceof IWorkspaceRoot) { HashSet projects= new HashSet(); for (int i= 0; i < fInput.length; i++) { @@ -195,6 +190,7 @@ class SelectResourcesDialog extends Dialog { Button selectButton= createButton(buttonComposite, IDialogConstants.SELECT_ALL_ID, TextEditorMessages.SelectResourcesDialog_selectAll, false); SelectionListener listener= new SelectionAdapter() { + @Override public void widgetSelected(SelectionEvent e) { fResourceGroup.setAllSelections(true); updateSelectionCount(); @@ -207,6 +203,7 @@ class SelectResourcesDialog extends Dialog { Button deselectButton= createButton(buttonComposite, IDialogConstants.DESELECT_ALL_ID, TextEditorMessages.SelectResourcesDialog_deselectAll, false); listener= new SelectionAdapter() { + @Override public void widgetSelected(SelectionEvent e) { fResourceGroup.setAllSelections(false); updateSelectionCount(); @@ -220,6 +217,7 @@ class SelectResourcesDialog extends Dialog { Button selectTypesButton= createButton(buttonComposite, IDialogConstants.SELECT_TYPES_ID, TextEditorMessages.SelectResourcesDialog_filterSelection, false); listener= new SelectionAdapter() { + @Override public void widgetSelected(SelectionEvent e) { handleSelectFileTypes(); } @@ -248,6 +246,7 @@ class SelectResourcesDialog extends Dialog { private void filterSelection() { final IFilter filter= new IFilter() { + @Override public boolean accept(IResource resource) { return hasAcceptedFileType(resource); } @@ -257,7 +256,8 @@ class SelectResourcesDialog extends Dialog { final IResource[] resources= (IResource[]) list.toArray(new IResource[list.size()]); Runnable runnable = new Runnable() { - public void run() { + @Override + public void run() { setSelection(resources, filter); } }; diff --git a/org.eclipse.ui.editors/src/org/eclipse/ui/internal/editors/text/SharedTextColors.java b/org.eclipse.ui.editors/src/org/eclipse/ui/internal/editors/text/SharedTextColors.java index eccaeda0b35..047968bd09a 100644 --- a/org.eclipse.ui.editors/src/org/eclipse/ui/internal/editors/text/SharedTextColors.java +++ b/org.eclipse.ui.editors/src/org/eclipse/ui/internal/editors/text/SharedTextColors.java @@ -34,9 +34,7 @@ class SharedTextColors implements ISharedTextColors { super(); } - /* - * @see ISharedTextColors#getColor(RGB) - */ + @Override public Color getColor(RGB rgb) { if (rgb == null) return null; @@ -51,6 +49,7 @@ class SharedTextColors implements ISharedTextColors { colorTable= new HashMap(10); fDisplayTable.put(display, colorTable); display.disposeExec(new Runnable() { + @Override public void run() { dispose(display); } @@ -66,9 +65,7 @@ class SharedTextColors implements ISharedTextColors { return color; } - /* - * @see ISharedTextColors#dispose() - */ + @Override public void dispose() { if (fDisplayTable == null) return; diff --git a/org.eclipse.ui.editors/src/org/eclipse/ui/internal/editors/text/SpellingConfigurationBlock.java b/org.eclipse.ui.editors/src/org/eclipse/ui/internal/editors/text/SpellingConfigurationBlock.java index d28884cddfc..1d711e1d252 100644 --- a/org.eclipse.ui.editors/src/org/eclipse/ui/internal/editors/text/SpellingConfigurationBlock.java +++ b/org.eclipse.ui.editors/src/org/eclipse/ui/internal/editors/text/SpellingConfigurationBlock.java @@ -85,9 +85,7 @@ class SpellingConfigurationBlock implements IPreferenceConfigurationBlock { fMessage= message; } - /* - * @see org.eclipse.ui.texteditor.spelling.ISpellingPreferenceBlock#createControl(org.eclipse.swt.widgets.Composite) - */ + @Override public Control createControl(Composite composite) { Composite inner= new Composite(composite, SWT.NONE); inner.setLayout(new FillLayout(SWT.VERTICAL)); @@ -98,46 +96,32 @@ class SpellingConfigurationBlock implements IPreferenceConfigurationBlock { return inner; } - /* - * @see org.eclipse.ui.texteditor.spelling.ISpellingPreferenceBlock#initialize(org.eclipse.ui.texteditor.spelling.IStatusMonitor) - */ + @Override public void initialize(IPreferenceStatusMonitor statusMonitor) { } - /* - * @see org.eclipse.ui.texteditor.spelling.ISpellingPreferenceBlock#canPerformOk() - */ + @Override public boolean canPerformOk() { return true; } - /* - * @see org.eclipse.ui.texteditor.spelling.ISpellingPreferenceBlock#performOk() - */ + @Override public void performOk() { } - /* - * @see org.eclipse.ui.texteditor.spelling.ISpellingPreferenceBlock#performDefaults() - */ + @Override public void performDefaults() { } - /* - * @see org.eclipse.ui.texteditor.spelling.ISpellingPreferenceBlock#performRevert() - */ + @Override public void performRevert() { } - /* - * @see org.eclipse.ui.texteditor.spelling.ISpellingPreferenceBlock#dispose() - */ + @Override public void dispose() { } - /* - * @see org.eclipse.ui.texteditor.spelling.ISpellingPreferenceBlock#setEnabled(boolean) - */ + @Override public void setEnabled(boolean enabled) { fLabel.setEnabled(enabled); } @@ -163,9 +147,7 @@ class SpellingConfigurationBlock implements IPreferenceConfigurationBlock { fForwardedMonitor= forwardedMonitor; } - /* - * @see org.eclipse.ui.texteditor.spelling.IPreferenceStatusMonitor#statusChanged(org.eclipse.core.runtime.IStatus) - */ + @Override public void statusChanged(IStatus status) { fStatus= status; fForwardedMonitor.statusChanged(status); @@ -239,6 +221,7 @@ class SpellingConfigurationBlock implements IPreferenceConfigurationBlock { * @param parent the parent composite * @return the control for the preference page */ + @Override public Control createControl(Composite parent) { Composite composite= new Composite(parent, SWT.NULL); @@ -266,12 +249,14 @@ class SpellingConfigurationBlock implements IPreferenceConfigurationBlock { gd= new GridData(GridData.HORIZONTAL_ALIGN_BEGINNING | GridData.VERTICAL_ALIGN_BEGINNING); fEnablementCheckbox.setLayoutData(gd); fEnablementCheckbox.addSelectionListener(new SelectionListener() { + @Override public void widgetSelected(SelectionEvent e) { boolean enabled= fEnablementCheckbox.getSelection(); fStore.setValue(SpellingService.PREFERENCE_SPELLING_ENABLED, enabled); updateCheckboxDependencies(); } + @Override public void widgetDefaultSelected(SelectionEvent e) { } }); @@ -324,10 +309,7 @@ class SpellingConfigurationBlock implements IPreferenceConfigurationBlock { return composite; } - /* - * @see org.eclipse.ui.internal.editors.text.IPreferenceConfigurationBlock#applyData(java.lang.Object) - * @since 3.4 - */ + @Override public void applyData(Object data) { } @@ -336,42 +318,33 @@ class SpellingConfigurationBlock implements IPreferenceConfigurationBlock { final ComboViewer viewer= new ComboViewer(fProviderCombo); viewer.setContentProvider(new IStructuredContentProvider() { - /* - * @see org.eclipse.jface.viewers.IContentProvider#dispose() - */ + @Override public void dispose() { } - /* - * @see org.eclipse.jface.viewers.IContentProvider#inputChanged(org.eclipse.jface.viewers.Viewer, java.lang.Object, java.lang.Object) - */ + @Override public void inputChanged(Viewer v, Object oldInput, Object newInput) { } - /* - * @see org.eclipse.jface.viewers.IStructuredContentProvider#getElements(java.lang.Object) - */ + @Override public Object[] getElements(Object inputElement) { return fProviderDescriptors.values().toArray(); } }); viewer.setLabelProvider(new LabelProvider() { - /* - * @see org.eclipse.jface.viewers.LabelProvider#getImage(java.lang.Object) - */ + @Override public Image getImage(Object element) { return null; } - /* - * @see org.eclipse.jface.viewers.LabelProvider#getText(java.lang.Object) - */ + @Override public String getText(Object element) { return ((SpellingEngineDescriptor) element).getLabel(); } }); viewer.addSelectionChangedListener(new ISelectionChangedListener() { + @Override public void selectionChanged(SelectionChangedEvent event) { IStructuredSelection sel= (IStructuredSelection) event.getSelection(); if (sel.isEmpty()) @@ -379,9 +352,11 @@ class SpellingConfigurationBlock implements IPreferenceConfigurationBlock { if (fCurrentBlock != null && fStatusMonitor.getStatus() != null && fStatusMonitor.getStatus().matches(IStatus.ERROR)) if (isPerformRevert()) { ISafeRunnable runnable= new ISafeRunnable() { + @Override public void run() throws Exception { fCurrentBlock.performRevert(); } + @Override public void handleException(Throwable x) { } }; @@ -426,9 +401,11 @@ class SpellingConfigurationBlock implements IPreferenceConfigurationBlock { final ISpellingPreferenceBlock preferenceBlock= (ISpellingPreferenceBlock) fProviderPreferences.get(id); if (preferenceBlock != null) { ISafeRunnable runnable= new ISafeRunnable() { + @Override public void run() throws Exception { preferenceBlock.setEnabled(enabled); } + @Override public void handleException(Throwable x) { } }; @@ -472,9 +449,11 @@ class SpellingConfigurationBlock implements IPreferenceConfigurationBlock { if (control == null) { final Control[] result= new Control[1]; ISafeRunnable runnable= new ISafeRunnable() { + @Override public void run() throws Exception { result[0]= fCurrentBlock.createControl(fGroup); } + @Override public void handleException(Throwable x) { } }; @@ -496,19 +475,23 @@ class SpellingConfigurationBlock implements IPreferenceConfigurationBlock { fStatusMonitor.statusChanged(new StatusInfo()); ISafeRunnable runnable= new ISafeRunnable() { + @Override public void run() throws Exception { fCurrentBlock.initialize(fStatusMonitor); } + @Override public void handleException(Throwable x) { } }; SafeRunner.run(runnable); } + @Override public void initialize() { restoreFromPreferences(); } + @Override public boolean canPerformOk() { SpellingEngineDescriptor desc= EditorsUI.getSpellingService().getActiveSpellingEngineDescriptor(fStore); String id= desc != null ? desc.getId() : ""; //$NON-NLS-1$ @@ -518,9 +501,11 @@ class SpellingConfigurationBlock implements IPreferenceConfigurationBlock { final Boolean[] result= new Boolean[] { Boolean.TRUE }; ISafeRunnable runnable= new ISafeRunnable() { + @Override public void run() throws Exception { result[0]= Boolean.valueOf(block.canPerformOk()); } + @Override public void handleException(Throwable x) { } }; @@ -528,13 +513,16 @@ class SpellingConfigurationBlock implements IPreferenceConfigurationBlock { return result[0].booleanValue(); } + @Override public void performOk() { for (Iterator it= fProviderPreferences.values().iterator(); it.hasNext();) { final ISpellingPreferenceBlock block= (ISpellingPreferenceBlock) it.next(); ISafeRunnable runnable= new ISafeRunnable() { + @Override public void run() throws Exception { block.performOk(); } + @Override public void handleException(Throwable x) { } }; @@ -542,14 +530,17 @@ class SpellingConfigurationBlock implements IPreferenceConfigurationBlock { } } + @Override public void performDefaults() { restoreFromPreferences(); for (Iterator it= fProviderPreferences.values().iterator(); it.hasNext();) { final ISpellingPreferenceBlock block= (ISpellingPreferenceBlock) it.next(); ISafeRunnable runnable= new ISafeRunnable() { + @Override public void run() throws Exception { block.performDefaults(); } + @Override public void handleException(Throwable x) { } }; @@ -557,13 +548,16 @@ class SpellingConfigurationBlock implements IPreferenceConfigurationBlock { } } + @Override public void dispose() { for (Iterator it= fProviderPreferences.values().iterator(); it.hasNext();) { final ISpellingPreferenceBlock block= (ISpellingPreferenceBlock) it.next(); ISafeRunnable runnable= new ISafeRunnable() { + @Override public void run() throws Exception { block.dispose(); } + @Override public void handleException(Throwable x) { } }; diff --git a/org.eclipse.ui.editors/src/org/eclipse/ui/internal/editors/text/SpellingPreferencePage.java b/org.eclipse.ui.editors/src/org/eclipse/ui/internal/editors/text/SpellingPreferencePage.java index 4468562b635..5d2752a08cd 100644 --- a/org.eclipse.ui.editors/src/org/eclipse/ui/internal/editors/text/SpellingPreferencePage.java +++ b/org.eclipse.ui.editors/src/org/eclipse/ui/internal/editors/text/SpellingPreferencePage.java @@ -32,9 +32,7 @@ public class SpellingPreferencePage extends AbstractConfigurationBlockPreference */ private class StatusMonitor implements IPreferenceStatusMonitor { - /* - * @see org.eclipse.ui.texteditor.spelling.IStatusMonitor#statusChanged(org.eclipse.core.runtime.IStatus) - */ + @Override public void statusChanged(IStatus status) { handleStatusChanged(status); } @@ -50,29 +48,21 @@ public class SpellingPreferencePage extends AbstractConfigurationBlockPreference StatusUtil.applyToStatusLine(this, status); } - /* - * @see org.eclipse.ui.internal.editors.text.AbstractConfigureationBlockPreferencePage#getHelpId() - */ + @Override protected String getHelpId() { return ITextEditorHelpContextIds.SPELLING_PREFERENCE_PAGE; } - /* - * @see org.eclipse.ui.internal.editors.text.AbstractConfigurationBlockPreferencePage#setDescription() - */ + @Override protected void setDescription() { } - /* - * @see org.eclipse.ui.internal.editors.text.AbstractConfigurationBlockPreferencePage#setPreferenceStore() - */ + @Override protected void setPreferenceStore() { setPreferenceStore(EditorsPlugin.getDefault().getPreferenceStore()); } - /* - * @see org.eclipse.ui.internal.editors.text.AbstractConfigureationBlockPreferencePage#createConfigurationBlock(org.eclipse.ui.internal.editors.text.OverlayPreferenceStore) - */ + @Override protected IPreferenceConfigurationBlock createConfigurationBlock(OverlayPreferenceStore overlayPreferenceStore) { return new SpellingConfigurationBlock(overlayPreferenceStore, new StatusMonitor()); } diff --git a/org.eclipse.ui.editors/src/org/eclipse/ui/internal/editors/text/StatusInfo.java b/org.eclipse.ui.editors/src/org/eclipse/ui/internal/editors/text/StatusInfo.java index 6e8bb39c775..57a0bdaf5b6 100644 --- a/org.eclipse.ui.editors/src/org/eclipse/ui/internal/editors/text/StatusInfo.java +++ b/org.eclipse.ui.editors/src/org/eclipse/ui/internal/editors/text/StatusInfo.java @@ -48,9 +48,7 @@ class StatusInfo implements IStatus { fSeverity= severity; } - /* - * @see org.eclipse.core.runtime.IStatus#isOK() - */ + @Override public boolean isOK() { return fSeverity == IStatus.OK; } @@ -85,9 +83,7 @@ class StatusInfo implements IStatus { return fSeverity == IStatus.ERROR; } - /* - * @see IStatus#getMessage() - */ + @Override public String getMessage() { return fStatusMessage; } @@ -133,9 +129,7 @@ class StatusInfo implements IStatus { fSeverity= IStatus.OK; } - /* - * @see IStatus#matches(int) - */ + @Override public boolean matches(int severityMask) { return (fSeverity & severityMask) != 0; } @@ -145,20 +139,17 @@ class StatusInfo implements IStatus { * * @see IStatus#isMultiStatus() */ + @Override public boolean isMultiStatus() { return false; } - /* - * @see IStatus#getSeverity() - */ + @Override public int getSeverity() { return fSeverity; } - /* - * @see IStatus#getPlugin() - */ + @Override public String getPlugin() { return EditorsUI.PLUGIN_ID; } @@ -168,6 +159,7 @@ class StatusInfo implements IStatus { * * @see IStatus#getException() */ + @Override public Throwable getException() { return null; } @@ -177,6 +169,7 @@ class StatusInfo implements IStatus { * * @see IStatus#getCode() */ + @Override public int getCode() { return fSeverity; } @@ -186,6 +179,7 @@ class StatusInfo implements IStatus { * * @see IStatus#getChildren() */ + @Override public IStatus[] getChildren() { return new IStatus[0]; } diff --git a/org.eclipse.ui.editors/src/org/eclipse/ui/internal/editors/text/TabFolderLayout.java b/org.eclipse.ui.editors/src/org/eclipse/ui/internal/editors/text/TabFolderLayout.java index 622ca4341a8..017831218f2 100644 --- a/org.eclipse.ui.editors/src/org/eclipse/ui/internal/editors/text/TabFolderLayout.java +++ b/org.eclipse.ui.editors/src/org/eclipse/ui/internal/editors/text/TabFolderLayout.java @@ -29,6 +29,7 @@ class TabFolderLayout extends Layout { /* * @see org.eclipse.swt.widgets.Layout#computeSize(org.eclipse.swt.widgets.Composite, int, int, boolean) */ + @Override protected Point computeSize (Composite composite, int wHint, int hHint, boolean flushCache) { if (wHint != SWT.DEFAULT && hHint != SWT.DEFAULT) return new Point(wHint, hHint); @@ -55,6 +56,7 @@ class TabFolderLayout extends Layout { /* * @see org.eclipse.swt.widgets.Layout#layout(org.eclipse.swt.widgets.Composite, boolean) */ + @Override protected void layout (Composite composite, boolean flushCache) { Rectangle rect= composite.getClientArea(); diff --git a/org.eclipse.ui.editors/src/org/eclipse/ui/internal/editors/text/TextEditorDefaultsPreferencePage.java b/org.eclipse.ui.editors/src/org/eclipse/ui/internal/editors/text/TextEditorDefaultsPreferencePage.java index 85e569c9b79..571c0d7018e 100644 --- a/org.eclipse.ui.editors/src/org/eclipse/ui/internal/editors/text/TextEditorDefaultsPreferencePage.java +++ b/org.eclipse.ui.editors/src/org/eclipse/ui/internal/editors/text/TextEditorDefaultsPreferencePage.java @@ -102,6 +102,7 @@ public class TextEditorDefaultsPreferencePage extends PreferencePage implements super(preference); fText= control; } + @Override public void initialize() { String value= fPreferenceStore.getString(fPreference.getKey()); fText.setText(value); @@ -115,6 +116,7 @@ public class TextEditorDefaultsPreferencePage extends PreferencePage implements super(preference); fControl= control; } + @Override public void initialize() { boolean value= fPreferenceStore.getBoolean(fPreference.getKey()); fControl.setSelection(value); @@ -130,6 +132,7 @@ public class TextEditorDefaultsPreferencePage extends PreferencePage implements fControl= control; fDomain= domain; } + @Override public void initialize() { int value= fPreferenceStore.getInt(fPreference.getKey()); EnumValue enumValue= fDomain.getValueByInteger(value); @@ -150,6 +153,7 @@ public class TextEditorDefaultsPreferencePage extends PreferencePage implements fControl= control; fDomain= domain; } + @Override public void initialize() { int value= fPreferenceStore.getInt(fPreference.getKey()); EnumValue enumValue= fDomain.getValueByInteger(value); @@ -199,6 +203,7 @@ public class TextEditorDefaultsPreferencePage extends PreferencePage implements fMin= min; } + @Override public IStatus validate(Object value) { StatusInfo status= new StatusInfo(); if (value instanceof String && ((String)value).length() == 0) { @@ -238,9 +243,11 @@ public class TextEditorDefaultsPreferencePage extends PreferencePage implements public int getIntValue() { return fValue; } + @Override public final int hashCode() { return getIntValue(); } + @Override public boolean equals(Object obj) { if (obj instanceof EnumValue) { return ((EnumValue) obj).getIntValue() == fValue; @@ -294,6 +301,7 @@ public class TextEditorDefaultsPreferencePage extends PreferencePage implements addValue(from++); } + @Override public IStatus validate(Object value) { StatusInfo status= new StatusInfo(); if (value instanceof String && ((String)value).length() == 0) { @@ -328,6 +336,7 @@ public class TextEditorDefaultsPreferencePage extends PreferencePage implements } static class BooleanDomain extends Domain { + @Override public IStatus validate(Object value) { StatusInfo status= new StatusInfo(); if (value instanceof String && ((String)value).length() == 0) { @@ -421,11 +430,13 @@ public class TextEditorDefaultsPreferencePage extends PreferencePage implements return new OverlayPreferenceStore(fParentPreferenceStore, keys); } + @Override protected void configureShell(Shell newShell) { super.configureShell(newShell); newShell.setText(TextEditorMessages.TextEditorDefaultsPreferencePage_showWhitespaceCharactersDialogTitle); } + @Override protected Control createContents(Composite parent) { Control contents= super.createContents(parent); Dialog.applyDialogFont(contents); @@ -442,6 +453,7 @@ public class TextEditorDefaultsPreferencePage extends PreferencePage implements } } + @Override protected Control createDialogArea(Composite parent) { Composite composite= (Composite)super.createDialogArea(parent); @@ -579,6 +591,7 @@ public class TextEditorDefaultsPreferencePage extends PreferencePage implements gd.horizontalIndent= indentation; checkBox.setLayoutData(gd); checkBox.addSelectionListener(new SelectionAdapter() { + @Override public void widgetSelected(SelectionEvent e) { boolean value= checkBox.getSelection(); IStatus status= domain.validate(Boolean.valueOf(value)); @@ -607,6 +620,7 @@ public class TextEditorDefaultsPreferencePage extends PreferencePage implements if (domain != null) { textControl.addModifyListener(new ModifyListener() { + @Override public void modifyText(ModifyEvent e) { String value= textControl.getText(); IStatus status= domain.validate(value); @@ -626,6 +640,7 @@ public class TextEditorDefaultsPreferencePage extends PreferencePage implements return new Control[] { labelControl, textControl }; } + @Override protected void okPressed() { super.okPressed(); fDialogOverlayStore.propagate(); @@ -735,15 +750,11 @@ public class TextEditorDefaultsPreferencePage extends PreferencePage implements return new OverlayPreferenceStore(getPreferenceStore(), keys); } - /* - * @see IWorkbenchPreferencePage#init() - */ + @Override public void init(IWorkbench workbench) { } - /* - * @see PreferencePage#createControl(Composite) - */ + @Override public void createControl(Composite parent) { super.createControl(parent); PlatformUI.getWorkbench().getHelpSystem().setHelp(getControl(), ITextEditorHelpContextIds.TEXT_EDITOR_PREFERENCE_PAGE); @@ -786,6 +797,7 @@ public class TextEditorDefaultsPreferencePage extends PreferencePage implements Link fontLink= new Link(appearanceComposite, SWT.NONE); fontLink.setText(TextEditorMessages.TextEditorPreferencePage_Font_link); fontLink.addSelectionListener(new SelectionAdapter() { + @Override public void widgetSelected(SelectionEvent e) { PreferencesUtil.createPreferenceDialogOn(getShell(), "org.eclipse.ui.preferencePages.ColorsAndFonts", null, "selectFont:" + JFaceResources.TEXT_FONT); //$NON-NLS-1$ //$NON-NLS-2$ } @@ -831,6 +843,7 @@ public class TextEditorDefaultsPreferencePage extends PreferencePage implements createDependency(showPrintMarginButton, showPrintMargin, printMarginControls); showPrintMarginButton.addSelectionListener(new SelectionAdapter() { + @Override public void widgetSelected(SelectionEvent e) { updateStatus(printMarginDomain); } @@ -848,6 +861,7 @@ public class TextEditorDefaultsPreferencePage extends PreferencePage implements String linkText= TextEditorMessages.TextEditorDefaultsPreferencePage_showWhitespaceCharactersLinkText; Preference showWhitespaceCharacters= new Preference(AbstractDecoratedTextEditorPreferenceConstants.EDITOR_SHOW_WHITESPACE_CHARACTERS, label, null); addCheckBoxWithLink(appearanceComposite, showWhitespaceCharacters, linkText, new BooleanDomain(), 0, new SelectionAdapter() { + @Override public void widgetSelected(SelectionEvent e) { Dialog dialog= new WhitespaceCharacterPainterOptionsDialog(Display.getDefault().getActiveShell(), fOverlayStore); dialog.open(); @@ -923,6 +937,7 @@ public class TextEditorDefaultsPreferencePage extends PreferencePage implements foregroundColorButton.setLayoutData(gd); SelectionListener colorDefaultSelectionListener= new SelectionListener() { + @Override public void widgetSelected(SelectionEvent e) { boolean systemDefault= fAppearanceColorDefault.getSelection(); fAppearanceColorEditor.getButton().setEnabled(!systemDefault); @@ -935,6 +950,7 @@ public class TextEditorDefaultsPreferencePage extends PreferencePage implements if (key != null) fOverlayStore.setValue(key, systemDefault); } + @Override public void widgetDefaultSelected(SelectionEvent e) {} }; @@ -948,17 +964,21 @@ public class TextEditorDefaultsPreferencePage extends PreferencePage implements fAppearanceColorDefault.addSelectionListener(colorDefaultSelectionListener); fAppearanceColorList.addSelectionListener(new SelectionListener() { + @Override public void widgetDefaultSelected(SelectionEvent e) { // do nothing } + @Override public void widgetSelected(SelectionEvent e) { handleAppearanceColorListSelection(); } }); foregroundColorButton.addSelectionListener(new SelectionListener() { + @Override public void widgetDefaultSelected(SelectionEvent e) { // do nothing } + @Override public void widgetSelected(SelectionEvent e) { int i= fAppearanceColorList.getSelectionIndex(); if (i == -1) @@ -972,6 +992,7 @@ public class TextEditorDefaultsPreferencePage extends PreferencePage implements Link link= new Link(appearanceComposite, SWT.NONE); link.setText(TextEditorMessages.TextEditorPreferencePage_colorsAndFonts_link); link.addSelectionListener(new SelectionAdapter() { + @Override public void widgetSelected(SelectionEvent e) { PreferencesUtil.createPreferenceDialogOn(getShell(), "org.eclipse.ui.preferencePages.ColorsAndFonts", null, "selectCategory:org.eclipse.ui.workbenchMisc"); //$NON-NLS-1$ //$NON-NLS-2$ } @@ -989,9 +1010,7 @@ public class TextEditorDefaultsPreferencePage extends PreferencePage implements return appearanceComposite; } - /* - * @see PreferencePage#createContents(Composite) - */ + @Override protected Control createContents(Composite parent) { initializeDefaultColors(); @@ -1013,6 +1032,7 @@ public class TextEditorDefaultsPreferencePage extends PreferencePage implements for (int i= 0; i < fAppearanceColorListModel.length; i++) fAppearanceColorList.add(fAppearanceColorListModel[i][0]); fAppearanceColorList.getDisplay().asyncExec(new Runnable() { + @Override public void run() { if (fAppearanceColorList != null && !fAppearanceColorList.isDisposed()) { fAppearanceColorList.select(0); @@ -1063,17 +1083,13 @@ public class TextEditorDefaultsPreferencePage extends PreferencePage implements } } - /* - * @see PreferencePage#performOk() - */ + @Override public boolean performOk() { fOverlayStore.propagate(); return true; } - /* - * @see PreferencePage#performDefaults() - */ + @Override protected void performDefaults() { fOverlayStore.loadDefaults(); @@ -1085,9 +1101,7 @@ public class TextEditorDefaultsPreferencePage extends PreferencePage implements super.performDefaults(); } - /* - * @see DialogPage#dispose() - */ + @Override public void dispose() { if (fOverlayStore != null) { @@ -1125,6 +1139,7 @@ public class TextEditorDefaultsPreferencePage extends PreferencePage implements gd.horizontalSpan= 2; checkBox.setLayoutData(gd); checkBox.addSelectionListener(new SelectionAdapter() { + @Override public void widgetSelected(SelectionEvent e) { checkboxControlChanged(preference, domain, checkBox); } @@ -1155,6 +1170,7 @@ public class TextEditorDefaultsPreferencePage extends PreferencePage implements gd= new GridData(GridData.FILL, GridData.CENTER, false, false); checkBox.setLayoutData(gd); checkBox.addSelectionListener(new SelectionAdapter() { + @Override public void widgetSelected(SelectionEvent e) { checkboxControlChanged(preference, domain, checkBox); } @@ -1166,6 +1182,7 @@ public class TextEditorDefaultsPreferencePage extends PreferencePage implements link.setLayoutData(gd); if (listener != null) { link.addSelectionListener(new SelectionAdapter() { + @Override public void widgetSelected(SelectionEvent e) { listener.widgetSelected(e); } @@ -1194,6 +1211,7 @@ public class TextEditorDefaultsPreferencePage extends PreferencePage implements } combo.addSelectionListener(new SelectionAdapter() { + @Override public void widgetSelected(SelectionEvent e) { int index= combo.getSelectionIndex(); EnumValue value= domain.getValueByIndex(index); @@ -1239,6 +1257,7 @@ public class TextEditorDefaultsPreferencePage extends PreferencePage implements spinner.setPageIncrement(4); spinner.addSelectionListener(new SelectionAdapter() { + @Override public void widgetSelected(SelectionEvent e) { int index= spinner.getSelection(); EnumValue value= domain.getValueByInteger(index); @@ -1270,6 +1289,7 @@ public class TextEditorDefaultsPreferencePage extends PreferencePage implements if (domain != null) { textControl.addModifyListener(new ModifyListener() { + @Override public void modifyText(ModifyEvent e) { String value= textControl.getText(); IStatus status= domain.validate(value); @@ -1296,6 +1316,7 @@ public class TextEditorDefaultsPreferencePage extends PreferencePage implements } SelectionListener listener= new SelectionListener() { + @Override public void widgetSelected(SelectionEvent e) { boolean state= master.getSelection(); for (int i= 0; i < slaves.length; i++) { @@ -1303,6 +1324,7 @@ public class TextEditorDefaultsPreferencePage extends PreferencePage implements } } + @Override public void widgetDefaultSelected(SelectionEvent e) {} }; master.addSelectionListener(listener); diff --git a/org.eclipse.ui.editors/src/org/eclipse/ui/internal/editors/text/UISynchronizationContext.java b/org.eclipse.ui.editors/src/org/eclipse/ui/internal/editors/text/UISynchronizationContext.java index 2f5dfde9415..eb373f2e856 100644 --- a/org.eclipse.ui.editors/src/org/eclipse/ui/internal/editors/text/UISynchronizationContext.java +++ b/org.eclipse.ui.editors/src/org/eclipse/ui/internal/editors/text/UISynchronizationContext.java @@ -26,9 +26,7 @@ import org.eclipse.ui.PlatformUI; */ public class UISynchronizationContext implements ISynchronizationContext { - /* - * @see org.eclipse.core.filebuffers.ISynchronizationContext#run(java.lang.Runnable) - */ + @Override public void run(Runnable runnable) { if (Display.getCurrent() != null) { runnable.run(); diff --git a/org.eclipse.ui.editors/src/org/eclipse/ui/internal/editors/text/URLHyperlink.java b/org.eclipse.ui.editors/src/org/eclipse/ui/internal/editors/text/URLHyperlink.java index 2ca11abc24f..f174c1f6cbb 100644 --- a/org.eclipse.ui.editors/src/org/eclipse/ui/internal/editors/text/URLHyperlink.java +++ b/org.eclipse.ui.editors/src/org/eclipse/ui/internal/editors/text/URLHyperlink.java @@ -39,10 +39,7 @@ final class URLHyperlink extends org.eclipse.jface.text.hyperlink.URLHyperlink { super(region, urlString); } - /* - * @see org.eclipse.jface.text.hyperlink.URLHyperlink#open() - * @since 3.1 - */ + @Override public void open() { // Create the browser IWorkbenchBrowserSupport support= PlatformUI.getWorkbench().getBrowserSupport(); diff --git a/org.eclipse.ui.editors/src/org/eclipse/ui/internal/editors/text/URLHyperlinkDetector.java b/org.eclipse.ui.editors/src/org/eclipse/ui/internal/editors/text/URLHyperlinkDetector.java index 51f421db008..b616604efff 100644 --- a/org.eclipse.ui.editors/src/org/eclipse/ui/internal/editors/text/URLHyperlinkDetector.java +++ b/org.eclipse.ui.editors/src/org/eclipse/ui/internal/editors/text/URLHyperlinkDetector.java @@ -22,9 +22,7 @@ import org.eclipse.jface.text.hyperlink.IHyperlink; */ public class URLHyperlinkDetector extends org.eclipse.jface.text.hyperlink.URLHyperlinkDetector { - /* - * @see org.eclipse.jface.text.hyperlink.IHyperlinkDetector#detectHyperlinks(org.eclipse.jface.text.ITextViewer, org.eclipse.jface.text.IRegion, boolean) - */ + @Override public IHyperlink[] detectHyperlinks(ITextViewer textViewer, IRegion region, boolean canShowMultipleHyperlinks) { IHyperlink[] result= super.detectHyperlinks(textViewer, region, canShowMultipleHyperlinks); if (result == null) diff --git a/org.eclipse.ui.editors/src/org/eclipse/ui/internal/editors/text/UntitledTextFileWizard.java b/org.eclipse.ui.editors/src/org/eclipse/ui/internal/editors/text/UntitledTextFileWizard.java index 383b9d55cb1..62e09c33999 100644 --- a/org.eclipse.ui.editors/src/org/eclipse/ui/internal/editors/text/UntitledTextFileWizard.java +++ b/org.eclipse.ui.editors/src/org/eclipse/ui/internal/editors/text/UntitledTextFileWizard.java @@ -42,9 +42,7 @@ public class UntitledTextFileWizard extends Wizard implements INewWizard { public UntitledTextFileWizard() { } - /* - * @see org.eclipse.ui.IWorkbenchWindowActionDelegate#dispose() - */ + @Override public void dispose() { fWindow= null; } @@ -68,9 +66,7 @@ public class UntitledTextFileWizard extends Wizard implements INewWizard { return new NonExistingFileEditorInput(fileStore, TextEditorMessages.NewTextEditorAction_namePrefix); } - /* - * @see org.eclipse.jface.wizard.Wizard#performFinish() - */ + @Override public boolean performFinish() { IFileStore fileStore= queryFileStore(); IEditorInput input= createEditorInput(fileStore); @@ -85,9 +81,7 @@ public class UntitledTextFileWizard extends Wizard implements INewWizard { return true; } - /* - * @see org.eclipse.ui.IWorkbenchWizard#init(org.eclipse.ui.IWorkbench, org.eclipse.jface.viewers.IStructuredSelection) - */ + @Override public void init(IWorkbench workbench, IStructuredSelection selection) { fWindow= workbench.getActiveWorkbenchWindow(); } diff --git a/org.eclipse.ui.editors/src/org/eclipse/ui/internal/editors/text/WorkspaceOperationRunner.java b/org.eclipse.ui.editors/src/org/eclipse/ui/internal/editors/text/WorkspaceOperationRunner.java index 8b1a7f5d040..514a066d9e8 100644 --- a/org.eclipse.ui.editors/src/org/eclipse/ui/internal/editors/text/WorkspaceOperationRunner.java +++ b/org.eclipse.ui.editors/src/org/eclipse/ui/internal/editors/text/WorkspaceOperationRunner.java @@ -57,9 +57,7 @@ public class WorkspaceOperationRunner implements IRunnableContext { return fProgressMonitor; } - /* - * @see org.eclipse.jface.operation.IRunnableContext#run(boolean, boolean, org.eclipse.jface.operation.IRunnableWithProgress) - */ + @Override public void run(boolean fork, boolean cancelable, IRunnableWithProgress runnable) throws InvocationTargetException, InterruptedException { if (runnable instanceof ISchedulingRuleProvider) run(runnable, ((ISchedulingRuleProvider)runnable).getSchedulingRule()); diff --git a/org.eclipse.ui.editors/src/org/eclipse/ui/internal/texteditor/AnnotationColumn.java b/org.eclipse.ui.editors/src/org/eclipse/ui/internal/texteditor/AnnotationColumn.java index 54efed5e851..06c344b6e38 100644 --- a/org.eclipse.ui.editors/src/org/eclipse/ui/internal/texteditor/AnnotationColumn.java +++ b/org.eclipse.ui.editors/src/org/eclipse/ui/internal/texteditor/AnnotationColumn.java @@ -62,53 +62,39 @@ public class AnnotationColumn extends AbstractContributedRulerColumn implements private final MarkerAnnotationPreferences fAnnotationPreferences= EditorsPlugin.getDefault().getMarkerAnnotationPreferences(); private IPropertyChangeListener fPropertyListener; - /* - * @see org.eclipse.jface.text.source.IVerticalRulerColumn#createControl(org.eclipse.jface.text.source.CompositeRuler, org.eclipse.swt.widgets.Composite) - */ + @Override public Control createControl(CompositeRuler parentRuler, Composite parentControl) { initialize(); Control control= fDelegate.createControl(parentRuler, parentControl); return control; } - /* - * @see org.eclipse.jface.text.source.IVerticalRulerColumn#getControl() - */ + @Override public Control getControl() { return fDelegate.getControl(); } - /* - * @see org.eclipse.jface.text.source.IVerticalRulerColumn#getWidth() - */ + @Override public int getWidth() { return fDelegate.getWidth(); } - /* - * @see org.eclipse.jface.text.source.IVerticalRulerColumn#redraw() - */ + @Override public void redraw() { fDelegate.redraw(); } - /* - * @see org.eclipse.jface.text.source.IVerticalRulerColumn#setFont(org.eclipse.swt.graphics.Font) - */ + @Override public void setFont(Font font) { fDelegate.setFont(font); } - /* - * @see org.eclipse.jface.text.source.IVerticalRulerColumn#setModel(org.eclipse.jface.text.source.IAnnotationModel) - */ + @Override public void setModel(IAnnotationModel model) { fDelegate.setModel(model); } - /* - * @see org.eclipse.ui.texteditor.rulers.AbstractContributedRulerColumn#columnRemoved() - */ + @Override public void columnRemoved() { if (fPropertyListener != null) { IPreferenceStore store= getPreferenceStore(); @@ -141,6 +127,7 @@ public class AnnotationColumn extends AbstractContributedRulerColumn implements // link to preference store fPropertyListener= new IPropertyChangeListener() { + @Override public void propertyChange(PropertyChangeEvent event) { String property= event.getProperty(); AnnotationPreference annotationPreference= getVerticalRulerAnnotationPreference(property); @@ -193,52 +180,40 @@ public class AnnotationColumn extends AbstractContributedRulerColumn implements fDelegate= column; } - /* - * @see org.eclipse.jface.text.source.IVerticalRulerInfoExtension#addVerticalRulerListener(org.eclipse.jface.text.source.IVerticalRulerListener) - */ + @Override public void addVerticalRulerListener(IVerticalRulerListener listener) { if (fDelegate instanceof IVerticalRulerInfoExtension) ((IVerticalRulerInfoExtension) fDelegate).addVerticalRulerListener(listener); } - /* - * @see org.eclipse.jface.text.source.IVerticalRulerInfoExtension#getHover() - */ + @Override public IAnnotationHover getHover() { if (fDelegate instanceof IVerticalRulerInfoExtension) return ((IVerticalRulerInfoExtension) fDelegate).getHover(); return null; } - /* - * @see org.eclipse.jface.text.source.IVerticalRulerInfoExtension#getModel() - */ + @Override public IAnnotationModel getModel() { if (fDelegate instanceof IVerticalRulerInfoExtension) return ((IVerticalRulerInfoExtension) fDelegate).getModel(); return null; } - /* - * @see org.eclipse.jface.text.source.IVerticalRulerInfoExtension#removeVerticalRulerListener(org.eclipse.jface.text.source.IVerticalRulerListener) - */ + @Override public void removeVerticalRulerListener(IVerticalRulerListener listener) { if (fDelegate instanceof IVerticalRulerInfoExtension) ((IVerticalRulerInfoExtension) fDelegate).removeVerticalRulerListener(listener); } - /* - * @see org.eclipse.jface.text.source.IVerticalRulerInfo#getLineOfLastMouseButtonActivity() - */ + @Override public int getLineOfLastMouseButtonActivity() { if (fDelegate instanceof IVerticalRulerInfo) return ((IVerticalRulerInfo)fDelegate).getLineOfLastMouseButtonActivity(); return -1; } - /* - * @see org.eclipse.jface.text.source.IVerticalRulerInfo#toDocumentLineNumber(int) - */ + @Override public int toDocumentLineNumber(int y_coordinate) { if (fDelegate instanceof IVerticalRulerInfo) return ((IVerticalRulerInfo)fDelegate).toDocumentLineNumber(y_coordinate); diff --git a/org.eclipse.ui.editors/src/org/eclipse/ui/internal/texteditor/BooleanPreferenceToggleAction.java b/org.eclipse.ui.editors/src/org/eclipse/ui/internal/texteditor/BooleanPreferenceToggleAction.java index 34fe82ed2fa..b2476835d20 100644 --- a/org.eclipse.ui.editors/src/org/eclipse/ui/internal/texteditor/BooleanPreferenceToggleAction.java +++ b/org.eclipse.ui.editors/src/org/eclipse/ui/internal/texteditor/BooleanPreferenceToggleAction.java @@ -38,16 +38,12 @@ public class BooleanPreferenceToggleAction extends ResourceAction implements IUp update(); } - /* - * @see org.eclipse.ui.texteditor.IUpdate#update() - */ + @Override public void update() { setChecked(fPreferences.getBoolean(fKey)); } - /* - * @see org.eclipse.jface.action.Action#run() - */ + @Override public void run() { boolean state= fPreferences.getBoolean(fKey); fPreferences.setValue(fKey, !state); diff --git a/org.eclipse.ui.editors/src/org/eclipse/ui/internal/texteditor/DelegatingAnnotationPreference.java b/org.eclipse.ui.editors/src/org/eclipse/ui/internal/texteditor/DelegatingAnnotationPreference.java index f986d4f46a9..85efcfb3056 100644 --- a/org.eclipse.ui.editors/src/org/eclipse/ui/internal/texteditor/DelegatingAnnotationPreference.java +++ b/org.eclipse.ui.editors/src/org/eclipse/ui/internal/texteditor/DelegatingAnnotationPreference.java @@ -76,23 +76,17 @@ public class DelegatingAnnotationPreference extends AnnotationPreference { return false; } - /* - * @see org.eclipse.ui.texteditor.AnnotationPreference#getAnnotationType() - */ + @Override public Object getAnnotationType() { return fType.getType(); } - /* - * @see org.eclipse.ui.texteditor.AnnotationPreference#contributesToHeader() - */ + @Override public boolean contributesToHeader() { return getBooleanAttributeValue(HEADER_VALUE); } - /* - * @see org.eclipse.ui.texteditor.AnnotationPreference#getAnnotationImageProvider() - */ + @Override public IAnnotationImageProvider getAnnotationImageProvider() { if (!isCached(IMAGE_PROVIDER)) { AnnotationPreference preference= getDefiningPreference(IMAGE_PROVIDER); @@ -106,86 +100,62 @@ public class DelegatingAnnotationPreference extends AnnotationPreference { return super.getAnnotationImageProvider(); } - /* - * @see org.eclipse.ui.texteditor.AnnotationPreference#getColorPreferenceKey() - */ + @Override public String getColorPreferenceKey() { return (String) getAttributeValue(COLOR_PREFERENCE_KEY); } - /* - * @see org.eclipse.ui.texteditor.AnnotationPreference#getColorPreferenceValue() - */ + @Override public RGB getColorPreferenceValue() { return (RGB) getAttributeValue(COLOR_PREFERENCE_VALUE); } - /* - * @see org.eclipse.ui.texteditor.AnnotationPreference#getHighlightPreferenceKey() - */ + @Override public String getHighlightPreferenceKey() { return (String) getAttributeValue(HIGHLIGHT_PREFERENCE_KEY); } - /* - * @see org.eclipse.ui.texteditor.AnnotationPreference#getHighlightPreferenceValue() - */ + @Override public boolean getHighlightPreferenceValue() { return getBooleanAttributeValue(HIGHLIGHT_PREFERENCE_VALUE); } - /* - * @see org.eclipse.ui.texteditor.AnnotationPreference#getImageDescriptor() - */ + @Override public ImageDescriptor getImageDescriptor() { return (ImageDescriptor) getAttributeValue(IMAGE_DESCRIPTOR); } - /* - * @see org.eclipse.ui.texteditor.AnnotationPreference#getQuickFixImageDescriptor() - */ + @Override public ImageDescriptor getQuickFixImageDescriptor() { return (ImageDescriptor) getAttributeValue(QUICK_FIX_IMAGE_DESCRIPTOR); } - /* - * @see org.eclipse.ui.texteditor.AnnotationPreference#getIsGoToNextNavigationTargetKey() - */ + @Override public String getIsGoToNextNavigationTargetKey() { return (String) getAttributeValue(IS_GO_TO_NEXT_TARGET_KEY); } - /* - * @see org.eclipse.ui.texteditor.AnnotationPreference#getIsGoToPreviousNavigationTargetKey() - */ + @Override public String getIsGoToPreviousNavigationTargetKey() { return (String) getAttributeValue(IS_GO_TO_PREVIOUS_TARGET_KEY); } - /* - * @see org.eclipse.ui.texteditor.AnnotationPreference#getOverviewRulerPreferenceKey() - */ + @Override public String getOverviewRulerPreferenceKey() { return (String) getAttributeValue(OVERVIEW_RULER_PREFERENCE_KEY); } - /* - * @see org.eclipse.ui.texteditor.AnnotationPreference#getOverviewRulerPreferenceValue() - */ + @Override public boolean getOverviewRulerPreferenceValue() { return getBooleanAttributeValue(OVERVIEW_RULER_PREFERENCE_VALUE); } - /* - * @see org.eclipse.ui.texteditor.AnnotationPreference#getPreferenceLabel() - */ + @Override public String getPreferenceLabel() { return (String) getAttributeValue(PREFERENCE_LABEL); } - /* - * @see org.eclipse.ui.texteditor.AnnotationPreference#getPresentationLayer() - */ + @Override public int getPresentationLayer() { Object value= getAttributeValue(PRESENTATION_LAYER); if (value instanceof Integer) @@ -193,89 +163,62 @@ public class DelegatingAnnotationPreference extends AnnotationPreference { return IAnnotationAccessExtension.DEFAULT_LAYER; } - /* - * @see org.eclipse.ui.texteditor.AnnotationPreference#getShowInNextPrevDropdownToolbarActionKey() - */ + @Override public String getShowInNextPrevDropdownToolbarActionKey() { return (String) getAttributeValue(SHOW_IN_NAVIGATION_DROPDOWN_KEY); } - /* - * @see org.eclipse.ui.texteditor.AnnotationPreference#getSymbolicImageName() - */ + @Override public String getSymbolicImageName() { return (String) getAttributeValue(SYMBOLIC_IMAGE_NAME); } - /* - * @see org.eclipse.ui.texteditor.AnnotationPreference#getTextPreferenceKey() - */ + @Override public String getTextPreferenceKey() { return (String) getAttributeValue(TEXT_PREFERENCE_KEY); } - /* - * @see org.eclipse.ui.texteditor.AnnotationPreference#getTextPreferenceValue() - */ + @Override public boolean getTextPreferenceValue() { return getBooleanAttributeValue(TEXT_PREFERENCE_VALUE); } - /* - * @see org.eclipse.ui.texteditor.AnnotationPreference#getVerticalRulerPreferenceKey() - */ + @Override public String getVerticalRulerPreferenceKey() { return (String) getAttributeValue(VERTICAL_RULER_PREFERENCE_KEY); } - /* - * @see org.eclipse.ui.texteditor.AnnotationPreference#getVerticalRulerPreferenceValue() - */ + @Override public boolean getVerticalRulerPreferenceValue() { return getBooleanAttributeValue(VERTICAL_RULER_PREFERENCE_VALUE); } - /* - * @see org.eclipse.ui.texteditor.AnnotationPreference#isGoToNextNavigationTarget() - */ + @Override public boolean isGoToNextNavigationTarget() { return getBooleanAttributeValue(IS_GO_TO_NEXT_TARGET_VALUE); } - /* - * @see org.eclipse.ui.texteditor.AnnotationPreference#isGoToPreviousNavigationTarget() - */ + @Override public boolean isGoToPreviousNavigationTarget() { return getBooleanAttributeValue(IS_GO_TO_PREVIOUS_TARGET_VALUE); } - /* - * @see org.eclipse.ui.texteditor.AnnotationPreference#isShowInNextPrevDropdownToolbarAction() - */ + @Override public boolean isShowInNextPrevDropdownToolbarAction() { return getBooleanAttributeValue(SHOW_IN_NAVIGATION_DROPDOWN_VALUE); } - /* - * @see org.eclipse.ui.texteditor.AnnotationPreference#getTextStylePreferenceKey() - * @since 3.8 - */ + @Override public String getTextStylePreferenceKey() { return (String)getAttributeValue(TEXT_STYLE_PREFERENCE_KEY); } - /* - * @see org.eclipse.ui.texteditor.AnnotationPreference#getTextStyleValue() - * @since 3.8 - */ + @Override public String getTextStyleValue() { return (String)getAttributeValue(TEXT_STYLE_PREFERENCE_VALUE); } - /* - * @see org.eclipse.ui.texteditor.AnnotationPreference#getValue(java.lang.Object) - * @since 3.8 - */ + @Override public Object getValue(Object attribute) { return getAttributeValue(attribute); } diff --git a/org.eclipse.ui.editors/src/org/eclipse/ui/internal/texteditor/LineNumberColumn.java b/org.eclipse.ui.editors/src/org/eclipse/ui/internal/texteditor/LineNumberColumn.java index 90e0aabbd19..f639325d16b 100644 --- a/org.eclipse.ui.editors/src/org/eclipse/ui/internal/texteditor/LineNumberColumn.java +++ b/org.eclipse.ui.editors/src/org/eclipse/ui/internal/texteditor/LineNumberColumn.java @@ -113,9 +113,7 @@ public class LineNumberColumn extends AbstractContributedRulerColumn implements private ISourceViewer fViewer; private ICompatibilityForwarder fForwarder; - /* - * @see org.eclipse.jface.text.source.IVerticalRulerColumn#createControl(org.eclipse.jface.text.source.CompositeRuler, org.eclipse.swt.widgets.Composite) - */ + @Override public Control createControl(CompositeRuler parentRuler, Composite parentControl) { Assert.isTrue(fDelegate != null); ITextViewer viewer= parentRuler.getTextViewer(); @@ -126,97 +124,73 @@ public class LineNumberColumn extends AbstractContributedRulerColumn implements return control; } - /* - * @see org.eclipse.jface.text.source.IVerticalRulerColumn#getControl() - */ + @Override public Control getControl() { return fDelegate.getControl(); } - /* - * @see org.eclipse.jface.text.source.IVerticalRulerColumn#getWidth() - */ + @Override public int getWidth() { return fDelegate.getWidth(); } - /* - * @see org.eclipse.jface.text.source.IVerticalRulerColumn#redraw() - */ + @Override public void redraw() { fDelegate.redraw(); } - /* - * @see org.eclipse.jface.text.source.IVerticalRulerColumn#setFont(org.eclipse.swt.graphics.Font) - */ + @Override public void setFont(Font font) { fDelegate.setFont(font); } - /* - * @see org.eclipse.jface.text.source.IVerticalRulerColumn#setModel(org.eclipse.jface.text.source.IAnnotationModel) - */ + @Override public void setModel(IAnnotationModel model) { if (getQuickDiffPreference()) fDelegate.setModel(model); } - /* - * @see org.eclipse.jface.text.source.IVerticalRulerInfo#getLineOfLastMouseButtonActivity() - */ + @Override public int getLineOfLastMouseButtonActivity() { if (fDelegate instanceof IVerticalRulerInfo) return ((IVerticalRulerInfo)fDelegate).getLineOfLastMouseButtonActivity(); return -1; } - /* - * @see org.eclipse.jface.text.source.IVerticalRulerInfo#toDocumentLineNumber(int) - */ + @Override public int toDocumentLineNumber(int y_coordinate) { if (fDelegate instanceof IVerticalRulerInfo) return ((IVerticalRulerInfo)fDelegate).toDocumentLineNumber(y_coordinate); return -1; } - /* - * @see org.eclipse.jface.text.source.IVerticalRulerInfoExtension#addVerticalRulerListener(org.eclipse.jface.text.source.IVerticalRulerListener) - */ + @Override public void addVerticalRulerListener(IVerticalRulerListener listener) { if (fDelegate instanceof IVerticalRulerInfoExtension) ((IVerticalRulerInfoExtension) fDelegate).addVerticalRulerListener(listener); } - /* - * @see org.eclipse.jface.text.source.IVerticalRulerInfoExtension#getHover() - */ + @Override public IAnnotationHover getHover() { if (fDelegate instanceof IVerticalRulerInfoExtension) return ((IVerticalRulerInfoExtension) fDelegate).getHover(); return null; } - /* - * @see org.eclipse.jface.text.source.IVerticalRulerInfoExtension#getModel() - */ + @Override public IAnnotationModel getModel() { if (fDelegate instanceof IVerticalRulerInfoExtension) return ((IVerticalRulerInfoExtension) fDelegate).getModel(); return null; } - /* - * @see org.eclipse.jface.text.source.IVerticalRulerInfoExtension#removeVerticalRulerListener(org.eclipse.jface.text.source.IVerticalRulerListener) - */ + @Override public void removeVerticalRulerListener(IVerticalRulerListener listener) { if (fDelegate instanceof IVerticalRulerInfoExtension) ((IVerticalRulerInfoExtension) fDelegate).removeVerticalRulerListener(listener); } - /* - * @see org.eclipse.ui.texteditor.rulers.AbstractContributedRulerColumn#columnRemoved() - */ + @Override public void columnRemoved() { if (fDispatcher != null) { fDispatcher.dispose(); @@ -265,12 +239,14 @@ public class LineNumberColumn extends AbstractContributedRulerColumn implements fDispatcher= new PropertyEventDispatcher(store); fDispatcher.addPropertyChangeListener(FG_COLOR_KEY, new IPropertyChangeListener() { + @Override public void propertyChange(PropertyChangeEvent event) { updateForegroundColor(store, fDelegate); fDelegate.redraw(); } }); IPropertyChangeListener backgroundHandler= new IPropertyChangeListener() { + @Override public void propertyChange(PropertyChangeEvent event) { updateBackgroundColor(store, fDelegate); fDelegate.redraw(); @@ -280,6 +256,7 @@ public class LineNumberColumn extends AbstractContributedRulerColumn implements fDispatcher.addPropertyChangeListener(USE_DEFAULT_BG_KEY, backgroundHandler); fDispatcher.addPropertyChangeListener(LINE_NUMBER_KEY, new IPropertyChangeListener() { + @Override public void propertyChange(PropertyChangeEvent event) { // only handle quick diff on/off information, but not ruler visibility (handled by AbstractDecoratedTextEditor) updateLineNumbersVisibility(fDelegate); @@ -287,30 +264,35 @@ public class LineNumberColumn extends AbstractContributedRulerColumn implements }); fDispatcher.addPropertyChangeListener(AbstractDecoratedTextEditorPreferenceConstants.QUICK_DIFF_CHARACTER_MODE, new IPropertyChangeListener() { + @Override public void propertyChange(PropertyChangeEvent event) { updateCharacterMode(store, fDelegate); } }); fDispatcher.addPropertyChangeListener(AbstractDecoratedTextEditorPreferenceConstants.REVISION_RULER_RENDERING_MODE, new IPropertyChangeListener() { + @Override public void propertyChange(PropertyChangeEvent event) { updateRevisionRenderingMode(store, fDelegate); } }); fDispatcher.addPropertyChangeListener(AbstractDecoratedTextEditorPreferenceConstants.REVISION_RULER_SHOW_AUTHOR, new IPropertyChangeListener() { + @Override public void propertyChange(PropertyChangeEvent event) { updateRevisionAuthorVisibility(store, fDelegate); } }); fDispatcher.addPropertyChangeListener(AbstractDecoratedTextEditorPreferenceConstants.REVISION_RULER_SHOW_REVISION, new IPropertyChangeListener() { + @Override public void propertyChange(PropertyChangeEvent event) { updateRevisionIdVisibility(store, fDelegate); } }); fDispatcher.addPropertyChangeListener(AbstractDecoratedTextEditorPreferenceConstants.QUICK_DIFF_ALWAYS_ON, new IPropertyChangeListener() { + @Override public void propertyChange(PropertyChangeEvent event) { updateQuickDiffVisibility(fDelegate); } @@ -318,6 +300,7 @@ public class LineNumberColumn extends AbstractContributedRulerColumn implements if (changedPref != null) { fDispatcher.addPropertyChangeListener(changedPref.getColorPreferenceKey(), new IPropertyChangeListener() { + @Override public void propertyChange(PropertyChangeEvent event) { updateChangedColor(changedPref, store, fDelegate); fDelegate.redraw(); @@ -326,6 +309,7 @@ public class LineNumberColumn extends AbstractContributedRulerColumn implements } if (addedPref != null) { fDispatcher.addPropertyChangeListener(addedPref.getColorPreferenceKey(), new IPropertyChangeListener() { + @Override public void propertyChange(PropertyChangeEvent event) { updateAddedColor(addedPref, store, fDelegate); fDelegate.redraw(); @@ -334,6 +318,7 @@ public class LineNumberColumn extends AbstractContributedRulerColumn implements } if (deletedPref != null) { fDispatcher.addPropertyChangeListener(deletedPref.getColorPreferenceKey(), new IPropertyChangeListener() { + @Override public void propertyChange(PropertyChangeEvent event) { updateDeletedColor(deletedPref, store, fDelegate); fDelegate.redraw(); diff --git a/org.eclipse.ui.editors/src/org/eclipse/ui/internal/texteditor/PropertyEventDispatcher.java b/org.eclipse.ui.editors/src/org/eclipse/ui/internal/texteditor/PropertyEventDispatcher.java index a035895b60b..35f49ff8153 100644 --- a/org.eclipse.ui.editors/src/org/eclipse/ui/internal/texteditor/PropertyEventDispatcher.java +++ b/org.eclipse.ui.editors/src/org/eclipse/ui/internal/texteditor/PropertyEventDispatcher.java @@ -27,6 +27,7 @@ public final class PropertyEventDispatcher { private final Map fReverseMap= new HashMap(); private final IPreferenceStore fStore; private final IPropertyChangeListener fListener= new IPropertyChangeListener() { + @Override public void propertyChange(PropertyChangeEvent event) { firePropertyChange(event); } diff --git a/org.eclipse.ui.editors/src/org/eclipse/ui/internal/texteditor/SourceViewerInformationControl.java b/org.eclipse.ui.editors/src/org/eclipse/ui/internal/texteditor/SourceViewerInformationControl.java index e0dee289f8d..d298c3afb79 100644 --- a/org.eclipse.ui.editors/src/org/eclipse/ui/internal/texteditor/SourceViewerInformationControl.java +++ b/org.eclipse.ui.editors/src/org/eclipse/ui/internal/texteditor/SourceViewerInformationControl.java @@ -149,11 +149,13 @@ class SourceViewerInformationControl implements IInformationControl, IInformatio fText.addKeyListener(new KeyListener() { + @Override public void keyPressed(KeyEvent e) { if (e.character == 0x1B) // ESC fShell.dispose(); } + @Override public void keyReleased(KeyEvent e) {} }); @@ -221,9 +223,7 @@ class SourceViewerInformationControl implements IInformationControl, IInformatio setInformation(null); } - /* - * @see IInformationControl#setInformation(String) - */ + @Override public void setInformation(String content) { if (content == null) { fViewer.setInput(null); @@ -239,16 +239,12 @@ class SourceViewerInformationControl implements IInformationControl, IInformatio fViewer.getTextWidget().setHorizontalPixel(fHorizontalScrollPixel); } - /* - * @see IInformationControl#setVisible(boolean) - */ + @Override public void setVisible(boolean visible) { fShell.setVisible(visible); } - /* - * @see org.eclipse.swt.events.DisposeListener#widgetDisposed(org.eclipse.swt.events.DisposeEvent) - */ + @Override public void widgetDisposed(DisposeEvent event) { if (fStatusTextFont != null && !fStatusTextFont.isDisposed()) fStatusTextFont.dispose(); @@ -262,9 +258,7 @@ class SourceViewerInformationControl implements IInformationControl, IInformatio fText= null; } - /* - * @see org.eclipse.jface.text.IInformationControl#dispose() - */ + @Override public final void dispose() { if (fShell != null && !fShell.isDisposed()) fShell.dispose(); @@ -272,9 +266,7 @@ class SourceViewerInformationControl implements IInformationControl, IInformatio widgetDisposed(null); } - /* - * @see IInformationControl#setSize(int, int) - */ + @Override public void setSize(int width, int height) { if (fStatusField != null) { @@ -289,24 +281,18 @@ class SourceViewerInformationControl implements IInformationControl, IInformatio fShell.pack(true); } - /* - * @see IInformationControl#setLocation(Point) - */ + @Override public void setLocation(Point location) { fShell.setLocation(location); } - /* - * @see IInformationControl#setSizeConstraints(int, int) - */ + @Override public void setSizeConstraints(int maxWidth, int maxHeight) { fMaxWidth= maxWidth; fMaxHeight= maxHeight; } - /* - * @see IInformationControl#computeSizeHint() - */ + @Override public Point computeSizeHint() { // compute the preferred size int x= SWT.DEFAULT; @@ -324,66 +310,48 @@ class SourceViewerInformationControl implements IInformationControl, IInformatio return size; } - /* - * @see IInformationControl#addDisposeListener(DisposeListener) - */ + @Override public void addDisposeListener(DisposeListener listener) { fShell.addDisposeListener(listener); } - /* - * @see IInformationControl#removeDisposeListener(DisposeListener) - */ + @Override public void removeDisposeListener(DisposeListener listener) { fShell.removeDisposeListener(listener); } - /* - * @see IInformationControl#setForegroundColor(Color) - */ + @Override public void setForegroundColor(Color foreground) { fText.setForeground(foreground); } - /* - * @see IInformationControl#setBackgroundColor(Color) - */ + @Override public void setBackgroundColor(Color background) { fText.setBackground(background); } - /* - * @see IInformationControl#isFocusControl() - */ + @Override public boolean isFocusControl() { return fShell.getDisplay().getActiveShell() == fShell; } - /* - * @see IInformationControl#setFocus() - */ + @Override public void setFocus() { fShell.forceFocus(); fText.setFocus(); } - /* - * @see IInformationControl#addFocusListener(FocusListener) - */ + @Override public void addFocusListener(FocusListener listener) { fText.addFocusListener(listener); } - /* - * @see IInformationControl#removeFocusListener(FocusListener) - */ + @Override public void removeFocusListener(FocusListener listener) { fText.removeFocusListener(listener); } - /* - * @see IInformationControlExtension#hasContents() - */ + @Override public boolean hasContents() { return fText.getCharCount() > 0; } @@ -440,10 +408,7 @@ class SourceViewerInformationControl implements IInformationControl, IInformatio } - /* - * @see org.eclipse.jface.text.IInformationControlExtension3#computeTrim() - * @since 3.4 - */ + @Override public Rectangle computeTrim() { Rectangle trim= fShell.computeTrim(0, 0, 0, 0); addInternalTrim(trim); @@ -463,46 +428,32 @@ class SourceViewerInformationControl implements IInformationControl, IInformatio } } - /* - * @see org.eclipse.jface.text.IInformationControlExtension3#getBounds() - * @since 3.4 - */ + @Override public Rectangle getBounds() { return fShell.getBounds(); } - /* - * @see org.eclipse.jface.text.IInformationControlExtension3#restoresLocation() - * @since 3.4 - */ + @Override public boolean restoresLocation() { return false; } - /* - * @see org.eclipse.jface.text.IInformationControlExtension3#restoresSize() - * @since 3.4 - */ + @Override public boolean restoresSize() { return false; } - /* - * @see org.eclipse.jface.text.IInformationControlExtension5#getInformationPresenterControlCreator() - * @since 3.4 - */ + @Override public IInformationControlCreator getInformationPresenterControlCreator() { return new IInformationControlCreator() { + @Override public IInformationControl createInformationControl(Shell parent) { return new SourceViewerInformationControl(parent, true, fSymbolicFontName, null); } }; } - /* - * @see org.eclipse.jface.text.IInformationControlExtension5#containsControl(org.eclipse.swt.widgets.Control) - * @since 3.4 - */ + @Override public boolean containsControl(Control control) { do { if (control == fShell) @@ -514,18 +465,12 @@ class SourceViewerInformationControl implements IInformationControl, IInformatio return false; } - /* - * @see org.eclipse.jface.text.IInformationControlExtension5#isVisible() - * @since 3.4 - */ + @Override public boolean isVisible() { return fShell != null && !fShell.isDisposed() && fShell.isVisible(); } - /* - * @see org.eclipse.jface.text.IInformationControlExtension5#computeSizeConstraints(int, int) - * @since 3.4 - */ + @Override public Point computeSizeConstraints(int widthInChars, int heightInChars) { GC gc= new GC(fText); gc.setFont(fTextFont); diff --git a/org.eclipse.ui.editors/src/org/eclipse/ui/internal/texteditor/TextChangeHover.java b/org.eclipse.ui.editors/src/org/eclipse/ui/internal/texteditor/TextChangeHover.java index b5b5190e369..fc1a190c6d3 100644 --- a/org.eclipse.ui.editors/src/org/eclipse/ui/internal/texteditor/TextChangeHover.java +++ b/org.eclipse.ui.editors/src/org/eclipse/ui/internal/texteditor/TextChangeHover.java @@ -34,26 +34,21 @@ public class TextChangeHover extends LineChangeHover { /** The last created information control. */ private int fLastScrollIndex= 0; - /* - * @see org.eclipse.jface.text.source.LineChangeHover#getTabReplacement() - */ + @Override protected String getTabReplacement() { return Character.toString('\t'); } - /* - * @see org.eclipse.jface.text.source.LineChangeHover#getHoverInfo(org.eclipse.jface.text.source.ISourceViewer, org.eclipse.jface.text.source.ILineRange, int) - */ + @Override public Object getHoverInfo(ISourceViewer sourceViewer, ILineRange lineRange, int visibleLines) { fLastScrollIndex= sourceViewer.getTextWidget().getHorizontalPixel(); return super.getHoverInfo(sourceViewer, lineRange, visibleLines); } - /* - * @see org.eclipse.jface.text.source.IAnnotationHoverExtension#getHoverControlCreator() - */ + @Override public IInformationControlCreator getHoverControlCreator() { return new IInformationControlCreator() { + @Override public IInformationControl createInformationControl(Shell parent) { SourceViewerInformationControl control= new SourceViewerInformationControl(parent, false, JFaceResources.TEXT_FONT, EditorsUI.getTooltipAffordanceString()); control.setHorizontalScrollPixel(fLastScrollIndex); @@ -62,12 +57,10 @@ public class TextChangeHover extends LineChangeHover { }; } - /* - * @see org.eclipse.jface.text.information.IInformationProviderExtension2#getInformationPresenterControlCreator() - * @since 3.3 - */ + @Override public IInformationControlCreator getInformationPresenterControlCreator() { return new IInformationControlCreator() { + @Override public IInformationControl createInformationControl(Shell parent) { return new SourceViewerInformationControl(parent, true, JFaceResources.TEXT_FONT, null); } diff --git a/org.eclipse.ui.editors/src/org/eclipse/ui/texteditor/AbstractDecoratedTextEditor.java b/org.eclipse.ui.editors/src/org/eclipse/ui/texteditor/AbstractDecoratedTextEditor.java index f8cf4a6059c..8b2775ffbc8 100644 --- a/org.eclipse.ui.editors/src/org/eclipse/ui/texteditor/AbstractDecoratedTextEditor.java +++ b/org.eclipse.ui.editors/src/org/eclipse/ui/texteditor/AbstractDecoratedTextEditor.java @@ -226,6 +226,7 @@ public abstract class AbstractDecoratedTextEditor extends StatusTextEditor { * Adapter class for <code>IGotoMarker</code>. */ private class GotoMarkerAdapter implements IGotoMarker { + @Override public void gotoMarker(IMarker marker) { AbstractDecoratedTextEditor.this.gotoMarker(marker); } @@ -361,9 +362,7 @@ public abstract class AbstractDecoratedTextEditor extends StatusTextEditor { setKeyBindingScopes(new String[] { "org.eclipse.ui.textEditorScope" }); //$NON-NLS-1$ } - /* - * @see IWorkbenchPart#dispose() - */ + @Override public void dispose() { if (fSourceViewerDecorationSupport != null) { fSourceViewerDecorationSupport.dispose(); @@ -383,9 +382,7 @@ public abstract class AbstractDecoratedTextEditor extends StatusTextEditor { super.dispose(); } - /* - * @see org.eclipse.ui.texteditor.AbstractTextEditor#createSourceViewer(Composite, IVerticalRuler, int) - */ + @Override protected ISourceViewer createSourceViewer(Composite parent, IVerticalRuler ruler, int styles) { fAnnotationAccess= getAnnotationAccess(); @@ -443,6 +440,7 @@ public abstract class AbstractDecoratedTextEditor extends StatusTextEditor { /* * @see org.eclipse.ui.texteditor.AbstractTextEditor.createPartControl(Composite) */ + @Override public void createPartControl(Composite parent) { super.createPartControl(parent); if (fSourceViewerDecorationSupport != null) @@ -501,13 +499,11 @@ public abstract class AbstractDecoratedTextEditor extends StatusTextEditor { getEditorSite().registerContextMenu(fOverviewRulerContextMenuId, menuManager, getSelectionProvider(), false); } - /* - * @see org.eclipse.ui.texteditor.AbstractTextEditor#createContextMenuListener() - * @since 3.4 - */ + @Override protected IMenuListener createContextMenuListener() { final IMenuListener superListener= super.createContextMenuListener(); return new IMenuListener() { + @Override public void menuAboutToShow(IMenuManager menu) { if (!getOverviewRulerContextMenuId().equals(menu.getId())) { superListener.menuAboutToShow(menu); @@ -519,10 +515,7 @@ public abstract class AbstractDecoratedTextEditor extends StatusTextEditor { }; } - /* - * @see org.eclipse.ui.texteditor.StatusTextEditor#createStatusControl(org.eclipse.swt.widgets.Composite, org.eclipse.core.runtime.IStatus) - * @since 3.1 - */ + @Override protected Control createStatusControl(Composite parent, final IStatus status) { Object adapter= getAdapter(IEncodingSupport.class); DefaultEncodingSupport encodingSupport= null; @@ -566,9 +559,7 @@ public abstract class AbstractDecoratedTextEditor extends StatusTextEditor { return store != null ? store.getBoolean(OVERVIEW_RULER) : false; } - /* - * @see org.eclipse.ui.texteditor.ITextEditorExtension3#showChangeInformation(boolean) - */ + @Override public void showChangeInformation(boolean show) { if (show == isChangeInformationShowing()) return; @@ -586,17 +577,12 @@ public abstract class AbstractDecoratedTextEditor extends StatusTextEditor { } } - /* - * @see org.eclipse.ui.texteditor.ITextEditorExtension3#isChangeInformationShowing() - */ + @Override public boolean isChangeInformationShowing() { return fLineColumn != null && fLineColumn.isShowingChangeInformation(); } - /* - * @see org.eclipse.ui.texteditor.ITextEditorExtension4#showRevisionInformation(org.eclipse.jface.text.revisions.RevisionInformation, java.lang.String) - * @since 3.2 - */ + @Override public void showRevisionInformation(RevisionInformation info, String quickDiffProviderId) { if (info.getHoverControlCreator() == null) info.setHoverControlCreator(new RevisionHoverInformationControlCreator(false)); @@ -716,6 +702,7 @@ public abstract class AbstractDecoratedTextEditor extends StatusTextEditor { * @return a new change ruler column * @deprecated as of 3.3. Not called any longer, replaced by {@link #createLineNumberRulerColumn()} */ + @Deprecated protected IChangeRulerColumn createChangeRulerColumn() { /* * Left for compatibility. See LineNumberColumn. @@ -733,6 +720,7 @@ public abstract class AbstractDecoratedTextEditor extends StatusTextEditor { * * @see AbstractTextEditor#createVerticalRuler() */ + @Override protected IVerticalRuler createVerticalRuler() { return createCompositeRuler(); } @@ -760,15 +748,10 @@ public abstract class AbstractDecoratedTextEditor extends StatusTextEditor { return new AnnotationRulerColumn(VERTICAL_RULER_WIDTH, getAnnotationAccess()); } - /* - * @see org.eclipse.ui.texteditor.AbstractTextEditor#createColumnSupport() - * @since 3.3 - */ + @Override protected final IColumnSupport createColumnSupport() { return new ColumnSupport(this, RulerColumnRegistry.getDefault()) { - /* - * @see org.eclipse.ui.texteditor.rulers.ColumnSupport#initializeColumn(org.eclipse.ui.texteditor.rulers.AbstractContributedRulerColumn) - */ + @Override protected void initializeColumn(IContributedRulerColumn column) { super.initializeColumn(column); RulerColumnDescriptor descriptor= column.getDescriptor(); @@ -779,12 +762,15 @@ public abstract class AbstractDecoratedTextEditor extends StatusTextEditor { } else if (LineNumberColumn.ID.equals(descriptor.getId())) { fLineColumn= ((LineNumberColumn) column); fLineColumn.setForwarder(new LineNumberColumn.ICompatibilityForwarder() { + @Override public IVerticalRulerColumn createLineNumberRulerColumn() { return AbstractDecoratedTextEditor.this.createLineNumberRulerColumn(); } + @Override public boolean isQuickDiffEnabled() { return AbstractDecoratedTextEditor.this.isPrefQuickDiffAlwaysOn(); } + @Override public boolean isLineNumberRulerVisible() { return AbstractDecoratedTextEditor.this.isLineNumberRulerVisible(); } @@ -793,9 +779,7 @@ public abstract class AbstractDecoratedTextEditor extends StatusTextEditor { } } - /* - * @see org.eclipse.ui.texteditor.AbstractTextEditor.ColumnSupport#dispose() - */ + @Override public void dispose() { fLineColumn= null; super.dispose(); @@ -803,9 +787,7 @@ public abstract class AbstractDecoratedTextEditor extends StatusTextEditor { }; } - /* - * @see AbstractTextEditor#handlePreferenceStoreChanged(PropertyChangeEvent) - */ + @Override protected void handlePreferenceStoreChanged(PropertyChangeEvent event) { try { @@ -993,6 +975,7 @@ public abstract class AbstractDecoratedTextEditor extends StatusTextEditor { * @param marker the marker to go to * @deprecated visibility will be reduced, use <code>getAdapter(IGotoMarker.class) for accessing this method</code> */ + @Deprecated public void gotoMarker(IMarker marker) { if (fIsUpdatingMarkerViews) return; @@ -1049,20 +1032,14 @@ public abstract class AbstractDecoratedTextEditor extends StatusTextEditor { } } - /* - * @see org.eclipse.ui.texteditor.AbstractTextEditor#isEditable() - * @since 3.3 - */ + @Override public boolean isEditable() { if (!super.isEditable()) return false; return fIsEditingDerivedFileAllowed; } - /* - * @see org.eclipse.ui.texteditor.StatusTextEditor#validateEditorInputState() - * @since 3.3 - */ + @Override public boolean validateEditorInputState() { if (!super.validateEditorInputState()) return false; @@ -1116,6 +1093,7 @@ public abstract class AbstractDecoratedTextEditor extends StatusTextEditor { * * @see org.eclipse.ui.texteditor.StatusTextEditor#isErrorStatus(org.eclipse.core.runtime.IStatus) */ + @Override protected boolean isErrorStatus(IStatus status) { if (!super.isErrorStatus(status)) return false; @@ -1144,9 +1122,7 @@ public abstract class AbstractDecoratedTextEditor extends StatusTextEditor { return status.getCode() == IResourceStatus.READ_ONLY_LOCAL; } - /* - * @see org.eclipse.ui.texteditor.AbstractTextEditor#createActions() - */ + @Override protected void createActions() { super.createActions(); @@ -1167,6 +1143,7 @@ public abstract class AbstractDecoratedTextEditor extends StatusTextEditor { markAsPropertyDependentAction(ITextEditorActionConstants.CHANGE_ENCODING, true); action= new ResourceAction(TextEditorMessages.getBundleForConstructedKeys(), "Editor.ToggleLineNumbersAction.", IAction.AS_CHECK_BOX) { //$NON-NLS-1$ + @Override public void run() { toggleLineNumberRuler(); } @@ -1175,6 +1152,7 @@ public abstract class AbstractDecoratedTextEditor extends StatusTextEditor { setAction(ITextEditorActionConstants.LINENUMBERS_TOGGLE, action); action= new ResourceAction(TextEditorMessages.getBundleForConstructedKeys(), "Editor.ToggleQuickDiffAction.", IAction.AS_CHECK_BOX) { //$NON-NLS-1$ + @Override public void run() { toggleQuickDiffRuler(); } @@ -1204,6 +1182,7 @@ public abstract class AbstractDecoratedTextEditor extends StatusTextEditor { setAction(ITextEditorActionConstants.QUICKDIFF_REVERT, action2); action= new ResourceAction(TextEditorMessages.getBundleForConstructedKeys(), "Editor.HideRevisionInformationAction.") { //$NON-NLS-1$ + @Override public void run() { if (fLineColumn != null) fLineColumn.hideRevisionInformation(); @@ -1212,6 +1191,7 @@ public abstract class AbstractDecoratedTextEditor extends StatusTextEditor { setAction(ITextEditorActionConstants.REVISION_HIDE_INFO, action); action= new ResourceAction(TextEditorMessages.getBundleForConstructedKeys(), "Editor.CycleRevisionRenderingAction.") { //$NON-NLS-1$ + @Override public void run() { final RenderingMode[] modes= { IRevisionRulerColumnExtension.AGE, IRevisionRulerColumnExtension.AUTHOR, IRevisionRulerColumnExtension.AUTHOR_SHADED_BY_AGE}; IPreferenceStore store= EditorsUI.getPreferenceStore(); @@ -1243,6 +1223,7 @@ public abstract class AbstractDecoratedTextEditor extends StatusTextEditor { else shell= null; action= new ResourceAction(TextEditorMessages.getBundleForConstructedKeys(), "Editor.RulerPreferencesAction.") { //$NON-NLS-1$ + @Override public void run() { String[] preferencePages= collectRulerMenuPreferencePages(); if (preferencePages.length > 0 && (shell == null || !shell.isDisposed())) @@ -1253,6 +1234,7 @@ public abstract class AbstractDecoratedTextEditor extends StatusTextEditor { setAction(ITextEditorActionConstants.RULER_PREFERENCES, action); action= new ResourceAction(TextEditorMessages.getBundleForConstructedKeys(), "Editor.ContextPreferencesAction.") { //$NON-NLS-1$ + @Override public void run() { String[] preferencePages= collectContextMenuPreferencePages(); if (preferencePages.length > 0 && (shell == null || !shell.isDisposed())) @@ -1273,6 +1255,7 @@ public abstract class AbstractDecoratedTextEditor extends StatusTextEditor { createPrintAction(); action= new ResourceAction(TextEditorMessages.getBundleForConstructedKeys(), "Editor.ShowChangeRulerInformation.", IAction.AS_PUSH_BUTTON) { //$NON-NLS-1$ + @Override public void run() { showChangeRulerInformation(); } @@ -1281,6 +1264,7 @@ public abstract class AbstractDecoratedTextEditor extends StatusTextEditor { setAction(ITextEditorActionConstants.SHOW_CHANGE_RULER_INFORMATION, action); action= new ResourceAction(TextEditorMessages.getBundleForConstructedKeys(), "Editor.ShowRulerAnnotationInformation.", IAction.AS_PUSH_BUTTON) { //$NON-NLS-1$ + @Override public void run() { showRulerAnnotationInformation(); } @@ -1373,6 +1357,7 @@ public abstract class AbstractDecoratedTextEditor extends StatusTextEditor { final ISourceViewer viewer= getSourceViewer(); ResourceAction action= new ResourceAction(TextEditorMessages.getBundleForConstructedKeys(), "Editor.Print.") { //$NON-NLS-1$ + @Override public void run() { StyledTextPrintOptions options= new StyledTextPrintOptions(); options.printTextFontStyle= true; @@ -1400,6 +1385,7 @@ public abstract class AbstractDecoratedTextEditor extends StatusTextEditor { setAction(ITextEditorActionConstants.PRINT, action); } + @Override public Object getAdapter(Class adapter) { if (IGotoMarker.class.equals(adapter)) return fGotoMarkerAdapter; @@ -1409,6 +1395,7 @@ public abstract class AbstractDecoratedTextEditor extends StatusTextEditor { if (adapter == IShowInSource.class) { return new IShowInSource() { + @Override public ShowInContext getShowInContext() { ISelection selection= null; ISelectionProvider selectionProvider= getSelectionProvider(); @@ -1437,6 +1424,7 @@ public abstract class AbstractDecoratedTextEditor extends StatusTextEditor { * * @see org.eclipse.ui.texteditor.AbstractTextEditor#setDocumentProvider(org.eclipse.ui.IEditorInput) */ + @Override protected void setDocumentProvider(IEditorInput input) { fImplicitDocumentProvider= DocumentProviderRegistry.getDefault().getDocumentProvider(input); IDocumentProvider provider= super.getDocumentProvider(); @@ -1446,9 +1434,7 @@ public abstract class AbstractDecoratedTextEditor extends StatusTextEditor { } } - /* - * @see org.eclipse.ui.texteditor.ITextEditor#getDocumentProvider() - */ + @Override public IDocumentProvider getDocumentProvider() { IDocumentProvider provider= super.getDocumentProvider(); if (provider == null) @@ -1456,9 +1442,7 @@ public abstract class AbstractDecoratedTextEditor extends StatusTextEditor { return provider; } - /* - * @see org.eclipse.ui.texteditor.AbstractTextEditor#disposeDocumentProvider() - */ + @Override protected void disposeDocumentProvider() { super.disposeDocumentProvider(); fImplicitDocumentProvider= null; @@ -1470,6 +1454,7 @@ public abstract class AbstractDecoratedTextEditor extends StatusTextEditor { * This implementation also updates change information in the quick diff * ruler. */ + @Override protected void doSetInput(IEditorInput input) throws CoreException { fIsDerivedStateValidated= false; fIsEditingDerivedFileAllowed= true; @@ -1486,10 +1471,7 @@ public abstract class AbstractDecoratedTextEditor extends StatusTextEditor { } } - /* - * @see org.eclipse.ui.texteditor.StatusTextEditor#handleEditorInputChanged() - * @since 3.7 - */ + @Override protected void handleEditorInputChanged() { final IDocumentProvider provider= getDocumentProvider(); IEditorInput input= getEditorInput(); @@ -1508,6 +1490,7 @@ public abstract class AbstractDecoratedTextEditor extends StatusTextEditor { * @param progressMonitor the progress monitor to be used * @since 3.2 */ + @Override protected void performSaveAs(IProgressMonitor progressMonitor) { Shell shell= PlatformUI.getWorkbench().getModalDialogShellProvider().getShell(); final IEditorInput input= getEditorInput(); @@ -1643,6 +1626,7 @@ public abstract class AbstractDecoratedTextEditor extends StatusTextEditor { * @param exception the exception to handle * @since 3.6 */ + @Override protected void openSaveErrorDialog(String title, String message, CoreException exception) { IStatus status= exception.getStatus(); final IDocumentProvider documentProvider= getDocumentProvider(); @@ -1657,6 +1641,7 @@ public abstract class AbstractDecoratedTextEditor extends StatusTextEditor { ErrorDialog errorDialog= new ErrorDialog(getSite().getShell(), title, message, status, IStatus.ERROR) { + @Override protected void createButtonsForButtonBar(Composite parent) { super.createButtonsForButtonBar(parent); createButton(parent, saveAsUTF8ButtonId, TextEditorMessages.AbstractDecoratedTextEditor_save_error_Dialog_button_saveAsUTF8, false); @@ -1664,6 +1649,7 @@ public abstract class AbstractDecoratedTextEditor extends StatusTextEditor { createButton(parent, selectUnmappableCharButtonId, TextEditorMessages.AbstractDecoratedTextEditor_save_error_Dialog_button_selectUnmappable, false); } + @Override protected void buttonPressed(int id) { if (id == saveAsUTF8ButtonId || id == selectUnmappableCharButtonId) { setReturnCode(id); @@ -1672,6 +1658,7 @@ public abstract class AbstractDecoratedTextEditor extends StatusTextEditor { super.buttonPressed(id); } + @Override protected boolean shouldShowDetailsButton() { return false; } @@ -1780,6 +1767,7 @@ public abstract class AbstractDecoratedTextEditor extends StatusTextEditor { final Shell shell= getSite().getShell(); IAction action= new ResourceAction(TextEditorMessages.getBundleForConstructedKeys(), "Editor.RulerPreferencesAction.") { //$NON-NLS-1$ + @Override public void run() { String[] preferencePages= collectOverviewRulerMenuPreferencePages(); if (preferencePages.length > 0 && (shell == null || !shell.isDisposed())) { @@ -1814,10 +1802,7 @@ public abstract class AbstractDecoratedTextEditor extends StatusTextEditor { return null; } - /* - * @see org.eclipse.ui.texteditor.AbstractTextEditor#rulerContextMenuAboutToShow(org.eclipse.jface.action.IMenuManager) - * @since 3.1 - */ + @Override protected void rulerContextMenuAboutToShow(IMenuManager menu) { /* * XXX: workaround for reliable menu item ordering. @@ -1881,6 +1866,7 @@ public abstract class AbstractDecoratedTextEditor extends StatusTextEditor { for (int i= 0; i < modes.length; i++) { final String mode= modes[i].name(); IAction action= new Action(labels[i], IAction.AS_RADIO_BUTTON) { + @Override public void run() { // set preference globally, LineNumberColumn reacts on preference change uiStore.setValue(AbstractDecoratedTextEditorPreferenceConstants.REVISION_RULER_RENDERING_MODE, mode); @@ -1929,6 +1915,7 @@ public abstract class AbstractDecoratedTextEditor extends StatusTextEditor { continue; final boolean isVisible= support.isColumnVisible(descriptor); IAction action= new Action(MessageFormat.format(TextEditorMessages.AbstractDecoratedTextEditor_show_ruler_label, new Object[] {descriptor.getName()}), IAction.AS_CHECK_BOX) { + @Override public void run() { if (descriptor.isGlobal()) // column state is modified via preference listener of AbstractTextEditor @@ -1973,10 +1960,7 @@ public abstract class AbstractDecoratedTextEditor extends StatusTextEditor { showChangeInformation(current); } - /* - * @see org.eclipse.ui.texteditor.AbstractTextEditor#editorContextMenuAboutToShow(org.eclipse.jface.action.IMenuManager) - * @since 3.1 - */ + @Override protected void editorContextMenuAboutToShow(IMenuManager menu) { super.editorContextMenuAboutToShow(menu); @@ -1993,6 +1977,7 @@ public abstract class AbstractDecoratedTextEditor extends StatusTextEditor { // XXX: Internal reference will get fixed during 3.7, see https://bugs.eclipse.org/bugs/show_bug.cgi?id=307026 openWithSubMenu.add(new OpenWithMenu(page, editorInput) { + @Override protected void openEditor(IEditorDescriptor editorDescriptor, boolean openUsingDescriptor) { super.openEditor(editorDescriptor, openUsingDescriptor); ISelection selection= getSelectionProvider().getSelection(); @@ -2033,6 +2018,7 @@ public abstract class AbstractDecoratedTextEditor extends StatusTextEditor { final IEditorInput input= editor.getEditorInput(); if (input instanceof IFileEditorInput) { WorkspaceModifyOperation op= new WorkspaceModifyOperation() { + @Override protected void execute(IProgressMonitor monitor) throws CoreException { IMarker marker= null; try { @@ -2141,10 +2127,7 @@ public abstract class AbstractDecoratedTextEditor extends StatusTextEditor { }; } - /* - * @see AbstractTextEditor#getUndoRedoOperationApprover(IUndoContext) - * @since 3.1 - */ + @Override protected IOperationApprover getUndoRedoOperationApprover(IUndoContext undoContext) { IEditorInput input= getEditorInput(); if (input != null && input.getAdapter(IResource.class) != null) @@ -2164,6 +2147,7 @@ public abstract class AbstractDecoratedTextEditor extends StatusTextEditor { * @return <code>true</code> if this is a target, <code>false</code> otherwise * @since 3.2 */ + @Override protected boolean isNavigationTarget(Annotation annotation) { AnnotationPreference preference= getAnnotationPreferenceLookup().getAnnotationPreference(annotation); // See bug 41689 @@ -2180,6 +2164,7 @@ public abstract class AbstractDecoratedTextEditor extends StatusTextEditor { * </p> * @since 3.2 */ + @Override public Annotation gotoAnnotation(boolean forward) { Annotation annotation= super.gotoAnnotation(forward); if (annotation != null) @@ -2222,6 +2207,7 @@ public abstract class AbstractDecoratedTextEditor extends StatusTextEditor { * @see org.eclipse.ui.texteditor.AbstractTextEditor#isTabConversionEnabled() * @since 3.3 */ + @Override protected boolean isTabsToSpacesConversionEnabled() { return getPreferenceStore() != null && getPreferenceStore().getBoolean(AbstractDecoratedTextEditorPreferenceConstants.EDITOR_SPACES_FOR_TABS); } diff --git a/org.eclipse.ui.editors/src/org/eclipse/ui/texteditor/AbstractDecoratedTextEditorPreferenceConstants.java b/org.eclipse.ui.editors/src/org/eclipse/ui/texteditor/AbstractDecoratedTextEditorPreferenceConstants.java index 7bd29665ec3..5e98a71b803 100644 --- a/org.eclipse.ui.editors/src/org/eclipse/ui/texteditor/AbstractDecoratedTextEditorPreferenceConstants.java +++ b/org.eclipse.ui.editors/src/org/eclipse/ui/texteditor/AbstractDecoratedTextEditorPreferenceConstants.java @@ -135,6 +135,7 @@ public class AbstractDecoratedTextEditorPreferenceConstants { * </p> * @deprecated as of 3.0 there are no UNKNOWN annotations any more */ + @Deprecated public final static String EDITOR_UNKNOWN_INDICATION= "othersIndication"; //$NON-NLS-1$ /** @@ -149,6 +150,7 @@ public class AbstractDecoratedTextEditorPreferenceConstants { * @see PreferenceConverter * @deprecated As of 3.0, there are no UNKNOWN annotations any more */ + @Deprecated public final static String EDITOR_UNKNOWN_INDICATION_COLOR= "othersIndicationColor"; //$NON-NLS-1$ /** @@ -159,6 +161,7 @@ public class AbstractDecoratedTextEditorPreferenceConstants { * </p> * @deprecated As of 3.0, there are no UNKNOWN annotations any more */ + @Deprecated public final static String EDITOR_UNKNOWN_INDICATION_IN_OVERVIEW_RULER= "othersIndicationInOverviewRuler"; //$NON-NLS-1$ /** diff --git a/org.eclipse.ui.editors/src/org/eclipse/ui/texteditor/AbstractMarkerAnnotationModel.java b/org.eclipse.ui.editors/src/org/eclipse/ui/texteditor/AbstractMarkerAnnotationModel.java index 59479cf235f..7ba1f7788f6 100644 --- a/org.eclipse.ui.editors/src/org/eclipse/ui/texteditor/AbstractMarkerAnnotationModel.java +++ b/org.eclipse.ui.editors/src/org/eclipse/ui/texteditor/AbstractMarkerAnnotationModel.java @@ -241,6 +241,7 @@ public abstract class AbstractMarkerAnnotationModel extends AnnotationModel impl * Connects to the source of markers as marker change listener. * @see AnnotationModel#connected() */ + @Override protected void connected() { listenToMarkerChanges(true); @@ -348,6 +349,7 @@ public abstract class AbstractMarkerAnnotationModel extends AnnotationModel impl * Removes the marker change listener. * @see AnnotationModel#disconnected() */ + @Override protected void disconnected() { listenToMarkerChanges(false); uninstallMarkerUpdaters(); @@ -387,9 +389,7 @@ public abstract class AbstractMarkerAnnotationModel extends AnnotationModel impl addMarkerAnnotation(marker); } - /* - * @see AnnotationModel#removeAnnotations(List, boolean, boolean) - */ + @Override protected void removeAnnotations(List annotations, boolean fireModelChanged, boolean modelInitiated) { if (annotations != null && annotations.size() > 0) { @@ -549,6 +549,7 @@ public abstract class AbstractMarkerAnnotationModel extends AnnotationModel impl * @since 2.0 * @deprecated use <code>updateMarker(IDocument, IMarker, Position)</code> instead. This method will be changed to protected. */ + @Deprecated public boolean updateMarker(IMarker marker, IDocument document, Position position) throws CoreException { if (fMarkerUpdaterSpecifications == null) @@ -690,23 +691,17 @@ public abstract class AbstractMarkerAnnotationModel extends AnnotationModel impl fireModelChanged(); } - /* - * @see org.eclipse.jface.text.source.IPersistableAnnotationModel#commit(org.eclipse.jface.text.IDocument) - */ + @Override public void commit(IDocument document) throws CoreException { updateMarkers(document); } - /* - * @see org.eclipse.jface.text.source.IPersistableAnnotationModel#revert(org.eclipse.jface.text.IDocument) - */ + @Override public void revert(IDocument document) { resetMarkers(); } - /* - * @see org.eclipse.jface.text.source.IPersistableAnnotationModel#reinitialize(org.eclipse.jface.text.IDocument) - */ + @Override public void reinitialize(IDocument document) { resetMarkers(); } diff --git a/org.eclipse.ui.editors/src/org/eclipse/ui/texteditor/AddMarkerAction.java b/org.eclipse.ui.editors/src/org/eclipse/ui/texteditor/AddMarkerAction.java index ea168a54ead..6df61f5fc18 100644 --- a/org.eclipse.ui.editors/src/org/eclipse/ui/texteditor/AddMarkerAction.java +++ b/org.eclipse.ui.editors/src/org/eclipse/ui/texteditor/AddMarkerAction.java @@ -118,9 +118,7 @@ public class AddMarkerAction extends TextEditorAction { return fPrefix; } - /* - * @see IAction#run() - */ + @Override public void run() { IResource resource= getResource(); if (resource == null) @@ -136,6 +134,7 @@ public class AddMarkerAction extends TextEditorAction { final Shell shell= getTextEditor().getSite().getShell(); IAdaptable context= new IAdaptable() { + @Override public Object getAdapter(Class adapter) { if (adapter == Shell.class) return shell; @@ -155,9 +154,7 @@ public class AddMarkerAction extends TextEditorAction { } } - /* - * @see TextEditorAction#update() - */ + @Override public void update() { setEnabled(getResource() != null); } @@ -178,6 +175,7 @@ public class AddMarkerAction extends TextEditorAction { String title= getString(fBundle, fPrefix + "dialog.title", fPrefix + "dialog.title"); //$NON-NLS-2$ //$NON-NLS-1$ String message= getString(fBundle, fPrefix + "dialog.message", fPrefix + "dialog.message"); //$NON-NLS-2$ //$NON-NLS-1$ IInputValidator inputValidator= new IInputValidator() { + @Override public String isValid(String newText) { return (newText == null || newText.trim().length() == 0) ? " " : null; //$NON-NLS-1$ } diff --git a/org.eclipse.ui.editors/src/org/eclipse/ui/texteditor/AddTaskAction.java b/org.eclipse.ui.editors/src/org/eclipse/ui/texteditor/AddTaskAction.java index 32324ec188e..78acf6a9056 100644 --- a/org.eclipse.ui.editors/src/org/eclipse/ui/texteditor/AddTaskAction.java +++ b/org.eclipse.ui.editors/src/org/eclipse/ui/texteditor/AddTaskAction.java @@ -43,9 +43,7 @@ public class AddTaskAction extends AddMarkerAction { super(bundle, prefix, editor, IMarker.TASK, false); } - /* - * @see IAction#run() - */ + @Override public void run() { IResource resource= getResource(); diff --git a/org.eclipse.ui.editors/src/org/eclipse/ui/texteditor/BasicMarkerUpdater.java b/org.eclipse.ui.editors/src/org/eclipse/ui/texteditor/BasicMarkerUpdater.java index a665a1c41b1..d0844e89d27 100644 --- a/org.eclipse.ui.editors/src/org/eclipse/ui/texteditor/BasicMarkerUpdater.java +++ b/org.eclipse.ui.editors/src/org/eclipse/ui/texteditor/BasicMarkerUpdater.java @@ -36,23 +36,17 @@ public final class BasicMarkerUpdater implements IMarkerUpdater { super(); } - /* - * @see IMarkerUpdater#getAttribute() - */ + @Override public String[] getAttribute() { return ATTRIBUTES; } - /* - * @see IMarkerUpdater#getMarkerType() - */ + @Override public String getMarkerType() { return null; } - /* - * @see IMarkerUpdater#updateMarker(IMarker, IDocument, Position) - */ + @Override public boolean updateMarker(IMarker marker, IDocument document, Position position) { if (position == null) diff --git a/org.eclipse.ui.editors/src/org/eclipse/ui/texteditor/BookmarkRulerAction.java b/org.eclipse.ui.editors/src/org/eclipse/ui/texteditor/BookmarkRulerAction.java index 72352e17733..64ec3907bac 100644 --- a/org.eclipse.ui.editors/src/org/eclipse/ui/texteditor/BookmarkRulerAction.java +++ b/org.eclipse.ui.editors/src/org/eclipse/ui/texteditor/BookmarkRulerAction.java @@ -24,9 +24,7 @@ import org.eclipse.jface.text.source.IVerticalRulerInfo; */ public class BookmarkRulerAction extends AbstractRulerActionDelegate { - /* - * @see AbstractRulerActionDelegate#createAction(ITextEditor, IVerticalRulerInfo) - */ + @Override protected IAction createAction(ITextEditor editor, IVerticalRulerInfo rulerInfo) { return new MarkerRulerAction(TextEditorMessages.getBundleForConstructedKeys(), "Editor.ManageBookmarks.", editor, rulerInfo, IMarker.BOOKMARK, true); //$NON-NLS-1$ } diff --git a/org.eclipse.ui.editors/src/org/eclipse/ui/texteditor/ChainedPreferenceStore.java b/org.eclipse.ui.editors/src/org/eclipse/ui/texteditor/ChainedPreferenceStore.java index d08d6ebe056..5b616c2c24e 100644 --- a/org.eclipse.ui.editors/src/org/eclipse/ui/texteditor/ChainedPreferenceStore.java +++ b/org.eclipse.ui.editors/src/org/eclipse/ui/texteditor/ChainedPreferenceStore.java @@ -61,9 +61,7 @@ public class ChainedPreferenceStore implements IPreferenceStore { setPreferenceStore(preferenceStore); } - /* - * @see org.eclipse.jface.util.IPropertyChangeListener#propertyChange(org.eclipse.jface.util.PropertyChangeEvent) - */ + @Override public void propertyChange(PropertyChangeEvent event) { IPreferenceStore childPreferenceStore= getPreferenceStore(); handlePropertyChangeEvent(childPreferenceStore, event); @@ -119,9 +117,7 @@ public class ChainedPreferenceStore implements IPreferenceStore { } } - /* - * @see org.eclipse.jface.preference.IPreferenceStore#addPropertyChangeListener(org.eclipse.jface.util.IPropertyChangeListener) - */ + @Override public void addPropertyChangeListener(IPropertyChangeListener listener) { if (fClientListeners.size() == 0) { registerChildListeners(); @@ -129,9 +125,7 @@ public class ChainedPreferenceStore implements IPreferenceStore { fClientListeners.add(listener); } - /* - * @see org.eclipse.jface.preference.IPreferenceStore#removePropertyChangeListener(org.eclipse.jface.util.IPropertyChangeListener) - */ + @Override public void removePropertyChangeListener(IPropertyChangeListener listener) { fClientListeners.remove(listener); if (fClientListeners.size() == 0) { @@ -139,16 +133,12 @@ public class ChainedPreferenceStore implements IPreferenceStore { } } - /* - * @see org.eclipse.jface.preference.IPreferenceStore#contains(java.lang.String) - */ + @Override public boolean contains(String name) { return getVisibleStore(name) != null; } - /* - * @see org.eclipse.jface.preference.IPreferenceStore#firePropertyChangeEvent(java.lang.String, java.lang.Object, java.lang.Object) - */ + @Override public void firePropertyChangeEvent(String name, Object oldValue, Object newValue) { firePropertyChangeEvent(new PropertyChangeEvent(this, name, oldValue, newValue)); } @@ -164,9 +154,7 @@ public class ChainedPreferenceStore implements IPreferenceStore { ((IPropertyChangeListener) listeners[i]).propertyChange(event); } - /* - * @see org.eclipse.jface.preference.IPreferenceStore#getBoolean(java.lang.String) - */ + @Override public boolean getBoolean(String name) { IPreferenceStore visibleStore= getVisibleStore(name); if (visibleStore != null) @@ -174,9 +162,7 @@ public class ChainedPreferenceStore implements IPreferenceStore { return BOOLEAN_DEFAULT_DEFAULT; } - /* - * @see org.eclipse.jface.preference.IPreferenceStore#getDefaultBoolean(java.lang.String) - */ + @Override public boolean getDefaultBoolean(String name) { IPreferenceStore visibleStore= getVisibleStore(name); if (visibleStore != null) @@ -184,9 +170,7 @@ public class ChainedPreferenceStore implements IPreferenceStore { return BOOLEAN_DEFAULT_DEFAULT; } - /* - * @see org.eclipse.jface.preference.IPreferenceStore#getDefaultDouble(java.lang.String) - */ + @Override public double getDefaultDouble(String name) { IPreferenceStore visibleStore= getVisibleStore(name); if (visibleStore != null) @@ -194,9 +178,7 @@ public class ChainedPreferenceStore implements IPreferenceStore { return DOUBLE_DEFAULT_DEFAULT; } - /* - * @see org.eclipse.jface.preference.IPreferenceStore#getDefaultFloat(java.lang.String) - */ + @Override public float getDefaultFloat(String name) { IPreferenceStore visibleStore= getVisibleStore(name); if (visibleStore != null) @@ -204,9 +186,7 @@ public class ChainedPreferenceStore implements IPreferenceStore { return FLOAT_DEFAULT_DEFAULT; } - /* - * @see org.eclipse.jface.preference.IPreferenceStore#getDefaultInt(java.lang.String) - */ + @Override public int getDefaultInt(String name) { IPreferenceStore visibleStore= getVisibleStore(name); if (visibleStore != null) @@ -214,9 +194,7 @@ public class ChainedPreferenceStore implements IPreferenceStore { return INT_DEFAULT_DEFAULT; } - /* - * @see org.eclipse.jface.preference.IPreferenceStore#getDefaultLong(java.lang.String) - */ + @Override public long getDefaultLong(String name) { IPreferenceStore visibleStore= getVisibleStore(name); if (visibleStore != null) @@ -224,9 +202,7 @@ public class ChainedPreferenceStore implements IPreferenceStore { return LONG_DEFAULT_DEFAULT; } - /* - * @see org.eclipse.jface.preference.IPreferenceStore#getDefaultString(java.lang.String) - */ + @Override public String getDefaultString(String name) { IPreferenceStore visibleStore= getVisibleStore(name); if (visibleStore != null) @@ -234,9 +210,7 @@ public class ChainedPreferenceStore implements IPreferenceStore { return STRING_DEFAULT_DEFAULT; } - /* - * @see org.eclipse.jface.preference.IPreferenceStore#getDouble(java.lang.String) - */ + @Override public double getDouble(String name) { IPreferenceStore visibleStore= getVisibleStore(name); if (visibleStore != null) @@ -244,9 +218,7 @@ public class ChainedPreferenceStore implements IPreferenceStore { return DOUBLE_DEFAULT_DEFAULT; } - /* - * @see org.eclipse.jface.preference.IPreferenceStore#getFloat(java.lang.String) - */ + @Override public float getFloat(String name) { IPreferenceStore visibleStore= getVisibleStore(name); if (visibleStore != null) @@ -254,9 +226,7 @@ public class ChainedPreferenceStore implements IPreferenceStore { return FLOAT_DEFAULT_DEFAULT; } - /* - * @see org.eclipse.jface.preference.IPreferenceStore#getInt(java.lang.String) - */ + @Override public int getInt(String name) { IPreferenceStore visibleStore= getVisibleStore(name); if (visibleStore != null) @@ -264,9 +234,7 @@ public class ChainedPreferenceStore implements IPreferenceStore { return INT_DEFAULT_DEFAULT; } - /* - * @see org.eclipse.jface.preference.IPreferenceStore#getLong(java.lang.String) - */ + @Override public long getLong(String name) { IPreferenceStore visibleStore= getVisibleStore(name); if (visibleStore != null) @@ -274,9 +242,7 @@ public class ChainedPreferenceStore implements IPreferenceStore { return LONG_DEFAULT_DEFAULT; } - /* - * @see org.eclipse.jface.preference.IPreferenceStore#getString(java.lang.String) - */ + @Override public String getString(String name) { IPreferenceStore visibleStore= getVisibleStore(name); if (visibleStore != null) @@ -284,9 +250,7 @@ public class ChainedPreferenceStore implements IPreferenceStore { return STRING_DEFAULT_DEFAULT; } - /* - * @see org.eclipse.jface.preference.IPreferenceStore#isDefault(java.lang.String) - */ + @Override public boolean isDefault(String name) { IPreferenceStore visibleStore= getVisibleStore(name); if (visibleStore != null) @@ -294,107 +258,77 @@ public class ChainedPreferenceStore implements IPreferenceStore { return false; } - /* - * @see org.eclipse.jface.preference.IPreferenceStore#needsSaving() - */ + @Override public boolean needsSaving() { throw new UnsupportedOperationException(); } - /* - * @see org.eclipse.jface.preference.IPreferenceStore#putValue(java.lang.String, java.lang.String) - */ + @Override public void putValue(String name, String value) { throw new UnsupportedOperationException(); } - /* - * @see org.eclipse.jface.preference.IPreferenceStore#setDefault(java.lang.String, double) - */ + @Override public void setDefault(String name, double value) { throw new UnsupportedOperationException(); } - /* - * @see org.eclipse.jface.preference.IPreferenceStore#setDefault(java.lang.String, float) - */ + @Override public void setDefault(String name, float value) { throw new UnsupportedOperationException(); } - /* - * @see org.eclipse.jface.preference.IPreferenceStore#setDefault(java.lang.String, int) - */ + @Override public void setDefault(String name, int value) { throw new UnsupportedOperationException(); } - /* - * @see org.eclipse.jface.preference.IPreferenceStore#setDefault(java.lang.String, long) - */ + @Override public void setDefault(String name, long value) { throw new UnsupportedOperationException(); } - /* - * @see org.eclipse.jface.preference.IPreferenceStore#setDefault(java.lang.String, java.lang.String) - */ + @Override public void setDefault(String name, String defaultObject) { throw new UnsupportedOperationException(); } - /* - * @see org.eclipse.jface.preference.IPreferenceStore#setDefault(java.lang.String, boolean) - */ + @Override public void setDefault(String name, boolean value) { throw new UnsupportedOperationException(); } - /* - * @see org.eclipse.jface.preference.IPreferenceStore#setToDefault(java.lang.String) - */ + @Override public void setToDefault(String name) { throw new UnsupportedOperationException(); } - /* - * @see org.eclipse.jface.preference.IPreferenceStore#setValue(java.lang.String, double) - */ + @Override public void setValue(String name, double value) { throw new UnsupportedOperationException(); } - /* - * @see org.eclipse.jface.preference.IPreferenceStore#setValue(java.lang.String, float) - */ + @Override public void setValue(String name, float value) { throw new UnsupportedOperationException(); } - /* - * @see org.eclipse.jface.preference.IPreferenceStore#setValue(java.lang.String, int) - */ + @Override public void setValue(String name, int value) { throw new UnsupportedOperationException(); } - /* - * @see org.eclipse.jface.preference.IPreferenceStore#setValue(java.lang.String, long) - */ + @Override public void setValue(String name, long value) { throw new UnsupportedOperationException(); } - /* - * @see org.eclipse.jface.preference.IPreferenceStore#setValue(java.lang.String, java.lang.String) - */ + @Override public void setValue(String name, String value) { throw new UnsupportedOperationException(); } - /* - * @see org.eclipse.jface.preference.IPreferenceStore#setValue(java.lang.String, boolean) - */ + @Override public void setValue(String name, boolean value) { throw new UnsupportedOperationException(); } diff --git a/org.eclipse.ui.editors/src/org/eclipse/ui/texteditor/ChangeEncodingAction.java b/org.eclipse.ui.editors/src/org/eclipse/ui/texteditor/ChangeEncodingAction.java index c61fd20d29a..020bf34d958 100644 --- a/org.eclipse.ui.editors/src/org/eclipse/ui/texteditor/ChangeEncodingAction.java +++ b/org.eclipse.ui.editors/src/org/eclipse/ui/texteditor/ChangeEncodingAction.java @@ -89,9 +89,7 @@ public class ChangeEncodingAction extends TextEditorAction { fDialogTitle= getString(bundle, key, null); } - /* - * @see org.eclipse.jface.action.Action#run() - */ + @Override public void run() { final IResource resource= getResource(); final Shell parentShell= getTextEditor().getSite().getShell(); @@ -105,17 +103,13 @@ public class ChangeEncodingAction extends TextEditorAction { private AbstractEncodingFieldEditor fEncodingEditor; private IPreferenceStore store= null; - /* - * @see org.eclipse.jface.window.Window#configureShell(org.eclipse.swt.widgets.Shell) - */ + @Override protected void configureShell(Shell newShell) { super.configureShell(newShell); newShell.setText(fDialogTitle); } - /* - * @see org.eclipse.jface.dialogs.Dialog#createDialogArea(org.eclipse.swt.widgets.Composite) - */ + @Override protected Control createDialogArea(Composite parent) { Composite composite= (Composite)super.createDialogArea(parent); @@ -132,6 +126,7 @@ public class ChangeEncodingAction extends TextEditorAction { composite.setFont(parent.getFont()); DialogPage page= new MessageDialogPage(composite) { + @Override public void setErrorMessage(String newMessage) { super.setErrorMessage(newMessage); setButtonEnabledState(IDialogConstants.OK_ID, newMessage == null); @@ -169,17 +164,13 @@ public class ChangeEncodingAction extends TextEditorAction { return composite; } - /* - * @see org.eclipse.jface.dialogs.Dialog#createButtonsForButtonBar(org.eclipse.swt.widgets.Composite) - */ + @Override protected void createButtonsForButtonBar(Composite parent) { createButton(parent, APPLY_ID, TextEditorMessages.ChangeEncodingAction_button_apply_label, false); super.createButtonsForButtonBar(parent); } - /* - * @see org.eclipse.jface.dialogs.Dialog#buttonPressed(int) - */ + @Override protected void buttonPressed(int buttonId) { if (buttonId == APPLY_ID) apply(); @@ -187,9 +178,7 @@ public class ChangeEncodingAction extends TextEditorAction { super.buttonPressed(buttonId); } - /* - * @see org.eclipse.jface.dialogs.Dialog#okPressed() - */ + @Override protected void okPressed() { apply(); super.okPressed(); @@ -207,9 +196,7 @@ public class ChangeEncodingAction extends TextEditorAction { dialog.open(); } - /* - * @see org.eclipse.ui.texteditor.IUpdate#update() - */ + @Override public void update() { setEnabled((getResource() != null || getEncodingSupport() != null) && !getTextEditor().isDirty()); } diff --git a/org.eclipse.ui.editors/src/org/eclipse/ui/texteditor/DefaultMarkerAnnotationAccess.java b/org.eclipse.ui.editors/src/org/eclipse/ui/texteditor/DefaultMarkerAnnotationAccess.java index 7f036f5691a..d180e03c4f9 100644 --- a/org.eclipse.ui.editors/src/org/eclipse/ui/texteditor/DefaultMarkerAnnotationAccess.java +++ b/org.eclipse.ui.editors/src/org/eclipse/ui/texteditor/DefaultMarkerAnnotationAccess.java @@ -56,6 +56,7 @@ public class DefaultMarkerAnnotationAccess implements IAnnotationAccess, IAnnota * * @deprecated As of 3.0, replaced by Annotation.TYPE_UNKNOWN */ + @Deprecated public static final String UNKNOWN= Annotation.TYPE_UNKNOWN; /** @@ -116,6 +117,7 @@ public class DefaultMarkerAnnotationAccess implements IAnnotationAccess, IAnnota * * @deprecated As of 3.0, no replacement */ + @Deprecated protected MarkerAnnotationPreferences fMarkerAnnotationPreferences; /** @@ -132,6 +134,7 @@ public class DefaultMarkerAnnotationAccess implements IAnnotationAccess, IAnnota * @deprecated As of 3.0, replaced by * {@link org.eclipse.ui.texteditor.DefaultMarkerAnnotationAccess#DefaultMarkerAnnotationAccess()} */ + @Deprecated public DefaultMarkerAnnotationAccess(MarkerAnnotationPreferences markerAnnotationPreferences) { fMarkerAnnotationPreferences= markerAnnotationPreferences; } @@ -146,10 +149,7 @@ public class DefaultMarkerAnnotationAccess implements IAnnotationAccess, IAnnota public DefaultMarkerAnnotationAccess() { } - /* - * @see org.eclipse.jface.text.source.IAnnotationAccessExtension2#setQuickAssistAssistant(org.eclipse.jface.text.quickassist.IQuickAssistAssistant) - * @since 3.2 - */ + @Override public void setQuickAssistAssistant(IQuickAssistAssistant assistant) { fQuickAssistAssistant= assistant; } @@ -183,6 +183,8 @@ public class DefaultMarkerAnnotationAccess implements IAnnotationAccess, IAnnota * @deprecated use <code>Annotation.getType()</code> */ + @Deprecated + @Override public Object getType(Annotation annotation) { return annotation.getType(); } @@ -192,6 +194,8 @@ public class DefaultMarkerAnnotationAccess implements IAnnotationAccess, IAnnota * * @deprecated assumed to always return <code>true</code> */ + @Deprecated + @Override public boolean isMultiLine(Annotation annotation) { return true; } @@ -201,6 +205,8 @@ public class DefaultMarkerAnnotationAccess implements IAnnotationAccess, IAnnota * * @deprecated assumed to always return <code>true</code> */ + @Deprecated + @Override public boolean isTemporary(Annotation annotation) { return !annotation.isPersistent(); } @@ -209,15 +215,13 @@ public class DefaultMarkerAnnotationAccess implements IAnnotationAccess, IAnnota * @see org.eclipse.jface.text.source.IAnnotationAccessExtension#getLabel(org.eclipse.jface.text.source.Annotation) * @since 3.0 */ + @Override public String getTypeLabel(Annotation annotation) { AnnotationPreference preference= getAnnotationPreference(annotation); return preference != null ? preference.getPreferenceLabel() : null; } - /* - * @see org.eclipse.jface.text.source.IAnnotationAccessExtension#getLayer(org.eclipse.jface.text.source.Annotation) - * @since 3.0 - */ + @Override public int getLayer(Annotation annotation) { if (annotation instanceof IAnnotationPresentation) { IAnnotationPresentation presentation= (IAnnotationPresentation) annotation; @@ -245,10 +249,7 @@ public class DefaultMarkerAnnotationAccess implements IAnnotationAccess, IAnnota return IAnnotationAccessExtension.DEFAULT_LAYER; } - /* - * @see org.eclipse.jface.text.source.IAnnotationAccessExtension#paint(org.eclipse.jface.text.source.Annotation, org.eclipse.swt.graphics.GC, org.eclipse.swt.widgets.Canvas, org.eclipse.swt.graphics.Rectangle) - * @since 3.0 - */ + @Override public void paint(Annotation annotation, GC gc, Canvas canvas, Rectangle bounds) { if (annotation instanceof IAnnotationPresentation) { @@ -282,10 +283,7 @@ public class DefaultMarkerAnnotationAccess implements IAnnotationAccess, IAnnota } } - /* - * @see org.eclipse.jface.text.source.IAnnotationAccessExtension#isPaintable(org.eclipse.jface.text.source.Annotation) - * @since 3.0 - */ + @Override public boolean isPaintable(Annotation annotation) { if (annotation instanceof IAnnotationPresentation) return true; @@ -300,17 +298,13 @@ public class DefaultMarkerAnnotationAccess implements IAnnotationAccess, IAnnota return image != null; } - /* - * @see org.eclipse.jface.text.source.IAnnotationAccessExtension#isSubtype(java.lang.Object, java.lang.Object) - */ + @Override public boolean isSubtype(Object annotationType, Object potentialSupertype) { AnnotationTypeHierarchy hierarchy= getAnnotationTypeHierarchy(); return hierarchy.isSubtype(potentialSupertype.toString(), annotationType.toString()); } - /* - * @see org.eclipse.jface.text.source.IAnnotationAccessExtension#getSupertypes(java.lang.Object) - */ + @Override public Object[] getSupertypes(Object annotationType) { AnnotationTypeHierarchy hierarchy= getAnnotationTypeHierarchy(); AnnotationType type= hierarchy.getAnnotationType(annotationType.toString()); diff --git a/org.eclipse.ui.editors/src/org/eclipse/ui/texteditor/ImageUtilities.java b/org.eclipse.ui.editors/src/org/eclipse/ui/texteditor/ImageUtilities.java index e095f811cdb..40b4127a8ee 100644 --- a/org.eclipse.ui.editors/src/org/eclipse/ui/texteditor/ImageUtilities.java +++ b/org.eclipse.ui.editors/src/org/eclipse/ui/texteditor/ImageUtilities.java @@ -22,6 +22,7 @@ import org.eclipse.swt.widgets.Canvas; * @noinstantiate This class is not intended to be instantiated by clients. * @noextend This class is not intended to be subclassed by clients. */ +@Deprecated public class ImageUtilities { /** @@ -35,6 +36,7 @@ public class ImageUtilities { * @param valign the vertical alignment of the image to be drawn * @deprecated As of 3.0, replaced by {@link org.eclipse.jface.text.source.ImageUtilities#drawImage(Image, GC, Canvas, Rectangle, int, int)} */ + @Deprecated public static void drawImage(Image image, GC gc, Canvas canvas, Rectangle r, int halign, int valign) { org.eclipse.jface.text.source.ImageUtilities.drawImage(image, gc, canvas, r, halign, valign); } @@ -49,6 +51,7 @@ public class ImageUtilities { * @param align the alignment of the image to be drawn * @deprecated As of 3.0, replaced by {@link org.eclipse.jface.text.source.ImageUtilities#drawImage(Image, GC, Canvas, Rectangle, int)} */ + @Deprecated public static void drawImage(Image image, GC gc, Canvas canvas, Rectangle r, int align) { org.eclipse.jface.text.source.ImageUtilities.drawImage(image, gc, canvas, r, align); } diff --git a/org.eclipse.ui.editors/src/org/eclipse/ui/texteditor/MarkerAnnotation.java b/org.eclipse.ui.editors/src/org/eclipse/ui/texteditor/MarkerAnnotation.java index 3a90c7c03be..92271a50a4e 100644 --- a/org.eclipse.ui.editors/src/org/eclipse/ui/texteditor/MarkerAnnotation.java +++ b/org.eclipse.ui.editors/src/org/eclipse/ui/texteditor/MarkerAnnotation.java @@ -53,6 +53,7 @@ public class MarkerAnnotation extends SimpleMarkerAnnotation implements IQuickFi * @deprecated As of 3.0, replaced by {@link IAnnotationAccessExtension} */ + @Deprecated public final static int PROBLEM_LAYER= 5; /** Internal image registry. */ @@ -69,6 +70,7 @@ public class MarkerAnnotation extends SimpleMarkerAnnotation implements IQuickFi * annotation with a visible presentation should implement * {@link org.eclipse.jface.text.source.IAnnotationPresentation} */ + @Deprecated protected static Image getImage(Display display, ImageDescriptor descriptor) { Map map= getImageRegistry(display); Image image= (Image) map.get(descriptor); @@ -89,10 +91,12 @@ public class MarkerAnnotation extends SimpleMarkerAnnotation implements IQuickFi * annotation with a visible presentation should implement * {@link org.eclipse.jface.text.source.IAnnotationPresentation} */ + @Deprecated protected static Map getImageRegistry(Display display) { if (fgImageRegistry == null) { fgImageRegistry= new HashMap(); display.disposeExec(new Runnable() { + @Override public void run() { if (fgImageRegistry != null) { Map map= fgImageRegistry; @@ -159,6 +163,7 @@ public class MarkerAnnotation extends SimpleMarkerAnnotation implements IQuickFi * annotation with a visible presentation should implement * {@link org.eclipse.jface.text.source.IAnnotationPresentation} */ + @Deprecated protected void setImage(Image image) { fImage= image; } @@ -171,6 +176,7 @@ public class MarkerAnnotation extends SimpleMarkerAnnotation implements IQuickFi * annotation with a visible presentation should implement * {@link org.eclipse.jface.text.source.IAnnotationPresentation} */ + @Deprecated protected void initialize() { IMarker marker= getMarker(); String name= getUnknownImageName(marker); @@ -206,6 +212,7 @@ public class MarkerAnnotation extends SimpleMarkerAnnotation implements IQuickFi * @deprecated As of 3.0, replaced by {@link org.eclipse.jface.text.source.IAnnotationAccessExtension#getLayer(org.eclipse.jface.text.source.Annotation)} * @since 3.0 */ + @Deprecated public int getLayer() { if (fPresentationLayer != -1) // Backward compatibility @@ -228,6 +235,7 @@ public class MarkerAnnotation extends SimpleMarkerAnnotation implements IQuickFi * * @since 3.0 */ + @Deprecated protected void setLayer(int layer) { fPresentationLayer= layer; } @@ -245,6 +253,7 @@ public class MarkerAnnotation extends SimpleMarkerAnnotation implements IQuickFi * @deprecated As of 3.0 replaced by {@link org.eclipse.jface.text.source.IAnnotationAccessExtension#paint(org.eclipse.jface.text.source.Annotation, GC, Canvas, Rectangle)} * @since 3.0 */ + @Deprecated public void paint(GC gc, Canvas canvas, Rectangle r) { Image image= getImage(canvas.getDisplay()); if (image != null) @@ -255,6 +264,7 @@ public class MarkerAnnotation extends SimpleMarkerAnnotation implements IQuickFi * Informs this annotation about changes applied to its underlying marker * and adapts to those changes. */ + @Override public void update() { super.update(); initialize(); @@ -271,6 +281,7 @@ public class MarkerAnnotation extends SimpleMarkerAnnotation implements IQuickFi * annotation with a visible presentation should implement * {@link org.eclipse.jface.text.source.IAnnotationPresentation} */ + @Deprecated protected String getUnknownImageName(IMarker marker) { return null; } @@ -286,6 +297,7 @@ public class MarkerAnnotation extends SimpleMarkerAnnotation implements IQuickFi * annotation with a visible presentation should implement * {@link org.eclipse.jface.text.source.IAnnotationPresentation} */ + @Deprecated protected Image getImage(String name) { if (name != null) return PlatformUI.getWorkbench().getSharedImages().getImage(name); @@ -303,6 +315,7 @@ public class MarkerAnnotation extends SimpleMarkerAnnotation implements IQuickFi * annotation with a visible presentation should implement * {@link org.eclipse.jface.text.source.IAnnotationPresentation} */ + @Deprecated protected Image getImage(Display display) { if (fImage == null) { @@ -328,6 +341,7 @@ public class MarkerAnnotation extends SimpleMarkerAnnotation implements IQuickFi * * @since 3.4 */ + @Override public void setQuickFixable(boolean state) { fIsQuickFixable= state; fIsQuickFixableStateSet= true; @@ -338,6 +352,7 @@ public class MarkerAnnotation extends SimpleMarkerAnnotation implements IQuickFi * * @since 3.4 */ + @Override public boolean isQuickFixableStateSet() { return fIsQuickFixableStateSet; } @@ -347,6 +362,7 @@ public class MarkerAnnotation extends SimpleMarkerAnnotation implements IQuickFi * * @since 3.4 */ + @Override public boolean isQuickFixable() { Assert.isTrue(isQuickFixableStateSet()); return fIsQuickFixable; diff --git a/org.eclipse.ui.editors/src/org/eclipse/ui/texteditor/MarkerAnnotationPreferences.java b/org.eclipse.ui.editors/src/org/eclipse/ui/texteditor/MarkerAnnotationPreferences.java index 2480849d843..17b7e5a3dab 100644 --- a/org.eclipse.ui.editors/src/org/eclipse/ui/texteditor/MarkerAnnotationPreferences.java +++ b/org.eclipse.ui.editors/src/org/eclipse/ui/texteditor/MarkerAnnotationPreferences.java @@ -191,6 +191,7 @@ public class MarkerAnnotationPreferences { } private static final class AccessChecker extends SecurityManager { + @Override public Class[] getClassContext() { return super.getClassContext(); } diff --git a/org.eclipse.ui.editors/src/org/eclipse/ui/texteditor/MarkerRulerAction.java b/org.eclipse.ui.editors/src/org/eclipse/ui/texteditor/MarkerRulerAction.java index a59f471fc42..16538f92e43 100644 --- a/org.eclipse.ui.editors/src/org/eclipse/ui/texteditor/MarkerRulerAction.java +++ b/org.eclipse.ui.editors/src/org/eclipse/ui/texteditor/MarkerRulerAction.java @@ -132,6 +132,7 @@ public class MarkerRulerAction extends ResourceAction implements IUpdate { * @param askForLabel <code>true</code> if the user should be asked for a label * @deprecated use <code>MarkerRulerAction(ResourceBundle, String, ITextEditor, IVerticalRulerInfo, String, boolean)</code> instead */ + @Deprecated public MarkerRulerAction(ResourceBundle bundle, String prefix, IVerticalRuler ruler, ITextEditor editor, String markerType, boolean askForLabel) { this(bundle, prefix, editor, ruler, markerType, askForLabel); } @@ -152,6 +153,7 @@ public class MarkerRulerAction extends ResourceAction implements IUpdate { * @return this action's vertical ruler * @deprecated use <code>getVerticalRulerInfo</code> instead */ + @Deprecated protected IVerticalRuler getVerticalRuler() { if (fRuler instanceof IVerticalRuler) return (IVerticalRuler) fRuler; @@ -186,9 +188,7 @@ public class MarkerRulerAction extends ResourceAction implements IUpdate { return fPrefix; } - /* - * @see IUpdate#update() - */ + @Override public void update() { //bug 38745 IDocument document= getDocument(); @@ -232,9 +232,7 @@ public class MarkerRulerAction extends ResourceAction implements IUpdate { return marker != null && marker.exists() && marker.getAttribute(IMarker.USER_EDITABLE, true); } - /* - * @see Action#run() - */ + @Override public void run() { if (fMarkers.isEmpty()) addMarker(); @@ -403,6 +401,7 @@ public class MarkerRulerAction extends ResourceAction implements IUpdate { String title= getString(fBundle, fPrefix + "add.dialog.title", fPrefix + "add.dialog.title"); //$NON-NLS-2$ //$NON-NLS-1$ String message= getString(fBundle, fPrefix + "add.dialog.message", fPrefix + "add.dialog.message"); //$NON-NLS-2$ //$NON-NLS-1$ IInputValidator inputValidator= new IInputValidator() { + @Override public String isValid(String newText) { return (newText == null || newText.trim().length() == 0) ? " " : null; //$NON-NLS-1$ } @@ -504,6 +503,7 @@ public class MarkerRulerAction extends ResourceAction implements IUpdate { private void execute(IUndoableOperation operation) { final Shell shell= getTextEditor().getSite().getShell(); IAdaptable context= new IAdaptable() { + @Override public Object getAdapter(Class adapter) { if (adapter == Shell.class) return shell; diff --git a/org.eclipse.ui.editors/src/org/eclipse/ui/texteditor/MarkerRulerInfoAction.java b/org.eclipse.ui.editors/src/org/eclipse/ui/texteditor/MarkerRulerInfoAction.java index c3ff0319e39..3c764cbe745 100644 --- a/org.eclipse.ui.editors/src/org/eclipse/ui/texteditor/MarkerRulerInfoAction.java +++ b/org.eclipse.ui.editors/src/org/eclipse/ui/texteditor/MarkerRulerInfoAction.java @@ -19,6 +19,7 @@ import org.eclipse.jface.text.source.IVerticalRulerInfo; * @deprecated use {@link org.eclipse.ui.texteditor.MarkerRulerAction} instead * @since 2.0 */ +@Deprecated public class MarkerRulerInfoAction extends MarkerRulerAction { /** @@ -33,6 +34,7 @@ public class MarkerRulerInfoAction extends MarkerRulerAction { * @param askForLabel <code>true</code> if the user should be asked for a label when a new marker is created * @deprecated use super class constructor instead */ + @Deprecated public MarkerRulerInfoAction(ResourceBundle bundle, String prefix, IVerticalRulerInfo ruler, ITextEditor editor, String markerType, boolean askForLabel) { super(bundle, prefix, editor, ruler, markerType, askForLabel); } diff --git a/org.eclipse.ui.editors/src/org/eclipse/ui/texteditor/MarkerUtilities.java b/org.eclipse.ui.editors/src/org/eclipse/ui/texteditor/MarkerUtilities.java index 6f397a2f6b7..c02d4371b3b 100644 --- a/org.eclipse.ui.editors/src/org/eclipse/ui/texteditor/MarkerUtilities.java +++ b/org.eclipse.ui.editors/src/org/eclipse/ui/texteditor/MarkerUtilities.java @@ -390,6 +390,7 @@ public final class MarkerUtilities { public static void createMarker(final IResource resource, final Map attributes, final String markerType) throws CoreException { IWorkspaceRunnable r= new IWorkspaceRunnable() { + @Override public void run(IProgressMonitor monitor) throws CoreException { IMarker marker= resource.createMarker(markerType); marker.setAttributes(attributes); diff --git a/org.eclipse.ui.editors/src/org/eclipse/ui/texteditor/MessageDialogPage.java b/org.eclipse.ui.editors/src/org/eclipse/ui/texteditor/MessageDialogPage.java index b8dcfd5bc58..9cb00d8585d 100644 --- a/org.eclipse.ui.editors/src/org/eclipse/ui/texteditor/MessageDialogPage.java +++ b/org.eclipse.ui.editors/src/org/eclipse/ui/texteditor/MessageDialogPage.java @@ -35,6 +35,7 @@ class MessageDialogPage extends DialogPage { createControl(parent); } + @Override public void createControl(Composite parent) { Composite composite1= new Composite(parent, SWT.NONE); composite1.setLayoutData(new GridData(GridData.FILL_HORIZONTAL)); @@ -50,11 +51,13 @@ class MessageDialogPage extends DialogPage { Dialog.applyDialogFont(composite1); } + @Override public void setMessage(String newMessage,int newType) { super.setMessage(newMessage, newType); fMessageRegion.updateText(newMessage, newType); } + @Override public void setErrorMessage(String newMessage) { super.setErrorMessage(newMessage); fMessageRegion.updateText(newMessage, IMessageProvider.ERROR); diff --git a/org.eclipse.ui.editors/src/org/eclipse/ui/texteditor/ReadOnlyAnnotationPreference.java b/org.eclipse.ui.editors/src/org/eclipse/ui/texteditor/ReadOnlyAnnotationPreference.java index f55cd499c94..1e1ec97ccf9 100644 --- a/org.eclipse.ui.editors/src/org/eclipse/ui/texteditor/ReadOnlyAnnotationPreference.java +++ b/org.eclipse.ui.editors/src/org/eclipse/ui/texteditor/ReadOnlyAnnotationPreference.java @@ -31,18 +31,21 @@ class ReadOnlyAnnotationPreference extends AnnotationPreference { private boolean fIsReadOnly; + @Override public void merge(AnnotationPreference preference) { if (fIsReadOnly) throw new UnsupportedOperationException(); super.merge(preference); } + @Override public void setAnnotationImageProvider(IAnnotationImageProvider provider) { if (fIsReadOnly) throw new UnsupportedOperationException(); super.setAnnotationImageProvider(provider); } + @Override public void setAnnotationImageProviderData(IConfigurationElement configurationElement, String annotationImageProviderAttribute) { if (fIsReadOnly) throw new UnsupportedOperationException(); @@ -50,186 +53,217 @@ class ReadOnlyAnnotationPreference extends AnnotationPreference { annotationImageProviderAttribute); } + @Override public void setAnnotationType(Object annotationType) { if (fIsReadOnly) throw new UnsupportedOperationException(); super.setAnnotationType(annotationType); } + @Override public void setColorPreferenceKey(String colorKey) { if (fIsReadOnly) throw new UnsupportedOperationException(); super.setColorPreferenceKey(colorKey); } + @Override public void setColorPreferenceValue(RGB colorValue) { if (fIsReadOnly) throw new UnsupportedOperationException(); super.setColorPreferenceValue(colorValue); } + @Override public void setContributesToHeader(boolean contributesToHeader) { if (fIsReadOnly) throw new UnsupportedOperationException(); super.setContributesToHeader(contributesToHeader); } + @Override public void setHighlightPreferenceKey(String highlightKey) { if (fIsReadOnly) throw new UnsupportedOperationException(); super.setHighlightPreferenceKey(highlightKey); } + @Override public void setHighlightPreferenceValue(boolean highlightValue) { if (fIsReadOnly) throw new UnsupportedOperationException(); super.setHighlightPreferenceValue(highlightValue); } + @Override public void setImageDescriptor(ImageDescriptor descriptor) { if (fIsReadOnly) throw new UnsupportedOperationException(); super.setImageDescriptor(descriptor); } + @Override public void setIncludeOnPreferencePage(boolean includeOnPreferencePage) { if (fIsReadOnly) throw new UnsupportedOperationException(); super.setIncludeOnPreferencePage(includeOnPreferencePage); } + @Override public void setIsGoToNextNavigationTarget(boolean isGoToNextNavigationTarget) { if (fIsReadOnly) throw new UnsupportedOperationException(); super.setIsGoToNextNavigationTarget(isGoToNextNavigationTarget); } + @Override public void setIsGoToNextNavigationTargetKey(String isGoToNextNavigationTargetKey) { if (fIsReadOnly) throw new UnsupportedOperationException(); super.setIsGoToNextNavigationTargetKey(isGoToNextNavigationTargetKey); } + @Override public void setIsGoToPreviousNavigationTarget(boolean isGoToPreviousNavigationTarget) { if (fIsReadOnly) throw new UnsupportedOperationException(); super.setIsGoToPreviousNavigationTarget(isGoToPreviousNavigationTarget); } + @Override public void setIsGoToPreviousNavigationTargetKey(String isGoToPreviousNavigationTargetKey) { if (fIsReadOnly) throw new UnsupportedOperationException(); super.setIsGoToPreviousNavigationTargetKey(isGoToPreviousNavigationTargetKey); } + @Override public void setMarkerType(String markerType) { if (fIsReadOnly) throw new UnsupportedOperationException(); super.setMarkerType(markerType); } + @Override public void setOverviewRulerPreferenceKey(String overviewRulerKey) { if (fIsReadOnly) throw new UnsupportedOperationException(); super.setOverviewRulerPreferenceKey(overviewRulerKey); } + @Override public void setOverviewRulerPreferenceValue(boolean overviewRulerValue) { if (fIsReadOnly) throw new UnsupportedOperationException(); super.setOverviewRulerPreferenceValue(overviewRulerValue); } + @Override public void setPreferenceLabel(String label) { if (fIsReadOnly) throw new UnsupportedOperationException(); super.setPreferenceLabel(label); } + @Override public void setPresentationLayer(int presentationLayer) { if (fIsReadOnly) throw new UnsupportedOperationException(); super.setPresentationLayer(presentationLayer); } + @Override public void setQuickFixImageDescriptor(ImageDescriptor descriptor) { if (fIsReadOnly) throw new UnsupportedOperationException(); super.setQuickFixImageDescriptor(descriptor); } + @Override public void setSeverity(int severity) { if (fIsReadOnly) throw new UnsupportedOperationException(); super.setSeverity(severity); } + @Override public void setShowInNextPrevDropdownToolbarAction(boolean showInNextPrevDropdownToolbarAction) { if (fIsReadOnly) throw new UnsupportedOperationException(); super.setShowInNextPrevDropdownToolbarAction(showInNextPrevDropdownToolbarAction); } + @Override public void setShowInNextPrevDropdownToolbarActionKey(String showInNextPrevDropdownToolbarActionKey) { if (fIsReadOnly) throw new UnsupportedOperationException(); super.setShowInNextPrevDropdownToolbarActionKey(showInNextPrevDropdownToolbarActionKey); } + @Override public void setSymbolicImageName(String symbolicImageName) { if (fIsReadOnly) throw new UnsupportedOperationException(); super.setSymbolicImageName(symbolicImageName); } + @Override public void setTextPreferenceKey(String textKey) { if (fIsReadOnly) throw new UnsupportedOperationException(); super.setTextPreferenceKey(textKey); } + @Override public void setTextPreferenceValue(boolean textValue) { if (fIsReadOnly) throw new UnsupportedOperationException(); super.setTextPreferenceValue(textValue); } + @Override public void setTextStylePreferenceKey(String key) { if (fIsReadOnly) throw new UnsupportedOperationException(); super.setTextStylePreferenceKey(key); } + @Override public void setTextStyleValue(String value) { if (fIsReadOnly) throw new UnsupportedOperationException(); super.setTextStyleValue(value); } + @Override protected void setValue(Object attribute, boolean value) { if (fIsReadOnly) throw new UnsupportedOperationException(); super.setValue(attribute, value); } + @Override protected void setValue(Object attribute, int value) { if (fIsReadOnly) throw new UnsupportedOperationException(); super.setValue(attribute, value); } + @Override protected void setValue(Object attribute, Object value) { if (fIsReadOnly) throw new UnsupportedOperationException(); super.setValue(attribute, value); } + @Override public void setVerticalRulerPreferenceKey(String verticalRulerKey) { if (fIsReadOnly) throw new UnsupportedOperationException(); super.setVerticalRulerPreferenceKey(verticalRulerKey); } + @Override public void setVerticalRulerPreferenceValue(boolean verticalRulerValue) { if (fIsReadOnly) throw new UnsupportedOperationException(); diff --git a/org.eclipse.ui.editors/src/org/eclipse/ui/texteditor/ResourceMarkerAnnotationModel.java b/org.eclipse.ui.editors/src/org/eclipse/ui/texteditor/ResourceMarkerAnnotationModel.java index 3cf258bd20b..819ee7a70a7 100644 --- a/org.eclipse.ui.editors/src/org/eclipse/ui/texteditor/ResourceMarkerAnnotationModel.java +++ b/org.eclipse.ui.editors/src/org/eclipse/ui/texteditor/ResourceMarkerAnnotationModel.java @@ -45,9 +45,7 @@ public class ResourceMarkerAnnotationModel extends AbstractMarkerAnnotationModel * Internal resource change listener. */ class ResourceChangeListener implements IResourceChangeListener { - /* - * @see IResourceChangeListener#resourceChanged(org.eclipse.core.resources.IResourceChangeEvent) - */ + @Override public void resourceChanged(IResourceChangeEvent e) { IResourceDelta delta= e.getDelta(); if (delta != null && fResource != null) { @@ -78,9 +76,7 @@ public class ResourceMarkerAnnotationModel extends AbstractMarkerAnnotationModel fWorkspace= resource.getWorkspace(); } - /* - * @see AbstractMarkerAnnotationModel#isAcceptable(IMarker) - */ + @Override protected boolean isAcceptable(IMarker marker) { return marker != null && fResource.equals(marker.getResource()); } @@ -170,9 +166,7 @@ public class ResourceMarkerAnnotationModel extends AbstractMarkerAnnotationModel addMarkerAnnotation((IMarker)iter.next()); } - /* - * @see AbstractMarkerAnnotationModel#listenToMarkerChanges(boolean) - */ + @Override protected void listenToMarkerChanges(boolean listen) { if (listen) fWorkspace.addResourceChangeListener(fResourceChangeListener); @@ -180,11 +174,10 @@ public class ResourceMarkerAnnotationModel extends AbstractMarkerAnnotationModel fWorkspace.removeResourceChangeListener(fResourceChangeListener); } - /* - * @see AbstractMarkerAnnotationModel#deleteMarkers(IMarker[]) - */ + @Override protected void deleteMarkers(final IMarker[] markers) throws CoreException { fWorkspace.run(new IWorkspaceRunnable() { + @Override public void run(IProgressMonitor monitor) throws CoreException { for (int i= 0; i < markers.length; ++i) { markers[i].delete(); @@ -193,9 +186,7 @@ public class ResourceMarkerAnnotationModel extends AbstractMarkerAnnotationModel }, null, IWorkspace.AVOID_UPDATE, null); } - /* - * @see AbstractMarkerAnnotationModel#retrieveMarkers() - */ + @Override protected IMarker[] retrieveMarkers() throws CoreException { return fResource.findMarkers(IMarker.MARKER, true, IResource.DEPTH_ZERO); } diff --git a/org.eclipse.ui.editors/src/org/eclipse/ui/texteditor/ResourceMarkerAnnotationModelFactory.java b/org.eclipse.ui.editors/src/org/eclipse/ui/texteditor/ResourceMarkerAnnotationModelFactory.java index c1b4e78cb2b..c012fa39b98 100644 --- a/org.eclipse.ui.editors/src/org/eclipse/ui/texteditor/ResourceMarkerAnnotationModelFactory.java +++ b/org.eclipse.ui.editors/src/org/eclipse/ui/texteditor/ResourceMarkerAnnotationModelFactory.java @@ -27,9 +27,7 @@ import org.eclipse.jface.text.source.IAnnotationModel; */ public class ResourceMarkerAnnotationModelFactory implements IAnnotationModelFactory { - /* - * @see org.eclipse.core.filebuffers.IAnnotationModelFactory#createAnnotationModel(org.eclipse.core.runtime.IPath) - */ + @Override public IAnnotationModel createAnnotationModel(IPath location) { IFile file= FileBuffers.getWorkspaceFileAtLocation(location); if (file != null) diff --git a/org.eclipse.ui.editors/src/org/eclipse/ui/texteditor/RevisionHoverInformationControlCreator.java b/org.eclipse.ui.editors/src/org/eclipse/ui/texteditor/RevisionHoverInformationControlCreator.java index f5baea48dd6..dfbd0277be6 100644 --- a/org.eclipse.ui.editors/src/org/eclipse/ui/texteditor/RevisionHoverInformationControlCreator.java +++ b/org.eclipse.ui.editors/src/org/eclipse/ui/texteditor/RevisionHoverInformationControlCreator.java @@ -79,6 +79,8 @@ class RevisionHoverInformationControlCreator extends AbstractReusableInformation * * @deprecated use {@link #setInput(Object)} */ + @Deprecated + @Override public void setInformation(String content) { content= addCSSToHTMLFragment(content); super.setInformation(content); @@ -113,9 +115,7 @@ class RevisionHoverInformationControlCreator extends AbstractReusableInformation fIsFocusable= isFocusable; } - /* - * @see org.eclipse.ui.texteditor.AbstractReusableInformationControlCreator#canReuse(org.eclipse.jface.text.IInformationControl) - */ + @Override public boolean canReuse(IInformationControl control) { if (!super.canReuse(control)) return false; @@ -126,9 +126,7 @@ class RevisionHoverInformationControlCreator extends AbstractReusableInformation return true; } - /* - * @see org.eclipse.jface.internal.text.revisions.AbstractReusableInformationControlCreator#doCreateInformationControl(org.eclipse.swt.widgets.Shell) - */ + @Override protected IInformationControl doCreateInformationControl(Shell parent) { if (BrowserInformationControl.isAvailable(parent)) { if (fIsFocusable) diff --git a/org.eclipse.ui.editors/src/org/eclipse/ui/texteditor/SelectMarkerRulerAction.java b/org.eclipse.ui.editors/src/org/eclipse/ui/texteditor/SelectMarkerRulerAction.java index 945773fb111..eb8fc635ba1 100644 --- a/org.eclipse.ui.editors/src/org/eclipse/ui/texteditor/SelectMarkerRulerAction.java +++ b/org.eclipse.ui.editors/src/org/eclipse/ui/texteditor/SelectMarkerRulerAction.java @@ -101,20 +101,17 @@ public class SelectMarkerRulerAction extends ResourceAction implements IUpdate { * @param editor the editor * @deprecated As of 3.0, replaced by {@link #SelectMarkerRulerAction(ResourceBundle, String, ITextEditor, IVerticalRulerInfo)} */ + @Deprecated public SelectMarkerRulerAction(ResourceBundle bundle, String prefix, IVerticalRuler ruler, ITextEditor editor) { this(bundle, prefix, editor, ruler); } - /* - * @see IUpdate#update() - */ + @Override public void update() { setEnabled(hasMarkers()); } - /* - * @see Action#run() - */ + @Override public void run() { IMarker marker= chooseMarker(getMarkers()); diff --git a/org.eclipse.ui.editors/src/org/eclipse/ui/texteditor/SelectMarkerRulerInfoAction.java b/org.eclipse.ui.editors/src/org/eclipse/ui/texteditor/SelectMarkerRulerInfoAction.java index 9d5bbc83798..93b12992a24 100644 --- a/org.eclipse.ui.editors/src/org/eclipse/ui/texteditor/SelectMarkerRulerInfoAction.java +++ b/org.eclipse.ui.editors/src/org/eclipse/ui/texteditor/SelectMarkerRulerInfoAction.java @@ -19,6 +19,7 @@ import org.eclipse.jface.text.source.IVerticalRulerInfo; * @deprecated As of 2.1, replaced by {@link org.eclipse.ui.texteditor.SelectMarkerRulerAction} * @since 2.0 */ +@Deprecated public class SelectMarkerRulerInfoAction extends SelectMarkerRulerAction { /** @@ -31,6 +32,7 @@ public class SelectMarkerRulerInfoAction extends SelectMarkerRulerAction { * @param editor the editor * @deprecated As of 2.1 replaced by {@link org.eclipse.ui.texteditor.SelectMarkerRulerAction#SelectMarkerRulerAction(ResourceBundle, String, ITextEditor, IVerticalRulerInfo)} */ + @Deprecated public SelectMarkerRulerInfoAction(ResourceBundle bundle, String prefix, IVerticalRulerInfo ruler, ITextEditor editor) { super(bundle, prefix, editor, ruler); } diff --git a/org.eclipse.ui.editors/src/org/eclipse/ui/texteditor/SelectRulerAction.java b/org.eclipse.ui.editors/src/org/eclipse/ui/texteditor/SelectRulerAction.java index c580ccff2e2..07c6a9dde37 100644 --- a/org.eclipse.ui.editors/src/org/eclipse/ui/texteditor/SelectRulerAction.java +++ b/org.eclipse.ui.editors/src/org/eclipse/ui/texteditor/SelectRulerAction.java @@ -22,9 +22,7 @@ import org.eclipse.jface.text.source.IVerticalRulerInfo; */ public class SelectRulerAction extends AbstractRulerActionDelegate { - /* - * @see AbstractRulerActionDelegate#createAction(ITextEditor, IVerticalRulerInfo) - */ + @Override protected IAction createAction(ITextEditor editor, IVerticalRulerInfo rulerInfo) { return new SelectMarkerRulerAction(TextEditorMessages.getBundleForConstructedKeys(), "Editor.SelectMarker.", editor, rulerInfo); //$NON-NLS-1$ } diff --git a/org.eclipse.ui.editors/src/org/eclipse/ui/texteditor/SimpleMarkerAnnotation.java b/org.eclipse.ui.editors/src/org/eclipse/ui/texteditor/SimpleMarkerAnnotation.java index 43925cec9cc..5db64bc5cd8 100644 --- a/org.eclipse.ui.editors/src/org/eclipse/ui/texteditor/SimpleMarkerAnnotation.java +++ b/org.eclipse.ui.editors/src/org/eclipse/ui/texteditor/SimpleMarkerAnnotation.java @@ -67,15 +67,14 @@ public class SimpleMarkerAnnotation extends Annotation { * * @see Object#equals(java.lang.Object) */ + @Override public boolean equals(Object o) { if (o != null && o.getClass() == getClass()) return fMarker.equals(((SimpleMarkerAnnotation) o).fMarker); return false; } - /* - * @see Object#hashCode() - */ + @Override public int hashCode() { return fMarker.hashCode(); } @@ -102,9 +101,7 @@ public class SimpleMarkerAnnotation extends Annotation { setType(annotationType); } - /* - * @see org.eclipse.jface.text.source.Annotation#getText() - */ + @Override public String getText() { return MarkerUtilities.getMessage(fMarker); } diff --git a/org.eclipse.ui.editors/src/org/eclipse/ui/texteditor/TaskRulerAction.java b/org.eclipse.ui.editors/src/org/eclipse/ui/texteditor/TaskRulerAction.java index e77bef4f349..21b7e103e55 100644 --- a/org.eclipse.ui.editors/src/org/eclipse/ui/texteditor/TaskRulerAction.java +++ b/org.eclipse.ui.editors/src/org/eclipse/ui/texteditor/TaskRulerAction.java @@ -54,9 +54,7 @@ public class TaskRulerAction extends AbstractRulerActionDelegate { super(bundle, prefix, editor, ruler, IMarker.TASK, false); } - /* - * @see MarkerRulerAction#addMarker() - */ + @Override protected void addMarker() { IResource resource= getResource(); if (resource == null) @@ -69,9 +67,7 @@ public class TaskRulerAction extends AbstractRulerActionDelegate { } } - /* - * @see AbstractRulerActionDelegate#createAction(ITextEditor, IVerticalRulerInfo) - */ + @Override protected IAction createAction(ITextEditor editor, IVerticalRulerInfo rulerInfo) { return new TaskMarkerRulerAction(TextEditorMessages.getBundleForConstructedKeys(), "Editor.ManageTasks.", editor, rulerInfo); //$NON-NLS-1$ } diff --git a/org.eclipse.ui.examples.javaeditor/Eclipse Java Editor Example/org/eclipse/ui/examples/javaeditor/JavaActionContributor.java b/org.eclipse.ui.examples.javaeditor/Eclipse Java Editor Example/org/eclipse/ui/examples/javaeditor/JavaActionContributor.java index 45854859bc4..f2a8768f59b 100644 --- a/org.eclipse.ui.examples.javaeditor/Eclipse Java Editor Example/org/eclipse/ui/examples/javaeditor/JavaActionContributor.java +++ b/org.eclipse.ui.examples.javaeditor/Eclipse Java Editor Example/org/eclipse/ui/examples/javaeditor/JavaActionContributor.java @@ -48,9 +48,7 @@ public class JavaActionContributor extends TextEditorActionContributor { fTogglePresentation= new PresentationAction(); } - /* - * @see IEditorActionBarContributor#init(IActionBars) - */ + @Override public void init(IActionBars bars) { super.init(bars); @@ -83,17 +81,13 @@ public class JavaActionContributor extends TextEditorActionContributor { fTogglePresentation.update(); } - /* - * @see IEditorActionBarContributor#setActiveEditor(IEditorPart) - */ + @Override public void setActiveEditor(IEditorPart part) { super.setActiveEditor(part); doSetActiveEditor(part); } - /* - * @see IEditorActionBarContributor#dispose() - */ + @Override public void dispose() { doSetActiveEditor(null); super.dispose(); diff --git a/org.eclipse.ui.examples.javaeditor/Eclipse Java Editor Example/org/eclipse/ui/examples/javaeditor/JavaAnnotationHover.java b/org.eclipse.ui.examples.javaeditor/Eclipse Java Editor Example/org/eclipse/ui/examples/javaeditor/JavaAnnotationHover.java index 91728124442..d812b11381e 100644 --- a/org.eclipse.ui.examples.javaeditor/Eclipse Java Editor Example/org/eclipse/ui/examples/javaeditor/JavaAnnotationHover.java +++ b/org.eclipse.ui.examples.javaeditor/Eclipse Java Editor Example/org/eclipse/ui/examples/javaeditor/JavaAnnotationHover.java @@ -24,9 +24,7 @@ import org.eclipse.jface.text.source.ISourceViewer; public class JavaAnnotationHover implements IAnnotationHover { - /* (non-Javadoc) - * Method declared on IAnnotationHover - */ + @Override public String getHoverInfo(ISourceViewer sourceViewer, int lineNumber) { IDocument document= sourceViewer.getDocument(); diff --git a/org.eclipse.ui.examples.javaeditor/Eclipse Java Editor Example/org/eclipse/ui/examples/javaeditor/JavaContentOutlinePage.java b/org.eclipse.ui.examples.javaeditor/Eclipse Java Editor Example/org/eclipse/ui/examples/javaeditor/JavaContentOutlinePage.java index 48c9c4b142e..78ec2f00c4c 100644 --- a/org.eclipse.ui.examples.javaeditor/Eclipse Java Editor Example/org/eclipse/ui/examples/javaeditor/JavaContentOutlinePage.java +++ b/org.eclipse.ui.examples.javaeditor/Eclipse Java Editor Example/org/eclipse/ui/examples/javaeditor/JavaContentOutlinePage.java @@ -56,6 +56,7 @@ public class JavaContentOutlinePage extends ContentOutlinePage { this.position= position; } + @Override public String toString() { return name; } @@ -96,9 +97,7 @@ public class JavaContentOutlinePage extends ContentOutlinePage { } } - /* - * @see IContentProvider#inputChanged(Viewer, Object, Object) - */ + @Override public void inputChanged(Viewer viewer, Object oldInput, Object newInput) { if (oldInput != null) { IDocument document= fDocumentProvider.getDocument(oldInput); @@ -127,6 +126,7 @@ public class JavaContentOutlinePage extends ContentOutlinePage { /* * @see IContentProvider#dispose */ + @Override public void dispose() { if (fContent != null) { fContent.clear(); @@ -134,32 +134,24 @@ public class JavaContentOutlinePage extends ContentOutlinePage { } } - /* - * @see IStructuredContentProvider#getElements(Object) - */ + @Override public Object[] getElements(Object element) { return fContent.toArray(); } - /* - * @see ITreeContentProvider#hasChildren(Object) - */ + @Override public boolean hasChildren(Object element) { return element == fInput; } - /* - * @see ITreeContentProvider#getParent(Object) - */ + @Override public Object getParent(Object element) { if (element instanceof Segment) return fInput; return null; } - /* - * @see ITreeContentProvider#getChildren(Object) - */ + @Override public Object[] getChildren(Object element) { if (element == fInput) return fContent.toArray(); @@ -183,9 +175,7 @@ public class JavaContentOutlinePage extends ContentOutlinePage { fTextEditor= editor; } - /* (non-Javadoc) - * Method declared on ContentOutlinePage - */ + @Override public void createControl(Composite parent) { super.createControl(parent); @@ -199,9 +189,7 @@ public class JavaContentOutlinePage extends ContentOutlinePage { viewer.setInput(fInput); } - /* (non-Javadoc) - * Method declared on ContentOutlinePage - */ + @Override public void selectionChanged(SelectionChangedEvent event) { super.selectionChanged(event); diff --git a/org.eclipse.ui.examples.javaeditor/Eclipse Java Editor Example/org/eclipse/ui/examples/javaeditor/JavaDocumentSetupParticipant.java b/org.eclipse.ui.examples.javaeditor/Eclipse Java Editor Example/org/eclipse/ui/examples/javaeditor/JavaDocumentSetupParticipant.java index c315bc1c2d9..41ae1b1b19a 100644 --- a/org.eclipse.ui.examples.javaeditor/Eclipse Java Editor Example/org/eclipse/ui/examples/javaeditor/JavaDocumentSetupParticipant.java +++ b/org.eclipse.ui.examples.javaeditor/Eclipse Java Editor Example/org/eclipse/ui/examples/javaeditor/JavaDocumentSetupParticipant.java @@ -27,9 +27,7 @@ public class JavaDocumentSetupParticipant implements IDocumentSetupParticipant { public JavaDocumentSetupParticipant() { } - /* - * @see org.eclipse.core.filebuffers.IDocumentSetupParticipant#setup(org.eclipse.jface.text.IDocument) - */ + @Override public void setup(IDocument document) { if (document instanceof IDocumentExtension3) { IDocumentExtension3 extension3= (IDocumentExtension3) document; diff --git a/org.eclipse.ui.examples.javaeditor/Eclipse Java Editor Example/org/eclipse/ui/examples/javaeditor/JavaEditor.java b/org.eclipse.ui.examples.javaeditor/Eclipse Java Editor Example/org/eclipse/ui/examples/javaeditor/JavaEditor.java index c5106b79ed3..3ee57028498 100644 --- a/org.eclipse.ui.examples.javaeditor/Eclipse Java Editor Example/org/eclipse/ui/examples/javaeditor/JavaEditor.java +++ b/org.eclipse.ui.examples.javaeditor/Eclipse Java Editor Example/org/eclipse/ui/examples/javaeditor/JavaEditor.java @@ -61,9 +61,7 @@ public class JavaEditor extends TextEditor { return (IAnnotationModel) editor.getAdapter(ProjectionAnnotationModel.class); } - /* - * @see org.eclipse.jface.action.Action#run() - */ + @Override public void run() { ITextEditor editor= getTextEditor(); ISelection selection= editor.getSelectionProvider().getSelection(); @@ -107,6 +105,7 @@ public class JavaEditor extends TextEditor { * <code>AbstractTextEditor</code> method extend the * actions to add those specific to the receiver */ + @Override protected void createActions() { super.createActions(); @@ -118,6 +117,7 @@ public class JavaEditor extends TextEditor { * <code>AbstractTextEditor</code> method performs any extra * disposal actions required by the java editor. */ + @Override public void dispose() { if (fOutlinePage != null) fOutlinePage.setInput(null); @@ -128,6 +128,7 @@ public class JavaEditor extends TextEditor { * <code>AbstractTextEditor</code> method performs any extra * revert behavior required by the java editor. */ + @Override public void doRevertToSaved() { super.doRevertToSaved(); if (fOutlinePage != null) @@ -140,6 +141,7 @@ public class JavaEditor extends TextEditor { * * @param monitor the progress monitor */ + @Override public void doSave(IProgressMonitor monitor) { super.doSave(monitor); if (fOutlinePage != null) @@ -150,6 +152,7 @@ public class JavaEditor extends TextEditor { * <code>AbstractTextEditor</code> method performs any extra * save as behavior required by the java editor. */ + @Override public void doSaveAs() { super.doSaveAs(); if (fOutlinePage != null) @@ -163,15 +166,14 @@ public class JavaEditor extends TextEditor { * @param input the editor input * @throws CoreException in case the input can not be set */ + @Override public void doSetInput(IEditorInput input) throws CoreException { super.doSetInput(input); if (fOutlinePage != null) fOutlinePage.setInput(input); } - /* - * @see org.eclipse.ui.texteditor.ExtendedTextEditor#editorContextMenuAboutToShow(org.eclipse.jface.action.IMenuManager) - */ + @Override protected void editorContextMenuAboutToShow(IMenuManager menu) { super.editorContextMenuAboutToShow(menu); addAction(menu, "ContentAssistProposal"); //$NON-NLS-1$ @@ -187,6 +189,7 @@ public class JavaEditor extends TextEditor { * @param required the required type * @return an adapter for the required type or <code>null</code> */ + @Override public Object getAdapter(Class required) { if (IContentOutlinePage.class.equals(required)) { if (fOutlinePage == null) { @@ -206,17 +209,13 @@ public class JavaEditor extends TextEditor { return super.getAdapter(required); } - /* (non-Javadoc) - * Method declared on AbstractTextEditor - */ + @Override protected void initializeEditor() { super.initializeEditor(); setSourceViewerConfiguration(new JavaSourceViewerConfiguration()); } - /* - * @see org.eclipse.ui.texteditor.ExtendedTextEditor#createSourceViewer(org.eclipse.swt.widgets.Composite, org.eclipse.jface.text.source.IVerticalRuler, int) - */ + @Override protected ISourceViewer createSourceViewer(Composite parent, IVerticalRuler ruler, int styles) { fAnnotationAccess= createAnnotationAccess(); @@ -229,9 +228,7 @@ public class JavaEditor extends TextEditor { return viewer; } - /* - * @see org.eclipse.ui.texteditor.ExtendedTextEditor#createPartControl(org.eclipse.swt.widgets.Composite) - */ + @Override public void createPartControl(Composite parent) { super.createPartControl(parent); ProjectionViewer viewer= (ProjectionViewer) getSourceViewer(); @@ -242,9 +239,7 @@ public class JavaEditor extends TextEditor { viewer.doOperation(ProjectionViewer.TOGGLE); } - /* - * @see org.eclipse.ui.texteditor.AbstractTextEditor#adjustHighlightRange(int, int) - */ + @Override protected void adjustHighlightRange(int offset, int length) { ISourceViewer viewer= getSourceViewer(); if (viewer instanceof ITextViewerExtension5) { diff --git a/org.eclipse.ui.examples.javaeditor/Eclipse Java Editor Example/org/eclipse/ui/examples/javaeditor/JavaPartitionScanner.java b/org.eclipse.ui.examples.javaeditor/Eclipse Java Editor Example/org/eclipse/ui/examples/javaeditor/JavaPartitionScanner.java index bf62b5a76a9..66c0fc143e8 100644 --- a/org.eclipse.ui.examples.javaeditor/Eclipse Java Editor Example/org/eclipse/ui/examples/javaeditor/JavaPartitionScanner.java +++ b/org.eclipse.ui.examples.javaeditor/Eclipse Java Editor Example/org/eclipse/ui/examples/javaeditor/JavaPartitionScanner.java @@ -39,16 +39,12 @@ public class JavaPartitionScanner extends RuleBasedPartitionScanner { */ static class EmptyCommentDetector implements IWordDetector { - /* (non-Javadoc) - * Method declared on IWordDetector - */ + @Override public boolean isWordStart(char c) { return (c == '/'); } - /* (non-Javadoc) - * Method declared on IWordDetector - */ + @Override public boolean isWordPart(char c) { return (c == '*' || c == '/'); } @@ -67,16 +63,12 @@ public class JavaPartitionScanner extends RuleBasedPartitionScanner { addWord("/**/", fSuccessToken); //$NON-NLS-1$ } - /* - * @see org.eclipse.jface.text.rules.IPredicateRule#evaluate(ICharacterScanner, boolean) - */ + @Override public IToken evaluate(ICharacterScanner scanner, boolean resume) { return super.evaluate(scanner); } - /* - * @see org.eclipse.jface.text.rules.IPredicateRule#getSuccessToken() - */ + @Override public IToken getSuccessToken() { return fSuccessToken; } diff --git a/org.eclipse.ui.examples.javaeditor/Eclipse Java Editor Example/org/eclipse/ui/examples/javaeditor/JavaSourceViewerConfiguration.java b/org.eclipse.ui.examples.javaeditor/Eclipse Java Editor Example/org/eclipse/ui/examples/javaeditor/JavaSourceViewerConfiguration.java index 65c59103f87..a040e7d40b2 100644 --- a/org.eclipse.ui.examples.javaeditor/Eclipse Java Editor Example/org/eclipse/ui/examples/javaeditor/JavaSourceViewerConfiguration.java +++ b/org.eclipse.ui.examples.javaeditor/Eclipse Java Editor Example/org/eclipse/ui/examples/javaeditor/JavaSourceViewerConfiguration.java @@ -58,38 +58,28 @@ public class JavaSourceViewerConfiguration extends SourceViewerConfiguration { public JavaSourceViewerConfiguration() { } - /* (non-Javadoc) - * Method declared on SourceViewerConfiguration - */ + @Override public IAnnotationHover getAnnotationHover(ISourceViewer sourceViewer) { return new JavaAnnotationHover(); } - /* - * @see org.eclipse.jface.text.source.SourceViewerConfiguration#getAutoEditStrategies(org.eclipse.jface.text.source.ISourceViewer, java.lang.String) - */ + @Override public IAutoEditStrategy[] getAutoEditStrategies(ISourceViewer sourceViewer, String contentType) { IAutoEditStrategy strategy= (IDocument.DEFAULT_CONTENT_TYPE.equals(contentType) ? new JavaAutoIndentStrategy() : new DefaultIndentLineAutoEditStrategy()); return new IAutoEditStrategy[] { strategy }; } - /* - * @see org.eclipse.jface.text.source.SourceViewerConfiguration#getConfiguredDocumentPartitioning(org.eclipse.jface.text.source.ISourceViewer) - */ + @Override public String getConfiguredDocumentPartitioning(ISourceViewer sourceViewer) { return JavaEditorExamplePlugin.JAVA_PARTITIONING; } - /* (non-Javadoc) - * Method declared on SourceViewerConfiguration - */ + @Override public String[] getConfiguredContentTypes(ISourceViewer sourceViewer) { return new String[] { IDocument.DEFAULT_CONTENT_TYPE, JavaPartitionScanner.JAVA_DOC, JavaPartitionScanner.JAVA_MULTILINE_COMMENT }; } - /* (non-Javadoc) - * Method declared on SourceViewerConfiguration - */ + @Override public IContentAssistant getContentAssistant(ISourceViewer sourceViewer) { ContentAssistant assistant= new ContentAssistant(); @@ -106,23 +96,17 @@ public class JavaSourceViewerConfiguration extends SourceViewerConfiguration { return assistant; } - /* (non-Javadoc) - * Method declared on SourceViewerConfiguration - */ + @Override public ITextDoubleClickStrategy getDoubleClickStrategy(ISourceViewer sourceViewer, String contentType) { return new JavaDoubleClickSelector(); } - /* (non-Javadoc) - * Method declared on SourceViewerConfiguration - */ + @Override public String[] getIndentPrefixes(ISourceViewer sourceViewer, String contentType) { return new String[] { "\t", " " }; //$NON-NLS-1$ //$NON-NLS-2$ } - /* (non-Javadoc) - * Method declared on SourceViewerConfiguration - */ + @Override public IPresentationReconciler getPresentationReconciler(ISourceViewer sourceViewer) { JavaColorProvider provider= JavaEditorExamplePlugin.getDefault().getJavaColorProvider(); @@ -144,16 +128,12 @@ public class JavaSourceViewerConfiguration extends SourceViewerConfiguration { return reconciler; } - /* (non-Javadoc) - * Method declared on SourceViewerConfiguration - */ + @Override public int getTabWidth(ISourceViewer sourceViewer) { return 4; } - /* (non-Javadoc) - * Method declared on SourceViewerConfiguration - */ + @Override public ITextHover getTextHover(ISourceViewer sourceViewer, String contentType) { return new JavaTextHover(); } diff --git a/org.eclipse.ui.examples.javaeditor/Eclipse Java Editor Example/org/eclipse/ui/examples/javaeditor/JavaTextHover.java b/org.eclipse.ui.examples.javaeditor/Eclipse Java Editor Example/org/eclipse/ui/examples/javaeditor/JavaTextHover.java index 2af16fabfad..2c182798075 100644 --- a/org.eclipse.ui.examples.javaeditor/Eclipse Java Editor Example/org/eclipse/ui/examples/javaeditor/JavaTextHover.java +++ b/org.eclipse.ui.examples.javaeditor/Eclipse Java Editor Example/org/eclipse/ui/examples/javaeditor/JavaTextHover.java @@ -31,6 +31,8 @@ public class JavaTextHover implements ITextHover { * @deprecated As of 3.4, replaced by * {@link ITextHoverExtension2#getHoverInfo2(ITextViewer, IRegion)} */ + @Deprecated + @Override public String getHoverInfo(ITextViewer textViewer, IRegion hoverRegion) { if (hoverRegion != null) { try { @@ -42,9 +44,7 @@ public class JavaTextHover implements ITextHover { return JavaEditorMessages.getString("JavaTextHover.emptySelection"); //$NON-NLS-1$ } - /* (non-Javadoc) - * Method declared on ITextHover - */ + @Override public IRegion getHoverRegion(ITextViewer textViewer, int offset) { Point selection= textViewer.getSelectedRange(); if (selection.x <= offset && offset < selection.x + selection.y) diff --git a/org.eclipse.ui.examples.javaeditor/Eclipse Java Editor Example/org/eclipse/ui/examples/javaeditor/PresentationAction.java b/org.eclipse.ui.examples.javaeditor/Eclipse Java Editor Example/org/eclipse/ui/examples/javaeditor/PresentationAction.java index 92f38f60a06..f2d551ecb41 100644 --- a/org.eclipse.ui.examples.javaeditor/Eclipse Java Editor Example/org/eclipse/ui/examples/javaeditor/PresentationAction.java +++ b/org.eclipse.ui.examples.javaeditor/Eclipse Java Editor Example/org/eclipse/ui/examples/javaeditor/PresentationAction.java @@ -29,9 +29,7 @@ public class PresentationAction extends TextEditorAction { update(); } - /* (non-Javadoc) - * Method declared on IAction - */ + @Override public void run() { ITextEditor editor= getTextEditor(); @@ -42,9 +40,7 @@ public class PresentationAction extends TextEditorAction { editor.showHighlightRangeOnly(!show); } - /* (non-Javadoc) - * Method declared on TextEditorAction - */ + @Override public void update() { setChecked(getTextEditor() != null && getTextEditor().showsHighlightRangeOnly()); setEnabled(true); diff --git a/org.eclipse.ui.examples.javaeditor/Eclipse Java Editor Example/org/eclipse/ui/examples/javaeditor/java/JavaAutoIndentStrategy.java b/org.eclipse.ui.examples.javaeditor/Eclipse Java Editor Example/org/eclipse/ui/examples/javaeditor/java/JavaAutoIndentStrategy.java index 5f7b3926615..b078d06b2af 100644 --- a/org.eclipse.ui.examples.javaeditor/Eclipse Java Editor Example/org/eclipse/ui/examples/javaeditor/java/JavaAutoIndentStrategy.java +++ b/org.eclipse.ui.examples.javaeditor/Eclipse Java Editor Example/org/eclipse/ui/examples/javaeditor/java/JavaAutoIndentStrategy.java @@ -25,9 +25,7 @@ public class JavaAutoIndentStrategy extends DefaultIndentLineAutoEditStrategy { public JavaAutoIndentStrategy() { } - /* (non-Javadoc) - * Method declared on IAutoIndentStrategy - */ + @Override public void customizeDocumentCommand(IDocument d, DocumentCommand c) { if (c.length == 0 && c.text != null && endsWithDelimiter(d, c.text)) smartIndentAfterNewLine(d, c); diff --git a/org.eclipse.ui.examples.javaeditor/Eclipse Java Editor Example/org/eclipse/ui/examples/javaeditor/java/JavaCompletionProcessor.java b/org.eclipse.ui.examples.javaeditor/Eclipse Java Editor Example/org/eclipse/ui/examples/javaeditor/java/JavaCompletionProcessor.java index fea12638c2c..5a45d1cc6a1 100644 --- a/org.eclipse.ui.examples.javaeditor/Eclipse Java Editor Example/org/eclipse/ui/examples/javaeditor/java/JavaCompletionProcessor.java +++ b/org.eclipse.ui.examples.javaeditor/Eclipse Java Editor Example/org/eclipse/ui/examples/javaeditor/java/JavaCompletionProcessor.java @@ -36,23 +36,17 @@ public class JavaCompletionProcessor implements IContentAssistProcessor { protected int fInstallOffset; - /* - * @see IContextInformationValidator#isContextInformationValid(int) - */ + @Override public boolean isContextInformationValid(int offset) { return Math.abs(fInstallOffset - offset) < 5; } - /* - * @see IContextInformationValidator#install(IContextInformation, ITextViewer, int) - */ + @Override public void install(IContextInformation info, ITextViewer viewer, int offset) { fInstallOffset= offset; } - /* - * @see org.eclipse.jface.text.contentassist.IContextInformationPresenter#updatePresentation(int, TextPresentation) - */ + @Override public boolean updatePresentation(int documentPosition, TextPresentation presentation) { return false; } @@ -63,9 +57,7 @@ public class JavaCompletionProcessor implements IContentAssistProcessor { protected IContextInformationValidator fValidator= new Validator(); - /* (non-Javadoc) - * Method declared on IContentAssistProcessor - */ + @Override public ICompletionProposal[] computeCompletionProposals(ITextViewer viewer, int documentOffset) { ICompletionProposal[] result= new ICompletionProposal[fgProposals.length]; for (int i= 0; i < fgProposals.length; i++) { @@ -75,9 +67,7 @@ public class JavaCompletionProcessor implements IContentAssistProcessor { return result; } - /* (non-Javadoc) - * Method declared on IContentAssistProcessor - */ + @Override public IContextInformation[] computeContextInformation(ITextViewer viewer, int documentOffset) { IContextInformation[] result= new IContextInformation[5]; for (int i= 0; i < result.length; i++) @@ -87,30 +77,22 @@ public class JavaCompletionProcessor implements IContentAssistProcessor { return result; } - /* (non-Javadoc) - * Method declared on IContentAssistProcessor - */ + @Override public char[] getCompletionProposalAutoActivationCharacters() { return new char[] { '.', '(' }; } - /* (non-Javadoc) - * Method declared on IContentAssistProcessor - */ + @Override public char[] getContextInformationAutoActivationCharacters() { return new char[] { '#' }; } - /* (non-Javadoc) - * Method declared on IContentAssistProcessor - */ + @Override public IContextInformationValidator getContextInformationValidator() { return fValidator; } - /* (non-Javadoc) - * Method declared on IContentAssistProcessor - */ + @Override public String getErrorMessage() { return null; } diff --git a/org.eclipse.ui.examples.javaeditor/Eclipse Java Editor Example/org/eclipse/ui/examples/javaeditor/java/JavaDoubleClickSelector.java b/org.eclipse.ui.examples.javaeditor/Eclipse Java Editor Example/org/eclipse/ui/examples/javaeditor/java/JavaDoubleClickSelector.java index bbd59f8de37..377024bfe2a 100644 --- a/org.eclipse.ui.examples.javaeditor/Eclipse Java Editor Example/org/eclipse/ui/examples/javaeditor/java/JavaDoubleClickSelector.java +++ b/org.eclipse.ui.examples.javaeditor/Eclipse Java Editor Example/org/eclipse/ui/examples/javaeditor/java/JavaDoubleClickSelector.java @@ -35,9 +35,7 @@ public class JavaDoubleClickSelector implements ITextDoubleClickStrategy { super(); } - /* (non-Javadoc) - * Method declared on ITextDoubleClickStrategy - */ + @Override public void doubleClicked(ITextViewer text) { fPos= text.getSelectedRange().x; diff --git a/org.eclipse.ui.examples.javaeditor/Eclipse Java Editor Example/org/eclipse/ui/examples/javaeditor/javadoc/JavaDocCompletionProcessor.java b/org.eclipse.ui.examples.javaeditor/Eclipse Java Editor Example/org/eclipse/ui/examples/javaeditor/javadoc/JavaDocCompletionProcessor.java index c8b5bc7e23d..be2081d4e14 100644 --- a/org.eclipse.ui.examples.javaeditor/Eclipse Java Editor Example/org/eclipse/ui/examples/javaeditor/javadoc/JavaDocCompletionProcessor.java +++ b/org.eclipse.ui.examples.javaeditor/Eclipse Java Editor Example/org/eclipse/ui/examples/javaeditor/javadoc/JavaDocCompletionProcessor.java @@ -25,9 +25,7 @@ public class JavaDocCompletionProcessor implements IContentAssistProcessor { protected final static String[] fgProposals= { "@author", "@deprecated", "@exception", "@param", "@return", "@see", "@serial", "@serialData", "@serialField", "@since", "@throws", "@version" }; //$NON-NLS-12$ //$NON-NLS-11$ //$NON-NLS-10$ //$NON-NLS-7$ //$NON-NLS-9$ //$NON-NLS-8$ //$NON-NLS-6$ //$NON-NLS-5$ //$NON-NLS-4$ //$NON-NLS-3$ //$NON-NLS-2$ //$NON-NLS-1$ - /* (non-Javadoc) - * Method declared on IContentAssistProcessor - */ + @Override public ICompletionProposal[] computeCompletionProposals(ITextViewer viewer, int documentOffset) { ICompletionProposal[] result= new ICompletionProposal[fgProposals.length]; for (int i= 0; i < fgProposals.length; i++) @@ -35,37 +33,27 @@ public class JavaDocCompletionProcessor implements IContentAssistProcessor { return result; } - /* (non-Javadoc) - * Method declared on IContentAssistProcessor - */ + @Override public IContextInformation[] computeContextInformation(ITextViewer viewer, int documentOffset) { return null; } - /* (non-Javadoc) - * Method declared on IContentAssistProcessor - */ + @Override public char[] getCompletionProposalAutoActivationCharacters() { return null; } - /* (non-Javadoc) - * Method declared on IContentAssistProcessor - */ + @Override public char[] getContextInformationAutoActivationCharacters() { return null; } - /* (non-Javadoc) - * Method declared on IContentAssistProcessor - */ + @Override public IContextInformationValidator getContextInformationValidator() { return null; } - /* (non-Javadoc) - * Method declared on IContentAssistProcessor - */ + @Override public String getErrorMessage() { return null; } diff --git a/org.eclipse.ui.examples.javaeditor/Eclipse Java Editor Example/org/eclipse/ui/examples/javaeditor/javadoc/JavaDocScanner.java b/org.eclipse.ui.examples.javaeditor/Eclipse Java Editor Example/org/eclipse/ui/examples/javaeditor/javadoc/JavaDocScanner.java index fe479545459..85e6af4b351 100644 --- a/org.eclipse.ui.examples.javaeditor/Eclipse Java Editor Example/org/eclipse/ui/examples/javaeditor/javadoc/JavaDocScanner.java +++ b/org.eclipse.ui.examples.javaeditor/Eclipse Java Editor Example/org/eclipse/ui/examples/javaeditor/javadoc/JavaDocScanner.java @@ -37,16 +37,12 @@ public class JavaDocScanner extends RuleBasedScanner { */ static class JavaDocWordDetector implements IWordDetector { - /* (non-Javadoc) - * Method declared on IWordDetector - */ + @Override public boolean isWordStart(char c) { return (c == '@'); } - /* (non-Javadoc) - * Method declared on IWordDetector - */ + @Override public boolean isWordPart(char c) { return Character.isLetter(c); } diff --git a/org.eclipse.ui.examples.javaeditor/Eclipse Java Editor Example/org/eclipse/ui/examples/javaeditor/util/JavaWhitespaceDetector.java b/org.eclipse.ui.examples.javaeditor/Eclipse Java Editor Example/org/eclipse/ui/examples/javaeditor/util/JavaWhitespaceDetector.java index fa41e7979c6..a3aac716251 100644 --- a/org.eclipse.ui.examples.javaeditor/Eclipse Java Editor Example/org/eclipse/ui/examples/javaeditor/util/JavaWhitespaceDetector.java +++ b/org.eclipse.ui.examples.javaeditor/Eclipse Java Editor Example/org/eclipse/ui/examples/javaeditor/util/JavaWhitespaceDetector.java @@ -18,9 +18,7 @@ import org.eclipse.jface.text.rules.IWhitespaceDetector; */ public class JavaWhitespaceDetector implements IWhitespaceDetector { - /* (non-Javadoc) - * Method declared on IWhitespaceDetector - */ + @Override public boolean isWhitespace(char character) { return Character.isWhitespace(character); } diff --git a/org.eclipse.ui.examples.javaeditor/Eclipse Java Editor Example/org/eclipse/ui/examples/javaeditor/util/JavaWordDetector.java b/org.eclipse.ui.examples.javaeditor/Eclipse Java Editor Example/org/eclipse/ui/examples/javaeditor/util/JavaWordDetector.java index 8357964a808..4edf67baf13 100644 --- a/org.eclipse.ui.examples.javaeditor/Eclipse Java Editor Example/org/eclipse/ui/examples/javaeditor/util/JavaWordDetector.java +++ b/org.eclipse.ui.examples.javaeditor/Eclipse Java Editor Example/org/eclipse/ui/examples/javaeditor/util/JavaWordDetector.java @@ -18,16 +18,12 @@ import org.eclipse.jface.text.rules.IWordDetector; */ public class JavaWordDetector implements IWordDetector { - /* (non-Javadoc) - * Method declared on IWordDetector. - */ + @Override public boolean isWordPart(char character) { return Character.isJavaIdentifierPart(character); } - /* (non-Javadoc) - * Method declared on IWordDetector. - */ + @Override public boolean isWordStart(char character) { return Character.isJavaIdentifierStart(character); } diff --git a/org.eclipse.ui.examples.javaeditor/Template Editor Example/org/eclipse/ui/examples/templateeditor/editors/NonRuleBasedDamagerRepairer.java b/org.eclipse.ui.examples.javaeditor/Template Editor Example/org/eclipse/ui/examples/templateeditor/editors/NonRuleBasedDamagerRepairer.java index 8e747b3c001..61d5f60695a 100644 --- a/org.eclipse.ui.examples.javaeditor/Template Editor Example/org/eclipse/ui/examples/templateeditor/editors/NonRuleBasedDamagerRepairer.java +++ b/org.eclipse.ui.examples.javaeditor/Template Editor Example/org/eclipse/ui/examples/templateeditor/editors/NonRuleBasedDamagerRepairer.java @@ -42,9 +42,7 @@ public class NonRuleBasedDamagerRepairer implements IPresentationDamager, IPrese fDefaultTextAttribute= defaultTextAttribute; } - /* - * @see org.eclipse.jface.text.presentation.IPresentationRepairer#setDocument(org.eclipse.jface.text.IDocument) - */ + @Override public void setDocument(IDocument document) { fDocument= document; } @@ -73,9 +71,7 @@ public class NonRuleBasedDamagerRepairer implements IPresentationDamager, IPrese } } - /* - * @see org.eclipse.jface.text.presentation.IPresentationDamager#getDamageRegion(org.eclipse.jface.text.ITypedRegion, org.eclipse.jface.text.DocumentEvent, boolean) - */ + @Override public IRegion getDamageRegion(ITypedRegion partition, DocumentEvent event, boolean documentPartitioningChanged) { if (!documentPartitioningChanged) { try { @@ -100,9 +96,7 @@ public class NonRuleBasedDamagerRepairer implements IPresentationDamager, IPrese return partition; } - /* - * @see org.eclipse.jface.text.presentation.IPresentationRepairer#createPresentation(org.eclipse.jface.text.TextPresentation, org.eclipse.jface.text.ITypedRegion) - */ + @Override public void createPresentation(TextPresentation presentation, ITypedRegion region) { addRange(presentation, region.getOffset(), region.getLength(), fDefaultTextAttribute); } diff --git a/org.eclipse.ui.examples.javaeditor/Template Editor Example/org/eclipse/ui/examples/templateeditor/editors/TagRule.java b/org.eclipse.ui.examples.javaeditor/Template Editor Example/org/eclipse/ui/examples/templateeditor/editors/TagRule.java index c99705e002a..7df6475a8f2 100644 --- a/org.eclipse.ui.examples.javaeditor/Template Editor Example/org/eclipse/ui/examples/templateeditor/editors/TagRule.java +++ b/org.eclipse.ui.examples.javaeditor/Template Editor Example/org/eclipse/ui/examples/templateeditor/editors/TagRule.java @@ -19,6 +19,7 @@ public class TagRule extends MultiLineRule { public TagRule(IToken token) { super("<", ">", token); //$NON-NLS-1$//$NON-NLS-2$ } + @Override protected boolean sequenceDetected( ICharacterScanner scanner, char[] sequence, diff --git a/org.eclipse.ui.examples.javaeditor/Template Editor Example/org/eclipse/ui/examples/templateeditor/editors/TemplateEditor.java b/org.eclipse.ui.examples.javaeditor/Template Editor Example/org/eclipse/ui/examples/templateeditor/editors/TemplateEditor.java index 48ea1bf77cc..353b647a807 100644 --- a/org.eclipse.ui.examples.javaeditor/Template Editor Example/org/eclipse/ui/examples/templateeditor/editors/TemplateEditor.java +++ b/org.eclipse.ui.examples.javaeditor/Template Editor Example/org/eclipse/ui/examples/templateeditor/editors/TemplateEditor.java @@ -32,11 +32,13 @@ public class TemplateEditor extends AbstractDecoratedTextEditor { setDocumentProvider(new XMLDocumentProvider()); } + @Override public void dispose() { colorManager.dispose(); super.dispose(); } + @Override protected void createActions() { super.createActions(); diff --git a/org.eclipse.ui.examples.javaeditor/Template Editor Example/org/eclipse/ui/examples/templateeditor/editors/XMLConfiguration.java b/org.eclipse.ui.examples.javaeditor/Template Editor Example/org/eclipse/ui/examples/templateeditor/editors/XMLConfiguration.java index e22cc73979a..c75f5bc5eb3 100644 --- a/org.eclipse.ui.examples.javaeditor/Template Editor Example/org/eclipse/ui/examples/templateeditor/editors/XMLConfiguration.java +++ b/org.eclipse.ui.examples.javaeditor/Template Editor Example/org/eclipse/ui/examples/templateeditor/editors/XMLConfiguration.java @@ -37,11 +37,13 @@ public class XMLConfiguration extends TextSourceViewerConfiguration { this.colorManager= colorManager; } + @Override public String[] getConfiguredContentTypes(ISourceViewer sourceViewer) { return new String[]{IDocument.DEFAULT_CONTENT_TYPE, XMLPartitionScanner.XML_COMMENT, XMLPartitionScanner.XML_TAG}; } + @Override public ITextDoubleClickStrategy getDoubleClickStrategy(ISourceViewer sourceViewer, String contentType) { if (doubleClickStrategy == null) doubleClickStrategy= new XMLDoubleClickStrategy(); @@ -66,6 +68,7 @@ public class XMLConfiguration extends TextSourceViewerConfiguration { return tagScanner; } + @Override public IPresentationReconciler getPresentationReconciler(ISourceViewer sourceViewer) { PresentationReconciler reconciler= new PresentationReconciler(); @@ -85,6 +88,7 @@ public class XMLConfiguration extends TextSourceViewerConfiguration { return reconciler; } + @Override public IContentAssistant getContentAssistant(ISourceViewer sourceViewer) { ContentAssistant assistant= new ContentAssistant(); assistant.setDocumentPartitioning(getConfiguredDocumentPartitioning(sourceViewer)); diff --git a/org.eclipse.ui.examples.javaeditor/Template Editor Example/org/eclipse/ui/examples/templateeditor/editors/XMLDocumentProvider.java b/org.eclipse.ui.examples.javaeditor/Template Editor Example/org/eclipse/ui/examples/templateeditor/editors/XMLDocumentProvider.java index ac1068f373e..b6a1f60b36f 100644 --- a/org.eclipse.ui.examples.javaeditor/Template Editor Example/org/eclipse/ui/examples/templateeditor/editors/XMLDocumentProvider.java +++ b/org.eclipse.ui.examples.javaeditor/Template Editor Example/org/eclipse/ui/examples/templateeditor/editors/XMLDocumentProvider.java @@ -20,6 +20,7 @@ import org.eclipse.ui.editors.text.FileDocumentProvider; public class XMLDocumentProvider extends FileDocumentProvider { + @Override protected IDocument createDocument(Object element) throws CoreException { IDocument document = super.createDocument(element); if (document != null) { diff --git a/org.eclipse.ui.examples.javaeditor/Template Editor Example/org/eclipse/ui/examples/templateeditor/editors/XMLDoubleClickStrategy.java b/org.eclipse.ui.examples.javaeditor/Template Editor Example/org/eclipse/ui/examples/templateeditor/editors/XMLDoubleClickStrategy.java index 66f623d3d87..4d44971be0b 100644 --- a/org.eclipse.ui.examples.javaeditor/Template Editor Example/org/eclipse/ui/examples/templateeditor/editors/XMLDoubleClickStrategy.java +++ b/org.eclipse.ui.examples.javaeditor/Template Editor Example/org/eclipse/ui/examples/templateeditor/editors/XMLDoubleClickStrategy.java @@ -18,6 +18,7 @@ import org.eclipse.jface.text.ITextViewer; public class XMLDoubleClickStrategy implements ITextDoubleClickStrategy { protected ITextViewer fText; + @Override public void doubleClicked(ITextViewer part) { int pos = part.getSelectedRange().x; diff --git a/org.eclipse.ui.examples.javaeditor/Template Editor Example/org/eclipse/ui/examples/templateeditor/editors/XMLWhitespaceDetector.java b/org.eclipse.ui.examples.javaeditor/Template Editor Example/org/eclipse/ui/examples/templateeditor/editors/XMLWhitespaceDetector.java index aa9483db6d7..83cc855fa93 100644 --- a/org.eclipse.ui.examples.javaeditor/Template Editor Example/org/eclipse/ui/examples/templateeditor/editors/XMLWhitespaceDetector.java +++ b/org.eclipse.ui.examples.javaeditor/Template Editor Example/org/eclipse/ui/examples/templateeditor/editors/XMLWhitespaceDetector.java @@ -14,6 +14,7 @@ import org.eclipse.jface.text.rules.IWhitespaceDetector; public class XMLWhitespaceDetector implements IWhitespaceDetector { + @Override public boolean isWhitespace(char c) { return (c == ' ' || c == '\t' || c == '\n' || c == '\r'); } diff --git a/org.eclipse.ui.examples.javaeditor/Template Editor Example/org/eclipse/ui/examples/templateeditor/preferences/TemplatesPreferencePage.java b/org.eclipse.ui.examples.javaeditor/Template Editor Example/org/eclipse/ui/examples/templateeditor/preferences/TemplatesPreferencePage.java index 6bb6260035b..aaeb852e97a 100644 --- a/org.eclipse.ui.examples.javaeditor/Template Editor Example/org/eclipse/ui/examples/templateeditor/preferences/TemplatesPreferencePage.java +++ b/org.eclipse.ui.examples.javaeditor/Template Editor Example/org/eclipse/ui/examples/templateeditor/preferences/TemplatesPreferencePage.java @@ -26,11 +26,13 @@ public class TemplatesPreferencePage extends TemplatePreferencePage { setContextTypeRegistry(TemplateEditorUI.getDefault().getContextTypeRegistry()); } + @Override protected boolean isShowFormatterSetting() { return false; } + @Override public boolean performOk() { boolean ok= super.performOk(); diff --git a/org.eclipse.ui.examples.javaeditor/Template Editor Example/org/eclipse/ui/examples/templateeditor/template/AntVariableResolver.java b/org.eclipse.ui.examples.javaeditor/Template Editor Example/org/eclipse/ui/examples/templateeditor/template/AntVariableResolver.java index 401feea921e..f94551325e7 100644 --- a/org.eclipse.ui.examples.javaeditor/Template Editor Example/org/eclipse/ui/examples/templateeditor/template/AntVariableResolver.java +++ b/org.eclipse.ui.examples.javaeditor/Template Editor Example/org/eclipse/ui/examples/templateeditor/template/AntVariableResolver.java @@ -21,14 +21,13 @@ import org.eclipse.jface.text.templates.TemplateVariableResolver; * their prefix-likeness with the variable type. */ public class AntVariableResolver extends TemplateVariableResolver { - /* - * @see org.eclipse.jface.text.templates.TemplateVariableResolver#resolveAll(org.eclipse.jface.text.templates.TemplateContext) - */ + @Override protected String[] resolveAll(TemplateContext context) { String[] proposals= new String[] { "${srcDir}", "${dstDir}" }; //$NON-NLS-1$ //$NON-NLS-2$ Arrays.sort(proposals, new Comparator() { + @Override public int compare(Object o1, Object o2) { return getCommonPrefixLength(getType(), (String) o2) - getCommonPrefixLength(getType(), (String) o1); } diff --git a/org.eclipse.ui.examples.javaeditor/Template Editor Example/org/eclipse/ui/examples/templateeditor/template/XMLCompletionProcessor.java b/org.eclipse.ui.examples.javaeditor/Template Editor Example/org/eclipse/ui/examples/templateeditor/template/XMLCompletionProcessor.java index 6998a026343..481870b9a67 100644 --- a/org.eclipse.ui.examples.javaeditor/Template Editor Example/org/eclipse/ui/examples/templateeditor/template/XMLCompletionProcessor.java +++ b/org.eclipse.ui.examples.javaeditor/Template Editor Example/org/eclipse/ui/examples/templateeditor/template/XMLCompletionProcessor.java @@ -40,6 +40,7 @@ public class XMLCompletionProcessor extends TemplateCompletionProcessor { * @param offset the offset left of which the prefix is detected * @return the detected prefix */ + @Override protected String extractPrefix(ITextViewer viewer, int offset) { IDocument document= viewer.getDocument(); int i= offset; @@ -67,6 +68,7 @@ public class XMLCompletionProcessor extends TemplateCompletionProcessor { * @param prefix the prefix * @return the relevance of the <code>template</code> for the given <code>prefix</code> */ + @Override protected int getRelevance(Template template, String prefix) { if (prefix.startsWith("<")) //$NON-NLS-1$ prefix= prefix.substring(1); @@ -81,6 +83,7 @@ public class XMLCompletionProcessor extends TemplateCompletionProcessor { * @param contextTypeId the context type, ignored in this implementation * @return all templates */ + @Override protected Template[] getTemplates(String contextTypeId) { return TemplateEditorUI.getDefault().getTemplateStore().getTemplates(); } @@ -92,6 +95,7 @@ public class XMLCompletionProcessor extends TemplateCompletionProcessor { * @param region the region, ignored in this implementation * @return the supported XML context type */ + @Override protected TemplateContextType getContextType(ITextViewer viewer, IRegion region) { return TemplateEditorUI.getDefault().getContextTypeRegistry().getContextType(XMLContextType.XML_CONTEXT_TYPE); } @@ -102,6 +106,7 @@ public class XMLCompletionProcessor extends TemplateCompletionProcessor { * @param template the template, ignored in this implementation * @return the default template image */ + @Override protected Image getImage(Template template) { ImageRegistry registry= TemplateEditorUI.getDefault().getImageRegistry(); Image image= registry.get(DEFAULT_IMAGE); diff --git a/org.eclipse.ui.workbench.texteditor.tests/src/org/eclipse/ui/workbench/texteditor/tests/FindReplaceDialogTest.java b/org.eclipse.ui.workbench.texteditor.tests/src/org/eclipse/ui/workbench/texteditor/tests/FindReplaceDialogTest.java index 9c971d226a1..92008e3be0c 100644 --- a/org.eclipse.ui.workbench.texteditor.tests/src/org/eclipse/ui/workbench/texteditor/tests/FindReplaceDialogTest.java +++ b/org.eclipse.ui.workbench.texteditor.tests/src/org/eclipse/ui/workbench/texteditor/tests/FindReplaceDialogTest.java @@ -88,6 +88,7 @@ public class FindReplaceDialogTest extends TestCase { fFindReplaceDialog= new Accessor(fFindReplaceDialogStubAccessor.invoke("getDialog", null), "org.eclipse.ui.texteditor.FindReplaceDialog", getClass().getClassLoader()); } + @Override protected void tearDown() throws Exception { if (fFindReplaceDialog != null) { fFindReplaceDialog.invoke("close", null); diff --git a/org.eclipse.ui.workbench.texteditor.tests/src/org/eclipse/ui/workbench/texteditor/tests/HippieCompletionTest.java b/org.eclipse.ui.workbench.texteditor.tests/src/org/eclipse/ui/workbench/texteditor/tests/HippieCompletionTest.java index 54df7908187..3d335947217 100644 --- a/org.eclipse.ui.workbench.texteditor.tests/src/org/eclipse/ui/workbench/texteditor/tests/HippieCompletionTest.java +++ b/org.eclipse.ui.workbench.texteditor.tests/src/org/eclipse/ui/workbench/texteditor/tests/HippieCompletionTest.java @@ -45,9 +45,7 @@ public class HippieCompletionTest extends TestCase { super(name); } - /* - * @see junit.framework.TestCase#setUp() - */ + @Override protected void setUp() throws Exception { documents= new IDocument[5]; documents[0]= new Document("package ui.TestPackage;\n" + diff --git a/org.eclipse.ui.workbench.texteditor.tests/src/org/eclipse/ui/workbench/texteditor/tests/revisions/ChangeRegionTest.java b/org.eclipse.ui.workbench.texteditor.tests/src/org/eclipse/ui/workbench/texteditor/tests/revisions/ChangeRegionTest.java index 98e30ad6e37..1ddac364e80 100644 --- a/org.eclipse.ui.workbench.texteditor.tests/src/org/eclipse/ui/workbench/texteditor/tests/revisions/ChangeRegionTest.java +++ b/org.eclipse.ui.workbench.texteditor.tests/src/org/eclipse/ui/workbench/texteditor/tests/revisions/ChangeRegionTest.java @@ -36,18 +36,22 @@ public class ChangeRegionTest extends TestCase { } public static final class TestRevision extends Revision { + @Override public Object getHoverInfo() { return null; } + @Override public RGB getColor() { return null; } + @Override public String getId() { return null; } + @Override public Date getDate() { return null; } @@ -55,9 +59,7 @@ public class ChangeRegionTest extends TestCase { private Revision fRevision; - /* - * @see junit.framework.TestCase#setUp() - */ + @Override protected void setUp() throws Exception { fRevision= new TestRevision(); } diff --git a/org.eclipse.ui.workbench.texteditor.tests/src/org/eclipse/ui/workbench/texteditor/tests/revisions/HunkComputerTest.java b/org.eclipse.ui.workbench.texteditor.tests/src/org/eclipse/ui/workbench/texteditor/tests/revisions/HunkComputerTest.java index be9657498c2..3b4773ec281 100644 --- a/org.eclipse.ui.workbench.texteditor.tests/src/org/eclipse/ui/workbench/texteditor/tests/revisions/HunkComputerTest.java +++ b/org.eclipse.ui.workbench.texteditor.tests/src/org/eclipse/ui/workbench/texteditor/tests/revisions/HunkComputerTest.java @@ -38,45 +38,55 @@ public class HunkComputerTest extends TestCase { private int[] fDiffInformation; private ILineDiffer fDiffer= new ILineDiffer() { + @Override public ILineDiffInfo getLineInfo(final int line) { return new ILineDiffInfo() { + @Override public int getChangeType() { return fDiffInformation[line * 2]; } + @Override public String[] getOriginalText() { throw new UnsupportedOperationException(); } + @Override public int getRemovedLinesAbove() { return fDiffInformation[line * 2 + 1]; } + @Override public int getRemovedLinesBelow() { if (fRemovedBelow == null) return 0; return fRemovedBelow[line]; } + @Override public boolean hasChanges() { throw new UnsupportedOperationException(); } }; } + @Override public int restoreAfterLine(int line) throws BadLocationException { throw new UnsupportedOperationException(); } + @Override public void revertBlock(int line) throws BadLocationException { throw new UnsupportedOperationException(); } + @Override public void revertLine(int line) throws BadLocationException { throw new UnsupportedOperationException(); } + @Override public void revertSelection(int line, int nLines) throws BadLocationException { throw new UnsupportedOperationException(); } diff --git a/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/contentassist/ContentAssistHandler.java b/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/contentassist/ContentAssistHandler.java index 31f105cf38c..12a0321c876 100644 --- a/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/contentassist/ContentAssistHandler.java +++ b/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/contentassist/ContentAssistHandler.java @@ -48,6 +48,7 @@ import org.eclipse.ui.texteditor.ITextEditorActionDefinitionIds; * @since 3.0 * @deprecated As of 3.2, replaced by JFace field assist support */ +@Deprecated public class ContentAssistHandler { /** * The target control. @@ -113,6 +114,7 @@ public class ContentAssistHandler { fContentAssistSubjectAdapter= subjectAdapter; setEnabled(true); fControl.addDisposeListener(new DisposeListener() { + @Override public void widgetDisposed(DisposeEvent e) { setEnabled(false); } @@ -175,9 +177,7 @@ public class ContentAssistHandler { */ private void installCueLabelProvider() { ILabelProvider labelProvider= new LabelProvider() { - /* - * @see org.eclipse.jface.viewers.ILabelProvider#getText(java.lang.Object) - */ + @Override public String getText(Object element) { IBindingService bindingService= (IBindingService) PlatformUI.getWorkbench().getAdapter(IBindingService.class); TriggerSequence[] activeBindings= bindingService.getActiveBindingsFor(ITextEditorActionDefinitionIds.CONTENT_ASSIST_PROPOSALS); @@ -194,10 +194,12 @@ public class ContentAssistHandler { */ private void installFocusListener() { fFocusListener= new FocusListener() { + @Override public void focusGained(final FocusEvent e) { if (fHandlerActivation == null) activateHandler(); } + @Override public void focusLost(FocusEvent e) { if (fHandlerActivation != null) deactivateHandler(); @@ -215,6 +217,7 @@ public class ContentAssistHandler { return; IHandler handler= new AbstractHandler() { + @Override public Object execute(ExecutionEvent event) throws ExecutionException { if (ContentAssistHandler.this.isEnabled()) // don't call AbstractHandler#isEnabled()! fContentAssistant.showPossibleCompletions(); diff --git a/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/internal/texteditor/CompoundEditExitStrategy.java b/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/internal/texteditor/CompoundEditExitStrategy.java index 7cb752c989a..cccac3fa5d7 100644 --- a/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/internal/texteditor/CompoundEditExitStrategy.java +++ b/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/internal/texteditor/CompoundEditExitStrategy.java @@ -58,43 +58,40 @@ public final class CompoundEditExitStrategy { */ private final class EventListener implements MouseListener, FocusListener, VerifyKeyListener, IExecutionListener { - /* - * @see org.eclipse.swt.events.MouseListener#mouseDoubleClick(org.eclipse.swt.events.MouseEvent) - */ + @Override public void mouseDoubleClick(MouseEvent e) { // mouse actions end the compound change fireEndCompoundEdit(); } - /* - * @see org.eclipse.swt.events.MouseListener#mouseDown(org.eclipse.swt.events.MouseEvent) - */ + @Override public void mouseDown(MouseEvent e) { // mouse actions end the compound change fireEndCompoundEdit(); } + @Override public void mouseUp(MouseEvent e) {} + @Override public void focusGained(FocusEvent e) {} - /* - * @see org.eclipse.swt.events.FocusListener#focusLost(org.eclipse.swt.events.FocusEvent) - */ + @Override public void focusLost(FocusEvent e) { // losing focus ends the change fireEndCompoundEdit(); } + @Override public void notHandled(String commandId, NotHandledException exception) {} + @Override public void postExecuteFailure(String commandId, ExecutionException exception) {} + @Override public void postExecuteSuccess(String commandId, Object returnValue) {} - /* - * @see org.eclipse.core.commands.IExecutionListener#preExecute(java.lang.String, org.eclipse.core.commands.ExecutionEvent) - */ + @Override public void preExecute(String commandId, ExecutionEvent event) { // any command other than the known ones end the compound change for (int i= 0; i < fCommandIds.length; i++) { @@ -104,9 +101,7 @@ public final class CompoundEditExitStrategy { fireEndCompoundEdit(); } - /* - * @see org.eclipse.swt.custom.VerifyKeyListener#verifyKey(org.eclipse.swt.events.VerifyEvent) - */ + @Override public void verifyKey(VerifyEvent event) { // any key press that is not a modifier combo ends the compound change final int maskWithoutShift= SWT.MODIFIER_MASK & ~SWT.SHIFT; diff --git a/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/internal/texteditor/FocusedInformationPresenter.java b/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/internal/texteditor/FocusedInformationPresenter.java index 83e49b76103..a0675a1e18c 100644 --- a/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/internal/texteditor/FocusedInformationPresenter.java +++ b/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/internal/texteditor/FocusedInformationPresenter.java @@ -53,9 +53,7 @@ public class FocusedInformationPresenter extends InformationPresenter { fHoverInfo= hoverInfo; fControlCreator= controlCreator; } - /* - * @see org.eclipse.jface.text.information.IInformationProvider#getSubject(org.eclipse.jface.text.ITextViewer, int) - */ + @Override public IRegion getSubject(ITextViewer textViewer, int invocationOffset) { return fHoverRegion; } @@ -64,19 +62,16 @@ public class FocusedInformationPresenter extends InformationPresenter { * * @deprecated As of 2.1, replaced by {@link IInformationProviderExtension#getInformation2(ITextViewer, IRegion)} */ + @Deprecated + @Override public String getInformation(ITextViewer textViewer, IRegion subject) { return fHoverInfo == null ? null : fHoverInfo.toString(); } - /* - * @see org.eclipse.jface.text.information.IInformationProviderExtension#getInformation2(org.eclipse.jface.text.ITextViewer, org.eclipse.jface.text.IRegion) - * @since 3.2 - */ + @Override public Object getInformation2(ITextViewer textViewer, IRegion subject) { return fHoverInfo; } - /* - * @see org.eclipse.jface.text.information.IInformationProviderExtension2#getInformationPresenterControlCreator() - */ + @Override public IInformationControlCreator getInformationPresenterControlCreator() { return fControlCreator; } @@ -86,6 +81,7 @@ public class FocusedInformationPresenter extends InformationPresenter { * The default information control creator. */ private static class DefaultInformationControlCreator implements IInformationControlCreator { + @Override public IInformationControl createInformationControl(Shell shell) { return new DefaultInformationControl(shell, true); } diff --git a/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/internal/texteditor/HippieCompletionEngine.java b/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/internal/texteditor/HippieCompletionEngine.java index a90d320b40b..aa3552d62f7 100644 --- a/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/internal/texteditor/HippieCompletionEngine.java +++ b/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/internal/texteditor/HippieCompletionEngine.java @@ -385,10 +385,6 @@ public final class HippieCompletionEngine { /** The 'current' backward iterator. */ private Iterator fCompletionsBackwardIterator; - /* - * (non-Javadoc) - * @see HippieCompletionEngine#getMultipleDocumentsIterator(IDocument, List, CharSequence, int) - */ private MultipleDocumentsIterator(IDocument openDocument, List otherDocuments, CharSequence prefix, int selectionOffset) { this.fPrefix= prefix; @@ -476,6 +472,7 @@ public final class HippieCompletionEngine { * @return <code>true</code> if the next token to be returned is not null (we always * pre-calculate things) */ + @Override public boolean hasNext() { return fNext != null; } @@ -484,6 +481,7 @@ public final class HippieCompletionEngine { /** * @return the next suggestion */ + @Override public Object next() { if (fNext == null) { throw new NoSuchElementException("No more elements to iterate"); //$NON-NLS-1$ @@ -498,6 +496,7 @@ public final class HippieCompletionEngine { * * @throws UnsupportedOperationException always. */ + @Override public void remove() { throw new UnsupportedOperationException("Not supported"); //$NON-NLS-1$ @@ -573,18 +572,12 @@ public final class HippieCompletionEngine { } } - /* - * (non-Javadoc) - * @see java.util.Iterator#hasNext() - */ + @Override public boolean hasNext() { return fHasNext; } - /* - * (non-Javadoc) - * @see java.util.Iterator#next() - */ + @Override public Object next() { if (!fHasNext) { throw new NoSuchElementException(); @@ -600,10 +593,7 @@ public final class HippieCompletionEngine { return ret; } - /* - * (non-Javadoc) - * @see java.util.Iterator#remove() - */ + @Override public void remove() { throw new UnsupportedOperationException(); } @@ -639,20 +629,13 @@ public final class HippieCompletionEngine { private String fCurrentWordCompletion= null; - /* - * (non-Javadoc) - * @see HippieCompletionEngine#getForwardIterator(IDocument, CharSequence, int, boolean) - */ private HippieCompletionForwardIterator(IDocument document, CharSequence prefix, int firstPosition, boolean currentWordLast) { super(document, prefix, firstPosition); this.fCurrentWordLast= currentWordLast; calculateFirst(); } - /* - * (non-Javadoc) - * @see HippieCompletionIterator#calculateNext() - */ + @Override protected void calculateNext() throws BadLocationException { if (fCurrentState == 0) { if (fFirstPosition == fDocument.getLength()) { @@ -755,19 +738,12 @@ public final class HippieCompletionEngine { /** Last position searched **/ private int fLastSearchPos= -1; - /* - * (non-Javadoc) - * @see HippieCompletionEngine#getBackwardIterator(IDocument, CharSequence, int) - */ private HippieCompletionBackwardIterator(IDocument document, CharSequence prefix, int firstPosition) { super(document, prefix, firstPosition); calculateFirst(); } - /* - * (non-Javadoc) - * @see HippieCompletionIterator#calculateNext() - */ + @Override protected void calculateNext() throws BadLocationException { if (fCurrentState == 0) { fCurrentState= 1; diff --git a/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/internal/texteditor/TextEditorPlugin.java b/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/internal/texteditor/TextEditorPlugin.java index f53a41ecae6..3b5f632d590 100644 --- a/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/internal/texteditor/TextEditorPlugin.java +++ b/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/internal/texteditor/TextEditorPlugin.java @@ -145,10 +145,7 @@ public final class TextEditorPlugin extends AbstractUIPlugin implements IRegistr } - /* - * @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext) - * @since 3.0 - */ + @Override public void start(BundleContext context) throws Exception { super.start(context); fQuickDiffExtensionRegistry= new QuickDiffExtensionsRegistry(); @@ -156,10 +153,7 @@ public final class TextEditorPlugin extends AbstractUIPlugin implements IRegistr Platform.getExtensionRegistry().addRegistryChangeListener(this, PLUGIN_ID); } - /* - * @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext) - * @since 3.0 - */ + @Override public void stop(BundleContext context) throws Exception { Platform.getExtensionRegistry().removeRegistryChangeListener(this); fQuickDiffExtensionRegistry= null; @@ -167,10 +161,7 @@ public final class TextEditorPlugin extends AbstractUIPlugin implements IRegistr super.stop(context); } - /* - * @see org.eclipse.core.runtime.IRegistryChangeListener#registryChanged(org.eclipse.core.runtime.IRegistryChangeEvent) - * @since 3.0 - */ + @Override public void registryChanged(IRegistryChangeEvent event) { if (fQuickDiffExtensionRegistry != null && event.getExtensionDeltas(PLUGIN_ID, REFERENCE_PROVIDER_EXTENSION_POINT).length > 0) fQuickDiffExtensionRegistry.reloadExtensions(); diff --git a/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/internal/texteditor/quickdiff/DiffRegion.java b/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/internal/texteditor/quickdiff/DiffRegion.java index 1608d45fcb6..56b17981fff 100644 --- a/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/internal/texteditor/quickdiff/DiffRegion.java +++ b/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/internal/texteditor/quickdiff/DiffRegion.java @@ -55,9 +55,7 @@ public final class DiffRegion extends Annotation implements ILineDiffInfo { fDocument= source; } - /* - * @see org.eclipse.jface.text.source.Annotation#getType() - */ + @Override public String getType() { // we return unknown for unchanged regions to avoid // them getting displayed. @@ -79,9 +77,7 @@ public final class DiffRegion extends Annotation implements ILineDiffInfo { } } - /* - * @see org.eclipse.jface.text.source.ILineDiffInfo#getRemovedLinesBelow() - */ + @Override public int getRemovedLinesBelow() { if (fOffset == fDifference.rightLength() - 1) { @@ -104,9 +100,7 @@ public final class DiffRegion extends Annotation implements ILineDiffInfo { return 0; } - /* - * @see org.eclipse.jface.text.source.ILineDiffInfo#getChangeType() - */ + @Override public int getChangeType() { if (fDifference.kind() == RangeDifference.NOCHANGE) return UNCHANGED; @@ -115,9 +109,7 @@ public final class DiffRegion extends Annotation implements ILineDiffInfo { return CHANGED; } - /* - * @see org.eclipse.jface.text.source.ILineDiffInfo#getRemovedLinesAbove() - */ + @Override public int getRemovedLinesAbove() { if (getChangeType() == UNCHANGED && fOffset == 0) { synchronized (fList) { @@ -135,16 +127,12 @@ public final class DiffRegion extends Annotation implements ILineDiffInfo { return 0; } - /* - * @see org.eclipse.jface.text.source.ILineDiffInfo#hasChanges() - */ + @Override public boolean hasChanges() { return getChangeType() != UNCHANGED || getRemovedLinesAbove() > 0 || getRemovedLinesBelow() > 0; } - /* - * @see org.eclipse.jface.text.source.ILineDiffInfo#getOriginalText() - */ + @Override public String[] getOriginalText() { IDocument doc= fDocument; if (doc != null) { @@ -171,9 +159,7 @@ public final class DiffRegion extends Annotation implements ILineDiffInfo { return new String[0]; } - /* - * @see org.eclipse.jface.text.source.Annotation#getText() - */ + @Override public String getText() { int r= fDifference.rightLength(); int l= fDifference.leftLength(); diff --git a/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/internal/texteditor/quickdiff/DocumentLineDiffer.java b/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/internal/texteditor/quickdiff/DocumentLineDiffer.java index 498b80d0c08..0a60484b609 100644 --- a/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/internal/texteditor/quickdiff/DocumentLineDiffer.java +++ b/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/internal/texteditor/quickdiff/DocumentLineDiffer.java @@ -90,6 +90,7 @@ public class DocumentLineDiffer implements ILineDiffer, IDocumentListener, IAnno * @since 3.5 */ private static class RangeDifferenceFactory extends AbstractRangeDifferenceFactory { + @Override protected org.eclipse.compare.rangedifferencer.RangeDifference createRangeDifference() { return new QuickDiffRangeDifference(); } @@ -103,37 +104,27 @@ public class DocumentLineDiffer implements ILineDiffer, IDocumentListener, IAnno private static final String[] ORIGINAL_TEXT= new String[] { "\n" }; //$NON-NLS-1$ - /* - * @see org.eclipse.jface.text.source.ILineDiffInfo#getRemovedLinesBelow() - */ + @Override public int getRemovedLinesBelow() { return 0; } - /* - * @see org.eclipse.jface.text.source.ILineDiffInfo#getRemovedLinesAbove() - */ + @Override public int getRemovedLinesAbove() { return 0; } - /* - * @see org.eclipse.jface.text.source.ILineDiffInfo#getChangeType() - */ + @Override public int getChangeType() { return CHANGED; } - /* - * @see org.eclipse.jface.text.source.ILineDiffInfo#hasChanges() - */ + @Override public boolean hasChanges() { return true; } - /* - * @see org.eclipse.jface.text.source.ILineDiffInfo#getOriginalText() - */ + @Override public String[] getOriginalText() { return ORIGINAL_TEXT; } @@ -222,6 +213,7 @@ public class DocumentLineDiffer implements ILineDiffer, IDocumentListener, IAnno * @since 3.2 */ private final IDocumentRewriteSessionListener fSessionListener= new IDocumentRewriteSessionListener() { + @Override public void documentRewriteSessionChanged(DocumentRewriteSessionEvent event) { if (event.getSession().getSessionType() == DocumentRewriteSessionType.UNRESTRICTED_SMALL) return; @@ -246,9 +238,7 @@ public class DocumentLineDiffer implements ILineDiffer, IDocumentListener, IAnno /* ILineDiffer implementation */ - /* - * @see org.eclipse.jface.text.source.ILineDiffer#getLineInfo(int) - */ + @Override public ILineDiffInfo getLineInfo(int line) { if (isSuspended()) @@ -267,9 +257,7 @@ public class DocumentLineDiffer implements ILineDiffer, IDocumentListener, IAnno return null; } - /* - * @see org.eclipse.jface.text.source.ILineDiffer#revertLine(int) - */ + @Override public synchronized void revertLine(int line) throws BadLocationException { if (!isInitialized()) throw new BadLocationException(QuickDiffMessages.quickdiff_nonsynchronized); @@ -298,9 +286,7 @@ public class DocumentLineDiffer implements ILineDiffer, IDocumentListener, IAnno fRightDocument.replace(rOffset, rLength, replacement); } - /* - * @see org.eclipse.jface.text.source.ILineDiffer#revertBlock(int) - */ + @Override public synchronized void revertBlock(int line) throws BadLocationException { if (!isInitialized()) throw new BadLocationException(QuickDiffMessages.quickdiff_nonsynchronized); @@ -334,9 +320,7 @@ public class DocumentLineDiffer implements ILineDiffer, IDocumentListener, IAnno fRightDocument.replace(rOffset, rLength, fLeftDocument.get(lOffset, lLength)); } - /* - * @see org.eclipse.jface.text.source.ILineDiffer#revertSelection(int, int) - */ + @Override public synchronized void revertSelection(int line, int nLines) throws BadLocationException { if (!isInitialized()) throw new BadLocationException(QuickDiffMessages.quickdiff_nonsynchronized); @@ -385,9 +369,7 @@ public class DocumentLineDiffer implements ILineDiffer, IDocumentListener, IAnno fRightDocument.replace(rOffset, rLength, fLeftDocument.get(lOffset, lLength)); } - /* - * @see org.eclipse.jface.text.source.ILineDiffer#restoreAfterLine(int) - */ + @Override public synchronized int restoreAfterLine(int line) throws BadLocationException { if (!isInitialized()) throw new BadLocationException(QuickDiffMessages.quickdiff_nonsynchronized); @@ -448,6 +430,7 @@ public class DocumentLineDiffer implements ILineDiffer, IDocumentListener, IAnno * * @return <code>true</code> if the differ is suspended */ + @Override public synchronized boolean isSuspended() { return fState == SUSPENDED; } @@ -517,6 +500,7 @@ public class DocumentLineDiffer implements ILineDiffer, IDocumentListener, IAnno * access the documents in a synchronized section or expect deadlocks. See * https://bugs.eclipse.org/bugs/show_bug.cgi?id=44692 */ + @Override public IStatus run(IProgressMonitor monitor) { // 1: wait for any previous job that was canceled to avoid job flooding @@ -761,9 +745,7 @@ public class DocumentLineDiffer implements ILineDiffer, IDocumentListener, IAnno /* IDocumentListener implementation */ - /* - * @see org.eclipse.jface.text.IDocumentListener#documentAboutToBeChanged(org.eclipse.jface.text.DocumentEvent) - */ + @Override public synchronized void documentAboutToBeChanged(DocumentEvent event) { if (fIgnoreDocumentEvents) return; @@ -828,9 +810,7 @@ public class DocumentLineDiffer implements ILineDiffer, IDocumentListener, IAnno rightEquivalent.update(event); } - /* - * @see org.eclipse.jface.text.IDocumentListener#documentChanged(org.eclipse.jface.text.DocumentEvent) - */ + @Override public synchronized void documentChanged(DocumentEvent event) { final Thread lastCurrentThread= fThread; fThread= null; @@ -1385,23 +1365,17 @@ public class DocumentLineDiffer implements ILineDiffer, IDocumentListener, IAnno return null; } - /* - * @see org.eclipse.jface.text.source.IAnnotationModel#addAnnotationModelListener(org.eclipse.jface.text.source.IAnnotationModelListener) - */ + @Override public void addAnnotationModelListener(IAnnotationModelListener listener) { fAnnotationModelListeners.add(listener); } - /* - * @see org.eclipse.jface.text.source.IAnnotationModel#removeAnnotationModelListener(org.eclipse.jface.text.source.IAnnotationModelListener) - */ + @Override public void removeAnnotationModelListener(IAnnotationModelListener listener) { fAnnotationModelListeners.remove(listener); } - /* - * @see org.eclipse.jface.text.source.IAnnotationModel#connect(org.eclipse.jface.text.IDocument) - */ + @Override public void connect(IDocument document) { Assert.isTrue(fRightDocument == null || fRightDocument == document); @@ -1417,9 +1391,7 @@ public class DocumentLineDiffer implements ILineDiffer, IDocumentListener, IAnno } } - /* - * @see org.eclipse.jface.text.source.IAnnotationModel#disconnect(org.eclipse.jface.text.IDocument) - */ + @Override public void disconnect(IDocument document) { Assert.isTrue(fRightDocument == document); @@ -1466,23 +1438,17 @@ public class DocumentLineDiffer implements ILineDiffer, IDocumentListener, IAnno } } - /* - * @see org.eclipse.jface.text.source.IAnnotationModel#addAnnotation(org.eclipse.jface.text.source.Annotation, org.eclipse.jface.text.Position) - */ + @Override public void addAnnotation(Annotation annotation, Position position) { throw new UnsupportedOperationException(); } - /* - * @see org.eclipse.jface.text.source.IAnnotationModel#removeAnnotation(org.eclipse.jface.text.source.Annotation) - */ + @Override public void removeAnnotation(Annotation annotation) { throw new UnsupportedOperationException(); } - /* - * @see org.eclipse.jface.text.source.IAnnotationModel#getAnnotationIterator() - */ + @Override public Iterator getAnnotationIterator() { final List copy; List differences= fDifferences; // atomic @@ -1492,14 +1458,17 @@ public class DocumentLineDiffer implements ILineDiffer, IDocumentListener, IAnno final Iterator iter= copy.iterator(); return new Iterator() { + @Override public void remove() { throw new UnsupportedOperationException(); } + @Override public boolean hasNext() { return iter.hasNext(); } + @Override public Object next() { QuickDiffRangeDifference diff= (QuickDiffRangeDifference) iter.next(); return diff.getDiffRegion(copy, fLeftDocument); @@ -1508,9 +1477,7 @@ public class DocumentLineDiffer implements ILineDiffer, IDocumentListener, IAnno }; } - /* - * @see org.eclipse.jface.text.source.IAnnotationModel#getPosition(org.eclipse.jface.text.source.Annotation) - */ + @Override public Position getPosition(Annotation annotation) { if (fRightDocument != null && annotation instanceof DiffRegion) { QuickDiffRangeDifference difference= ((DiffRegion)annotation).getDifference(); @@ -1551,9 +1518,7 @@ public class DocumentLineDiffer implements ILineDiffer, IDocumentListener, IAnno } } - /* - * @see org.eclipse.ui.internal.texteditor.quickdiff.ILineDifferExtension#suspend() - */ + @Override public void suspend() { Job job= fInitializationJob; if (job != null) @@ -1578,9 +1543,7 @@ public class DocumentLineDiffer implements ILineDiffer, IDocumentListener, IAnno } } - /* - * @see org.eclipse.ui.internal.texteditor.quickdiff.ILineDifferExtension#resume() - */ + @Override public synchronized void resume() { if (fRightDocument != null) fRightDocument.addDocumentListener(this); diff --git a/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/internal/texteditor/quickdiff/QuickDiffRestoreAction.java b/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/internal/texteditor/quickdiff/QuickDiffRestoreAction.java index 80728e44689..98a5c4c9e95 100644 --- a/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/internal/texteditor/quickdiff/QuickDiffRestoreAction.java +++ b/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/internal/texteditor/quickdiff/QuickDiffRestoreAction.java @@ -67,9 +67,7 @@ public abstract class QuickDiffRestoreAction extends TextEditorAction implements */ protected abstract void runCompoundChange(); - /* - * @see org.eclipse.jface.action.IAction#run() - */ + @Override public void run() { ITextEditor editor= getTextEditor(); if (editor == null || !validateEditorInputState()) @@ -83,9 +81,7 @@ public abstract class QuickDiffRestoreAction extends TextEditorAction implements } - /* - * @see org.eclipse.ui.texteditor.IUpdate#update() - */ + @Override public void update() { /* * Update only works if we're updated from the ruler action @@ -96,10 +92,7 @@ public abstract class QuickDiffRestoreAction extends TextEditorAction implements setEnabled(computeEnablement()); } - /* - * @see org.eclipse.jface.viewers.ISelectionChangedListener#selectionChanged(org.eclipse.jface.viewers.SelectionChangedEvent) - * @since 3.3 - */ + @Override public void selectionChanged(SelectionChangedEvent event) { update(); } diff --git a/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/internal/texteditor/quickdiff/ReferenceSelectionAction.java b/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/internal/texteditor/quickdiff/ReferenceSelectionAction.java index b3818867f4f..535c9017b71 100644 --- a/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/internal/texteditor/quickdiff/ReferenceSelectionAction.java +++ b/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/internal/texteditor/quickdiff/ReferenceSelectionAction.java @@ -74,9 +74,7 @@ public class ReferenceSelectionAction extends Action implements IUpdate { return fProvider; } - /* - * @see org.eclipse.jface.action.IAction#run() - */ + @Override public void run() { DocumentLineDiffer differ= getDiffer(true); // create if needed, so the user does not have to toggle display when he selects a reference @@ -98,9 +96,7 @@ public class ReferenceSelectionAction extends Action implements IUpdate { } } - /* - * @see org.eclipse.ui.texteditor.IUpdate#update() - */ + @Override public void update() { /* two things happen here: * 1: checked state setting - if a provider is already installed, and its id matches diff --git a/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/internal/texteditor/quickdiff/RestoreAction.java b/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/internal/texteditor/quickdiff/RestoreAction.java index ceece979864..8f586bd283b 100644 --- a/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/internal/texteditor/quickdiff/RestoreAction.java +++ b/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/internal/texteditor/quickdiff/RestoreAction.java @@ -41,9 +41,7 @@ public class RestoreAction extends QuickDiffRestoreAction { super(PREFIX, editor, isRulerAction); } - /* - * @see org.eclipse.ui.internal.texteditor.quickdiff.QuickDiffRestoreAction#computeEnablement() - */ + @Override public boolean computeEnablement() { if (!super.computeEnablement()) return false; @@ -73,9 +71,7 @@ public class RestoreAction extends QuickDiffRestoreAction { return true; } - /* - * @see org.eclipse.ui.internal.editors.quickdiff.QuickDiffRestoreAction#runCompoundChange() - */ + @Override public void runCompoundChange() { if (!isEnabled()) return; diff --git a/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/internal/texteditor/quickdiff/RevertBlockAction.java b/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/internal/texteditor/quickdiff/RevertBlockAction.java index fa1246e8723..ee1ef0bb113 100644 --- a/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/internal/texteditor/quickdiff/RevertBlockAction.java +++ b/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/internal/texteditor/quickdiff/RevertBlockAction.java @@ -40,9 +40,7 @@ public class RevertBlockAction extends QuickDiffRestoreAction { super(PREFIX, editor, isRulerAction); } - /* - * @see org.eclipse.ui.internal.texteditor.quickdiff.QuickDiffRestoreAction#computeEnablement() - */ + @Override public boolean computeEnablement() { if (!super.computeEnablement()) return false; @@ -72,9 +70,7 @@ public class RevertBlockAction extends QuickDiffRestoreAction { return false; } - /* - * @see org.eclipse.ui.internal.editors.quickdiff.QuickDiffRestoreAction#runCompoundChange() - */ + @Override public void runCompoundChange() { if (!isEnabled()) return; diff --git a/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/internal/texteditor/quickdiff/RevertLineAction.java b/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/internal/texteditor/quickdiff/RevertLineAction.java index b597da1aa6d..9805717190a 100644 --- a/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/internal/texteditor/quickdiff/RevertLineAction.java +++ b/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/internal/texteditor/quickdiff/RevertLineAction.java @@ -38,9 +38,7 @@ public class RevertLineAction extends QuickDiffRestoreAction { super("RevertLineAction.", editor, isRulerAction); //$NON-NLS-1$ } - /* - * @see org.eclipse.ui.internal.texteditor.quickdiff.QuickDiffRestoreAction#computeEnablement() - */ + @Override public boolean computeEnablement() { if (!super.computeEnablement()) return false; @@ -62,9 +60,7 @@ public class RevertLineAction extends QuickDiffRestoreAction { return true; } - /* - * @see org.eclipse.ui.internal.editors.quickdiff.QuickDiffRestoreAction#runCompoundChange() - */ + @Override public void runCompoundChange() { if (!isEnabled()) return; diff --git a/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/internal/texteditor/quickdiff/RevertSelectionAction.java b/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/internal/texteditor/quickdiff/RevertSelectionAction.java index 428185878d0..3ad0af00d04 100644 --- a/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/internal/texteditor/quickdiff/RevertSelectionAction.java +++ b/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/internal/texteditor/quickdiff/RevertSelectionAction.java @@ -40,9 +40,7 @@ public class RevertSelectionAction extends QuickDiffRestoreAction { super("RevertSelectionAction.", editor, isRulerAction); //$NON-NLS-1$ } - /* - * @see org.eclipse.ui.internal.texteditor.quickdiff.QuickDiffRestoreAction#computeEnablement() - */ + @Override public boolean computeEnablement() { if (!super.computeEnablement()) return false; @@ -72,9 +70,7 @@ public class RevertSelectionAction extends QuickDiffRestoreAction { return false; } - /* - * @see org.eclipse.ui.internal.editors.quickdiff.QuickDiffRestoreAction#runCompoundChange() - */ + @Override public void runCompoundChange() { // recheck if run without being enabled if (!isEnabled()) diff --git a/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/internal/texteditor/quickdiff/compare/equivalence/DJBHashFunction.java b/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/internal/texteditor/quickdiff/compare/equivalence/DJBHashFunction.java index b18357beeff..c87ae879965 100644 --- a/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/internal/texteditor/quickdiff/compare/equivalence/DJBHashFunction.java +++ b/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/internal/texteditor/quickdiff/compare/equivalence/DJBHashFunction.java @@ -16,6 +16,7 @@ package org.eclipse.ui.internal.texteditor.quickdiff.compare.equivalence; */ public final class DJBHashFunction implements IHashFunction { + @Override public Hash computeHash(CharSequence string) { return new IntHash(hash(string)); } diff --git a/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/internal/texteditor/quickdiff/compare/equivalence/DocEquivalenceComparator.java b/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/internal/texteditor/quickdiff/compare/equivalence/DocEquivalenceComparator.java index 6a11758d242..b926ff4d65c 100644 --- a/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/internal/texteditor/quickdiff/compare/equivalence/DocEquivalenceComparator.java +++ b/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/internal/texteditor/quickdiff/compare/equivalence/DocEquivalenceComparator.java @@ -55,6 +55,7 @@ public final class DocEquivalenceComparator implements IRangeComparator { * * @return number of lines */ + @Override public int getRangeCount() { return fLines; } @@ -68,6 +69,7 @@ public final class DocEquivalenceComparator implements IRangeComparator { * @param otherIndex the number of the line within the other comparator * @return <code>true</code> if the lines are equal */ + @Override public boolean rangesEqual(int thisIndex, IRangeComparator other, int otherIndex) { if (other instanceof DocEquivalenceComparator) { DocEquivalenceComparator dec= (DocEquivalenceComparator) other; @@ -96,6 +98,7 @@ public final class DocEquivalenceComparator implements IRangeComparator { * @param other the comparator with which to compare * @return <code>true</code> to abort a token comparison */ + @Override public boolean skipRangeComparison(int length, int max, IRangeComparator other) { return fSkip; } diff --git a/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/internal/texteditor/quickdiff/compare/equivalence/Hash.java b/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/internal/texteditor/quickdiff/compare/equivalence/Hash.java index 036207b0bc4..30f753a5d06 100644 --- a/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/internal/texteditor/quickdiff/compare/equivalence/Hash.java +++ b/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/internal/texteditor/quickdiff/compare/equivalence/Hash.java @@ -18,6 +18,7 @@ package org.eclipse.ui.internal.texteditor.quickdiff.compare.equivalence; */ public abstract class Hash implements Cloneable { + @Override public Object clone() { try { return super.clone(); @@ -33,12 +34,14 @@ public abstract class Hash implements Cloneable { * @param obj {@inheritDoc} * @return <code>true</code> if the receiver is equal to <code>obj</code> */ + @Override public abstract boolean equals(Object obj); /** * @see java.lang.Object#hashCode() * @since 3.5 */ + @Override public abstract int hashCode(); }
\ No newline at end of file diff --git a/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/internal/texteditor/quickdiff/compare/equivalence/IntHash.java b/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/internal/texteditor/quickdiff/compare/equivalence/IntHash.java index d2fef0efcf6..c37a8d70a93 100644 --- a/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/internal/texteditor/quickdiff/compare/equivalence/IntHash.java +++ b/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/internal/texteditor/quickdiff/compare/equivalence/IntHash.java @@ -22,6 +22,7 @@ public final class IntHash extends Hash { fHash= hash; } + @Override public boolean equals(Object obj) { if (obj instanceof IntHash) { return fHash == ((IntHash) obj).fHash; @@ -30,6 +31,7 @@ public final class IntHash extends Hash { return false; } + @Override public int hashCode() { return fHash; } diff --git a/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/internal/texteditor/quickdiff/compare/equivalence/SystemHashFunction.java b/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/internal/texteditor/quickdiff/compare/equivalence/SystemHashFunction.java index 838b0dccd23..f1e0ae92155 100644 --- a/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/internal/texteditor/quickdiff/compare/equivalence/SystemHashFunction.java +++ b/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/internal/texteditor/quickdiff/compare/equivalence/SystemHashFunction.java @@ -16,6 +16,7 @@ package org.eclipse.ui.internal.texteditor.quickdiff.compare.equivalence; */ public class SystemHashFunction implements IHashFunction { + @Override public Hash computeHash(CharSequence seq) { return new IntHash(seq.toString().hashCode()); } diff --git a/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/internal/texteditor/rulers/DAG.java b/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/internal/texteditor/rulers/DAG.java index bbb3fb96431..144db9644d2 100644 --- a/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/internal/texteditor/rulers/DAG.java +++ b/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/internal/texteditor/rulers/DAG.java @@ -89,9 +89,7 @@ public final class DAG { values.remove(val); } - /* - * @see java.lang.Object#toString() - */ + @Override public String toString() { return fMap.toString(); } @@ -205,10 +203,7 @@ public final class DAG { return false; } - /* - * @see java.lang.Object#toString() - * @since 3.3 - */ + @Override public String toString() { return "Out: " + fOut.toString() + " In: " + fIn.toString(); //$NON-NLS-1$ //$NON-NLS-2$ } diff --git a/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/internal/texteditor/rulers/RulerColumnTarget.java b/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/internal/texteditor/rulers/RulerColumnTarget.java index ed0cd8ee7b0..82022b3266e 100644 --- a/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/internal/texteditor/rulers/RulerColumnTarget.java +++ b/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/internal/texteditor/rulers/RulerColumnTarget.java @@ -59,18 +59,22 @@ final class AllTarget extends RulerColumnTarget { AllTarget() { } + @Override public boolean matchesContentType(IContentType contentType) { return true; } + @Override public boolean matchesEditorId(String editorId) { return true; } + @Override public boolean matchesClass(Class clazz) { return true; } + @Override public String toString() { return "All"; //$NON-NLS-1$ } @@ -87,18 +91,22 @@ final class OrTarget extends RulerColumnTarget { Assert.isLegal(or != null); } + @Override public boolean matchesContentType(IContentType contentType) { return fEither.matchesContentType(contentType) || fOr.matchesContentType(contentType); } + @Override public boolean matchesEditorId(String editorId) { return fEither.matchesEditorId(editorId) || fOr.matchesEditorId(editorId); } + @Override public boolean matchesClass(Class clazz) { return fEither.matchesClass(clazz) || fOr.matchesClass(clazz); } + @Override public String toString() { return fEither.toString() + " || " + fOr.toString(); //$NON-NLS-1$ } @@ -112,18 +120,22 @@ final class EditorIdTarget extends RulerColumnTarget { fEditorId= id; } + @Override public boolean matchesContentType(IContentType contentType) { return false; } + @Override public boolean matchesEditorId(String editorId) { return fEditorId.equals(editorId); } + @Override public boolean matchesClass(Class clazz) { return false; } + @Override public String toString() { return "editorID=" + fEditorId; //$NON-NLS-1$ } @@ -137,14 +149,17 @@ final class ClassTarget extends RulerColumnTarget { fClassName= className; } + @Override public boolean matchesContentType(IContentType contentType) { return false; } + @Override public boolean matchesEditorId(String editorId) { return false; } + @Override public boolean matchesClass(Class clazz) { Assert.isLegal(clazz != null); @@ -157,6 +172,7 @@ final class ClassTarget extends RulerColumnTarget { return false; } + @Override public String toString() { return "class=" + fClassName; //$NON-NLS-1$ } @@ -170,18 +186,22 @@ final class ContentTypeTarget extends RulerColumnTarget { fContentType= Platform.getContentTypeManager().getContentType(contentTypeId); } + @Override public boolean matchesContentType(IContentType contentType) { return fContentType != null && contentType != null && contentType.isKindOf(fContentType); } + @Override public boolean matchesEditorId(String editorId) { return false; } + @Override public boolean matchesClass(Class clazz) { return false; } + @Override public String toString() { return "contentType=" + fContentType; //$NON-NLS-1$ } diff --git a/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/internal/texteditor/spelling/EmptySpellingPreferenceBlock.java b/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/internal/texteditor/spelling/EmptySpellingPreferenceBlock.java index b4b8499e91a..d93f3f3a58b 100644 --- a/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/internal/texteditor/spelling/EmptySpellingPreferenceBlock.java +++ b/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/internal/texteditor/spelling/EmptySpellingPreferenceBlock.java @@ -30,9 +30,7 @@ import org.eclipse.ui.texteditor.spelling.ISpellingPreferenceBlock; */ public class EmptySpellingPreferenceBlock implements ISpellingPreferenceBlock { - /* - * @see org.eclipse.ui.texteditor.spelling.ISpellingPreferenceBlock#createControl(org.eclipse.swt.widgets.Composite) - */ + @Override public Control createControl(Composite composite) { Composite inner= new Composite(composite, SWT.NONE); inner.setLayout(new GridLayout(3, false)); @@ -55,46 +53,32 @@ public class EmptySpellingPreferenceBlock implements ISpellingPreferenceBlock { return inner; } - /* - * @see org.eclipse.ui.texteditor.spelling.ISpellingPreferenceBlock#initialize(org.eclipse.ui.texteditor.spelling.IPreferenceStatusMonitor) - */ + @Override public void initialize(IPreferenceStatusMonitor statusMonitor) { } - /* - * @see org.eclipse.ui.texteditor.spelling.ISpellingPreferenceBlock#canPerformOk() - */ + @Override public boolean canPerformOk() { return true; } - /* - * @see org.eclipse.ui.texteditor.spelling.ISpellingPreferenceBlock#performOk() - */ + @Override public void performOk() { } - /* - * @see org.eclipse.ui.texteditor.spelling.ISpellingPreferenceBlock#performDefaults() - */ + @Override public void performDefaults() { } - /* - * @see org.eclipse.ui.texteditor.spelling.ISpellingPreferenceBlock#performRevert() - */ + @Override public void performRevert() { } - /* - * @see org.eclipse.ui.texteditor.spelling.ISpellingPreferenceBlock#dispose() - */ + @Override public void dispose() { } - /* - * @see org.eclipse.ui.texteditor.spelling.ISpellingPreferenceBlock#setEnabled(boolean) - */ + @Override public void setEnabled(boolean enabled) { } } diff --git a/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/internal/texteditor/spelling/NoCompletionsProposal.java b/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/internal/texteditor/spelling/NoCompletionsProposal.java index 7be8f103477..ec704bfb19c 100644 --- a/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/internal/texteditor/spelling/NoCompletionsProposal.java +++ b/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/internal/texteditor/spelling/NoCompletionsProposal.java @@ -27,44 +27,32 @@ import org.eclipse.jface.text.contentassist.IContextInformation; */ public final class NoCompletionsProposal implements ICompletionProposal { - /* - * @see org.eclipse.jface.text.contentassist.ICompletionProposal#apply(org.eclipse.jface.text.IDocument) - */ + @Override public void apply(IDocument document) { // do nothing } - /* - * @see org.eclipse.jface.text.contentassist.ICompletionProposal#getAdditionalProposalInfo() - */ + @Override public String getAdditionalProposalInfo() { return null; } - /* - * @see org.eclipse.jface.text.contentassist.ICompletionProposal#getContextInformation() - */ + @Override public IContextInformation getContextInformation() { return null; } - /* - * @see org.eclipse.jface.text.contentassist.ICompletionProposal#getDisplayString() - */ + @Override public String getDisplayString() { return SpellingMessages.NoCompletionsProposal_displayString; } - /* - * @see org.eclipse.jface.text.contentassist.ICompletionProposal#getImage() - */ + @Override public Image getImage() { return null; } - /* - * @see org.eclipse.jface.text.contentassist.ICompletionProposal#getSelection(org.eclipse.jface.text.IDocument) - */ + @Override public Point getSelection(IDocument document) { return null; } diff --git a/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/AbstractDocumentProvider.java b/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/AbstractDocumentProvider.java index 36477529281..67817ccf1fa 100644 --- a/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/AbstractDocumentProvider.java +++ b/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/AbstractDocumentProvider.java @@ -66,9 +66,7 @@ public abstract class AbstractDocumentProvider implements IDocumentProvider, IDo */ protected abstract void execute(IProgressMonitor monitor) throws CoreException; - /* - * @see org.eclipse.jface.operation.IRunnableWithProgress#run(org.eclipse.core.runtime.IProgressMonitor) - */ + @Override public void run(IProgressMonitor monitor) throws InvocationTargetException, InterruptedException { try { execute(monitor); @@ -125,6 +123,7 @@ public abstract class AbstractDocumentProvider implements IDocumentProvider, IDo * and if the documents of the two element infos are equal. * @see Object#equals(java.lang.Object) */ + @Override public boolean equals(Object o) { if (o instanceof ElementInfo) { ElementInfo e= (ElementInfo) o; @@ -133,25 +132,19 @@ public abstract class AbstractDocumentProvider implements IDocumentProvider, IDo return false; } - /* - * @see Object#hashCode() - */ + @Override public int hashCode() { return fDocument.hashCode(); } - /* - * @see IDocumentListener#documentChanged(DocumentEvent) - */ + @Override public void documentChanged(DocumentEvent event) { fCanBeSaved= true; removeUnchangedElementListeners(fElement, this); fireElementDirtyStateChanged(fElement, fCanBeSaved); } - /* - * @see IDocumentListener#documentAboutToBeChanged(DocumentEvent) - */ + @Override public void documentAboutToBeChanged(DocumentEvent event) { } } @@ -182,6 +175,7 @@ public abstract class AbstractDocumentProvider implements IDocumentProvider, IDo * @since 2.0 * @deprecated As of 3.6, replaced by {@link Status#OK_STATUS} */ + @Deprecated static final protected IStatus STATUS_OK= new Status(IStatus.OK, TextEditorPlugin.PLUGIN_ID, IStatus.OK, EditorMessages.AbstractDocumentProvider_ok, null); /** @@ -390,9 +384,7 @@ public abstract class AbstractDocumentProvider implements IDocumentProvider, IDo return s.iterator(); } - /* - * @see IDocumentProvider#connect(Object) - */ + @Override public final void connect(Object element) throws CoreException { ElementInfo info= (ElementInfo) fElementInfoMap.get(element); if (info == null) { @@ -424,6 +416,7 @@ public abstract class AbstractDocumentProvider implements IDocumentProvider, IDo /* * @see IDocumentProvider#disconnect */ + @Override public final void disconnect(Object element) { ElementInfo info= (ElementInfo) fElementInfoMap.get(element); @@ -452,9 +445,7 @@ public abstract class AbstractDocumentProvider implements IDocumentProvider, IDo protected void disconnected() { } - /* - * @see IDocumentProvider#getDocument(Object) - */ + @Override public IDocument getDocument(Object element) { if (element == null) @@ -464,9 +455,7 @@ public abstract class AbstractDocumentProvider implements IDocumentProvider, IDo return (info != null ? info.fDocument : null); } - /* - * @see IDocumentProvider#mustSaveDocument(Object) - */ + @Override public boolean mustSaveDocument(Object element) { if (element == null) @@ -476,9 +465,7 @@ public abstract class AbstractDocumentProvider implements IDocumentProvider, IDo return (info != null ? info.fCount == 1 && info.fCanBeSaved : false); } - /* - * @see IDocumentProvider#getAnnotationModel(Object) - */ + @Override public IAnnotationModel getAnnotationModel(Object element) { if (element == null) @@ -488,9 +475,7 @@ public abstract class AbstractDocumentProvider implements IDocumentProvider, IDo return (info != null ? info.fModel : null); } - /* - * @see IDocumentProvider#canSaveDocument(Object) - */ + @Override public boolean canSaveDocument(Object element) { if (element == null) @@ -563,9 +548,7 @@ public abstract class AbstractDocumentProvider implements IDocumentProvider, IDo } } - /* - * @see IDocumentProvider#resetDocument(Object) - */ + @Override public final void resetDocument(final Object element) throws CoreException { if (element == null) @@ -573,10 +556,12 @@ public abstract class AbstractDocumentProvider implements IDocumentProvider, IDo class ResetOperation extends DocumentProviderOperation implements ISchedulingRuleProvider { + @Override protected void execute(IProgressMonitor monitor) throws CoreException { doResetDocument(element, monitor); } + @Override public ISchedulingRule getSchedulingRule() { return getResetRule(element); } @@ -586,9 +571,7 @@ public abstract class AbstractDocumentProvider implements IDocumentProvider, IDo } - /* - * @see IDocumentProvider#saveDocument(IProgressMonitor, Object, IDocument, boolean) - */ + @Override public final void saveDocument(IProgressMonitor monitor, final Object element, final IDocument document, final boolean overwrite) throws CoreException { if (element == null) @@ -596,9 +579,7 @@ public abstract class AbstractDocumentProvider implements IDocumentProvider, IDo class SaveOperation extends DocumentProviderOperation implements ISchedulingRuleProvider { - /* - * @see org.eclipse.ui.texteditor.AbstractDocumentProvider.DocumentProviderOperation#execute(org.eclipse.core.runtime.IProgressMonitor) - */ + @Override protected void execute(IProgressMonitor pm) throws CoreException { ElementInfo info= (ElementInfo) fElementInfoMap.get(element); if (info != null) { @@ -621,6 +602,7 @@ public abstract class AbstractDocumentProvider implements IDocumentProvider, IDo } } + @Override public ISchedulingRule getSchedulingRule() { return getSaveRule(element); } @@ -636,6 +618,7 @@ public abstract class AbstractDocumentProvider implements IDocumentProvider, IDo * * @param element the element */ + @Override public void aboutToChange(Object element) { } @@ -646,21 +629,18 @@ public abstract class AbstractDocumentProvider implements IDocumentProvider, IDo * * @param element the element */ + @Override public void changed(Object element) { } - /* - * @see IDocumentProvider#addElementStateListener(IElementStateListener) - */ + @Override public void addElementStateListener(IElementStateListener listener) { Assert.isNotNull(listener); if (!fElementStateListeners.contains(listener)) fElementStateListeners.add(listener); } - /* - * @see IDocumentProvider#removeElementStateListener(IElementStateListener) - */ + @Override public void removeElementStateListener(IElementStateListener listener) { Assert.isNotNull(listener); fElementStateListeners.remove(listener); @@ -742,42 +722,27 @@ public abstract class AbstractDocumentProvider implements IDocumentProvider, IDo } } - /* - * @see IDocumentProvider#getModificationStamp(Object) - * @since 2.0 - */ + @Override public long getModificationStamp(Object element) { return 0; } - /* - * @see IDocumentProvider#getSynchronizationStamp(Object) - * @since 2.0 - */ + @Override public long getSynchronizationStamp(Object element) { return 0; } - /* - * @see IDocumentProvider#isDeleted(Object) - * @since 2.0 - */ + @Override public boolean isDeleted(Object element) { return false; } - /* - * @see IDocumentProviderExtension#isReadOnly(Object) - * @since 2.0 - */ + @Override public boolean isReadOnly(Object element) { return true; } - /* - * @see IDocumentProviderExtension#isModifiable(Object) - * @since 2.0 - */ + @Override public boolean isModifiable(Object element) { return false; } @@ -790,6 +755,7 @@ public abstract class AbstractDocumentProvider implements IDocumentProvider, IDo * @return whether <code>validateState</code> has been called for the given element * @since 2.0 */ + @Override public boolean isStateValidated(Object element) { ElementInfo info= (ElementInfo) fElementInfoMap.get(element); if (info != null) @@ -809,16 +775,14 @@ public abstract class AbstractDocumentProvider implements IDocumentProvider, IDo protected void doValidateState(Object element, Object computationContext) throws CoreException { } - /* - * @see IDocumentProviderExtension#validateState(Object, Object) - * @since 2.0 - */ + @Override public void validateState(final Object element, final Object computationContext) throws CoreException { if (element == null) return; class ValidateStateOperation extends DocumentProviderOperation implements ISchedulingRuleProvider { + @Override protected void execute(IProgressMonitor monitor) throws CoreException { ElementInfo info= (ElementInfo) fElementInfoMap.get(element); if (info == null) @@ -831,6 +795,7 @@ public abstract class AbstractDocumentProvider implements IDocumentProvider, IDo fireElementStateValidationChanged(element, true); } + @Override public ISchedulingRule getSchedulingRule() { return getValidateStateRule(element); } @@ -867,10 +832,7 @@ public abstract class AbstractDocumentProvider implements IDocumentProvider, IDo return readOnlyChanged; } - /* - * @see IDocumentProviderExtension#updateStateCache(Object) - * @since 2.0 - */ + @Override public final void updateStateCache(Object element) throws CoreException { ElementInfo info= (ElementInfo) fElementInfoMap.get(element); if (info != null) { @@ -883,10 +845,7 @@ public abstract class AbstractDocumentProvider implements IDocumentProvider, IDo } } - /* - * @see IDocumentProviderExtension#setCanSaveDocument(Object) - * @since 2.0 - */ + @Override public void setCanSaveDocument(Object element) { if (element != null) { ElementInfo info= (ElementInfo) fElementInfoMap.get(element); @@ -956,10 +915,7 @@ public abstract class AbstractDocumentProvider implements IDocumentProvider, IDo } } - /* - * @see IDocumentProviderExtension#getStatus(Object) - * @since 2.0 - */ + @Override public IStatus getStatus(Object element) { ElementInfo info= (ElementInfo) fElementInfoMap.get(element); if (info != null) { @@ -982,10 +938,7 @@ public abstract class AbstractDocumentProvider implements IDocumentProvider, IDo protected void doSynchronize(Object element, IProgressMonitor monitor) throws CoreException { } - /* - * @see org.eclipse.ui.texteditor.IDocumentProviderExtension#synchronize(Object) - * @since 2.0 - */ + @Override public final void synchronize(final Object element) throws CoreException { if (element == null) @@ -993,10 +946,12 @@ public abstract class AbstractDocumentProvider implements IDocumentProvider, IDo class SynchronizeOperation extends DocumentProviderOperation implements ISchedulingRuleProvider { + @Override protected void execute(IProgressMonitor monitor) throws CoreException { doSynchronize(element, monitor); } + @Override public ISchedulingRule getSchedulingRule() { return getSynchronizeRule(element); } @@ -1005,42 +960,27 @@ public abstract class AbstractDocumentProvider implements IDocumentProvider, IDo executeOperation(new SynchronizeOperation(), getProgressMonitor()); } - /* - * @see org.eclipse.ui.texteditor.IDocumentProviderExtension2#getProgressMonitor() - * @since 2.1 - */ + @Override public IProgressMonitor getProgressMonitor() { return fProgressMonitor == null ? new NullProgressMonitor() : fProgressMonitor; } - /* - * @see org.eclipse.ui.texteditor.IDocumentProviderExtension2#setProgressMonitor(org.eclipse.core.runtime.IProgressMonitor) - * @since 2.1 - */ + @Override public void setProgressMonitor(IProgressMonitor progressMonitor) { fProgressMonitor= progressMonitor; } - /* - * @see org.eclipse.ui.texteditor.IDocumentProviderExtension3#isSynchronized(java.lang.Object) - * @since 3.0 - */ + @Override public boolean isSynchronized(Object element) { return true; } - /* - * @see org.eclipse.ui.texteditor.IDocumentProviderExtension5#isNotSynchronizedException(Object, CoreException) - * @since 3.2 - */ + @Override public boolean isNotSynchronizedException(Object element, CoreException ex) { return false; } - /* - * @see org.eclipse.ui.texteditor.IDocumentProviderExtension4#getContentType(java.lang.Object) - * @since 3.1 - */ + @Override public IContentType getContentType(Object element) throws CoreException { return null; } diff --git a/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/AbstractRulerActionDelegate.java b/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/AbstractRulerActionDelegate.java index f255eba7a5d..f18bc79dd4d 100644 --- a/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/AbstractRulerActionDelegate.java +++ b/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/AbstractRulerActionDelegate.java @@ -59,9 +59,7 @@ public abstract class AbstractRulerActionDelegate extends ActionDelegate impleme protected abstract IAction createAction(ITextEditor editor, IVerticalRulerInfo rulerInfo); - /* - * @see IEditorActionDelegate#setActiveEditor(org.eclipse.jface.action.IAction, org.eclipse.ui.IEditorPart) - */ + @Override public void setActiveEditor(IAction callerAction, IEditorPart targetEditor) { if (fEditor != null) { IVerticalRulerInfo rulerInfo= (IVerticalRulerInfo) fEditor.getAdapter(IVerticalRulerInfo.class); @@ -95,9 +93,7 @@ public abstract class AbstractRulerActionDelegate extends ActionDelegate impleme } } - /* - * @see org.eclipse.ui.IActionDelegate#run(org.eclipse.jface.action.IAction) - */ + @Override public void run(IAction callerAction) { if (fAction != null) fAction.run(); @@ -107,14 +103,13 @@ public abstract class AbstractRulerActionDelegate extends ActionDelegate impleme * @see org.eclipse.ui.IActionDelegate#run(org.eclipse.jface.action.IAction) * @since 3.2 */ + @Override public void runWithEvent(IAction action, Event event) { if (fAction != null) fAction.runWithEvent(event); } - /* - * @see org.eclipse.ui.IActionDelegate#selectionChanged(org.eclipse.jface.action.IAction, org.eclipse.jface.viewers.ISelection) - */ + @Override public void selectionChanged(IAction action, ISelection selection) { /* * This is a ruler action - don't update on selection. @@ -137,29 +132,21 @@ public abstract class AbstractRulerActionDelegate extends ActionDelegate impleme } } - /* - * @see IMenuListener#menuAboutToShow(org.eclipse.jface.action.IMenuManager) - */ + @Override public void menuAboutToShow(IMenuManager manager) { update(); } - /* - * @see MouseListener#mouseDoubleClick(org.eclipse.swt.events.MouseEvent) - */ + @Override public void mouseDoubleClick(MouseEvent e) { } - /* - * @see MouseListener#mouseDown(org.eclipse.swt.events.MouseEvent) - */ + @Override public void mouseDown(MouseEvent e) { update(); } - /* - * @see MouseListener#mouseUp(org.eclipse.swt.events.MouseEvent) - */ + @Override public void mouseUp(MouseEvent e) { } } diff --git a/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/AbstractTextEditor.java b/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/AbstractTextEditor.java index 16d640a3070..84164598260 100644 --- a/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/AbstractTextEditor.java +++ b/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/AbstractTextEditor.java @@ -341,7 +341,9 @@ public abstract class AbstractTextEditor extends EditorPart implements ITextEdit public boolean inputChanged; /* Detectors for editor input changes during the process of state validation. */ + @Override public void inputDocumentAboutToBeChanged(IDocument oldInput, IDocument newInput) {} + @Override public void inputDocumentChanged(IDocument oldInput, IDocument newInput) { inputChanged= true; } } @@ -356,15 +358,15 @@ public abstract class AbstractTextEditor extends EditorPart implements ITextEdit * @since 2.0 */ class Validator implements VerifyListener { - /* - * @see VerifyListener#verifyText(org.eclipse.swt.events.VerifyEvent) - */ + @Override public void verifyText(VerifyEvent e) { IDocument document= getDocumentProvider().getDocument(getEditorInput()); final boolean[] documentChanged= new boolean[1]; IDocumentListener listener= new IDocumentListener() { + @Override public void documentAboutToBeChanged(DocumentEvent event) { } + @Override public void documentChanged(DocumentEvent event) { documentChanged[0]= true; } @@ -392,13 +394,11 @@ public abstract class AbstractTextEditor extends EditorPart implements ITextEdit */ private Display fDisplay; - /* - * @see IElementStateListenerExtension#elementStateValidationChanged(Object, boolean) - * @since 2.0 - */ + @Override public void elementStateValidationChanged(final Object element, final boolean isStateValidated) { if (element != null && element.equals(getEditorInput())) { Runnable r= new Runnable() { + @Override public void run() { enableSanityChecking(true); if (isStateValidated) { @@ -430,12 +430,11 @@ public abstract class AbstractTextEditor extends EditorPart implements ITextEdit } - /* - * @see IElementStateListener#elementDirtyStateChanged(Object, boolean) - */ + @Override public void elementDirtyStateChanged(Object element, boolean isDirty) { if (element != null && element.equals(getEditorInput())) { Runnable r= new Runnable() { + @Override public void run() { enableSanityChecking(true); firePropertyChange(PROP_DIRTY); @@ -445,12 +444,11 @@ public abstract class AbstractTextEditor extends EditorPart implements ITextEdit } } - /* - * @see IElementStateListener#elementContentAboutToBeReplaced(Object) - */ + @Override public void elementContentAboutToBeReplaced(Object element) { if (element != null && element.equals(getEditorInput())) { Runnable r= new Runnable() { + @Override public void run() { enableSanityChecking(true); rememberSelection(); @@ -461,12 +459,11 @@ public abstract class AbstractTextEditor extends EditorPart implements ITextEdit } } - /* - * @see IElementStateListener#elementContentReplaced(Object) - */ + @Override public void elementContentReplaced(Object element) { if (element != null && element.equals(getEditorInput())) { Runnable r= new Runnable() { + @Override public void run() { enableSanityChecking(true); firePropertyChange(PROP_DIRTY); @@ -478,12 +475,11 @@ public abstract class AbstractTextEditor extends EditorPart implements ITextEdit } } - /* - * @see IElementStateListener#elementDeleted(Object) - */ + @Override public void elementDeleted(Object deletedElement) { if (deletedElement != null && deletedElement.equals(getEditorInput())) { Runnable r= new Runnable() { + @Override public void run() { enableSanityChecking(true); close(false); @@ -493,13 +489,12 @@ public abstract class AbstractTextEditor extends EditorPart implements ITextEdit } } - /* - * @see IElementStateListener#elementMoved(Object, Object) - */ + @Override public void elementMoved(final Object originalElement, final Object movedElement) { if (originalElement != null && originalElement.equals(getEditorInput())) { final boolean doValidationAsync= Display.getCurrent() != null; Runnable r= new Runnable() { + @Override public void run() { enableSanityChecking(true); @@ -549,6 +544,7 @@ public abstract class AbstractTextEditor extends EditorPart implements ITextEdit if (wasDirty && changed != null) { Runnable r2= new Runnable() { + @Override public void run() { validateState(getEditorInput()); d.getDocument(getEditorInput()).set(previousContent); @@ -567,19 +563,13 @@ public abstract class AbstractTextEditor extends EditorPart implements ITextEdit } } - /* - * @see IElementStateListenerExtension#elementStateChanging(Object) - * @since 2.0 - */ + @Override public void elementStateChanging(Object element) { if (element != null && element.equals(getEditorInput())) enableSanityChecking(false); } - /* - * @see IElementStateListenerExtension#elementStateChangeFailed(Object) - * @since 2.0 - */ + @Override public void elementStateChangeFailed(Object element) { if (element != null && element.equals(getEditorInput())) enableSanityChecking(true); @@ -614,6 +604,7 @@ public abstract class AbstractTextEditor extends EditorPart implements ITextEdit /** The posted updater code. */ private Runnable fRunnable= new Runnable() { + @Override public void run() { fIsRunnablePosted= false; @@ -669,9 +660,7 @@ public abstract class AbstractTextEditor extends EditorPart implements ITextEdit */ private boolean fUpdateLastEditPosition= false; - /* - * @see ITextListener#textChanged(TextEvent) - */ + @Override public void textChanged(TextEvent event) { /* @@ -692,9 +681,7 @@ public abstract class AbstractTextEditor extends EditorPart implements ITextEdit } } - /* - * @see org.eclipse.jface.text.ITextInputListener#inputDocumentAboutToBeChanged(org.eclipse.jface.text.IDocument, org.eclipse.jface.text.IDocument) - */ + @Override public void inputDocumentAboutToBeChanged(IDocument oldInput, IDocument newInput) { if (oldInput != null && fLocalLastEditPosition != null) { oldInput.removePosition(fLocalLastEditPosition); @@ -702,9 +689,7 @@ public abstract class AbstractTextEditor extends EditorPart implements ITextEdit } } - /* - * @see org.eclipse.jface.text.ITextInputListener#inputDocumentChanged(org.eclipse.jface.text.IDocument, org.eclipse.jface.text.IDocument) - */ + @Override public void inputDocumentChanged(IDocument oldInput, IDocument newInput) { } } @@ -713,9 +698,7 @@ public abstract class AbstractTextEditor extends EditorPart implements ITextEdit * Internal property change listener for handling changes in the editor's preferences. */ class PropertyChangeListener implements IPropertyChangeListener { - /* - * @see IPropertyChangeListener#propertyChange(org.eclipse.jface.util.PropertyChangeEvent) - */ + @Override public void propertyChange(PropertyChangeEvent event) { handlePreferenceStoreChanged(event); } @@ -726,9 +709,7 @@ public abstract class AbstractTextEditor extends EditorPart implements ITextEdit * @since 2.1 */ class FontPropertyChangeListener implements IPropertyChangeListener { - /* - * @see IPropertyChangeListener#propertyChange(org.eclipse.jface.util.PropertyChangeEvent) - */ + @Override public void propertyChange(PropertyChangeEvent event) { if (fSourceViewer == null) return; @@ -765,9 +746,7 @@ public abstract class AbstractTextEditor extends EditorPart implements ITextEdit */ private IKeyBindingService fKeyBindingService; - /* - * @see VerifyKeyListener#verifyKey(org.eclipse.swt.events.VerifyEvent) - */ + @Override public void verifyKey(VerifyEvent event) { ActionActivationCode code= null; @@ -941,36 +920,26 @@ public abstract class AbstractTextEditor extends EditorPart implements ITextEdit fPartService= null; } - /* - * @see IPartListener#partActivated(org.eclipse.ui.IWorkbenchPart) - */ + @Override public void partActivated(IWorkbenchPart part) { fActivePart= part; handleActivation(); } - /* - * @see IPartListener#partBroughtToTop(org.eclipse.ui.IWorkbenchPart) - */ + @Override public void partBroughtToTop(IWorkbenchPart part) { } - /* - * @see IPartListener#partClosed(org.eclipse.ui.IWorkbenchPart) - */ + @Override public void partClosed(IWorkbenchPart part) { } - /* - * @see IPartListener#partDeactivated(org.eclipse.ui.IWorkbenchPart) - */ + @Override public void partDeactivated(IWorkbenchPart part) { fActivePart= null; } - /* - * @see IPartListener#partOpened(org.eclipse.ui.IWorkbenchPart) - */ + @Override public void partOpened(IWorkbenchPart part) { // Restore the saved state if any if ((part == AbstractTextEditor.this || part.getAdapter(AbstractTextEditor.class) == AbstractTextEditor.this) && fMementoToRestore != null && containsSavedState(fMementoToRestore)) { @@ -997,10 +966,7 @@ public abstract class AbstractTextEditor extends EditorPart implements ITextEdit } } - /* - * @see org.eclipse.ui.IWindowListener#windowActivated(org.eclipse.ui.IWorkbenchWindow) - * @since 3.1 - */ + @Override public void windowActivated(IWorkbenchWindow window) { if (fHandleActivation && window == getEditorSite().getWorkbenchWindow()) { /* @@ -1009,6 +975,7 @@ public abstract class AbstractTextEditor extends EditorPart implements ITextEdit * Will be removed when SWT has solved the problem. */ window.getShell().getDisplay().asyncExec(new Runnable() { + @Override public void run() { handleActivation(); } @@ -1016,24 +983,15 @@ public abstract class AbstractTextEditor extends EditorPart implements ITextEdit } } - /* - * @see org.eclipse.ui.IWindowListener#windowDeactivated(org.eclipse.ui.IWorkbenchWindow) - * @since 3.1 - */ + @Override public void windowDeactivated(IWorkbenchWindow window) { } - /* - * @see org.eclipse.ui.IWindowListener#windowClosed(org.eclipse.ui.IWorkbenchWindow) - * @since 3.1 - */ + @Override public void windowClosed(IWorkbenchWindow window) { } - /* - * @see org.eclipse.ui.IWindowListener#windowOpened(org.eclipse.ui.IWorkbenchWindow) - * @since 3.1 - */ + @Override public void windowOpened(IWorkbenchWindow window) { } } @@ -1102,9 +1060,7 @@ public abstract class AbstractTextEditor extends EditorPart implements ITextEdit fScrollIncrement= scrollIncrement; } - /* - * @see IAction#run() - */ + @Override public void run() { if (fSourceViewer instanceof ITextViewerExtension5) { ITextViewerExtension5 extension= (ITextViewerExtension5) fSourceViewer; @@ -1132,17 +1088,12 @@ public abstract class AbstractTextEditor extends EditorPart implements ITextEdit super(bundle, prefix, IAction.AS_CHECK_BOX); } - /* - * @see org.eclipse.jface.action.IAction#run() - */ + @Override public void run() { switchToNextInsertMode(); } - /* - * @see org.eclipse.jface.action.IAction#isChecked() - * @since 3.0 - */ + @Override public boolean isChecked() { return fInsertMode == SMART_INSERT; } @@ -1159,9 +1110,7 @@ public abstract class AbstractTextEditor extends EditorPart implements ITextEdit super(bundle, prefix); } - /* - * @see org.eclipse.jface.action.IAction#run() - */ + @Override public void run() { toggleOverwriteMode(); } @@ -1225,9 +1174,7 @@ public abstract class AbstractTextEditor extends EditorPart implements ITextEdit return index; } - /* - * @see org.eclipse.jface.action.IAction#run() - */ + @Override public void run() { boolean isSmartHomeEndEnabled= false; IPreferenceStore store= getPreferenceStore(); @@ -1363,9 +1310,7 @@ public abstract class AbstractTextEditor extends EditorPart implements ITextEdit return index; } - /* - * @see org.eclipse.jface.action.IAction#run() - */ + @Override public void run() { boolean isSmartHomeEndEnabled= false; IPreferenceStore store= getPreferenceStore(); @@ -1446,9 +1391,7 @@ public abstract class AbstractTextEditor extends EditorPart implements ITextEdit * @since 2.0 */ class ShowRulerContextMenuAction extends Action { - /* - * @see IAction#run() - */ + @Override public void run() { if (fSourceViewer == null) return; @@ -1476,40 +1419,29 @@ public abstract class AbstractTextEditor extends EditorPart implements ITextEdit */ protected class SelectionProvider implements IPostSelectionProvider, ISelectionValidator { - /* - * @see org.eclipse.jface.viewers.ISelectionProvider#addSelectionChangedListener(ISelectionChangedListener) - */ + @Override public void addSelectionChangedListener(ISelectionChangedListener listener) { if (fSourceViewer != null) fSourceViewer.getSelectionProvider().addSelectionChangedListener(listener); } - /* - * @see org.eclipse.jface.viewers.ISelectionProvider#getSelection() - */ + @Override public ISelection getSelection() { return doGetSelection(); } - /* - * @see org.eclipse.jface.viewers.ISelectionProvider#removeSelectionChangedListener(ISelectionChangedListener) - */ + @Override public void removeSelectionChangedListener(ISelectionChangedListener listener) { if (fSourceViewer != null) fSourceViewer.getSelectionProvider().removeSelectionChangedListener(listener); } - /* - * @see org.eclipse.jface.viewers.ISelectionProvider#setSelection(ISelection) - */ + @Override public void setSelection(ISelection selection) { doSetSelection(selection); } - /* - * @see org.eclipse.jface.text.IPostSelectionProvider#addPostSelectionChangedListener(org.eclipse.jface.viewers.ISelectionChangedListener) - * @since 3.0 - */ + @Override public void addPostSelectionChangedListener(ISelectionChangedListener listener) { if (fSourceViewer != null) { if (fSourceViewer.getSelectionProvider() instanceof IPostSelectionProvider) { @@ -1519,10 +1451,7 @@ public abstract class AbstractTextEditor extends EditorPart implements ITextEdit } } - /* - * @see org.eclipse.jface.text.IPostSelectionProvider#removePostSelectionChangedListener(org.eclipse.jface.viewers.ISelectionChangedListener) - * @since 3.0 - */ + @Override public void removePostSelectionChangedListener(ISelectionChangedListener listener) { if (fSourceViewer != null) { if (fSourceViewer.getSelectionProvider() instanceof IPostSelectionProvider) { @@ -1532,10 +1461,7 @@ public abstract class AbstractTextEditor extends EditorPart implements ITextEdit } } - /* - * @see org.eclipse.jface.text.IPostSelectionValidator#isValid() - * @since 3.0 - */ + @Override public boolean isValid(ISelection postSelection) { return fSelectionListener != null && fSelectionListener.isValid(postSelection); } @@ -1595,25 +1521,17 @@ public abstract class AbstractTextEditor extends EditorPart implements ITextEdit private final Object INVALID_SELECTION= new Object(); private Object fPostSelection= INVALID_SELECTION; - /* - * @see org.eclipse.jface.viewers.ISelectionChangedListener#selectionChanged(org.eclipse.jface.viewers.SelectionChangedEvent) - */ + @Override public synchronized void selectionChanged(SelectionChangedEvent event) { fPostSelection= event.getSelection(); } - /* - * @see org.eclipse.jface.text.IDocumentListener#documentAboutToBeChanged(org.eclipse.jface.text.DocumentEvent) - * @since 3.0 - */ + @Override public synchronized void documentAboutToBeChanged(DocumentEvent event) { fPostSelection= INVALID_SELECTION; } - /* - * @see org.eclipse.jface.text.IDocumentListener#documentChanged(org.eclipse.jface.text.DocumentEvent) - * @since 3.0 - */ + @Override public void documentChanged(DocumentEvent event) { } @@ -1630,10 +1548,7 @@ public abstract class AbstractTextEditor extends EditorPart implements ITextEdit fDocument.addDocumentListener(this); } - /* - * @see org.eclipse.ui.texteditor.AbstractTextEditor.AbstractSelectionChangedListener#install(org.eclipse.jface.viewers.ISelectionProvider) - * @since 3.0 - */ + @Override public void install(ISelectionProvider selectionProvider) { super.install(selectionProvider); @@ -1641,10 +1556,7 @@ public abstract class AbstractTextEditor extends EditorPart implements ITextEdit selectionProvider.addSelectionChangedListener(this); } - /* - * @see org.eclipse.ui.texteditor.AbstractTextEditor.AbstractSelectionChangedListener#uninstall(org.eclipse.jface.viewers.ISelectionProvider) - * @since 3.0 - */ + @Override public void uninstall(ISelectionProvider selectionProvider) { if (selectionProvider != null) selectionProvider.removeSelectionChangedListener(this); @@ -1686,9 +1598,7 @@ public abstract class AbstractTextEditor extends EditorPart implements ITextEdit fColumns= new ArrayList(); } - /* - * @see org.eclipse.ui.texteditor.IColumnSupport#setColumnVisible(java.lang.String, boolean) - */ + @Override public final void setColumnVisible(RulerColumnDescriptor descriptor, boolean visible) { Assert.isLegal(descriptor != null); @@ -1713,6 +1623,7 @@ public abstract class AbstractTextEditor extends EditorPart implements ITextEdit final int idx= computeIndex(ruler, descriptor); SafeRunnable runnable= new SafeRunnable() { + @Override public void run() throws Exception { IContributedRulerColumn column= descriptor.createColumn(fEditor); fColumns.add(column); @@ -1740,6 +1651,7 @@ public abstract class AbstractTextEditor extends EditorPart implements ITextEdit private void removeColumn(final CompositeRuler ruler, final IContributedRulerColumn rulerColumn) { if (rulerColumn != null) { SafeRunnable runnable= new SafeRunnable() { + @Override public void run() throws Exception { if (ruler != null) ruler.removeDecorator(rulerColumn); @@ -1797,18 +1709,14 @@ public abstract class AbstractTextEditor extends EditorPart implements ITextEdit return index; } - /* - * @see org.eclipse.ui.texteditor.IColumnSupport#isColumnVisible(java.lang.String) - */ + @Override public final boolean isColumnVisible(RulerColumnDescriptor descriptor) { Assert.isLegal(descriptor != null); CompositeRuler ruler= getRuler(); return ruler != null && getVisibleColumn(ruler, descriptor) != null; } - /* - * @see org.eclipse.ui.texteditor.IColumnSupport#isColumnSupported(java.lang.String) - */ + @Override public final boolean isColumnSupported(RulerColumnDescriptor descriptor) { Assert.isLegal(descriptor != null); if (getRuler() == null) @@ -1836,6 +1744,7 @@ public abstract class AbstractTextEditor extends EditorPart implements ITextEdit * Subclasses may extend this method.</p> * */ + @Override public void dispose() { for (Iterator iter= new ArrayList(fColumns).iterator(); iter.hasNext();) removeColumn(getRuler(), (IContributedRulerColumn)iter.next()); @@ -1872,9 +1781,7 @@ public abstract class AbstractTextEditor extends EditorPart implements ITextEdit fTextOperationAction= textOperationAction; } - /* - * @see org.eclipse.jface.action.IAction#run() - */ + @Override public void run() { ISourceViewer sourceViewer= getSourceViewer(); @@ -2011,6 +1918,7 @@ public abstract class AbstractTextEditor extends EditorPart implements ITextEdit * * @deprecated As of 2.1, replaced by {@link JFaceResources#TEXT_FONT} */ + @Deprecated public static final String PREFERENCE_FONT= JFaceResources.TEXT_FONT; /** * Key used to look up foreground color preference. @@ -2412,6 +2320,7 @@ public abstract class AbstractTextEditor extends EditorPart implements ITextEdit public int fValue; + @Override public String toString() { return String.valueOf(fValue); } @@ -2731,9 +2640,7 @@ public abstract class AbstractTextEditor extends EditorPart implements ITextEdit fHelpContextId= null; } - /* - * @see ITextEditor#getDocumentProvider() - */ + @Override public IDocumentProvider getDocumentProvider() { return fExplicitDocumentProvider; } @@ -2925,9 +2832,7 @@ public abstract class AbstractTextEditor extends EditorPart implements ITextEdit } } - /* - * @see ITextEditor#isEditable() - */ + @Override public boolean isEditable() { IDocumentProvider provider= getDocumentProvider(); if (provider instanceof IDocumentProviderExtension) { @@ -2946,6 +2851,7 @@ public abstract class AbstractTextEditor extends EditorPart implements ITextEdit * @return the selection provider or <code>null</code> if the editor has * been disposed */ + @Override public ISelectionProvider getSelectionProvider() { return fSelectionProvider; } @@ -3040,6 +2946,7 @@ public abstract class AbstractTextEditor extends EditorPart implements ITextEdit */ protected IMenuListener createContextMenuListener() { return new IMenuListener() { + @Override public void menuAboutToShow(IMenuManager menu) { String id= menu.getId(); if (getRulerContextMenuId().equals(id)) { @@ -3099,6 +3006,7 @@ public abstract class AbstractTextEditor extends EditorPart implements ITextEdit } } + @Override public void mouseUp(final MouseEvent e) { setFocus(); final int delay= fMouseUpDelta == 0 ? 0 : fDoubleClickTime - (int)(System.currentTimeMillis() - fMouseUpDelta); @@ -3106,6 +3014,7 @@ public abstract class AbstractTextEditor extends EditorPart implements ITextEdit return; Runnable runnable= new Runnable() { + @Override public void run() { if (!fDoubleClicked) triggerAction(ITextEditorActionConstants.RULER_CLICK, e); @@ -3117,6 +3026,7 @@ public abstract class AbstractTextEditor extends EditorPart implements ITextEdit e.widget.getDisplay().timerExec(delay, runnable); } + @Override public void mouseDoubleClick(MouseEvent e) { if (1 == e.button) { fDoubleClicked= true; @@ -3124,6 +3034,7 @@ public abstract class AbstractTextEditor extends EditorPart implements ITextEdit } } + @Override public void mouseDown(MouseEvent e) { fMouseUpDelta= System.currentTimeMillis(); fDoubleClicked= false; @@ -3149,6 +3060,7 @@ public abstract class AbstractTextEditor extends EditorPart implements ITextEdit fSelectionChangedListener= new ISelectionChangedListener() { private Runnable fRunnable= new Runnable() { + @Override public void run() { // check whether editor has not been disposed yet if (fSourceViewer != null && fSourceViewer.getDocument() != null) { @@ -3160,6 +3072,7 @@ public abstract class AbstractTextEditor extends EditorPart implements ITextEdit private Display fDisplay; + @Override public void selectionChanged(SelectionChangedEvent event) { if (fDisplay == null) fDisplay= getSite().getShell().getDisplay(); @@ -3187,19 +3100,24 @@ public abstract class AbstractTextEditor extends EditorPart implements ITextEdit if (fCursorListener == null) { fCursorListener= new ICursorListener() { + @Override public void keyPressed(KeyEvent e) { handleCursorPositionChanged(); } + @Override public void keyReleased(KeyEvent e) { } + @Override public void mouseDoubleClick(MouseEvent e) { } + @Override public void mouseDown(MouseEvent e) { } + @Override public void mouseUp(MouseEvent e) { handleCursorPositionChanged(); } @@ -3224,6 +3142,7 @@ public abstract class AbstractTextEditor extends EditorPart implements ITextEdit protected final void internalInit(IWorkbenchWindow window, final IEditorSite site, final IEditorInput input) throws PartInitException { IRunnableWithProgress runnable= new IRunnableWithProgress() { + @Override public void run(IProgressMonitor monitor) throws InvocationTargetException, InterruptedException { try { @@ -3270,9 +3189,7 @@ public abstract class AbstractTextEditor extends EditorPart implements ITextEdit } } - /* - * @see IEditorPart#init(org.eclipse.ui.IEditorSite, org.eclipse.ui.IEditorInput) - */ + @Override public void init(final IEditorSite site, final IEditorInput input) throws PartInitException { setSite(site); @@ -3430,6 +3347,7 @@ public abstract class AbstractTextEditor extends EditorPart implements ITextEdit * * @param parent the parent composite */ + @Override public void createPartControl(Composite parent) { fVerticalRuler= createVerticalRuler(); @@ -3468,6 +3386,7 @@ public abstract class AbstractTextEditor extends EditorPart implements ITextEdit // Disable orientation switching until we fully support it. styledText.addListener(SWT.OrientationChange, new Listener() { + @Override public void handleEvent(Event event) { event.doit= false; } @@ -3585,6 +3504,7 @@ public abstract class AbstractTextEditor extends EditorPart implements ITextEdit source.addDragListener(new DragSourceAdapter() { String fSelectedText; Point fSelection; + @Override public void dragStart(DragSourceEvent event) { fTextDragAndDropToken= null; try { @@ -3613,11 +3533,13 @@ public abstract class AbstractTextEditor extends EditorPart implements ITextEdit return offset >= fSelection.x && offset < fSelection.y; } + @Override public void dragSetData(DragSourceEvent event) { event.data= fSelectedText; fTextDragAndDropToken= this; // Can be any non-null object } + @Override public void dragFinished(DragSourceEvent event) { try { if (event.detail == DND.DROP_MOVE && validateEditorInputState()) { @@ -3647,6 +3569,7 @@ public abstract class AbstractTextEditor extends EditorPart implements ITextEdit private Point fSelection; + @Override public void dragEnter(DropTargetEvent event) { fTextDragAndDropToken= null; fSelection= st.getSelection(); @@ -3661,6 +3584,7 @@ public abstract class AbstractTextEditor extends EditorPart implements ITextEdit } } + @Override public void dragOperationChanged(DropTargetEvent event) { if (event.detail == DND.DROP_DEFAULT) { if ((event.operations & DND.DROP_MOVE) != 0) { @@ -3673,10 +3597,12 @@ public abstract class AbstractTextEditor extends EditorPart implements ITextEdit } } + @Override public void dragOver(DropTargetEvent event) { event.feedback |= DND.FEEDBACK_SCROLL; } + @Override public void drop(DropTargetEvent event) { try { if (fTextDragAndDropToken != null && event.detail == DND.DROP_MOVE) { @@ -3897,6 +3823,7 @@ public abstract class AbstractTextEditor extends EditorPart implements ITextEdit private Font fMagnificationStartFont; private int fLastHeight= -1; + @Override public void gesture(GestureEvent e) { if (e.detail == SWT.GESTURE_BEGIN) { fMagnificationStartFont= styledText.getFont(); @@ -4305,10 +4232,7 @@ public abstract class AbstractTextEditor extends EditorPart implements ITextEdit return null; } - /* - * @see org.eclipse.ui.part.EditorPart#setInputWithNotify(org.eclipse.ui.IEditorInput) - * @since 3.2 - */ + @Override protected final void setInputWithNotify(IEditorInput input) { try { @@ -4330,9 +4254,7 @@ public abstract class AbstractTextEditor extends EditorPart implements ITextEdit } } - /* - * @see EditorPart#setInput(org.eclipse.ui.IEditorInput) - */ + @Override public final void setInput(IEditorInput input) { setInputWithNotify(input); } @@ -4340,12 +4262,14 @@ public abstract class AbstractTextEditor extends EditorPart implements ITextEdit /* * @see ITextEditor#close */ + @Override public void close(final boolean save) { enableSanityChecking(false); Display display= getSite().getShell().getDisplay(); display.asyncExec(new Runnable() { + @Override public void run() { if (fSourceViewer != null) getSite().getPage().closeEditor(AbstractTextEditor.this, save); @@ -4362,6 +4286,7 @@ public abstract class AbstractTextEditor extends EditorPart implements ITextEdit * disposed. * </p> */ + @Override public void dispose() { if (fActivationListener != null) { @@ -4828,6 +4753,7 @@ public abstract class AbstractTextEditor extends EditorPart implements ITextEdit * <code>IEditorPart</code> method calls <code>performSaveAs</code>. * Subclasses may reimplement. */ + @Override public void doSaveAs() { /* * 1GEUSSR: ITPUI:ALL - User should never loose changes made in the editors. @@ -4853,6 +4779,7 @@ public abstract class AbstractTextEditor extends EditorPart implements ITextEdit * * @param progressMonitor the progress monitor for communicating result state or <code>null</code> */ + @Override public void doSave(IProgressMonitor progressMonitor) { IDocumentProvider p= getDocumentProvider(); @@ -5003,10 +4930,7 @@ public abstract class AbstractTextEditor extends EditorPart implements ITextEdit updateStateDependentActions(); } - /* - * @see org.eclipse.ui.texteditor.ITextEditorExtension2#validateEditorInputState() - * @since 2.1 - */ + @Override public boolean validateEditorInputState() { boolean enabled= false; @@ -5027,9 +4951,7 @@ public abstract class AbstractTextEditor extends EditorPart implements ITextEdit try { final IEditorInput input= getEditorInput(); BusyIndicator.showWhile(getSite().getShell().getDisplay(), new Runnable() { - /* - * @see java.lang.Runnable#run() - */ + @Override public void run() { validateState(input); } @@ -5201,13 +5123,12 @@ public abstract class AbstractTextEditor extends EditorPart implements ITextEdit * * @return <code>false</code> */ + @Override public boolean isSaveAsAllowed() { return false; } - /* - * @see EditorPart#isDirty() - */ + @Override public boolean isDirty() { IDocumentProvider p= getDocumentProvider(); return p == null ? false : p.canSaveDocument(getEditorInput()); @@ -5217,6 +5138,7 @@ public abstract class AbstractTextEditor extends EditorPart implements ITextEdit * The <code>AbstractTextEditor</code> implementation of this * <code>ITextEditor</code> method may be extended by subclasses. */ + @Override public void doRevertToSaved() { IDocumentProvider p= getDocumentProvider(); if (p == null) @@ -5269,9 +5191,7 @@ public abstract class AbstractTextEditor extends EditorPart implements ITextEdit protected void handleElementContentReplaced() { } - /* - * @see ITextEditor#setAction(String, IAction) - */ + @Override public void setAction(String actionID, IAction action) { Assert.isNotNull(actionID); if (action == null) { @@ -5326,9 +5246,7 @@ public abstract class AbstractTextEditor extends EditorPart implements ITextEdit setActionActivation(true); } - /* - * @see ITextEditor#setActionActivationCode(String, char, int, int) - */ + @Override public void setActionActivationCode(String actionID, char activationCharacter, int activationKeyCode, int activationStateMask) { Assert.isNotNull(actionID); @@ -5360,9 +5278,7 @@ public abstract class AbstractTextEditor extends EditorPart implements ITextEdit return null; } - /* - * @see ITextEditor#removeActionActivationCode(String) - */ + @Override public void removeActionActivationCode(String actionID) { Assert.isNotNull(actionID); ActionActivationCode code= findActionActivationCode(actionID); @@ -5370,9 +5286,7 @@ public abstract class AbstractTextEditor extends EditorPart implements ITextEdit fActivationCodes.remove(code); } - /* - * @see ITextEditor#getAction(String) - */ + @Override public IAction getAction(String actionID) { Assert.isNotNull(actionID); IAction action= (IAction) fActions.get(actionID); @@ -5417,9 +5331,7 @@ public abstract class AbstractTextEditor extends EditorPart implements ITextEdit if (actionSize > 1) { IConfigurationElement[] actionArray= (IConfigurationElement[])actions.toArray(new IConfigurationElement[actionSize]); ConfigurationElementSorter sorter= new ConfigurationElementSorter() { - /* - * @see org.eclipse.ui.texteditor.ConfigurationElementSorter#getConfigurationElement(java.lang.Object) - */ + @Override public IConfigurationElement getConfigurationElement(Object object) { return (IConfigurationElement)object; } @@ -5823,6 +5735,7 @@ public abstract class AbstractTextEditor extends EditorPart implements ITextEdit setAction(ITextEditorActionConstants.SHIFT_RIGHT, action); action= new ShiftAction(EditorMessages.getBundleForConstructedKeys(), "Editor.ShiftRight.", this, ITextOperationTarget.SHIFT_RIGHT) { //$NON-NLS-1$ + @Override public void update() { updateForTab(); } @@ -5980,6 +5893,7 @@ public abstract class AbstractTextEditor extends EditorPart implements ITextEdit setAction(ITextEditorActionConstants.WORD_WRAP, action); blockAction.addPropertyChangeListener(new IPropertyChangeListener() { + @Override public void propertyChange(PropertyChangeEvent event) { if (IAction.CHECKED == event.getProperty() && Boolean.TRUE.equals(event.getNewValue())) { @@ -5988,6 +5902,7 @@ public abstract class AbstractTextEditor extends EditorPart implements ITextEdit } }); wrapAction.addPropertyChangeListener(new IPropertyChangeListener() { + @Override public void propertyChange(PropertyChangeEvent event) { if (IAction.CHECKED == event.getProperty() && Boolean.TRUE.equals(event.getNewValue())) { @@ -6004,18 +5919,23 @@ public abstract class AbstractTextEditor extends EditorPart implements ITextEdit PropertyDialogAction openProperties= new PropertyDialogAction( new IShellProvider() { + @Override public Shell getShell() { return getSite().getShell(); } }, new ISelectionProvider() { + @Override public void addSelectionChangedListener(ISelectionChangedListener listener) { } + @Override public ISelection getSelection() { return new StructuredSelection(getEditorInput()); } + @Override public void removeSelectionChangedListener(ISelectionChangedListener listener) { } + @Override public void setSelection(ISelection selection) { } }); @@ -6177,9 +6097,7 @@ public abstract class AbstractTextEditor extends EditorPart implements ITextEdit return getEditorSite().getActionBars().getStatusLineManager(); } - /* - * @see IAdaptable#getAdapter(java.lang.Class) - */ + @Override public Object getAdapter(Class required) { if (IEditorStatusLine.class.equals(required)) { @@ -6257,31 +6175,23 @@ public abstract class AbstractTextEditor extends EditorPart implements ITextEdit return super.getAdapter(required); } - /* - * @see IWorkbenchPart#setFocus() - */ + @Override public void setFocus() { if (fSourceViewer != null && fSourceViewer.getTextWidget() != null) fSourceViewer.getTextWidget().setFocus(); } - /* - * @see ITextEditor#showsHighlightRangeOnly() - */ + @Override public boolean showsHighlightRangeOnly() { return fShowHighlightRangeOnly; } - /* - * @see ITextEditor#showHighlightRangeOnly(boolean) - */ + @Override public void showHighlightRangeOnly(boolean showHighlightRangeOnly) { fShowHighlightRangeOnly= showHighlightRangeOnly; } - /* - * @see ITextEditor#setHighlightRange(int, int, boolean) - */ + @Override public void setHighlightRange(int offset, int length, boolean moveCursor) { if (fSourceViewer == null) return; @@ -6296,9 +6206,7 @@ public abstract class AbstractTextEditor extends EditorPart implements ITextEdit } } - /* - * @see ITextEditor#getHighlightRange() - */ + @Override public IRegion getHighlightRange() { if (fSourceViewer == null) return null; @@ -6312,6 +6220,7 @@ public abstract class AbstractTextEditor extends EditorPart implements ITextEdit /* * @see ITextEditor#resetHighlightRange */ + @Override public void resetHighlightRange() { if (fSourceViewer == null) return; @@ -6343,9 +6252,7 @@ public abstract class AbstractTextEditor extends EditorPart implements ITextEdit } } - /* - * @see ITextEditor#selectAndReveal(int, int) - */ + @Override public void selectAndReveal(int start, int length) { selectAndReveal(start, length, start, length); } @@ -6387,13 +6294,12 @@ public abstract class AbstractTextEditor extends EditorPart implements ITextEdit * @see org.eclipse.ui.INavigationLocationProvider#createNavigationLocation() * @since 2.1 */ + @Override public INavigationLocation createEmptyNavigationLocation() { return new TextSelectionNavigationLocation(this, false); } - /* - * @see org.eclipse.ui.INavigationLocationProvider#createNavigationLocation() - */ + @Override public INavigationLocation createNavigationLocation() { return new TextSelectionNavigationLocation(this, true); } @@ -6424,18 +6330,13 @@ public abstract class AbstractTextEditor extends EditorPart implements ITextEdit } } - /* - * @see WorkbenchPart#firePropertyChange(int) - */ + @Override protected void firePropertyChange(int property) { super.firePropertyChange(property); updatePropertyDependentActions(); } - /* - * @see ITextEditorExtension#setStatusField(IStatusField, String) - * @since 2.0 - */ + @Override public void setStatusField(IStatusField field, String category) { Assert.isNotNull(category); if (field != null) { @@ -6476,18 +6377,12 @@ public abstract class AbstractTextEditor extends EditorPart implements ITextEdit return !fIsOverwriting; } - /* - * @see org.eclipse.ui.texteditor.ITextEditorExtension3#getInsertMode() - * @since 3.0 - */ + @Override public InsertMode getInsertMode() { return fInsertMode; } - /* - * @see org.eclipse.ui.texteditor.ITextEditorExtension3#setInsertMode(org.eclipse.ui.texteditor.ITextEditorExtension3.InsertMode) - * @since 3.0 - */ + @Override public void setInsertMode(InsertMode newMode) { List legalModes= getLegalInsertModes(); if (!legalModes.contains(newMode)) @@ -6814,10 +6709,7 @@ public abstract class AbstractTextEditor extends EditorPart implements ITextEdit } } - /* - * @see ITextEditorExtension#isEditorInputReadOnly() - * @since 2.0 - */ + @Override public boolean isEditorInputReadOnly() { IDocumentProvider provider= getDocumentProvider(); if (provider instanceof IDocumentProviderExtension) { @@ -6827,10 +6719,7 @@ public abstract class AbstractTextEditor extends EditorPart implements ITextEdit return true; } - /* - * @see ITextEditorExtension2#isEditorInputModifiable() - * @since 2.1 - */ + @Override public boolean isEditorInputModifiable() { IDocumentProvider provider= getDocumentProvider(); if (provider instanceof IDocumentProviderExtension) { @@ -6840,18 +6729,12 @@ public abstract class AbstractTextEditor extends EditorPart implements ITextEdit return true; } - /* - * @see ITextEditorExtension#addRulerContextMenuListener(IMenuListener) - * @since 2.0 - */ + @Override public void addRulerContextMenuListener(IMenuListener listener) { fRulerContextMenuListeners.add(listener); } - /* - * @see ITextEditorExtension#removeRulerContextMenuListener(IMenuListener) - * @since 2.0 - */ + @Override public void removeRulerContextMenuListener(IMenuListener listener) { fRulerContextMenuListeners.remove(listener); } @@ -6939,18 +6822,12 @@ public abstract class AbstractTextEditor extends EditorPart implements ITextEdit return viewer.overlapsWithVisibleRegion(offset, length); } - /* - * @see org.eclipse.ui.texteditor.ITextEditorExtension3#showChangeInformation(boolean) - * @since 3.0 - */ + @Override public void showChangeInformation(boolean show) { // do nothing } - /* - * @see org.eclipse.ui.texteditor.ITextEditorExtension3#isChangeInformationShowing() - * @since 3.0 - */ + @Override public boolean isChangeInformationShowing() { return false; } @@ -6988,6 +6865,7 @@ public abstract class AbstractTextEditor extends EditorPart implements ITextEdit * @see #findAnnotation(int, int, boolean, Position) * @since 3.2 */ + @Override public Annotation gotoAnnotation(boolean forward) { ITextSelection selection= (ITextSelection) getSelectionProvider().getSelection(); Position position= new Position(0, 0); @@ -7097,26 +6975,17 @@ public abstract class AbstractTextEditor extends EditorPart implements ITextEdit return true; } - /* - * @see org.eclipse.ui.texteditor.ITextEditorExtension4#showRevisionInformation(org.eclipse.jface.text.revisions.RevisionInformation, java.lang.String) - * @since 3.2 - */ + @Override public void showRevisionInformation(RevisionInformation info, String quickDiffProviderId) { // no implementation } - /* - * @see org.eclipse.ui.IEditorPersistable#restoreState(org.eclipse.ui.IMemento) - * @since 3.3 - */ + @Override public void restoreState(IMemento memento) { fMementoToRestore= memento; } - /* - * @see org.eclipse.ui.IPersistable#saveState(org.eclipse.ui.IMemento) - * @since 3.3 - */ + @Override public void saveState(IMemento memento) { ISelection selection= doGetSelection(); if (selection instanceof ITextSelection) { @@ -7171,10 +7040,7 @@ public abstract class AbstractTextEditor extends EditorPart implements ITextEdit textWidget.setHorizontalPixel(horizontalPixel.intValue()); } - /* - * @see org.eclipse.ui.ISaveablesSource#getSaveables() - * @since 3.3 - */ + @Override public Saveable[] getSaveables() { if (fSavable == null) fSavable= new TextEditorSavable(this); @@ -7182,10 +7048,7 @@ public abstract class AbstractTextEditor extends EditorPart implements ITextEdit return new Saveable[] { fSavable }; } - /* - * @see org.eclipse.ui.ISaveablesSource#getActiveSaveables() - * @since 3.3 - */ + @Override public Saveable[] getActiveSaveables() { return getSaveables(); } @@ -7224,35 +7087,27 @@ public abstract class AbstractTextEditor extends EditorPart implements ITextEdit fTextEditor= null; } - /* - * @see org.eclipse.ui.Saveable#getName() - */ + @Override public String getName() { return fEditorInput.getName(); } - /* - * @see org.eclipse.ui.Saveable#getToolTipText() - */ + @Override public String getToolTipText() { return fEditorInput.getToolTipText(); } - /* - * @see org.eclipse.ui.Saveable#getImageDescriptor() - */ + @Override public ImageDescriptor getImageDescriptor() { return fEditorInput.getImageDescriptor(); } - /* - * @see org.eclipse.ui.Saveable#doSave(org.eclipse.core.runtime.IProgressMonitor) - * @since 3.3 - */ + @Override public void doSave(IProgressMonitor monitor) throws CoreException { fTextEditor.doSave(monitor); } + @Override public boolean isDirty() { return fTextEditor.isDirty(); } @@ -7264,9 +7119,7 @@ public abstract class AbstractTextEditor extends EditorPart implements ITextEdit return false; } - /* - * @see org.eclipse.ui.Saveable#hashCode() - */ + @Override public int hashCode() { Object document= getAdapter(IDocument.class); if (document == null) @@ -7274,9 +7127,7 @@ public abstract class AbstractTextEditor extends EditorPart implements ITextEdit return document.hashCode(); } - /* - * @see org.eclipse.ui.Saveable#equals(java.lang.Object) - */ + @Override public boolean equals(Object obj) { if (this == obj) return true; @@ -7299,6 +7150,7 @@ public abstract class AbstractTextEditor extends EditorPart implements ITextEdit * * @see org.eclipse.ui.Saveable#getAdapter(java.lang.Class) */ + @Override public Object getAdapter(Class adapter) { if (adapter == IDocument.class) { if (fDocument == null) { @@ -7395,6 +7247,7 @@ public abstract class AbstractTextEditor extends EditorPart implements ITextEdit * @see org.eclipse.ui.texteditor.ITextEditorExtension5#isBlockSelectionModeEnabled() * @since 3.5 */ + @Override public final boolean isBlockSelectionModeEnabled() { ISourceViewer viewer= getSourceViewer(); if (viewer != null) { @@ -7409,6 +7262,7 @@ public abstract class AbstractTextEditor extends EditorPart implements ITextEdit * @see org.eclipse.ui.texteditor.ITextEditorExtension5#setBlockSelectionMode(boolean) * @since 3.5 */ + @Override public void setBlockSelectionMode(boolean enable) { if (!isBlockSelectionModeSupported()) return; @@ -7469,6 +7323,7 @@ public abstract class AbstractTextEditor extends EditorPart implements ITextEdit * @since 3.10 * @see AbstractTextEditor#isWordWrapSupported() */ + @Override public final boolean isWordWrapEnabled() { if (!isWordWrapSupported()) { return false; @@ -7487,6 +7342,7 @@ public abstract class AbstractTextEditor extends EditorPart implements ITextEdit * @see org.eclipse.ui.texteditor.ITextEditorExtension6#setWordWrap(boolean) * @since 3.10 */ + @Override public void setWordWrap(boolean enable) { if (!isWordWrapSupported() || isWordWrapEnabled() == enable) { return; diff --git a/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/AnnotationPreference.java b/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/AnnotationPreference.java index 3d7f0944bf3..7f57fbad566 100644 --- a/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/AnnotationPreference.java +++ b/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/AnnotationPreference.java @@ -479,6 +479,7 @@ public class AnnotationPreference { * @return the marker type, or <code>null</code> if none is set * @deprecated since 3.0 */ + @Deprecated public String getMarkerType() { return fMarkerType; } @@ -489,6 +490,7 @@ public class AnnotationPreference { * @return the marker severity * @deprecated since 3.0 */ + @Deprecated public int getSeverity() { return fSeverity; } diff --git a/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/BasicTextEditorActionContributor.java b/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/BasicTextEditorActionContributor.java index df0af8ec328..29acfb5422c 100644 --- a/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/BasicTextEditorActionContributor.java +++ b/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/BasicTextEditorActionContributor.java @@ -244,13 +244,12 @@ public class BasicTextEditorActionContributor extends EditorActionBarContributor * * @param part {@inheritDoc} */ + @Override public void setActiveEditor(IEditorPart part) { doSetActiveEditor(part); } - /* - * @see EditorActionBarContributor#contributeToMenu(IMenuManager) - */ + @Override public void contributeToMenu(IMenuManager menu) { IMenuManager editMenu= menu.findMenuUsingPath(IWorkbenchActionConstants.M_EDIT); @@ -293,20 +292,14 @@ public class BasicTextEditorActionContributor extends EditorActionBarContributor menu.insertAfter(id, item); } - /* - * @see EditorActionBarContributor#contributeToStatusLine(org.eclipse.jface.action.IStatusLineManager) - * @since 2.0 - */ + @Override public void contributeToStatusLine(IStatusLineManager statusLineManager) { super.contributeToStatusLine(statusLineManager); for (int i= 0; i < STATUS_FIELD_DEFS.length; i++) statusLineManager.add((IContributionItem)fStatusFields.get(STATUS_FIELD_DEFS[i])); } - /* - * @see org.eclipse.ui.IEditorActionBarContributor#dispose() - * @since 2.0 - */ + @Override public void dispose() { doSetActiveEditor(null); super.dispose(); diff --git a/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/BlockSelectionModeToggleAction.java b/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/BlockSelectionModeToggleAction.java index 470c961524b..e81d3edfbce 100644 --- a/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/BlockSelectionModeToggleAction.java +++ b/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/BlockSelectionModeToggleAction.java @@ -33,9 +33,7 @@ final class BlockSelectionModeToggleAction extends TextEditorAction { super(resourceBundle, prefix, editor, IAction.AS_CHECK_BOX); } - /* - * @see org.eclipse.jface.action.Action#run() - */ + @Override public void run() { ITextEditor editor= getTextEditor(); if (editor instanceof ITextEditorExtension5) { @@ -45,9 +43,7 @@ final class BlockSelectionModeToggleAction extends TextEditorAction { update(); // update in case anyone else has directly accessed the widget } - /* - * @see org.eclipse.ui.texteditor.TextEditorAction#update() - */ + @Override public void update() { ITextEditor editor= getTextEditor(); if (editor instanceof ITextEditorExtension5) { diff --git a/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/CaseAction.java b/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/CaseAction.java index d5b0e073c7c..ac4f577fb10 100644 --- a/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/CaseAction.java +++ b/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/CaseAction.java @@ -53,9 +53,7 @@ public class CaseAction extends TextEditorAction { update(); } - /* - * @see org.eclipse.jface.action.IAction#run() - */ + @Override public void run() { ITextEditor editor= getTextEditor(); if (editor == null) diff --git a/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/ConfigurationElementSorter.java b/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/ConfigurationElementSorter.java index 212975fa160..0457234ae9c 100644 --- a/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/ConfigurationElementSorter.java +++ b/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/ConfigurationElementSorter.java @@ -79,10 +79,7 @@ public abstract class ConfigurationElementSorter { initialize(elements); } - /* - * @see Comparator#compare(java.lang.Object, java.lang.Object) - * @since 2.0 - */ + @Override public int compare(Object object0, Object object1) { if (dependsOn(object0, object1)) diff --git a/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/ContentAssistAction.java b/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/ContentAssistAction.java index 5c87f35ba1e..a9b892082c9 100644 --- a/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/ContentAssistAction.java +++ b/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/ContentAssistAction.java @@ -64,6 +64,7 @@ public final class ContentAssistAction extends TextEditorAction { /** * Runs the content assist operation on the editor's text operation target. */ + @Override public void run() { if (fOperationTarget != null) { @@ -78,6 +79,7 @@ public final class ContentAssistAction extends TextEditorAction { display= shell.getDisplay(); BusyIndicator.showWhile(display, new Runnable() { + @Override public void run() { fOperationTarget.doOperation(ISourceViewer.CONTENTASSIST_PROPOSALS); } @@ -92,6 +94,7 @@ public final class ContentAssistAction extends TextEditorAction { * editor's <code>ITextOperationTarget</code> adapter, and sets the * enabled state accordingly. */ + @Override public void update() { ITextEditor editor= getTextEditor(); @@ -115,6 +118,7 @@ public final class ContentAssistAction extends TextEditorAction { /** * @see TextEditorAction#setEditor(ITextEditor) */ + @Override public void setEditor(ITextEditor editor) { super.setEditor(editor); fOperationTarget= null; diff --git a/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/ConvertLineDelimitersAction.java b/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/ConvertLineDelimitersAction.java index 82fef74904c..526f9714165 100644 --- a/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/ConvertLineDelimitersAction.java +++ b/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/ConvertLineDelimitersAction.java @@ -40,6 +40,7 @@ import org.eclipse.jface.text.TextUtilities; * @since 2.0 * @deprecated since 3.1. Line delimiter conversion has been modified to work on groups of files rather than being editor specific */ +@Deprecated public class ConvertLineDelimitersAction extends TextEditorAction { @@ -74,9 +75,7 @@ public class ConvertLineDelimitersAction extends TextEditorAction { update(); } - /* - * @see org.eclipse.jface.action.Action#run() - */ + @Override public void run() { try { @@ -136,9 +135,7 @@ public class ConvertLineDelimitersAction extends TextEditorAction { fLineDelimiter= lineDelimiter; } - /* - * @see IRunnableWithProgress#run(org.eclipse.core.runtime.IProgressMonitor) - */ + @Override public void run(IProgressMonitor monitor) throws InvocationTargetException, InterruptedException { IDocument document= fRewriteTarget.getDocument(); @@ -182,9 +179,7 @@ public class ConvertLineDelimitersAction extends TextEditorAction { } } - /* - * @see Runnable#run() - */ + @Override public void run() { try { run(new NullProgressMonitor()); @@ -266,9 +261,7 @@ public class ConvertLineDelimitersAction extends TextEditorAction { } } - /* - * @see IUpdate#update() - */ + @Override public void update() { super.update(); setEnabled(canModifyEditor()); diff --git a/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/DefaultRangeIndicator.java b/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/DefaultRangeIndicator.java index c89bb17d354..429f6df35cd 100644 --- a/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/DefaultRangeIndicator.java +++ b/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/DefaultRangeIndicator.java @@ -52,9 +52,7 @@ public class DefaultRangeIndicator extends Annotation implements IAnnotationPres public DefaultRangeIndicator() { } - /* - * @see org.eclipse.jface.text.source.IAnnotationPresentation#paint(org.eclipse.swt.graphics.GC, org.eclipse.swt.widgets.Canvas, org.eclipse.swt.graphics.Rectangle) - */ + @Override public void paint(GC gc, Canvas canvas, Rectangle bounds) { Point canvasSize= canvas.getSize(); @@ -84,9 +82,7 @@ public class DefaultRangeIndicator extends Annotation implements IAnnotationPres gc.fillRectangle(x, bounds.y + bounds.height - b, w, b); } - /* - * @see org.eclipse.jface.text.source.IAnnotationPresentation#getLayer() - */ + @Override public int getLayer() { return IAnnotationPresentation.DEFAULT_LAYER; } @@ -102,6 +98,7 @@ public class DefaultRangeIndicator extends Annotation implements IAnnotationPres fImage= createImage(control.getDisplay(), control.getSize()); control.addDisposeListener(new DisposeListener() { + @Override public void widgetDisposed(DisposeEvent e) { if (fImage != null && !fImage.isDisposed()) { fImage.dispose(); diff --git a/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/DeleteLineAction.java b/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/DeleteLineAction.java index ffccf7c26d7..eb8508b7269 100644 --- a/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/DeleteLineAction.java +++ b/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/DeleteLineAction.java @@ -166,9 +166,7 @@ public class DeleteLineAction extends TextEditorAction { return (ITextSelection) selection; } - /* - * @see IAction#run() - */ + @Override public void run() { if (fTarget == null) @@ -199,9 +197,7 @@ public class DeleteLineAction extends TextEditorAction { } } - /* - * @see IUpdate#update() - */ + @Override public void update() { super.update(); diff --git a/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/EditorStatusLine.java b/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/EditorStatusLine.java index b3cd97e87eb..c1f3afeae14 100644 --- a/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/EditorStatusLine.java +++ b/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/EditorStatusLine.java @@ -31,9 +31,7 @@ class EditorStatusLine implements IEditorStatusLine { * Clears the status line on selection changed. */ private class StatusLineClearer implements ISelectionChangedListener { - /* - * @see ISelectionChangedListener#selectionChanged(org.eclipse.jface.viewers.SelectionChangedEvent) - */ + @Override public void selectionChanged(SelectionChangedEvent event) { fStatusLineManager.setErrorMessage(null, null); fStatusLineManager.setMessage(null, null); @@ -85,9 +83,7 @@ class EditorStatusLine implements IEditorStatusLine { return fSelectionProvider; } - /* - * @see org.eclipse.ui.texteditor.IStatusLine#setMessage(boolean, String, Image) - */ + @Override public void setMessage(boolean error, String message, Image image) { if (error) diff --git a/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/FindNextAction.java b/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/FindNextAction.java index 0e4147c6ebf..9d8919bf8a0 100644 --- a/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/FindNextAction.java +++ b/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/FindNextAction.java @@ -114,6 +114,7 @@ public class FindNextAction extends ResourceAction implements IUpdate { * * @deprecated use FindReplaceAction(ResourceBundle, String, IWorkbenchPart, boolean) instead */ + @Deprecated public FindNextAction(ResourceBundle bundle, String prefix, IWorkbenchWindow workbenchWindow, boolean forward) { super(bundle, prefix); fWorkbenchWindow= workbenchWindow; @@ -175,9 +176,7 @@ public class FindNextAction extends ResourceAction implements IUpdate { manager.setMessage(""); //$NON-NLS-1$ } - /* - * @see IAction#run() - */ + @Override public void run() { if (fTarget != null) { readConfiguration(); @@ -216,9 +215,7 @@ public class FindNextAction extends ResourceAction implements IUpdate { return true; } - /* - * @see IUpdate#update() - */ + @Override public void update() { if (fWorkbenchPart == null && fWorkbenchWindow != null) diff --git a/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/FindReplaceAction.java b/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/FindReplaceAction.java index 79a828a4d8a..28938472540 100644 --- a/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/FindReplaceAction.java +++ b/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/FindReplaceAction.java @@ -129,25 +129,18 @@ public class FindReplaceAction extends ResourceAction implements IUpdate { } } - /* - * @see org.eclipse.ui.IPartListener2#partActivated(org.eclipse.ui.IWorkbenchPartReference) - */ + @Override public void partActivated(IWorkbenchPartReference partRef) { partActivated(partRef.getPart(true)); } - /* - * @see org.eclipse.jface.dialogs.IPageChangedListener#pageChanged(org.eclipse.jface.dialogs.PageChangedEvent) - * @since 3.5 - */ + @Override public void pageChanged(PageChangedEvent event) { if (event.getSource() instanceof IWorkbenchPart) partActivated((IWorkbenchPart)event.getSource()); } - /* - * @see org.eclipse.ui.IPartListener2#partClosed(org.eclipse.ui.IWorkbenchPartReference) - */ + @Override public void partClosed(IWorkbenchPartReference partRef) { IWorkbenchPart part= partRef.getPart(true); if (part == fPreviousPart) { @@ -159,9 +152,7 @@ public class FindReplaceAction extends ResourceAction implements IUpdate { partActivated((IWorkbenchPart)null); } - /* - * @see DisposeListener#widgetDisposed(DisposeEvent) - */ + @Override public void widgetDisposed(DisposeEvent event) { if (fgFindReplaceDialogStub == this) @@ -180,42 +171,27 @@ public class FindReplaceAction extends ResourceAction implements IUpdate { fPreviousTarget= null; } - /* - * @see org.eclipse.ui.IPartListener2#partOpened(IWorkbenchPartReference) - */ + @Override public void partOpened(IWorkbenchPartReference partRef) { } - /* - * @see org.eclipse.ui.IPartListener2#partDeactivated(IWorkbenchPartReference) - */ + @Override public void partDeactivated(IWorkbenchPartReference partRef) { } - /* - * @see org.eclipse.ui.IPartListener2#partBroughtToTop(IWorkbenchPartReference) - */ + @Override public void partBroughtToTop(IWorkbenchPartReference partRef) { } - /* - * @see org.eclipse.ui.IPartListener2#partHidden(org.eclipse.ui.IWorkbenchPartReference) - * @since 3.5 - */ + @Override public void partHidden(IWorkbenchPartReference partRef) { } - /* - * @see org.eclipse.ui.IPartListener2#partInputChanged(org.eclipse.ui.IWorkbenchPartReference) - * @since 3.5 - */ + @Override public void partInputChanged(IWorkbenchPartReference partRef) { } - /* - * @see org.eclipse.ui.IPartListener2#partVisible(org.eclipse.ui.IWorkbenchPartReference) - * @since 3.5 - */ + @Override public void partVisible(IWorkbenchPartReference partRef) { } @@ -328,15 +304,14 @@ public class FindReplaceAction extends ResourceAction implements IUpdate { * * @deprecated use FindReplaceAction(ResourceBundle, String, IWorkbenchPart) instead */ + @Deprecated public FindReplaceAction(ResourceBundle bundle, String prefix, IWorkbenchWindow workbenchWindow) { super(bundle, prefix); fWorkbenchWindow= workbenchWindow; update(); } - /* - * @see IAction#run() - */ + @Override public void run() { if (fTarget == null) return; @@ -374,9 +349,7 @@ public class FindReplaceAction extends ResourceAction implements IUpdate { dialog.open(); } - /* - * @see IUpdate#update() - */ + @Override public void update() { if(fShell == null){ diff --git a/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/FindReplaceDialog.java b/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/FindReplaceDialog.java index 18331201bb4..e59f3f2f8a7 100644 --- a/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/FindReplaceDialog.java +++ b/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/FindReplaceDialog.java @@ -79,9 +79,7 @@ class FindReplaceDialog extends Dialog { * Updates the find replace dialog on activation changes. */ class ActivationListener extends ShellAdapter { - /* - * @see ShellListener#shellActivated(ShellEvent) - */ + @Override public void shellActivated(ShellEvent e) { fActiveShell= (Shell)e.widget; updateButtonState(); @@ -91,9 +89,7 @@ class FindReplaceDialog extends Dialog { } - /* - * @see ShellListener#shellDeactivated(ShellEvent) - */ + @Override public void shellDeactivated(ShellEvent e) { fGiveFocusToFindField= false; @@ -125,9 +121,7 @@ class FindReplaceDialog extends Dialog { fIgnoreNextEvent= true; } - /* - * @see ModifyListener#modifyText(ModifyEvent) - */ + @Override public void modifyText(ModifyEvent e) { // XXX: Workaround for Combo bug on Linux (see bug 404202 and bug 410603) @@ -259,10 +253,7 @@ class FindReplaceDialog extends Dialog { setBlockOnOpen(false); } - /* - * @see org.eclipse.jface.dialogs.Dialog#isResizable() - * @since 3.4 - */ + @Override protected boolean isResizable() { return true; } @@ -271,6 +262,7 @@ class FindReplaceDialog extends Dialog { * Returns this dialog's parent shell. * @return the dialog's parent shell */ + @Override public Shell getParentShell() { return super.getParentShell(); } @@ -286,9 +278,7 @@ class FindReplaceDialog extends Dialog { return control != null && !control.isDisposed(); } - /* - * @see org.eclipse.jface.window.Window#create() - */ + @Override public void create() { super.create(); @@ -330,6 +320,7 @@ class FindReplaceDialog extends Dialog { panel.setLayout(layout); fFindNextButton= makeButton(panel, EditorMessages.FindReplace_FindNextButton_label, 102, true, new SelectionAdapter() { + @Override public void widgetSelected(SelectionEvent e) { if (isIncrementalSearch() && !isRegExSearchAvailableAndChecked()) initIncrementalBaseLocation(); @@ -342,6 +333,7 @@ class FindReplaceDialog extends Dialog { setGridData(fFindNextButton, SWT.FILL, true, SWT.FILL, false); fReplaceFindButton= makeButton(panel, EditorMessages.FindReplace_ReplaceFindButton_label, 103, false, new SelectionAdapter() { + @Override public void widgetSelected(SelectionEvent e) { if (fNeedsInitialFindBeforeReplace) performSearch((e.stateMask == SWT.SHIFT) ^ isForwardSearch()); @@ -353,6 +345,7 @@ class FindReplaceDialog extends Dialog { setGridData(fReplaceFindButton, SWT.FILL, false, SWT.FILL, false); fReplaceSelectionButton= makeButton(panel, EditorMessages.FindReplace_ReplaceSelectionButton_label, 104, false, new SelectionAdapter() { + @Override public void widgetSelected(SelectionEvent e) { if (fNeedsInitialFindBeforeReplace) performSearch(); @@ -364,6 +357,7 @@ class FindReplaceDialog extends Dialog { setGridData(fReplaceSelectionButton, SWT.FILL, false, SWT.FILL, false); fReplaceAllButton= makeButton(panel, EditorMessages.FindReplace_ReplaceAllButton_label, 105, false, new SelectionAdapter() { + @Override public void widgetSelected(SelectionEvent e) { performReplaceAll(); updateFindAndReplaceHistory(); @@ -404,9 +398,7 @@ class FindReplaceDialog extends Dialog { return panel; } - /* - * @see org.eclipse.jface.window.Window#createContents(org.eclipse.swt.widgets.Composite) - */ + @Override protected Control createContents(Composite parent) { Composite panel= new Composite(parent, SWT.NULL); @@ -429,6 +421,7 @@ class FindReplaceDialog extends Dialog { setGridData(statusBar, SWT.FILL, true, SWT.BOTTOM, false); panel.addTraverseListener(new TraverseListener() { + @Override public void keyTraversed(TraverseEvent e) { if (e.detail == SWT.TRAVERSE_RETURN) { if (!Util.isMac()) { @@ -505,11 +498,13 @@ class FindReplaceDialog extends Dialog { group.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true)); SelectionListener selectionListener= new SelectionListener() { + @Override public void widgetSelected(SelectionEvent e) { if (isIncrementalSearch() && !isRegExSearchAvailableAndChecked()) initIncrementalBaseLocation(); } + @Override public void widgetDefaultSelected(SelectionEvent e) { } }; @@ -558,6 +553,7 @@ class FindReplaceDialog extends Dialog { setGridData(fGlobalRadioButton, SWT.LEFT, false, SWT.CENTER, false); fGlobalRadioButton.setSelection(fGlobalInit); fGlobalRadioButton.addSelectionListener(new SelectionListener() { + @Override public void widgetSelected(SelectionEvent e) { if (!fGlobalRadioButton.getSelection() || !fUseSelectedLines) return; @@ -565,6 +561,7 @@ class FindReplaceDialog extends Dialog { useSelectedLines(false); } + @Override public void widgetDefaultSelected(SelectionEvent e) { } }); @@ -576,6 +573,7 @@ class FindReplaceDialog extends Dialog { fSelectedRangeRadioButton.setSelection(!fGlobalInit); fUseSelectedLines= !fGlobalInit; fSelectedRangeRadioButton.addSelectionListener(new SelectionListener() { + @Override public void widgetSelected(SelectionEvent e) { if (!fSelectedRangeRadioButton.getSelection() || fUseSelectedLines) return; @@ -583,6 +581,7 @@ class FindReplaceDialog extends Dialog { useSelectedLines(true); } + @Override public void widgetDefaultSelected(SelectionEvent e) { } }); @@ -638,6 +637,7 @@ class FindReplaceDialog extends Dialog { private Composite createInputPanel(Composite parent) { ModifyListener listener= new ModifyListener() { + @Override public void modifyText(ModifyEvent e) { updateButtonState(); } @@ -711,10 +711,12 @@ class FindReplaceDialog extends Dialog { group.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true)); SelectionListener selectionListener= new SelectionListener() { + @Override public void widgetSelected(SelectionEvent e) { storeSettings(); } + @Override public void widgetDefaultSelected(SelectionEvent e) { } }; @@ -745,6 +747,7 @@ class FindReplaceDialog extends Dialog { setGridData(fIncrementalCheckBox, SWT.LEFT, false, SWT.CENTER, false); fIncrementalCheckBox.setSelection(fIncrementalInit); fIncrementalCheckBox.addSelectionListener(new SelectionListener() { + @Override public void widgetSelected(SelectionEvent e) { if (isIncrementalSearch() && !isRegExSearch()) initIncrementalBaseLocation(); @@ -752,6 +755,7 @@ class FindReplaceDialog extends Dialog { storeSettings(); } + @Override public void widgetDefaultSelected(SelectionEvent e) { } }); @@ -763,9 +767,7 @@ class FindReplaceDialog extends Dialog { ((GridData)fIsRegExCheckBox.getLayoutData()).horizontalSpan= 2; fIsRegExCheckBox.setSelection(fIsRegExInit); fIsRegExCheckBox.addSelectionListener(new SelectionAdapter() { - /* - * @see org.eclipse.swt.events.SelectionAdapter#widgetSelected(org.eclipse.swt.events.SelectionEvent) - */ + @Override public void widgetSelected(SelectionEvent e) { boolean newState= fIsRegExCheckBox.getSelection(); fIncrementalCheckBox.setEnabled(!newState); @@ -777,9 +779,7 @@ class FindReplaceDialog extends Dialog { storeButtonWithMnemonicInMap(fIsRegExCheckBox); fWholeWordCheckBox.setEnabled(!isRegExSearchAvailableAndChecked()); fWholeWordCheckBox.addSelectionListener(new SelectionAdapter() { - /* - * @see org.eclipse.swt.events.SelectionAdapter#widgetSelected(org.eclipse.swt.events.SelectionEvent) - */ + @Override public void widgetSelected(SelectionEvent e) { updateButtonState(); } @@ -816,6 +816,7 @@ class FindReplaceDialog extends Dialog { /* * @see Dialog#buttonPressed */ + @Override protected void buttonPressed(int buttonID) { if (buttonID == 101) close(); @@ -971,10 +972,7 @@ class FindReplaceDialog extends Dialog { return fDialogPositionInit; } - /* - * @see org.eclipse.jface.dialogs.Dialog#getInitialSize() - * @since 3.5 - */ + @Override protected Point getInitialSize() { Point initialSize= super.getInitialSize(); Point minSize= getShell().computeSize(SWT.DEFAULT, SWT.DEFAULT); @@ -1045,6 +1043,7 @@ class FindReplaceDialog extends Dialog { /** * @see org.eclipse.jface.window.Window#close() */ + @Override public boolean close() { handleDialogClose(); return super.close(); @@ -1351,6 +1350,7 @@ class FindReplaceDialog extends Dialog { class ReplaceAllRunnable implements Runnable { public int numberOfOccurrences; + @Override public void run() { numberOfOccurrences= replaceAll(findString, replaceString == null ? "" : replaceString, isForwardSearch(), isCaseSensitiveSearch(), isWholeWordSearch(), isRegExSearchAvailableAndChecked()); //$NON-NLS-1$ } @@ -1751,6 +1751,7 @@ class FindReplaceDialog extends Dialog { * * @param shell the new parent shell */ + @Override public void setParentShell(Shell shell) { if (shell != fParentShell) { @@ -1781,10 +1782,7 @@ class FindReplaceDialog extends Dialog { return fDialogSettings; } - /* - * @see org.eclipse.jface.dialogs.Dialog#getDialogBoundsSettings() - * @since 3.2 - */ + @Override protected IDialogSettings getDialogBoundsSettings() { String sectionName= getClass().getName() + "_dialogBounds"; //$NON-NLS-1$ IDialogSettings settings= TextEditorPlugin.getDefault().getDialogSettings(); @@ -1794,10 +1792,7 @@ class FindReplaceDialog extends Dialog { return section; } - /* - * @see org.eclipse.jface.dialogs.Dialog#getDialogBoundsStrategy() - * @since 3.2 - */ + @Override protected int getDialogBoundsStrategy() { return DIALOG_PERSISTLOCATION | DIALOG_PERSISTSIZE; } diff --git a/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/FindReplaceTarget.java b/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/FindReplaceTarget.java index 9173f5788f2..d58319eb20d 100644 --- a/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/FindReplaceTarget.java +++ b/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/FindReplaceTarget.java @@ -61,28 +61,21 @@ class FindReplaceTarget implements IFindReplaceTarget, IFindReplaceTargetExtensi return null; } - /* - * @see org.eclipse.jface.text.IFindReplaceTarget#canPerformFind() - */ + @Override public boolean canPerformFind() { if (getTarget() != null) return getTarget().canPerformFind(); return false; } - /* - * @see org.eclipse.jface.text.IFindReplaceTarget#findAndSelect(int, java.lang.String, boolean, boolean, boolean) - */ + @Override public int findAndSelect(int offset, String findString, boolean searchForward, boolean caseSensitive, boolean wholeWord) { if (getTarget() != null) return getTarget().findAndSelect(offset, findString, searchForward, caseSensitive, wholeWord); return -1; } - /* - * @see org.eclipse.jface.text.IFindReplaceTargetExtension3#findAndSelect(int, String, boolean, boolean, boolean, boolean) - * @since 3.0 - */ + @Override public int findAndSelect(int offset, String findString, boolean searchForward, boolean caseSensitive, boolean wholeWord, boolean regExSearch) { if (getTarget() instanceof IFindReplaceTargetExtension3) return ((IFindReplaceTargetExtension3)getTarget()).findAndSelect(offset, findString, searchForward, caseSensitive, wholeWord, regExSearch); @@ -94,27 +87,21 @@ class FindReplaceTarget implements IFindReplaceTarget, IFindReplaceTargetExtensi return -1; } - /* - * @see org.eclipse.jface.text.IFindReplaceTarget#getSelection() - */ + @Override public Point getSelection() { if (getTarget() != null) return getTarget().getSelection(); return new Point(-1, -1); } - /* - * @see org.eclipse.jface.text.IFindReplaceTarget#getSelectionText() - */ + @Override public String getSelectionText() { if (getTarget() != null) return getTarget().getSelectionText(); return ""; //$NON-NLS-1$ } - /* - * @see org.eclipse.jface.text.IFindReplaceTarget#isEditable() - */ + @Override public boolean isEditable() { if (getTarget() != null) { if (getTarget().isEditable()) @@ -124,18 +111,13 @@ class FindReplaceTarget implements IFindReplaceTarget, IFindReplaceTargetExtensi return false; } - /* - * @see org.eclipse.jface.text.IFindReplaceTarget#replaceSelection(java.lang.String) - */ + @Override public void replaceSelection(String text) { if (getTarget() != null) getTarget().replaceSelection(text); } - /* - * @see org.eclipse.jface.text.IFindReplaceTargetExtension3#replaceSelection(String, boolean) - * @since 3.0 - */ + @Override public void replaceSelection(String text, boolean regExReplace) { if (getTarget() instanceof IFindReplaceTargetExtension3) { ((IFindReplaceTargetExtension3)getTarget()).replaceSelection(text, regExReplace); @@ -147,75 +129,57 @@ class FindReplaceTarget implements IFindReplaceTarget, IFindReplaceTargetExtensi getTarget().replaceSelection(text); } - /* - * @see org.eclipse.jface.text.IFindReplaceTargetExtension#beginSession() - */ + @Override public void beginSession() { if (getExtension() != null) getExtension().beginSession(); } - /* - * @see org.eclipse.jface.text.IFindReplaceTargetExtension#endSession() - */ + @Override public void endSession() { if (getExtension() != null) getExtension().endSession(); } - /* - * @see org.eclipse.jface.text.IFindReplaceTargetExtension#getScope() - */ + @Override public IRegion getScope() { if (getExtension() != null) return getExtension().getScope(); return null; } - /* - * @see org.eclipse.jface.text.IFindReplaceTargetExtension#setScope(org.eclipse.jface.text.IRegion) - */ + @Override public void setScope(IRegion scope) { if (getExtension() != null) getExtension().setScope(scope); } - /* - * @see org.eclipse.jface.text.IFindReplaceTargetExtension#getLineSelection() - */ + @Override public Point getLineSelection() { if (getExtension() != null) return getExtension().getLineSelection(); return null; } - /* - * @see org.eclipse.jface.text.IFindReplaceTargetExtension#setSelection(int, int) - */ + @Override public void setSelection(int offset, int length) { if (getExtension() != null) getExtension().setSelection(offset, length); } - /* - * @see org.eclipse.jface.text.IFindReplaceTargetExtension#setScopeHighlightColor(org.eclipse.swt.graphics.Color) - */ + @Override public void setScopeHighlightColor(Color color) { if (getExtension() != null) getExtension().setScopeHighlightColor(color); } - /* - * @see org.eclipse.jface.text.IFindReplaceTargetExtension#setReplaceAllMode(boolean) - */ + @Override public void setReplaceAllMode(boolean replaceAll) { if (getExtension() != null) getExtension().setReplaceAllMode(replaceAll); } - /* - * @see org.eclipse.ui.texteditor.IFindReplaceTargetExtension2#validateTargetState() - */ + @Override public boolean validateTargetState() { return fEditor.validateEditorInputState(); } diff --git a/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/GotoAnnotationAction.java b/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/GotoAnnotationAction.java index a737c0c5ca0..5500bf37a95 100644 --- a/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/GotoAnnotationAction.java +++ b/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/GotoAnnotationAction.java @@ -64,29 +64,20 @@ public class GotoAnnotationAction extends TextEditorAction { this(EditorMessages.getBundleForConstructedKeys(), forward ? "Editor.GotoNextAnnotation." : "Editor.GotoPreviousAnnotation.", editor, forward); //$NON-NLS-1$ //$NON-NLS-2$ } - /* - * @see org.eclipse.jface.action.IAction#run() - * @since 3.2 - */ + @Override public void run() { ITextEditor editor= getTextEditor(); if (editor instanceof ITextEditorExtension4) ((ITextEditorExtension4)editor).gotoAnnotation(fForward); } - /* - * @see org.eclipse.ui.texteditor.TextEditorAction#setEditor(org.eclipse.ui.texteditor.ITextEditor) - * @since 3.2 - */ + @Override public void setEditor(ITextEditor editor) { super.setEditor(editor); update(); } - /* - * @see org.eclipse.ui.texteditor.IUpdate#update() - * @since 3.2 - */ + @Override public void update() { ITextEditor editor= getTextEditor(); if (!(editor instanceof AbstractTextEditor)) { diff --git a/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/GotoLastEditPositionAction.java b/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/GotoLastEditPositionAction.java index b0a3117466b..cc9d69c2607 100644 --- a/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/GotoLastEditPositionAction.java +++ b/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/GotoLastEditPositionAction.java @@ -54,23 +54,17 @@ public class GotoLastEditPositionAction extends Action implements IWorkbenchWind setEnabled(false); } - /* - * @see IWorkbenchWindowActionDelegate#init(org.eclipse.ui.IWorkbenchWindow) - */ + @Override public void init(IWorkbenchWindow window) { fWindow= window; } - /* - * @see org.eclipse.ui.IActionDelegate#run(org.eclipse.jface.action.IAction) - */ + @Override public void run(IAction action) { run(); } - /* - * @see IAction#run() - */ + @Override public void run() { EditPosition editPosition= TextEditorPlugin.getDefault().getLastEditPosition(); if (editPosition == null) @@ -119,9 +113,7 @@ public class GotoLastEditPositionAction extends Action implements IWorkbenchWind } } - /* - * @see org.eclipse.ui.IActionDelegate#selectionChanged(org.eclipse.jface.action.IAction, org.eclipse.jface.viewers.ISelection) - */ + @Override public void selectionChanged(IAction action, ISelection selection) { boolean enabled= TextEditorPlugin.getDefault().getLastEditPosition() != null; setEnabled(enabled); @@ -147,9 +139,7 @@ public class GotoLastEditPositionAction extends Action implements IWorkbenchWind return fWindow; } - /* - * @see IWorkbenchWindowActionDelegate#dispose() - */ + @Override public void dispose() { fWindow= null; TextEditorPlugin.getDefault().removeLastEditPositionDependentAction(fAction); diff --git a/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/GotoLineAction.java b/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/GotoLineAction.java index a2ed256c030..9909feee67f 100644 --- a/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/GotoLineAction.java +++ b/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/GotoLineAction.java @@ -62,9 +62,7 @@ public class GotoLineAction extends TextEditorAction { */ class NumberValidator implements IInputValidator { - /* - * @see IInputValidator#isValid(String) - */ + @Override public String isValid(String input) { if (input == null || input.length() == 0) @@ -97,10 +95,7 @@ public class GotoLineAction extends TextEditorAction { super(parent, title, message, initialValue, validator); } - /* - * @see org.eclipse.jface.dialogs.Dialog#getDialogBoundsSettings() - * @since 3.2 - */ + @Override protected IDialogSettings getDialogBoundsSettings() { String sectionName= getClass().getName() + "_dialogBounds"; //$NON-NLS-1$ IDialogSettings settings= TextEditorPlugin.getDefault().getDialogSettings(); @@ -110,10 +105,7 @@ public class GotoLineAction extends TextEditorAction { return section; } - /* - * @see org.eclipse.jface.dialogs.Dialog#getDialogBoundsStrategy() - * @since 3.2 - */ + @Override protected int getDialogBoundsStrategy() { return DIALOG_PERSISTLOCATION; } @@ -183,9 +175,7 @@ public class GotoLineAction extends TextEditorAction { } } - /* - * @see Action#run() - */ + @Override public void run() { ITextEditor editor= getTextEditor(); diff --git a/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/HippieCompleteAction.java b/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/HippieCompleteAction.java index 84faf1954df..36ed5e41f7c 100644 --- a/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/HippieCompleteAction.java +++ b/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/HippieCompleteAction.java @@ -210,6 +210,7 @@ final class HippieCompleteAction extends TextEditorAction { HippieCompleteAction(ResourceBundle bundle, String prefix, ITextEditor editor) { super(bundle, prefix, editor); fExitStrategy.addCompoundListener(new ICompoundEditListener() { + @Override public void endCompoundEdit() { clearState(); } @@ -323,9 +324,7 @@ final class HippieCompleteAction extends TextEditorAction { getTextEditor().getSite().getShell().getDisplay().beep(); } - /* - * @see org.eclipse.jface.action.Action#run() - */ + @Override public void run() { if (!validateEditorInputState()) return; @@ -337,16 +336,12 @@ final class HippieCompleteAction extends TextEditorAction { completeNext(); } - /* - * @see org.eclipse.jface.action.IAction#isEnabled() - */ + @Override public boolean isEnabled() { return canModifyEditor(); } - /* - * @see org.eclipse.ui.texteditor.TextEditorAction#setEditor(org.eclipse.ui.texteditor.ITextEditor) - */ + @Override public void setEditor(ITextEditor editor) { clearState(); // make sure to remove listers before the editor changes! super.setEditor(editor); diff --git a/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/HippieProposalProcessor.java b/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/HippieProposalProcessor.java index a2e2fd7a858..afc6350bcfa 100644 --- a/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/HippieProposalProcessor.java +++ b/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/HippieProposalProcessor.java @@ -64,30 +64,37 @@ public final class HippieProposalProcessor implements IContentAssistProcessor { fOffset= offset; } + @Override public void apply(IDocument document) { apply(null, '\0', 0, fOffset); } + @Override public Point getSelection(IDocument document) { return new Point(fOffset + fString.length(), 0); } + @Override public String getAdditionalProposalInfo() { return null; } + @Override public String getDisplayString() { return fPrefix + fString; } + @Override public Image getImage() { return null; } + @Override public IContextInformation getContextInformation() { return null; } + @Override public void apply(IDocument document, char trigger, int offset) { try { String replacement= fString.substring(offset - fOffset); @@ -98,28 +105,35 @@ public final class HippieProposalProcessor implements IContentAssistProcessor { } } + @Override public boolean isValidFor(IDocument document, int offset) { return validate(document, offset, null); } + @Override public char[] getTriggerCharacters() { return null; } + @Override public int getContextInformationPosition() { return 0; } + @Override public void apply(ITextViewer viewer, char trigger, int stateMask, int offset) { apply(viewer.getDocument(), trigger, offset); } + @Override public void selected(ITextViewer viewer, boolean smartToggle) { } + @Override public void unselected(ITextViewer viewer) { } + @Override public boolean validate(IDocument document, int offset, DocumentEvent event) { try { int prefixStart= fOffset - fPrefix.length(); @@ -129,18 +143,22 @@ public final class HippieProposalProcessor implements IContentAssistProcessor { } } + @Override public IInformationControlCreator getInformationControlCreator() { return null; } + @Override public CharSequence getPrefixCompletionText(IDocument document, int completionOffset) { return fPrefix + fString; } + @Override public int getPrefixCompletionStart(IDocument document, int completionOffset) { return fOffset - fPrefix.length(); } + @Override public boolean isAutoInsertable() { return true; } @@ -155,9 +173,7 @@ public final class HippieProposalProcessor implements IContentAssistProcessor { public HippieProposalProcessor() { } - /* - * @see org.eclipse.jface.text.contentassist.IContentAssistProcessor#computeCompletionProposals(org.eclipse.jface.text.ITextViewer, int) - */ + @Override public ICompletionProposal[] computeCompletionProposals(ITextViewer viewer, int offset) { try { String prefix= getPrefix(viewer, offset); @@ -197,31 +213,23 @@ public final class HippieProposalProcessor implements IContentAssistProcessor { return new Proposal(string, prefix, offset); } - /* - * @see org.eclipse.jface.text.contentassist.IContentAssistProcessor#computeContextInformation(org.eclipse.jface.text.ITextViewer, int) - */ + @Override public IContextInformation[] computeContextInformation(ITextViewer viewer, int offset) { // no context informations for hippie completions return NO_CONTEXTS; } - /* - * @see org.eclipse.jface.text.contentassist.IContentAssistProcessor#getCompletionProposalAutoActivationCharacters() - */ + @Override public char[] getCompletionProposalAutoActivationCharacters() { return null; } - /* - * @see org.eclipse.jface.text.contentassist.IContentAssistProcessor#getContextInformationAutoActivationCharacters() - */ + @Override public char[] getContextInformationAutoActivationCharacters() { return null; } - /* - * @see org.eclipse.jface.text.contentassist.IContentAssistProcessor#getContextInformationValidator() - */ + @Override public IContextInformationValidator getContextInformationValidator() { return null; } @@ -281,9 +289,7 @@ public final class HippieProposalProcessor implements IContentAssistProcessor { return uniqueSuggestions; } - /* - * @see org.eclipse.jface.text.contentassist.ICompletionProposalComputer#getErrorMessage() - */ + @Override public String getErrorMessage() { return null; // no custom error message } diff --git a/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/HyperlinkDetectorDescriptor.java b/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/HyperlinkDetectorDescriptor.java index d2607eb683d..8d1aedce284 100644 --- a/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/HyperlinkDetectorDescriptor.java +++ b/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/HyperlinkDetectorDescriptor.java @@ -88,6 +88,7 @@ public final class HyperlinkDetectorDescriptor { * @throws CoreException if a failure occurred during creation * @deprecated As of 3.9, replaced by {@link #createHyperlinkDetectorImplementation()} */ + @Deprecated public AbstractHyperlinkDetector createHyperlinkDetector() throws CoreException { return (AbstractHyperlinkDetector)createHyperlinkDetectorImplementation(); } @@ -104,18 +105,14 @@ public final class HyperlinkDetectorDescriptor { final IHyperlinkDetector[] result= new IHyperlinkDetector[1]; String message= NLSUtility.format(EditorMessages.Editor_error_HyperlinkDetector_couldNotCreate_message, new String[] { getId(), fElement.getContributor().getName() }); ISafeRunnable code= new SafeRunnable(message) { - /* - * @see org.eclipse.core.runtime.ISafeRunnable#run() - */ + @Override public void run() throws Exception { String pluginId = fElement.getContributor().getName(); boolean isPlugInActivated= Platform.getBundle(pluginId).getState() == Bundle.ACTIVE; if (isPlugInActivated || canActivatePlugIn()) result[0]= (IHyperlinkDetector)fElement.createExecutableExtension(CLASS_ATTRIBUTE); } - /* - * @see org.eclipse.jface.util.SafeRunnable#handleException(java.lang.Throwable) - */ + @Override public void handleException(Throwable ex) { super.handleException(ex); exception[0]= ex; @@ -210,12 +207,14 @@ public final class HyperlinkDetectorDescriptor { return Boolean.valueOf(value).booleanValue(); } + @Override public boolean equals(Object obj) { if (obj == null || !obj.getClass().equals(this.getClass()) || getId() == null) return false; return getId().equals(((HyperlinkDetectorDescriptor)obj).getId()); } + @Override public int hashCode() { return getId().hashCode(); } diff --git a/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/HyperlinkDetectorRegistry.java b/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/HyperlinkDetectorRegistry.java index 970975ce0d9..0d67929896c 100644 --- a/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/HyperlinkDetectorRegistry.java +++ b/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/HyperlinkDetectorRegistry.java @@ -60,9 +60,7 @@ public final class HyperlinkDetectorRegistry { } } - /* - * @see org.eclipse.jface.text.hyperlink.IHyperlinkDetector#detectHyperlinks(org.eclipse.jface.text.ITextViewer, org.eclipse.jface.text.IRegion, boolean) - */ + @Override public IHyperlink[] detectHyperlinks(ITextViewer textViewer, IRegion region, boolean canShowMultipleHyperlinks) { if (!isEnabled()) return null; @@ -90,9 +88,7 @@ public final class HyperlinkDetectorRegistry { fContext= context; } - /* - * @see org.eclipse.jface.text.hyperlink.IHyperlinkDetectorExtension#dispose() - */ + @Override public void dispose() { if (fHyperlinkDetector instanceof AbstractHyperlinkDetector) ((AbstractHyperlinkDetector)fHyperlinkDetector).dispose(); @@ -102,10 +98,7 @@ public final class HyperlinkDetectorRegistry { fContext= null; } - /* - * @see org.eclipse.jface.text.hyperlink.IHyperlinkDetectorExtension#getStateMask() - * @since 3.3 - */ + @Override public int getStateMask() { return fStateMask; } diff --git a/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/HyperlinkDetectorTargetDescriptor.java b/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/HyperlinkDetectorTargetDescriptor.java index faf17489978..c0027e40210 100644 --- a/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/HyperlinkDetectorTargetDescriptor.java +++ b/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/HyperlinkDetectorTargetDescriptor.java @@ -110,12 +110,14 @@ public final class HyperlinkDetectorTargetDescriptor { } + @Override public boolean equals(Object obj) { if (obj == null || !obj.getClass().equals(this.getClass()) || getId() == null) return false; return getId().equals(((HyperlinkDetectorTargetDescriptor)obj).getId()); } + @Override public int hashCode() { return getId().hashCode(); } diff --git a/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/IAbstractTextEditorHelpContextIds.java b/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/IAbstractTextEditorHelpContextIds.java index 0ff7f3df6ff..7d5a7e6ccd9 100644 --- a/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/IAbstractTextEditorHelpContextIds.java +++ b/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/IAbstractTextEditorHelpContextIds.java @@ -219,6 +219,7 @@ public interface IAbstractTextEditorHelpContextIds { * Value: <code>"org.eclipse.ui.bookmark_action_context"</code> * @deprecated in 3.0 Use <code>org.eclipse.ui.texteditor.ITextEditorHelpContextIds.BOOKMARK_ACTION</code> instead. */ + @Deprecated String BOOKMARK_ACTION= PREFIX + IWorkbenchActionConstants.BOOKMARK + ACTION_POSTFIX; /** @@ -226,12 +227,14 @@ public interface IAbstractTextEditorHelpContextIds { * Value: <code>"org.eclipse.ui.addTask_action_context"</code> * @deprecated in 3.0 Use <code>org.eclipse.ui.texteditor.ITextEditorHelpContextIds.ADD_TASK_ACTION</code> instead. */ + @Deprecated String ADD_TASK_ACTION= PREFIX + IWorkbenchActionConstants.ADD_TASK + ACTION_POSTFIX; /** * Help context id for the action. Value: <code>"org.eclipse.ui.save_action_context"</code> * @deprecated As of 3.5, no longer used */ + @Deprecated String SAVE_ACTION= PREFIX + ITextEditorActionConstants.SAVE + ACTION_POSTFIX; /** @@ -258,6 +261,7 @@ public interface IAbstractTextEditorHelpContextIds { * @since 2.0 * @deprecated since 3.1. No longer supported as editor actions. */ + @Deprecated String CONVERT_LINE_DELIMITERS_TO_WINDOWS= PREFIX + ITextEditorActionConstants.CONVERT_LINE_DELIMITERS_TO_WINDOWS + ACTION_POSTFIX; /** @@ -266,6 +270,7 @@ public interface IAbstractTextEditorHelpContextIds { * @since 2.0 * @deprecated since 3.1. No longer supported as editor actions. */ + @Deprecated String CONVERT_LINE_DELIMITERS_TO_UNIX= PREFIX + ITextEditorActionConstants.CONVERT_LINE_DELIMITERS_TO_UNIX + ACTION_POSTFIX; /** @@ -274,6 +279,7 @@ public interface IAbstractTextEditorHelpContextIds { * @since 2.0 * @deprecated since 3.1 No longer supported as editor actions. */ + @Deprecated String CONVERT_LINE_DELIMITERS_TO_MAC= PREFIX + ITextEditorActionConstants.CONVERT_LINE_DELIMITERS_TO_MAC + ACTION_POSTFIX; /** diff --git a/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/ITextEditorActionConstants.java b/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/ITextEditorActionConstants.java index f8b5a855cfd..a1a2fd009a5 100644 --- a/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/ITextEditorActionConstants.java +++ b/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/ITextEditorActionConstants.java @@ -274,6 +274,7 @@ public interface ITextEditorActionConstants extends IWorkbenchActionConstants { * @since 2.0 * @deprecated since 3.1. No longer supported as editor actions. */ + @Deprecated String CONVERT_LINE_DELIMITERS_TO_WINDOWS= "ConvertLineDelimitersToWindows"; //$NON-NLS-1$ /** @@ -282,6 +283,7 @@ public interface ITextEditorActionConstants extends IWorkbenchActionConstants { * @since 2.0 * @deprecated since 3.1. No longer supported as editor actions. */ + @Deprecated String CONVERT_LINE_DELIMITERS_TO_UNIX= "ConvertLineDelimitersToUNIX"; //$NON-NLS-1$ /** @@ -290,6 +292,7 @@ public interface ITextEditorActionConstants extends IWorkbenchActionConstants { * @since 2.0 * @deprecated since 3.1. No longer supported as editor actions. */ + @Deprecated String CONVERT_LINE_DELIMITERS_TO_MAC= "ConvertLineDelimitersToMAC"; //$NON-NLS-1$ /** diff --git a/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/ITextEditorActionDefinitionIds.java b/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/ITextEditorActionDefinitionIds.java index 153ae3298cd..a532d0c1c46 100644 --- a/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/ITextEditorActionDefinitionIds.java +++ b/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/ITextEditorActionDefinitionIds.java @@ -390,6 +390,7 @@ public interface ITextEditorActionDefinitionIds extends IWorkbenchActionDefiniti * Value: <code>"org.eclipse.ui.edit.text.convert.lineDelimiters.toWindows"</code> * @deprecated since 3.1. No longer supported as editor actions. */ + @Deprecated String CONVERT_LINE_DELIMITERS_TO_WINDOWS= "org.eclipse.ui.edit.text.convert.lineDelimiters.toWindows"; //$NON-NLS-1$ /** @@ -397,6 +398,7 @@ public interface ITextEditorActionDefinitionIds extends IWorkbenchActionDefiniti * Value: <code>"org.eclipse.ui.edit.text.convert.lineDelimiters.toUNIX"</code> * @deprecated since 3.1. No longer supported as editor actions. */ + @Deprecated String CONVERT_LINE_DELIMITERS_TO_UNIX= "org.eclipse.ui.edit.text.convert.lineDelimiters.toUNIX"; //$NON-NLS-1$ /** @@ -404,6 +406,7 @@ public interface ITextEditorActionDefinitionIds extends IWorkbenchActionDefiniti * Value: <code>"org.eclipse.ui.edit.text.convert.lineDelimiters.toMac"</code> * @deprecated since 3.1. No longer supported as editor actions. */ + @Deprecated String CONVERT_LINE_DELIMITERS_TO_MAC= "org.eclipse.ui.edit.text.convert.lineDelimiters.toMac"; //$NON-NLS-1$ diff --git a/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/IWorkbenchActionDefinitionIds.java b/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/IWorkbenchActionDefinitionIds.java index 1184aa64b97..1b520e3815a 100644 --- a/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/IWorkbenchActionDefinitionIds.java +++ b/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/IWorkbenchActionDefinitionIds.java @@ -33,6 +33,7 @@ public interface IWorkbenchActionDefinitionIds { * * @deprecated As of 3.5, replaced by {@link IWorkbenchCommandConstants#FILE_PRINT} */ + @Deprecated public static final String PRINT= IWorkbenchCommandConstants.FILE_PRINT; /** @@ -41,6 +42,7 @@ public interface IWorkbenchActionDefinitionIds { * * @deprecated As of 3.5, no longer used */ + @Deprecated public static final String SAVE= IWorkbenchCommandConstants.FILE_SAVE; /** @@ -49,6 +51,7 @@ public interface IWorkbenchActionDefinitionIds { * * @deprecated As of 3.4, replaced by {@link #REVERT} */ + @Deprecated public static final String REVERT_TO_SAVED= "org.eclipse.ui.edit.revertToSaved"; //$NON-NLS-1$ /** @@ -58,6 +61,7 @@ public interface IWorkbenchActionDefinitionIds { * @since 3.4 * @deprecated As of 3.5, replaced by {@link IWorkbenchCommandConstants#FILE_REVERT} */ + @Deprecated public static final String REVERT= IWorkbenchCommandConstants.FILE_REVERT; /** @@ -67,6 +71,7 @@ public interface IWorkbenchActionDefinitionIds { * @deprecated As of 3.5, replaced by {@link IWorkbenchCommandConstants#FILE_PROPERTIES} * @since 3.1 */ + @Deprecated public static final String PROPERTIES= IWorkbenchCommandConstants.FILE_PROPERTIES; @@ -79,6 +84,7 @@ public interface IWorkbenchActionDefinitionIds { * @deprecated As of 3.5, replaced by {@link IWorkbenchCommandConstants#EDIT_CUT} * */ + @Deprecated public static final String CUT= IWorkbenchCommandConstants.EDIT_CUT; /** @@ -87,6 +93,7 @@ public interface IWorkbenchActionDefinitionIds { * * @deprecated As of 3.5, replaced by {@link IWorkbenchCommandConstants#EDIT_COPY} */ + @Deprecated public static final String COPY= IWorkbenchCommandConstants.EDIT_COPY; /** @@ -95,6 +102,7 @@ public interface IWorkbenchActionDefinitionIds { * * @deprecated As of 3.5, replaced by {@link IWorkbenchCommandConstants#EDIT_PASTE} */ + @Deprecated public static final String PASTE= IWorkbenchCommandConstants.EDIT_PASTE; /** @@ -103,6 +111,7 @@ public interface IWorkbenchActionDefinitionIds { * * @deprecated As of 3.5, replaced by {@link IWorkbenchCommandConstants#EDIT_UNDO} */ + @Deprecated public static final String UNDO= IWorkbenchCommandConstants.EDIT_UNDO; /** @@ -111,6 +120,7 @@ public interface IWorkbenchActionDefinitionIds { * * @deprecated As of 3.5, replaced by {@link IWorkbenchCommandConstants#EDIT_REDO} */ + @Deprecated public static final String REDO= IWorkbenchCommandConstants.EDIT_REDO; /** @@ -119,6 +129,7 @@ public interface IWorkbenchActionDefinitionIds { * * @deprecated As of 3.5, replaced by {@link IWorkbenchCommandConstants#EDIT_DELETE} */ + @Deprecated public static final String DELETE= IWorkbenchCommandConstants.EDIT_DELETE; /** @@ -127,6 +138,7 @@ public interface IWorkbenchActionDefinitionIds { * * @deprecated As of 3.5, replaced by {@link IWorkbenchCommandConstants#EDIT_SELECT_ALL} */ + @Deprecated public static final String SELECT_ALL= IWorkbenchCommandConstants.EDIT_SELECT_ALL; /** @@ -135,6 +147,7 @@ public interface IWorkbenchActionDefinitionIds { * * @deprecated As of 3.5, replaced by {@link IWorkbenchCommandConstants#EDIT_FIND_AND_REPLACE} */ + @Deprecated public static final String FIND_REPLACE= IWorkbenchCommandConstants.EDIT_FIND_AND_REPLACE; /** @@ -143,6 +156,7 @@ public interface IWorkbenchActionDefinitionIds { * * @deprecated As of 3.5, replaced by {@link IWorkbenchCommandConstants#EDIT_ADD_BOOKMARK} */ + @Deprecated public static final String ADD_BOOKMARK= IWorkbenchCommandConstants.EDIT_ADD_BOOKMARK; /** @@ -151,6 +165,7 @@ public interface IWorkbenchActionDefinitionIds { * * @deprecated As of 3.5, replaced by {@link IWorkbenchCommandConstants#EDIT_ADD_TASK} */ + @Deprecated public static final String ADD_TASK= IWorkbenchCommandConstants.EDIT_ADD_TASK; /** @@ -160,6 +175,7 @@ public interface IWorkbenchActionDefinitionIds { * @since 3.0 * @deprecated As of 3.5, replaced by {@link IWorkbenchCommandConstants#FILE_MOVE} */ + @Deprecated public static final String MOVE= IWorkbenchCommandConstants.FILE_MOVE; /** @@ -169,6 +185,7 @@ public interface IWorkbenchActionDefinitionIds { * @since 3.0 * @deprecated As of 3.5, replaced by {@link IWorkbenchCommandConstants#FILE_RENAME} */ + @Deprecated public static final String RENAME= IWorkbenchCommandConstants.FILE_RENAME; diff --git a/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/IncrementalFindAction.java b/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/IncrementalFindAction.java index e830a663aa0..368474fdb45 100644 --- a/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/IncrementalFindAction.java +++ b/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/IncrementalFindAction.java @@ -80,6 +80,7 @@ public class IncrementalFindAction extends ResourceAction implements IUpdate { * @deprecated use FindReplaceAction(ResourceBundle, String, IWorkbenchPart, boolean) instead * @since 2.1 */ + @Deprecated public IncrementalFindAction(ResourceBundle bundle, String prefix, IWorkbenchWindow workbenchWindow, boolean forward) { super(bundle, prefix); fWorkbenchWindow= workbenchWindow; @@ -87,9 +88,7 @@ public class IncrementalFindAction extends ResourceAction implements IUpdate { update(); } - /* - * @see IAction#run() - */ + @Override public void run() { if (fTarget == null) @@ -102,9 +101,7 @@ public class IncrementalFindAction extends ResourceAction implements IUpdate { ((IFindReplaceTargetExtension) fTarget).beginSession(); } - /* - * @see IUpdate#update() - */ + @Override public void update() { if (fWorkbenchPart == null && fWorkbenchWindow != null) diff --git a/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/IncrementalFindTarget.java b/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/IncrementalFindTarget.java index 75f3a2d1ed1..aa18bb4e906 100644 --- a/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/IncrementalFindTarget.java +++ b/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/IncrementalFindTarget.java @@ -229,50 +229,36 @@ class IncrementalFindTarget implements IFindReplaceTarget, IFindReplaceTargetExt fTarget= viewer.getFindReplaceTarget(); } - /* - * @see IFindReplaceTarget#canPerformFind() - */ + @Override public boolean canPerformFind() { return fTarget.canPerformFind(); } - /* - * @see IFindReplaceTarget#findAndSelect(int, String, boolean, boolean, boolean) - */ + @Override public int findAndSelect(int offset, String findString, boolean searchForward, boolean caseSensitive, boolean wholeWord) { return fTarget.findAndSelect(offset, findString, searchForward, caseSensitive, wholeWord); } - /* - * @see IFindReplaceTarget#getSelection() - */ + @Override public Point getSelection() { return fTarget.getSelection(); } - /* - * @see IFindReplaceTarget#getSelectionText() - */ + @Override public String getSelectionText() { return fTarget.getSelectionText(); } - /* - * @see IFindReplaceTarget#isEditable() - */ + @Override public boolean isEditable() { return false; } - /* - * @see IFindReplaceTarget#replaceSelection(String) - */ + @Override public void replaceSelection(String text) { } - /* - * @see IFindReplaceTargetExtension#beginSession() - */ + @Override public void beginSession() { fSearching= true; @@ -320,9 +306,7 @@ class IncrementalFindTarget implements IFindReplaceTarget, IFindReplaceTargetExt fSearching= false; } - /* - * @see IFindReplaceTargetExtension#endSession() - */ + @Override public void endSession() { if (fTarget instanceof IFindReplaceTargetExtension) ((IFindReplaceTargetExtension) fTarget).endSession(); @@ -330,22 +314,16 @@ class IncrementalFindTarget implements IFindReplaceTarget, IFindReplaceTargetExt // will uninstall itself } - /* - * @see IFindReplaceTargetExtension#getScope() - */ + @Override public IRegion getScope() { return null; } - /* - * @see IFindReplaceTargetExtension#setScope(IRegion) - */ + @Override public void setScope(IRegion scope) { } - /* - * @see IFindReplaceTargetExtension#setReplaceAllMode(boolean) - */ + @Override public void setReplaceAllMode(boolean replaceAll) { } @@ -443,9 +421,7 @@ class IncrementalFindTarget implements IFindReplaceTarget, IFindReplaceTargetExt } } - /* - * @see VerifyKeyListener#verifyKey(VerifyEvent) - */ + @Override public void verifyKey(VerifyEvent event) { if (!event.doit) @@ -629,9 +605,7 @@ class IncrementalFindTarget implements IFindReplaceTarget, IFindReplaceTargetExt fSessionStack = null; } - /* - * @see ITextListener#textChanged(TextEvent) - */ + @Override public void textChanged(TextEvent event) { if (event.getDocumentEvent() != null) leave(); @@ -640,34 +614,27 @@ class IncrementalFindTarget implements IFindReplaceTarget, IFindReplaceTargetExt /* * @see MouseListener##mouseDoubleClick(MouseEvent) */ + @Override public void mouseDoubleClick(MouseEvent e) { leave(); } - /* - * @see MouseListener#mouseDown(org.eclipse.swt.events.MouseEvent) - */ + @Override public void mouseDown(MouseEvent e) { leave(); } - /* - * @see MouseListener#mouseUp(org.eclipse.swt.events.MouseEvent) - */ + @Override public void mouseUp(MouseEvent e) { leave(); } - /* - * @see FocusListener#focusGained(org.eclipse.swt.events.FocusEvent) - */ + @Override public void focusGained(FocusEvent e) { leave(); } - /* - * @see FocusListener#focusLost(org.eclipse.swt.events.FocusEvent) - */ + @Override public void focusLost(FocusEvent e) { leave(); } @@ -756,9 +723,7 @@ class IncrementalFindTarget implements IFindReplaceTarget, IFindReplaceTargetExt return buffer.toString(); } - /* - * @see IFindReplaceTargetExtension#getLineSelection() - */ + @Override public Point getLineSelection() { if (fTarget instanceof IFindReplaceTargetExtension) return ((IFindReplaceTargetExtension) fTarget).getLineSelection(); @@ -766,24 +731,17 @@ class IncrementalFindTarget implements IFindReplaceTarget, IFindReplaceTargetExt return null; // XXX: should not return null } - /* - * @see IFindReplaceTargetExtension#setSelection(int, int) - */ + @Override public void setSelection(int offset, int length) { if (fTarget instanceof IFindReplaceTargetExtension) ((IFindReplaceTargetExtension) fTarget).setSelection(offset, length); } - /* - * @see IFindReplaceTargetExtension#setScopeHighlightColor(Color) - */ + @Override public void setScopeHighlightColor(Color color) { } - /* - * @see ISelectionChangedListener#selectionChanged(org.eclipse.jface.viewers.SelectionChangedEvent) - * @since 2.1 - */ + @Override public void selectionChanged(SelectionChangedEvent e) { boolean ignore= false; ISelection selection= e.getSelection(); @@ -807,31 +765,19 @@ class IncrementalFindTarget implements IFindReplaceTarget, IFindReplaceTargetExt fIsStatusFieldExtension= fStatusField instanceof IStatusFieldExtension; } - /* - * @see org.eclipse.core.commands.IExecutionListener#notHandled(java.lang.String, org.eclipse.core.commands.NotHandledException) - * @since 3.2 - */ + @Override public void notHandled(String commandId, NotHandledException exception) { } - /* - * @see org.eclipse.core.commands.IExecutionListener#postExecuteFailure(java.lang.String, org.eclipse.core.commands.ExecutionException) - * @since 3.2 - */ + @Override public void postExecuteFailure(String commandId, ExecutionException exception) { } - /* - * @see org.eclipse.core.commands.IExecutionListener#postExecuteSuccess(java.lang.String, java.lang.Object) - * @since 3.2 - */ + @Override public void postExecuteSuccess(String commandId, Object returnValue) { } - /* - * @see org.eclipse.core.commands.IExecutionListener#preExecute(java.lang.String, org.eclipse.core.commands.ExecutionEvent) - * @since 3.2 - */ + @Override public void preExecute(String commandId, ExecutionEvent event) { if (IWorkbenchActionDefinitionIds.FIND_INCREMENTAL.equals(commandId) || IWorkbenchActionDefinitionIds.FIND_INCREMENTAL_REVERSE.equals(commandId)) diff --git a/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/InfoForm.java b/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/InfoForm.java index 3b1310ba556..03bbb228b47 100644 --- a/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/InfoForm.java +++ b/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/InfoForm.java @@ -38,6 +38,7 @@ import org.eclipse.jface.util.PropertyChangeEvent; * @since 2.0 * @deprecated since 3.0. there is no replacement, use org.eclipse.ui.forms to define a component with a similar look and function. */ +@Deprecated public class InfoForm { /** The form's root widget */ @@ -69,6 +70,7 @@ public class InfoForm { fSeparatorColor= new Color(display, 152, 170, 203); fPropertyChangeListener= new IPropertyChangeListener() { + @Override public void propertyChange(PropertyChangeEvent event) { handlePropertyChange(event); } @@ -80,6 +82,7 @@ public class InfoForm { fScrolledComposite.setExpandHorizontal(true); fScrolledComposite.setExpandVertical(true); fScrolledComposite.addDisposeListener(new DisposeListener() { + @Override public void widgetDisposed(DisposeEvent e) { JFaceResources.getFontRegistry().removeListener(fPropertyChangeListener); fScrolledComposite= null; diff --git a/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/InsertLineAction.java b/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/InsertLineAction.java index d4a438dcfd4..67de4574c00 100644 --- a/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/InsertLineAction.java +++ b/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/InsertLineAction.java @@ -63,18 +63,14 @@ public class InsertLineAction extends TextEditorAction { fAbove= above; } - /* - * @see org.eclipse.ui.texteditor.TextEditorAction#update() - */ + @Override public void update() { super.update(); if (isEnabled()) setEnabled(canModifyEditor()); } - /* - * @see org.eclipse.jface.action.IAction#run() - */ + @Override public void run() { /* * Implementation note: instead of computing any indentations needed diff --git a/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/JoinLinesAction.java b/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/JoinLinesAction.java index d4c0f7bbd38..df2f8e82d90 100644 --- a/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/JoinLinesAction.java +++ b/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/JoinLinesAction.java @@ -48,9 +48,7 @@ public class JoinLinesAction extends TextEditorAction { update(); } - /* - * @see org.eclipse.jface.action.Action#run() - */ + @Override public void run() { ITextEditor editor= getTextEditor(); @@ -118,9 +116,7 @@ public class JoinLinesAction extends TextEditorAction { return (ITextSelection) selection; } - /* - * @see org.eclipse.ui.texteditor.TextEditorAction#update() - */ + @Override public void update() { super.update(); if (!isEnabled()) diff --git a/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/KeyBindingSupportForAssistant.java b/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/KeyBindingSupportForAssistant.java index c79c27cdb1a..736a5f67e28 100644 --- a/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/KeyBindingSupportForAssistant.java +++ b/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/KeyBindingSupportForAssistant.java @@ -91,6 +91,7 @@ public final class KeyBindingSupportForAssistant implements ICompletionListener * @param contentAssistFacade the content assist facade * @deprecated As of 3.5, this is a NOP since the framework installs this now */ + @Deprecated public KeyBindingSupportForAssistant(ContentAssistantFacade contentAssistFacade) { } @@ -113,6 +114,7 @@ public final class KeyBindingSupportForAssistant implements ICompletionListener * @param contentAssistant the content assist facade * @deprecated As of 3.5, this is a NOP since the framework installs this now */ + @Deprecated public KeyBindingSupportForAssistant(ContentAssistant contentAssistant) { } @@ -127,10 +129,7 @@ public final class KeyBindingSupportForAssistant implements ICompletionListener fQuickAssistAssistant.addCompletionListener(this); } - /* - * @see org.eclipse.jface.text.contentassist.ICompletionListener#assistSessionStarted(org.eclipse.jface.text.contentassist.ContentAssistEvent) - * @since 3.4 - */ + @Override public void assistSessionStarted(ContentAssistEvent event) { ICommandService commandService= (ICommandService)PlatformUI.getWorkbench().getService(ICommandService.class); IHandler handler= getHandler(ContentAssistant.SELECT_NEXT_PROPOSAL_COMMAND_ID); @@ -166,10 +165,7 @@ public final class KeyBindingSupportForAssistant implements ICompletionListener return null; } - /* - * @see org.eclipse.jface.text.contentassist.ICompletionListener#assistSessionEnded(org.eclipse.jface.text.contentassist.ContentAssistEvent) - * @since 3.4 - */ + @Override public void assistSessionEnded(ContentAssistEvent event) { if (fReplacedCommands == null) return; @@ -180,10 +176,7 @@ public final class KeyBindingSupportForAssistant implements ICompletionListener fReplacedCommands= null; } - /* - * @see org.eclipse.jface.text.contentassist.ICompletionListener#selectionChanged(org.eclipse.jface.text.contentassist.ICompletionProposal, boolean) - * @since 3.4 - */ + @Override public void selectionChanged(ICompletionProposal proposal, boolean smartToggle) { } diff --git a/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/MarkAction.java b/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/MarkAction.java index eedd5732200..fad6725ebdb 100644 --- a/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/MarkAction.java +++ b/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/MarkAction.java @@ -49,9 +49,7 @@ public class MarkAction extends TextEditorAction { fType= type; } - /* - * @see IAction#run() - */ + @Override public void run() { ITextEditor editor= getTextEditor(); diff --git a/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/MarkRegionTarget.java b/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/MarkRegionTarget.java index ee566b1bd72..694091c682c 100644 --- a/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/MarkRegionTarget.java +++ b/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/MarkRegionTarget.java @@ -46,9 +46,7 @@ public class MarkRegionTarget implements IMarkRegionTarget { fStatusLine= manager; } - /* - * @see IMarkregion#setMarkAtCursor(boolean) - */ + @Override public void setMarkAtCursor(boolean set) { if (!(fViewer instanceof ITextViewerExtension)) @@ -71,9 +69,7 @@ public class MarkRegionTarget implements IMarkRegionTarget { } } - /* - * @see IMarkregion#swapMarkAndCursor() - */ + @Override public void swapMarkAndCursor() { if (!(fViewer instanceof ITextViewerExtension)) diff --git a/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/MoveLinesAction.java b/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/MoveLinesAction.java index fb49439e475..51e94fc719f 100644 --- a/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/MoveLinesAction.java +++ b/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/MoveLinesAction.java @@ -90,6 +90,7 @@ public class MoveLinesAction extends TextEditorAction { String[] commandIds= copy ? new String[] {ITextEditorActionDefinitionIds.COPY_LINES_UP, ITextEditorActionDefinitionIds.COPY_LINES_DOWN } : new String[] {ITextEditorActionDefinitionIds.MOVE_LINES_UP, ITextEditorActionDefinitionIds.MOVE_LINES_DOWN }; fStrategy= new CompoundEditExitStrategy(commandIds); fStrategy.addCompoundListener(new ICompoundEditListener() { + @Override public void endCompoundEdit() { MoveLinesAction.this.endCompoundEdit(); } @@ -112,6 +113,7 @@ public class MoveLinesAction extends TextEditorAction { * @deprecated As of 3.5, replaced by * {@link #MoveLinesAction(ResourceBundle, String, ITextEditor, ITextViewer, boolean, boolean)} */ + @Deprecated public MoveLinesAction(ResourceBundle bundle, String prefix, AbstractTextEditor editor, boolean upwards, boolean copy) { this(bundle, prefix, editor, editor != null ? editor.getSourceViewer() : null, upwards, copy); } @@ -273,6 +275,7 @@ public class MoveLinesAction extends TextEditorAction { /* * @see org.eclipse.jface.action.IAction#run() */ + @Override public void runWithEvent(Event event) { if (fTextViewer == null) return; @@ -405,10 +408,7 @@ public class MoveLinesAction extends TextEditorAction { status.setMessage(false, EditorMessages.Editor_MoveLines_IllegalMove_status, null); } - /* - * @see org.eclipse.ui.texteditor.TextEditorAction#setEditor(org.eclipse.ui.texteditor.ITextEditor) - * @since 3.5 - */ + @Override public void setEditor(ITextEditor editor) { ITextEditor currentEditor= getTextEditor(); if (currentEditor != editor && currentEditor != null && editor != null) { @@ -420,9 +420,7 @@ public class MoveLinesAction extends TextEditorAction { super.setEditor(editor); } - /* - * @see org.eclipse.ui.texteditor.IUpdate#update() - */ + @Override public void update() { super.update(); diff --git a/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/PropagatingFontFieldEditor.java b/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/PropagatingFontFieldEditor.java index 608bc033d60..4770a993588 100644 --- a/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/PropagatingFontFieldEditor.java +++ b/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/PropagatingFontFieldEditor.java @@ -18,6 +18,7 @@ import org.eclipse.swt.widgets.Composite; /** * @deprecated no longer supported */ +@Deprecated public final class PropagatingFontFieldEditor extends WorkbenchChainedTextFontFieldEditor { /** @@ -28,6 +29,7 @@ public final class PropagatingFontFieldEditor extends WorkbenchChainedTextFontFi * @param parent the parent control * @deprecated no longer supported */ + @Deprecated public PropagatingFontFieldEditor(String name, String labelText, Composite parent) { super(name, labelText, parent); } diff --git a/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/RecenterAction.java b/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/RecenterAction.java index a576bac2f0d..fbf795cabcb 100644 --- a/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/RecenterAction.java +++ b/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/RecenterAction.java @@ -48,9 +48,7 @@ public class RecenterAction extends TextEditorAction { super(bundle, prefix, editor); } - /* - * @see IAction#run() - */ + @Override public void run() { ITextEditor editor= getTextEditor(); if (!(editor instanceof AbstractTextEditor)) diff --git a/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/RetargetTextEditorAction.java b/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/RetargetTextEditorAction.java index 8275e6cc519..906098d9e36 100644 --- a/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/RetargetTextEditorAction.java +++ b/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/RetargetTextEditorAction.java @@ -44,6 +44,7 @@ public final class RetargetTextEditorAction extends ResourceAction { private HelpListener fLocalHelpListener; /** The listener to pick up changes of the target action. */ private IPropertyChangeListener fListener= new IPropertyChangeListener() { + @Override public void propertyChange(PropertyChangeEvent event) { update(event); } @@ -201,6 +202,7 @@ public final class RetargetTextEditorAction extends ResourceAction { */ private void installHelpListener() { super.setHelpListener(new HelpListener() { + @Override public void helpRequested(HelpEvent e) { HelpListener listener= null; if (fAction != null) { @@ -225,13 +227,12 @@ public final class RetargetTextEditorAction extends ResourceAction { * @param listener the help listener * @since 2.1 */ + @Override public void setHelpListener(HelpListener listener) { fLocalHelpListener= listener; } - /* - * @see IAction#run() - */ + @Override public void run() { if (fAction != null) fAction.run(); diff --git a/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/RevertToSavedAction.java b/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/RevertToSavedAction.java index b05abd58f1c..18c52e2a4ce 100644 --- a/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/RevertToSavedAction.java +++ b/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/RevertToSavedAction.java @@ -41,16 +41,12 @@ public class RevertToSavedAction extends TextEditorAction { super(bundle, prefix, editor); } - /* - * @see IAction#run() - */ + @Override public void run() { getTextEditor().doRevertToSaved(); } - /* - * @see TextEditorAction#update() - */ + @Override public void update() { setEnabled(getTextEditor().isDirty()); } diff --git a/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/SaveAction.java b/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/SaveAction.java index 7878abcb995..00a00f027af 100644 --- a/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/SaveAction.java +++ b/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/SaveAction.java @@ -24,6 +24,7 @@ import java.util.ResourceBundle; * @noextend This class is not intended to be subclassed by clients. * @deprecated As of 3.5, replaced by {@link org.eclipse.ui.actions.ActionFactory#SAVE} */ +@Deprecated public class SaveAction extends TextEditorAction { /** @@ -41,16 +42,12 @@ public class SaveAction extends TextEditorAction { super(bundle, prefix, editor); } - /* - * @see IAction#run() - */ + @Override public void run() { getTextEditor().getSite().getPage().saveEditor(getTextEditor(), false); } - /* - * @see TextEditorAction#update() - */ + @Override public void update() { setEnabled(getTextEditor().isDirty()); } diff --git a/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/SelectAnnotationRulerAction.java b/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/SelectAnnotationRulerAction.java index 47e57c66296..4635bb6452e 100644 --- a/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/SelectAnnotationRulerAction.java +++ b/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/SelectAnnotationRulerAction.java @@ -48,9 +48,7 @@ public class SelectAnnotationRulerAction extends TextEditorAction implements IVe super(bundle, prefix, editor); } - /* - * @see org.eclipse.ui.texteditor.TextEditorAction#setEditor(org.eclipse.ui.texteditor.ITextEditor) - */ + @Override public void setEditor(ITextEditor editor) { if (getTextEditor() != null) { IVerticalRulerInfo service= (IVerticalRulerInfo) getTextEditor().getAdapter(IVerticalRulerInfo.class); @@ -75,15 +73,11 @@ public class SelectAnnotationRulerAction extends TextEditorAction implements IVe return provider.getAnnotationModel(getTextEditor().getEditorInput()); } - /* - * @see org.eclipse.ui.texteditor.IVerticalRulerListener#annotationSelected(org.eclipse.ui.texteditor.VerticalRulerEvent) - */ + @Override public void annotationSelected(VerticalRulerEvent event) { } - /* - * @see org.eclipse.ui.texteditor.IVerticalRulerListener#annotationDefaultSelected(org.eclipse.ui.texteditor.VerticalRulerEvent) - */ + @Override public void annotationDefaultSelected(VerticalRulerEvent event) { Annotation a= event.getSelectedAnnotation(); IAnnotationModel model= getAnnotationModel(); @@ -94,9 +88,7 @@ public class SelectAnnotationRulerAction extends TextEditorAction implements IVe getTextEditor().selectAndReveal(position.offset, position.length); } - /* - * @see org.eclipse.ui.texteditor.IVerticalRulerListener#annotationContextMenuAboutToShow(org.eclipse.ui.texteditor.VerticalRulerEvent, org.eclipse.swt.widgets.Menu) - */ + @Override public void annotationContextMenuAboutToShow(VerticalRulerEvent event, Menu menu) { } } diff --git a/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/ShiftAction.java b/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/ShiftAction.java index 432b0ca723e..ccc6157149e 100644 --- a/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/ShiftAction.java +++ b/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/ShiftAction.java @@ -62,6 +62,7 @@ public class ShiftAction extends TextEditorAction implements IReadOnlyDependent * <code>IAction</code> method runs the operation with the current * operation code. */ + @Override public void run() { if (fOperationCode == -1 || fOperationTarget == null) return; @@ -81,15 +82,14 @@ public class ShiftAction extends TextEditorAction implements IReadOnlyDependent display= shell.getDisplay(); BusyIndicator.showWhile(display, new Runnable() { + @Override public void run() { fOperationTarget.doOperation(fOperationCode); } }); } - /* - * @see IUpdate#update() - */ + @Override public void update() { super.update(); if (!isEnabled()) @@ -130,17 +130,13 @@ public class ShiftAction extends TextEditorAction implements IReadOnlyDependent } - /* - * @see TextEditorAction#setEditor(ITextEditor) - */ + @Override public void setEditor(ITextEditor editor) { super.setEditor(editor); fOperationTarget= null; } - /* - * @see IReadOnlyDependent#isEnabled(boolean) - */ + @Override public boolean isEnabled(boolean isWritable) { if (!isWritable) diff --git a/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/ShowWhitespaceCharactersAction.java b/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/ShowWhitespaceCharactersAction.java index a3deac2d342..a2dc4df12e0 100644 --- a/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/ShowWhitespaceCharactersAction.java +++ b/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/ShowWhitespaceCharactersAction.java @@ -89,18 +89,14 @@ public class ShowWhitespaceCharactersAction extends TextEditorAction { synchronizeWithPreference(); } - /* - * @see org.eclipse.jface.action.Action#run() - */ + @Override public void run() { togglePainterState(isChecked()); if (fStore != null) fStore.setValue(AbstractTextEditor.PREFERENCE_SHOW_WHITESPACE_CHARACTERS, isChecked()); } - /* - * @see org.eclipse.ui.texteditor.TextEditorAction#update() - */ + @Override public void update() { setEnabled(getTextViewer() instanceof ITextViewerExtension2); synchronizeWithPreference(); diff --git a/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/SourceViewerDecorationSupport.java b/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/SourceViewerDecorationSupport.java index 5af718038ed..b1b93af7f7a 100644 --- a/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/SourceViewerDecorationSupport.java +++ b/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/SourceViewerDecorationSupport.java @@ -94,9 +94,7 @@ public class SourceViewerDecorationSupport { */ private static final class IBeamStrategy implements IDrawingStrategy { - /* - * @see org.eclipse.jface.text.source.AnnotationPainter.IDrawingStrategy#draw(org.eclipse.jface.text.source.Annotation, org.eclipse.swt.graphics.GC, org.eclipse.swt.custom.StyledText, int, int, org.eclipse.swt.graphics.Color) - */ + @Override public void draw(Annotation annotation, GC gc, StyledText textWidget, int offset, int length, Color color) { if (gc != null) { @@ -193,9 +191,7 @@ public class SourceViewerDecorationSupport { * @see IPropertyChangeListener */ private class FontPropertyChangeListener implements IPropertyChangeListener { - /* - * @see IPropertyChangeListener#propertyChange(org.eclipse.jface.util.PropertyChangeEvent) - */ + @Override public void propertyChange(PropertyChangeEvent event) { if (fMarginPainter != null && fSymbolicFontName != null && fSymbolicFontName.equals(event.getProperty())) fMarginPainter.initialize(); @@ -279,6 +275,7 @@ public class SourceViewerDecorationSupport { fPreferenceStore= store; if (fPreferenceStore != null) { fPropertyChangeListener= new IPropertyChangeListener() { + @Override public void propertyChange(PropertyChangeEvent event) { handlePreferenceStoreChanged(event); } diff --git a/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/StatusLineContributionItem.java b/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/StatusLineContributionItem.java index fdea772a617..9a7b9eba4ff 100644 --- a/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/StatusLineContributionItem.java +++ b/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/StatusLineContributionItem.java @@ -41,9 +41,7 @@ public class StatusLineContributionItem extends ContributionItem implements ISta * @since 3.0 */ private class Listener extends MouseAdapter { - /* - * @see org.eclipse.swt.events.MouseAdapter#mouseDoubleClick(org.eclipse.swt.events.MouseEvent) - */ + @Override public void mouseDoubleClick(MouseEvent e) { if (fActionHandler != null && fActionHandler.isEnabled()) fActionHandler.run(); @@ -131,58 +129,44 @@ public class StatusLineContributionItem extends ContributionItem implements ISta fWidthInChars= widthInChars; } - /* - * @see IStatusField#setText(String) - */ + @Override public void setText(String text) { fText= text; updateMessageLabel(); } - /* - * @see IStatusField#setImage(Image) - */ + @Override public void setImage(Image image) { fImage= image; updateMessageLabel(); } - /* - * @see org.eclipse.ui.texteditor.IStatusFieldExtension#setErrorText(java.lang.String) - * @since 3.0 - */ + @Override public void setErrorText(String text) { fErrorText= text; updateMessageLabel(); } - /* - * @see org.eclipse.ui.texteditor.IStatusFieldExtension#setErrorImage(org.eclipse.swt.graphics.Image) - * @since 3.0 - */ + @Override public void setErrorImage(Image image) { fErrorImage= image; updateMessageLabel(); } - /* - * @see org.eclipse.ui.texteditor.IStatusFieldExtension#setToolTipText(java.lang.String) - * @since 3.0 - */ + @Override public void setToolTipText(String string) { fToolTipText= string; updateMessageLabel(); } - /* - * @see IContributionItem#fill(Composite) - */ + @Override public void fill(Composite parent) { Label sep= new Label(parent, SWT.SEPARATOR); fLabel= new CLabel(parent, SWT.SHADOW_NONE); fLabel.addDisposeListener(new DisposeListener() { + @Override public void widgetDisposed(DisposeEvent e) { fMouseListener= null; } diff --git a/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/StatusTextEditor.java b/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/StatusTextEditor.java index dd3c3f5381b..01c090cffe0 100644 --- a/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/StatusTextEditor.java +++ b/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/StatusTextEditor.java @@ -43,6 +43,7 @@ public class StatusTextEditor extends AbstractTextEditor { /* * @see org.eclipse.ui.texteditor.AbstractTextEditor.createPartControl(Composite) */ + @Override public void createPartControl(Composite parent) { fParent= new Composite(parent, SWT.NONE); @@ -109,10 +110,7 @@ public class StatusTextEditor extends AbstractTextEditor { return focusControl == fParent; } - /* - * @see org.eclipse.ui.texteditor.AbstractTextEditor#setFocus() - * @since 3.6 - */ + @Override public void setFocus() { if (fStatusControl != null && !fStatusControl.isDisposed()) { /* even if the control does not really take focus, we still have to set it @@ -123,10 +121,7 @@ public class StatusTextEditor extends AbstractTextEditor { } } - /* - * @see org.eclipse.ui.texteditor.AbstractTextEditor#validateEditorInputState() - * @since 3.3 - */ + @Override public boolean validateEditorInputState() { if (!super.validateEditorInputState()) return false; @@ -172,6 +167,7 @@ public class StatusTextEditor extends AbstractTextEditor { * @since 3.5 * @deprecated As of 3.5 */ + @Deprecated private Control createInfoForm(Composite parent, IStatus status) { InfoForm infoForm= new InfoForm(parent); infoForm.setHeaderText(getStatusHeader(status)); @@ -210,9 +206,7 @@ public class StatusTextEditor extends AbstractTextEditor { return status.getMessage(); } - /* - * @see AbstractTextEditor#updateStatusField(String) - */ + @Override protected void updateStatusField(String category) { IDocumentProvider provider= getDocumentProvider(); if (provider instanceof IDocumentProviderExtension) { @@ -230,18 +224,14 @@ public class StatusTextEditor extends AbstractTextEditor { super.updateStatusField(category); } - /* - * @see AbstractTextEditor#doSetInput(IEditorInput) - */ + @Override protected void doSetInput(IEditorInput input) throws CoreException { super.doSetInput(input); if (fParent != null && !fParent.isDisposed()) updatePartControl(getEditorInput()); } - /* - * @see ITextEditor#doRevertToSaved() - */ + @Override public void doRevertToSaved() { // http://dev.eclipse.org/bugs/show_bug.cgi?id=19014 super.doRevertToSaved(); @@ -249,9 +239,7 @@ public class StatusTextEditor extends AbstractTextEditor { updatePartControl(getEditorInput()); } - /* - * @see AbstractTextEditor#sanityCheckState(IEditorInput) - */ + @Override protected void sanityCheckState(IEditorInput input) { // http://dev.eclipse.org/bugs/show_bug.cgi?id=19014 super.sanityCheckState(input); @@ -259,20 +247,14 @@ public class StatusTextEditor extends AbstractTextEditor { updatePartControl(getEditorInput()); } - /* - * @see org.eclipse.ui.texteditor.AbstractTextEditor#handleEditorInputChanged() - * @since 3.1 - */ + @Override protected void handleEditorInputChanged() { super.handleEditorInputChanged(); if (fParent != null && !fParent.isDisposed()) updatePartControl(getEditorInput()); } - /* - * @see org.eclipse.ui.texteditor.AbstractTextEditor#handleElementContentReplaced() - * @since 3.1 - */ + @Override protected void handleElementContentReplaced() { super.handleElementContentReplaced(); if (fParent != null && !fParent.isDisposed()) diff --git a/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/TextEditorAction.java b/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/TextEditorAction.java index 7754afbc759..762aac5c239 100644 --- a/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/TextEditorAction.java +++ b/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/TextEditorAction.java @@ -91,6 +91,7 @@ public abstract class TextEditorAction extends ResourceAction implements IUpdate * If the associated editor is <code>null</code>, the action is disabled. * Subclasses may override. */ + @Override public void update() { setEnabled(getTextEditor() != null); } diff --git a/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/TextNavigationAction.java b/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/TextNavigationAction.java index 3d4b6403836..0418fc3c6dc 100644 --- a/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/TextNavigationAction.java +++ b/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/TextNavigationAction.java @@ -53,9 +53,7 @@ public class TextNavigationAction extends Action { return fTextWidget; } - /* - * @see IAction#run() - */ + @Override public void run() { Point selection= fTextWidget.getSelection(); fTextWidget.invokeAction(fAction); @@ -92,9 +90,7 @@ public class TextNavigationAction extends Action { doFireSelectionChanged(selection); } - /* - * @see IAction#runWithEvent(Event) - */ + @Override public void runWithEvent(Event event) { run(); } @@ -103,165 +99,115 @@ public class TextNavigationAction extends Action { // ---------------------------------------------------------------------------------------------------------------------------------- // All the subsequent methods are just empty method bodies. - /* - * @see IAction#addPropertyChangeListener(IPropertyChangeListener) - */ + @Override public void addPropertyChangeListener(IPropertyChangeListener listener) { } - /* - * @see IAction#getAccelerator() - */ + @Override public int getAccelerator() { return 0; } - /* - * @see IAction#getDescription() - */ + @Override public String getDescription() { return null; } - /* - * @see IAction#getDisabledImageDescriptor() - */ + @Override public ImageDescriptor getDisabledImageDescriptor() { return null; } - /* - * @see IAction#getHelpListener() - */ + @Override public HelpListener getHelpListener() { return null; } - /* - * @see IAction#getHoverImageDescriptor() - */ + @Override public ImageDescriptor getHoverImageDescriptor() { return null; } - /* - * @see IAction#getImageDescriptor() - */ + @Override public ImageDescriptor getImageDescriptor() { return null; } - /* - * @see IAction#getMenuCreator() - */ + @Override public IMenuCreator getMenuCreator() { return null; } - /* - * @see IAction#getStyle() - */ + @Override public int getStyle() { return 0; } - /* - * @see IAction#getText() - */ + @Override public String getText() { return null; } - /* - * @see IAction#getToolTipText() - */ + @Override public String getToolTipText() { return null; } - /* - * @see IAction#isChecked() - */ + @Override public boolean isChecked() { return false; } - /* - * @see IAction#isEnabled() - */ + @Override public boolean isEnabled() { return true; } - /* - * @see IAction#removePropertyChangeListener(IPropertyChangeListener) - */ + @Override public void removePropertyChangeListener(IPropertyChangeListener listener) { } - /* - * @see org.eclipse.jface.action.IAction#setAccelerator(int) - */ + @Override public void setAccelerator(int keycode) { } - /* - * @see IAction#setChecked(boolean) - */ + @Override public void setChecked(boolean checked) { } - /* - * @see IAction#setDescription(String) - */ + @Override public void setDescription(String text) { } - /* - * @see IAction#setDisabledImageDescriptor(ImageDescriptor) - */ + @Override public void setDisabledImageDescriptor(ImageDescriptor newImage) { } - /* - * @see IAction#setEnabled(boolean) - */ + @Override public void setEnabled(boolean enabled) { } - /* - * @see IAction#setHelpListener(HelpListener) - */ + @Override public void setHelpListener(HelpListener listener) { } - /* - * @see IAction#setHoverImageDescriptor(ImageDescriptor) - */ + @Override public void setHoverImageDescriptor(ImageDescriptor newImage) { } - /* - * @see IAction#setImageDescriptor(ImageDescriptor) - */ + @Override public void setImageDescriptor(ImageDescriptor newImage) { } - /* - * @see IAction#setMenuCreator(IMenuCreator) - */ + @Override public void setMenuCreator(IMenuCreator creator) { } - /* - * @see IAction#setText(String) - */ + @Override public void setText(String text) { } - /* - * @see IAction#setToolTipText(String) - */ + @Override public void setToolTipText(String text) { } } diff --git a/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/TextOperationAction.java b/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/TextOperationAction.java index f35344cc8a1..3751f085b0e 100644 --- a/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/TextOperationAction.java +++ b/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/TextOperationAction.java @@ -105,6 +105,7 @@ public final class TextOperationAction extends TextEditorAction { * <code>IAction</code> method runs the operation with the current * operation code. */ + @Override public void run() { if (fOperationCode == -1 || fOperationTarget == null) return; @@ -124,6 +125,7 @@ public final class TextOperationAction extends TextEditorAction { display= shell.getDisplay(); BusyIndicator.showWhile(display, new Runnable() { + @Override public void run() { fOperationTarget.doOperation(fOperationCode); } @@ -136,6 +138,7 @@ public final class TextOperationAction extends TextEditorAction { * editor's <code>ITextOperationTarget</code> adapter, and sets the * enabled state accordingly. */ + @Override public void update() { if (!fAllowUpdate) return; @@ -155,9 +158,7 @@ public final class TextOperationAction extends TextEditorAction { setEnabled(isEnabled); } - /* - * @see TextEditorAction#setEditor(ITextEditor) - */ + @Override public void setEditor(ITextEditor editor) { super.setEditor(editor); fOperationTarget= null; diff --git a/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/TextSelectionNavigationLocation.java b/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/TextSelectionNavigationLocation.java index 4b7d5e924ef..a3818168816 100644 --- a/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/TextSelectionNavigationLocation.java +++ b/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/TextSelectionNavigationLocation.java @@ -144,9 +144,7 @@ public class TextSelectionNavigationLocation extends NavigationLocation { return false; } - /* - * @see Object#toString() - */ + @Override public String toString() { return "Selection<" + fPosition + ">"; //$NON-NLS-1$ //$NON-NLS-2$ } @@ -184,6 +182,7 @@ public class TextSelectionNavigationLocation extends NavigationLocation { return false; } + @Override public void dispose() { uninstallFromDocument(fDocument, fPosition); fDocument= null; @@ -195,6 +194,7 @@ public class TextSelectionNavigationLocation extends NavigationLocation { /** * Releases the state of this location. */ + @Override public void releaseState() { // deactivate uninstallFromDocument(fDocument, fPosition); @@ -210,6 +210,7 @@ public class TextSelectionNavigationLocation extends NavigationLocation { * @param location the location to merge into this one * @return <code>true<code> if merging was successful */ + @Override public boolean mergeInto(INavigationLocation location) { if (location == null) @@ -244,6 +245,7 @@ public class TextSelectionNavigationLocation extends NavigationLocation { /** * Restores this location. */ + @Override public void restoreLocation() { if (fPosition == null || fPosition.isDeleted) return; @@ -260,6 +262,7 @@ public class TextSelectionNavigationLocation extends NavigationLocation { * * @param memento the memento */ + @Override public void restoreState(IMemento memento) { IEditorPart part= getEditorPart(); @@ -292,6 +295,7 @@ public class TextSelectionNavigationLocation extends NavigationLocation { * * @param memento the memento */ + @Override public void saveState(IMemento memento) { if (fSavedPosition != null) { memento.putInteger(TAG_X, fSavedPosition.offset); @@ -316,6 +320,7 @@ public class TextSelectionNavigationLocation extends NavigationLocation { /** * Updates the this location. */ + @Override public void update() { IEditorPart part= getEditorPart(); if (part instanceof ITextEditor) { diff --git a/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/TextViewerDeleteLineTarget.java b/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/TextViewerDeleteLineTarget.java index d6ce61a6889..7b8aab46daa 100644 --- a/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/TextViewerDeleteLineTarget.java +++ b/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/TextViewerDeleteLineTarget.java @@ -185,58 +185,42 @@ public class TextViewerDeleteLineTarget implements IDeleteLineTarget { fDeleting= deleting; } - /* - * @see org.eclipse.swt.events.MouseListener#mouseDoubleClick(MouseEvent) - */ + @Override public void mouseDoubleClick(MouseEvent e) { uninstall(); } - /* - * @see org.eclipse.swt.events.MouseListener#mouseDown(MouseEvent) - */ + @Override public void mouseDown(MouseEvent e) { uninstall(); } - /* - * @see org.eclipse.swt.events.MouseListener#mouseUp(MouseEvent) - */ + @Override public void mouseUp(MouseEvent e) { uninstall(); } - /* - * @see org.eclipse.jface.viewers.ISelectionChangedListener#selectionChanged(SelectionChangedEvent) - */ + @Override public void selectionChanged(SelectionChangedEvent event) { uninstall(); } - /* - * @see org.eclipse.swt.events.FocusListener#focusGained(FocusEvent) - */ + @Override public void focusGained(FocusEvent e) { uninstall(); } - /* - * @see org.eclipse.swt.events.FocusListener#focusLost(FocusEvent) - */ + @Override public void focusLost(FocusEvent e) { uninstall(); } - /* - * @see org.eclipse.jface.text.ITextListener#textChanged(TextEvent) - */ + @Override public void textChanged(TextEvent event) { uninstall(); } - /* - * @see org.eclipse.swt.events.ModifyListener#modifyText(ModifyEvent) - */ + @Override public void modifyText(ModifyEvent e) { if (!fDeleting) uninstall(); @@ -332,10 +316,7 @@ public class TextViewerDeleteLineTarget implements IDeleteLineTarget { return new Region(startOffset, endOffset - startOffset); } - /* - * @see org.eclipse.ui.texteditor.IDeleteLineTarget#deleteLine(org.eclipse.jface.text.IDocument, int, int, int, boolean) - * @since 3.4 - */ + @Override public void deleteLine(IDocument document, int offset, int length, int type, boolean copyToClipboard) throws BadLocationException { deleteLine(document, new TextSelection(offset, length), type, copyToClipboard); } diff --git a/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/ValidateStateException.java b/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/ValidateStateException.java index 71efe868d42..df84c4ee7a2 100644 --- a/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/ValidateStateException.java +++ b/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/ValidateStateException.java @@ -24,6 +24,7 @@ import org.eclipse.core.runtime.IStatus; * @deprecated No longer used, create a {@link CoreException} instead * @since 2.1 */ +@Deprecated public class ValidateStateException extends CoreException { /** diff --git a/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/WordWrapToggleAction.java b/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/WordWrapToggleAction.java index 1a5483d4553..6f683866f3e 100644 --- a/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/WordWrapToggleAction.java +++ b/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/WordWrapToggleAction.java @@ -35,6 +35,7 @@ final class WordWrapToggleAction extends TextEditorAction { update(checked); } + @Override public void run() { boolean newState = false; if (isWordWrapPossible()) { @@ -50,6 +51,7 @@ final class WordWrapToggleAction extends TextEditorAction { setChecked(checked); } + @Override public void update() { setEnabled(isWordWrapPossible()); setChecked(isWordWrapEnabled()); diff --git a/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/WorkbenchChainedTextFontFieldEditor.java b/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/WorkbenchChainedTextFontFieldEditor.java index 3943894a809..4ae1ed0ef1e 100644 --- a/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/WorkbenchChainedTextFontFieldEditor.java +++ b/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/WorkbenchChainedTextFontFieldEditor.java @@ -39,6 +39,7 @@ import org.eclipse.ui.preferences.ScopedPreferenceStore; * <code>org.eclipse.ui.editors</code> plug-in. * @since 2.0 */ +@Deprecated public class WorkbenchChainedTextFontFieldEditor extends PropagatingFontFieldEditor { /** diff --git a/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/link/EditorLinkedModeUI.java b/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/link/EditorLinkedModeUI.java index 9ddf58d96bc..ec31317cc07 100644 --- a/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/link/EditorLinkedModeUI.java +++ b/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/link/EditorLinkedModeUI.java @@ -38,6 +38,7 @@ public class EditorLinkedModeUI extends LinkedModeUI { /* * @see org.eclipse.jface.text.link.LinkedModeUI.ILinkedModeUIFocusListener#linkedFocusLost(org.eclipse.jface.text.link.LinkedPosition, org.eclipse.jface.text.link.LinkedModeUI.LinkedModeUITarget) */ + @Override public void linkingFocusLost(LinkedPosition position, LinkedModeUITarget target) { // mark navigation history IWorkbenchWindow win= PlatformUI.getWorkbench().getActiveWorkbenchWindow(); @@ -53,6 +54,7 @@ public class EditorLinkedModeUI extends LinkedModeUI { /* * @see org.eclipse.jface.text.link.LinkedModeUI.ILinkedModeUIFocusListener#linkedFocusGained(org.eclipse.jface.text.link.LinkedPosition, org.eclipse.jface.text.link.LinkedModeUI.LinkedModeUITarget) */ + @Override public void linkingFocusGained(LinkedPosition position, LinkedModeUITarget target) { // does nothing } diff --git a/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/quickdiff/QuickDiffToggleAction.java b/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/quickdiff/QuickDiffToggleAction.java index a5457498532..21fc95c6201 100644 --- a/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/quickdiff/QuickDiffToggleAction.java +++ b/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/quickdiff/QuickDiffToggleAction.java @@ -70,6 +70,7 @@ public class QuickDiffToggleAction implements IEditorActionDelegate, IUpdate { private static final String MENU_ID= "quickdiff.menu"; //$NON-NLS-1$ private static final String GROUP_RESTORE= "restore"; //$NON-NLS-1$ + @Override public void menuAboutToShow(IMenuManager manager) { // update the toggle action itself update(); @@ -123,9 +124,7 @@ public class QuickDiffToggleAction implements IEditorActionDelegate, IUpdate { } }; - /* - * @see org.eclipse.ui.IEditorActionDelegate#setActiveEditor(org.eclipse.jface.action.IAction, org.eclipse.ui.IEditorPart) - */ + @Override public void setActiveEditor(IAction action, IEditorPart targetEditor) { fProxy= action; removePopupMenu(); @@ -171,9 +170,7 @@ public class QuickDiffToggleAction implements IEditorActionDelegate, IUpdate { return ((ITextEditorExtension3)fEditor).isChangeInformationShowing(); } - /* - * @see org.eclipse.ui.IActionDelegate#run(org.eclipse.jface.action.IAction) - */ + @Override public void run(IAction action) { fProxy= action; if (fEditor == null) @@ -185,16 +182,12 @@ public class QuickDiffToggleAction implements IEditorActionDelegate, IUpdate { } } - /* - * @see org.eclipse.ui.IActionDelegate#selectionChanged(org.eclipse.jface.action.IAction, org.eclipse.jface.viewers.ISelection) - */ + @Override public void selectionChanged(IAction action, ISelection selection) { fProxy= action; } - /* - * @see org.eclipse.ui.texteditor.IUpdate#update() - */ + @Override public void update() { if (fProxy == null) return; diff --git a/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/quickdiff/ReferenceProviderDescriptor.java b/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/quickdiff/ReferenceProviderDescriptor.java index 42593933192..5c90564b1fd 100644 --- a/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/quickdiff/ReferenceProviderDescriptor.java +++ b/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/quickdiff/ReferenceProviderDescriptor.java @@ -119,6 +119,7 @@ public class ReferenceProviderDescriptor { * @return the default attribute value for this extension. * @deprecated as of 3.2, the default flag should not be used any longer */ + @Deprecated public boolean getDefault() { if (fDefault == null) { String def= fConfiguration.getAttribute(DEFAULT_ATTRIBUTE); diff --git a/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/rulers/AbstractContributedRulerColumn.java b/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/rulers/AbstractContributedRulerColumn.java index 078fa0e6088..44b5a76c508 100644 --- a/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/rulers/AbstractContributedRulerColumn.java +++ b/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/rulers/AbstractContributedRulerColumn.java @@ -32,47 +32,35 @@ public abstract class AbstractContributedRulerColumn implements IContributedRule private ITextEditor fEditor; - /* - * @see org.eclipse.ui.texteditor.rulers.IContributedRulerColumn#getDescriptor() - */ + @Override public final RulerColumnDescriptor getDescriptor() { return fDescriptor; } - /* - * @see org.eclipse.ui.texteditor.rulers.IContributedRulerColumn#setDescriptor(org.eclipse.ui.texteditor.rulers.RulerColumnDescriptor) - */ + @Override public final void setDescriptor(RulerColumnDescriptor descriptor) { Assert.isLegal(descriptor != null); Assert.isTrue(fDescriptor == null); fDescriptor= descriptor; } - /* - * @see org.eclipse.ui.texteditor.rulers.IContributedRulerColumn#setEditor(org.eclipse.ui.texteditor.ITextEditor) - */ + @Override public final void setEditor(ITextEditor editor) { Assert.isLegal(editor != null); Assert.isTrue(fEditor == null); fEditor= editor; } - /* - * @see org.eclipse.ui.texteditor.rulers.IContributedRulerColumn#getEditor() - */ + @Override public final ITextEditor getEditor() { return fEditor; } - /* - * @see org.eclipse.ui.texteditor.rulers.IContributedRulerColumn#columnCreated() - */ + @Override public void columnCreated() { } - /* - * @see org.eclipse.ui.texteditor.rulers.IContributedRulerColumn#columnRemoved() - */ + @Override public void columnRemoved() { } } diff --git a/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/rulers/RulerColumnDescriptor.java b/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/rulers/RulerColumnDescriptor.java index 50726fb6102..66143004b82 100755 --- a/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/rulers/RulerColumnDescriptor.java +++ b/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/rulers/RulerColumnDescriptor.java @@ -259,10 +259,7 @@ public final class RulerColumnDescriptor { return column; } - /* - * @see java.lang.Object#toString() - * @since 3.3 - */ + @Override public String toString() { return "RulerColumnDescriptor[name=" + getName() + "]"; //$NON-NLS-1$ //$NON-NLS-2$ } @@ -271,9 +268,7 @@ public final class RulerColumnDescriptor { return fElement; } - /* - * @see java.lang.Object#hashCode() - */ + @Override public int hashCode() { final int prime= 31; int result= 1; @@ -281,9 +276,7 @@ public final class RulerColumnDescriptor { return result; } - /* - * @see java.lang.Object#equals(java.lang.Object) - */ + @Override public boolean equals(Object obj) { if (this == obj) return true; diff --git a/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/rulers/RulerColumnRegistry.java b/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/rulers/RulerColumnRegistry.java index bd92717cf7a..1ee546c4c3d 100644 --- a/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/rulers/RulerColumnRegistry.java +++ b/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/rulers/RulerColumnRegistry.java @@ -197,6 +197,7 @@ public final class RulerColumnRegistry { * 3. TopoSort DAG: pick the source with the lowest gravity and remove from DAG */ ConfigurationElementSorter sorter= new ConfigurationElementSorter() { + @Override public IConfigurationElement getConfigurationElement(Object object) { return ((RulerColumnDescriptor) object).getConfigurationElement(); } @@ -235,6 +236,7 @@ public final class RulerColumnRegistry { } Comparator gravityComp= new Comparator() { + @Override public int compare(Object o1, Object o2) { float diff= ((RulerColumnDescriptor) o1).getPlacement().getGravity() - ((RulerColumnDescriptor) o2).getPlacement().getGravity(); if (diff == 0) diff --git a/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/spelling/SpellingAnnotation.java b/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/spelling/SpellingAnnotation.java index 3716e9fb36c..3f3c85e48e7 100644 --- a/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/spelling/SpellingAnnotation.java +++ b/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/spelling/SpellingAnnotation.java @@ -37,23 +37,17 @@ public class SpellingAnnotation extends Annotation implements IQuickFixableAnnot fSpellingProblem= problem; } - /* - * @see org.eclipse.jface.text.quickassist.IQuickFixableAnnotation#isQuickFixable() - */ + @Override public boolean isQuickFixable() { return true; } - /* - * @see org.eclipse.jface.text.quickassist.IQuickFixableAnnotation#isQuickFixableStateSet() - */ + @Override public boolean isQuickFixableStateSet() { return true; } - /* - * @see org.eclipse.jface.text.quickassist.IQuickFixableAnnotation#setQuickFixable(boolean) - */ + @Override public void setQuickFixable(boolean state) { // always true } diff --git a/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/spelling/SpellingCorrectionProcessor.java b/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/spelling/SpellingCorrectionProcessor.java index 1bf8c717805..2b4f689f560 100644 --- a/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/spelling/SpellingCorrectionProcessor.java +++ b/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/spelling/SpellingCorrectionProcessor.java @@ -42,6 +42,7 @@ public final class SpellingCorrectionProcessor implements IQuickAssistProcessor /* * @see IContentAssistProcessor#computeCompletionProposals(ITextViewer, int) */ + @Override public ICompletionProposal[] computeQuickAssistProposals(IQuickAssistInvocationContext quickAssistContext) { ISourceViewer viewer= quickAssistContext.getSourceViewer(); int documentOffset= quickAssistContext.getOffset(); @@ -95,23 +96,17 @@ public final class SpellingCorrectionProcessor implements IQuickAssistProcessor return proposals; } - /* - * @see IContentAssistProcessor#getErrorMessage() - */ + @Override public String getErrorMessage() { return null; } - /* - * @see org.eclipse.jface.text.quickassist.IQuickAssistProcessor#canFix(org.eclipse.jface.text.source.Annotation) - */ + @Override public boolean canFix(Annotation annotation) { return annotation instanceof SpellingAnnotation && !annotation.isMarkedDeleted(); } - /* - * @see org.eclipse.jface.text.quickassist.IQuickAssistProcessor#canAssist(org.eclipse.jface.text.quickassist.IQuickAssistInvocationContext) - */ + @Override public boolean canAssist(IQuickAssistInvocationContext invocationContext) { return false; } diff --git a/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/spelling/SpellingProblem.java b/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/spelling/SpellingProblem.java index 8bafe1aa2e9..5f7df930308 100644 --- a/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/spelling/SpellingProblem.java +++ b/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/spelling/SpellingProblem.java @@ -61,6 +61,7 @@ public abstract class SpellingProblem { * @since 3.3 * @deprecated As of 3.4, replaced by {@link #removeAll(ISourceViewer, String)} */ + @Deprecated public static void removeAllInActiveEditor(ITextEditor editor, String word) { if (editor == null) return; diff --git a/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/spelling/SpellingReconcileStrategy.java b/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/spelling/SpellingReconcileStrategy.java index e450ab42c28..d777e9ae0d6 100644 --- a/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/spelling/SpellingReconcileStrategy.java +++ b/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/spelling/SpellingReconcileStrategy.java @@ -73,23 +73,17 @@ public class SpellingReconcileStrategy implements IReconcilingStrategy, IReconci fLockObject= fAnnotationModel; } - /* - * @see org.eclipse.ui.texteditor.spelling.ISpellingProblemCollector#accept(org.eclipse.ui.texteditor.spelling.SpellingProblem) - */ + @Override public void accept(SpellingProblem problem) { fAddAnnotations.put(new SpellingAnnotation(problem), new Position(problem.getOffset(), problem.getLength())); } - /* - * @see org.eclipse.ui.texteditor.spelling.ISpellingProblemCollector#beginCollecting() - */ + @Override public void beginCollecting() { fAddAnnotations= new HashMap(); } - /* - * @see org.eclipse.ui.texteditor.spelling.ISpellingProblemCollector#endCollecting() - */ + @Override public void endCollecting() { List toRemove= new ArrayList(); @@ -162,16 +156,12 @@ public class SpellingReconcileStrategy implements IReconcilingStrategy, IReconci } - /* - * @see org.eclipse.jface.text.reconciler.IReconcilingStrategyExtension#initialReconcile() - */ + @Override public void initialReconcile() { reconcile(new Region(0, fDocument.getLength())); } - /* - * @see org.eclipse.jface.text.reconciler.IReconcilingStrategy#reconcile(org.eclipse.jface.text.reconciler.DirtyRegion,org.eclipse.jface.text.IRegion) - */ + @Override public void reconcile(DirtyRegion dirtyRegion, IRegion subRegion) { try { IRegion startLineInfo= fDocument.getLineInformationOfOffset(subRegion.getOffset()); @@ -187,9 +177,7 @@ public class SpellingReconcileStrategy implements IReconcilingStrategy, IReconci reconcile(subRegion); } - /* - * @see org.eclipse.jface.text.reconciler.IReconcilingStrategy#reconcile(org.eclipse.jface.text.IRegion) - */ + @Override public void reconcile(IRegion region) { if (getAnnotationModel() == null || fSpellingProblemCollector == null) return; @@ -217,9 +205,7 @@ public class SpellingReconcileStrategy implements IReconcilingStrategy, IReconci return fDocument; } - /* - * @see org.eclipse.jface.text.reconciler.IReconcilingStrategy#setDocument(org.eclipse.jface.text.IDocument) - */ + @Override public void setDocument(IDocument document) { fDocument= document; fSpellingProblemCollector= createSpellingProblemCollector(); @@ -237,9 +223,7 @@ public class SpellingReconcileStrategy implements IReconcilingStrategy, IReconci return new SpellingProblemCollector(model); } - /* - * @see org.eclipse.jface.text.reconciler.IReconcilingStrategyExtension#setProgressMonitor(org.eclipse.core.runtime.IProgressMonitor) - */ + @Override public final void setProgressMonitor(IProgressMonitor monitor) { fProgressMonitor= monitor; } diff --git a/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/spelling/SpellingService.java b/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/spelling/SpellingService.java index 4db04023a97..f70fbc0caa0 100644 --- a/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/spelling/SpellingService.java +++ b/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/spelling/SpellingService.java @@ -100,9 +100,11 @@ public class SpellingService { final ISpellingEngine engine= createEngine(fPreferences); if (engine != null) { ISafeRunnable runnable= new ISafeRunnable() { + @Override public void run() throws Exception { engine.check(document, regions, context, collector, monitor); } + @Override public void handleException(Throwable x) { } }; diff --git a/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/templates/AbstractTemplatesPage.java b/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/templates/AbstractTemplatesPage.java index a041f17c562..20333be90ef 100644 --- a/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/templates/AbstractTemplatesPage.java +++ b/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/templates/AbstractTemplatesPage.java @@ -163,9 +163,7 @@ public abstract class AbstractTemplatesPage extends Page implements ITemplatesPa * position updates the templates */ private final class SelectionChangedListener implements ISelectionChangedListener { - /* - * @see org.eclipse.jface.viewers.ISelectionChangedListener#selectionChanged(org.eclipse.jface.viewers.SelectionChangedEvent) - */ + @Override public void selectionChanged(SelectionChangedEvent event) { String[] contextTypes= getEditorContextTypeIds(); if (needUpdate(contextTypes)) { @@ -209,9 +207,7 @@ public abstract class AbstractTemplatesPage extends Page implements ITemplatesPa * position. */ private final class EditorDropTargetListener extends DropTargetAdapter { - /* - * @see org.eclipse.swt.dnd.DropTargetAdapter#dragEnter(org.eclipse.swt.dnd.DropTargetEvent) - */ + @Override public void dragEnter(DropTargetEvent event) { if (!TemplatesTransfer.getInstance().isSupportedType(event.currentDataType)) return; @@ -219,9 +215,7 @@ public abstract class AbstractTemplatesPage extends Page implements ITemplatesPa event.detail= DND.DROP_COPY; } - /* - * @see org.eclipse.swt.dnd.DropTargetAdapter#dragOperationChanged(org.eclipse.swt.dnd.DropTargetEvent) - */ + @Override public void dragOperationChanged(DropTargetEvent event) { if (!TemplatesTransfer.getInstance().isSupportedType(event.currentDataType)) return; @@ -229,9 +223,7 @@ public abstract class AbstractTemplatesPage extends Page implements ITemplatesPa event.detail= DND.DROP_COPY; } - /* - * @see org.eclipse.swt.dnd.DropTargetAdapter#dragOver(org.eclipse.swt.dnd.DropTargetEvent) - */ + @Override public void dragOver(DropTargetEvent event) { if (!TemplatesTransfer.getInstance().isSupportedType(event.currentDataType)) return; @@ -244,9 +236,7 @@ public abstract class AbstractTemplatesPage extends Page implements ITemplatesPa event.detail= DND.DROP_COPY; } - /* - * @see org.eclipse.swt.dnd.DropTargetAdapter#drop(org.eclipse.swt.dnd.DropTargetEvent) - */ + @Override public void drop(DropTargetEvent event) { if (!TemplatesTransfer.getInstance().isSupportedType(event.currentDataType)) return; @@ -266,12 +256,7 @@ public abstract class AbstractTemplatesPage extends Page implements ITemplatesPa * description and context types by names. */ private static final class TemplateViewerComparator extends ViewerComparator { - /* - * (non-Javadoc) - * - * @see org.eclipse.jface.viewers.ViewerComparator#compare(org.eclipse.jface.viewers.Viewer, - * java.lang.Object, java.lang.Object) - */ + @Override public int compare(Viewer viewer, Object object1, Object object2) { if ((object1 instanceof TemplatePersistenceData) && (object2 instanceof TemplatePersistenceData)) { @@ -291,9 +276,7 @@ public abstract class AbstractTemplatesPage extends Page implements ITemplatesPa return super.compare(viewer, object1, object2); } - /* - * @see org.eclipse.jface.viewers.ViewerComparator#isSorterProperty(java.lang.Object, java.lang.String) - */ + @Override public boolean isSorterProperty(Object element, String property) { return false; } @@ -305,9 +288,7 @@ public abstract class AbstractTemplatesPage extends Page implements ITemplatesPa */ private final class TemplateLabelProvider extends LabelProvider implements ITableLabelProvider { - /* - * @see org.eclipse.jface.viewers.ITableLabelProvider#getColumnImage(java.lang.Object, int) - */ + @Override public Image getColumnImage(Object element, int columnIndex) { if (columnIndex != 0) return null; @@ -316,9 +297,7 @@ public abstract class AbstractTemplatesPage extends Page implements ITemplatesPa return AbstractTemplatesPage.this.getImage(((TemplatePersistenceData) element).getTemplate()); } - /* - * @see org.eclipse.jface.viewers.ITableLabelProvider#getColumnText(java.lang.Object, int) - */ + @Override public String getColumnText(Object element, int columnIndex) { if (element instanceof TemplatePersistenceData) return getTemplateColumnText((TemplatePersistenceData) element, columnIndex); @@ -353,9 +332,7 @@ public abstract class AbstractTemplatesPage extends Page implements ITemplatesPa */ private final class TemplatesContentProvider implements ITreeContentProvider { - /* - * @see org.eclipse.jface.viewers.ITreeContentProvider#getChildren(java.lang.Object) - */ + @Override public Object[] getChildren(Object parentElement) { if (parentElement instanceof TemplatePersistenceData) return new Object[0]; @@ -377,9 +354,7 @@ public abstract class AbstractTemplatesPage extends Page implements ITemplatesPa .toArray(new TemplatePersistenceData[templateList.size()]); } - /* - * @see org.eclipse.jface.viewers.ITreeContentProvider#getParent(java.lang.Object) - */ + @Override public Object getParent(Object element) { if (element instanceof TemplatePersistenceData) { TemplatePersistenceData templateData= (TemplatePersistenceData) element; @@ -389,9 +364,7 @@ public abstract class AbstractTemplatesPage extends Page implements ITemplatesPa return null; } - /* - * @see org.eclipse.jface.viewers.ITreeContentProvider#hasChildren(java.lang.Object) - */ + @Override public boolean hasChildren(Object parentElement) { if (parentElement instanceof TemplatePersistenceData) return false; @@ -411,9 +384,7 @@ public abstract class AbstractTemplatesPage extends Page implements ITemplatesPa return false; } - /* - * @see org.eclipse.jface.viewers.IStructuredContentProvider#getElements(java.lang.Object) - */ + @Override public Object[] getElements(Object inputElement) { List contextTypes= new ArrayList(); @@ -429,15 +400,11 @@ public abstract class AbstractTemplatesPage extends Page implements ITemplatesPa return fActiveTypes == null || fActiveTypes.contains(contextType.getId()); } - /* - * @see org.eclipse.jface.viewers.IContentProvider#dispose() - */ + @Override public void dispose() { } - /* - * @see org.eclipse.jface.viewers.IContentProvider#inputChanged(org.eclipse.jface.viewers.Viewer, java.lang.Object, java.lang.Object) - */ + @Override public void inputChanged(Viewer viewer, Object oldInput, Object newInput) { } } @@ -517,9 +484,7 @@ public abstract class AbstractTemplatesPage extends Page implements ITemplatesPa setupPasteOperation(); } - /* - * @see org.eclipse.ui.part.Page#createControl(org.eclipse.swt.widgets.Composite) - */ + @Override public void createControl(Composite ancestor) { setupActions(); @@ -535,8 +500,10 @@ public abstract class AbstractTemplatesPage extends Page implements ITemplatesPa int sashSize= fPreferenceStore.getInt(SASH_SIZE_PREF_ID); fControl.setWeights(new int[] { sashSize, 100 - sashSize }); fTemplateChangeListener= new IPropertyChangeListener() { + @Override public void propertyChange(PropertyChangeEvent event) { getShell().getDisplay().asyncExec(new Runnable() { + @Override public void run() { refresh(); } @@ -547,22 +514,16 @@ public abstract class AbstractTemplatesPage extends Page implements ITemplatesPa updateContextTypes(getEditorContextTypeIds()); } - /* - * @see org.eclipse.ui.part.Page#setFocus() - */ + @Override public void setFocus() { } - /* - * @see org.eclipse.ui.part.Page#getControl() - */ + @Override public Control getControl() { return fControl; } - /* - * @see org.eclipse.ui.part.Page#dispose() - */ + @Override public void dispose() { ISelectionProvider selectionProvider= fViewer.getSelectionProvider(); if (selectionProvider instanceof IPostSelectionProvider) @@ -690,6 +651,7 @@ public abstract class AbstractTemplatesPage extends Page implements ITemplatesPa * @return the template store * @since 3.6 public, before it was protected */ + @Override abstract public TemplateStore getTemplateStore(); /** @@ -759,6 +721,7 @@ public abstract class AbstractTemplatesPage extends Page implements ITemplatesPa private void setupPasteOperation() { fEditorOldPasteAction= fTextEditor.getAction(ITextEditorActionConstants.PASTE); fEditorPasteAction= new Action(TemplatesMessages.TemplatesPage_paste) { + @Override public void run() { Clipboard clipboard= new Clipboard(getShell().getDisplay()); try { @@ -772,6 +735,7 @@ public abstract class AbstractTemplatesPage extends Page implements ITemplatesPa } } + @Override public void runWithEvent(Event event) { run(); } @@ -852,6 +816,7 @@ public abstract class AbstractTemplatesPage extends Page implements ITemplatesPa */ private void createActions() { fInsertAction= new Action(TemplatesMessages.TemplatesPage_insert) { + @Override public void run() { TemplatePersistenceData[] selectedTemplates= getSelectedTemplates(); insertTemplate(selectedTemplates[0].getTemplate()); @@ -864,6 +829,7 @@ public abstract class AbstractTemplatesPage extends Page implements ITemplatesPa fInsertAction.setToolTipText(TemplatesMessages.TemplatesPage_insert_tooltip); fAddAction= new Action(TemplatesMessages.TemplatesPage_new) { + @Override public void run() { addTemplate(); } @@ -873,6 +839,7 @@ public abstract class AbstractTemplatesPage extends Page implements ITemplatesPa fAddAction.setToolTipText(TemplatesMessages.TemplatesPage_new_tooltip); fEditAction= new Action(TemplatesMessages.TemplatesPage_edit) { + @Override public void run() { editTemplate(); } @@ -884,6 +851,7 @@ public abstract class AbstractTemplatesPage extends Page implements ITemplatesPa fEditAction.setToolTipText(TemplatesMessages.TemplatesPage_edit_tooltip); fRemoveAction= new Action(TemplatesMessages.TemplatesPage_remove) { + @Override public void run() { removeTemplates(); } @@ -896,6 +864,7 @@ public abstract class AbstractTemplatesPage extends Page implements ITemplatesPa fLinkWithEditorAction= new Action(TemplatesMessages.TemplatesPage_link_to_editor, IAction.AS_CHECK_BOX) { + @Override public void run() { fPreferenceStore.setValue(LINK_ACTION_PREF_ID, fLinkWithEditorAction.isChecked()); refresh(); @@ -907,6 +876,7 @@ public abstract class AbstractTemplatesPage extends Page implements ITemplatesPa fLinkWithEditorAction .setToolTipText(TemplatesMessages.TemplatesPage_link_to_editor_tooltip); fCollapseAllAction= new Action(TemplatesMessages.TemplatesPage_collapse_all) { + @Override public void run() { fTreeViewer.collapseAll(); } @@ -917,6 +887,7 @@ public abstract class AbstractTemplatesPage extends Page implements ITemplatesPa if (getPreferencePageId() != null) { fPreferencePageAction= new Action(TemplatesMessages.TemplatesPage_preference_page) { + @Override public void run() { showPreferencePage(); } @@ -926,6 +897,7 @@ public abstract class AbstractTemplatesPage extends Page implements ITemplatesPa } fPasteAction= new Action() { + @Override public void run() { Clipboard clipboard= new Clipboard(getShell().getDisplay()); try { @@ -933,6 +905,7 @@ public abstract class AbstractTemplatesPage extends Page implements ITemplatesPa if (pattern != null) { final Template template= new Template(createTemplateName(), TemplatesMessages.TemplatesPage_paste_description, getContextTypeId(), pattern.replaceAll("\\$", "\\$\\$"), true); //$NON-NLS-1$//$NON-NLS-2$ getShell().getDisplay().asyncExec(new Runnable() { + @Override public void run() { addTemplate(template); } @@ -950,6 +923,7 @@ public abstract class AbstractTemplatesPage extends Page implements ITemplatesPa }; fCopyAction= new Action() { + @Override public void run() { Clipboard clipboard= new Clipboard(getShell().getDisplay()); try { @@ -1050,9 +1024,11 @@ public abstract class AbstractTemplatesPage extends Page implements ITemplatesPa } columnLayout.setColumnData(columnName, new ColumnPixelData(minWidth, true)); columnName.addControlListener(new ControlListener() { + @Override public void controlMoved(ControlEvent e) { } + @Override public void controlResized(ControlEvent e) { int nameWidth= ((TreeColumn) e.getSource()).getWidth(); fPreferenceStore.setValue(COLUMN_NAME_WIDTH_PREF_ID, nameWidth); @@ -1067,9 +1043,11 @@ public abstract class AbstractTemplatesPage extends Page implements ITemplatesPa } columnLayout.setColumnData(columnDescription, new ColumnPixelData(minWidth, false)); columnDescription.addControlListener(new ControlListener() { + @Override public void controlMoved(ControlEvent e) { } + @Override public void controlResized(ControlEvent e) { int descriptionWidth= ((TreeColumn) e.getSource()).getWidth(); fPreferenceStore.setValue(COLUMN_DESCRIPTION_WIDTH_PREF_ID, descriptionWidth); @@ -1092,6 +1070,7 @@ public abstract class AbstractTemplatesPage extends Page implements ITemplatesPa fTreeViewer.setComparator(new TemplateViewerComparator()); fTreeViewer.setInput(getTemplatePreferenceStore()); fTreeViewer.addDoubleClickListener(new IDoubleClickListener() { + @Override public void doubleClick(DoubleClickEvent e) { updateSelectedItems(); TemplatePersistenceData[] selectedTemplates= getSelectedTemplates(); @@ -1101,6 +1080,7 @@ public abstract class AbstractTemplatesPage extends Page implements ITemplatesPa }); fTreeViewer.addSelectionChangedListener(new ISelectionChangedListener() { + @Override public void selectionChanged(SelectionChangedEvent e) { updateSelectedItems(); updateButtons(); @@ -1125,9 +1105,11 @@ public abstract class AbstractTemplatesPage extends Page implements ITemplatesPa fPatternViewer= createPatternViewer(viewForm); viewForm.setContent(fPatternViewer.getControl()); viewForm.addControlListener(new ControlListener() { + @Override public void controlMoved(ControlEvent e) { } + @Override public void controlResized(ControlEvent e) { int[] weights= fControl.getWeights(); int sashSize= (int) (weights[0] * 100.0 / (weights[0] + weights[1])); @@ -1143,6 +1125,7 @@ public abstract class AbstractTemplatesPage extends Page implements ITemplatesPa MenuManager menuMgr= new MenuManager(POPUP_MENU_ID); menuMgr.setRemoveAllWhenShown(true); menuMgr.addMenuListener(new IMenuListener() { + @Override public void menuAboutToShow(IMenuManager manager) { fillContextMenu(manager); } @@ -1236,6 +1219,7 @@ public abstract class AbstractTemplatesPage extends Page implements ITemplatesPa * @return selected templates * @since 3.6 public, before it was private */ + @Override public TemplatePersistenceData[] getSelectedTemplates() { return fSelectedTemplates; } @@ -1421,20 +1405,14 @@ public abstract class AbstractTemplatesPage extends Page implements ITemplatesPa */ private void initializeDND() { DragSourceAdapter dragListener= new DragSourceAdapter() { - /* - * (non-Javadoc) - * - * @see org.eclipse.swt.dnd.DragSourceAdapter#dragStart(org.eclipse.swt.dnd.DragSourceEvent) - */ + @Override public void dragStart(DragSourceEvent event) { if (getSelectedTemplates().length == 0) { event.doit= false; } } - /* - * @see org.eclipse.swt.dnd.DragSourceAdapter#dragSetData(org.eclipse.swt.dnd.DragSourceEvent) - */ + @Override public void dragSetData(DragSourceEvent event) { if (TemplatesTransfer.getInstance().isSupportedType(event.dataType)) { event.data= getSelectedTemplates(); @@ -1447,25 +1425,19 @@ public abstract class AbstractTemplatesPage extends Page implements ITemplatesPa Transfer textTransfer= TextTransfer.getInstance(); Transfer templateTransfer= TemplatesTransfer.getInstance(); - /* - * @see org.eclipse.swt.dnd.DropTargetAdapter#dragEnter(org.eclipse.swt.dnd.DropTargetEvent) - */ + @Override public void dragEnter(DropTargetEvent event) { if (event.detail == DND.DROP_DEFAULT) event.detail= DND.DROP_COPY; } - /* - * @see org.eclipse.swt.dnd.DropTargetAdapter#dragOperationChanged(org.eclipse.swt.dnd.DropTargetEvent) - */ + @Override public void dragOperationChanged(DropTargetEvent event) { if (event.detail == DND.DROP_DEFAULT) event.detail= DND.DROP_COPY; } - /* - * @see org.eclipse.swt.dnd.DropTargetAdapter#dragOver(org.eclipse.swt.dnd.DropTargetEvent) - */ + @Override public void dragOver(DropTargetEvent event) { event.feedback |= DND.FEEDBACK_SCROLL; if (event.item == null) { @@ -1492,9 +1464,7 @@ public abstract class AbstractTemplatesPage extends Page implements ITemplatesPa } } - /* - * @see org.eclipse.swt.dnd.DropTargetAdapter#drop(org.eclipse.swt.dnd.DropTargetEvent) - */ + @Override public void drop(DropTargetEvent event) { if (event.item == null) return; @@ -1510,6 +1480,7 @@ public abstract class AbstractTemplatesPage extends Page implements ITemplatesPa TemplatesMessages.TemplatesPage_paste_description, contextId, text, true); getShell().getDisplay().asyncExec(new Runnable() { + @Override public void run() { addTemplate(template); } @@ -1520,6 +1491,7 @@ public abstract class AbstractTemplatesPage extends Page implements ITemplatesPa final TemplatePersistenceData[] templates= (TemplatePersistenceData[]) event.data; final int dropType= event.detail; getShell().getDisplay().asyncExec(new Runnable() { + @Override public void run() { if (dropType == DND.DROP_COPY) copyTemplates(templates, contextId); diff --git a/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/templates/ColumnLayout.java b/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/templates/ColumnLayout.java index 506c8780b58..e8e3d64194c 100644 --- a/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/templates/ColumnLayout.java +++ b/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/templates/ColumnLayout.java @@ -178,16 +178,12 @@ final class ColumnLayout extends Layout { } } - /* - * @see org.eclipse.swt.widgets.Layout#computeSize(org.eclipse.swt.widgets.Composite, int, int, boolean) - */ + @Override protected Point computeSize(Composite composite, int wHint, int hHint, boolean flushCache) { return computeTableSize(getTable(composite), wHint, hHint); } - /* - * @see org.eclipse.swt.widgets.Layout#layout(org.eclipse.swt.widgets.Composite, boolean) - */ + @Override protected void layout(Composite composite, boolean flushCache) { Rectangle area= composite.getClientArea(); Table table= getTable(composite); diff --git a/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/templates/StatusInfo.java b/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/templates/StatusInfo.java index d64f3ca1662..51c59d2d8f9 100644 --- a/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/templates/StatusInfo.java +++ b/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/templates/StatusInfo.java @@ -50,6 +50,7 @@ class StatusInfo implements IStatus { * * @return <code>true</code> if the status' severity is OK */ + @Override public boolean isOK() { return fSeverity == IStatus.OK; } @@ -87,6 +88,7 @@ class StatusInfo implements IStatus { * @return the message * @see IStatus#getMessage() */ + @Override public String getMessage() { return fStatusMessage; } @@ -129,9 +131,7 @@ class StatusInfo implements IStatus { fSeverity= IStatus.OK; } - /* - * @see IStatus#matches(int) - */ + @Override public boolean matches(int severityMask) { return (fSeverity & severityMask) != 0; } @@ -140,20 +140,17 @@ class StatusInfo implements IStatus { * Returns always <code>false</code>. * @see IStatus#isMultiStatus() */ + @Override public boolean isMultiStatus() { return false; } - /* - * @see IStatus#getSeverity() - */ + @Override public int getSeverity() { return fSeverity; } - /* - * @see IStatus#getPlugin() - */ + @Override public String getPlugin() { return TextEditorPlugin.PLUGIN_ID; } @@ -162,6 +159,7 @@ class StatusInfo implements IStatus { * Returns always <code>null</code>. * @see IStatus#getException() */ + @Override public Throwable getException() { return null; } @@ -170,6 +168,7 @@ class StatusInfo implements IStatus { * Returns always the error severity. * @see IStatus#getCode() */ + @Override public int getCode() { return fSeverity; } @@ -178,6 +177,7 @@ class StatusInfo implements IStatus { * Returns always <code>null</code>. * @see IStatus#getChildren() */ + @Override public IStatus[] getChildren() { return new IStatus[0]; } diff --git a/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/templates/TemplateContentProvider.java b/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/templates/TemplateContentProvider.java index 231f4691c9c..6a2d97811b9 100644 --- a/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/templates/TemplateContentProvider.java +++ b/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/templates/TemplateContentProvider.java @@ -26,23 +26,17 @@ class TemplateContentProvider implements IStructuredContentProvider { /** The template store. */ private TemplateStore fStore; - /* - * @see IStructuredContentProvider#getElements(Object) - */ + @Override public Object[] getElements(Object input) { return fStore.getTemplateData(false); } - /* - * @see IContentProvider#inputChanged(Viewer, Object, Object) - */ + @Override public void inputChanged(Viewer viewer, Object oldInput, Object newInput) { fStore= (TemplateStore) newInput; } - /* - * @see IContentProvider#dispose() - */ + @Override public void dispose() { fStore= null; } diff --git a/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/templates/TemplatePreferencePage.java b/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/templates/TemplatePreferencePage.java index 82f382363d9..c5bfa55b86e 100644 --- a/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/templates/TemplatePreferencePage.java +++ b/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/templates/TemplatePreferencePage.java @@ -184,6 +184,7 @@ public abstract class TemplatePreferencePage extends PreferencePage implements I * * @see Action#firePropertyChange(String, Object, Object) */ + @Override public void update() { // XXX: workaround for https://bugs.eclipse.org/bugs/show_bug.cgi?id=206111 if (fOperationCode == ITextOperationTarget.REDO || fOperationCode == ITextOperationTarget.REDO) @@ -201,6 +202,7 @@ public abstract class TemplatePreferencePage extends PreferencePage implements I /** * @see Action#run() */ + @Override public void run() { if (fOperationCode != -1 && fOperationTarget != null) { fOperationTarget.doOperation(fOperationCode); @@ -258,6 +260,7 @@ public abstract class TemplatePreferencePage extends PreferencePage implements I } Collections.sort(contexts, new Comparator() { Collator fCollator= Collator.getInstance(); + @Override public int compare(Object o1, Object o2) { return fCollator.compare(((String[])o1)[1], ((String[])o2)[1]); } @@ -272,17 +275,12 @@ public abstract class TemplatePreferencePage extends PreferencePage implements I fTemplateProcessor.setContextType(type); } - /* - * @see org.eclipse.jface.dialogs.Dialog#isResizable() - * @since 3.4 - */ + @Override protected boolean isResizable() { return true; } - /* - * @see org.eclipse.ui.texteditor.templates.StatusDialog#create() - */ + @Override public void create() { super.create(); // update initial OK button to be disabled for new templates @@ -294,9 +292,7 @@ public abstract class TemplatePreferencePage extends PreferencePage implements I } } - /* - * @see Dialog#createDialogArea(Composite) - */ + @Override protected Control createDialogArea(Composite ancestor) { Composite parent= new Composite(ancestor, SWT.NONE); GridLayout layout= new GridLayout(); @@ -309,6 +305,7 @@ public abstract class TemplatePreferencePage extends PreferencePage implements I parent.setLayoutData(new GridData(GridData.FILL_BOTH)); ModifyListener listener= new ModifyListener() { + @Override public void modifyText(ModifyEvent e) { doTextWidgetChanged(e.widget); } @@ -329,9 +326,11 @@ public abstract class TemplatePreferencePage extends PreferencePage implements I fNameText.addModifyListener(listener); fNameText.addFocusListener(new FocusListener() { + @Override public void focusGained(FocusEvent e) { } + @Override public void focusLost(FocusEvent e) { if (fSuppressError) { fSuppressError= false; @@ -382,11 +381,13 @@ public abstract class TemplatePreferencePage extends PreferencePage implements I fInsertVariableButton.setLayoutData(getButtonGridData(fInsertVariableButton)); fInsertVariableButton.setText(TemplatesMessages.EditTemplateDialog_insert_variable); fInsertVariableButton.addSelectionListener(new SelectionListener() { + @Override public void widgetSelected(SelectionEvent e) { fPatternEditor.getTextWidget().setFocus(); fPatternEditor.doOperation(ISourceViewer.CONTENTASSIST_PROPOSALS); } + @Override public void widgetDefaultSelected(SelectionEvent e) {} }); @@ -508,6 +509,7 @@ public abstract class TemplatePreferencePage extends PreferencePage implements I control.setLayoutData(data); viewer.addTextListener(new ITextListener() { + @Override public void textChanged(TextEvent event) { if (event .getDocumentEvent() != null) doSourceChanged(event.getDocumentEvent().getDocument()); @@ -515,6 +517,7 @@ public abstract class TemplatePreferencePage extends PreferencePage implements I }); viewer.addSelectionChangedListener(new ISelectionChangedListener() { + @Override public void selectionChanged(SelectionChangedEvent event) { updateSelectionDependentActions(); } @@ -532,6 +535,7 @@ public abstract class TemplatePreferencePage extends PreferencePage implements I protected SourceViewer createViewer(Composite parent) { SourceViewer viewer= new SourceViewer(parent, null, null, false, SWT.BORDER | SWT.V_SCROLL | SWT.H_SCROLL); SourceViewerConfiguration configuration= new SourceViewerConfiguration() { + @Override public IContentAssistant getContentAssistant(ISourceViewer sourceViewer) { ContentAssistant assistant= new ContentAssistant(); @@ -552,16 +556,19 @@ public abstract class TemplatePreferencePage extends PreferencePage implements I getShell().addDisposeListener(new DisposeListener() { + @Override public void widgetDisposed(DisposeEvent e) { handlerService.deactivateHandlers(handlerActivations); } }); fPatternEditor.getTextWidget().addFocusListener(new FocusListener() { + @Override public void focusLost(FocusEvent e) { handlerService.deactivateHandlers(handlerActivations); } + @Override public void focusGained(FocusEvent e) { IAction action= (IAction)fGlobalActions.get(ITextEditorActionConstants.REDO); handlerActivations.add(handlerService.activateHandler(IWorkbenchCommandConstants.EDIT_REDO, new ActionHandler(action), expression)); @@ -608,6 +615,7 @@ public abstract class TemplatePreferencePage extends PreferencePage implements I MenuManager manager= new MenuManager(null, null); manager.setRemoveAllWhenShown(true); manager.addMenuListener(new IMenuListener() { + @Override public void menuAboutToShow(IMenuManager mgr) { fillContextMenu(mgr); } @@ -698,6 +706,7 @@ public abstract class TemplatePreferencePage extends PreferencePage implements I /* * @since 3.1 */ + @Override protected void okPressed() { String name= fNameText == null ? fOriginalTemplate.getName() : fNameText.getText(); boolean isAutoInsertable= fAutoInsertCheckbox != null && fAutoInsertCheckbox.getSelection(); @@ -726,10 +735,7 @@ public abstract class TemplatePreferencePage extends PreferencePage implements I return fTemplateProcessor; } - /* - * @see org.eclipse.jface.dialogs.Dialog#getDialogBoundsSettings() - * @since 3.2 - */ + @Override protected IDialogSettings getDialogBoundsSettings() { String sectionName= getClass().getName() + "_dialogBounds"; //$NON-NLS-1$ IDialogSettings settings= TextEditorPlugin.getDefault().getDialogSettings(); @@ -747,16 +753,12 @@ public abstract class TemplatePreferencePage extends PreferencePage implements I */ private class TemplateLabelProvider extends LabelProvider implements ITableLabelProvider { - /* - * @see org.eclipse.jface.viewers.ITableLabelProvider#getColumnImage(java.lang.Object, int) - */ + @Override public Image getColumnImage(Object element, int columnIndex) { return null; } - /* - * @see org.eclipse.jface.viewers.ITableLabelProvider#getColumnText(java.lang.Object, int) - */ + @Override public String getColumnText(Object element, int columnIndex) { TemplatePersistenceData data = (TemplatePersistenceData) element; Template template= data.getTemplate(); @@ -850,15 +852,11 @@ public abstract class TemplatePreferencePage extends PreferencePage implements I fContextTypeRegistry= registry; } - /* - * @see org.eclipse.ui.IWorkbenchPreferencePage#init(org.eclipse.ui.IWorkbench) - */ + @Override public void init(IWorkbench workbench) { } - /* - * @see PreferencePage#createContents(Composite) - */ + @Override protected Control createContents(Composite ancestor) { Composite parent= new Composite(ancestor, SWT.NONE); GridLayout layout= new GridLayout(); @@ -933,18 +931,21 @@ public abstract class TemplatePreferencePage extends PreferencePage implements I table.setSortDirection(viewerComparator.getDirection()); fTableViewer.addDoubleClickListener(new IDoubleClickListener() { + @Override public void doubleClick(DoubleClickEvent e) { edit(); } }); fTableViewer.addSelectionChangedListener(new ISelectionChangedListener() { + @Override public void selectionChanged(SelectionChangedEvent e) { selectionChanged1(); } }); fTableViewer.addCheckStateListener(new ICheckStateListener() { + @Override public void checkStateChanged(CheckStateChangedEvent event) { TemplatePersistenceData d= (TemplatePersistenceData) event.getElement(); d.setEnabled(event.getChecked()); @@ -964,6 +965,7 @@ public abstract class TemplatePreferencePage extends PreferencePage implements I fAddButton.setText(TemplatesMessages.TemplatePreferencePage_new); fAddButton.setLayoutData(getButtonGridData(fAddButton)); fAddButton.addListener(SWT.Selection, new Listener() { + @Override public void handleEvent(Event e) { add(); } @@ -973,6 +975,7 @@ public abstract class TemplatePreferencePage extends PreferencePage implements I fEditButton.setText(TemplatesMessages.TemplatePreferencePage_edit); fEditButton.setLayoutData(getButtonGridData(fEditButton)); fEditButton.addListener(SWT.Selection, new Listener() { + @Override public void handleEvent(Event e) { edit(); } @@ -982,6 +985,7 @@ public abstract class TemplatePreferencePage extends PreferencePage implements I fRemoveButton.setText(TemplatesMessages.TemplatePreferencePage_remove); fRemoveButton.setLayoutData(getButtonGridData(fRemoveButton)); fRemoveButton.addListener(SWT.Selection, new Listener() { + @Override public void handleEvent(Event e) { remove(); } @@ -993,6 +997,7 @@ public abstract class TemplatePreferencePage extends PreferencePage implements I fRestoreButton.setText(TemplatesMessages.TemplatePreferencePage_restore); fRestoreButton.setLayoutData(getButtonGridData(fRestoreButton)); fRestoreButton.addListener(SWT.Selection, new Listener() { + @Override public void handleEvent(Event e) { restoreDeleted(); } @@ -1002,6 +1007,7 @@ public abstract class TemplatePreferencePage extends PreferencePage implements I fRevertButton.setText(TemplatesMessages.TemplatePreferencePage_revert); fRevertButton.setLayoutData(getButtonGridData(fRevertButton)); fRevertButton.addListener(SWT.Selection, new Listener() { + @Override public void handleEvent(Event e) { revert(); } @@ -1013,6 +1019,7 @@ public abstract class TemplatePreferencePage extends PreferencePage implements I fImportButton.setText(TemplatesMessages.TemplatePreferencePage_import); fImportButton.setLayoutData(getButtonGridData(fImportButton)); fImportButton.addListener(SWT.Selection, new Listener() { + @Override public void handleEvent(Event e) { import_(); } @@ -1022,6 +1029,7 @@ public abstract class TemplatePreferencePage extends PreferencePage implements I fExportButton.setText(TemplatesMessages.TemplatePreferencePage_export); fExportButton.setLayoutData(getButtonGridData(fExportButton)); fExportButton.addListener(SWT.Selection, new Listener() { + @Override public void handleEvent(Event e) { export(); } @@ -1235,6 +1243,7 @@ public abstract class TemplatePreferencePage extends PreferencePage implements I * @return an <code>EditTemplateDialog</code> which will be opened. * @deprecated not called any longer as of 3.1 - use {@link #editTemplate(Template, boolean, boolean)} */ + @Deprecated protected Dialog createTemplateEditDialog(Template template, boolean edit, boolean isNameModifiable) { return new EditTemplateDialog(getShell(), template, edit, isNameModifiable, fContextTypeRegistry); } @@ -1445,18 +1454,14 @@ public abstract class TemplatePreferencePage extends PreferencePage implements I fTableViewer.refresh(); } - /* - * @see Control#setVisible(boolean) - */ + @Override public void setVisible(boolean visible) { super.setVisible(visible); if (visible) setTitle(TemplatesMessages.TemplatePreferencePage_title); } - /* - * @see PreferencePage#performDefaults() - */ + @Override protected void performDefaults() { if (isShowFormatterSetting()) { IPreferenceStore prefs= getPreferenceStore(); @@ -1471,9 +1476,7 @@ public abstract class TemplatePreferencePage extends PreferencePage implements I fTableViewer.setCheckedElements(getEnabledTemplates()); } - /* - * @see PreferencePage#performOk() - */ + @Override public boolean performOk() { if (isShowFormatterSetting()) { IPreferenceStore prefs= getPreferenceStore(); @@ -1498,9 +1501,7 @@ public abstract class TemplatePreferencePage extends PreferencePage implements I return DEFAULT_FORMATTER_PREFERENCE_KEY; } - /* - * @see PreferencePage#performCancel() - */ + @Override public boolean performCancel() { try { fTemplateStore.load(); @@ -1576,6 +1577,7 @@ public abstract class TemplatePreferencePage extends PreferencePage implements I } } + @Override public int compare(Viewer viewer, Object e1, Object e2) { if (viewer instanceof TableViewer) { @@ -1605,6 +1607,7 @@ public abstract class TemplatePreferencePage extends PreferencePage implements I fViewerComparator= vc; } + @Override public void widgetSelected(SelectionEvent e) { fViewerComparator.setColumn(fColumnIndex); int dir= fViewerComparator.getDirection(); diff --git a/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/templates/TemplateVariableProcessor.java b/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/templates/TemplateVariableProcessor.java index 655f1817156..45a35d38228 100644 --- a/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/templates/TemplateVariableProcessor.java +++ b/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/templates/TemplateVariableProcessor.java @@ -38,6 +38,7 @@ import org.eclipse.jface.text.templates.TemplateVariableResolver; final class TemplateVariableProcessor implements IContentAssistProcessor { private static Comparator fgTemplateVariableProposalComparator= new Comparator() { + @Override public int compare(Object arg0, Object arg1) { TemplateVariableProposal proposal0= (TemplateVariableProposal) arg0; TemplateVariableProposal proposal1= (TemplateVariableProposal) arg1; @@ -45,9 +46,7 @@ final class TemplateVariableProcessor implements IContentAssistProcessor { return proposal0.getDisplayString().compareTo(proposal1.getDisplayString()); } - /* - * @see java.lang.Object#equals(java.lang.Object) - */ + @Override public boolean equals(Object arg0) { return false; } @@ -56,6 +55,7 @@ final class TemplateVariableProcessor implements IContentAssistProcessor { * Returns Object#hashCode. * @see java.lang.Object#hashCode() */ + @Override public int hashCode() { return super.hashCode(); } @@ -83,9 +83,7 @@ final class TemplateVariableProcessor implements IContentAssistProcessor { return fContextType; } - /* - * @see IContentAssistProcessor#computeCompletionProposals(ITextViewer, int) - */ + @Override public ICompletionProposal[] computeCompletionProposals(ITextViewer viewer, int documentOffset) { if (fContextType == null) @@ -132,37 +130,27 @@ final class TemplateVariableProcessor implements IContentAssistProcessor { return end; } - /* - * @see IContentAssistProcessor#computeContextInformation(ITextViewer, int) - */ + @Override public IContextInformation[] computeContextInformation(ITextViewer viewer, int documentOffset) { return null; } - /* - * @see IContentAssistProcessor#getCompletionProposalAutoActivationCharacters() - */ + @Override public char[] getCompletionProposalAutoActivationCharacters() { return new char[] {'$'}; } - /* - * @see IContentAssistProcessor#getContextInformationAutoActivationCharacters() - */ + @Override public char[] getContextInformationAutoActivationCharacters() { return null; } - /* - * @see IContentAssistProcessor#getErrorMessage() - */ + @Override public String getErrorMessage() { return null; } - /* - * @see IContentAssistProcessor#getContextInformationValidator() - */ + @Override public IContextInformationValidator getContextInformationValidator() { return null; } diff --git a/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/templates/TemplateVariableProposal.java b/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/templates/TemplateVariableProposal.java index ed87a0fb390..24751d6bcb2 100644 --- a/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/templates/TemplateVariableProposal.java +++ b/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/templates/TemplateVariableProposal.java @@ -56,9 +56,7 @@ final class TemplateVariableProposal implements ICompletionProposal { fViewer= viewer; } - /* - * @see ICompletionProposal#apply(IDocument) - */ + @Override public void apply(IDocument document) { try { @@ -72,37 +70,27 @@ final class TemplateVariableProposal implements ICompletionProposal { } } - /* - * @see ICompletionProposal#getSelection(IDocument) - */ + @Override public Point getSelection(IDocument document) { return fSelection; } - /* - * @see ICompletionProposal#getAdditionalProposalInfo() - */ + @Override public String getAdditionalProposalInfo() { return null; } - /* - * @see ICompletionProposal#getDisplayString() - */ + @Override public String getDisplayString() { return fVariable.getType() + " - " + fVariable.getDescription(); //$NON-NLS-1$ } - /* - * @see ICompletionProposal#getImage() - */ + @Override public Image getImage() { return null; } - /* - * @see ICompletionProposal#getContextInformation() - */ + @Override public IContextInformation getContextInformation() { return null; } diff --git a/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/templates/TemplatesTransfer.java b/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/templates/TemplatesTransfer.java index 8f91261594c..e2184509187 100644 --- a/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/templates/TemplatesTransfer.java +++ b/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/templates/TemplatesTransfer.java @@ -44,23 +44,17 @@ class TemplatesTransfer extends ByteArrayTransfer { return INSTANCE; } - /* - * @see org.eclipse.swt.dnd.Transfer#getTypeIds() - */ + @Override protected int[] getTypeIds() { return new int[] { TYPE_ID }; } - /* - * @see org.eclipse.swt.dnd.Transfer#getTypeNames() - */ + @Override protected String[] getTypeNames() { return new String[] { TYPE_NAME }; } - /* - * @see org.eclipse.swt.dnd.ByteArrayTransfer#javaToNative(java.lang.Object, org.eclipse.swt.dnd.TransferData) - */ + @Override protected void javaToNative(Object object, TransferData transferData) { if (object == null || !(object instanceof TemplatePersistenceData[]) || !isSupportedType(transferData)) { fObject= null ; @@ -70,9 +64,7 @@ class TemplatesTransfer extends ByteArrayTransfer { super.javaToNative(TYPE_NAME.getBytes(), transferData); } - /* - * @see org.eclipse.swt.dnd.ByteArrayTransfer#nativeToJava(org.eclipse.swt.dnd.TransferData) - */ + @Override protected Object nativeToJava(TransferData transferData) { Object result= super.nativeToJava(transferData); if (!(result instanceof byte[]) || !TYPE_NAME.equals(new String((byte[]) result))) diff --git a/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/templates/TemplatesView.java b/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/templates/TemplatesView.java index a9d739b03fc..6331bfc3928 100644 --- a/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/templates/TemplatesView.java +++ b/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/templates/TemplatesView.java @@ -102,9 +102,7 @@ public final class TemplatesView extends PageBookView { public TemplatesView() { } - /* - * @see org.eclipse.ui.part.PageBookView#createDefaultPage(org.eclipse.ui.part.PageBook) - */ + @Override protected IPage createDefaultPage(PageBook book) { MessagePage page= new MessagePage(); initPage(page); @@ -113,19 +111,14 @@ public final class TemplatesView extends PageBookView { return page; } - /* - * @see org.eclipse.ui.part.PageBookView#createPartControl(org.eclipse.swt.widgets.Composite) - * @since 3.4 - */ + @Override public void createPartControl(Composite parent) { super.createPartControl(parent); Assert.isTrue(ID.equals(getViewSite().getId())); // prevent from contributing this view under a different ID PlatformUI.getWorkbench().getHelpSystem().setHelp(getPageBook(), IAbstractTextEditorHelpContextIds.TEMPLATES_VIEW); } - /* - * @see org.eclipse.ui.part.PageBookView#doCreatePage(org.eclipse.ui.IWorkbenchPart) - */ + @Override protected PageRec doCreatePage(IWorkbenchPart part) { // Try to get template page. ITemplatesPage page= (ITemplatesPage)part.getAdapter(ITemplatesPage.class); @@ -139,19 +132,14 @@ public final class TemplatesView extends PageBookView { return new PageRec(part, page); } - /* - * @see org.eclipse.ui.part.PageBookView#doDestroyPage(org.eclipse.ui.IWorkbenchPart, org.eclipse.ui.part.PageBookView.PageRec) - */ + @Override protected void doDestroyPage(IWorkbenchPart part, PageRec rec) { ITemplatesPage page= (ITemplatesPage)rec.page; page.dispose(); rec.dispose(); } - /* - * @see org.eclipse.ui.part.PageBookView#getBootstrapPart() - * @since 3.4 - */ + @Override protected IWorkbenchPart getBootstrapPart() { IWorkbenchPage page= getSite().getPage(); if (page != null) @@ -159,18 +147,13 @@ public final class TemplatesView extends PageBookView { return null; } - /* - * @see org.eclipse.ui.part.PageBookView#isImportant(org.eclipse.ui.IWorkbenchPart) - */ + @Override protected boolean isImportant(IWorkbenchPart part) { //We only care about editors return (part instanceof IEditorPart); } - /* - * @see org.eclipse.ui.part.PageBookView#partBroughtToTop(org.eclipse.ui.IWorkbenchPart) - * @since 3.4 - */ + @Override public void partBroughtToTop(IWorkbenchPart part) { partActivated(part); } |