From e5a127f1a42d50dd2e0f2c7a1ef8db96cffc416c Mon Sep 17 00:00:00 2001 From: Mohamed Ezzat Date: Sun, 3 Jul 2016 19:26:20 +0200 Subject: [PATCH] Cleanup - squid:S1301 - "switch" statements should have at least 3 "case" clauses --- .../yalantis/phoenix/PullToRefreshView.java | 11 ++++----- .../PullToRefreshLayout.java | 7 ++---- .../circlerefresh/CircleRefreshLayout.java | 23 ++++++++----------- .../jellyrefresh/PullToRefreshLayout.java | 21 ++++++++--------- 4 files changed, 26 insertions(+), 36 deletions(-) diff --git a/Phoenix/src/main/java/com/yalantis/phoenix/PullToRefreshView.java b/Phoenix/src/main/java/com/yalantis/phoenix/PullToRefreshView.java index 4d33313..29f3e37 100644 --- a/Phoenix/src/main/java/com/yalantis/phoenix/PullToRefreshView.java +++ b/Phoenix/src/main/java/com/yalantis/phoenix/PullToRefreshView.java @@ -103,13 +103,12 @@ public PullToRefreshView(Context context, AttributeSet attrs) { public void setRefreshStyle(int type) { setRefreshing(false); - switch (type) { - case STYLE_SUN: - mBaseRefreshView = new SunRefreshView(getContext(), this); - break; - default: - throw new InvalidParameterException("Type does not exist"); + if (type != STYLE_SUN) { + throw new InvalidParameterException("Type does not exist"); + } else { + mBaseRefreshView = new SunRefreshView(getContext(), this); } + mRefreshView.setImageDrawable(mBaseRefreshView); } diff --git a/app/src/main/java/com/tellh/android_pulltorefreshlibrary_collection/PullToRefreshLayoutTellH/PullToRefreshLayout.java b/app/src/main/java/com/tellh/android_pulltorefreshlibrary_collection/PullToRefreshLayoutTellH/PullToRefreshLayout.java index 671f5d7..b9caf1a 100644 --- a/app/src/main/java/com/tellh/android_pulltorefreshlibrary_collection/PullToRefreshLayoutTellH/PullToRefreshLayout.java +++ b/app/src/main/java/com/tellh/android_pulltorefreshlibrary_collection/PullToRefreshLayoutTellH/PullToRefreshLayout.java @@ -100,11 +100,8 @@ public PullToRefreshLayout(Context context, AttributeSet attrs) { public void setRefreshStyle(int type) { setRefreshing(false); - switch (type) { - case STYLE_SUN: - break; - default: - throw new InvalidParameterException("Type does not exist"); + if (type != STYLE_SUN) { + throw new InvalidParameterException("Type does not exist"); } } diff --git a/circlerefreshlayout/src/main/java/com/tuesda/walker/circlerefresh/CircleRefreshLayout.java b/circlerefreshlayout/src/main/java/com/tuesda/walker/circlerefresh/CircleRefreshLayout.java index 862af6a..977191b 100644 --- a/circlerefreshlayout/src/main/java/com/tuesda/walker/circlerefresh/CircleRefreshLayout.java +++ b/circlerefreshlayout/src/main/java/com/tuesda/walker/circlerefresh/CircleRefreshLayout.java @@ -194,19 +194,16 @@ public boolean onInterceptTouchEvent(MotionEvent ev) { if (mIsRefreshing) { return true; } - switch (ev.getAction()) { - //记下按下的Y坐标 - case MotionEvent.ACTION_DOWN: - mTouchStartY = ev.getY(); - mTouchCurY = mTouchStartY; - break; - case MotionEvent.ACTION_MOVE: - float curY = ev.getY(); - float dy = curY - mTouchStartY; - //如果是向下滑动并且已经滑动顶部,拦截点击事件 - if (dy > 0 && !canChildScrollUp()) { - return true; - } + if (ev.getAction() == MotionEvent.ACTION_DOWN) { + mTouchStartY = ev.getY(); + mTouchCurY = mTouchStartY; + } else if (ev.getAction() == MotionEvent.ACTION_MOVE ) { + float curY = ev.getY(); + float dy = curY - mTouchStartY; + //如果是向下滑动并且已经滑动顶部,拦截点击事件 + if (dy > 0 && !canChildScrollUp()) { + return true; + } } return super.onInterceptTouchEvent(ev); } diff --git a/jellyrefresh/src/main/java/uk/co/imallan/jellyrefresh/PullToRefreshLayout.java b/jellyrefresh/src/main/java/uk/co/imallan/jellyrefresh/PullToRefreshLayout.java index e4e7f97..03a18cf 100644 --- a/jellyrefresh/src/main/java/uk/co/imallan/jellyrefresh/PullToRefreshLayout.java +++ b/jellyrefresh/src/main/java/uk/co/imallan/jellyrefresh/PullToRefreshLayout.java @@ -205,18 +205,15 @@ public boolean onInterceptTouchEvent(MotionEvent e) { if (isRefreshing) { return true; } - switch (e.getAction()) { - case MotionEvent.ACTION_DOWN: - mTouchStartY = e.getY(); - mCurrentY = mTouchStartY; - break; - case MotionEvent.ACTION_MOVE: - float currentY = e.getY(); - float dy = currentY - mTouchStartY; - if (dy > 0 && !canChildScrollUp()) { - return true; - } - break; + if (e.getAction() == MotionEvent.ACTION_DOWN) { + mTouchStartY = e.getY(); + mCurrentY = mTouchStartY; + } else if (e.getAction() == MotionEvent.ACTION_MOVE) { + float currentY = e.getY(); + float dy = currentY - mTouchStartY; + if (dy > 0 && !canChildScrollUp()) { + return true; + } } return super.onInterceptTouchEvent(e); }