W3C home > Mailing lists > Public > www-validator-cvs@w3.org > October 2009

2006/unicorn/src/org/w3c/unicorn/response/impl DefaultResponseXBeans.java,1.5,1.6

From: Thomas Gambet via cvs-syncmail <cvsmail@w3.org>
Date: Tue, 20 Oct 2009 12:44:00 +0000
To: www-validator-cvs@w3.org
Message-Id: <E1N0E4G-0006dh-LD@lionel-hutz.w3.org>
Update of /sources/public/2006/unicorn/src/org/w3c/unicorn/response/impl
In directory hutz:/tmp/cvs-serv25507/src/org/w3c/unicorn/response/impl

Modified Files:
	DefaultResponseXBeans.java 
Log Message:
changed constructor of MessageIterable
+ getMessage(String group) implementation : returns all the message of a group

Index: DefaultResponseXBeans.java
===================================================================
RCS file: /sources/public/2006/unicorn/src/org/w3c/unicorn/response/impl/DefaultResponseXBeans.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- DefaultResponseXBeans.java	20 Oct 2009 10:35:59 -0000	1.5
+++ DefaultResponseXBeans.java	20 Oct 2009 12:43:58 -0000	1.6
@@ -16,11 +16,11 @@
 import org.apache.xmlbeans.XmlException;
 import org.apache.xmlbeans.XmlObject;
 import org.apache.xmlbeans.XmlOptions;
-import org.w3.unicorn.x2009.x10.observationresponse.GroupType;
-import org.w3.unicorn.x2009.x10.observationresponse.ListType;
-import org.w3.unicorn.x2009.x10.observationresponse.MessageType;
-import org.w3.unicorn.x2009.x10.observationresponse.ObservationresponseDocument;
-import org.w3.unicorn.x2009.x10.observationresponse.ObservationresponseDocument.Observationresponse;
+import org.w3.x2009.x10.unicorn.observationresponse.GroupType;
+import org.w3.x2009.x10.unicorn.observationresponse.ListType;
+import org.w3.x2009.x10.unicorn.observationresponse.MessageType;
+import org.w3.x2009.x10.unicorn.observationresponse.ObservationresponseDocument;
+import org.w3.x2009.x10.unicorn.observationresponse.ObservationresponseDocument.Observationresponse;
 import org.w3c.unicorn.Framework;
 import org.w3c.unicorn.response.Group;
 import org.w3c.unicorn.response.Message;
@@ -253,7 +253,7 @@
 	}
 
 	public Iterable<Message> getMessages(String uri, int type) {
-		return new MessageIterable(uri, type);
+		return new MessageIterable(uri, type, null);
 	}
 	
 	protected class MessageIterable implements Iterable<Message> {
@@ -261,10 +261,28 @@
 		private int index = 0;
 		private Integer type;
 		private String uri;
+		private String group;
 		
-		public MessageIterable(String uri, Integer type) {
+		public MessageIterable(String uri, Integer type, String group) {
 			this.uri = uri;
 			this.type = type;
+			this.group = group;
+		}
+		
+		public int size() {
+			index = 0;
+			int size = 0;
+			while (index < messages.size()) {
+				if ((uri == null || uri.equals(messages.get(index).getURI())) && 
+					(type == null || messages.get(index).getType() == type) &&
+					(group == null || group.equals(messages.get(index).getGroupName()))) {
+					index++;
+					size++;
+				}
+				index++;
+			}
+			index = 0;
+			return size;
 		}
 		
 		public Iterator<Message> iterator() {
@@ -272,8 +290,10 @@
 				public boolean hasNext() {
 					int x = index;
 					while (x < messages.size()) {
-						if ((uri == null || messages.get(x).getURI().equals(uri)) && 
-							(type == null || messages.get(x).getType() == type))
+						if ((uri == null || uri.equals(messages.get(x).getURI())) && 
+							(type == null || messages.get(x).getType() == type) &&
+							(group == null || group.equals(messages.get(x).getGroupName())))
+							
 							return true;
 						x++;
 					}
@@ -282,8 +302,9 @@
 
 				public Message next() {
 					while (index < messages.size()) {
-						if ((uri == null || messages.get(index).getURI().equals(uri)) && 
-							(type == null || messages.get(index).getType() == type)) {
+						if ((uri == null || uri.equals(messages.get(index).getURI())) && 
+							(type == null || messages.get(index).getType() == type) &&
+							(group == null || group.equals(messages.get(index).getGroupName()))) {
 							index++;
 							return messages.get(index - 1);
 						}
@@ -308,7 +329,7 @@
 	}
 
 	public Iterable<Message> getMessages(String uri, Integer type) {
-		return new MessageIterable(uri, type);
+		return new MessageIterable(uri, type, null);
 	}
 
 	public Map<String, Iterable<Message>> getURISortedMessages(int type) {
@@ -332,4 +353,8 @@
 		return Framework.mapOfObserver.get(observerID).getIndexURI();
 	}
 
+	public MessageIterable getMessages(String group) {
+		return new MessageIterable(null, null, group);
+	}
+
 }
Received on Tuesday, 20 October 2009 12:44:06 GMT

This archive was generated by hypermail 2.2.0+W3C-0.50 : Thursday, 26 April 2012 12:55:15 GMT