From d6a8ef9e596518b0913cb902b4f7bde34c70883d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Mart=C3=AD?= <mvdan@mvdan.cc>
Date: Thu, 16 Apr 2015 18:32:31 +0200
Subject: [PATCH] Compact very simple getters in a single line
---
F-Droid/src/org/fdroid/fdroid/AppDetails.java | 48 +++++--------------
.../org/fdroid/fdroid/ProgressListener.java | 8 +---
.../src/org/fdroid/fdroid/RepoXMLHandler.java | 12 ++---
.../fdroid/fdroid/compat/ClipboardCompat.java | 4 +-
F-Droid/src/org/fdroid/fdroid/data/App.java | 4 +-
.../org/fdroid/fdroid/data/AppProvider.java | 12 ++---
.../org/fdroid/fdroid/data/NewRepoConfig.java | 48 +++++--------------
.../fdroid/fdroid/data/QuerySelection.java | 8 +---
F-Droid/src/org/fdroid/fdroid/data/Repo.java | 8 +---
.../org/fdroid/fdroid/net/ApkDownloader.java | 12 ++---
.../fdroid/fdroid/updater/RepoUpdater.java | 16 ++-----
11 files changed, 45 insertions(+), 135 deletions(-)
diff --git a/F-Droid/src/org/fdroid/fdroid/AppDetails.java b/F-Droid/src/org/fdroid/fdroid/AppDetails.java
index 89972cc25..f8eac660a 100644
--- a/F-Droid/src/org/fdroid/fdroid/AppDetails.java
+++ b/F-Droid/src/org/fdroid/fdroid/AppDetails.java
@@ -1091,24 +1091,16 @@ public class AppDetails extends ActionBarActivity implements ProgressListener, A
}
@Override
- public App getApp() {
- return app;
- }
+ public App getApp() { return app; }
@Override
- public ApkListAdapter getApks() {
- return adapter;
- }
+ public ApkListAdapter getApks() { return adapter; }
@Override
- public Signature getInstalledSignature() {
- return mInstalledSignature;
- }
+ public Signature getInstalledSignature() { return mInstalledSignature; }
@Override
- public String getInstalledSignatureId() {
- return mInstalledSigID;
- }
+ public String getInstalledSignatureId() { return mInstalledSigID; }
public static class AppDetailsSummaryFragment extends Fragment {
@@ -1125,21 +1117,13 @@ public class AppDetails extends ActionBarActivity implements ProgressListener, A
data = (AppDetailsData)activity;
}
- protected App getApp() {
- return data.getApp();
- }
+ protected App getApp() { return data.getApp(); }
- protected ApkListAdapter getApks() {
- return data.getApks();
- }
+ protected ApkListAdapter getApks() { return data.getApks(); }
- protected Signature getInstalledSignature() {
- return data.getInstalledSignature();
- }
+ protected Signature getInstalledSignature() { return data.getInstalledSignature(); }
- protected String getInstalledSignatureId() {
- return data.getInstalledSignatureId();
- }
+ protected String getInstalledSignatureId() { return data.getInstalledSignatureId(); }
@Override
public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
@@ -1294,13 +1278,9 @@ public class AppDetails extends ActionBarActivity implements ProgressListener, A
.build();
}
- private App getApp() {
- return data.getApp();
- }
+ private App getApp() { return data.getApp(); }
- private ApkListAdapter getApks() {
- return data.getApks();
- }
+ private ApkListAdapter getApks() { return data.getApks(); }
@Override
public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
@@ -1385,13 +1365,9 @@ public class AppDetails extends ActionBarActivity implements ProgressListener, A
installListener.removeApk(getApp().id);
}
- protected App getApp() {
- return data.getApp();
- }
+ protected App getApp() { return data.getApp(); }
- protected ApkListAdapter getApks() {
- return data.getApks();
- }
+ protected ApkListAdapter getApks() { return data.getApks(); }
@Override
public void onViewCreated(View view, Bundle savedInstanceState) {
diff --git a/F-Droid/src/org/fdroid/fdroid/ProgressListener.java b/F-Droid/src/org/fdroid/fdroid/ProgressListener.java
index bf011631f..0b7e4f119 100644
--- a/F-Droid/src/org/fdroid/fdroid/ProgressListener.java
+++ b/F-Droid/src/org/fdroid/fdroid/ProgressListener.java
@@ -41,9 +41,7 @@ public interface ProgressListener {
}
@Override
- public int describeContents() {
- return 0;
- }
+ public int describeContents() { return 0; }
@Override
public void writeToParcel(Parcel dest, int flags) {
@@ -72,9 +70,7 @@ public interface ProgressListener {
* so we pass that through to the downloader when we set the progress listener. This way,
* we can ask the event for the name of the repo.
*/
- public Bundle getData() {
- return data;
- }
+ public Bundle getData() { return data; }
}
}
diff --git a/F-Droid/src/org/fdroid/fdroid/RepoXMLHandler.java b/F-Droid/src/org/fdroid/fdroid/RepoXMLHandler.java
index 8a591d8a2..01d294a89 100644
--- a/F-Droid/src/org/fdroid/fdroid/RepoXMLHandler.java
+++ b/F-Droid/src/org/fdroid/fdroid/RepoXMLHandler.java
@@ -72,13 +72,9 @@ public class RepoXMLHandler extends DefaultHandler {
progressListener = listener;
}
- public List<App> getApps() {
- return apps;
- }
+ public List<App> getApps() { return apps; }
- public List<Apk> getApks() {
- return apksList;
- }
+ public List<Apk> getApks() { return apksList; }
public int getMaxAge() { return maxage; }
@@ -88,9 +84,7 @@ public class RepoXMLHandler extends DefaultHandler {
public String getName() { return name; }
- public String getPubKey() {
- return pubkey;
- }
+ public String getPubKey() { return pubkey; }
@Override
public void characters(char[] ch, int start, int length) {
diff --git a/F-Droid/src/org/fdroid/fdroid/compat/ClipboardCompat.java b/F-Droid/src/org/fdroid/fdroid/compat/ClipboardCompat.java
index 11a8a7786..f3a7f22dd 100644
--- a/F-Droid/src/org/fdroid/fdroid/compat/ClipboardCompat.java
+++ b/F-Droid/src/org/fdroid/fdroid/compat/ClipboardCompat.java
@@ -45,7 +45,5 @@ class HoneycombClipboard extends ClipboardCompat {
class OldClipboard extends ClipboardCompat {
@Override
- public String getText() {
- return null;
- }
+ public String getText() { return null; }
}
diff --git a/F-Droid/src/org/fdroid/fdroid/data/App.java b/F-Droid/src/org/fdroid/fdroid/data/App.java
index 953b816cf..7168d21b5 100644
--- a/F-Droid/src/org/fdroid/fdroid/data/App.java
+++ b/F-Droid/src/org/fdroid/fdroid/data/App.java
@@ -430,7 +430,5 @@ public class App extends ValueObject implements Comparable<App> {
return new AppFilter().filter(this);
}
- public String getSuggestedVersion() {
- return suggestedVersion;
- }
+ public String getSuggestedVersion() { return suggestedVersion; }
}
diff --git a/F-Droid/src/org/fdroid/fdroid/data/AppProvider.java b/F-Droid/src/org/fdroid/fdroid/data/AppProvider.java
index dcac9b53c..f8920efe6 100644
--- a/F-Droid/src/org/fdroid/fdroid/data/AppProvider.java
+++ b/F-Droid/src/org/fdroid/fdroid/data/AppProvider.java
@@ -509,23 +509,17 @@ public class AppProvider extends FDroidProvider {
}
@Override
- protected String getTableName() {
- return DBHelper.TABLE_APP;
- }
+ protected String getTableName() { return DBHelper.TABLE_APP; }
@Override
- protected String getProviderName() {
- return "AppProvider";
- }
+ protected String getProviderName() { return "AppProvider"; }
public static String getAuthority() {
return AUTHORITY + "." + PROVIDER_NAME;
}
@Override
- protected UriMatcher getMatcher() {
- return matcher;
- }
+ protected UriMatcher getMatcher() { return matcher; }
private AppQuerySelection queryCanUpdate() {
String ignoreCurrent = " fdroid_app.ignoreThisUpdate != fdroid_app.suggestedVercode ";
diff --git a/F-Droid/src/org/fdroid/fdroid/data/NewRepoConfig.java b/F-Droid/src/org/fdroid/fdroid/data/NewRepoConfig.java
index e55d8c94f..c3c484d8e 100644
--- a/F-Droid/src/org/fdroid/fdroid/data/NewRepoConfig.java
+++ b/F-Droid/src/org/fdroid/fdroid/data/NewRepoConfig.java
@@ -101,21 +101,13 @@ public class NewRepoConfig {
}
- public String getBssid() {
- return bssid;
- }
+ public String getBssid() { return bssid; }
- public String getSsid() {
- return ssid;
- }
+ public String getSsid() { return ssid; }
- public int getPort() {
- return port;
- }
+ public int getPort() { return port; }
- public String getRepoUriString() {
- return uriString;
- }
+ public String getRepoUriString() { return uriString; }
/**
* This is the URI which was passed to the NewRepoConfig for parsing.
@@ -123,9 +115,7 @@ public class NewRepoConfig {
* ssid, bssid, and perhaps other query parameters. If you want the actual repo
* URL, then you will probably want {@link org.fdroid.fdroid.data.NewRepoConfig#getRepoUri()}.
*/
- public Uri getParsedUri() {
- return uri;
- }
+ public Uri getParsedUri() { return uri; }
public Uri getRepoUri() {
if (uriString == null) {
@@ -135,29 +125,17 @@ public class NewRepoConfig {
}
}
- public String getHost() {
- return host;
- }
+ public String getHost() { return host; }
- public String getScheme() {
- return scheme;
- }
+ public String getScheme() { return scheme; }
- public String getFingerprint() {
- return fingerprint;
- }
+ public String getFingerprint() { return fingerprint; }
- public boolean isValidRepo() {
- return isValidRepo;
- }
+ public boolean isValidRepo() { return isValidRepo; }
- public boolean isFromSwap() {
- return fromSwap;
- }
+ public boolean isFromSwap() { return fromSwap; }
- public boolean preventFurtherSwaps() {
- return preventFurtherSwaps;
- }
+ public boolean preventFurtherSwaps() { return preventFurtherSwaps; }
/*
* The port starts out as 8888, but if there is a conflict, it will be
@@ -167,9 +145,7 @@ public class NewRepoConfig {
return (port >= 8888 && host.matches("[0-9]+\\.[0-9]+\\.[0-9]+\\.[0-9]+"));
}
- public String getErrorMessage() {
- return errorMessage;
- }
+ public String getErrorMessage() { return errorMessage; }
/** Sanitize and format an incoming repo URI for function and readability */
public static String sanitizeRepoUri(Uri uri) {
diff --git a/F-Droid/src/org/fdroid/fdroid/data/QuerySelection.java b/F-Droid/src/org/fdroid/fdroid/data/QuerySelection.java
index 26a30f1cb..734c299a5 100644
--- a/F-Droid/src/org/fdroid/fdroid/data/QuerySelection.java
+++ b/F-Droid/src/org/fdroid/fdroid/data/QuerySelection.java
@@ -31,13 +31,9 @@ public class QuerySelection {
this.selection = selection;
}
- public String[] getArgs() {
- return args;
- }
+ public String[] getArgs() { return args; }
- public String getSelection() {
- return selection;
- }
+ public String getSelection() { return selection; }
public boolean hasSelection() {
return selection != null && selection.length() > 0;
diff --git a/F-Droid/src/org/fdroid/fdroid/data/Repo.java b/F-Droid/src/org/fdroid/fdroid/data/Repo.java
index 12d6ec4d1..2845c647e 100644
--- a/F-Droid/src/org/fdroid/fdroid/data/Repo.java
+++ b/F-Droid/src/org/fdroid/fdroid/data/Repo.java
@@ -85,14 +85,10 @@ public class Repo extends ValueObject {
public long getId() { return id; }
- public String getName() {
- return name;
- }
+ public String getName() { return name; }
@Override
- public String toString() {
- return address;
- }
+ public String toString() { return address; }
public boolean isSigned() {
return !TextUtils.isEmpty(this.pubkey);
diff --git a/F-Droid/src/org/fdroid/fdroid/net/ApkDownloader.java b/F-Droid/src/org/fdroid/fdroid/net/ApkDownloader.java
index dd927092c..03543c876 100644
--- a/F-Droid/src/org/fdroid/fdroid/net/ApkDownloader.java
+++ b/F-Droid/src/org/fdroid/fdroid/net/ApkDownloader.java
@@ -272,15 +272,9 @@ public class ApkDownloader implements AsyncDownloadWrapper.Listener {
}
}
- public Apk getApk() {
- return curApk;
- }
+ public Apk getApk() { return curApk; }
- public int getProgress() {
- return progress;
- }
+ public int getProgress() { return progress; }
- public int getTotalSize() {
- return totalSize;
- }
+ public int getTotalSize() { return totalSize; }
}
diff --git a/F-Droid/src/org/fdroid/fdroid/updater/RepoUpdater.java b/F-Droid/src/org/fdroid/fdroid/updater/RepoUpdater.java
index 676bb67b6..0cb9293da 100644
--- a/F-Droid/src/org/fdroid/fdroid/updater/RepoUpdater.java
+++ b/F-Droid/src/org/fdroid/fdroid/updater/RepoUpdater.java
@@ -64,17 +64,11 @@ abstract public class RepoUpdater {
this.progressListener = progressListener;
}
- public boolean hasChanged() {
- return hasChanged;
- }
+ public boolean hasChanged() { return hasChanged; }
- public List<App> getApps() {
- return apps;
- }
+ public List<App> getApps() { return apps; }
- public List<Apk> getApks() {
- return apks;
- }
+ public List<Apk> getApks() { return apks; }
/**
* For example, you may want to unzip a jar file to get the index inside,
@@ -238,9 +232,7 @@ abstract public class RepoUpdater {
return values;
}
- public RepoUpdateRememberer getRememberer() {
- return rememberer;
- }
+ public RepoUpdateRememberer getRememberer() { return rememberer; }
public static class RepoUpdateRememberer {