From 4b61eb675ab20b97fdd606afb4d294c13d1cf7d7 Mon Sep 17 00:00:00 2001
From: Przemek Grondek <github@nerull7.info>
Date: Fri, 18 Jul 2014 12:28:59 +0200
Subject: [PATCH] Cleaning and added todo's
---
app/app.iml | 1 +
.../info/nerull7/mysqlbrowser/DatabaseActivity.java | 5 +++--
.../info/nerull7/mysqlbrowser/DatabaseFragment.java | 2 +-
.../java/info/nerull7/mysqlbrowser/DatabaseItem.java | 7 -------
.../info/nerull7/mysqlbrowser/EntriesActivity.java | 5 +++--
.../info/nerull7/mysqlbrowser/EntriesFragment.java | 2 +-
.../java/info/nerull7/mysqlbrowser/MainActivity.java | 2 ++
.../java/info/nerull7/mysqlbrowser/TableActivity.java | 5 +++--
.../java/info/nerull7/mysqlbrowser/TableFragment.java | 1 +
.../nerull7/mysqlbrowser/db/DatabaseConnector.java | 4 ----
.../mysqlbrowser/db/FakeDatabaseConnector.java | 11 -----------
.../mysqlbrowser/db/RealDatabaseConnector.java | 9 +--------
app/src/main/res/menu/database.xml | 8 --------
app/src/main/res/menu/entries.xml | 8 --------
app/src/main/res/menu/login.xml | 8 --------
app/src/main/res/menu/table.xml | 8 --------
16 files changed, 16 insertions(+), 70 deletions(-)
delete mode 100644 app/src/main/java/info/nerull7/mysqlbrowser/DatabaseItem.java
delete mode 100644 app/src/main/res/menu/database.xml
delete mode 100644 app/src/main/res/menu/entries.xml
delete mode 100644 app/src/main/res/menu/login.xml
delete mode 100644 app/src/main/res/menu/table.xml
diff --git a/app/app.iml b/app/app.iml
index 219a04b..a0f9ba9 100644
--- a/app/app.iml
+++ b/app/app.iml
@@ -61,6 +61,7 @@
</content>
<orderEntry type="jdk" jdkName="Android API 19 Platform" jdkType="Android SDK" />
<orderEntry type="sourceFolder" forTests="false" />
+ <orderEntry type="library" exported="" name="support-v4-19.1.0" level="project" />
</component>
</module>
diff --git a/app/src/main/java/info/nerull7/mysqlbrowser/DatabaseActivity.java b/app/src/main/java/info/nerull7/mysqlbrowser/DatabaseActivity.java
index 7d85376..fd93d7e 100644
--- a/app/src/main/java/info/nerull7/mysqlbrowser/DatabaseActivity.java
+++ b/app/src/main/java/info/nerull7/mysqlbrowser/DatabaseActivity.java
@@ -21,8 +21,7 @@ public class DatabaseActivity extends Activity {
@Override
public boolean onCreateOptionsMenu(Menu menu) {
- // Inflate the menu; this adds items to the action bar if it is present.
- getMenuInflater().inflate(R.menu.database, menu);
+ getMenuInflater().inflate(R.menu.main, menu);
return true;
}
@@ -31,6 +30,8 @@ public class DatabaseActivity extends Activity {
// Handle action bar item clicks here. The action bar will
// automatically handle clicks on the Home/Up button, so long
// as you specify a parent activity in AndroidManifest.xml.
+
+ //TODO Handling menu
int id = item.getItemId();
if (id == R.id.action_settings) {
return true;
diff --git a/app/src/main/java/info/nerull7/mysqlbrowser/DatabaseFragment.java b/app/src/main/java/info/nerull7/mysqlbrowser/DatabaseFragment.java
index 3d9dd56..27aadd9 100644
--- a/app/src/main/java/info/nerull7/mysqlbrowser/DatabaseFragment.java
+++ b/app/src/main/java/info/nerull7/mysqlbrowser/DatabaseFragment.java
@@ -28,7 +28,7 @@ public class DatabaseFragment extends Fragment implements AdapterView.OnItemClic
return rootView;
}
- private void setupListViewDatabase(){
+ private void setupListViewDatabase(){ // TODO: Handle no databases available problem
listAdapter = new ArrayAdapter<String>(getActivity(),android.R.layout.simple_list_item_1, Static.databaseConnector.getDatabases());
databasesListView.setAdapter(listAdapter);
databasesListView.setOnItemClickListener(this);
diff --git a/app/src/main/java/info/nerull7/mysqlbrowser/DatabaseItem.java b/app/src/main/java/info/nerull7/mysqlbrowser/DatabaseItem.java
deleted file mode 100644
index 576889e..0000000
--- a/app/src/main/java/info/nerull7/mysqlbrowser/DatabaseItem.java
+++ /dev/null
@@ -1,7 +0,0 @@
-package info.nerull7.mysqlbrowser;
-
-/**
- * Created by nerull7 on 07.07.14.
- */
-public class DatabaseItem {
-}
diff --git a/app/src/main/java/info/nerull7/mysqlbrowser/EntriesActivity.java b/app/src/main/java/info/nerull7/mysqlbrowser/EntriesActivity.java
index 7d575ea..d5bda3e 100644
--- a/app/src/main/java/info/nerull7/mysqlbrowser/EntriesActivity.java
+++ b/app/src/main/java/info/nerull7/mysqlbrowser/EntriesActivity.java
@@ -26,8 +26,7 @@ public class EntriesActivity extends Activity {
@Override
public boolean onCreateOptionsMenu(Menu menu) {
- // Inflate the menu; this adds items to the action bar if it is present.
- getMenuInflater().inflate(R.menu.entries, menu);
+ getMenuInflater().inflate(R.menu.main, menu);
return true;
}
@@ -36,6 +35,8 @@ public class EntriesActivity extends Activity {
// Handle action bar item clicks here. The action bar will
// automatically handle clicks on the Home/Up button, so long
// as you specify a parent activity in AndroidManifest.xml.
+
+ //TODO Handling menu
int id = item.getItemId();
if (id == R.id.action_settings) {
return true;
diff --git a/app/src/main/java/info/nerull7/mysqlbrowser/EntriesFragment.java b/app/src/main/java/info/nerull7/mysqlbrowser/EntriesFragment.java
index 3a14585..02924e0 100644
--- a/app/src/main/java/info/nerull7/mysqlbrowser/EntriesFragment.java
+++ b/app/src/main/java/info/nerull7/mysqlbrowser/EntriesFragment.java
@@ -38,7 +38,7 @@ public class EntriesFragment extends Fragment {
return rootView;
}
- private void setupTable(){
+ private void setupTable(){ // TODO Empty table handling
List<String> fieldList = Static.databaseConnector.getFields(tableName);
TableRow.LayoutParams layoutParams = new TableRow.LayoutParams(TableRow.LayoutParams.WRAP_CONTENT, TableRow.LayoutParams.WRAP_CONTENT);
diff --git a/app/src/main/java/info/nerull7/mysqlbrowser/MainActivity.java b/app/src/main/java/info/nerull7/mysqlbrowser/MainActivity.java
index 38465e3..402375b 100644
--- a/app/src/main/java/info/nerull7/mysqlbrowser/MainActivity.java
+++ b/app/src/main/java/info/nerull7/mysqlbrowser/MainActivity.java
@@ -31,6 +31,8 @@ public class MainActivity extends Activity {
// Handle action bar item clicks here. The action bar will
// automatically handle clicks on the Home/Up button, so long
// as you specify a parent activity in AndroidManifest.xml.
+
+ //TODO Handling menu
int id = item.getItemId();
if (id == R.id.action_settings) {
return true;
diff --git a/app/src/main/java/info/nerull7/mysqlbrowser/TableActivity.java b/app/src/main/java/info/nerull7/mysqlbrowser/TableActivity.java
index 36d152f..f7d6b1c 100644
--- a/app/src/main/java/info/nerull7/mysqlbrowser/TableActivity.java
+++ b/app/src/main/java/info/nerull7/mysqlbrowser/TableActivity.java
@@ -25,8 +25,7 @@ public class TableActivity extends Activity {
@Override
public boolean onCreateOptionsMenu(Menu menu) {
- // Inflate the menu; this adds items to the action bar if it is present.
- getMenuInflater().inflate(R.menu.table, menu);
+ getMenuInflater().inflate(R.menu.main, menu);
return true;
}
@@ -35,6 +34,8 @@ public class TableActivity extends Activity {
// Handle action bar item clicks here. The action bar will
// automatically handle clicks on the Home/Up button, so long
// as you specify a parent activity in AndroidManifest.xml.
+
+ //TODO Handling menu
int id = item.getItemId();
if (id == R.id.action_settings) {
return true;
diff --git a/app/src/main/java/info/nerull7/mysqlbrowser/TableFragment.java b/app/src/main/java/info/nerull7/mysqlbrowser/TableFragment.java
index 8576d5d..b3eb62a 100644
--- a/app/src/main/java/info/nerull7/mysqlbrowser/TableFragment.java
+++ b/app/src/main/java/info/nerull7/mysqlbrowser/TableFragment.java
@@ -31,6 +31,7 @@ public class TableFragment extends Fragment implements AdapterView.OnItemClickLi
private void setupList(){
listAdapter = new ArrayAdapter<String>(getActivity(),android.R.layout.simple_list_item_1, Static.databaseConnector.getTables());
+ // TODO No tables handling
tablesList.setAdapter(listAdapter);
tablesList.setOnItemClickListener(this);
}
diff --git a/app/src/main/java/info/nerull7/mysqlbrowser/db/DatabaseConnector.java b/app/src/main/java/info/nerull7/mysqlbrowser/db/DatabaseConnector.java
index d0bd3a7..c06f97b 100644
--- a/app/src/main/java/info/nerull7/mysqlbrowser/db/DatabaseConnector.java
+++ b/app/src/main/java/info/nerull7/mysqlbrowser/db/DatabaseConnector.java
@@ -8,15 +8,11 @@ import java.util.List;
public interface DatabaseConnector {
void setDatabaseInUse(String database);
- // TODO Real connection
List<String> getDatabases();
- // TODO Real getTables
List<String> getTables();
- // TODO Real getFields
List<String> getFields(String table);
- // TODO Real getRows
List<List<String>> getRows(String table, int count);
}
diff --git a/app/src/main/java/info/nerull7/mysqlbrowser/db/FakeDatabaseConnector.java b/app/src/main/java/info/nerull7/mysqlbrowser/db/FakeDatabaseConnector.java
index 62f2381..650d95e 100644
--- a/app/src/main/java/info/nerull7/mysqlbrowser/db/FakeDatabaseConnector.java
+++ b/app/src/main/java/info/nerull7/mysqlbrowser/db/FakeDatabaseConnector.java
@@ -23,15 +23,8 @@ public class FakeDatabaseConnector implements DatabaseConnector {
this.url = url;
}
- // TODO Real checking
public static boolean checkLogin(String login, String password, String url){
-// if (login.compareTo("nerull7")==0)
return true;
-// if(password.compareTo("")==0)
-// errorMsg = "No Password";
-// else
-// errorMsg = "I don't know";
-// return false;
}
@Override
@@ -39,7 +32,6 @@ public class FakeDatabaseConnector implements DatabaseConnector {
this.database = database;
}
- // TODO Real connection
@Override
public List<String> getDatabases(){
List<String> stringList = new ArrayList<String>();
@@ -50,7 +42,6 @@ public class FakeDatabaseConnector implements DatabaseConnector {
return stringList;
}
- // TODO Real getTables
@Override
public List<String> getTables(){
if(database==null) return null; // if database is not chosen return null
@@ -62,7 +53,6 @@ public class FakeDatabaseConnector implements DatabaseConnector {
return stringList;
}
- // TODO Real getFields
@Override
public List<String> getFields(String table){
if(database==null) return null; // if database is not chosen return null
@@ -76,7 +66,6 @@ public class FakeDatabaseConnector implements DatabaseConnector {
return stringList;
}
- // TODO Real getRows
@Override
public List<List<String>> getRows(String table, int count){
if(database==null) return null; // if database is not chosen return null
diff --git a/app/src/main/java/info/nerull7/mysqlbrowser/db/RealDatabaseConnector.java b/app/src/main/java/info/nerull7/mysqlbrowser/db/RealDatabaseConnector.java
index 16faca8..1da7a82 100644
--- a/app/src/main/java/info/nerull7/mysqlbrowser/db/RealDatabaseConnector.java
+++ b/app/src/main/java/info/nerull7/mysqlbrowser/db/RealDatabaseConnector.java
@@ -45,7 +45,7 @@ public class RealDatabaseConnector implements DatabaseConnector {
private static String httpRequest(String urlRequest) throws IOException {
disableStrictMode(); // FIXME
URL url = new URL(urlRequest);
- HttpURLConnection urlConnection = (HttpURLConnection) url.openConnection();
+ HttpURLConnection urlConnection = (HttpURLConnection) url.openConnection(); // TODO Handling no connection
InputStream inputStream = null;
String response;
if(urlConnection.getResponseCode() == HttpURLConnection.HTTP_OK) {
@@ -58,13 +58,6 @@ public class RealDatabaseConnector implements DatabaseConnector {
return response;
}
else {
-// try {
-// inputStream = new BufferedInputStream(urlConnection.getErrorStream());
-// errorMsg = readStream(inputStream);
-// } finally {
-// urlConnection.disconnect();
-// }
-// return null;
errorMsg = "ERROR: "+urlConnection.getResponseCode();
return null;
}
diff --git a/app/src/main/res/menu/database.xml b/app/src/main/res/menu/database.xml
deleted file mode 100644
index 79392ac..0000000
--- a/app/src/main/res/menu/database.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<menu xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:tools="http://schemas.android.com/tools"
- tools:context="info.nerull7.mysqlbrowser.DatabaseActivity" >
- <item android:id="@+id/action_settings"
- android:title="@string/action_settings"
- android:orderInCategory="100"
- android:showAsAction="never" />
-</menu>
diff --git a/app/src/main/res/menu/entries.xml b/app/src/main/res/menu/entries.xml
deleted file mode 100644
index 695e129..0000000
--- a/app/src/main/res/menu/entries.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<menu xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:tools="http://schemas.android.com/tools"
- tools:context="info.nerull7.mysqlbrowser.EntriesActivity" >
- <item android:id="@+id/action_settings"
- android:title="@string/action_settings"
- android:orderInCategory="100"
- android:showAsAction="never" />
-</menu>
diff --git a/app/src/main/res/menu/login.xml b/app/src/main/res/menu/login.xml
deleted file mode 100644
index 5f5cbbe..0000000
--- a/app/src/main/res/menu/login.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<menu xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:tools="http://schemas.android.com/tools"
- tools:context=".LoginActivity" >
- <item android:id="@+id/action_settings"
- android:title="@string/action_settings"
- android:orderInCategory="100"
- android:showAsAction="never" />
-</menu>
diff --git a/app/src/main/res/menu/table.xml b/app/src/main/res/menu/table.xml
deleted file mode 100644
index 8888e00..0000000
--- a/app/src/main/res/menu/table.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<menu xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:tools="http://schemas.android.com/tools"
- tools:context="info.nerull7.mysqlbrowser.TableActivity" >
- <item android:id="@+id/action_settings"
- android:title="@string/action_settings"
- android:orderInCategory="100"
- android:showAsAction="never" />
-</menu>