Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTobias Oberlies2013-02-21 11:34:01 -0500
committerTobias Oberlies2013-02-21 11:34:01 -0500
commitc532878647d1910a5b4816ee2892dab15bf2723e (patch)
treeedccea4a433341e7856035344a50219f01c0248a
parentfac3d656edbe03d9a43e8384fae5b5d54647c5df (diff)
downloadorg.eclipse.tycho.nexus-c532878647d1910a5b4816ee2892dab15bf2723e.tar.gz
org.eclipse.tycho.nexus-c532878647d1910a5b4816ee2892dab15bf2723e.tar.xz
org.eclipse.tycho.nexus-c532878647d1910a5b4816ee2892dab15bf2723e.zip
[cleanup] Submit preference changes done by m2e on import
- m2eclipse sets the compiler compliance level in JDT to 1.6 (corresponding to the setting in Maven). - Also: Added @Override annotations recommended in Java 6. Change-Id: Ib1aaa9aeaae55980dbffb56d70b57dfdbb79491d
-rw-r--r--.settings/org.eclipse.jdt.core.prefs3
-rw-r--r--src/main/java/org/eclipse/tycho/nexus/internal/plugin/UnzipRepositoryTemplate.java1
-rw-r--r--src/main/java/org/eclipse/tycho/nexus/internal/plugin/storage/ZippedStorageFileItem.java3
-rw-r--r--src/test/java/org/eclipse/tycho/nexus/internal/plugin/cache/LatestVersionConverterTest.java2
4 files changed, 9 insertions, 0 deletions
diff --git a/.settings/org.eclipse.jdt.core.prefs b/.settings/org.eclipse.jdt.core.prefs
index 75b211d..0a99f09 100644
--- a/.settings/org.eclipse.jdt.core.prefs
+++ b/.settings/org.eclipse.jdt.core.prefs
@@ -1,5 +1,8 @@
eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
+org.eclipse.jdt.core.compiler.compliance=1.6
org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
+org.eclipse.jdt.core.compiler.source=1.6
org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0
diff --git a/src/main/java/org/eclipse/tycho/nexus/internal/plugin/UnzipRepositoryTemplate.java b/src/main/java/org/eclipse/tycho/nexus/internal/plugin/UnzipRepositoryTemplate.java
index c8cc979..124c9e3 100644
--- a/src/main/java/org/eclipse/tycho/nexus/internal/plugin/UnzipRepositoryTemplate.java
+++ b/src/main/java/org/eclipse/tycho/nexus/internal/plugin/UnzipRepositoryTemplate.java
@@ -48,6 +48,7 @@ public class UnzipRepositoryTemplate extends AbstractRepositoryTemplate {
final CRepositoryCoreConfiguration result = new CRepositoryCoreConfiguration(getTemplateProvider()
.getApplicationConfiguration(), repo,
new CRepositoryExternalConfigurationHolderFactory<UnzipRepositoryConfiguration>() {
+ @Override
public UnzipRepositoryConfiguration createExternalConfigurationHolder(final CRepository config) {
return new UnzipRepositoryConfiguration((Xpp3Dom) config.getExternalConfiguration());
}
diff --git a/src/main/java/org/eclipse/tycho/nexus/internal/plugin/storage/ZippedStorageFileItem.java b/src/main/java/org/eclipse/tycho/nexus/internal/plugin/storage/ZippedStorageFileItem.java
index 752931c..f808ac8 100644
--- a/src/main/java/org/eclipse/tycho/nexus/internal/plugin/storage/ZippedStorageFileItem.java
+++ b/src/main/java/org/eclipse/tycho/nexus/internal/plugin/storage/ZippedStorageFileItem.java
@@ -29,14 +29,17 @@ public final class ZippedStorageFileItem extends DefaultStorageFileItem {
this.zippedItem = zippedItem;
}
+ @Override
public InputStream getContent() throws IOException {
return zippedItem.getStreamOfZippedFile();
}
+ @Override
public String getMimeType() {
return zippedItem.getMimeType();
}
+ @Override
public boolean isReusable() {
return false;
}
diff --git a/src/test/java/org/eclipse/tycho/nexus/internal/plugin/cache/LatestVersionConverterTest.java b/src/test/java/org/eclipse/tycho/nexus/internal/plugin/cache/LatestVersionConverterTest.java
index 8ee32ca..dde5e30 100644
--- a/src/test/java/org/eclipse/tycho/nexus/internal/plugin/cache/LatestVersionConverterTest.java
+++ b/src/test/java/org/eclipse/tycho/nexus/internal/plugin/cache/LatestVersionConverterTest.java
@@ -137,10 +137,12 @@ public class LatestVersionConverterTest {
EasyMock.expect(repositoryMock.getId()).andStubReturn("");
EasyMock.expect(repositoryMock.retrieveItem(EasyMock.capture(captures[0])))
.andAnswer(new IAnswer<StorageFileItem>() {
+ @Override
public StorageFileItem answer() throws Throwable {
final StorageFileItem mavenMetaDataXml = EasyMock.createMock(StorageFileItem.class);
EasyMock.expect(mavenMetaDataXml.getInputStream()).andAnswer(new IAnswer<InputStream>() {
+ @Override
public InputStream answer() throws Throwable {
final File metaDataFile;
final String requestPath = captures[0].getValue().getRequestPath();

Back to the top