Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCarsten Hammer2019-05-01 10:29:59 +0000
committerMickael Istria2019-05-09 12:13:55 +0000
commit8ca01e63fb37ec4a4a673a91ad290a639c1d5583 (patch)
tree9d2080d92260ce586d9397891b2b1cec5e160d1a
parent5ac3d2d32ec7049f646c50c834c2d511259462d8 (diff)
downloadorg.eclipse.tycho.extras-8ca01e63fb37ec4a4a673a91ad290a639c1d5583.tar.gz
org.eclipse.tycho.extras-8ca01e63fb37ec4a4a673a91ad290a639c1d5583.tar.xz
org.eclipse.tycho.extras-8ca01e63fb37ec4a4a673a91ad290a639c1d5583.zip
Add @Override Annotation
Change-Id: I0d26ee2a4213c26c9fa7c70367646641dd2dcd61 Signed-off-by: Carsten Hammer <carsten.hammer@t-online.de>
-rw-r--r--pack200/tycho-pack200a-plugin/src/main/java/org/eclipse/tycho/extras/pack200/mojo/Pack200NormalizeMojo.java1
-rw-r--r--pack200/tycho-pack200b-plugin/src/main/java/org/eclipse/tycho/extras/pack200/mojo/Pack200PackMojo.java1
-rw-r--r--tycho-buildtimestamp-jgit/src/main/java/org/eclipse/tycho/extras/buildtimestamp/jgit/JGitBuildTimestampProvider.java1
-rw-r--r--tycho-custom-bundle-plugin/src/main/java/org/eclipse/tycho/extras/custombundle/CustomBundleMojo.java1
-rw-r--r--tycho-custom-bundle-plugin/src/main/java/org/eclipse/tycho/extras/custombundle/CustomBundleP2MetadataProvider.java2
-rw-r--r--tycho-document-bundle-plugin/src/main/java/org/eclipse/tycho/extras/docbundle/JavadocMojo.java3
-rw-r--r--tycho-p2-extras-plugin/src/main/java/org/eclipse/tycho/plugins/p2/extras/CompareWithBaselineMojo.java1
-rw-r--r--tycho-p2-extras-plugin/src/main/java/org/eclipse/tycho/plugins/p2/extras/MirrorMojo.java1
-rw-r--r--tycho-p2-extras-plugin/src/main/java/org/eclipse/tycho/plugins/p2/extras/PublishFeaturesAndBundlesMojo.java1
-rw-r--r--tycho-sourceref-jgit/src/main/java/org/eclipse/tycho/extras/sourceref/jgit/JGitSourceReferencesProvider.java1
10 files changed, 13 insertions, 0 deletions
diff --git a/pack200/tycho-pack200a-plugin/src/main/java/org/eclipse/tycho/extras/pack200/mojo/Pack200NormalizeMojo.java b/pack200/tycho-pack200a-plugin/src/main/java/org/eclipse/tycho/extras/pack200/mojo/Pack200NormalizeMojo.java
index 71b0c43..6a6a1d1 100644
--- a/pack200/tycho-pack200a-plugin/src/main/java/org/eclipse/tycho/extras/pack200/mojo/Pack200NormalizeMojo.java
+++ b/pack200/tycho-pack200a-plugin/src/main/java/org/eclipse/tycho/extras/pack200/mojo/Pack200NormalizeMojo.java
@@ -73,6 +73,7 @@ public class Pack200NormalizeMojo extends AbstractMojo {
@Component
private Pack200Archiver pack200;
+ @Override
public void execute() throws MojoExecutionException, MojoFailureException {
if (this.skip || !supportedProjectTypes.contains(project.getPackaging())) {
return;
diff --git a/pack200/tycho-pack200b-plugin/src/main/java/org/eclipse/tycho/extras/pack200/mojo/Pack200PackMojo.java b/pack200/tycho-pack200b-plugin/src/main/java/org/eclipse/tycho/extras/pack200/mojo/Pack200PackMojo.java
index a388eb8..f9e6edf 100644
--- a/pack200/tycho-pack200b-plugin/src/main/java/org/eclipse/tycho/extras/pack200/mojo/Pack200PackMojo.java
+++ b/pack200/tycho-pack200b-plugin/src/main/java/org/eclipse/tycho/extras/pack200/mojo/Pack200PackMojo.java
@@ -63,6 +63,7 @@ public class Pack200PackMojo extends AbstractMojo {
@Component
protected MavenProjectHelper projectHelper;
+ @Override
public void execute() throws MojoExecutionException, MojoFailureException {
if (!supportedProjectTypes.contains(project.getPackaging())) {
return;
diff --git a/tycho-buildtimestamp-jgit/src/main/java/org/eclipse/tycho/extras/buildtimestamp/jgit/JGitBuildTimestampProvider.java b/tycho-buildtimestamp-jgit/src/main/java/org/eclipse/tycho/extras/buildtimestamp/jgit/JGitBuildTimestampProvider.java
index 0c758c7..b3a092a 100644
--- a/tycho-buildtimestamp-jgit/src/main/java/org/eclipse/tycho/extras/buildtimestamp/jgit/JGitBuildTimestampProvider.java
+++ b/tycho-buildtimestamp-jgit/src/main/java/org/eclipse/tycho/extras/buildtimestamp/jgit/JGitBuildTimestampProvider.java
@@ -121,6 +121,7 @@ public class JGitBuildTimestampProvider implements BuildTimestampProvider {
}
}
+ @Override
public Date getTimestamp(MavenSession session, MavenProject project, MojoExecution execution)
throws MojoExecutionException {
FileRepositoryBuilder builder = new FileRepositoryBuilder() //
diff --git a/tycho-custom-bundle-plugin/src/main/java/org/eclipse/tycho/extras/custombundle/CustomBundleMojo.java b/tycho-custom-bundle-plugin/src/main/java/org/eclipse/tycho/extras/custombundle/CustomBundleMojo.java
index 58d78e9..a07485d 100644
--- a/tycho-custom-bundle-plugin/src/main/java/org/eclipse/tycho/extras/custombundle/CustomBundleMojo.java
+++ b/tycho-custom-bundle-plugin/src/main/java/org/eclipse/tycho/extras/custombundle/CustomBundleMojo.java
@@ -91,6 +91,7 @@ public class CustomBundleMojo extends AbstractMojo {
@Component
private MavenProjectHelper projectHelper;
+ @Override
public void execute() throws MojoExecutionException, MojoFailureException {
File outputJarFile = getOutputJarFile();
diff --git a/tycho-custom-bundle-plugin/src/main/java/org/eclipse/tycho/extras/custombundle/CustomBundleP2MetadataProvider.java b/tycho-custom-bundle-plugin/src/main/java/org/eclipse/tycho/extras/custombundle/CustomBundleP2MetadataProvider.java
index b99adad..622716a 100644
--- a/tycho-custom-bundle-plugin/src/main/java/org/eclipse/tycho/extras/custombundle/CustomBundleP2MetadataProvider.java
+++ b/tycho-custom-bundle-plugin/src/main/java/org/eclipse/tycho/extras/custombundle/CustomBundleP2MetadataProvider.java
@@ -47,6 +47,7 @@ public class CustomBundleP2MetadataProvider implements P2MetadataProvider, Initi
private DependencyMetadataGenerator generator;
+ @Override
public Map<String, IDependencyMetadata> getDependencyMetadata(MavenSession session, MavenProject project,
List<TargetEnvironment> environments, OptionalResolutionAction optionalAction) {
Map<String, IDependencyMetadata> metadata = new LinkedHashMap<>();
@@ -90,6 +91,7 @@ public class CustomBundleP2MetadataProvider implements P2MetadataProvider, Initi
return new File(locationDom.getValue());
}
+ @Override
public void initialize() throws InitializationException {
this.generator = equinox.getService(DependencyMetadataGenerator.class, "(role-hint=dependency-only)");
}
diff --git a/tycho-document-bundle-plugin/src/main/java/org/eclipse/tycho/extras/docbundle/JavadocMojo.java b/tycho-document-bundle-plugin/src/main/java/org/eclipse/tycho/extras/docbundle/JavadocMojo.java
index 79220fd..a1054c2 100644
--- a/tycho-document-bundle-plugin/src/main/java/org/eclipse/tycho/extras/docbundle/JavadocMojo.java
+++ b/tycho-document-bundle-plugin/src/main/java/org/eclipse/tycho/extras/docbundle/JavadocMojo.java
@@ -296,6 +296,7 @@ public class JavadocMojo extends AbstractMojo {
private class GatherSourcesVisitor implements ProjectVisitor {
private final Set<File> sourceFolders = new HashSet<>();
+ @Override
public void visit(final MavenProject project) {
if (JavadocMojo.this.sourceTypes.contains(project.getPackaging())) {
for (final String root : (Collection<String>) project.getCompileSourceRoots()) {
@@ -316,6 +317,7 @@ public class JavadocMojo extends AbstractMojo {
private class GatherManifestVisitor implements ProjectVisitor {
private final Set<File> manifestFiles = new HashSet<>();
+ @Override
public void visit(final MavenProject project) {
if (JavadocMojo.this.sourceTypes.contains(project.getPackaging())) {
this.manifestFiles.add(new File(project.getBasedir(), "META-INF/MANIFEST.MF"));
@@ -330,6 +332,7 @@ public class JavadocMojo extends AbstractMojo {
private class GatherClasspathVisitor implements ProjectVisitor {
private final Set<String> classPath = new HashSet<>();
+ @Override
public void visit(final MavenProject project) throws MojoExecutionException {
for (final Dependency dep : (List<Dependency>) project.getDependencies()) {
if (dep.getSystemPath() != null) {
diff --git a/tycho-p2-extras-plugin/src/main/java/org/eclipse/tycho/plugins/p2/extras/CompareWithBaselineMojo.java b/tycho-p2-extras-plugin/src/main/java/org/eclipse/tycho/plugins/p2/extras/CompareWithBaselineMojo.java
index 4d9d566..57f9815 100644
--- a/tycho-p2-extras-plugin/src/main/java/org/eclipse/tycho/plugins/p2/extras/CompareWithBaselineMojo.java
+++ b/tycho-p2-extras-plugin/src/main/java/org/eclipse/tycho/plugins/p2/extras/CompareWithBaselineMojo.java
@@ -103,6 +103,7 @@ public class CompareWithBaselineMojo extends AbstractMojo {
@Component(role = ArtifactComparator.class)
protected Map<String, ArtifactComparator> artifactComparators;
+ @Override
public void execute() throws MojoExecutionException, MojoFailureException {
if (skip) {
getLog().info("Skipped");
diff --git a/tycho-p2-extras-plugin/src/main/java/org/eclipse/tycho/plugins/p2/extras/MirrorMojo.java b/tycho-p2-extras-plugin/src/main/java/org/eclipse/tycho/plugins/p2/extras/MirrorMojo.java
index e8eccc6..5dc5872 100644
--- a/tycho-p2-extras-plugin/src/main/java/org/eclipse/tycho/plugins/p2/extras/MirrorMojo.java
+++ b/tycho-p2-extras-plugin/src/main/java/org/eclipse/tycho/plugins/p2/extras/MirrorMojo.java
@@ -221,6 +221,7 @@ public class MirrorMojo extends AbstractMojo {
@Parameter(defaultValue = "false")
private boolean ignoreErrors;
+ @Override
public void execute() throws MojoExecutionException, MojoFailureException {
final MirrorApplicationService mirrorService = p2.getService(MirrorApplicationService.class);
diff --git a/tycho-p2-extras-plugin/src/main/java/org/eclipse/tycho/plugins/p2/extras/PublishFeaturesAndBundlesMojo.java b/tycho-p2-extras-plugin/src/main/java/org/eclipse/tycho/plugins/p2/extras/PublishFeaturesAndBundlesMojo.java
index 479c837..09dcab9 100644
--- a/tycho-p2-extras-plugin/src/main/java/org/eclipse/tycho/plugins/p2/extras/PublishFeaturesAndBundlesMojo.java
+++ b/tycho-p2-extras-plugin/src/main/java/org/eclipse/tycho/plugins/p2/extras/PublishFeaturesAndBundlesMojo.java
@@ -101,6 +101,7 @@ public class PublishFeaturesAndBundlesMojo extends AbstractMojo {
@Component
private P2ApplicationLauncher launcher;
+ @Override
public void execute() throws MojoExecutionException, MojoFailureException {
publishContent();
}
diff --git a/tycho-sourceref-jgit/src/main/java/org/eclipse/tycho/extras/sourceref/jgit/JGitSourceReferencesProvider.java b/tycho-sourceref-jgit/src/main/java/org/eclipse/tycho/extras/sourceref/jgit/JGitSourceReferencesProvider.java
index 6727822..56c0ad1 100644
--- a/tycho-sourceref-jgit/src/main/java/org/eclipse/tycho/extras/sourceref/jgit/JGitSourceReferencesProvider.java
+++ b/tycho-sourceref-jgit/src/main/java/org/eclipse/tycho/extras/sourceref/jgit/JGitSourceReferencesProvider.java
@@ -31,6 +31,7 @@ import org.eclipse.tycho.packaging.sourceref.SourceReferencesProvider;
@Component(role = SourceReferencesProvider.class, hint = "git")
public class JGitSourceReferencesProvider implements SourceReferencesProvider {
+ @Override
public String getSourceReferencesHeader(MavenProject project, ScmUrl scmUrl) throws MojoExecutionException {
File basedir = project.getBasedir().getAbsoluteFile();
FileRepositoryBuilder builder = new FileRepositoryBuilder().readEnvironment().findGitDir(basedir)

Back to the top