[jboss-svn-commits] JBL Code SVN: r33294 - labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse.task/src/main/java/org/drools/eclipse/task/views.

[jboss-svn-commits at lists.jboss.org]

Author: KrisVerlaenen
Date: 2010-06-01 20:11:19 -0400 (Tue, 01 Jun 2010)
New Revision: 33294

Modified:
   labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse.task/src/main/java/org/drools/eclipse/task/views/TaskView.java
Log:
 - fixing eclipse task plugin due to task service refactoring

Modified: labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse.task/src/main/java/org/drools/eclipse/task/views/TaskView.java
===================================================================
--- labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse.task/src/main/java/org/drools/eclipse/task/views/TaskView.java	2010-06-02 00:01:21 UTC (rev 33293)
+++ labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse.task/src/main/java/org/drools/eclipse/task/views/TaskView.java	2010-06-02 00:11:19 UTC (rev 33294)
@@ -8,16 +8,17 @@
 import java.util.List;
 import java.util.Map;
 
-import org.drools.SystemEventListenerFactory;
 import org.apache.mina.transport.socket.nio.NioSocketConnector;
+import org.drools.SystemEventListenerFactory;
 import org.drools.eclipse.task.Activator;
 import org.drools.eclipse.task.preferences.DroolsTaskConstants;
 import org.drools.process.workitem.wsht.BlockingAddTaskResponseHandler;
 import org.drools.task.Status;
 import org.drools.task.User;
 import org.drools.task.query.TaskSummary;
-import org.drools.task.service.MinaTaskClient;
-import org.drools.task.service.TaskClientHandler;
+import org.drools.task.service.TaskClient;
+import org.drools.task.service.mina.MinaTaskClientConnector;
+import org.drools.task.service.mina.MinaTaskClientHandler;
 import org.eclipse.jface.action.Action;
 import org.eclipse.jface.action.IMenuListener;
 import org.eclipse.jface.action.IMenuManager;
@@ -105,7 +106,7 @@
 	private Button completeButton;
 	private Button failButton;
 
-	private MinaTaskClient client;
+	private TaskClient client;
 
 	private class ViewContentProvider implements IStructuredContentProvider {
 		public void inputChanged(Viewer v, Object oldInput, Object newInput) {
@@ -430,7 +431,7 @@
 			return;
 		}
 
-		MinaTaskClient client = getTaskClient();
+		TaskClient client = getTaskClient();
 		if (client == null) {
 			return;
 		}
@@ -457,7 +458,7 @@
 		NewTaskDialog dialog = new NewTaskDialog(getSite().getShell());
 		int result = dialog.open();
 		if (result == Dialog.OK) {
-			MinaTaskClient client = getTaskClient();
+			TaskClient client = getTaskClient();
 			if (client == null) {
 				return;
 			}
@@ -469,7 +470,7 @@
 	}
 
 	public void claim() {
-		MinaTaskClient client = getTaskClient();
+		TaskClient client = getTaskClient();
 		if (client == null) {
 			return;
 		}
@@ -491,7 +492,7 @@
 	}
 
 	public void start() {
-		MinaTaskClient client = getTaskClient();
+		TaskClient client = getTaskClient();
 		if (client == null) {
 			return;
 		}
@@ -513,7 +514,7 @@
 	}
 
 	public void stop() {
-		MinaTaskClient client = getTaskClient();
+		TaskClient client = getTaskClient();
 		if (client == null) {
 			return;
 		}
@@ -535,7 +536,7 @@
 	}
 
 	public void release() {
-		MinaTaskClient client = getTaskClient();
+		TaskClient client = getTaskClient();
 		if (client == null) {
 			return;
 		}
@@ -557,7 +558,7 @@
 	}
 
 	public void suspend() {
-		MinaTaskClient client = getTaskClient();
+		TaskClient client = getTaskClient();
 		if (client == null) {
 			return;
 		}
@@ -579,7 +580,7 @@
 	}
 
 	public void resume() {
-		MinaTaskClient client = getTaskClient();
+		TaskClient client = getTaskClient();
 		if (client == null) {
 			return;
 		}
@@ -601,7 +602,7 @@
 	}
 
 	public void skip() {
-		MinaTaskClient client = getTaskClient();
+		TaskClient client = getTaskClient();
 		if (client == null) {
 			return;
 		}
@@ -623,7 +624,7 @@
 	}
 
 	public void complete() {
-		MinaTaskClient client = getTaskClient();
+		TaskClient client = getTaskClient();
 		if (client == null) {
 			return;
 		}
@@ -645,7 +646,7 @@
 	}
 
 	public void fail() {
-		MinaTaskClient client = getTaskClient();
+		TaskClient client = getTaskClient();
 		if (client == null) {
 			return;
 		}
@@ -666,13 +667,11 @@
         refresh();
 	}
 
-	private MinaTaskClient getTaskClient() {
+	private TaskClient getTaskClient() {
 		if (client == null) {
-			client = new MinaTaskClient(
-				"org.drools.eclipse.task.views.TaskView", new TaskClientHandler(SystemEventListenerFactory.getSystemEventListener()));
-			NioSocketConnector connector = new NioSocketConnector();
-			SocketAddress address = new InetSocketAddress(ipAddress, port);
-			boolean connected = client.connect(connector, address);
+			client = new TaskClient(new MinaTaskClientConnector("client 1",
+                new MinaTaskClientHandler(SystemEventListenerFactory.getSystemEventListener())));
+			boolean connected = client.connect(ipAddress, port);
 			if (!connected) {
 				showMessage("Could not connect to task server: " + ipAddress + " [port " + port + "]");
 				client = null;