Skip to content
This repository has been archived by the owner on Apr 9, 2021. It is now read-only.

Commit

Permalink
Merge pull request #355 from SaumiaSinghal/Issue#354
Browse files Browse the repository at this point in the history
Closes #354: Added CheckStyle rule to check for multiple blank lines between field declarations
  • Loading branch information
lakshyagupta21 authored Feb 4, 2020
2 parents c955438 + f7e6b3d commit 8763f6b
Show file tree
Hide file tree
Showing 30 changed files with 1 addition and 37 deletions.
1 change: 1 addition & 0 deletions config/checkstyle.xml
Original file line number Diff line number Diff line change
Expand Up @@ -96,6 +96,7 @@
<module name="ModifierOrder" />
<module name="EmptyLineSeparator">
<property name="allowNoEmptyLineBetweenFields" value="true" />
<property name="allowMultipleEmptyLines" value="false"/>
</module>
<module name="SeparatorWrap">
<property name="id" value="SeparatorWrapDot" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@
import java.util.ArrayList;
import java.util.List;


public class FormsDao {

private Context context;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@
import static org.odk.share.dto.InstanceMap.INSTANCE_UUID;
import static org.odk.share.provider.InstanceMapProvider.CONTENT_URI;


/**
* Created by laksh on 8/2/2018.
*/
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
package org.odk.share.injection.config;


import android.app.Application;
import android.content.Context;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
package org.odk.share.injection.config.scopes;


import java.lang.annotation.Documented;
import java.lang.annotation.Retention;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
package org.odk.share.rx;


import com.jakewharton.rxrelay2.PublishRelay;
import com.jakewharton.rxrelay2.Relay;

Expand Down Expand Up @@ -35,7 +34,6 @@ public <T> Observable<T> register(@NonNull Class<T> eventClass) {
.map(obj -> (T) obj);
}


/**
* Sends an event to all the observers who have registered to receive the event type.
*
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@

import io.reactivex.Scheduler;


/**
* Allow providing different types of {@link Scheduler}s.
*/
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,6 @@

import io.reactivex.disposables.CompositeDisposable;


public class HotspotService extends Service {

public static final String ACTION_START = "hotspot_start";
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
package org.odk.share.utilities;


public class ArrayUtils {

/**
Expand All @@ -13,7 +12,6 @@ public class ArrayUtils {
*/
private static final long[] EMPTY_LONG_ARRAY = new long[0];


private ArrayUtils() {

}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
package org.odk.share.utilities;


import android.app.Activity;
import android.content.Context;
import android.content.DialogInterface;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
package org.odk.share.views.ui.about;


import androidx.annotation.DrawableRes;
import androidx.annotation.StringRes;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@
import static android.bluetooth.BluetoothDevice.BOND_BONDED;
import static android.bluetooth.BluetoothDevice.BOND_NONE;


/**
* BluetoothListAdapter: {@link RecyclerView.Adapter} for {@link BluetoothDevice}.
*
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
package org.odk.share.views.ui.bluetooth;


import android.Manifest;
import android.app.AlertDialog;
import android.app.ProgressDialog;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
package org.odk.share.views.ui.bluetooth;


import android.Manifest;
import android.app.AlertDialog;
import android.app.ProgressDialog;
Expand Down Expand Up @@ -55,7 +54,6 @@
import static org.odk.share.views.ui.instance.fragment.ReviewedInstancesFragment.MODE;
import static org.odk.share.views.ui.send.fragment.BlankFormsFragment.FORM_IDS;


/**
* Bluetooth sender activity.
*
Expand Down Expand Up @@ -99,7 +97,6 @@ public class BtSenderActivity extends InjectableActivity {
private long[] formIds;
private int mode;


@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,6 @@

import static org.odk.share.utilities.ApplicationConstants.SortingOrder.BY_NAME_ASC;


public abstract class AppListActivity extends InjectableActivity {

private static final String SELECTED_INSTANCES = "selectedInstances";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@

import org.odk.share.views.listeners.ItemClickListener;


public class BaseCursorViewHolder extends RecyclerView.ViewHolder implements View.OnClickListener {

private ItemClickListener listener;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@

import org.odk.share.views.listeners.ItemClickListener;


public abstract class CursorRecyclerViewAdapter<T extends BaseCursorViewHolder> extends RecyclerView.Adapter<T> {

protected Context context;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,6 @@ public void onLoadFinished(@NonNull Loader<Cursor> loader, Cursor cursor) {
}
}


@Override
public void onLoaderReset(@NonNull Loader loader) {
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -104,8 +104,6 @@ public int getItemCount() {
return !cursor.isClosed() ? cursor.getCount() : 0;
}



public Cursor getCursor() {
return cursor;
}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
package org.odk.share.views.ui.main;


import org.odk.collect.android.provider.FormsProviderAPI;
import org.odk.share.views.ui.common.applist.AppListActivity;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,6 @@ public class MainActivity extends FormListActivity implements LoaderManager.Load

private FormsAdapter formAdapter;


@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@


package org.odk.share.views.ui.send.fragment;

import android.content.Intent;
Expand Down Expand Up @@ -74,7 +72,6 @@ public class BlankFormsFragment extends FormListFragment implements LoaderManage
private FormsAdapter formAdapter;
private LinkedHashSet<Long> selectedForms;


public BlankFormsFragment() {
}

Expand Down Expand Up @@ -123,7 +120,6 @@ public void onLoadFinished(@NonNull Loader<Cursor> loader, Cursor cursor) {
}
}


@Override
public void onLoaderReset(@NonNull Loader loader) {
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,6 @@ public void onLoadFinished(@NonNull Loader<Cursor> loader, Cursor cursor) {
}
}


@Override
public void onLoaderReset(@NonNull Loader loader) {
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@

import org.odk.share.R;


/**
* Created by laksh on 5/27/2018.
*/
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
package org.odk.share.activities;


import android.content.Intent;
import android.view.View;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
package org.odk.share.activities;


import android.bluetooth.BluetoothAdapter;
import android.bluetooth.BluetoothDevice;
import android.content.BroadcastReceiver;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
package org.odk.share.activities;


import androidx.appcompat.widget.Toolbar;

import org.junit.Before;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
package org.odk.share.activities;


import androidx.appcompat.widget.Toolbar;

import org.junit.Before;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
package org.odk.share.activities;


import android.content.Intent;
import android.content.SharedPreferences;
import android.preference.PreferenceManager;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
package org.odk.share.utilities;


import org.junit.Test;

import static org.junit.Assert.assertArrayEquals;
Expand Down

0 comments on commit 8763f6b

Please sign in to comment.