Merge branch 'master' of http://github.com/camilstaps/RSSin

7 files changed, 8 insertions, 9 deletions

diff --git a/app/src/main/java/org/rssin/android/FeedsActivity.java b/app/src/main/java/org/rssin/android/FeedsActivity.java
index a1b9656..1ac091e 100755
--- a/app/src/main/java/org/rssin/android/FeedsActivity.java
+++ b/app/src/main/java/org/rssin/android/FeedsActivity.java
@@ -116,7 +116,7 @@ public class FeedsActivity extends ActionBarActivity {
     /**
      * Open dialog to add new feed
      * For the moment, we temporarily disable rotating because we can't get it working otherwise.
-     * @todo make rotating possible
+     * Possible feature: make rotating possible
      */
     public void openAddDialog() {
         setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_NOSENSOR);
diff --git a/app/src/main/java/org/rssin/android/FilterSettingsActivity.java b/app/src/main/java/org/rssin/android/FilterSettingsActivity.java
index 93bffdf..ae0327a 100755
--- a/app/src/main/java/org/rssin/android/FilterSettingsActivity.java
+++ b/app/src/main/java/org/rssin/android/FilterSettingsActivity.java
@@ -72,7 +72,7 @@ public class FilterSettingsActivity extends ActionBarActivity {
         Intent intent = getIntent();
         int filterHashCode = intent.getIntExtra("filter", -1);
 
-        // @todo Check on -1? Shouldn't happen anyway.
+        // Check on -1? Shouldn't happen anyway.
         filter = filtersList.getFilterFromHashCode(filterHashCode);
 
         setTitle();
@@ -205,7 +205,7 @@ public class FilterSettingsActivity extends ActionBarActivity {
     /**
      * Open dialog to edit title
      * For the moment, we temporarily disable rotating because we can't get it working otherwise.
-     * @todo make rotating possible
+     * Possible feature: make rotating possible
      */
     public void openTitleDialog() {
         setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_NOSENSOR);
diff --git a/app/src/main/java/org/rssin/android/InternalStorageProvider.java b/app/src/main/java/org/rssin/android/InternalStorageProvider.java
index 6241c2d..a09eefa 100644
--- a/app/src/main/java/org/rssin/android/InternalStorageProvider.java
+++ b/app/src/main/java/org/rssin/android/InternalStorageProvider.java
@@ -46,7 +46,6 @@ class InternalStorageProvider implements StorageProvider<String, FeedSorter>, Fi
 
     private final Context context;
 
-    // @todo redo singleton
     public InternalStorageProvider(Context context) {
         this.context = context;
     }
diff --git a/app/src/main/java/org/rssin/android/NavigationDrawerManageFeedsFragment.java b/app/src/main/java/org/rssin/android/NavigationDrawerManageFeedsFragment.java
index 3e52b1b..7f6163a 100755
--- a/app/src/main/java/org/rssin/android/NavigationDrawerManageFeedsFragment.java
+++ b/app/src/main/java/org/rssin/android/NavigationDrawerManageFeedsFragment.java
@@ -117,7 +117,7 @@ public class NavigationDrawerManageFeedsFragment extends Fragment {
     /**

      * Open dialog to add new feed

      * For the moment, we temporarily disable rotating because we can't get it working otherwise.

-     * @todo make rotating possible

+     * Possible feature: make rotating possible

      */

     public void openAddDialog() {

         //setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_NOSENSOR);

diff --git a/app/src/main/java/org/rssin/android/NavigationDrawerManageFiltersFragment.java b/app/src/main/java/org/rssin/android/NavigationDrawerManageFiltersFragment.java
index 84d9a0d..a0d9b55 100644
--- a/app/src/main/java/org/rssin/android/NavigationDrawerManageFiltersFragment.java
+++ b/app/src/main/java/org/rssin/android/NavigationDrawerManageFiltersFragment.java
@@ -124,7 +124,7 @@ public class NavigationDrawerManageFiltersFragment extends Fragment {
     /**

      * Open dialog to create new filter

      * For the moment, we temporarily disable rotating because we can't get it working otherwise.

-     * @todo make rotating possible

+     * Possible feature: make rotating possible

      */

     public void openAddDialog() {

         //setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_NOSENSOR);

diff --git a/app/src/main/java/org/rssin/rssin/Feed.java b/app/src/main/java/org/rssin/rssin/Feed.java
index c126ceb..646a517 100755
--- a/app/src/main/java/org/rssin/rssin/Feed.java
+++ b/app/src/main/java/org/rssin/rssin/Feed.java
@@ -40,7 +40,7 @@ import java.net.URL;
 /**
  * Feed holder
  * @author Camil Staps
- * @todo Allow users to enter links without scheme (http:// ...)
+ * Possible feature: Allow users to enter links without scheme (http:// ...)
  */
 public class Feed implements Storable, Comparable<Feed>, Jsonable {
     private static final long serialVersionUID = 0;
@@ -126,7 +126,7 @@ public class Feed implements Storable, Comparable<Feed>, Jsonable {
 
     /**
      * Cleverly make up a title based on the URL
-     * @todo make it really really clever
+     * Possible feature: make it really really clever
      */
     public void setTitleFromURL(Context context, final FeedStorageProvider storageProvider, Fetcher fetcher, final FallibleListener<String, Object> titlehasChanged) {
         String newTitle = url.getHost();
diff --git a/app/src/main/java/org/rssin/rssin/Filter.java b/app/src/main/java/org/rssin/rssin/Filter.java
index ec7a23c..8de2325 100644
--- a/app/src/main/java/org/rssin/rssin/Filter.java
+++ b/app/src/main/java/org/rssin/rssin/Filter.java
@@ -35,7 +35,7 @@ import java.util.List;
  * Filter holder
  * @author Camil Staps
  *
- * @todo Write read & writeObject with JSON or so to make it easier to change this class later
+ * Possible feature: Write read & writeObject with JSON or so to make it easier to change this class later
  */
 public class Filter implements Storable, Comparable<Filter>, Jsonable {