From e3752daeeb73f9d54701c101a1f860f7d09c88d2 Mon Sep 17 00:00:00 2001 From: Alejandro Alcalde Date: Thu, 7 Aug 2014 20:02:21 +0200 Subject: [PATCH] Organize imports --- .../es/ugr/swad/swadroid/LoginActivity.java | 5 +++-- .../swad/swadroid/gui/AlertNotification.java | 1 + .../swad/swadroid/gui/ImageListAdapter.java | 7 ++++--- .../ugr/swad/swadroid/gui/MenuActivity.java | 1 + .../gui/MenuExpandableListActivity.java | 1 + .../swadroid/modules/RecoverPassword.java | 2 -- .../modules/messages/FilterUsersList.java | 2 +- .../swadroid/modules/messages/Messages.java | 11 ++++++----- .../swadroid/modules/messages/UsersList.java | 9 +++++---- .../notifications/NotificationItem.java | 9 +++++---- .../modules/notifications/Notifications.java | 3 ++- .../NotificationsExpandableListAdapter.java | 19 ++++++++++--------- .../swad/swadroid/modules/tests/Tests.java | 7 ++++--- .../modules/tests/TestsConfigDownload.java | 1 + .../swadroid/modules/tests/TestsMake.java | 1 + 15 files changed, 45 insertions(+), 34 deletions(-) diff --git a/SWADroid/src/es/ugr/swad/swadroid/LoginActivity.java b/SWADroid/src/es/ugr/swad/swadroid/LoginActivity.java index 0417d42e..89d68cea 100644 --- a/SWADroid/src/es/ugr/swad/swadroid/LoginActivity.java +++ b/SWADroid/src/es/ugr/swad/swadroid/LoginActivity.java @@ -15,8 +15,6 @@ package es.ugr.swad.swadroid; -import java.security.NoSuchAlgorithmException; - import android.animation.Animator; import android.animation.AnimatorListenerAdapter; import android.annotation.TargetApi; @@ -38,12 +36,15 @@ import android.view.inputmethod.EditorInfo; import android.widget.EditText; import android.widget.TextView; import android.widget.Toast; + import es.ugr.swad.swadroid.gui.DialogFactory; import es.ugr.swad.swadroid.modules.Login; import es.ugr.swad.swadroid.modules.RecoverPassword; import es.ugr.swad.swadroid.utils.Crypto; import es.ugr.swad.swadroid.utils.Utils; +import java.security.NoSuchAlgorithmException; + /** * diff --git a/SWADroid/src/es/ugr/swad/swadroid/gui/AlertNotification.java b/SWADroid/src/es/ugr/swad/swadroid/gui/AlertNotification.java index 3f38b4c0..0329a9c7 100644 --- a/SWADroid/src/es/ugr/swad/swadroid/gui/AlertNotification.java +++ b/SWADroid/src/es/ugr/swad/swadroid/gui/AlertNotification.java @@ -26,6 +26,7 @@ import android.content.Context; import android.content.Intent; import android.graphics.BitmapFactory; import android.support.v4.app.NotificationCompat; + import es.ugr.swad.swadroid.Preferences; import es.ugr.swad.swadroid.R; diff --git a/SWADroid/src/es/ugr/swad/swadroid/gui/ImageListAdapter.java b/SWADroid/src/es/ugr/swad/swadroid/gui/ImageListAdapter.java index db2fe526..9111b472 100644 --- a/SWADroid/src/es/ugr/swad/swadroid/gui/ImageListAdapter.java +++ b/SWADroid/src/es/ugr/swad/swadroid/gui/ImageListAdapter.java @@ -1,8 +1,5 @@ package es.ugr.swad.swadroid.gui; -import java.util.List; - -import es.ugr.swad.swadroid.R; import android.app.Activity; import android.content.Context; import android.view.LayoutInflater; @@ -11,6 +8,10 @@ import android.view.ViewGroup; import android.widget.ArrayAdapter; import android.widget.ImageView; import android.widget.TextView; + +import es.ugr.swad.swadroid.R; + +import java.util.List; public class ImageListAdapter extends ArrayAdapter { diff --git a/SWADroid/src/es/ugr/swad/swadroid/gui/MenuActivity.java b/SWADroid/src/es/ugr/swad/swadroid/gui/MenuActivity.java index 4fe773ff..342cb79a 100644 --- a/SWADroid/src/es/ugr/swad/swadroid/gui/MenuActivity.java +++ b/SWADroid/src/es/ugr/swad/swadroid/gui/MenuActivity.java @@ -30,6 +30,7 @@ import android.view.Menu; import android.view.MenuInflater; import android.view.MenuItem; import android.widget.Toast; + import es.ugr.swad.swadroid.Constants; import es.ugr.swad.swadroid.Preferences; import es.ugr.swad.swadroid.PreferencesActivity; diff --git a/SWADroid/src/es/ugr/swad/swadroid/gui/MenuExpandableListActivity.java b/SWADroid/src/es/ugr/swad/swadroid/gui/MenuExpandableListActivity.java index e352fcf7..6b14419c 100644 --- a/SWADroid/src/es/ugr/swad/swadroid/gui/MenuExpandableListActivity.java +++ b/SWADroid/src/es/ugr/swad/swadroid/gui/MenuExpandableListActivity.java @@ -30,6 +30,7 @@ import android.view.Menu; import android.view.MenuInflater; import android.view.MenuItem; import android.widget.Toast; + import es.ugr.swad.swadroid.Constants; import es.ugr.swad.swadroid.Preferences; import es.ugr.swad.swadroid.PreferencesActivity; diff --git a/SWADroid/src/es/ugr/swad/swadroid/modules/RecoverPassword.java b/SWADroid/src/es/ugr/swad/swadroid/modules/RecoverPassword.java index 126761bf..bd7c872f 100644 --- a/SWADroid/src/es/ugr/swad/swadroid/modules/RecoverPassword.java +++ b/SWADroid/src/es/ugr/swad/swadroid/modules/RecoverPassword.java @@ -20,8 +20,6 @@ package es.ugr.swad.swadroid.modules; import android.os.Bundle; -import android.util.Log; -import android.widget.Toast; import es.ugr.swad.swadroid.Constants; import es.ugr.swad.swadroid.R; diff --git a/SWADroid/src/es/ugr/swad/swadroid/modules/messages/FilterUsersList.java b/SWADroid/src/es/ugr/swad/swadroid/modules/messages/FilterUsersList.java index 6186688d..0d43aeb0 100644 --- a/SWADroid/src/es/ugr/swad/swadroid/modules/messages/FilterUsersList.java +++ b/SWADroid/src/es/ugr/swad/swadroid/modules/messages/FilterUsersList.java @@ -9,7 +9,7 @@ package es.ugr.swad.swadroid.modules.messages; import android.os.Bundle; import android.view.View; import android.widget.Button; -import android.widget.RadioButton; + import es.ugr.swad.swadroid.Constants; import es.ugr.swad.swadroid.R; import es.ugr.swad.swadroid.gui.MenuActivity; diff --git a/SWADroid/src/es/ugr/swad/swadroid/modules/messages/Messages.java b/SWADroid/src/es/ugr/swad/swadroid/modules/messages/Messages.java index 96036450..25a4517b 100644 --- a/SWADroid/src/es/ugr/swad/swadroid/modules/messages/Messages.java +++ b/SWADroid/src/es/ugr/swad/swadroid/modules/messages/Messages.java @@ -18,11 +18,6 @@ */ package es.ugr.swad.swadroid.modules.messages; -import java.util.ArrayList; -import java.util.Vector; - -import org.ksoap2.serialization.SoapObject; - import android.content.Intent; import android.os.Bundle; import android.util.Log; @@ -31,12 +26,18 @@ import android.view.MenuItem; import android.view.View; import android.widget.EditText; import android.widget.Toast; + import es.ugr.swad.swadroid.Constants; import es.ugr.swad.swadroid.R; import es.ugr.swad.swadroid.model.User; import es.ugr.swad.swadroid.modules.Module; import es.ugr.swad.swadroid.webservices.SOAPClient; +import org.ksoap2.serialization.SoapObject; + +import java.util.ArrayList; +import java.util.Vector; + /** * Module for send messages. * diff --git a/SWADroid/src/es/ugr/swad/swadroid/modules/messages/UsersList.java b/SWADroid/src/es/ugr/swad/swadroid/modules/messages/UsersList.java index e09c7fa6..38b71279 100644 --- a/SWADroid/src/es/ugr/swad/swadroid/modules/messages/UsersList.java +++ b/SWADroid/src/es/ugr/swad/swadroid/modules/messages/UsersList.java @@ -6,10 +6,6 @@ package es.ugr.swad.swadroid.modules.messages; -import java.util.ArrayList; -import java.util.Collections; -import java.util.List; - import android.app.Activity; import android.content.Context; import android.content.Intent; @@ -20,6 +16,7 @@ import android.view.View; import android.widget.Button; import android.widget.ListView; import android.widget.Toast; + import es.ugr.swad.swadroid.Constants; import es.ugr.swad.swadroid.R; import es.ugr.swad.swadroid.gui.MenuActivity; @@ -28,6 +25,10 @@ import es.ugr.swad.swadroid.modules.rollcall.RollcallConfigDownload; import es.ugr.swad.swadroid.modules.rollcall.students.StudentItemModel; import es.ugr.swad.swadroid.modules.rollcall.students.StudentsArrayAdapter; +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; + public class UsersList extends MenuActivity { public static final String TAG = Constants.APP_TAG + " Users List"; diff --git a/SWADroid/src/es/ugr/swad/swadroid/modules/notifications/NotificationItem.java b/SWADroid/src/es/ugr/swad/swadroid/modules/notifications/NotificationItem.java index 586d8700..843bc091 100644 --- a/SWADroid/src/es/ugr/swad/swadroid/modules/notifications/NotificationItem.java +++ b/SWADroid/src/es/ugr/swad/swadroid/modules/notifications/NotificationItem.java @@ -18,10 +18,6 @@ */ package es.ugr.swad.swadroid.modules.notifications; -import com.nostra13.universalimageloader.core.DisplayImageOptions; -import com.nostra13.universalimageloader.core.ImageLoader; -import com.nostra13.universalimageloader.core.ImageLoaderConfiguration; - import android.app.Activity; import android.content.Intent; import android.os.Bundle; @@ -32,6 +28,11 @@ import android.webkit.WebSettings; import android.webkit.WebView; import android.widget.ImageView; import android.widget.TextView; + +import com.nostra13.universalimageloader.core.DisplayImageOptions; +import com.nostra13.universalimageloader.core.ImageLoader; +import com.nostra13.universalimageloader.core.ImageLoaderConfiguration; + import es.ugr.swad.swadroid.Constants; import es.ugr.swad.swadroid.R; import es.ugr.swad.swadroid.gui.MenuActivity; diff --git a/SWADroid/src/es/ugr/swad/swadroid/modules/notifications/Notifications.java b/SWADroid/src/es/ugr/swad/swadroid/modules/notifications/Notifications.java index 8cb39dce..d79df5f2 100644 --- a/SWADroid/src/es/ugr/swad/swadroid/modules/notifications/Notifications.java +++ b/SWADroid/src/es/ugr/swad/swadroid/modules/notifications/Notifications.java @@ -28,6 +28,7 @@ import android.content.Intent; import android.content.IntentFilter; import android.os.Build; import android.os.Bundle; +import android.support.v4.widget.SwipeRefreshLayout; import android.util.Log; import android.view.Menu; import android.view.MenuItem; @@ -36,7 +37,7 @@ import android.widget.ExpandableListView; import android.widget.ExpandableListView.OnChildClickListener; import android.widget.TextView; import android.widget.Toast; -import android.support.v4.widget.SwipeRefreshLayout; + import es.ugr.swad.swadroid.Constants; import es.ugr.swad.swadroid.Preferences; import es.ugr.swad.swadroid.R; diff --git a/SWADroid/src/es/ugr/swad/swadroid/modules/notifications/NotificationsExpandableListAdapter.java b/SWADroid/src/es/ugr/swad/swadroid/modules/notifications/NotificationsExpandableListAdapter.java index 8adcc709..31b6f4c8 100644 --- a/SWADroid/src/es/ugr/swad/swadroid/modules/notifications/NotificationsExpandableListAdapter.java +++ b/SWADroid/src/es/ugr/swad/swadroid/modules/notifications/NotificationsExpandableListAdapter.java @@ -18,15 +18,6 @@ */ package es.ugr.swad.swadroid.modules.notifications; -import java.util.ArrayList; -import java.util.Date; -import java.util.List; - -import es.ugr.swad.swadroid.Constants; -import es.ugr.swad.swadroid.R; -import es.ugr.swad.swadroid.model.Model; -import es.ugr.swad.swadroid.model.SWADNotification; -import es.ugr.swad.swadroid.utils.Utils; import android.app.Activity; import android.text.Html; import android.view.LayoutInflater; @@ -36,6 +27,16 @@ import android.widget.BaseExpandableListAdapter; import android.widget.ImageView; import android.widget.TextView; +import es.ugr.swad.swadroid.Constants; +import es.ugr.swad.swadroid.R; +import es.ugr.swad.swadroid.model.Model; +import es.ugr.swad.swadroid.model.SWADNotification; +import es.ugr.swad.swadroid.utils.Utils; + +import java.util.ArrayList; +import java.util.Date; +import java.util.List; + /** * Custom ExpandableListAdapter for display notifications * diff --git a/SWADroid/src/es/ugr/swad/swadroid/modules/tests/Tests.java b/SWADroid/src/es/ugr/swad/swadroid/modules/tests/Tests.java index ea485864..d2bbfdbd 100644 --- a/SWADroid/src/es/ugr/swad/swadroid/modules/tests/Tests.java +++ b/SWADroid/src/es/ugr/swad/swadroid/modules/tests/Tests.java @@ -18,21 +18,22 @@ */ package es.ugr.swad.swadroid.modules.tests; -import java.util.ArrayList; -import java.util.List; - import android.content.Intent; import android.os.Bundle; import android.view.View; import android.widget.AdapterView; import android.widget.AdapterView.OnItemClickListener; import android.widget.ListView; + import es.ugr.swad.swadroid.Constants; import es.ugr.swad.swadroid.R; import es.ugr.swad.swadroid.gui.ImageListAdapter; import es.ugr.swad.swadroid.gui.ImageListItem; import es.ugr.swad.swadroid.gui.MenuActivity; +import java.util.ArrayList; +import java.util.List; + /** * Tests module for download questions and evaluate user skills in a course * diff --git a/SWADroid/src/es/ugr/swad/swadroid/modules/tests/TestsConfigDownload.java b/SWADroid/src/es/ugr/swad/swadroid/modules/tests/TestsConfigDownload.java index 3b4c4bc6..1e354556 100644 --- a/SWADroid/src/es/ugr/swad/swadroid/modules/tests/TestsConfigDownload.java +++ b/SWADroid/src/es/ugr/swad/swadroid/modules/tests/TestsConfigDownload.java @@ -22,6 +22,7 @@ import android.content.Intent; import android.os.Bundle; import android.util.Log; import android.widget.Toast; + import es.ugr.swad.swadroid.Constants; import es.ugr.swad.swadroid.R; import es.ugr.swad.swadroid.model.Test; diff --git a/SWADroid/src/es/ugr/swad/swadroid/modules/tests/TestsMake.java b/SWADroid/src/es/ugr/swad/swadroid/modules/tests/TestsMake.java index 3d9aee88..7ef42a97 100644 --- a/SWADroid/src/es/ugr/swad/swadroid/modules/tests/TestsMake.java +++ b/SWADroid/src/es/ugr/swad/swadroid/modules/tests/TestsMake.java @@ -41,6 +41,7 @@ import android.widget.ListView; import android.widget.ScrollView; import android.widget.TextView; import android.widget.Toast; + import es.ugr.swad.swadroid.Constants; import es.ugr.swad.swadroid.R; import es.ugr.swad.swadroid.gui.MenuActivity;