Karl/BobStore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

checkstyle: Add StaticVariableName

Browse Source
This commit is contained in:
Daniel Martí 2015-10-09 11:02:19 +02:00
parent caa91186cc
commit 2249ad59da
4 changed files with 24 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
F-Droid/src/org/fdroid/fdroid/AppDetails.java
View File

@ -1059,14 +1059,14 @@ public class AppDetails extends AppCompatActivity implements ProgressListener, A
protected final Preferences prefs; protected final Preferences prefs;
private AppDetailsData data; private AppDetailsData data;
private static final int MAX_LINES = 5; private static final int MAX_LINES = 5;
private static boolean view_all_description; private static boolean viewAllDescription;
private static LinearLayout ll_view_more_description; private static LinearLayout llViewMoreDescription;
private static LinearLayout ll_view_more_permissions; private static LinearLayout llViewMorePermissions;
private final View.OnClickListener expanderPermissions = new View.OnClickListener() { private final View.OnClickListener expanderPermissions = new View.OnClickListener() {
@Override @Override
public void onClick(View v) { public void onClick(View v) {
final TextView permissionListView = (TextView) ll_view_more_permissions.findViewById(R.id.permissions_list); final TextView permissionListView = (TextView) llViewMorePermissions.findViewById(R.id.permissions_list);
final TextView permissionHeader = (TextView) ll_view_more_permissions.findViewById(R.id.permissions); final TextView permissionHeader = (TextView) llViewMorePermissions.findViewById(R.id.permissions);
if (permissionListView.getVisibility() == View.GONE) { if (permissionListView.getVisibility() == View.GONE) {
permissionListView.setVisibility(View.VISIBLE); permissionListView.setVisibility(View.VISIBLE);
@ -1187,9 +1187,9 @@ public class AppDetails extends AppCompatActivity implements ProgressListener, A
private final View.OnClickListener expanderDescription = new View.OnClickListener() { private final View.OnClickListener expanderDescription = new View.OnClickListener() {
public void onClick(View v) { public void onClick(View v) {
final TextView description = (TextView) ll_view_more_description.findViewById(R.id.description); final TextView description = (TextView) llViewMoreDescription.findViewById(R.id.description);
final TextView viewMorePermissions = (TextView) ll_view_more_description.findViewById(R.id.view_more_description); final TextView viewMorePermissions = (TextView) llViewMoreDescription.findViewById(R.id.view_more_description);
if (view_all_description) { if (viewAllDescription) {
description.setMaxLines(Integer.MAX_VALUE); description.setMaxLines(Integer.MAX_VALUE);
viewMorePermissions.setText(getString(R.string.less)); viewMorePermissions.setText(getString(R.string.less));
} else { } else {
@ -1197,7 +1197,7 @@ public class AppDetails extends AppCompatActivity implements ProgressListener, A
description.setEllipsize(TextUtils.TruncateAt.MARQUEE); description.setEllipsize(TextUtils.TruncateAt.MARQUEE);
viewMorePermissions.setText(R.string.more); viewMorePermissions.setText(R.string.more);
} }
view_all_description ^= true; viewAllDescription ^= true;
} }
}; };
@ -1216,10 +1216,10 @@ public class AppDetails extends AppCompatActivity implements ProgressListener, A
description.setMaxLines(MAX_LINES); description.setMaxLines(MAX_LINES);
description.setEllipsize(TextUtils.TruncateAt.MARQUEE); description.setEllipsize(TextUtils.TruncateAt.MARQUEE);
description.setOnClickListener(expanderDescription); description.setOnClickListener(expanderDescription);
view_all_description = true; viewAllDescription = true;
ll_view_more_description = (LinearLayout) view.findViewById(R.id.ll_description); llViewMoreDescription = (LinearLayout) view.findViewById(R.id.ll_description);
ll_view_more_description.setOnClickListener(expanderDescription); llViewMoreDescription.setOnClickListener(expanderDescription);
viewMoreDescription.setOnClickListener(expanderDescription); viewMoreDescription.setOnClickListener(expanderDescription);
} else { } else {
@ -1319,7 +1319,7 @@ public class AppDetails extends AppCompatActivity implements ProgressListener, A
} }
// Expandable permissions // Expandable permissions
ll_view_more_permissions = (LinearLayout) view.findViewById(R.id.ll_permissions); llViewMorePermissions = (LinearLayout) view.findViewById(R.id.ll_permissions);
final TextView permissionHeader = (TextView) view.findViewById(R.id.permissions); final TextView permissionHeader = (TextView) view.findViewById(R.id.permissions);
final boolean curApkCompatible = curApk != null && curApk.compatible; final boolean curApkCompatible = curApk != null && curApk.compatible;
@ -1356,7 +1356,7 @@ public class AppDetails extends AppCompatActivity implements ProgressListener, A
} }
private void buildPermissionInfo() { private void buildPermissionInfo() {
final TextView permissionListView = (TextView) ll_view_more_permissions.findViewById(R.id.permissions_list); final TextView permissionListView = (TextView) llViewMorePermissions.findViewById(R.id.permissions_list);
CommaSeparatedList permsList = getApks().getItem(0).permissions; CommaSeparatedList permsList = getApks().getItem(0).permissions;
if (permsList == null) { if (permsList == null) {

12
F-Droid/src/org/fdroid/fdroid/FDroidCertPins.java
View File

@ -57,15 +57,15 @@ public class FDroidCertPins {
"87e3bf322427c1405d2736c381e01d1a71d4a039", "87e3bf322427c1405d2736c381e01d1a71d4a039",
}; };
public static List<String> PINLIST; public static List<String> pinList;
public static String[] getPinList() { public static String[] getPinList() {
if (PINLIST == null) { if (pinList == null) {
List<String> pinlist = new ArrayList<>(); List<String> l = new ArrayList<>();
pinlist.addAll(Arrays.asList(DEFAULT_PINS)); l.addAll(Arrays.asList(DEFAULT_PINS));
PINLIST = pinlist; pinList = pinlist;
} }
return PINLIST.toArray(new String[PINLIST.size()]); return pinList.toArray(new String[pinList.size()]);
} }
} }

6
F-Droid/src/org/fdroid/fdroid/views/fragments/AvailableAppsFragment.java
View File

@ -38,7 +38,7 @@ public class AvailableAppsFragment extends AppListFragment implements
public static final String PREFERENCES_FILE = "CategorySpinnerPosition"; public static final String PREFERENCES_FILE = "CategorySpinnerPosition";
public static final String CATEGORY_KEY = "Selection"; public static final String CATEGORY_KEY = "Selection";
public static String DEFAULT_CATEGORY; public static String defaultCategory;
private List<String> categories; private List<String> categories;
private Spinner categorySpinner; private Spinner categorySpinner;
@ -185,7 +185,7 @@ public class AvailableAppsFragment extends AppListFragment implements
((ListView) view.findViewById(android.R.id.list)).setOnItemClickListener(this); ((ListView) view.findViewById(android.R.id.list)).setOnItemClickListener(this);
DEFAULT_CATEGORY = AppProvider.Helper.getCategoryWhatsNew(getActivity()); defaultCategory = AppProvider.Helper.getCategoryWhatsNew(getActivity());
return view; return view;
} }
@ -214,7 +214,7 @@ public class AvailableAppsFragment extends AppListFragment implements
Activity activity = getActivity(); Activity activity = getActivity();
SharedPreferences p = activity.getSharedPreferences(PREFERENCES_FILE, SharedPreferences p = activity.getSharedPreferences(PREFERENCES_FILE,
Context.MODE_PRIVATE); Context.MODE_PRIVATE);
currentCategory = p.getString(CATEGORY_KEY, DEFAULT_CATEGORY); currentCategory = p.getString(CATEGORY_KEY, defaultCategory);
for (int i = 0; i < categorySpinner.getCount(); i++) { for (int i = 0; i < categorySpinner.getCount(); i++) {
if (currentCategory.equals(categorySpinner.getItemAtPosition(i).toString())) { if (currentCategory.equals(categorySpinner.getItemAtPosition(i).toString())) {
categorySpinner.setSelection(i); categorySpinner.setSelection(i);

2
config/checkstyle/checkstyle.xml
View File

@ -23,7 +23,7 @@
<module name="MethodName" /> <module name="MethodName" />
<module name="PackageName" /> <module name="PackageName" />
<module name="ParameterName" /> <module name="ParameterName" />
<!--<module name="StaticVariableName" />--> <module name="StaticVariableName" />
<module name="TypeName" /> <module name="TypeName" />
<module name="AvoidStarImport" /> <module name="AvoidStarImport" />