From fe42731ee6bcdb9a5905d82ba3648c68b5a6e0ae Mon Sep 17 00:00:00 2001 From: veyndan Date: Wed, 1 Mar 2017 15:34:14 +0000 Subject: [PATCH] Replace fully qualified names with imports --- .../fr/free/nrw/commons/AboutActivity.java | 4 ++-- .../java/fr/free/nrw/commons/LicenseList.java | 18 +++++++++--------- .../fr/free/nrw/commons/SettingsActivity.java | 16 ++++++++-------- .../main/java/fr/free/nrw/commons/Utils.java | 9 ++++++--- .../auth/WikiAccountAuthenticatorService.java | 3 ++- .../category/CategorizationFragment.java | 3 ++- .../commons/contributions/Contribution.java | 4 ++-- .../contributions/ContributionController.java | 4 ++-- .../ContributionsListAdapter.java | 3 ++- .../nrw/commons/media/MediaDetailFragment.java | 8 ++++---- .../media/MediaDetailPagerFragment.java | 2 +- .../nrw/commons/upload/ExistingFileAsync.java | 2 +- .../upload/MultipleUploadListFragment.java | 3 ++- 13 files changed, 43 insertions(+), 36 deletions(-) diff --git a/app/src/main/java/fr/free/nrw/commons/AboutActivity.java b/app/src/main/java/fr/free/nrw/commons/AboutActivity.java index 931267513..4fb9bc70b 100644 --- a/app/src/main/java/fr/free/nrw/commons/AboutActivity.java +++ b/app/src/main/java/fr/free/nrw/commons/AboutActivity.java @@ -24,8 +24,8 @@ public class AboutActivity extends Activity { privacyPolicyText = (TextView) findViewById(R.id.about_privacy_policy); uploadsToText = (TextView) findViewById(R.id.about_uploads_to); - uploadsToText.setText(fr.free.nrw.commons.CommonsApplication.EVENTLOG_WIKI); - versionText.setText(fr.free.nrw.commons.CommonsApplication.APPLICATION_VERSION); + uploadsToText.setText(CommonsApplication.EVENTLOG_WIKI); + versionText.setText(CommonsApplication.APPLICATION_VERSION); // We can't use formatted strings directly because it breaks with // our localization tools. Grab an HTML string and turn it into diff --git a/app/src/main/java/fr/free/nrw/commons/LicenseList.java b/app/src/main/java/fr/free/nrw/commons/LicenseList.java index a30728fb7..9c791109e 100644 --- a/app/src/main/java/fr/free/nrw/commons/LicenseList.java +++ b/app/src/main/java/fr/free/nrw/commons/LicenseList.java @@ -11,7 +11,7 @@ import java.util.Map; import java.util.Set; public class LicenseList { - Map licenses = new HashMap<>(); + Map licenses = new HashMap<>(); Resources res; private static String XMLNS_LICENSE = "https://www.mediawiki.org/wiki/Extension:UploadWizard/xmlns/licenses"; @@ -19,12 +19,12 @@ public class LicenseList { public LicenseList(Activity activity) { res = activity.getResources(); XmlPullParser parser = res.getXml(R.xml.wikimedia_licenses); - while (fr.free.nrw.commons.Utils.xmlFastForward(parser, XMLNS_LICENSE, "license")) { + while (Utils.xmlFastForward(parser, XMLNS_LICENSE, "license")) { String id = parser.getAttributeValue(null, "id"); String template = parser.getAttributeValue(null, "template"); String url = parser.getAttributeValue(null, "url"); String name = nameForTemplate(template); - fr.free.nrw.commons.License license = new fr.free.nrw.commons.License(id, template, url, name); + License license = new License(id, template, url, name); licenses.put(id, license); } } @@ -33,18 +33,18 @@ public class LicenseList { return licenses.keySet(); } - public Collection values() { + public Collection values() { return licenses.values(); } - public fr.free.nrw.commons.License get(String key) { + public License get(String key) { return licenses.get(key); } - public fr.free.nrw.commons.License licenseForTemplate(String template) { - String ucTemplate = fr.free.nrw.commons.Utils.capitalize(template); - for (fr.free.nrw.commons.License license : values()) { - if (ucTemplate.equals(fr.free.nrw.commons.Utils.capitalize(license.getTemplate()))) { + public License licenseForTemplate(String template) { + String ucTemplate = Utils.capitalize(template); + for (License license : values()) { + if (ucTemplate.equals(Utils.capitalize(license.getTemplate()))) { return license; } } diff --git a/app/src/main/java/fr/free/nrw/commons/SettingsActivity.java b/app/src/main/java/fr/free/nrw/commons/SettingsActivity.java index 970271567..38f655500 100644 --- a/app/src/main/java/fr/free/nrw/commons/SettingsActivity.java +++ b/app/src/main/java/fr/free/nrw/commons/SettingsActivity.java @@ -13,7 +13,7 @@ import android.view.View; import android.view.ViewGroup; public class SettingsActivity extends PreferenceActivity implements SharedPreferences.OnSharedPreferenceChangeListener { - fr.free.nrw.commons.CommonsApplication app; + CommonsApplication app; private AppCompatDelegate mDelegate; @@ -23,7 +23,7 @@ public class SettingsActivity extends PreferenceActivity implements SharedPrefer getDelegate().onCreate(savedInstanceState); super.onCreate(savedInstanceState); addPreferencesFromResource(R.xml.preferences); - ListPreference licensePreference = (ListPreference) findPreference(fr.free.nrw.commons.Prefs.DEFAULT_LICENSE); + ListPreference licensePreference = (ListPreference) findPreference(Prefs.DEFAULT_LICENSE); // WARNING: ORDERING NEEDS TO MATCH FOR THE LICENSE NAMES AND DISPLAY VALUES licensePreference.setEntries(new String[]{ getString(R.string.license_name_cc0), @@ -31,21 +31,21 @@ public class SettingsActivity extends PreferenceActivity implements SharedPrefer getString(R.string.license_name_cc_by_sa) }); licensePreference.setEntryValues(new String[]{ - fr.free.nrw.commons.Prefs.Licenses.CC0, - fr.free.nrw.commons.Prefs.Licenses.CC_BY, - fr.free.nrw.commons.Prefs.Licenses.CC_BY_SA + Prefs.Licenses.CC0, + Prefs.Licenses.CC_BY, + Prefs.Licenses.CC_BY_SA }); - licensePreference.setSummary(getString(fr.free.nrw.commons.Utils.licenseNameFor(licensePreference.getValue()))); + licensePreference.setSummary(getString(Utils.licenseNameFor(licensePreference.getValue()))); licensePreference.setOnPreferenceChangeListener(new Preference.OnPreferenceChangeListener() { @Override public boolean onPreferenceChange(Preference preference, Object newValue) { - preference.setSummary(getString(fr.free.nrw.commons.Utils.licenseNameFor((String)newValue))); + preference.setSummary(getString(Utils.licenseNameFor((String)newValue))); return true; } }); - app = (fr.free.nrw.commons.CommonsApplication)getApplicationContext(); + app = (CommonsApplication)getApplicationContext(); } @Override diff --git a/app/src/main/java/fr/free/nrw/commons/Utils.java b/app/src/main/java/fr/free/nrw/commons/Utils.java index a00221e10..1463d20c7 100644 --- a/app/src/main/java/fr/free/nrw/commons/Utils.java +++ b/app/src/main/java/fr/free/nrw/commons/Utils.java @@ -31,10 +31,13 @@ import java.util.TimeZone; import java.util.concurrent.Executor; import java.util.regex.Pattern; +import javax.xml.transform.Transformer; import javax.xml.transform.TransformerConfigurationException; import javax.xml.transform.TransformerException; import javax.xml.transform.TransformerFactory; import javax.xml.transform.TransformerFactoryConfigurationError; +import javax.xml.transform.dom.DOMSource; +import javax.xml.transform.stream.StreamResult; public class Utils { @@ -99,7 +102,7 @@ public class Utils { } public static String getStringFromDOM(Node dom) { - javax.xml.transform.Transformer transformer = null; + Transformer transformer = null; try { transformer = TransformerFactory.newInstance().newTransformer(); } catch (TransformerConfigurationException e) { @@ -111,8 +114,8 @@ public class Utils { } StringWriter outputStream = new StringWriter(); - javax.xml.transform.dom.DOMSource domSource = new javax.xml.transform.dom.DOMSource(dom); - javax.xml.transform.stream.StreamResult strResult = new javax.xml.transform.stream.StreamResult(outputStream); + DOMSource domSource = new DOMSource(dom); + StreamResult strResult = new StreamResult(outputStream); try { transformer.transform(domSource, strResult); diff --git a/app/src/main/java/fr/free/nrw/commons/auth/WikiAccountAuthenticatorService.java b/app/src/main/java/fr/free/nrw/commons/auth/WikiAccountAuthenticatorService.java index 8aa97191c..c5201f95a 100644 --- a/app/src/main/java/fr/free/nrw/commons/auth/WikiAccountAuthenticatorService.java +++ b/app/src/main/java/fr/free/nrw/commons/auth/WikiAccountAuthenticatorService.java @@ -1,5 +1,6 @@ package fr.free.nrw.commons.auth; +import android.accounts.AccountManager; import android.app.Service; import android.content.Intent; import android.os.IBinder; @@ -10,7 +11,7 @@ public class WikiAccountAuthenticatorService extends Service{ @Override public IBinder onBind(Intent intent) { - if (!intent.getAction().equals(android.accounts.AccountManager.ACTION_AUTHENTICATOR_INTENT)) { + if (!intent.getAction().equals(AccountManager.ACTION_AUTHENTICATOR_INTENT)) { return null; } diff --git a/app/src/main/java/fr/free/nrw/commons/category/CategorizationFragment.java b/app/src/main/java/fr/free/nrw/commons/category/CategorizationFragment.java index 5ff6c6af5..1d784b1c8 100644 --- a/app/src/main/java/fr/free/nrw/commons/category/CategorizationFragment.java +++ b/app/src/main/java/fr/free/nrw/commons/category/CategorizationFragment.java @@ -20,6 +20,7 @@ import android.util.Log; import android.view.KeyEvent; import android.view.LayoutInflater; import android.view.Menu; +import android.view.MenuInflater; import android.view.MenuItem; import android.view.View; import android.view.ViewGroup; @@ -466,7 +467,7 @@ public class CategorizationFragment extends Fragment { } @Override - public void onCreateOptionsMenu(Menu menu, android.view.MenuInflater inflater) { + public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) { menu.clear(); inflater.inflate(R.menu.fragment_categorization, menu); } diff --git a/app/src/main/java/fr/free/nrw/commons/contributions/Contribution.java b/app/src/main/java/fr/free/nrw/commons/contributions/Contribution.java index 62fedf592..83b3068a0 100644 --- a/app/src/main/java/fr/free/nrw/commons/contributions/Contribution.java +++ b/app/src/main/java/fr/free/nrw/commons/contributions/Contribution.java @@ -165,7 +165,7 @@ public class Contribution extends Media { public void save() { try { if(contentUri == null) { - contentUri = client.insert(fr.free.nrw.commons.contributions.ContributionsContentProvider.BASE_URI, this.toContentValues()); + contentUri = client.insert(ContributionsContentProvider.BASE_URI, this.toContentValues()); } else { client.update(contentUri, toContentValues(), null, null); } @@ -234,7 +234,7 @@ public class Contribution extends Media { //Check that cursor has a value to avoid CursorIndexOutOfBoundsException if (cursor.getCount() > 0) { - c.contentUri = fr.free.nrw.commons.contributions.ContributionsContentProvider.uriForId(cursor.getInt(0)); + c.contentUri = ContributionsContentProvider.uriForId(cursor.getInt(0)); c.filename = cursor.getString(1); c.localUri = TextUtils.isEmpty(cursor.getString(2)) ? null : Uri.parse(cursor.getString(2)); c.imageUrl = cursor.getString(3); diff --git a/app/src/main/java/fr/free/nrw/commons/contributions/ContributionController.java b/app/src/main/java/fr/free/nrw/commons/contributions/ContributionController.java index 2a248dc10..dc45c64d1 100644 --- a/app/src/main/java/fr/free/nrw/commons/contributions/ContributionController.java +++ b/app/src/main/java/fr/free/nrw/commons/contributions/ContributionController.java @@ -76,12 +76,12 @@ public class ContributionController { Uri imageData = data.getData(); shareIntent.setType(activity.getContentResolver().getType(imageData)); shareIntent.putExtra(Intent.EXTRA_STREAM, imageData); - shareIntent.putExtra(UploadService.EXTRA_SOURCE, fr.free.nrw.commons.contributions.Contribution.SOURCE_GALLERY); + shareIntent.putExtra(UploadService.EXTRA_SOURCE, Contribution.SOURCE_GALLERY); break; case SELECT_FROM_CAMERA: shareIntent.setType("image/jpeg"); //FIXME: Find out appropriate mime type shareIntent.putExtra(Intent.EXTRA_STREAM, lastGeneratedCaptureURI); - shareIntent.putExtra(UploadService.EXTRA_SOURCE, fr.free.nrw.commons.contributions.Contribution.SOURCE_CAMERA); + shareIntent.putExtra(UploadService.EXTRA_SOURCE, Contribution.SOURCE_CAMERA); break; } Log.i("Image", "Image selected"); diff --git a/app/src/main/java/fr/free/nrw/commons/contributions/ContributionsListAdapter.java b/app/src/main/java/fr/free/nrw/commons/contributions/ContributionsListAdapter.java index bb4e5ffc5..53aba32b9 100644 --- a/app/src/main/java/fr/free/nrw/commons/contributions/ContributionsListAdapter.java +++ b/app/src/main/java/fr/free/nrw/commons/contributions/ContributionsListAdapter.java @@ -11,6 +11,7 @@ import android.view.View; import android.view.ViewGroup; import com.nostra13.universalimageloader.core.DisplayImageOptions; +import com.nostra13.universalimageloader.core.ImageLoader; import com.nostra13.universalimageloader.core.assist.FailReason; import com.nostra13.universalimageloader.core.assist.SimpleImageLoadingListener; @@ -51,7 +52,7 @@ class ContributionsListAdapter extends CursorAdapter { mwImageView.setMedia(contribution, ((CommonsApplication) activity.getApplicationContext()).getImageLoader()); // FIXME: For transparent images } else { - com.nostra13.universalimageloader.core.ImageLoader.getInstance().displayImage(actualUrl, views.imageView, contributionDisplayOptions, new SimpleImageLoadingListener() { + ImageLoader.getInstance().displayImage(actualUrl, views.imageView, contributionDisplayOptions, new SimpleImageLoadingListener() { @Override public void onLoadingComplete(String imageUri, View view, Bitmap loadedImage) { diff --git a/app/src/main/java/fr/free/nrw/commons/media/MediaDetailFragment.java b/app/src/main/java/fr/free/nrw/commons/media/MediaDetailFragment.java index f15ccf01f..b20e93b96 100644 --- a/app/src/main/java/fr/free/nrw/commons/media/MediaDetailFragment.java +++ b/app/src/main/java/fr/free/nrw/commons/media/MediaDetailFragment.java @@ -39,7 +39,7 @@ public class MediaDetailFragment extends Fragment { private boolean editable; private DisplayImageOptions displayOptions; - private fr.free.nrw.commons.media.MediaDetailPagerFragment.MediaDetailProvider detailProvider; + private MediaDetailPagerFragment.MediaDetailProvider detailProvider; private int index; public static MediaDetailFragment forMedia(int index) { @@ -64,7 +64,7 @@ public class MediaDetailFragment extends Fragment { //private EditText title; private ProgressBar loadingProgress; private ImageView loadingFailed; - private fr.free.nrw.commons.media.MediaDetailSpacer spacer; + private MediaDetailSpacer spacer; private int initialListTop = 0; private TextView title; @@ -97,7 +97,7 @@ public class MediaDetailFragment extends Fragment { @Override public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) { - detailProvider = (fr.free.nrw.commons.media.MediaDetailPagerFragment.MediaDetailProvider)getActivity(); + detailProvider = (MediaDetailPagerFragment.MediaDetailProvider)getActivity(); if(savedInstanceState != null) { editable = savedInstanceState.getBoolean("editable"); @@ -119,7 +119,7 @@ public class MediaDetailFragment extends Fragment { scrollView = (ScrollView) view.findViewById(R.id.mediaDetailScrollView); // Detail consists of a list view with main pane in header view, plus category list. - spacer = (fr.free.nrw.commons.media.MediaDetailSpacer) view.findViewById(R.id.mediaDetailSpacer); + spacer = (MediaDetailSpacer) view.findViewById(R.id.mediaDetailSpacer); title = (TextView) view.findViewById(R.id.mediaDetailTitle); desc = (TextView) view.findViewById(R.id.mediaDetailDesc); license = (TextView) view.findViewById(R.id.mediaDetailLicense); diff --git a/app/src/main/java/fr/free/nrw/commons/media/MediaDetailPagerFragment.java b/app/src/main/java/fr/free/nrw/commons/media/MediaDetailPagerFragment.java index 16aacd4c2..be755a6de 100644 --- a/app/src/main/java/fr/free/nrw/commons/media/MediaDetailPagerFragment.java +++ b/app/src/main/java/fr/free/nrw/commons/media/MediaDetailPagerFragment.java @@ -71,7 +71,7 @@ public class MediaDetailPagerFragment extends Fragment implements ViewPager.OnPa } }, 5); } - return fr.free.nrw.commons.media.MediaDetailFragment.forMedia(i, editable); + return MediaDetailFragment.forMedia(i, editable); } @Override diff --git a/app/src/main/java/fr/free/nrw/commons/upload/ExistingFileAsync.java b/app/src/main/java/fr/free/nrw/commons/upload/ExistingFileAsync.java index f22c59ab6..34a30285d 100644 --- a/app/src/main/java/fr/free/nrw/commons/upload/ExistingFileAsync.java +++ b/app/src/main/java/fr/free/nrw/commons/upload/ExistingFileAsync.java @@ -24,7 +24,7 @@ import fr.free.nrw.commons.contributions.ContributionsActivity; */ public class ExistingFileAsync extends AsyncTask { - private static final String TAG = fr.free.nrw.commons.upload.ExistingFileAsync.class.getName(); + private static final String TAG = ExistingFileAsync.class.getName(); private String fileSHA1; private Context context; diff --git a/app/src/main/java/fr/free/nrw/commons/upload/MultipleUploadListFragment.java b/app/src/main/java/fr/free/nrw/commons/upload/MultipleUploadListFragment.java index f9627adc5..01526d202 100644 --- a/app/src/main/java/fr/free/nrw/commons/upload/MultipleUploadListFragment.java +++ b/app/src/main/java/fr/free/nrw/commons/upload/MultipleUploadListFragment.java @@ -11,6 +11,7 @@ import android.text.TextWatcher; import android.util.DisplayMetrics; import android.view.LayoutInflater; import android.view.Menu; +import android.view.MenuInflater; import android.view.MenuItem; import android.view.View; import android.view.ViewGroup; @@ -200,7 +201,7 @@ public class MultipleUploadListFragment extends Fragment { } @Override - public void onCreateOptionsMenu(Menu menu, android.view.MenuInflater inflater) { + public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) { super.onCreateOptionsMenu(menu, inflater); menu.clear(); inflater.inflate(R.menu.fragment_multiple_upload_list, menu);