The @var annotation has been moved to the experimental package.

Added a test of a @var variable with null initialization.

3 files changed, 5 insertions, 5 deletions

diff --git a/src/core/lombok/eclipse/handlers/HandleVal.java b/src/core/lombok/eclipse/handlers/HandleVal.java
index 1f54bfac..0a136d0b 100644
--- a/src/core/lombok/eclipse/handlers/HandleVal.java
+++ b/src/core/lombok/eclipse/handlers/HandleVal.java
@@ -32,7 +32,7 @@ import lombok.eclipse.EclipseASTAdapter;
 import lombok.eclipse.EclipseASTVisitor;
 import lombok.eclipse.EclipseNode;
 
-import lombok.var;
+import lombok.experimental.var;
 import org.eclipse.jdt.internal.compiler.ast.ArrayInitializer;
 import org.eclipse.jdt.internal.compiler.ast.ForStatement;
 import org.eclipse.jdt.internal.compiler.ast.ForeachStatement;
diff --git a/src/core/lombok/var.java b/src/core/lombok/experimental/var.java
index 397f2760..d8de8b19 100644
--- a/src/core/lombok/var.java
+++ b/src/core/lombok/experimental/var.java
@@ -19,7 +19,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package lombok;
+package lombok.experimental;
 
 /**
  * like val but not final
diff --git a/src/core/lombok/javac/handlers/HandleVal.java b/src/core/lombok/javac/handlers/HandleVal.java
index f4c816d6..5b90ff62 100644
--- a/src/core/lombok/javac/handlers/HandleVal.java
+++ b/src/core/lombok/javac/handlers/HandleVal.java
@@ -31,7 +31,7 @@ import lombok.ConfigurationKeys;
 import lombok.core.HandlerPriority;
 import lombok.javac.*;
 import lombok.val;
-import lombok.var;
+import lombok.experimental.var;
 import org.mangosdk.spi.ProviderFor;
 
 import static lombok.core.handlers.HandlerUtil.handleFlagUsage;
@@ -88,8 +88,8 @@ public class HandleVal extends JavacASTAdapter {
 		}
 
 		if (localNode.shouldDeleteLombokAnnotations()) {
-			JavacHandlerUtil.deleteImportFromCompilationUnit(localNode, "lombok.val");
-			JavacHandlerUtil.deleteImportFromCompilationUnit(localNode, "lombok.var");
+			JavacHandlerUtil.deleteImportFromCompilationUnit(localNode, val.class.getName());
+			JavacHandlerUtil.deleteImportFromCompilationUnit(localNode, var.class.getName());
 		}
 
 		if (isVal) local.mods.flags |= Flags.FINAL;