Bug 403189 - enable api tools and fix warningsN20130318-2000N20130317-2000N20130316-1500N20130315-2000I20130319-1000I20130314-1330

18 files changed, 34 insertions, 9 deletions

diff --git a/bundles/org.eclipse.e4.core.contexts/.project b/bundles/org.eclipse.e4.core.contexts/.project
index e5401de09..d515bce11 100644
--- a/bundles/org.eclipse.e4.core.contexts/.project
+++ b/bundles/org.eclipse.e4.core.contexts/.project
@@ -20,9 +20,15 @@
 			<arguments>
 			</arguments>
 		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.api.tools.apiAnalysisBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
 	</buildSpec>
 	<natures>
 		<nature>org.eclipse.pde.PluginNature</nature>
 		<nature>org.eclipse.jdt.core.javanature</nature>
+		<nature>org.eclipse.pde.api.tools.apiAnalysisNature</nature>
 	</natures>
 </projectDescription>
diff --git a/bundles/org.eclipse.e4.core.contexts/META-INF/MANIFEST.MF b/bundles/org.eclipse.e4.core.contexts/META-INF/MANIFEST.MF
index 386f750dc..58a9c0926 100644
--- a/bundles/org.eclipse.e4.core.contexts/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.e4.core.contexts/META-INF/MANIFEST.MF
@@ -1,7 +1,7 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-SymbolicName: org.eclipse.e4.core.contexts
-Bundle-Version: 1.2.0.qualifier
+Bundle-Version: 1.3.0.qualifier
 Bundle-Name: %pluginName
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
diff --git a/bundles/org.eclipse.e4.core.contexts/pom.xml b/bundles/org.eclipse.e4.core.contexts/pom.xml
index a47b656a8..dc38c540d 100644
--- a/bundles/org.eclipse.e4.core.contexts/pom.xml
+++ b/bundles/org.eclipse.e4.core.contexts/pom.xml
@@ -19,6 +19,6 @@
   </parent>
   <groupId>org.eclipse.e4</groupId>
   <artifactId>org.eclipse.e4.core.contexts</artifactId>
-  <version>1.2.0-SNAPSHOT</version>
+  <version>1.3.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 </project>
diff --git a/bundles/org.eclipse.e4.core.contexts/src/org/eclipse/e4/core/contexts/Active.java b/bundles/org.eclipse.e4.core.contexts/src/org/eclipse/e4/core/contexts/Active.java
index 601ccc26a..e0426e34d 100644
--- a/bundles/org.eclipse.e4.core.contexts/src/org/eclipse/e4/core/contexts/Active.java
+++ b/bundles/org.eclipse.e4.core.contexts/src/org/eclipse/e4/core/contexts/Active.java
@@ -24,6 +24,7 @@ import javax.inject.Qualifier;
  * 
  * @see Inject
  * @see IEclipseContext#activate
+ * @since 1.3
  */
 @Qualifier
 @Documented
diff --git a/bundles/org.eclipse.e4.core.contexts/src/org/eclipse/e4/core/contexts/ContextFunction.java b/bundles/org.eclipse.e4.core.contexts/src/org/eclipse/e4/core/contexts/ContextFunction.java
index 212c4202f..045799fa7 100644
--- a/bundles/org.eclipse.e4.core.contexts/src/org/eclipse/e4/core/contexts/ContextFunction.java
+++ b/bundles/org.eclipse.e4.core.contexts/src/org/eclipse/e4/core/contexts/ContextFunction.java
@@ -18,6 +18,7 @@ package org.eclipse.e4.core.contexts;
  * This class is intended to be subclassed by clients.
  * </p>
  * @see IContextFunction
+ * @since 1.3
  */
 public abstract class ContextFunction implements IContextFunction {
 
diff --git a/bundles/org.eclipse.e4.core.contexts/src/org/eclipse/e4/core/contexts/ContextInjectionFactory.java b/bundles/org.eclipse.e4.core.contexts/src/org/eclipse/e4/core/contexts/ContextInjectionFactory.java
index a160f8b91..feb13b0e2 100644
--- a/bundles/org.eclipse.e4.core.contexts/src/org/eclipse/e4/core/contexts/ContextInjectionFactory.java
+++ b/bundles/org.eclipse.e4.core.contexts/src/org/eclipse/e4/core/contexts/ContextInjectionFactory.java
@@ -48,10 +48,11 @@ import org.eclipse.e4.core.internal.contexts.EclipseContext;
  * When a context is disposed, the injection factory will attempt to notify all injected objects by
  * calling methods with the <tt>javax.annotation.PreDestroy</tt> annotation.
  * 
- * @noextend This class is not intended to be extended by clients.
+ * This class is not intended to be extended by clients.
  * @noinstantiate This class is not intended to be instantiated by clients.
+ * @since 1.3
  */
-final public class ContextInjectionFactory {
+public final class ContextInjectionFactory {
 
 	final private static IInjector injector = InjectorFactory.getDefault();
 
diff --git a/bundles/org.eclipse.e4.core.contexts/src/org/eclipse/e4/core/contexts/EclipseContextFactory.java b/bundles/org.eclipse.e4.core.contexts/src/org/eclipse/e4/core/contexts/EclipseContextFactory.java
index 6a97cb913..8af33438f 100644
--- a/bundles/org.eclipse.e4.core.contexts/src/org/eclipse/e4/core/contexts/EclipseContextFactory.java
+++ b/bundles/org.eclipse.e4.core.contexts/src/org/eclipse/e4/core/contexts/EclipseContextFactory.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2009, 2011 IBM Corporation and others.
+ * Copyright (c) 2009, 2013 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -17,7 +17,9 @@ import org.eclipse.e4.core.internal.contexts.osgi.EclipseContextOSGi;
 import org.osgi.framework.BundleContext;
 
 /**
- * A factory for creating context instances.
+ * This factory is used to create new context instances.
+ * @see IEclipseContext
+ * @since 1.3
  */
 public final class EclipseContextFactory {
 
diff --git a/bundles/org.eclipse.e4.core.contexts/src/org/eclipse/e4/core/contexts/IContextFunction.java b/bundles/org.eclipse.e4.core.contexts/src/org/eclipse/e4/core/contexts/IContextFunction.java
index 035aa69f5..4a4f0c896 100644
--- a/bundles/org.eclipse.e4.core.contexts/src/org/eclipse/e4/core/contexts/IContextFunction.java
+++ b/bundles/org.eclipse.e4.core.contexts/src/org/eclipse/e4/core/contexts/IContextFunction.java
@@ -39,6 +39,7 @@ import org.osgi.framework.BundleContext;
  * @noimplement This interface is not intended to be implemented by clients.
  *              Function implementations must subclass {@link ContextFunction}
  *              instead.
+ * @since 1.3
  */
 public interface IContextFunction {
 	/**
diff --git a/bundles/org.eclipse.e4.core.contexts/src/org/eclipse/e4/core/contexts/IEclipseContext.java b/bundles/org.eclipse.e4.core.contexts/src/org/eclipse/e4/core/contexts/IEclipseContext.java
index 920781e78..f18cde897 100644
--- a/bundles/org.eclipse.e4.core.contexts/src/org/eclipse/e4/core/contexts/IEclipseContext.java
+++ b/bundles/org.eclipse.e4.core.contexts/src/org/eclipse/e4/core/contexts/IEclipseContext.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2009, 2010 IBM Corporation and others.
+ * Copyright (c) 2009, 2013 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -40,6 +40,7 @@ package org.eclipse.e4.core.contexts;
  * </p>
  * @noimplement This interface is not intended to be implemented by clients.
  * @noextend This interface is not intended to be extended by clients.
+ * @since 1.3
  */
 public interface IEclipseContext {
 
diff --git a/bundles/org.eclipse.e4.core.contexts/src/org/eclipse/e4/core/contexts/RunAndTrack.java b/bundles/org.eclipse.e4.core.contexts/src/org/eclipse/e4/core/contexts/RunAndTrack.java
index 6bafef91a..5b53c4988 100644
--- a/bundles/org.eclipse.e4.core.contexts/src/org/eclipse/e4/core/contexts/RunAndTrack.java
+++ b/bundles/org.eclipse.e4.core.contexts/src/org/eclipse/e4/core/contexts/RunAndTrack.java
@@ -20,6 +20,7 @@ import org.eclipse.e4.core.internal.contexts.EclipseContext;
  * object, and will re-evaluate this runnable whenever any accessed value changes.
  * 
  * @see IEclipseContext#runAndTrack(RunAndTrack)
+ * @since 1.3
  */
 abstract public class RunAndTrack {
 
diff --git a/bundles/org.eclipse.e4.core.di/.project b/bundles/org.eclipse.e4.core.di/.project
index 241f11f04..fa247d66a 100644
--- a/bundles/org.eclipse.e4.core.di/.project
+++ b/bundles/org.eclipse.e4.core.di/.project
@@ -20,9 +20,15 @@
 			<arguments>
 			</arguments>
 		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.api.tools.apiAnalysisBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
 	</buildSpec>
 	<natures>
 		<nature>org.eclipse.pde.PluginNature</nature>
 		<nature>org.eclipse.jdt.core.javanature</nature>
+		<nature>org.eclipse.pde.api.tools.apiAnalysisNature</nature>
 	</natures>
 </projectDescription>
diff --git a/bundles/org.eclipse.e4.core.di/META-INF/MANIFEST.MF b/bundles/org.eclipse.e4.core.di/META-INF/MANIFEST.MF
index 5b454ecc3..4acda3728 100644
--- a/bundles/org.eclipse.e4.core.di/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.e4.core.di/META-INF/MANIFEST.MF
@@ -1,7 +1,7 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-SymbolicName: org.eclipse.e4.core.di
-Bundle-Version: 1.2.0.qualifier
+Bundle-Version: 1.3.0.qualifier
 Bundle-Name: %pluginName
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
diff --git a/bundles/org.eclipse.e4.core.di/pom.xml b/bundles/org.eclipse.e4.core.di/pom.xml
index cf913a678..46c82a6d8 100644
--- a/bundles/org.eclipse.e4.core.di/pom.xml
+++ b/bundles/org.eclipse.e4.core.di/pom.xml
@@ -19,6 +19,6 @@
   </parent>
   <groupId>org.eclipse.e4</groupId>
   <artifactId>org.eclipse.e4.core.di</artifactId>
-  <version>1.2.0-SNAPSHOT</version>
+  <version>1.3.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 </project>
diff --git a/bundles/org.eclipse.e4.core.di/src/org/eclipse/e4/core/di/annotations/CanExecute.java b/bundles/org.eclipse.e4.core.di/src/org/eclipse/e4/core/di/annotations/CanExecute.java
index 7ac73bef7..3e7e6ea19 100644
--- a/bundles/org.eclipse.e4.core.di/src/org/eclipse/e4/core/di/annotations/CanExecute.java
+++ b/bundles/org.eclipse.e4.core.di/src/org/eclipse/e4/core/di/annotations/CanExecute.java
@@ -23,6 +23,7 @@ import java.lang.annotation.Target;
  * This annotation must not be applied to more than one method per class. If several class
  * methods are tagged with this annotation, only one of them will be called.
  * </p>
+ * @since 1.3
  */
 @Documented
 @Target({ElementType.METHOD})
diff --git a/bundles/org.eclipse.e4.core.di/src/org/eclipse/e4/core/di/annotations/Creatable.java b/bundles/org.eclipse.e4.core.di/src/org/eclipse/e4/core/di/annotations/Creatable.java
index 06bc52f0f..8fca39d87 100644
--- a/bundles/org.eclipse.e4.core.di/src/org/eclipse/e4/core/di/annotations/Creatable.java
+++ b/bundles/org.eclipse.e4.core.di/src/org/eclipse/e4/core/di/annotations/Creatable.java
@@ -19,6 +19,7 @@ import javax.inject.Qualifier;
 

 /**

  * Specifies that the target class can be created by an injector as needed.

+ * @since 1.3

  */

 @Qualifier

 @Documented

diff --git a/bundles/org.eclipse.e4.core.di/src/org/eclipse/e4/core/di/annotations/Execute.java b/bundles/org.eclipse.e4.core.di/src/org/eclipse/e4/core/di/annotations/Execute.java
index 65d737779..fdbd5cea9 100644
--- a/bundles/org.eclipse.e4.core.di/src/org/eclipse/e4/core/di/annotations/Execute.java
+++ b/bundles/org.eclipse.e4.core.di/src/org/eclipse/e4/core/di/annotations/Execute.java
@@ -22,6 +22,7 @@ import java.lang.annotation.Target;
  * This annotation must not be applied to more than one method per class. If several class
  * methods are tagged with this annotation, only one of them will be called.
  * </p>
+ * @since 1.3
  */
 @Documented
 @Target({ElementType.METHOD})
diff --git a/bundles/org.eclipse.e4.core.di/src/org/eclipse/e4/core/di/annotations/GroupUpdates.java b/bundles/org.eclipse.e4.core.di/src/org/eclipse/e4/core/di/annotations/GroupUpdates.java
index faa41da8d..2f39babc2 100644
--- a/bundles/org.eclipse.e4.core.di/src/org/eclipse/e4/core/di/annotations/GroupUpdates.java
+++ b/bundles/org.eclipse.e4.core.di/src/org/eclipse/e4/core/di/annotations/GroupUpdates.java
@@ -33,6 +33,7 @@ import java.lang.annotation.Target;
  * Note that the order of batched events is unspecified and is likely different 
  * from the original event order. As such, it is not recommended to use grouped updates on 
  * the methods that modify other context values.
+ * @since 1.3
  */
 @Documented
 @Target({METHOD, FIELD})
diff --git a/bundles/org.eclipse.e4.core.di/src/org/eclipse/e4/core/di/annotations/Optional.java b/bundles/org.eclipse.e4.core.di/src/org/eclipse/e4/core/di/annotations/Optional.java
index 4a7deb6b1..f1f005075 100644
--- a/bundles/org.eclipse.e4.core.di/src/org/eclipse/e4/core/di/annotations/Optional.java
+++ b/bundles/org.eclipse.e4.core.di/src/org/eclipse/e4/core/di/annotations/Optional.java
@@ -36,6 +36,7 @@ import javax.inject.Qualifier;
  *   }
  *  </pre>
  *  </p>
+ * @since 1.3
  */
 @Qualifier
 @Documented