diff options
author | Carsten Hammer | 2019-05-20 13:06:05 +0000 |
---|---|---|
committer | Alexander Kurtakov | 2019-06-10 19:51:48 +0000 |
commit | d3cb7d11cd44cc2887a0c79680d82711825e964e (patch) | |
tree | f5d2a64aeddc8a5b72616ce79b85b858e46206f2 | |
parent | 20b4e2973008b4b287241fc14a1eb4f8ee9ee0ad (diff) | |
download | rt.equinox.p2-d3cb7d11cd44cc2887a0c79680d82711825e964e.tar.gz rt.equinox.p2-d3cb7d11cd44cc2887a0c79680d82711825e964e.tar.xz rt.equinox.p2-d3cb7d11cd44cc2887a0c79680d82711825e964e.zip |
Add @Override AnnotationI20190610-1800
Change-Id: Ic052ff77e850bee661315a5bd59e65b449f3b497
Signed-off-by: Carsten Hammer <carsten.hammer@t-online.de>
18 files changed, 29 insertions, 0 deletions
diff --git a/bundles/org.eclipse.equinox.p2.touchpoint.eclipse/src/org/eclipse/equinox/internal/p2/touchpoint/eclipse/AgentFromInstall.java b/bundles/org.eclipse.equinox.p2.touchpoint.eclipse/src/org/eclipse/equinox/internal/p2/touchpoint/eclipse/AgentFromInstall.java index 062bbdb01..66cbafa27 100644 --- a/bundles/org.eclipse.equinox.p2.touchpoint.eclipse/src/org/eclipse/equinox/internal/p2/touchpoint/eclipse/AgentFromInstall.java +++ b/bundles/org.eclipse.equinox.p2.touchpoint.eclipse/src/org/eclipse/equinox/internal/p2/touchpoint/eclipse/AgentFromInstall.java @@ -128,6 +128,7 @@ public class AgentFromInstall { private String findProfile(File profileDirectory) { final String PROFILE_EXT = ".profile"; //$NON-NLS-1$ File[] profileDirectories = profileDirectory.listFiles(new FileFilter() { + @Override public boolean accept(File pathname) { return pathname.getName().endsWith(PROFILE_EXT) && pathname.isDirectory(); } diff --git a/bundles/org.eclipse.equinox.p2.touchpoint.eclipse/src/org/eclipse/equinox/internal/p2/touchpoint/eclipse/actions/AddRepositoryAction.java b/bundles/org.eclipse.equinox.p2.touchpoint.eclipse/src/org/eclipse/equinox/internal/p2/touchpoint/eclipse/actions/AddRepositoryAction.java index 264843b30..bf74856f5 100644 --- a/bundles/org.eclipse.equinox.p2.touchpoint.eclipse/src/org/eclipse/equinox/internal/p2/touchpoint/eclipse/actions/AddRepositoryAction.java +++ b/bundles/org.eclipse.equinox.p2.touchpoint.eclipse/src/org/eclipse/equinox/internal/p2/touchpoint/eclipse/actions/AddRepositoryAction.java @@ -45,6 +45,7 @@ public class AddRepositoryAction extends RepositoryAction { } } + @Override protected String getId() { return ID; } diff --git a/bundles/org.eclipse.equinox.p2.touchpoint.eclipse/src/org/eclipse/equinox/internal/p2/touchpoint/eclipse/actions/RemoveRepositoryAction.java b/bundles/org.eclipse.equinox.p2.touchpoint.eclipse/src/org/eclipse/equinox/internal/p2/touchpoint/eclipse/actions/RemoveRepositoryAction.java index 3d3f978fc..59b4c1205 100644 --- a/bundles/org.eclipse.equinox.p2.touchpoint.eclipse/src/org/eclipse/equinox/internal/p2/touchpoint/eclipse/actions/RemoveRepositoryAction.java +++ b/bundles/org.eclipse.equinox.p2.touchpoint.eclipse/src/org/eclipse/equinox/internal/p2/touchpoint/eclipse/actions/RemoveRepositoryAction.java @@ -63,6 +63,7 @@ public class RemoveRepositoryAction extends RepositoryAction { } } + @Override protected String getId() { return ID; } diff --git a/bundles/org.eclipse.equinox.p2.touchpoint.eclipse/src/org/eclipse/equinox/internal/p2/update/Feature.java b/bundles/org.eclipse.equinox.p2.touchpoint.eclipse/src/org/eclipse/equinox/internal/p2/update/Feature.java index db6c7da4a..702dbf73f 100644 --- a/bundles/org.eclipse.equinox.p2.touchpoint.eclipse/src/org/eclipse/equinox/internal/p2/update/Feature.java +++ b/bundles/org.eclipse.equinox.p2.touchpoint.eclipse/src/org/eclipse/equinox/internal/p2/update/Feature.java @@ -108,6 +108,7 @@ public class Feature { /* (non-Javadoc) * @see java.lang.Object#equals(java.lang.Object) */ + @Override public boolean equals(Object obj) { if (!(obj instanceof Feature)) return false; @@ -131,6 +132,7 @@ public class Feature { /* (non-Javadoc) * @see java.lang.Object#hashCode() */ + @Override public int hashCode() { return id.hashCode() + version.hashCode(); } diff --git a/bundles/org.eclipse.equinox.p2.touchpoint.eclipse/src/org/eclipse/equinox/internal/p2/update/Site.java b/bundles/org.eclipse.equinox.p2.touchpoint.eclipse/src/org/eclipse/equinox/internal/p2/update/Site.java index 32fd7d58e..c2ef681b3 100644 --- a/bundles/org.eclipse.equinox.p2.touchpoint.eclipse/src/org/eclipse/equinox/internal/p2/update/Site.java +++ b/bundles/org.eclipse.equinox.p2.touchpoint.eclipse/src/org/eclipse/equinox/internal/p2/update/Site.java @@ -135,6 +135,7 @@ public class Site { /* (non-Javadoc) * @see java.lang.Object#hashCode() */ + @Override public int hashCode() { return getUrl().hashCode(); } @@ -142,6 +143,7 @@ public class Site { /* (non-Javadoc) * @see java.lang.Object#equals(java.lang.Object) */ + @Override public boolean equals(Object obj) { if (!(obj instanceof Site)) return false; diff --git a/examples/org.eclipse.equinox.p2.examples.rcp.cloud/src/org/eclipse/equinox/p2/examples/rcp/cloud/Application.java b/examples/org.eclipse.equinox.p2.examples.rcp.cloud/src/org/eclipse/equinox/p2/examples/rcp/cloud/Application.java index cf495c34d..463ec52e2 100644 --- a/examples/org.eclipse.equinox.p2.examples.rcp.cloud/src/org/eclipse/equinox/p2/examples/rcp/cloud/Application.java +++ b/examples/org.eclipse.equinox.p2.examples.rcp.cloud/src/org/eclipse/equinox/p2/examples/rcp/cloud/Application.java @@ -36,6 +36,7 @@ public class Application implements IApplication { return; final Display display = workbench.getDisplay(); display.syncExec(new Runnable() { + @Override public void run() { if (!display.isDisposed()) workbench.close(); diff --git a/examples/org.eclipse.equinox.p2.examples.rcp.cloud/src/org/eclipse/equinox/p2/examples/rcp/cloud/p2/InstallNewSoftwareHandler.java b/examples/org.eclipse.equinox.p2.examples.rcp.cloud/src/org/eclipse/equinox/p2/examples/rcp/cloud/p2/InstallNewSoftwareHandler.java index 2a87391ea..a4c79edf9 100644 --- a/examples/org.eclipse.equinox.p2.examples.rcp.cloud/src/org/eclipse/equinox/p2/examples/rcp/cloud/p2/InstallNewSoftwareHandler.java +++ b/examples/org.eclipse.equinox.p2.examples.rcp.cloud/src/org/eclipse/equinox/p2/examples/rcp/cloud/p2/InstallNewSoftwareHandler.java @@ -30,10 +30,12 @@ public class InstallNewSoftwareHandler extends PreloadingRepositoryHandler { super(); } + @Override protected void doExecute(LoadMetadataRepositoryJob job) { getProvisioningUI().openInstallWizard(null, null, job); } + @Override protected boolean waitForPreload() { // If the user cannot see repositories, then we may as well wait // for existing repos to load so that content is available. @@ -42,6 +44,7 @@ public class InstallNewSoftwareHandler extends PreloadingRepositoryHandler { return !getProvisioningUI().getPolicy().getRepositoriesVisible(); } + @Override protected void setLoadJobProperties(Job loadJob) { super.setLoadJobProperties(loadJob); // If we are doing a background load, we do not wish to authenticate, as the diff --git a/examples/org.eclipse.equinox.p2.examples.rcp.cloud/src/org/eclipse/equinox/p2/examples/rcp/cloud/p2/PreloadingRepositoryHandler.java b/examples/org.eclipse.equinox.p2.examples.rcp.cloud/src/org/eclipse/equinox/p2/examples/rcp/cloud/p2/PreloadingRepositoryHandler.java index 61d478614..6cd63e25a 100644 --- a/examples/org.eclipse.equinox.p2.examples.rcp.cloud/src/org/eclipse/equinox/p2/examples/rcp/cloud/p2/PreloadingRepositoryHandler.java +++ b/examples/org.eclipse.equinox.p2.examples.rcp.cloud/src/org/eclipse/equinox/p2/examples/rcp/cloud/p2/PreloadingRepositoryHandler.java @@ -58,6 +58,7 @@ abstract class PreloadingRepositoryHandler extends AbstractHandler { if (PlatformUI.isWorkbenchRunning()) if (event.getResult().isOK()) { PlatformUI.getWorkbench().getDisplay().asyncExec(new Runnable() { + @Override public void run() { doExecute(loadJob); } diff --git a/examples/org.eclipse.equinox.p2.examples.rcp.cloud/src/org/eclipse/equinox/p2/examples/rcp/cloud/p2/UpdateHandler.java b/examples/org.eclipse.equinox.p2.examples.rcp.cloud/src/org/eclipse/equinox/p2/examples/rcp/cloud/p2/UpdateHandler.java index a2bacf458..31bed0561 100644 --- a/examples/org.eclipse.equinox.p2.examples.rcp.cloud/src/org/eclipse/equinox/p2/examples/rcp/cloud/p2/UpdateHandler.java +++ b/examples/org.eclipse.equinox.p2.examples.rcp.cloud/src/org/eclipse/equinox/p2/examples/rcp/cloud/p2/UpdateHandler.java @@ -28,6 +28,7 @@ public class UpdateHandler extends PreloadingRepositoryHandler { boolean hasNoRepos = false; + @Override protected void doExecute(LoadMetadataRepositoryJob job) { if (hasNoRepos) { return; @@ -49,6 +50,7 @@ public class UpdateHandler extends PreloadingRepositoryHandler { } } + @Override protected boolean preloadRepositories() { hasNoRepos = false; RepositoryTracker repoMan = getProvisioningUI().getRepositoryTracker(); diff --git a/examples/org.eclipse.equinox.p2.examples.rcp.discovery/src/org/eclipse/equinox/p2/examples/rcp/cloud/Application.java b/examples/org.eclipse.equinox.p2.examples.rcp.discovery/src/org/eclipse/equinox/p2/examples/rcp/cloud/Application.java index cf495c34d..463ec52e2 100644 --- a/examples/org.eclipse.equinox.p2.examples.rcp.discovery/src/org/eclipse/equinox/p2/examples/rcp/cloud/Application.java +++ b/examples/org.eclipse.equinox.p2.examples.rcp.discovery/src/org/eclipse/equinox/p2/examples/rcp/cloud/Application.java @@ -36,6 +36,7 @@ public class Application implements IApplication { return; final Display display = workbench.getDisplay(); display.syncExec(new Runnable() { + @Override public void run() { if (!display.isDisposed()) workbench.close(); diff --git a/examples/org.eclipse.equinox.p2.examples.rcp.discovery/src/org/eclipse/equinox/p2/examples/rcp/cloud/p2/InstallNewSoftwareHandler.java b/examples/org.eclipse.equinox.p2.examples.rcp.discovery/src/org/eclipse/equinox/p2/examples/rcp/cloud/p2/InstallNewSoftwareHandler.java index 2a87391ea..a4c79edf9 100644 --- a/examples/org.eclipse.equinox.p2.examples.rcp.discovery/src/org/eclipse/equinox/p2/examples/rcp/cloud/p2/InstallNewSoftwareHandler.java +++ b/examples/org.eclipse.equinox.p2.examples.rcp.discovery/src/org/eclipse/equinox/p2/examples/rcp/cloud/p2/InstallNewSoftwareHandler.java @@ -30,10 +30,12 @@ public class InstallNewSoftwareHandler extends PreloadingRepositoryHandler { super(); } + @Override protected void doExecute(LoadMetadataRepositoryJob job) { getProvisioningUI().openInstallWizard(null, null, job); } + @Override protected boolean waitForPreload() { // If the user cannot see repositories, then we may as well wait // for existing repos to load so that content is available. @@ -42,6 +44,7 @@ public class InstallNewSoftwareHandler extends PreloadingRepositoryHandler { return !getProvisioningUI().getPolicy().getRepositoriesVisible(); } + @Override protected void setLoadJobProperties(Job loadJob) { super.setLoadJobProperties(loadJob); // If we are doing a background load, we do not wish to authenticate, as the diff --git a/examples/org.eclipse.equinox.p2.examples.rcp.discovery/src/org/eclipse/equinox/p2/examples/rcp/cloud/p2/PreloadingRepositoryHandler.java b/examples/org.eclipse.equinox.p2.examples.rcp.discovery/src/org/eclipse/equinox/p2/examples/rcp/cloud/p2/PreloadingRepositoryHandler.java index 61d478614..6cd63e25a 100644 --- a/examples/org.eclipse.equinox.p2.examples.rcp.discovery/src/org/eclipse/equinox/p2/examples/rcp/cloud/p2/PreloadingRepositoryHandler.java +++ b/examples/org.eclipse.equinox.p2.examples.rcp.discovery/src/org/eclipse/equinox/p2/examples/rcp/cloud/p2/PreloadingRepositoryHandler.java @@ -58,6 +58,7 @@ abstract class PreloadingRepositoryHandler extends AbstractHandler { if (PlatformUI.isWorkbenchRunning()) if (event.getResult().isOK()) { PlatformUI.getWorkbench().getDisplay().asyncExec(new Runnable() { + @Override public void run() { doExecute(loadJob); } diff --git a/examples/org.eclipse.equinox.p2.examples.rcp.discovery/src/org/eclipse/equinox/p2/examples/rcp/cloud/p2/UpdateHandler.java b/examples/org.eclipse.equinox.p2.examples.rcp.discovery/src/org/eclipse/equinox/p2/examples/rcp/cloud/p2/UpdateHandler.java index a2bacf458..31bed0561 100644 --- a/examples/org.eclipse.equinox.p2.examples.rcp.discovery/src/org/eclipse/equinox/p2/examples/rcp/cloud/p2/UpdateHandler.java +++ b/examples/org.eclipse.equinox.p2.examples.rcp.discovery/src/org/eclipse/equinox/p2/examples/rcp/cloud/p2/UpdateHandler.java @@ -28,6 +28,7 @@ public class UpdateHandler extends PreloadingRepositoryHandler { boolean hasNoRepos = false; + @Override protected void doExecute(LoadMetadataRepositoryJob job) { if (hasNoRepos) { return; @@ -49,6 +50,7 @@ public class UpdateHandler extends PreloadingRepositoryHandler { } } + @Override protected boolean preloadRepositories() { hasNoRepos = false; RepositoryTracker repoMan = getProvisioningUI().getRepositoryTracker(); diff --git a/examples/org.eclipse.equinox.p2.examples.rcp.prestartupdate/src/org/eclipse/equinox/p2/examples/rcp/prestartupdate/Application.java b/examples/org.eclipse.equinox.p2.examples.rcp.prestartupdate/src/org/eclipse/equinox/p2/examples/rcp/prestartupdate/Application.java index 0f180eee9..7d17206d5 100644 --- a/examples/org.eclipse.equinox.p2.examples.rcp.prestartupdate/src/org/eclipse/equinox/p2/examples/rcp/prestartupdate/Application.java +++ b/examples/org.eclipse.equinox.p2.examples.rcp.prestartupdate/src/org/eclipse/equinox/p2/examples/rcp/prestartupdate/Application.java @@ -37,6 +37,7 @@ public class Application implements IApplication { return; final Display display = workbench.getDisplay(); display.syncExec(new Runnable() { + @Override public void run() { if (!display.isDisposed()) workbench.close(); diff --git a/examples/org.eclipse.equinox.p2.examples.rcp.sdkbundlevisibility/src/org/eclipse/equinox/p2/examples/rcp/sdkbundlevisibility/Application.java b/examples/org.eclipse.equinox.p2.examples.rcp.sdkbundlevisibility/src/org/eclipse/equinox/p2/examples/rcp/sdkbundlevisibility/Application.java index 2fb79727e..ce79a81e6 100644 --- a/examples/org.eclipse.equinox.p2.examples.rcp.sdkbundlevisibility/src/org/eclipse/equinox/p2/examples/rcp/sdkbundlevisibility/Application.java +++ b/examples/org.eclipse.equinox.p2.examples.rcp.sdkbundlevisibility/src/org/eclipse/equinox/p2/examples/rcp/sdkbundlevisibility/Application.java @@ -36,6 +36,7 @@ public class Application implements IApplication { return; final Display display = workbench.getDisplay(); display.syncExec(new Runnable() { + @Override public void run() { if (!display.isDisposed()) workbench.close(); diff --git a/examples/org.eclipse.equinox.p2.examples.rcp.sdkbundlevisibility/src/org/eclipse/equinox/p2/examples/rcp/sdkbundlevisibility/p2/InstallNewSoftwareHandler.java b/examples/org.eclipse.equinox.p2.examples.rcp.sdkbundlevisibility/src/org/eclipse/equinox/p2/examples/rcp/sdkbundlevisibility/p2/InstallNewSoftwareHandler.java index 2799720b2..c9fceb806 100644 --- a/examples/org.eclipse.equinox.p2.examples.rcp.sdkbundlevisibility/src/org/eclipse/equinox/p2/examples/rcp/sdkbundlevisibility/p2/InstallNewSoftwareHandler.java +++ b/examples/org.eclipse.equinox.p2.examples.rcp.sdkbundlevisibility/src/org/eclipse/equinox/p2/examples/rcp/sdkbundlevisibility/p2/InstallNewSoftwareHandler.java @@ -30,10 +30,12 @@ public class InstallNewSoftwareHandler extends PreloadingRepositoryHandler { super(); } + @Override protected void doExecute(LoadMetadataRepositoryJob job) { getProvisioningUI().openInstallWizard(null, null, job); } + @Override protected boolean waitForPreload() { // If the user cannot see repositories, then we may as well wait // for existing repos to load so that content is available. @@ -42,6 +44,7 @@ public class InstallNewSoftwareHandler extends PreloadingRepositoryHandler { return !getProvisioningUI().getPolicy().getRepositoriesVisible(); } + @Override protected void setLoadJobProperties(Job loadJob) { super.setLoadJobProperties(loadJob); // If we are doing a background load, we do not wish to authenticate, as the diff --git a/examples/org.eclipse.equinox.p2.examples.rcp.sdkbundlevisibility/src/org/eclipse/equinox/p2/examples/rcp/sdkbundlevisibility/p2/PreloadingRepositoryHandler.java b/examples/org.eclipse.equinox.p2.examples.rcp.sdkbundlevisibility/src/org/eclipse/equinox/p2/examples/rcp/sdkbundlevisibility/p2/PreloadingRepositoryHandler.java index 2de020c52..56906e83f 100644 --- a/examples/org.eclipse.equinox.p2.examples.rcp.sdkbundlevisibility/src/org/eclipse/equinox/p2/examples/rcp/sdkbundlevisibility/p2/PreloadingRepositoryHandler.java +++ b/examples/org.eclipse.equinox.p2.examples.rcp.sdkbundlevisibility/src/org/eclipse/equinox/p2/examples/rcp/sdkbundlevisibility/p2/PreloadingRepositoryHandler.java @@ -58,6 +58,7 @@ abstract class PreloadingRepositoryHandler extends AbstractHandler { if (PlatformUI.isWorkbenchRunning()) if (event.getResult().isOK()) { PlatformUI.getWorkbench().getDisplay().asyncExec(new Runnable() { + @Override public void run() { doExecute(loadJob); } diff --git a/examples/org.eclipse.equinox.p2.examples.rcp.sdkbundlevisibility/src/org/eclipse/equinox/p2/examples/rcp/sdkbundlevisibility/p2/UpdateHandler.java b/examples/org.eclipse.equinox.p2.examples.rcp.sdkbundlevisibility/src/org/eclipse/equinox/p2/examples/rcp/sdkbundlevisibility/p2/UpdateHandler.java index 2025179c6..12ec31f3a 100644 --- a/examples/org.eclipse.equinox.p2.examples.rcp.sdkbundlevisibility/src/org/eclipse/equinox/p2/examples/rcp/sdkbundlevisibility/p2/UpdateHandler.java +++ b/examples/org.eclipse.equinox.p2.examples.rcp.sdkbundlevisibility/src/org/eclipse/equinox/p2/examples/rcp/sdkbundlevisibility/p2/UpdateHandler.java @@ -27,6 +27,7 @@ public class UpdateHandler extends PreloadingRepositoryHandler { boolean hasNoRepos = false; + @Override protected void doExecute(LoadMetadataRepositoryJob job) { if (hasNoRepos) { if (getProvisioningUI().getPolicy().getRepositoriesVisible()) { @@ -45,6 +46,7 @@ public class UpdateHandler extends PreloadingRepositoryHandler { } } + @Override protected boolean preloadRepositories() { hasNoRepos = false; RepositoryTracker repoMan = getProvisioningUI().getRepositoryTracker(); |