From 00b6c0c72e3af4fa80bbae58bd4048e3fa6e89a1 Mon Sep 17 00:00:00 2001 From: srowen Date: Wed, 23 Jun 2010 10:23:09 +0000 Subject: [PATCH] Small style things git-svn-id: http://zxing.googlecode.com/svn/trunk@1457 59b500cc-1b3d-0410-9834-0bbf25fbcc57 --- .../android/result/WifiResultHandler.java | 15 ++++---------- .../android/wifi/ConnectedReceiver.java | 20 +++++++++++++++---- .../client/android/wifi/WifiActivity.java | 3 --- 3 files changed, 20 insertions(+), 18 deletions(-) diff --git a/android/src/com/google/zxing/client/android/result/WifiResultHandler.java b/android/src/com/google/zxing/client/android/result/WifiResultHandler.java index 1cc2b5d5..2ef26c26 100644 --- a/android/src/com/google/zxing/client/android/result/WifiResultHandler.java +++ b/android/src/com/google/zxing/client/android/result/WifiResultHandler.java @@ -28,10 +28,9 @@ import com.google.zxing.client.result.WifiParsedResult; * @author viki@google.com (Vikram Aggarwal) */ public final class WifiResultHandler extends ResultHandler { - Activity parentActivity = null; + public WifiResultHandler(Activity activity, ParsedResult result) { super(activity, result); - parentActivity = activity; } @Override @@ -42,24 +41,18 @@ public final class WifiResultHandler extends ResultHandler { @Override public int getButtonText(int index) { - switch (index) { - case 0: + if (index == 0) { return R.string.button_wifi; - default: - throw new ArrayIndexOutOfBoundsException(); } + throw new ArrayIndexOutOfBoundsException(); } @Override public void handleButtonPress(int index) { // Get the underlying wifi config WifiParsedResult wifiResult = (WifiParsedResult) getResult(); - switch (index) { - case 0: + if (index == 0) { wifiConnect(wifiResult); - break; - default: - break; } } diff --git a/android/src/com/google/zxing/client/android/wifi/ConnectedReceiver.java b/android/src/com/google/zxing/client/android/wifi/ConnectedReceiver.java index 40ce99c3..c42852b9 100644 --- a/android/src/com/google/zxing/client/android/wifi/ConnectedReceiver.java +++ b/android/src/com/google/zxing/client/android/wifi/ConnectedReceiver.java @@ -1,10 +1,22 @@ -package com.google.zxing.client.android.wifi; +/* + * Copyright (C) 2010 ZXing authors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ -import com.google.zxing.client.android.R; +package com.google.zxing.client.android.wifi; import android.app.Activity; -import android.app.AlertDialog; -import android.content.ActivityNotFoundException; import android.content.BroadcastReceiver; import android.content.Context; import android.content.Intent; diff --git a/android/src/com/google/zxing/client/android/wifi/WifiActivity.java b/android/src/com/google/zxing/client/android/wifi/WifiActivity.java index b86fed0a..948aa457 100644 --- a/android/src/com/google/zxing/client/android/wifi/WifiActivity.java +++ b/android/src/com/google/zxing/client/android/wifi/WifiActivity.java @@ -19,12 +19,9 @@ package com.google.zxing.client.android.wifi; import java.util.List; import android.app.Activity; -import android.app.AlertDialog; -import android.content.ActivityNotFoundException; import android.content.Intent; import android.content.IntentFilter; import android.net.ConnectivityManager; -import android.net.Uri; import android.net.wifi.WifiConfiguration; import android.net.wifi.WifiManager; import android.os.Bundle; -- 2.20.1