correctly parameterise usages of the Logger classes

WithSecureLabs · Jan 18, 2014 · 05bb788 · 05bb788
1 parent 50751f1
commit 05bb788
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 10 deletions.
diff --git a/src/com/mwr/dz/activities/EndpointActivity.java b/src/com/mwr/dz/activities/EndpointActivity.java
@@ -17,6 +17,7 @@
 import com.mwr.dz.views.CheckListItemView;
 import com.mwr.dz.views.ConnectorStatusIndicator;
 import com.mwr.dz.views.logger.LogMessageAdapter;
+import com.mwr.jdiesel.api.connectors.Connector;
 import com.mwr.jdiesel.api.connectors.Endpoint;
 
 public class EndpointActivity extends ConnectorActivity implements Observer, Endpoint.OnDetailedStatusListener {
@@ -121,7 +122,7 @@ private void setEndpoint(Endpoint endpoint) {
     	this.setTitle(this.endpoint.getName());
 
     	this.endpoint_enabled.setChecked(this.endpoint.isEnabled());
-    	this.endpoint_messages.setAdapter(new LogMessageAdapter(this.getApplicationContext(), this.endpoint.getLogger()));
+    	this.endpoint_messages.setAdapter(new LogMessageAdapter<Connector>(this.getApplicationContext(), this.endpoint.getLogger()));
     	this.endpoint_status_indicator.setConnector(this.endpoint);
     	this.setting_endpoint = false;
 

diff --git a/src/com/mwr/dz/activities/ServerActivity.java b/src/com/mwr/dz/activities/ServerActivity.java
@@ -8,6 +8,7 @@
 import com.mwr.dz.views.CheckListItemView;
 import com.mwr.dz.views.ConnectorStatusIndicator;
 import com.mwr.dz.views.logger.LogMessageAdapter;
+import com.mwr.jdiesel.api.connectors.Connector;
 import com.mwr.jdiesel.api.connectors.Endpoint;
 import com.mwr.jdiesel.api.connectors.Server;
 
@@ -16,7 +17,6 @@
 import android.os.RemoteException;
 import android.app.Dialog;
 import android.app.ProgressDialog;
-import android.util.Log;
 import android.widget.CompoundButton;
 import android.widget.ListView;
 import android.widget.Toast;
@@ -116,7 +116,7 @@ private void setServerParameters(Server parameters) {
     	this.parameters = parameters;
 
     	this.server_enabled.setChecked(this.parameters.isEnabled());
-    	this.server_messages.setAdapter(new LogMessageAdapter(this.getApplicationContext(), this.parameters.getLogger()));
+    	this.server_messages.setAdapter(new LogMessageAdapter<Connector>(this.getApplicationContext(), this.parameters.getLogger()));
     	this.server_status_indicator.setConnector(this.parameters);
     	this.setting_server = false;
 

diff --git a/src/com/mwr/dz/service_connectors/ClientServiceConnection.java b/src/com/mwr/dz/service_connectors/ClientServiceConnection.java
@@ -9,12 +9,10 @@
 import android.os.Messenger;
 import android.os.RemoteException;
 import android.util.Log;
-import android.widget.Toast;
 
 import com.mwr.dz.Agent;
 import com.mwr.dz.services.ClientService;
 import com.mwr.jdiesel.api.connectors.Endpoint;
-import com.mwr.jdiesel.api.connectors.Server;
 
 public class ClientServiceConnection implements ServiceConnection {
 

diff --git a/src/com/mwr/dz/service_connectors/ServerServiceConnection.java b/src/com/mwr/dz/service_connectors/ServerServiceConnection.java
@@ -9,7 +9,6 @@
 import android.os.Message;
 import android.os.Messenger;
 import android.os.RemoteException;
-import android.util.Log;
 
 import com.mwr.dz.Agent;
 import com.mwr.dz.services.ServerService;

diff --git a/src/com/mwr/dz/views/logger/LogMessageAdapter.java b/src/com/mwr/dz/views/logger/LogMessageAdapter.java
@@ -9,12 +9,12 @@
 import android.view.ViewGroup;
 import android.widget.BaseAdapter;
 
-public class LogMessageAdapter extends BaseAdapter implements OnLogMessageListener {
+public class LogMessageAdapter<T> extends BaseAdapter implements OnLogMessageListener<T> {
 
 	private Context context = null;
-	private Logger logger = null;
+	private Logger<T> logger = null;
 
-	public LogMessageAdapter(Context context, Logger logger) {
+	public LogMessageAdapter(Context context, Logger<T> logger) {
 		this.context = context;
 		this.logger = logger;
 
@@ -46,7 +46,7 @@ public View getView(int pos, View copyView, ViewGroup parent) {
 	}
 
 	@Override
-	public void onLogMessage(Logger logger, LogMessage message) {
+	public void onLogMessage(Logger<T> logger, LogMessage message) {
 		this.notifyDataSetChanged();
 	}