From 22fbcb7be4cf4b81f8c23bd6d8002435ba635521 Mon Sep 17 00:00:00 2001
From: Adrian Cole <adrian@jclouds.org>
Date: Fri, 16 Sep 2011 16:17:00 -0700
Subject: [PATCH] Issue 158: fix to use new Nullable annotations

---
 .../java/org/jclouds/softlayer/domain/ProductItem.java    | 2 +-
 .../org/jclouds/softlayer/domain/ProductItemPrice.java    | 2 +-
 .../jclouds/softlayer/functions/AccountToLocation.java    | 8 +++-----
 3 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/sandbox-providers/softlayer/src/main/java/org/jclouds/softlayer/domain/ProductItem.java b/sandbox-providers/softlayer/src/main/java/org/jclouds/softlayer/domain/ProductItem.java
index ea5e283571..ad1d3a6164 100644
--- a/sandbox-providers/softlayer/src/main/java/org/jclouds/softlayer/domain/ProductItem.java
+++ b/sandbox-providers/softlayer/src/main/java/org/jclouds/softlayer/domain/ProductItem.java
@@ -22,7 +22,7 @@ import static com.google.common.base.Preconditions.checkNotNull;
 
 import java.util.Set;
 
-import javax.annotation.Nullable;
+import org.jclouds.javax.annotation.Nullable;
 
 import com.google.common.collect.ImmutableSet;
 import com.google.common.collect.Sets;
diff --git a/sandbox-providers/softlayer/src/main/java/org/jclouds/softlayer/domain/ProductItemPrice.java b/sandbox-providers/softlayer/src/main/java/org/jclouds/softlayer/domain/ProductItemPrice.java
index a3b88c8f6a..b23ea6c152 100644
--- a/sandbox-providers/softlayer/src/main/java/org/jclouds/softlayer/domain/ProductItemPrice.java
+++ b/sandbox-providers/softlayer/src/main/java/org/jclouds/softlayer/domain/ProductItemPrice.java
@@ -18,7 +18,7 @@
  */
 package org.jclouds.softlayer.domain;
 
-import javax.annotation.Nullable;
+import org.jclouds.javax.annotation.Nullable;
 
 /**
  * The SoftLayer_Product_Item_Price data type contains general information
diff --git a/sandbox-providers/softlayer/src/main/java/org/jclouds/softlayer/functions/AccountToLocation.java b/sandbox-providers/softlayer/src/main/java/org/jclouds/softlayer/functions/AccountToLocation.java
index a900da9250..4b5da9fc6c 100644
--- a/sandbox-providers/softlayer/src/main/java/org/jclouds/softlayer/functions/AccountToLocation.java
+++ b/sandbox-providers/softlayer/src/main/java/org/jclouds/softlayer/functions/AccountToLocation.java
@@ -18,16 +18,14 @@
  */
 package org.jclouds.softlayer.functions;
 
-import com.google.common.base.Function;
-import com.google.common.collect.ImmutableMap;
-import com.google.common.collect.ImmutableSet;
-import com.google.common.collect.Iterables;
 import org.jclouds.domain.Location;
 import org.jclouds.domain.LocationBuilder;
 import org.jclouds.domain.LocationScope;
 import org.jclouds.softlayer.domain.Address;
 
-import javax.annotation.Nullable;
+import com.google.common.base.Function;
+import com.google.common.collect.ImmutableMap;
+import com.google.common.collect.ImmutableSet;
 
 /**
  * Converts an Address into a Location.