Cleanup Imports

This commit is contained in:
YuviPanda 2013-03-21 15:47:32 +05:30
parent 3fbcb30753
commit c5ac1651aa
22 changed files with 133 additions and 248 deletions

View file

@ -26,7 +26,7 @@ import org.mediawiki.api.*;
import org.wikimedia.commons.auth.WikiAccountAuthenticator; import org.wikimedia.commons.auth.WikiAccountAuthenticator;
import org.apache.http.impl.client.*; import org.apache.http.impl.client.*;
import org.apache.http.params.CoreProtocolPNames; import org.apache.http.params.CoreProtocolPNames;
import org.wikimedia.commons.data.DBOpenHelper; import org.wikimedia.commons.data.*;
// TODO: Use ProGuard to rip out reporting when publishing // TODO: Use ProGuard to rip out reporting when publishing
@ReportsCrashes(formKey = "", @ReportsCrashes(formKey = "",

View file

@ -1,19 +1,12 @@
package org.wikimedia.commons; package org.wikimedia.commons;
import android.os.AsyncTask; import android.os.*;
import android.os.Build; import android.util.*;
import android.text.TextUtils;
import de.akquinet.android.androlog.Log;
import in.yuvi.http.fluent.Http; import in.yuvi.http.fluent.Http;
import org.apache.http.HttpResponse; import org.apache.http.HttpResponse;
import org.apache.http.client.utils.URLEncodedUtils; import org.json.*;
import org.json.JSONException;
import org.json.JSONObject;
import java.io.IOException; import java.io.IOException;
import java.net.HttpURLConnection; import java.net.*;
import java.net.MalformedURLException;
import java.net.URL;
public class EventLog { public class EventLog {
private static class LogTask extends AsyncTask<LogBuilder, Void, Boolean> { private static class LogTask extends AsyncTask<LogBuilder, Void, Boolean> {

View file

@ -1,16 +1,10 @@
package org.wikimedia.commons; package org.wikimedia.commons;
import android.net.Uri; import android.net.Uri;
import android.os.Parcel; import android.os.*;
import android.os.Parcelable;
import org.wikimedia.commons.contributions.Contribution;
import java.io.Serializable; import java.util.*;
import java.util.Date; import java.util.regex.*;
import java.util.HashMap;
import java.util.Map;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
public class Media implements Parcelable { public class Media implements Parcelable {

View file

@ -1,31 +1,22 @@
package org.wikimedia.commons; package org.wikimedia.commons;
import android.app.ProgressDialog; import java.util.*;
import android.content.ComponentName; import java.util.concurrent.*;
import android.content.Context;
import android.content.Intent; import android.app.*;
import android.content.ServiceConnection; import android.content.*;
import android.net.Uri; import android.net.*;
import android.os.AsyncTask; import android.os.*;
import android.os.Bundle;
import android.os.IBinder;
import android.support.v4.app.FragmentManager; import android.support.v4.app.FragmentManager;
import android.text.Editable; import android.text.*;
import android.text.TextUtils; import android.view.*;
import android.text.TextWatcher;
import android.view.View;
import android.view.inputmethod.InputMethodManager;
import android.widget.*; import android.widget.*;
import com.actionbarsherlock.view.Menu; import com.actionbarsherlock.view.Menu;
import com.actionbarsherlock.view.MenuItem; import com.actionbarsherlock.view.MenuItem;
import com.nostra13.universalimageloader.core.DisplayImageOptions;
import org.wikimedia.commons.auth.AuthenticatedActivity;
import org.wikimedia.commons.auth.WikiAccountAuthenticator;
import org.wikimedia.commons.contributions.Contribution;
import org.wikimedia.commons.media.MediaDetailPagerFragment;
import java.util.ArrayList; import org.wikimedia.commons.auth.*;
import java.util.concurrent.ExecutionException; import org.wikimedia.commons.contributions.*;
import org.wikimedia.commons.media.*;
public class MultipleShareActivity public class MultipleShareActivity
extends AuthenticatedActivity extends AuthenticatedActivity

View file

@ -1,29 +1,20 @@
package org.wikimedia.commons; package org.wikimedia.commons;
import android.content.Context; import android.content.*;
import android.graphics.Point; import android.graphics.*;
import android.graphics.Rect; import android.net.*;
import android.net.Uri; import android.os.*;
import android.os.Bundle; import android.text.*;
import android.text.Editable; import android.util.*;
import android.text.TextUtils; import android.view.*;
import android.text.TextWatcher;
import android.util.DisplayMetrics;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
import android.view.inputmethod.InputMethodManager; import android.view.inputmethod.InputMethodManager;
import android.widget.*; import android.widget.*;
import com.actionbarsherlock.app.SherlockFragment; import com.actionbarsherlock.app.SherlockFragment;
import com.nostra13.universalimageloader.core.DisplayImageOptions; import com.nostra13.universalimageloader.core.*;
import com.nostra13.universalimageloader.core.ImageLoader;
import com.nostra13.universalimageloader.core.assist.ImageScaleType; import org.wikimedia.commons.contributions.*;
import com.nostra13.universalimageloader.core.display.FadeInBitmapDisplayer; import org.wikimedia.commons.media.*;
import org.wikimedia.commons.contributions.Contribution;
import org.wikimedia.commons.media.MediaDetailPagerFragment;
import java.util.ArrayList;
import java.util.List;
public class MultipleUploadListFragment extends SherlockFragment { public class MultipleUploadListFragment extends SherlockFragment {

View file

@ -1,36 +1,19 @@
package org.wikimedia.commons; package org.wikimedia.commons;
import android.app.Activity; import android.app.*;
import android.content.ComponentName; import android.content.*;
import android.content.ServiceConnection; import android.os.*;
import android.database.Cursor; import android.text.*;
import android.os.AsyncTask;
import android.os.IBinder;
import android.provider.MediaStore;
import android.text.Editable;
import android.text.TextWatcher;
import android.util.Log;
import android.webkit.MimeTypeMap;
import com.nostra13.universalimageloader.core.ImageLoader; import com.nostra13.universalimageloader.core.ImageLoader;
import org.wikimedia.commons.*; import android.net.*;
import org.wikimedia.commons.auth.AuthenticatedActivity;
import org.wikimedia.commons.auth.WikiAccountAuthenticator;
import android.net.Uri;
import android.os.Bundle;
import android.content.Context;
import android.content.Intent;
import android.widget.ImageView;
import android.support.v4.app.NavUtils; import android.support.v4.app.NavUtils;
import com.actionbarsherlock.view.Menu; import com.actionbarsherlock.view.Menu;
import com.actionbarsherlock.view.MenuItem; import com.actionbarsherlock.view.MenuItem;
import com.actionbarsherlock.view.Window;
import android.widget.*; import android.widget.*;
import android.view.*; import android.view.*;
import org.wikimedia.commons.contributions.Contribution;
import java.io.IOException; import org.wikimedia.commons.contributions.*;
import java.util.Date; import org.wikimedia.commons.auth.*;
public class ShareActivity extends AuthenticatedActivity { public class ShareActivity extends AuthenticatedActivity {

View file

@ -1,21 +1,16 @@
package org.wikimedia.commons; package org.wikimedia.commons;
import android.app.Activity; import android.app.*;
import android.database.Cursor; import android.database.Cursor;
import android.net.Uri; import android.net.*;
import android.os.AsyncTask; import android.os.*;
import android.provider.MediaStore; import android.provider.*;
import android.util.Log;
import android.webkit.MimeTypeMap; import android.webkit.MimeTypeMap;
import android.widget.Toast;
import org.wikimedia.commons.CommonsApplication;
import org.wikimedia.commons.R;
import org.wikimedia.commons.UploadService;
import org.wikimedia.commons.Utils;
import org.wikimedia.commons.contributions.Contribution;
import java.io.IOException; import java.io.*;
import java.util.Date; import java.util.*;
import org.wikimedia.commons.contributions.*;
public class StartUploadTask extends AsyncTask<Void, Void, Contribution> { public class StartUploadTask extends AsyncTask<Void, Void, Contribution> {

View file

@ -3,24 +3,17 @@ package org.wikimedia.commons;
import java.io.*; import java.io.*;
import java.util.Date; import java.util.Date;
import android.graphics.BitmapFactory; import android.graphics.*;
import org.mediawiki.api.*; import org.mediawiki.api.*;
import org.wikimedia.commons.contributions.Contribution;
import org.wikimedia.commons.contributions.ContributionsActivity;
import org.wikimedia.commons.contributions.ContributionsContentProvider;
import in.yuvi.http.fluent.ProgressListener; import in.yuvi.http.fluent.ProgressListener;
import android.app.*; import android.app.*;
import android.content.*; import android.content.*;
import android.database.Cursor;
import android.os.*;
import android.provider.MediaStore;
import android.support.v4.app.NotificationCompat; import android.support.v4.app.NotificationCompat;
import android.util.Log; import android.util.*;
import android.widget.RemoteViews; import android.widget.*;
import android.widget.Toast;
import android.net.*; import org.wikimedia.commons.contributions.*;
public class UploadService extends HandlerService<Contribution> { public class UploadService extends HandlerService<Contribution> {

View file

@ -1,27 +1,19 @@
package org.wikimedia.commons; package org.wikimedia.commons;
import android.os.AsyncTask; import android.os.*;
import android.os.Build; import com.nostra13.universalimageloader.core.*;
import com.nostra13.universalimageloader.core.DisplayImageOptions;
import com.nostra13.universalimageloader.core.assist.ImageScaleType; import com.nostra13.universalimageloader.core.assist.ImageScaleType;
import com.nostra13.universalimageloader.core.display.FadeInBitmapDisplayer; import com.nostra13.universalimageloader.core.display.FadeInBitmapDisplayer;
import org.apache.commons.codec.EncoderException;
import org.apache.commons.codec.binary.Hex; import org.apache.commons.codec.binary.Hex;
import org.apache.commons.codec.digest.DigestUtils; import org.apache.commons.codec.digest.DigestUtils;
import org.apache.commons.codec.net.URLCodec; import org.apache.commons.codec.net.URLCodec;
import org.w3c.dom.Node; import org.w3c.dom.Node;
import javax.xml.transform.TransformerConfigurationException; import javax.xml.transform.*;
import javax.xml.transform.TransformerException;
import javax.xml.transform.TransformerFactory;
import javax.xml.transform.TransformerFactoryConfigurationError;
import java.io.*; import java.io.*;
import java.text.ParseException; import java.text.*;
import java.text.SimpleDateFormat; import java.util.*;
import java.util.Date;
import java.util.TimeZone;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
public class Utils { public class Utils {
public static Date parseMWDate(String mwDate) { public static Date parseMWDate(String mwDate) {

View file

@ -2,14 +2,13 @@ package org.wikimedia.commons.auth;
import java.io.IOException; import java.io.IOException;
import org.wikimedia.commons.CommonsApplication; import android.accounts.OperationCanceledException;
import com.actionbarsherlock.app.*; import com.actionbarsherlock.app.*;
import android.accounts.*; import android.accounts.*;
import android.os.AsyncTask; import android.os.*;
import android.os.Bundle;
import org.wikimedia.commons.Utils; import org.wikimedia.commons.*;
public class AuthenticatedActivity extends SherlockFragmentActivity { public class AuthenticatedActivity extends SherlockFragmentActivity {

View file

@ -2,34 +2,21 @@ package org.wikimedia.commons.auth;
import java.io.IOException; import java.io.IOException;
import android.content.ContentResolver; import android.content.*;
import android.text.Editable; import android.text.*;
import android.text.TextWatcher; import de.keyboardsurfer.android.widget.crouton.*;
import de.keyboardsurfer.android.widget.crouton.Crouton; import android.os.*;
import de.keyboardsurfer.android.widget.crouton.Style; import android.accounts.*;
import org.wikimedia.commons.CommonsApplication; import android.app.*;
import org.wikimedia.commons.EventLog; import android.util.*;
import org.wikimedia.commons.R;
import org.wikimedia.commons.R.id;
import org.wikimedia.commons.R.layout;
import org.wikimedia.commons.R.menu;
import org.wikimedia.commons.R.string;
import android.os.AsyncTask;
import android.os.Bundle;
import android.accounts.Account;
import android.accounts.AccountAuthenticatorActivity;
import android.accounts.AccountAuthenticatorResponse;
import android.accounts.AccountManager;
import android.app.Activity;
import android.app.ProgressDialog;
import android.util.Log;
import android.view.*; import android.view.*;
import android.widget.Button; import android.widget.*;
import android.widget.EditText;
import android.widget.Toast;
import android.support.v4.app.NavUtils; import android.support.v4.app.NavUtils;
import org.wikimedia.commons.contributions.ContributionsContentProvider;
import org.wikimedia.commons.*;
import org.wikimedia.commons.EventLog;
import org.wikimedia.commons.contributions.*;
public class LoginActivity extends AccountAuthenticatorActivity { public class LoginActivity extends AccountAuthenticatorActivity {
@ -96,7 +83,7 @@ public class LoginActivity extends AccountAuthenticatorActivity {
// Should never really happen // Should never really happen
response = R.string.login_failed_generic; response = R.string.login_failed_generic;
} }
Crouton.makeText(context, response, Style.ALERT, id.loginErrors).show(); Crouton.makeText(context, response, Style.ALERT, R.id.loginErrors).show();
dialog.dismiss(); dialog.dismiss();
} }

View file

@ -2,19 +2,12 @@ package org.wikimedia.commons.auth;
import java.io.IOException; import java.io.IOException;
import org.mediawiki.api.ApiResult; import android.accounts.*;
import org.mediawiki.api.MWApi; import android.content.*;
import org.wikimedia.commons.CommonsApplication; import android.os.*;
import android.accounts.AbstractAccountAuthenticator; import org.mediawiki.api.*;
import android.accounts.Account; import org.wikimedia.commons.*;
import android.accounts.AccountAuthenticatorResponse;
import android.accounts.AccountManager;
import android.accounts.NetworkErrorException;
import android.content.Context;
import android.content.Intent;
import android.os.Bundle;
import android.util.Log;
public class WikiAccountAuthenticator extends AbstractAccountAuthenticator { public class WikiAccountAuthenticator extends AbstractAccountAuthenticator {

View file

@ -1,8 +1,8 @@
package org.wikimedia.commons.auth; package org.wikimedia.commons.auth;
import android.app.Service; import android.app.*;
import android.content.Intent; import android.content.*;
import android.os.IBinder; import android.os.*;
public class WikiAccountAuthenticatorService extends Service{ public class WikiAccountAuthenticatorService extends Service{

View file

@ -1,19 +1,16 @@
package org.wikimedia.commons.contributions; package org.wikimedia.commons.contributions;
import java.text.SimpleDateFormat; import java.text.*;
import java.util.*; import java.util.*;
import android.content.ContentProviderClient; import android.content.*;
import android.content.ContentValues;
import android.database.Cursor; import android.database.Cursor;
import android.database.sqlite.SQLiteDatabase; import android.database.sqlite.SQLiteDatabase;
import android.net.*; import android.net.*;
import android.os.Parcel; import android.os.*;
import android.os.RemoteException; import android.text.*;
import android.text.TextUtils;
import org.wikimedia.commons.CommonsApplication; import org.wikimedia.commons.*;
import org.wikimedia.commons.EventLog;
import org.wikimedia.commons.Media;
public class Contribution extends Media { public class Contribution extends Media {

View file

@ -13,11 +13,10 @@ import android.view.View;
import android.widget.AdapterView; import android.widget.AdapterView;
import com.actionbarsherlock.view.Menu; import com.actionbarsherlock.view.Menu;
import com.actionbarsherlock.view.MenuItem; import com.actionbarsherlock.view.MenuItem;
import org.wikimedia.commons.*; import org.wikimedia.commons.*;
import org.wikimedia.commons.R; import org.wikimedia.commons.auth.*;
import org.wikimedia.commons.auth.AuthenticatedActivity; import org.wikimedia.commons.media.*;
import org.wikimedia.commons.auth.WikiAccountAuthenticator;
import org.wikimedia.commons.media.MediaDetailPagerFragment;
public class ContributionsActivity public class ContributionsActivity
extends AuthenticatedActivity extends AuthenticatedActivity

View file

@ -1,16 +1,14 @@
package org.wikimedia.commons.contributions; package org.wikimedia.commons.contributions;
import android.content.ContentProvider; import android.content.*;
import android.content.ContentValues; import android.database.*;
import android.content.UriMatcher; import android.database.sqlite.*;
import android.database.Cursor; import android.net.*;
import android.database.sqlite.SQLiteDatabase; import android.text.*;
import android.database.sqlite.SQLiteQueryBuilder; import android.util.*;
import android.net.Uri;
import android.text.TextUtils; import org.wikimedia.commons.*;
import android.util.Log; import org.wikimedia.commons.data.*;
import org.wikimedia.commons.CommonsApplication;
import org.wikimedia.commons.data.DBOpenHelper;
public class ContributionsContentProvider extends ContentProvider{ public class ContributionsContentProvider extends ContentProvider{

View file

@ -21,21 +21,14 @@ import com.actionbarsherlock.app.SherlockFragment;
import com.actionbarsherlock.view.Menu; import com.actionbarsherlock.view.Menu;
import com.actionbarsherlock.view.MenuInflater; import com.actionbarsherlock.view.MenuInflater;
import com.actionbarsherlock.view.MenuItem; import com.actionbarsherlock.view.MenuItem;
import com.nostra13.universalimageloader.core.DisplayImageOptions; import com.nostra13.universalimageloader.core.*;
import com.nostra13.universalimageloader.core.ImageLoader; import com.nostra13.universalimageloader.core.assist.*;
import com.nostra13.universalimageloader.core.assist.FailReason;
import com.nostra13.universalimageloader.core.assist.ImageLoadingListener;
import com.nostra13.universalimageloader.core.assist.ImageScaleType;
import com.nostra13.universalimageloader.core.assist.SimpleImageLoadingListener;
import com.nostra13.universalimageloader.core.display.FadeInBitmapDisplayer;
import org.wikimedia.commons.R;
import org.wikimedia.commons.ShareActivity;
import org.wikimedia.commons.UploadService;
import org.wikimedia.commons.Utils;
import java.io.File; import java.io.*;
import java.io.IOException; import java.util.*;
import java.util.Date;
import org.wikimedia.commons.*;
public class ContributionsListFragment extends SherlockFragment { public class ContributionsListFragment extends SherlockFragment {

View file

@ -7,15 +7,14 @@ import android.text.TextUtils;
import android.util.Log; import android.util.Log;
import android.accounts.Account; import android.accounts.Account;
import android.os.Bundle; import android.os.Bundle;
import org.apache.commons.codec.digest.DigestUtils;
import org.wikimedia.commons.CommonsApplication; import java.io.*;
import java.util.*;
import org.mediawiki.api.*; import org.mediawiki.api.*;
import org.wikimedia.commons.Utils; import org.wikimedia.commons.Utils;
import org.wikimedia.commons.*;
import java.io.IOException;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
public class ContributionsSyncAdapter extends AbstractThreadedSyncAdapter { public class ContributionsSyncAdapter extends AbstractThreadedSyncAdapter {
private static int COMMIT_THRESHOLD = 10; private static int COMMIT_THRESHOLD = 10;

View file

@ -1,8 +1,8 @@
package org.wikimedia.commons.contributions; package org.wikimedia.commons.contributions;
import android.app.Service; import android.app.*;
import android.content.Intent; import android.content.*;
import android.os.IBinder; import android.os.*;
public class ContributionsSyncService extends Service { public class ContributionsSyncService extends Service {

View file

@ -1,9 +1,9 @@
package org.wikimedia.commons.data; package org.wikimedia.commons.data;
import android.content.Context; import android.content.*;
import android.database.sqlite.SQLiteDatabase; import android.database.sqlite.*;
import android.database.sqlite.SQLiteOpenHelper;
import org.wikimedia.commons.contributions.Contribution; import org.wikimedia.commons.contributions.*;
public class DBOpenHelper extends SQLiteOpenHelper{ public class DBOpenHelper extends SQLiteOpenHelper{

View file

@ -1,27 +1,17 @@
package org.wikimedia.commons.media; package org.wikimedia.commons.media;
import android.graphics.Bitmap; import android.graphics.*;
import android.os.Bundle; import android.os.*;
import android.text.Editable; import android.text.*;
import android.text.TextUtils; import android.view.*;
import android.text.TextWatcher; import android.widget.*;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
import android.widget.EditText;
import android.widget.ImageView;
import android.widget.ProgressBar;
import android.widget.TextView;
import com.actionbarsherlock.app.SherlockFragment; import com.actionbarsherlock.app.SherlockFragment;
import com.nostra13.universalimageloader.core.DisplayImageOptions; import com.nostra13.universalimageloader.core.DisplayImageOptions;
import com.nostra13.universalimageloader.core.ImageLoader; import com.nostra13.universalimageloader.core.ImageLoader;
import com.nostra13.universalimageloader.core.assist.FailReason; import com.nostra13.universalimageloader.core.assist.FailReason;
import com.nostra13.universalimageloader.core.assist.ImageLoadingListener; import com.nostra13.universalimageloader.core.assist.ImageLoadingListener;
import com.nostra13.universalimageloader.core.assist.ImageScaleType;
import com.nostra13.universalimageloader.core.display.FadeInBitmapDisplayer; import org.wikimedia.commons.*;
import org.wikimedia.commons.Media;
import org.wikimedia.commons.R;
import org.wikimedia.commons.Utils;
public class MediaDetailFragment extends SherlockFragment { public class MediaDetailFragment extends SherlockFragment {

View file

@ -1,22 +1,20 @@
package org.wikimedia.commons.media; package org.wikimedia.commons.media;
import android.content.Intent; import android.content.*;
import android.net.Uri; import android.net.*;
import android.os.Bundle; import android.os.*;
import android.support.v4.app.Fragment; import android.support.v4.app.Fragment;
import android.support.v4.app.FragmentManager; import android.support.v4.app.FragmentManager;
import android.support.v4.app.FragmentStatePagerAdapter; import android.support.v4.app.FragmentStatePagerAdapter;
import android.support.v4.view.ViewPager; import android.support.v4.view.ViewPager;
import android.view.LayoutInflater; import android.view.*;
import android.view.View;
import android.view.ViewGroup;
import com.actionbarsherlock.app.SherlockFragment; import com.actionbarsherlock.app.SherlockFragment;
import com.actionbarsherlock.view.Menu; import com.actionbarsherlock.view.Menu;
import com.actionbarsherlock.view.MenuInflater; import com.actionbarsherlock.view.MenuInflater;
import com.actionbarsherlock.view.MenuItem; import com.actionbarsherlock.view.MenuItem;
import com.actionbarsherlock.widget.ShareActionProvider; import com.actionbarsherlock.widget.ShareActionProvider;
import org.wikimedia.commons.Media;
import org.wikimedia.commons.R; import org.wikimedia.commons.*;
public class MediaDetailPagerFragment extends SherlockFragment { public class MediaDetailPagerFragment extends SherlockFragment {
private ViewPager pager; private ViewPager pager;