TBR: TODOs: Renames now that hierarchy is clear
Change-Id: If52fea78d0cf7e4bdd0c3906b0b35ea9833cacf2
diff --git a/projects/todos/app/src/main/java/io/v/todos/MainActivity.java b/projects/todos/app/src/main/java/io/v/todos/MainActivity.java
index 56f2f0c..1f7467a 100644
--- a/projects/todos/app/src/main/java/io/v/todos/MainActivity.java
+++ b/projects/todos/app/src/main/java/io/v/todos/MainActivity.java
@@ -90,7 +90,7 @@
mPersistence = PersistenceFactory.getMainPersistence(this, new ListEventListener<TodoList>() {
@Override
- public void onInsert(TodoList item) {
+ public void onItemAdd(TodoList item) {
snackoosList.insertInOrder(item);
adapter.notifyDataSetChanged();
@@ -101,13 +101,13 @@
}
@Override
- public void onUpdate(TodoList item) {
+ public void onItemUpdate(TodoList item) {
snackoosList.updateInOrder(item);
adapter.notifyDataSetChanged();
}
@Override
- public void onDelete(String key) {
+ public void onItemDelete(String key) {
snackoosList.removeByKey(key);
adapter.notifyDataSetChanged();
diff --git a/projects/todos/app/src/main/java/io/v/todos/TodoListActivity.java b/projects/todos/app/src/main/java/io/v/todos/TodoListActivity.java
index 54403de..1791c87 100644
--- a/projects/todos/app/src/main/java/io/v/todos/TodoListActivity.java
+++ b/projects/todos/app/src/main/java/io/v/todos/TodoListActivity.java
@@ -88,7 +88,7 @@
mPersistence = PersistenceFactory.getTodoListPersistence(this, snackooKey,
new TodoListListener() {
@Override
- public void onChange(TodoList value) {
+ public void onUpdate(TodoList value) {
snackoo = value;
getActionBar().setTitle(snackoo.getName());
}
@@ -99,20 +99,20 @@
}
@Override
- public void onInsert(Task item) {
+ public void onItemAdd(Task item) {
snackoosList.insertInOrder(item);
adapter.notifyDataSetChanged();
setEmptyVisiblity();
}
@Override
- public void onUpdate(Task item) {
+ public void onItemUpdate(Task item) {
snackoosList.updateInOrder(item);
adapter.notifyDataSetChanged();
}
@Override
- public void onDelete(String key) {
+ public void onItemDelete(String key) {
snackoosList.removeByKey(key);
adapter.notifyDataSetChanged();
setEmptyVisiblity();
diff --git a/projects/todos/app/src/main/java/io/v/todos/persistence/ListEventListener.java b/projects/todos/app/src/main/java/io/v/todos/persistence/ListEventListener.java
index 0e0641e..7e62426 100644
--- a/projects/todos/app/src/main/java/io/v/todos/persistence/ListEventListener.java
+++ b/projects/todos/app/src/main/java/io/v/todos/persistence/ListEventListener.java
@@ -5,7 +5,7 @@
package io.v.todos.persistence;
public interface ListEventListener<T> {
- void onInsert(T item);
- void onUpdate(T item);
- void onDelete(String key);
+ void onItemAdd(T item);
+ void onItemUpdate(T item);
+ void onItemDelete(String key);
}
diff --git a/projects/todos/app/src/main/java/io/v/todos/persistence/PersistenceFactory.java b/projects/todos/app/src/main/java/io/v/todos/persistence/PersistenceFactory.java
index 9a34a11..b29f4f5 100644
--- a/projects/todos/app/src/main/java/io/v/todos/persistence/PersistenceFactory.java
+++ b/projects/todos/app/src/main/java/io/v/todos/persistence/PersistenceFactory.java
@@ -7,6 +7,8 @@
import android.content.Context;
import io.v.todos.TodoList;
+import io.v.todos.persistence.firebase.FirebaseMain;
+import io.v.todos.persistence.firebase.FirebaseTodoList;
public final class PersistenceFactory {
private PersistenceFactory(){}
diff --git a/projects/todos/app/src/main/java/io/v/todos/persistence/TodoListListener.java b/projects/todos/app/src/main/java/io/v/todos/persistence/TodoListListener.java
index 9632de9..7ab179d 100644
--- a/projects/todos/app/src/main/java/io/v/todos/persistence/TodoListListener.java
+++ b/projects/todos/app/src/main/java/io/v/todos/persistence/TodoListListener.java
@@ -8,6 +8,6 @@
import io.v.todos.TodoList;
public interface TodoListListener extends ListEventListener<Task> {
- void onChange(TodoList value);
+ void onUpdate(TodoList value);
void onDelete();
}
diff --git a/projects/todos/app/src/main/java/io/v/todos/persistence/FirebaseChildEventListenerAdapter.java b/projects/todos/app/src/main/java/io/v/todos/persistence/firebase/ChildEventListenerAdapter.java
similarity index 73%
rename from projects/todos/app/src/main/java/io/v/todos/persistence/FirebaseChildEventListenerAdapter.java
rename to projects/todos/app/src/main/java/io/v/todos/persistence/firebase/ChildEventListenerAdapter.java
index c38d01e..6c3508f 100644
--- a/projects/todos/app/src/main/java/io/v/todos/persistence/FirebaseChildEventListenerAdapter.java
+++ b/projects/todos/app/src/main/java/io/v/todos/persistence/firebase/ChildEventListenerAdapter.java
@@ -2,19 +2,20 @@
// Use of this source code is governed by a BSD-style
// license that can be found in the LICENSE file.
-package io.v.todos.persistence;
+package io.v.todos.persistence.firebase;
import com.firebase.client.ChildEventListener;
import com.firebase.client.DataSnapshot;
import com.firebase.client.FirebaseError;
import io.v.todos.KeyedData;
+import io.v.todos.persistence.ListEventListener;
-public class FirebaseChildEventListenerAdapter<T extends KeyedData> implements ChildEventListener {
+public class ChildEventListenerAdapter<T extends KeyedData> implements ChildEventListener {
private final Class<T> mType;
private final ListEventListener<T> mDelegate;
- public FirebaseChildEventListenerAdapter(Class<T> type, ListEventListener<T> delegate) {
+ public ChildEventListenerAdapter(Class<T> type, ListEventListener<T> delegate) {
mType = type;
mDelegate = delegate;
}
@@ -23,19 +24,19 @@
public void onChildAdded(DataSnapshot dataSnapshot, String prevKey) {
T value = dataSnapshot.getValue(mType);
value.setKey(dataSnapshot.getKey());
- mDelegate.onInsert(value);
+ mDelegate.onItemAdd(value);
}
@Override
public void onChildChanged(DataSnapshot dataSnapshot, String prevKey) {
T value = dataSnapshot.getValue(mType);
value.setKey(dataSnapshot.getKey());
- mDelegate.onUpdate(value);
+ mDelegate.onItemUpdate(value);
}
@Override
public void onChildRemoved(DataSnapshot dataSnapshot) {
- mDelegate.onDelete(dataSnapshot.getKey());
+ mDelegate.onItemDelete(dataSnapshot.getKey());
}
@Override
diff --git a/projects/todos/app/src/main/java/io/v/todos/persistence/FirebaseMain.java b/projects/todos/app/src/main/java/io/v/todos/persistence/firebase/FirebaseMain.java
similarity index 84%
rename from projects/todos/app/src/main/java/io/v/todos/persistence/FirebaseMain.java
rename to projects/todos/app/src/main/java/io/v/todos/persistence/firebase/FirebaseMain.java
index 711e8c4..67f774e 100644
--- a/projects/todos/app/src/main/java/io/v/todos/persistence/FirebaseMain.java
+++ b/projects/todos/app/src/main/java/io/v/todos/persistence/firebase/FirebaseMain.java
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style
// license that can be found in the LICENSE file.
-package io.v.todos.persistence;
+package io.v.todos.persistence.firebase;
import android.content.Context;
@@ -10,6 +10,8 @@
import com.firebase.client.Firebase;
import io.v.todos.TodoList;
+import io.v.todos.persistence.ListEventListener;
+import io.v.todos.persistence.MainPersistence;
public class FirebaseMain extends FirebasePersistence implements MainPersistence {
public static final String TODO_LISTS = "snackoos (TodoList)";
@@ -23,7 +25,7 @@
mTodoLists = getFirebase().child(TODO_LISTS);
mTodoListsListener = mTodoLists.addChildEventListener(
- new FirebaseChildEventListenerAdapter<>(TodoList.class, listener));
+ new ChildEventListenerAdapter<>(TodoList.class, listener));
}
@Override
diff --git a/projects/todos/app/src/main/java/io/v/todos/persistence/FirebasePersistence.java b/projects/todos/app/src/main/java/io/v/todos/persistence/firebase/FirebasePersistence.java
similarity index 94%
rename from projects/todos/app/src/main/java/io/v/todos/persistence/FirebasePersistence.java
rename to projects/todos/app/src/main/java/io/v/todos/persistence/firebase/FirebasePersistence.java
index fbc8180..b2af391 100644
--- a/projects/todos/app/src/main/java/io/v/todos/persistence/FirebasePersistence.java
+++ b/projects/todos/app/src/main/java/io/v/todos/persistence/firebase/FirebasePersistence.java
@@ -2,12 +2,14 @@
// Use of this source code is governed by a BSD-style
// license that can be found in the LICENSE file.
-package io.v.todos.persistence;
+package io.v.todos.persistence.firebase;
import android.content.Context;
import com.firebase.client.Firebase;
+import io.v.todos.persistence.Persistence;
+
/**
* TODO(alexfandrianto): We may want to shove a lot more into this class and have it subclass
* a common interface with Syncbase. I want this to also manage data watches and changes.
diff --git a/projects/todos/app/src/main/java/io/v/todos/persistence/FirebaseTodoList.java b/projects/todos/app/src/main/java/io/v/todos/persistence/firebase/FirebaseTodoList.java
similarity index 89%
rename from projects/todos/app/src/main/java/io/v/todos/persistence/FirebaseTodoList.java
rename to projects/todos/app/src/main/java/io/v/todos/persistence/firebase/FirebaseTodoList.java
index 000cc47..936b064 100644
--- a/projects/todos/app/src/main/java/io/v/todos/persistence/FirebaseTodoList.java
+++ b/projects/todos/app/src/main/java/io/v/todos/persistence/firebase/FirebaseTodoList.java
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style
// license that can be found in the LICENSE file.
-package io.v.todos.persistence;
+package io.v.todos.persistence.firebase;
import android.content.Context;
@@ -14,6 +14,8 @@
import io.v.todos.Task;
import io.v.todos.TodoList;
+import io.v.todos.persistence.TodoListListener;
+import io.v.todos.persistence.TodoListPersistence;
public class FirebaseTodoList extends FirebasePersistence implements TodoListPersistence {
public static final String TASKS = "snackoo lists (Task)";
@@ -35,7 +37,7 @@
if (todoList == null) {
listener.onDelete();
} else {
- listener.onChange(todoList);
+ listener.onUpdate(todoList);
}
}
@@ -46,7 +48,7 @@
});
mTasksListener = mTasks.addChildEventListener(
- new FirebaseChildEventListenerAdapter<>(Task.class, listener));
+ new ChildEventListenerAdapter<>(Task.class, listener));
}
@Override
diff --git a/projects/todos/app/src/main/java/io/v/todos/persistence/SyncbasePersistence.java b/projects/todos/app/src/main/java/io/v/todos/persistence/syncbase/SyncbasePersistence.java
similarity index 76%
rename from projects/todos/app/src/main/java/io/v/todos/persistence/SyncbasePersistence.java
rename to projects/todos/app/src/main/java/io/v/todos/persistence/syncbase/SyncbasePersistence.java
index 80c78b8..664184b 100644
--- a/projects/todos/app/src/main/java/io/v/todos/persistence/SyncbasePersistence.java
+++ b/projects/todos/app/src/main/java/io/v/todos/persistence/syncbase/SyncbasePersistence.java
@@ -2,7 +2,9 @@
// Use of this source code is governed by a BSD-style
// license that can be found in the LICENSE file.
-package io.v.todos.persistence;
+package io.v.todos.persistence.syncbase;
+
+import io.v.todos.persistence.Persistence;
public class SyncbasePersistence implements Persistence {
@Override
