Updated analytics service in response to API changes
The Property API changed a bit, and those changes have been
propogated here. I also cleaned up imports while I was at it.
Change-Id: I1576b353a31163c76ff84b496f51ad8d5ef89272
diff --git a/src/com/google/services/creators/AnalyticsServiceCreator.java b/src/com/google/services/creators/AnalyticsServiceCreator.java
index d9b5cec..50ea166 100644
--- a/src/com/google/services/creators/AnalyticsServiceCreator.java
+++ b/src/com/google/services/creators/AnalyticsServiceCreator.java
@@ -25,11 +25,8 @@
import com.android.tools.idea.ui.properties.core.IntValueProperty;
import com.android.tools.idea.ui.properties.core.ObservableBool;
import com.android.tools.idea.ui.properties.core.StringValueProperty;
-import com.android.tools.idea.ui.properties.expressions.bool.BooleanExpression;
-import com.android.tools.idea.ui.properties.expressions.bool.BooleanExpressions;
import com.android.tools.idea.ui.properties.expressions.list.AbstractMapExpression;
import com.android.tools.idea.ui.properties.expressions.list.SizeExpression;
-import com.android.tools.idea.ui.properties.expressions.string.IsEmptyExpression;
import com.google.api.client.http.javanet.NetHttpTransport;
import com.google.api.client.json.jackson2.JacksonFactory;
import com.google.api.services.analytics.Analytics;
@@ -41,7 +38,6 @@
import com.google.gct.login.GoogleLogin;
import com.google.services.GoogleServiceCreators;
import com.google.services.GoogleServiceLoginListener;
-import com.intellij.util.Consumer;
import org.jetbrains.annotations.NotNull;
import java.util.concurrent.Callable;
@@ -81,7 +77,7 @@
myLoggedIn.addWeakListener(myLoginListener);
// Map accounts to account names
- myBindings.bindList(myAccountNames, new AbstractMapExpression<Account, String>(myAccounts) {
+ myBindings.bind(myAccountNames, new AbstractMapExpression<Account, String>(myAccounts) {
@NotNull
@Override
protected String transform(@NotNull Account account) {
@@ -90,7 +86,7 @@
});
// Map properties to property names
- myBindings.bindList(myPropertyNames, new AbstractMapExpression<Webproperty, String>(myProperties) {
+ myBindings.bind(myPropertyNames, new AbstractMapExpression<Webproperty, String>(myProperties) {
@NotNull
@Override
protected String transform(@NotNull Webproperty property) {