remove checkstyle error
Project: http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/commit/8dbb7f91 Tree: http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/tree/8dbb7f91 Diff: http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/diff/8dbb7f91 Branch: refs/heads/master Commit: 8dbb7f9175a3e07efeae40ed3533c92985bc9fd0 Parents: 5f3c218 Author: Sagar <[email protected]> Authored: Sun Jul 24 20:11:25 2016 +0530 Committer: Sagar <[email protected]> Committed: Sun Jul 24 20:11:25 2016 +0530 ---------------------------------------------------------------------- .../taverna/mobile/data/local/DBHelper.java | 43 ++++++++-------- .../FavouriteWorkflowDetailFragment.java | 21 +------- .../mobile/ui/imagezoom/ImageZoomFragment.java | 52 +++++++------------- .../mobile/ui/imagezoom/ImageZoomMvpView.java | 2 +- .../mobile/ui/imagezoom/ImageZoomPresenter.java | 25 +++++----- .../workflowdetail/WorkflowDetailFragment.java | 23 ++------- 6 files changed, 58 insertions(+), 108 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/8dbb7f91/app/src/main/java/org/apache/taverna/mobile/data/local/DBHelper.java ---------------------------------------------------------------------- diff --git a/app/src/main/java/org/apache/taverna/mobile/data/local/DBHelper.java b/app/src/main/java/org/apache/taverna/mobile/data/local/DBHelper.java index 886c0ee..61d392f 100644 --- a/app/src/main/java/org/apache/taverna/mobile/data/local/DBHelper.java +++ b/app/src/main/java/org/apache/taverna/mobile/data/local/DBHelper.java @@ -19,6 +19,8 @@ package org.apache.taverna.mobile.data.local; +import android.support.annotation.Nullable; + import com.raizlabs.android.dbflow.sql.language.SQLite; import com.raizlabs.android.dbflow.sql.language.Select; @@ -26,8 +28,6 @@ import org.apache.taverna.mobile.data.model.Workflow; import org.apache.taverna.mobile.data.model.Workflow_Table; import org.apache.taverna.mobile.data.model.Workflows; -import android.support.annotation.Nullable; - import java.util.HashMap; import java.util.List; import java.util.Map; @@ -226,33 +226,32 @@ public class DBHelper { } public Observable<Map<String, String>> getImageURI(final String id) { - return Observable - .defer(new Func0<Observable<Map<String, String>>>() { - @Override - public Observable<Map<String, String>> call() { + return Observable.defer(new Func0<Observable<Map<String, String>>>() { + @Override + public Observable<Map<String, String>> call() { - Map<String, String> URI = new HashMap<String, String>(); + Map<String, String> URI = new HashMap<String, String>(); - Workflow workflow = - new Select(Workflow_Table.svgUri, Workflow_Table.previewUri) - .from(Workflow.class) - .where(Workflow_Table.id.eq(id)) - .querySingle(); + Workflow workflow = + new Select(Workflow_Table.svgUri, Workflow_Table + .previewUri) + .from(Workflow.class) + .where(Workflow_Table.id.eq(id)) + .querySingle(); - if (workflow != null) { + if (workflow != null) { - URI.put(SVG_URI, workflow.getSvgUri()); - URI.put(JPG_URI, workflow.getPreviewUri()); + URI.put(SVG_URI, workflow.getSvgUri()); + URI.put(JPG_URI, workflow.getPreviewUri()); - return Observable.just(URI); - } else { + return Observable.just(URI); + } else { - return Observable.just(URI); - } + return Observable.just(URI); + } - } - } - ); + } + }); } } http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/8dbb7f91/app/src/main/java/org/apache/taverna/mobile/ui/favouriteworkflowdetail/FavouriteWorkflowDetailFragment.java ---------------------------------------------------------------------- diff --git a/app/src/main/java/org/apache/taverna/mobile/ui/favouriteworkflowdetail/FavouriteWorkflowDetailFragment.java b/app/src/main/java/org/apache/taverna/mobile/ui/favouriteworkflowdetail/FavouriteWorkflowDetailFragment.java index b43def3..6c85593 100644 --- a/app/src/main/java/org/apache/taverna/mobile/ui/favouriteworkflowdetail/FavouriteWorkflowDetailFragment.java +++ b/app/src/main/java/org/apache/taverna/mobile/ui/favouriteworkflowdetail/FavouriteWorkflowDetailFragment.java @@ -60,51 +60,34 @@ import butterknife.OnClick; public class FavouriteWorkflowDetailFragment extends Fragment implements FavouriteWorkflowDetailMvpView { + private static final String ID = "id"; public final String LOG_TAG = getClass().getSimpleName(); - @BindView(R.id.ivWorkflowImage) ImageView workflowImage; - @BindView(R.id.tvTitle) TextView title; - @BindView(R.id.ivUploader) ImageView uploaderImage; - @BindView(R.id.tvUploaderName) TextView uploaderName; - @BindView(R.id.tvDate) TextView date; - @BindView(R.id.tvType) TextView type; - @BindView(R.id.tvDescription) WebView description; - @BindView(R.id.ivFav) ImageView ivFavourite; - @BindView(R.id.progressBar) ProgressBar mProgressBar; - @BindView(R.id.scrollView) ScrollView mScrollView; - @BindView(R.id.rootLayout) RelativeLayout rootLayout; - private AlertDialog alertDialog; - private DataManager dataManager; - private FavouriteWorkflowDetailPresenter mWorkflowDetailPresenter; - private ConnectionInfo mConnectionInfo; - - private static final String ID = "id"; - private String id; private String licenceId = null; @@ -172,7 +155,7 @@ public class FavouriteWorkflowDetailFragment extends Fragment } @OnClick(R.id.ivWorkflowImage) - void zoomImage(View v){ + void zoomImage(View v) { Intent intent = new Intent(getActivity(), ImageZoomActivity.class); intent.putExtra(ImageZoomFragment.ID, id); startActivity(intent); http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/8dbb7f91/app/src/main/java/org/apache/taverna/mobile/ui/imagezoom/ImageZoomFragment.java ---------------------------------------------------------------------- diff --git a/app/src/main/java/org/apache/taverna/mobile/ui/imagezoom/ImageZoomFragment.java b/app/src/main/java/org/apache/taverna/mobile/ui/imagezoom/ImageZoomFragment.java index 7599e35..0e06ec8 100644 --- a/app/src/main/java/org/apache/taverna/mobile/ui/imagezoom/ImageZoomFragment.java +++ b/app/src/main/java/org/apache/taverna/mobile/ui/imagezoom/ImageZoomFragment.java @@ -34,44 +34,31 @@ import uk.co.senab.photoview.PhotoViewAttacher; public class ImageZoomFragment extends Fragment implements ImageZoomMvpView { + public static final String ID = "id"; + // The 3 states (events) which the user is trying to perform + static final int NONE = 0; + static final int DRAG = 1; + static final int ZOOM = 2; + private static final String SERVER_ERROR = "Sever Error. Please try after sometime"; + private static final String TAG = "ImageZoomFragment"; @BindView(R.id.ivWorkflowImage) ImageView workflowImage; - @BindView(R.id.ivClose) ImageView close; - - public static final String ID = "id"; - - private static final String SERVER_ERROR = "Sever Error. Please try after sometime"; - - private static final String TAG = "ImageZoomFragment"; - - private String id; - - private String jpgURI; - - private DataManager dataManager; - - private ImageZoomPresenter mImageZoomPresenter; - - private ConnectionInfo mConnectionInfo; - PhotoViewAttacher mAttacher; - // These matrices will be used to scale points of the image Matrix matrix = new Matrix(); Matrix savedMatrix = new Matrix(); - - // The 3 states (events) which the user is trying to perform - static final int NONE = 0; - static final int DRAG = 1; - static final int ZOOM = 2; int mode = NONE; - // these PointF objects are used to record the point(s) the user is touching PointF start = new PointF(); PointF mid = new PointF(); float oldDist = 1f; + private String id; + private String jpgURI; + private DataManager dataManager; + private ImageZoomPresenter mImageZoomPresenter; + private ConnectionInfo mConnectionInfo; public static ImageZoomFragment newInstance(String id) { @@ -121,8 +108,6 @@ public class ImageZoomFragment extends Fragment implements ImageZoomMvpView { } - - } @OnClick(R.id.ivClose) @@ -132,7 +117,6 @@ public class ImageZoomFragment extends Fragment implements ImageZoomMvpView { } - @Override public void showErrorSnackBar(String error) { @@ -190,7 +174,9 @@ public class ImageZoomFragment extends Fragment implements ImageZoomMvpView { } @Override - public void onResourceReady(GlideDrawable resource, GlideAnimation<? super GlideDrawable> glideAnimation) { + public void onResourceReady(GlideDrawable resource, + GlideAnimation<? super GlideDrawable> + glideAnimation) { workflowImage.setImageDrawable(resource.getCurrent()); addImageAttacher(); @@ -207,13 +193,13 @@ public class ImageZoomFragment extends Fragment implements ImageZoomMvpView { } @Override - public void setRequest(Request request) { - + public Request getRequest() { + return null; } @Override - public Request getRequest() { - return null; + public void setRequest(Request request) { + } @Override http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/8dbb7f91/app/src/main/java/org/apache/taverna/mobile/ui/imagezoom/ImageZoomMvpView.java ---------------------------------------------------------------------- diff --git a/app/src/main/java/org/apache/taverna/mobile/ui/imagezoom/ImageZoomMvpView.java b/app/src/main/java/org/apache/taverna/mobile/ui/imagezoom/ImageZoomMvpView.java index 2397691..1727b16 100644 --- a/app/src/main/java/org/apache/taverna/mobile/ui/imagezoom/ImageZoomMvpView.java +++ b/app/src/main/java/org/apache/taverna/mobile/ui/imagezoom/ImageZoomMvpView.java @@ -5,7 +5,7 @@ import org.apache.taverna.mobile.ui.base.MvpView; import android.content.Context; -public interface ImageZoomMvpView extends MvpView{ +public interface ImageZoomMvpView extends MvpView { void showErrorSnackBar(String error); http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/8dbb7f91/app/src/main/java/org/apache/taverna/mobile/ui/imagezoom/ImageZoomPresenter.java ---------------------------------------------------------------------- diff --git a/app/src/main/java/org/apache/taverna/mobile/ui/imagezoom/ImageZoomPresenter.java b/app/src/main/java/org/apache/taverna/mobile/ui/imagezoom/ImageZoomPresenter.java index 7b5f21b..0b354fb 100644 --- a/app/src/main/java/org/apache/taverna/mobile/ui/imagezoom/ImageZoomPresenter.java +++ b/app/src/main/java/org/apache/taverna/mobile/ui/imagezoom/ImageZoomPresenter.java @@ -35,14 +35,10 @@ import rx.schedulers.Schedulers; public class ImageZoomPresenter extends BasePresenter<ImageZoomMvpView> { + public static final String NO_IMAGE_URI = "NO Image Found"; + public static final String DB_ERROR = "There is some problem. Please try after sometime "; private DataManager mDataManager; - private Subscription mSubscriptions; - - public static final String NO_IMAGE_URI = "NO Image Found"; - - public static final String DB_ERROR= "There is some problem. Please try after sometime "; - private GenericRequestBuilder<Uri, InputStream, SVG, PictureDrawable> requestBuilder; public ImageZoomPresenter(DataManager dataManager) { @@ -57,7 +53,8 @@ public class ImageZoomPresenter extends BasePresenter<ImageZoomMvpView> { super.attachView(mvpView); requestBuilder = Glide.with(getMvpView().getAppContext()) - .using(Glide.buildStreamModelLoader(Uri.class, getMvpView().getAppContext()), InputStream.class) + .using(Glide.buildStreamModelLoader(Uri.class, + getMvpView().getAppContext()), InputStream.class) .from(Uri.class) .as(SVG.class) .transcode(new SvgDrawableTranscoder(), PictureDrawable.class) @@ -66,7 +63,7 @@ public class ImageZoomPresenter extends BasePresenter<ImageZoomMvpView> { .decoder(new SvgDecoder()) .placeholder(R.drawable.placeholder) .error(R.drawable.placeholder) - .override(Target.SIZE_ORIGINAL,Target.SIZE_ORIGINAL) + .override(Target.SIZE_ORIGINAL, Target.SIZE_ORIGINAL) .animate(android.R.anim.fade_in); } @@ -133,7 +130,9 @@ public class ImageZoomPresenter extends BasePresenter<ImageZoomMvpView> { } @Override - public void onResourceReady(PictureDrawable resource, GlideAnimation<? super PictureDrawable> glideAnimation) { + public void onResourceReady(PictureDrawable resource, + GlideAnimation<? super PictureDrawable> + glideAnimation) { if (Build.VERSION_CODES.HONEYCOMB <= Build.VERSION.SDK_INT) { imageView.setLayerType(ImageView.LAYER_TYPE_SOFTWARE, null); } @@ -152,13 +151,13 @@ public class ImageZoomPresenter extends BasePresenter<ImageZoomMvpView> { } @Override - public void setRequest(Request request) { - + public Request getRequest() { + return null; } @Override - public Request getRequest() { - return null; + public void setRequest(Request request) { + } @Override http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/8dbb7f91/app/src/main/java/org/apache/taverna/mobile/ui/workflowdetail/WorkflowDetailFragment.java ---------------------------------------------------------------------- diff --git a/app/src/main/java/org/apache/taverna/mobile/ui/workflowdetail/WorkflowDetailFragment.java b/app/src/main/java/org/apache/taverna/mobile/ui/workflowdetail/WorkflowDetailFragment.java index eea1687..ed878f5 100644 --- a/app/src/main/java/org/apache/taverna/mobile/ui/workflowdetail/WorkflowDetailFragment.java +++ b/app/src/main/java/org/apache/taverna/mobile/ui/workflowdetail/WorkflowDetailFragment.java @@ -24,9 +24,9 @@ import com.bumptech.glide.load.engine.DiskCacheStrategy; import org.apache.taverna.mobile.R; import org.apache.taverna.mobile.data.DataManager; -import org.apache.taverna.mobile.data.model.Workflow; import org.apache.taverna.mobile.data.model.License; import org.apache.taverna.mobile.data.model.User; +import org.apache.taverna.mobile.data.model.Workflow; import org.apache.taverna.mobile.ui.imagezoom.ImageZoomActivity; import org.apache.taverna.mobile.ui.imagezoom.ImageZoomFragment; import org.apache.taverna.mobile.utils.ConnectionInfo; @@ -58,51 +58,34 @@ import butterknife.OnClick; public class WorkflowDetailFragment extends Fragment implements WorkflowDetailMvpView { + private static final String ID = "id"; public final String LOG_TAG = getClass().getSimpleName(); - @BindView(R.id.ivWorkflowImage) ImageView workflowImage; - @BindView(R.id.tvTitle) TextView title; - @BindView(R.id.ivUploader) ImageView uploaderImage; - @BindView(R.id.tvUploaderName) TextView uploaderName; - @BindView(R.id.tvDate) TextView date; - @BindView(R.id.tvType) TextView type; - @BindView(R.id.tvDescription) WebView description; - @BindView(R.id.ivFav) ImageView ivFavourite; - @BindView(R.id.progressBar) ProgressBar mProgressBar; - @BindView(R.id.scrollView) ScrollView mScrollView; - @BindView(R.id.rootLayout) RelativeLayout rootLayout; - private AlertDialog alertDialog; - private DataManager dataManager; - private WorkflowDetailPresenter mWorkflowDetailPresenter; - private ConnectionInfo mConnectionInfo; - - private static final String ID = "id"; - private String id; private String licenceId = null; @@ -168,7 +151,7 @@ public class WorkflowDetailFragment extends Fragment implements WorkflowDetailMv @OnClick(R.id.ivWorkflowImage) - void zoomImage(View v){ + void zoomImage(View v) { Intent intent = new Intent(getActivity(), ImageZoomActivity.class); intent.putExtra(ImageZoomFragment.ID, id); startActivity(intent);
