aboutsummaryrefslogtreecommitdiffstats
path: root/main/src/cgeo/geocaching/ui/CompassView.java
diff options
context:
space:
mode:
authorBananeweizen <bananeweizen@gmx.de>2014-07-09 20:00:20 +0200
committerBananeweizen <bananeweizen@gmx.de>2014-07-09 20:00:20 +0200
commit39c1a333586fc0cbe61b9f18f5abe33c5f7bba2b (patch)
treec16fb9a6910842b6d77f45a241e70bc9076bd239 /main/src/cgeo/geocaching/ui/CompassView.java
parentd958893efe7f492ebe909ba74f6e27ea2cb1532c (diff)
downloadcgeo-39c1a333586fc0cbe61b9f18f5abe33c5f7bba2b.zip
cgeo-39c1a333586fc0cbe61b9f18f5abe33c5f7bba2b.tar.gz
cgeo-39c1a333586fc0cbe61b9f18f5abe33c5f7bba2b.tar.bz2
remove some findbugs issues
* unused code * convert explicit type casts to generic method invocations
Diffstat (limited to 'main/src/cgeo/geocaching/ui/CompassView.java')
-rw-r--r--main/src/cgeo/geocaching/ui/CompassView.java19
1 files changed, 10 insertions, 9 deletions
diff --git a/main/src/cgeo/geocaching/ui/CompassView.java b/main/src/cgeo/geocaching/ui/CompassView.java
index 60982a9..b503d6c 100644
--- a/main/src/cgeo/geocaching/ui/CompassView.java
+++ b/main/src/cgeo/geocaching/ui/CompassView.java
@@ -6,6 +6,7 @@ import cgeo.geocaching.utils.AngleUtils;
import rx.Subscription;
import rx.android.schedulers.AndroidSchedulers;
import rx.functions.Action0;
+import rx.subscriptions.Subscriptions;
import android.content.Context;
import android.content.res.Resources;
@@ -54,13 +55,13 @@ public class CompassView extends View {
private int compassOverlayWidth = 0;
private int compassOverlayHeight = 0;
private boolean initialDisplay;
- private Subscription periodicUpdate;
+ private Subscription periodicUpdate = Subscriptions.empty();
private static final class UpdateAction implements Action0 {
private final WeakReference<CompassView> compassViewRef;
- private UpdateAction(CompassView view) {
+ private UpdateAction(final CompassView view) {
this.compassViewRef = new WeakReference<CompassView>(view);
}
@@ -74,7 +75,7 @@ public class CompassView extends View {
}
}
- public CompassView(Context contextIn) {
+ public CompassView(final Context contextIn) {
super(contextIn);
context = contextIn;
}
@@ -90,7 +91,7 @@ public class CompassView extends View {
}
}
- public CompassView(Context contextIn, AttributeSet attrs) {
+ public CompassView(final Context contextIn, final AttributeSet attrs) {
super(contextIn, attrs);
context = contextIn;
}
@@ -174,7 +175,7 @@ public class CompassView extends View {
* the actual value
* @return the new value
*/
- static protected float smoothUpdate(float goal, float actual) {
+ static protected float smoothUpdate(final float goal, final float actual) {
final double diff = AngleUtils.difference(actual, goal);
double offset = 0;
@@ -191,7 +192,7 @@ public class CompassView extends View {
}
@Override
- protected void onDraw(Canvas canvas) {
+ protected void onDraw(final Canvas canvas) {
final float azimuthTemp = azimuthShown;
final float azimuthRelative = AngleUtils.normalize(azimuthTemp - cacheHeadingShown);
@@ -236,11 +237,11 @@ public class CompassView extends View {
}
@Override
- protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
+ protected void onMeasure(final int widthMeasureSpec, final int heightMeasureSpec) {
setMeasuredDimension(measureWidth(widthMeasureSpec), measureHeight(heightMeasureSpec));
}
- private int measureWidth(int measureSpec) {
+ private int measureWidth(final int measureSpec) {
final int specMode = MeasureSpec.getMode(measureSpec);
final int specSize = MeasureSpec.getSize(measureSpec);
@@ -256,7 +257,7 @@ public class CompassView extends View {
return desired;
}
- private int measureHeight(int measureSpec) {
+ private int measureHeight(final int measureSpec) {
// The duplicated code in measureHeight and measureWidth cannot be avoided.
// Those methods must be efficient, therefore we cannot extract the code differences and unify the remainder.
final int specMode = MeasureSpec.getMode(measureSpec);