summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSteffen Pingel2013-06-12 15:36:29 (EDT)
committer Steffen Pingel2013-06-14 02:19:49 (EDT)
commitf33fa45ccfd4fed26a5429cd5a02b294414c7120 (patch)
treeaf178ae7a7a849c6fe0bb02318958083342330d1
parentf7dfdb3f1da56b753290e3d08438f2203b5754f7 (diff)
downloadorg.eclipse.mylyn.tasks-f33fa45ccfd4fed26a5429cd5a02b294414c7120.zip
org.eclipse.mylyn.tasks-f33fa45ccfd4fed26a5429cd5a02b294414c7120.tar.gz
org.eclipse.mylyn.tasks-f33fa45ccfd4fed26a5429cd5a02b294414c7120.tar.bz2
410655: add @NonNull annotations to AbstractRepositorySettingsPagerefs/changes/97/13797/3
Change-Id: I8f167f7e10cbe903a9a62f5e1e7273031effbdea Task-Url: https://bugs.eclipse.org/bugs/show_bug.cgi?id=410655
-rw-r--r--.gitignore1
-rw-r--r--org.eclipse.mylyn.tasks-target/mylyn-tasks-e3.5.target22
-rw-r--r--org.eclipse.mylyn.tasks.ui/build.properties3
-rw-r--r--org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/wizards/AbstractRepositorySettingsPage.java12
-rw-r--r--pom.xml78
5 files changed, 58 insertions, 58 deletions
diff --git a/.gitignore b/.gitignore
index 0ce679c..f837d26 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,5 @@
bin/
target/
*.rej
+*~
test-attach-*.txt
diff --git a/org.eclipse.mylyn.tasks-target/mylyn-tasks-e3.5.target b/org.eclipse.mylyn.tasks-target/mylyn-tasks-e3.5.target
index 995378a..949426f 100644
--- a/org.eclipse.mylyn.tasks-target/mylyn-tasks-e3.5.target
+++ b/org.eclipse.mylyn.tasks-target/mylyn-tasks-e3.5.target
@@ -4,28 +4,26 @@
<target name="mylyn-tasks-e3.5" sequenceNumber="7">
<locations>
<location includeAllPlatforms="false" includeMode="slicer" includeSource="true" type="InstallableUnit">
-<unit id="com.google.gson" version="2.1.0.v201303041604"/>
-<unit id="org.apache.lucene.core" version="2.9.1.v201101211721"/>
-<unit id="org.hamcrest" version="1.1.0.v20090501071000"/>
-<unit id="org.hamcrest.core" version="1.1.0.v20090501071000"/>
-<unit id="org.hamcrest.generator" version="1.1.0.v20090501071000"/>
-<unit id="org.hamcrest.integration" version="1.1.0.v201303031500"/>
-<unit id="org.hamcrest.library" version="1.1.0.v20090501071000"/>
-<unit id="org.hamcrest.text" version="1.1.0.v20090501071000"/>
-<unit id="org.junit" version="4.8.2.v4_8_2_v20110321-1705"/>
-<unit id="org.mockito" version="1.8.4.v201303031500"/>
-<unit id="org.objenesis" version="1.0.0.v201105211943"/>
<unit id="javax.xml" version="1.3.4.v201005080400"/>
+<unit id="org.apache.lucene.core" version="2.9.1.v201101211721"/>
<unit id="org.apache.xml.resolver" version="1.2.0.v201005080400"/>
<unit id="org.apache.xml.serializer" version="2.7.1.v201005080400"/>
<unit id="org.apache.xerces" version="2.9.0.v201101211617"/>
-<repository location="http://download.eclipse.org/tools/orbit/downloads/drops/S20130308121626/repository/"/>
+<repository location="http://download.eclipse.org/tools/orbit/downloads/drops/R20130517111416/repository/"/>
+</location>
+<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="slicer" includeSource="true" type="InstallableUnit">
+<unit id="org.eclipse.jdt.annotation" version="1.0.1.v20130111-135246"/>
+<repository location="http://download.eclipse.org/eclipse/updates/3.8/R-3.8.2-201301310800"/>
</location>
<location includeAllPlatforms="false" includeMode="slicer" includeSource="true" type="InstallableUnit">
<unit id="org.eclipse.sdk.ide" version="3.5.2.M20100211-1343"/>
<repository location="http://download.eclipse.org/releases/galileo"/>
</location>
<location includeAllPlatforms="false" includeMode="slicer" includeSource="true" type="InstallableUnit">
+<unit id="org.eclipse.mylyn.commons.tck.feature.group" version="0.0.0"/>
+<repository location="http://download.eclipse.org/mylyn/snapshots/nightly/commons"/>
+</location>
+<location includeAllPlatforms="false" includeMode="slicer" includeSource="true" type="InstallableUnit">
<unit id="org.eclipse.mylyn.commons.sdk.feature.group" version="0.0.0"/>
<unit id="org.eclipse.mylyn.context.core" version="0.0.0"/>
<repository location="http://download.eclipse.org/mylyn/snapshots/3.9"/>
diff --git a/org.eclipse.mylyn.tasks.ui/build.properties b/org.eclipse.mylyn.tasks.ui/build.properties
index 6472be2..0cc50f7 100644
--- a/org.eclipse.mylyn.tasks.ui/build.properties
+++ b/org.eclipse.mylyn.tasks.ui/build.properties
@@ -16,4 +16,5 @@ src.includes = about.html,\
schema/
source.. = src/
-jars.extra.classpath = platform:/plugin/org.eclipse.ui.navigator,platform:/plugin/org.eclipse.mylyn.discovery.ui
+additional.bundles = org.eclipse.jdt.annotation
+jars.extra.classpath = platform:/plugin/org.eclipse.ui.navigator,platform:/plugin/org.eclipse.mylyn.discovery.ui,platform:/plugin/org.eclipse.jdt.annotation
diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/wizards/AbstractRepositorySettingsPage.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/wizards/AbstractRepositorySettingsPage.java
index df1fd67..a8618bd 100644
--- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/wizards/AbstractRepositorySettingsPage.java
+++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/wizards/AbstractRepositorySettingsPage.java
@@ -27,6 +27,7 @@ import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.OperationCanceledException;
import org.eclipse.core.runtime.Status;
+import org.eclipse.jdt.annotation.NonNull;
import org.eclipse.jface.dialogs.Dialog;
import org.eclipse.jface.dialogs.IMessageProvider;
import org.eclipse.jface.layout.GridDataFactory;
@@ -1335,7 +1336,7 @@ public abstract class AbstractRepositorySettingsPage extends AbstractTaskReposit
/**
* @since 2.0
*/
- protected abstract void createAdditionalControls(Composite parent);
+ protected abstract void createAdditionalControls(@NonNull Composite parent);
/**
* @since 2.0
@@ -1668,7 +1669,7 @@ public abstract class AbstractRepositorySettingsPage extends AbstractTaskReposit
* @since 2.2
*/
@Override
- public void applyTo(TaskRepository repository) {
+ public void applyTo(@NonNull TaskRepository repository) {
repository.setVersion(getVersion());
if (needsEncoding()) {
repository.setCharacterEncoding(getCharacterEncoding());
@@ -2014,7 +2015,7 @@ public abstract class AbstractRepositorySettingsPage extends AbstractTaskReposit
/**
* @since 2.0
*/
- protected abstract Validator getValidator(TaskRepository repository);
+ protected abstract Validator getValidator(@NonNull TaskRepository repository);
/**
* Public for testing.
@@ -2025,7 +2026,7 @@ public abstract class AbstractRepositorySettingsPage extends AbstractTaskReposit
private IStatus status;
- public abstract void run(IProgressMonitor monitor) throws CoreException;
+ public abstract void run(@NonNull IProgressMonitor monitor) throws CoreException;
public IStatus getStatus() {
return status;
@@ -2043,8 +2044,7 @@ public abstract class AbstractRepositorySettingsPage extends AbstractTaskReposit
* @since 3.7
* @see IAdaptable#getAdapter(Class)
*/
- public Object getAdapter(@SuppressWarnings("rawtypes")
- Class adapter) {
+ public Object getAdapter(@SuppressWarnings("rawtypes") Class adapter) {
if (adapter == IValidatable.class) {
return new IValidatable() {
public void validate() {
diff --git a/pom.xml b/pom.xml
index e70c33d..309d903 100644
--- a/pom.xml
+++ b/pom.xml
@@ -115,42 +115,42 @@
</plugins>
</build>
</profile>
- </profiles>
- <modules>
- <module>org.eclipse.mylyn-feature</module>
- <module>org.eclipse.mylyn.bugzilla-feature</module>
- <module>org.eclipse.mylyn.bugzilla.core</module>
- <module>org.eclipse.mylyn.bugzilla.tests</module>
- <module>org.eclipse.mylyn.bugzilla.ui</module>
- <module>org.eclipse.mylyn.help.sdk</module>
- <module>org.eclipse.mylyn.help.ui</module>
- <module>org.eclipse.mylyn.sdk-feature</module>
- <module>org.eclipse.mylyn.test-feature</module>
- <module>org.eclipse.mylyn.oslc.core</module>
- <module>org.eclipse.mylyn.oslc.tests</module>
- <module>org.eclipse.mylyn.oslc.ui</module>
- <module>org.eclipse.mylyn.tasks-site</module>
- <module>org.eclipse.mylyn.tasks-target</module>
- <module>org.eclipse.mylyn.tasks.activity.core</module>
- <module>org.eclipse.mylyn.tasks.activity.tests</module>
- <module>org.eclipse.mylyn.tasks.activity.ui</module>
- <module>org.eclipse.mylyn.tasks.bugs</module>
- <module>org.eclipse.mylyn.tasks.core</module>
- <module>org.eclipse.mylyn.tasks.core.tests</module>
- <module>org.eclipse.mylyn.tasks.ide-feature</module>
- <module>org.eclipse.mylyn.tasks.index.core</module>
- <module>org.eclipse.mylyn.tasks.index.tests</module>
- <module>org.eclipse.mylyn.tasks.index.ui</module>
- <module>org.eclipse.mylyn.tasks.index-feature</module>
- <module>org.eclipse.mylyn.tasks.search</module>
- <module>org.eclipse.mylyn.tasks.tests</module>
- <module>org.eclipse.mylyn.tasks.ui</module>
- <module>org.eclipse.mylyn.tests.util</module>
- <module>org.eclipse.mylyn.trac-feature</module>
- <module>org.eclipse.mylyn.trac.core</module>
- <module>org.eclipse.mylyn.trac.core.tests</module>
- <module>org.eclipse.mylyn.trac.tests</module>
- <module>org.eclipse.mylyn.trac.ui</module>
- <module>org.eclipse.mylyn.trac.ui.tests</module>
- </modules>
- </project>
+ </profiles>
+ <modules>
+ <module>org.eclipse.mylyn-feature</module>
+ <module>org.eclipse.mylyn.bugzilla-feature</module>
+ <module>org.eclipse.mylyn.bugzilla.core</module>
+ <module>org.eclipse.mylyn.bugzilla.tests</module>
+ <module>org.eclipse.mylyn.bugzilla.ui</module>
+ <module>org.eclipse.mylyn.help.sdk</module>
+ <module>org.eclipse.mylyn.help.ui</module>
+ <module>org.eclipse.mylyn.sdk-feature</module>
+ <module>org.eclipse.mylyn.test-feature</module>
+ <module>org.eclipse.mylyn.oslc.core</module>
+ <module>org.eclipse.mylyn.oslc.tests</module>
+ <module>org.eclipse.mylyn.oslc.ui</module>
+ <module>org.eclipse.mylyn.tasks-site</module>
+ <module>org.eclipse.mylyn.tasks-target</module>
+ <module>org.eclipse.mylyn.tasks.activity.core</module>
+ <module>org.eclipse.mylyn.tasks.activity.tests</module>
+ <module>org.eclipse.mylyn.tasks.activity.ui</module>
+ <module>org.eclipse.mylyn.tasks.bugs</module>
+ <module>org.eclipse.mylyn.tasks.core</module>
+ <module>org.eclipse.mylyn.tasks.core.tests</module>
+ <module>org.eclipse.mylyn.tasks.ide-feature</module>
+ <module>org.eclipse.mylyn.tasks.index.core</module>
+ <module>org.eclipse.mylyn.tasks.index.tests</module>
+ <module>org.eclipse.mylyn.tasks.index.ui</module>
+ <module>org.eclipse.mylyn.tasks.index-feature</module>
+ <module>org.eclipse.mylyn.tasks.search</module>
+ <module>org.eclipse.mylyn.tasks.tests</module>
+ <module>org.eclipse.mylyn.tasks.ui</module>
+ <module>org.eclipse.mylyn.tests.util</module>
+ <module>org.eclipse.mylyn.trac-feature</module>
+ <module>org.eclipse.mylyn.trac.core</module>
+ <module>org.eclipse.mylyn.trac.core.tests</module>
+ <module>org.eclipse.mylyn.trac.tests</module>
+ <module>org.eclipse.mylyn.trac.ui</module>
+ <module>org.eclipse.mylyn.trac.ui.tests</module>
+ </modules>
+</project>