incubator-hise-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From wi...@apache.org
Subject svn commit: r999297 - in /incubator/hise/trunk/hise-ws-client/src/main/java/org/apache/hise/wsclient: facade/HiseApiFacade.java facade/HiseApiFacadeImpl.java model/Task.java
Date Tue, 21 Sep 2010 09:55:44 GMT
Author: witek
Date: Tue Sep 21 09:55:44 2010
New Revision: 999297

URL: http://svn.apache.org/viewvc?rev=999297&view=rev
Log: (empty)

Modified:
    incubator/hise/trunk/hise-ws-client/src/main/java/org/apache/hise/wsclient/facade/HiseApiFacade.java
    incubator/hise/trunk/hise-ws-client/src/main/java/org/apache/hise/wsclient/facade/HiseApiFacadeImpl.java
    incubator/hise/trunk/hise-ws-client/src/main/java/org/apache/hise/wsclient/model/Task.java

Modified: incubator/hise/trunk/hise-ws-client/src/main/java/org/apache/hise/wsclient/facade/HiseApiFacade.java
URL: http://svn.apache.org/viewvc/incubator/hise/trunk/hise-ws-client/src/main/java/org/apache/hise/wsclient/facade/HiseApiFacade.java?rev=999297&r1=999296&r2=999297&view=diff
==============================================================================
--- incubator/hise/trunk/hise-ws-client/src/main/java/org/apache/hise/wsclient/facade/HiseApiFacade.java
(original)
+++ incubator/hise/trunk/hise-ws-client/src/main/java/org/apache/hise/wsclient/facade/HiseApiFacade.java
Tue Sep 21 09:55:44 2010
@@ -17,6 +17,7 @@ public interface HiseApiFacade {
 
     List<Task> getMyTasks(String user, String password, FilterCriteria filterCriteria);
     Task getTask(String user, String password, String taskId);
+    String getTaskDescription(String user, String password, String taskId, String contentType);
 
     void claim(String user, String password, String identifier);
     void start(String user, String password, String identifier);

Modified: incubator/hise/trunk/hise-ws-client/src/main/java/org/apache/hise/wsclient/facade/HiseApiFacadeImpl.java
URL: http://svn.apache.org/viewvc/incubator/hise/trunk/hise-ws-client/src/main/java/org/apache/hise/wsclient/facade/HiseApiFacadeImpl.java?rev=999297&r1=999296&r2=999297&view=diff
==============================================================================
--- incubator/hise/trunk/hise-ws-client/src/main/java/org/apache/hise/wsclient/facade/HiseApiFacadeImpl.java
(original)
+++ incubator/hise/trunk/hise-ws-client/src/main/java/org/apache/hise/wsclient/facade/HiseApiFacadeImpl.java
Tue Sep 21 09:55:44 2010
@@ -76,8 +76,14 @@ public class HiseApiFacadeImpl implement
 	public Task getTask(String user, String password, String taskId) {
 		wssInterceptor.addWsAuthentication(user, password);
 		try {
+			
 			TTask task = service.getTaskInfo(taskId);
-			return taskConverter.buildTask(task);
+			String description = service.getTaskDescription(taskId, null);
+			Task taskDto = taskConverter.buildTask(task);
+			taskDto.setPresentationDescription(description);
+			
+			return taskDto;
+
 		} catch (Exception e) {
 			throw new HiseException("Błąd zwrócony przez webserwis HISE: " + e.getMessage(),
e);
 		}
@@ -195,6 +201,16 @@ public class HiseApiFacadeImpl implement
         }
     }
 
+	public String getTaskDescription(String user, String password, String taskId, String contentType)
{
+		wssInterceptor.addWsAuthentication(user, password);
+		try {
+	        service.getTaskDescription(taskId, contentType);
+        } catch (IllegalArgumentFault e) {
+        	throw new HiseException("Błąd IllegalArgumentFault zwrócony przez webserwis
HISE: " + e.getMessage(), e);
+        }
+	    return null;
+    }
+
     // IoC setters
 
 	public void setService(TaskOperationsInterface service) {

Modified: incubator/hise/trunk/hise-ws-client/src/main/java/org/apache/hise/wsclient/model/Task.java
URL: http://svn.apache.org/viewvc/incubator/hise/trunk/hise-ws-client/src/main/java/org/apache/hise/wsclient/model/Task.java?rev=999297&r1=999296&r2=999297&view=diff
==============================================================================
--- incubator/hise/trunk/hise-ws-client/src/main/java/org/apache/hise/wsclient/model/Task.java
(original)
+++ incubator/hise/trunk/hise-ws-client/src/main/java/org/apache/hise/wsclient/model/Task.java
Tue Sep 21 09:55:44 2010
@@ -1,15 +1,11 @@
 package org.apache.hise.wsclient.model;
 
-
 import java.io.Serializable;
 import java.util.Date;
 import java.util.List;
 
-import javax.xml.datatype.XMLGregorianCalendar;
-
 import org.apache.hise.wsclient.model.enums.Status;
 
-
 public class Task implements Serializable {
 
 	private static final long serialVersionUID = 1L;
@@ -28,8 +24,11 @@ public class Task implements Serializabl
     private boolean hasPotentialOwners;
     private boolean startByExists;
     private boolean completeByExists;
+    
     private String presentationName;
     private String presentationSubject;
+    private String presentationDescription; //Returned only in getTask
+    
     private boolean renderingMethodExists;
     private boolean hasOutput;
     private boolean hasFault;
@@ -289,5 +288,13 @@ public class Task implements Serializabl
 	    return completeBy;
     }
 
+	public void setPresentationDescription(String presentationDescription) {
+	    this.presentationDescription = presentationDescription;
+    }
+
+	public String getPresentationDescription() {
+	    return presentationDescription;
+    }
+
 	
 }



Mime
View raw message