Attachment 63118 Details for Bug 180796 – Patch: naming and JavaDoc improvements, migration to Arrays

Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.

[patch] Patch: naming and JavaDoc improvements, migration to Arrays

clipboard39202.txt (text/plain), 75.95 KB, created by Erkki Lindpere

on 2007-04-05 17:38:55 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Erkki Lindpere

Created: 2007-04-05 17:38:55 EDT

Size: 75.95 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.ecf.provider.vbulletin
>Index: src/org/eclipse/ecf/internal/provider/vbulletin/Thread.java
>===================================================================
>RCS file: /cvsroot/technology/org.eclipse.ecf/incubation/plugins/org.eclipse.ecf.provider.vbulletin/src/org/eclipse/ecf/internal/provider/vbulletin/Thread.java,v
>retrieving revision 1.1
>diff -u -r1.1 Thread.java
>--- src/org/eclipse/ecf/internal/provider/vbulletin/Thread.java	27 Feb 2007 17:44:52 -0000	1.1
>+++ src/org/eclipse/ecf/internal/provider/vbulletin/Thread.java	5 Apr 2007 21:37:37 -0000
>@@ -67,11 +67,11 @@
> 		return forum;
> 	}
> 
>-	public List<IThreadMessage> getMessages() throws BBException {
>+	public IThreadMessage[] getMessages() throws BBException {
> 		return getNewMessages();
> 	}
> 
>-	public List<IThreadMessage> getNewMessages() throws BBException {
>+	public IThreadMessage[] getNewMessages() throws BBException {
> 		ThreadBrowser2 browser = new ThreadBrowser2((VBulletin) bb, this);
> 		List<IThreadMessage> msgs = browser.fetchNewMessages();
> 		if (msgs.size() > 0) {
>@@ -85,10 +85,10 @@
> 				((Member) author).setBulletinBoard(bb);
> 			}
> 		}
>-		return msgs;
>+		return msgs.toArray(new IThreadMessage[msgs.size()]);
> 	}
> 
>-	public List<IThreadMessage> getNewMessages(ID lastReadId)
>+	public IThreadMessage[] getNewMessages(ID lastReadId)
> 			throws BBException {
> 		if (lastReadId != null) {
> 			lastReadMessageId = (ThreadMessageID) lastReadId;
>@@ -144,7 +144,7 @@
> 		request.addParameters(params);
> 		params = new NameValuePair[] {
> 				new NameValuePair("title", message.getName()),
>-				new NameValuePair("message", msg.getMessage()),
>+				new NameValuePair("message", msg.getBody()),
> 				new NameValuePair("iconid", "0"), new NameValuePair("s", ""),
> 				new NameValuePair("do", "postreply"),
> 				new NameValuePair("t", String.valueOf(id.getLongValue())) };
>@@ -226,7 +226,7 @@
> 		return id.hashCode();
> 	}
> 
>-	public IMember getAuthor() {
>+	public IMember getPoster() {
> 		return author;
> 	}
> 
>Index: src/org/eclipse/ecf/internal/provider/vbulletin/MemberGroup.java
>===================================================================
>RCS file: /cvsroot/technology/org.eclipse.ecf/incubation/plugins/org.eclipse.ecf.provider.vbulletin/src/org/eclipse/ecf/internal/provider/vbulletin/MemberGroup.java,v
>retrieving revision 1.1
>diff -u -r1.1 MemberGroup.java
>--- src/org/eclipse/ecf/internal/provider/vbulletin/MemberGroup.java	27 Feb 2007 17:44:52 -0000	1.1
>+++ src/org/eclipse/ecf/internal/provider/vbulletin/MemberGroup.java	5 Apr 2007 21:37:37 -0000
>@@ -10,8 +10,7 @@
> *******************************************************************************/
> package org.eclipse.ecf.internal.provider.vbulletin;
> 
>-import java.util.Collection;
>-import java.util.Collections;
>+import java.util.Arrays;
> 
> import org.eclipse.ecf.bulletinboard.IMember;
> import org.eclipse.ecf.bulletinboard.IMemberGroup;
>@@ -30,25 +29,17 @@
> 	}
> 
> 	private void attainDetailsFetched() {
>-		/*if (!detailsFetched) {
>-			GetRequest request = new GetRequest(bb.getHttpClient(),
>-					bb.getURL(), "groupcp.php");
>-			request.addParameter(new NameValuePair("g", String.valueOf(id
>-					.getLongValue())));
>-			request.execute();
>-			String resp = null;
>-			try {
>-				resp = request.getResponseBodyAsString();
>-			} catch (IOException e) {
>-				e.printStackTrace();
>-			}
>-			request.releaseConnection();
>-			if (resp != null) {
>-				MemberGroup group = bb.getParser().parseMemberGroup(resp);
>-				group.detailsFetched = true;
>-				this.description = group.getDescription();
>-			}
>-		}*/
>+		/*
>+		 * if (!detailsFetched) { GetRequest request = new
>+		 * GetRequest(bb.getHttpClient(), bb.getURL(), "groupcp.php");
>+		 * request.addParameter(new NameValuePair("g", String.valueOf(id
>+		 * .getLongValue()))); request.execute(); String resp = null; try { resp =
>+		 * request.getResponseBodyAsString(); } catch (IOException e) {
>+		 * e.printStackTrace(); } request.releaseConnection(); if (resp != null) {
>+		 * MemberGroup group = bb.getParser().parseMemberGroup(resp);
>+		 * group.detailsFetched = true; this.description =
>+		 * group.getDescription(); } }
>+		 */
> 	}
> 
> 	public String getDescription() {
>@@ -56,28 +47,18 @@
> 		return description;
> 	}
> 
>-	public Collection<IMember> getMembers() {
>-		/*Map<ID, Member> map = null;
>-		GetRequest request = new GetRequest(bb.getHttpClient(), bb.getURL(),
>-				"groupcp.php");
>-		request.addParameter(new NameValuePair("g", String.valueOf(id
>-				.getLongValue())));
>-		request.execute();
>-		String resp = null;
>-		try {
>-			resp = request.getResponseBodyAsString();
>-		} catch (IOException e) {
>-			e.printStackTrace();
>-		}
>-		request.releaseConnection();
>-		if (resp != null) {
>-			map = bb.getParser().parseMemberLinks(resp);
>-			for (Member member : map.values()) {
>-				member.bb = bb;
>-			}
>-		}
>-		return new HashSet<IMember>(map.values());*/
>-		return Collections.emptyList();
>+	public IMember[] getMembers() {
>+		/*
>+		 * Map<ID, Member> map = null; GetRequest request = new
>+		 * GetRequest(bb.getHttpClient(), bb.getURL(), "groupcp.php");
>+		 * request.addParameter(new NameValuePair("g", String.valueOf(id
>+		 * .getLongValue()))); request.execute(); String resp = null; try { resp =
>+		 * request.getResponseBodyAsString(); } catch (IOException e) {
>+		 * e.printStackTrace(); } request.releaseConnection(); if (resp != null) {
>+		 * map = bb.getParser().parseMemberLinks(resp); for (Member member :
>+		 * map.values()) { member.bb = bb; } } return new HashSet<IMember>(map.values());
>+		 */
>+		return new IMember[0];
> 	}
> 
> 	public ID getID() {
>@@ -101,4 +82,8 @@
> 	public int hashCode() {
> 		return id.hashCode();
> 	}
>+
>+	public boolean isMember(IMember member) {
>+		return Arrays.asList(getMembers()).contains(member);
>+	}
> }
>Index: src/org/eclipse/ecf/internal/provider/vbulletin/ThreadMessage.java
>===================================================================
>RCS file: /cvsroot/technology/org.eclipse.ecf/incubation/plugins/org.eclipse.ecf.provider.vbulletin/src/org/eclipse/ecf/internal/provider/vbulletin/ThreadMessage.java,v
>retrieving revision 1.1
>diff -u -r1.1 ThreadMessage.java
>--- src/org/eclipse/ecf/internal/provider/vbulletin/ThreadMessage.java	27 Feb 2007 17:44:52 -0000	1.1
>+++ src/org/eclipse/ecf/internal/provider/vbulletin/ThreadMessage.java	5 Apr 2007 21:37:37 -0000
>@@ -15,7 +15,7 @@
> import java.util.Date;
> 
> import org.eclipse.ecf.bulletinboard.IMember;
>-import org.eclipse.ecf.bulletinboard.IMessageBase;
>+import org.eclipse.ecf.bulletinboard.IBBMessage;
> import org.eclipse.ecf.bulletinboard.IThread;
> import org.eclipse.ecf.bulletinboard.IThreadMessage;
> import org.eclipse.ecf.bulletinboard.IllegalWriteException;
>@@ -53,20 +53,20 @@
> 		return number;
> 	}
> 
>-	public String getMessage() {
>+	public String getBody() {
> 		return message;
> 	}
> 
>-	public IMember getFrom() {
>+	public IMember getPoster() {
> 		return author;
> 	}
> 
>-	public IMessageBase getReplyTo() {
>+	public IBBMessage getReplyTo() {
> 		// TODO Implement reply relationships
> 		return null;
> 	}
> 
>-	public void setReplyTo(IMessageBase message) throws IllegalWriteException {
>+	public void setReplyTo(IBBMessage message) throws IllegalWriteException {
> 		// TODO Auto-generated method stub
> 	}
> 
>@@ -95,14 +95,14 @@
> 		this.thread = thread;
> 	}
> 
>-	public void setName(String name) throws IllegalWriteException {
>+	public void setTitle(String name) throws IllegalWriteException {
> 		if ((mode & READ_ONLY) == READ_ONLY) {
> 			throw new IllegalWriteException(E_READ_ONLY);
> 		}
> 		this.name = name;
> 	}
> 
>-	public void setMessage(String message) throws IllegalWriteException {
>+	public void setBody(String message) throws IllegalWriteException {
> 		if ((mode & READ_ONLY) == READ_ONLY) {
> 			throw new IllegalWriteException(E_READ_ONLY);
> 		}
>Index: src/org/eclipse/ecf/internal/provider/vbulletin/VBulletin.java
>===================================================================
>RCS file: /cvsroot/technology/org.eclipse.ecf/incubation/plugins/org.eclipse.ecf.provider.vbulletin/src/org/eclipse/ecf/internal/provider/vbulletin/VBulletin.java,v
>retrieving revision 1.1
>diff -u -r1.1 VBulletin.java
>--- src/org/eclipse/ecf/internal/provider/vbulletin/VBulletin.java	27 Feb 2007 17:44:52 -0000	1.1
>+++ src/org/eclipse/ecf/internal/provider/vbulletin/VBulletin.java	5 Apr 2007 21:37:37 -0000
>@@ -22,7 +22,6 @@
> import org.eclipse.ecf.bulletinboard.IForum;
> import org.eclipse.ecf.bulletinboard.IThread;
> import org.eclipse.ecf.bulletinboard.IThreadMessage;
>-import org.eclipse.ecf.core.ContainerConnectException;
> import org.eclipse.ecf.core.identity.ID;
> import org.eclipse.ecf.internal.bulletinboard.commons.AbstractBulletinBoard;
> import org.eclipse.ecf.internal.bulletinboard.commons.webapp.GetRequest;
>@@ -86,7 +85,7 @@
> 		return this.title;
> 	}
> 
>-	public List<IForum> getForums() throws BBException {
>+	public IForum[] getForums() throws BBException {
> 		if (cachedForums.isEmpty()) {
> 			GetRequest request = new GetRequest(httpClient, url, "");
> 			try {
>@@ -101,17 +100,17 @@
> 				// log.error(e);
> 			}
> 		}
>-		return new ArrayList<IForum>(cachedForums.values());
>+		return cachedForums.values().toArray(new IForum[cachedForums.size()]);
> 	}
> 
>-	public List<IForum> getTopLevelForums() throws BBException {
>+	public IForum[] getTopLevelForums() throws BBException {
> 		List<IForum> topForums = new ArrayList<IForum>();
> 		for (IForum forum : getForums()) {
>-			if (forum.getParentForum() == null) {
>+			if (forum.getParent() == null) {
> 				topForums.add(forum);
> 			}
> 		}
>-		return topForums;
>+		return topForums.toArray(new IForum[topForums.size()]);
> 	}
> 
> 	public IForum getForum(ID id) throws BBException {
>Index: src/org/eclipse/ecf/internal/provider/vbulletin/Member.java
>===================================================================
>RCS file: /cvsroot/technology/org.eclipse.ecf/incubation/plugins/org.eclipse.ecf.provider.vbulletin/src/org/eclipse/ecf/internal/provider/vbulletin/Member.java,v
>retrieving revision 1.1
>diff -u -r1.1 Member.java
>--- src/org/eclipse/ecf/internal/provider/vbulletin/Member.java	27 Feb 2007 17:44:52 -0000	1.1
>+++ src/org/eclipse/ecf/internal/provider/vbulletin/Member.java	5 Apr 2007 21:37:37 -0000
>@@ -10,7 +10,6 @@
> *******************************************************************************/
> package org.eclipse.ecf.internal.provider.vbulletin;
> 
>-import java.util.Collection;
> import java.util.Collections;
> import java.util.Map;
> 
>@@ -18,7 +17,6 @@
> import org.eclipse.ecf.bulletinboard.IMemberGroup;
> import org.eclipse.ecf.core.identity.ID;
> import org.eclipse.ecf.internal.bulletinboard.commons.AbstractBulletinBoard;
>-import org.eclipse.ecf.internal.provider.vbulletin.identity.MemberID;
> 
> public class Member extends VBObject implements IMember {
> 	private static final long serialVersionUID = -1931142128734519538L;
>@@ -41,10 +39,10 @@
> 
> 	public boolean isMemberOf(IMemberGroup group) {
> 		// TODO maybe a better way?
>-		return group.getMembers().contains(this);
>+		return group.isMember(this);
> 	}
> 
>-	public Collection<IMemberGroup> getGroups() {
>+	public IMemberGroup[] getGroups() {
> 		// TODO Auto-generated method stub
> 		return null;
> 	}
>Index: src/org/eclipse/ecf/internal/provider/vbulletin/Forum.java
>===================================================================
>RCS file: /cvsroot/technology/org.eclipse.ecf/incubation/plugins/org.eclipse.ecf.provider.vbulletin/src/org/eclipse/ecf/internal/provider/vbulletin/Forum.java,v
>retrieving revision 1.1
>diff -u -r1.1 Forum.java
>--- src/org/eclipse/ecf/internal/provider/vbulletin/Forum.java	27 Feb 2007 17:44:52 -0000	1.1
>+++ src/org/eclipse/ecf/internal/provider/vbulletin/Forum.java	5 Apr 2007 21:37:37 -0000
>@@ -14,9 +14,7 @@
> import java.net.MalformedURLException;
> import java.net.URL;
> import java.util.ArrayList;
>-import java.util.Collection;
> import java.util.HashSet;
>-import java.util.List;
> import java.util.Map;
> 
> import org.apache.commons.httpclient.NameValuePair;
>@@ -64,15 +62,15 @@
> 		return IForum.HOLDS_THREADS | IForum.HOLDS_FORUMS;
> 	}
> 
>-	public IForum getParentForum() {
>+	public IForum getParent() {
> 		return parent;
> 	}
> 
>-	public List<IForum> getSubForums() {
>-		return subforums;
>+	public IForum[] getSubForums() {
>+		return subforums.toArray(new IForum[subforums.size()]);
> 	}
> 
>-	public Collection<IThread> getThreads() {
>+	public IThread[] getThreads() {
> 		VBParser parser = (VBParser) bb.getParser();
> 		Map<ID, IThread> threadMap = null;
> 		WebRequest request = new GetRequest(bb.getHttpClient(), getURL(), "");
>@@ -90,7 +88,7 @@
> 		} catch (IOException e) {
> 			e.printStackTrace();
> 		}
>-		return new HashSet<IThread>(threadMap.values());
>+		return threadMap.values().toArray(new IThread[threadMap.size()]);
> 	}
> 
> 	public URL getURL() {
>#P org.eclipse.ecf.provider.phpbb
>Index: src/org/eclipse/ecf/internal/provider/phpbb/MemberGroup.java
>===================================================================
>RCS file: /cvsroot/technology/org.eclipse.ecf/incubation/plugins/org.eclipse.ecf.provider.phpbb/src/org/eclipse/ecf/internal/provider/phpbb/MemberGroup.java,v
>retrieving revision 1.1
>diff -u -r1.1 MemberGroup.java
>--- src/org/eclipse/ecf/internal/provider/phpbb/MemberGroup.java	27 Feb 2007 17:43:32 -0000	1.1
>+++ src/org/eclipse/ecf/internal/provider/phpbb/MemberGroup.java	5 Apr 2007 21:37:39 -0000
>@@ -11,9 +11,8 @@
> package org.eclipse.ecf.internal.provider.phpbb;
> 
> import java.io.IOException;
>-import java.util.Collection;
>+import java.util.Arrays;
> import java.util.Collections;
>-import java.util.HashSet;
> import java.util.Map;
> 
> import org.apache.commons.httpclient.NameValuePair;
>@@ -66,7 +65,7 @@
> 		return description;
> 	}
> 
>-	public Collection<IMember> getMembers() {
>+	public IMember[] getMembers() {
> 		Map<ID, IMember> map = Collections.emptyMap();
> 		GetRequest request = new GetRequest(bb.getHttpClient(), bb.getURL(),
> 				"groupcp.php");
>@@ -85,7 +84,7 @@
> 		} catch (IOException e) {
> 			e.printStackTrace();
> 		}
>-		return new HashSet<IMember>(map.values());
>+		return map.values().toArray(new IMember[map.size()]);
> 	}
> 
> 	public ID getID() {
>@@ -109,4 +108,8 @@
> 	public int hashCode() {
> 		return id.hashCode();
> 	}
>+
>+	public boolean isMember(IMember member) {
>+		return Arrays.asList(getMembers()).contains(member);
>+	}
> }
>Index: src/org/eclipse/ecf/internal/provider/phpbb/PHPBBParser.java
>===================================================================
>RCS file: /cvsroot/technology/org.eclipse.ecf/incubation/plugins/org.eclipse.ecf.provider.phpbb/src/org/eclipse/ecf/internal/provider/phpbb/PHPBBParser.java,v
>retrieving revision 1.1
>diff -u -r1.1 PHPBBParser.java
>--- src/org/eclipse/ecf/internal/provider/phpbb/PHPBBParser.java	27 Feb 2007 17:43:32 -0000	1.1
>+++ src/org/eclipse/ecf/internal/provider/phpbb/PHPBBParser.java	5 Apr 2007 21:37:39 -0000
>@@ -64,8 +64,8 @@
> 
> 	public static final Pattern PAT_FORUM_OR_CATEGORY = Pattern
> 			.compile("(?:"
>-					+ " <a href=\"viewforum.php\\?f=([0-9]+)(?:.*)\" class=\"forumlink\">(.*)</a> "
>-					+ "(?:\\s*) (?s)(.*?)"
>+					+ "(?:\\s*)<a href=\"viewforum.php\\?f=([0-9]+)(?:.*)\" class=\"forumlink\">(.*)</a> "
>+					+ "(?:\\s*)(?:\\s*)(?s)(.*?)"
> 					+ ")|(?:"
> 					+ "<a href=\"index.php\\?c=([0-9]+)(?:.*)\" class=\"cattitle\">(.*)</a>"
> 					+ ")");
>@@ -136,7 +136,7 @@
> 				.defaultCustom(
> 						Pattern
> 								.compile(
>-										"<a href=\"viewtopic.php\\?t=([0-9]+)(?:.*?)\" class=\"topictitle\">(.*)</a>(?:.*?)(.+?)",
>+										"<a href=\"viewtopic.php\\?t=([0-9]+?)(?:.*?)\" class=\"topictitle\">(.+?)</a>(?:.*?)(.+?)",
> 										Pattern.DOTALL), new String[] { "id",
> 								"name", "authorInfo" });
> 	}
>Index: src/org/eclipse/ecf/internal/provider/phpbb/ThreadMessage.java
>===================================================================
>RCS file: /cvsroot/technology/org.eclipse.ecf/incubation/plugins/org.eclipse.ecf.provider.phpbb/src/org/eclipse/ecf/internal/provider/phpbb/ThreadMessage.java,v
>retrieving revision 1.1
>diff -u -r1.1 ThreadMessage.java
>--- src/org/eclipse/ecf/internal/provider/phpbb/ThreadMessage.java	27 Feb 2007 17:43:32 -0000	1.1
>+++ src/org/eclipse/ecf/internal/provider/phpbb/ThreadMessage.java	5 Apr 2007 21:37:41 -0000
>@@ -13,7 +13,7 @@
> import java.util.Date;
> 
> import org.eclipse.ecf.bulletinboard.IMember;
>-import org.eclipse.ecf.bulletinboard.IMessageBase;
>+import org.eclipse.ecf.bulletinboard.IBBMessage;
> import org.eclipse.ecf.bulletinboard.IThread;
> import org.eclipse.ecf.bulletinboard.IThreadMessage;
> import org.eclipse.ecf.bulletinboard.IllegalWriteException;
>@@ -49,20 +49,20 @@
> 		return -1;
> 	}
> 
>-	public String getMessage() {
>+	public String getBody() {
> 		return message;
> 	}
> 
>-	public IMember getFrom() {
>+	public IMember getPoster() {
> 		return author;
> 	}
> 
>-	public IMessageBase getReplyTo() {
>+	public IBBMessage getReplyTo() {
> 		// TODO Implement reply relationships
> 		return null;
> 	}
> 
>-	public void setReplyTo(IMessageBase message) throws IllegalWriteException {
>+	public void setReplyTo(IBBMessage message) throws IllegalWriteException {
> 		// TODO Auto-generated method stub
> 	}
> 
>@@ -82,14 +82,14 @@
> 		this.thread = thread;
> 	}
> 
>-	public void setName(String name) throws IllegalWriteException {
>+	public void setTitle(String name) throws IllegalWriteException {
> 		if ((mode & READ_ONLY) == READ_ONLY) {
> 			throw new IllegalWriteException(E_READ_ONLY);
> 		}
> 		this.name = name;
> 	}
> 
>-	public void setMessage(String message) throws IllegalWriteException {
>+	public void setBody(String message) throws IllegalWriteException {
> 		if ((mode & READ_ONLY) == READ_ONLY) {
> 			throw new IllegalWriteException(E_READ_ONLY);
> 		}
>Index: src/org/eclipse/ecf/internal/provider/phpbb/PHPBB.java
>===================================================================
>RCS file: /cvsroot/technology/org.eclipse.ecf/incubation/plugins/org.eclipse.ecf.provider.phpbb/src/org/eclipse/ecf/internal/provider/phpbb/PHPBB.java,v
>retrieving revision 1.1
>diff -u -r1.1 PHPBB.java
>--- src/org/eclipse/ecf/internal/provider/phpbb/PHPBB.java	27 Feb 2007 17:43:32 -0000	1.1
>+++ src/org/eclipse/ecf/internal/provider/phpbb/PHPBB.java	5 Apr 2007 21:37:39 -0000
>@@ -70,7 +70,7 @@
> 		return sessionId;
> 	}
> 
>-	public List<IForum> getForums() {
>+	public IForum[] getForums() {
> 		if (cachedForums.isEmpty()) {
> 			GetRequest request = new GetRequest(httpClient, url, "");
> 			try {
>@@ -85,17 +85,17 @@
> 				// log.error(e);
> 			}
> 		}
>-		return new ArrayList<IForum>(cachedForums.values());
>+		return cachedForums.values().toArray(new IForum[cachedForums.size()]);
> 	}
> 
>-	public List<IForum> getTopLevelForums() {
>+	public IForum[] getTopLevelForums() {
> 		List<IForum> topForums = new ArrayList<IForum>();
> 		for (IForum forum : getForums()) {
>-			if (forum.getParentForum() == null) {
>+			if (forum.getParent() == null) {
> 				topForums.add(forum);
> 			}
> 		}
>-		return topForums;
>+		return topForums.toArray(new IForum[topForums.size()]);
> 	}
> 
> 	public IForum getForum(ID id) {
>Index: src/org/eclipse/ecf/internal/provider/phpbb/Member.java
>===================================================================
>RCS file: /cvsroot/technology/org.eclipse.ecf/incubation/plugins/org.eclipse.ecf.provider.phpbb/src/org/eclipse/ecf/internal/provider/phpbb/Member.java,v
>retrieving revision 1.1
>diff -u -r1.1 Member.java
>--- src/org/eclipse/ecf/internal/provider/phpbb/Member.java	27 Feb 2007 17:43:32 -0000	1.1
>+++ src/org/eclipse/ecf/internal/provider/phpbb/Member.java	5 Apr 2007 21:37:39 -0000
>@@ -10,14 +10,12 @@
> *******************************************************************************/
> package org.eclipse.ecf.internal.provider.phpbb;
> 
>-import java.util.Collection;
> import java.util.Collections;
> import java.util.Map;
> 
> import org.eclipse.ecf.bulletinboard.IMember;
> import org.eclipse.ecf.bulletinboard.IMemberGroup;
> import org.eclipse.ecf.core.identity.ID;
>-import org.eclipse.ecf.internal.bulletinboard.commons.AbstractBulletinBoard;
> 
> public class Member extends PHPBBObject implements IMember {
> 	// private static final Logger log = Logger.getLogger(Member.class);
>@@ -37,10 +35,10 @@
> 
> 	public boolean isMemberOf(IMemberGroup group) {
> 		// TODO maybe a better way?
>-		return group.getMembers().contains(this);
>+		return group.isMember(this);
> 	}
> 
>-	public Collection<IMemberGroup> getGroups() {
>+	public IMemberGroup[] getGroups() {
> 		// TODO Auto-generated method stub
> 		return null;
> 	}
>Index: src/org/eclipse/ecf/internal/provider/phpbb/Thread.java
>===================================================================
>RCS file: /cvsroot/technology/org.eclipse.ecf/incubation/plugins/org.eclipse.ecf.provider.phpbb/src/org/eclipse/ecf/internal/provider/phpbb/Thread.java,v
>retrieving revision 1.1
>diff -u -r1.1 Thread.java
>--- src/org/eclipse/ecf/internal/provider/phpbb/Thread.java	27 Feb 2007 17:43:32 -0000	1.1
>+++ src/org/eclipse/ecf/internal/provider/phpbb/Thread.java	5 Apr 2007 21:37:41 -0000
>@@ -65,12 +65,12 @@
> 		return forum;
> 	}
> 
>-	public List<IThreadMessage> getMessages() throws BBException {
>+	public IThreadMessage[] getMessages() throws BBException {
> 		// TODO Auto-generated method stub
> 		return getNewMessages();
> 	}
> 
>-	public List<IThreadMessage> getNewMessages() throws BBException {
>+	public IThreadMessage[] getNewMessages() throws BBException {
> 		ThreadBrowser2 browser = new ThreadBrowser2((AbstractBulletinBoard) bb,
> 				this);
> 		List<IThreadMessage> msgs = browser.fetchNewMessages();
>@@ -85,10 +85,10 @@
> 				((Member) author).setBulletinBoard(bb);
> 			}
> 		}
>-		return msgs;
>+		return msgs.toArray(new IThreadMessage[msgs.size()]);
> 	}
> 
>-	public List<IThreadMessage> getNewMessages(ID lastReadId)
>+	public IThreadMessage[] getNewMessages(ID lastReadId)
> 			throws BBException {
> 		if (lastReadId != null) {
> 			lastReadMessageId = (ThreadMessageID) lastReadId;
>@@ -133,7 +133,7 @@
> 				"posting.php");
> 		NameValuePair[] params = new NameValuePair[] {
> 				new NameValuePair("subject", msg.getName()),
>-				new NameValuePair("message", msg.getMessage()),
>+				new NameValuePair("message", msg.getBody()),
> 				new NameValuePair("t", String.valueOf(id.getLongValue())),
> 				new NameValuePair("mode", "reply"),
> 				// checkbox : disabled new NameValuePair("disable_smilies",
>@@ -204,7 +204,7 @@
> 		return id.hashCode();
> 	}
> 
>-	public IMember getAuthor() {
>+	public IMember getPoster() {
> 		return author;
> 	}
> 
>Index: src/org/eclipse/ecf/internal/provider/phpbb/Forum.java
>===================================================================
>RCS file: /cvsroot/technology/org.eclipse.ecf/incubation/plugins/org.eclipse.ecf.provider.phpbb/src/org/eclipse/ecf/internal/provider/phpbb/Forum.java,v
>retrieving revision 1.1
>diff -u -r1.1 Forum.java
>--- src/org/eclipse/ecf/internal/provider/phpbb/Forum.java	27 Feb 2007 17:43:32 -0000	1.1
>+++ src/org/eclipse/ecf/internal/provider/phpbb/Forum.java	5 Apr 2007 21:37:39 -0000
>@@ -11,12 +11,8 @@
> package org.eclipse.ecf.internal.provider.phpbb;
> 
> import java.io.IOException;
>-import java.net.URISyntaxException;
> import java.net.URL;
> import java.util.ArrayList;
>-import java.util.Collection;
>-import java.util.HashSet;
>-import java.util.List;
> import java.util.Map;
> 
> import org.apache.commons.httpclient.NameValuePair;
>@@ -69,15 +65,15 @@
> 		return IForum.HOLDS_THREADS;
> 	}
> 
>-	public IForum getParentForum() {
>+	public IForum getParent() {
> 		return parent;
> 	}
> 
>-	public List<IForum> getSubForums() {
>-		return subforums;
>+	public IForum[] getSubForums() {
>+		return subforums.toArray(new IForum[subforums.size()]);
> 	}
> 
>-	public Collection<IThread> getThreads() {
>+	public IThread[] getThreads() {
> 		PHPBBParser parser = (PHPBBParser) bb.getParser();
> 		Map<ID, IThread> threadMap = null;
> 		try {
>@@ -97,7 +93,7 @@
> 			// TODO Auto-generated catch block
> 			e.printStackTrace();
> 		}
>-		return new HashSet<IThread>(threadMap.values());
>+		return threadMap.values().toArray(new IThread[threadMap.size()]);
> 	}
> 
> 	public IThread createThread() throws IllegalWriteException, BBException {
>@@ -123,7 +119,7 @@
> 				new NameValuePair("subject", thread.getPrePostMessage()
> 						.getName()),
> 				new NameValuePair("message", thread.getPrePostMessage()
>-						.getMessage()),
>+						.getBody()),
> 				new NameValuePair("f", String.valueOf(id.getLongValue())),
> 				new NameValuePair("mode", "newtopic"),
> 				// checkbox : disabled new NameValuePair("disable_smilies",
>Index: src/org/eclipse/ecf/internal/provider/phpbb/Category.java
>===================================================================
>RCS file: /cvsroot/technology/org.eclipse.ecf/incubation/plugins/org.eclipse.ecf.provider.phpbb/src/org/eclipse/ecf/internal/provider/phpbb/Category.java,v
>retrieving revision 1.1
>diff -u -r1.1 Category.java
>--- src/org/eclipse/ecf/internal/provider/phpbb/Category.java	27 Feb 2007 17:43:32 -0000	1.1
>+++ src/org/eclipse/ecf/internal/provider/phpbb/Category.java	5 Apr 2007 21:37:38 -0000
>@@ -10,9 +10,6 @@
> *******************************************************************************/
> package org.eclipse.ecf.internal.provider.phpbb;
> 
>-import java.util.Collections;
>-import java.util.List;
>-
> import org.eclipse.ecf.bulletinboard.BBException;
> import org.eclipse.ecf.bulletinboard.IForum;
> import org.eclipse.ecf.bulletinboard.IThread;
>@@ -38,8 +35,8 @@
> 		return IForum.HOLDS_FORUMS;
> 	}
> 
>-	public List<IThread> getThreads() {
>-		return Collections.emptyList();
>+	public IThread[] getThreads() {
>+		return new Thread[0];
> 	}
> 
> 	/*
>Index: src/org/eclipse/ecf/internal/provider/phpbb/GuestFactory.java
>===================================================================
>RCS file: /cvsroot/technology/org.eclipse.ecf/incubation/plugins/org.eclipse.ecf.provider.phpbb/src/org/eclipse/ecf/internal/provider/phpbb/GuestFactory.java,v
>retrieving revision 1.1
>diff -u -r1.1 GuestFactory.java
>--- src/org/eclipse/ecf/internal/provider/phpbb/GuestFactory.java	27 Feb 2007 17:43:32 -0000	1.1
>+++ src/org/eclipse/ecf/internal/provider/phpbb/GuestFactory.java	5 Apr 2007 21:37:39 -0000
>@@ -10,6 +10,7 @@
> *******************************************************************************/
> package org.eclipse.ecf.internal.provider.phpbb;
> 
>+import java.io.UnsupportedEncodingException;
> import java.net.URI;
> import java.net.URISyntaxException;
> import java.net.URL;
>@@ -39,6 +40,8 @@
> 			return new GuestID((PHPBBNamespace) namespace, baseURL, longValue);
> 		} catch (URISyntaxException e) {
> 			throw new IDCreateException(e);
>+		} catch (UnsupportedEncodingException e) {
>+			throw new IDCreateException(e);
> 		}
> 	}
> 
>Index: src/org/eclipse/ecf/internal/provider/phpbb/identity/GuestID.java
>===================================================================
>RCS file: /cvsroot/technology/org.eclipse.ecf/incubation/plugins/org.eclipse.ecf.provider.phpbb/src/org/eclipse/ecf/internal/provider/phpbb/identity/GuestID.java,v
>retrieving revision 1.1
>diff -u -r1.1 GuestID.java
>--- src/org/eclipse/ecf/internal/provider/phpbb/identity/GuestID.java	27 Feb 2007 17:43:32 -0000	1.1
>+++ src/org/eclipse/ecf/internal/provider/phpbb/identity/GuestID.java	5 Apr 2007 21:37:41 -0000
>@@ -10,9 +10,11 @@
> *******************************************************************************/
> package org.eclipse.ecf.internal.provider.phpbb.identity;
> 
>+import java.io.UnsupportedEncodingException;
> import java.net.URI;
> import java.net.URISyntaxException;
> import java.net.URL;
>+import java.net.URLEncoder;
> 
> import org.eclipse.ecf.internal.bulletinboard.commons.util.IDUtil;
> 
>@@ -25,9 +27,10 @@
> 	}
> 
> 	public GuestID(PHPBBNamespace namespace, URL baseURL, String name)
>-			throws URISyntaxException {
>+			throws URISyntaxException, UnsupportedEncodingException {
> 		super(namespace, IDUtil.composeURI(baseURL,
>-				"profile.php?mode=viewprofile&u=0#" + name));
>+				"profile.php?mode=viewprofile&u=0#"
>+						+ URLEncoder.encode(name, "UTF-8")));
> 	}
> 
> 	public long getLongValue() {
>#P org.eclipse.ecf.examples.bbreader
>Index: plugin.xml
>===================================================================
>RCS file: /cvsroot/technology/org.eclipse.ecf/incubation/plugins/org.eclipse.ecf.examples.bbreader/plugin.xml,v
>retrieving revision 1.1
>diff -u -r1.1 plugin.xml
>--- plugin.xml	27 Feb 2007 17:41:58 -0000	1.1
>+++ plugin.xml	5 Apr 2007 21:37:42 -0000
>@@ -129,7 +129,7 @@
> <objectContribution
> adaptable="false"
> id="org.eclipse.ecf.examples.bbreader.objectContribution2"
>- objectClass="org.eclipse.ecf.examples.bbreader.model.IURLProvider">
>+ objectClass="org.eclipse.ecf.examples.bbreader.model.IURIProvider">
> <action
> class="org.eclipse.ecf.examples.bbreader.actions.OpenInBrowserAction"
> id="org.eclipse.ecf.examples.bbreader.action1"
>Index: BB Explorer.launch
>===================================================================
>RCS file: /cvsroot/technology/org.eclipse.ecf/incubation/plugins/org.eclipse.ecf.examples.bbreader/BB Explorer.launch,v
>retrieving revision 1.1
>diff -u -r1.1 BB Explorer.launch
>--- BB Explorer.launch	27 Feb 2007 17:41:58 -0000	1.1
>+++ BB Explorer.launch	5 Apr 2007 21:37:42 -0000
>@@ -6,22 +6,22 @@
> <booleanAttribute key="useProduct" value="false"/>
> <stringAttribute key="deselected_workspace_plugins" value="org.tigris.bbapi.core,org.tigris.bbapi.example.reader,org.tigris.bbapi.googlegroups,org.tigris.bbapi.phpbb,org.tigris.bbapi.commons,org.tigris.bbapi.vbulletin,org.tigris.bbapi.phpbb.test,org.tigris.bbapi.vbulletin.test"/>
> <booleanAttribute key="tracing" value="false"/>
>-<stringAttribute key="selected_target_plugins" value="com.ibm.icu,org.apache.commons_logging,org.apache.jakarta_log4j,org.eclipse.core.commands,org.eclipse.core.contenttype,org.eclipse.core.expressions,org.eclipse.core.jobs,org.eclipse.core.runtime,org.eclipse.core.runtime.compatibility.auth,org.eclipse.core.runtime.compatibility.registry,org.eclipse.equinox.common,org.eclipse.equinox.preferences,org.eclipse.equinox.registry,org.eclipse.help,org.eclipse.jface,org.eclipse.osgi,org.eclipse.swt,org.eclipse.swt.win32.win32.x86,org.eclipse.ui,org.eclipse.ui.browser,org.eclipse.ui.forms,org.eclipse.ui.navigator,org.eclipse.ui.workbench"/>
>+<stringAttribute key="selected_target_plugins" value="com.ibm.icu,org.eclipse.core.commands,org.eclipse.core.contenttype,org.eclipse.core.databinding,org.eclipse.core.expressions,org.eclipse.core.jobs,org.eclipse.core.runtime,org.eclipse.core.runtime.compatibility.auth,org.eclipse.core.runtime.compatibility.registry,org.eclipse.equinox.app,org.eclipse.equinox.common,org.eclipse.equinox.preferences,org.eclipse.equinox.registry,org.eclipse.help,org.eclipse.jface,org.eclipse.jface.databinding,org.eclipse.osgi,org.eclipse.osgi.services,org.eclipse.swt,org.eclipse.swt.win32.win32.x86,org.eclipse.ui,org.eclipse.ui.browser,org.eclipse.ui.forms,org.eclipse.ui.navigator,org.eclipse.ui.workbench"/>
> <booleanAttribute key="automaticValidate" value="false"/>
> <booleanAttribute key="automaticAdd" value="false"/>
> <stringAttribute key="checked" value="[NONE]"/>
> <stringAttribute key="location" value="${workspace_loc}/../runtime-New_configuration"/>
>-<stringAttribute key="selected_workspace_plugins" value="org.eclipse.ecf.provider.nntp,org.eclipse.ecf.bulletinboard.commons,org.eclipse.ecf.bulletinboard,org.eclipse.ecf.provider.phpbb,org.apache.oro,org.eclipse.ecf.provider.vbulletin,org.eclipse.ecf.identity,org.eclipse.ecf.examples.bbreader,org.eclipse.mylar.context.core,org.apache.commons.httpclient,org.apache.commons.net,org.eclipse.ecf"/>
>-<stringAttribute key="configLocation" value=""/>
>+<stringAttribute key="selected_workspace_plugins" value="org.eclipse.ecf.provider.nntp,org.eclipse.ecf.provider.vbulletin,org.eclipse.ecf.identity,org.eclipse.ecf.examples.bbreader,org.eclipse.ecf.bulletinboard.commons,org.eclipse.mylar,org.eclipse.ecf.bulletinboard,org.apache.oro,org.apache.commons.net,org.eclipse.ecf.provider.phpbb,org.eclipse.ecf"/>
> <stringAttribute key="application" value="org.eclipse.ecf.examples.bbreader.bbReader"/>
>+<stringAttribute key="configLocation" value=""/>
> <booleanAttribute key="clearws" value="false"/>
>-<stringAttribute key="pde.version" value="3.2a"/>
>+<stringAttribute key="pde.version" value="3.3"/>
> <stringAttribute key="templateConfig" value="${target_home}\configuration\config.ini"/>
> <booleanAttribute key="default" value="false"/>
> <booleanAttribute key="clearConfig" value="false"/>
> <booleanAttribute key="org.eclipse.debug.core.appendEnvironmentVariables" value="true"/>
>-<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/>
> <booleanAttribute key="useDefaultConfigArea" value="true"/>
>+<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/>
> <booleanAttribute key="useDefaultConfig" value="true"/>
> <booleanAttribute key="askclear" value="true"/>
> <booleanAttribute key="includeOptional" value="true"/>
>Index: src/org/eclipse/ecf/examples/bbreader/navigator/Group.java
>===================================================================
>RCS file: /cvsroot/technology/org.eclipse.ecf/incubation/plugins/org.eclipse.ecf.examples.bbreader/src/org/eclipse/ecf/examples/bbreader/navigator/Group.java,v
>retrieving revision 1.1
>diff -u -r1.1 Group.java
>--- src/org/eclipse/ecf/examples/bbreader/navigator/Group.java	27 Feb 2007 17:41:57 -0000	1.1
>+++ src/org/eclipse/ecf/examples/bbreader/navigator/Group.java	5 Apr 2007 21:37:44 -0000
>@@ -3,8 +3,8 @@
> */
> package org.eclipse.ecf.examples.bbreader.navigator;
> 
>-import java.net.MalformedURLException;
>-import java.net.URL;
>+import java.net.URI;
>+import java.net.URISyntaxException;
> import java.util.ArrayList;
> import java.util.List;
> 
>@@ -12,10 +12,10 @@
> import org.eclipse.ecf.bulletinboard.IMemberGroup;
> import org.eclipse.ecf.examples.bbreader.Activator;
> import org.eclipse.ecf.examples.bbreader.model.ITreeNode;
>-import org.eclipse.ecf.examples.bbreader.model.IURLProvider;
>+import org.eclipse.ecf.examples.bbreader.model.IURIProvider;
> import org.eclipse.swt.graphics.Image;
> 
>-public final class Group implements ITreeNode, IURLProvider {
>+public final class Group implements ITreeNode, IURIProvider {
> 	private final ITreeNode parent;
> 
> 	private final IMemberGroup group;
>@@ -35,7 +35,7 @@
> 
> 	public List<ITreeNode> getChildren() {
> 		ArrayList<ITreeNode> list = new ArrayList<ITreeNode>();
>-		if (group.getMembers() != null && group.getMembers().size() > 0) {
>+		if (group.getMembers() != null && group.getMembers().length > 0) {
> 			for (Object o : group.getMembers()) {
> 				IMember m = (IMember) o;
> 				list.add(new Member(this, m));
>@@ -55,10 +55,10 @@
> 		return parent;
> 	}
> 
>-	public URL getURL() {
>+	public URI getURI() {
> 		try {
>-			return new URL(group.getID().toExternalForm());
>-		} catch (MalformedURLException e) {
>+			return new URI(group.getID().toExternalForm());
>+		} catch (URISyntaxException e) {
> 			// TODO Auto-generated catch block
> 			e.printStackTrace();
> 		}
>Index: src/org/eclipse/ecf/examples/bbreader/navigator/ThreadMessage.java
>===================================================================
>RCS file: /cvsroot/technology/org.eclipse.ecf/incubation/plugins/org.eclipse.ecf.examples.bbreader/src/org/eclipse/ecf/examples/bbreader/navigator/ThreadMessage.java,v
>retrieving revision 1.1
>diff -u -r1.1 ThreadMessage.java
>--- src/org/eclipse/ecf/examples/bbreader/navigator/ThreadMessage.java	27 Feb 2007 17:41:57 -0000	1.1
>+++ src/org/eclipse/ecf/examples/bbreader/navigator/ThreadMessage.java	5 Apr 2007 21:37:44 -0000
>@@ -3,18 +3,18 @@
> */
> package org.eclipse.ecf.examples.bbreader.navigator;
> 
>-import java.net.MalformedURLException;
>-import java.net.URL;
>+import java.net.URI;
>+import java.net.URISyntaxException;
> import java.util.List;
> 
> import org.eclipse.ecf.bulletinboard.IThreadMessage;
> import org.eclipse.ecf.examples.bbreader.Activator;
> import org.eclipse.ecf.examples.bbreader.model.ITreeNode;
>-import org.eclipse.ecf.examples.bbreader.model.IURLProvider;
>+import org.eclipse.ecf.examples.bbreader.model.IURIProvider;
> import org.eclipse.ecf.internal.bulletinboard.commons.util.StringUtil;
> import org.eclipse.swt.graphics.Image;
> 
>-public final class ThreadMessage implements ITreeNode, IURLProvider {
>+public final class ThreadMessage implements ITreeNode, IURIProvider {
> 	private final ITreeNode parent;
> 
> 	private final IThreadMessage msg;
>@@ -37,7 +37,7 @@
> 		} else {
> 			name.append(msg.getName());
> 		}
>-		name.append(" (by ").append(msg.getFrom().getName()).append(")");
>+		name.append(" (by ").append(msg.getPoster().getName()).append(")");
> 		return name.toString();
> 	}
> 
>@@ -57,10 +57,10 @@
> 		return parent;
> 	}
> 
>-	public URL getURL() {
>+	public URI getURI() {
> 		try {
>-			return new URL(msg.getID().toExternalForm());
>-		} catch (MalformedURLException e) {
>+			return new URI(msg.getID().toExternalForm());
>+		} catch (URISyntaxException e) {
> 			// TODO Auto-generated catch block
> 			e.printStackTrace();
> 		}
>Index: src/org/eclipse/ecf/examples/bbreader/navigator/BBRoot.java
>===================================================================
>RCS file: /cvsroot/technology/org.eclipse.ecf/incubation/plugins/org.eclipse.ecf.examples.bbreader/src/org/eclipse/ecf/examples/bbreader/navigator/BBRoot.java,v
>retrieving revision 1.1
>diff -u -r1.1 BBRoot.java
>--- src/org/eclipse/ecf/examples/bbreader/navigator/BBRoot.java	27 Feb 2007 17:41:57 -0000	1.1
>+++ src/org/eclipse/ecf/examples/bbreader/navigator/BBRoot.java	5 Apr 2007 21:37:44 -0000
>@@ -148,7 +148,7 @@
> 			BulletinBoard bb = (BulletinBoard) elem;
> 			IMemento child = memento.createChild(BB_ELEM);
> 			child.putString(TYPE_ELEM, bb.getContainerName());
>-			child.putString(URL_ELEM, bb.getURL().toString());
>+			child.putString(URL_ELEM, bb.getURI().toString());
> 			if (bb.getCredentials() != null) {
> 				child.putString(USERNAME_ELEM, bb.getCredentials()
> 						.getUsername());
>Index: src/org/eclipse/ecf/examples/bbreader/navigator/Forum.java
>===================================================================
>RCS file: /cvsroot/technology/org.eclipse.ecf/incubation/plugins/org.eclipse.ecf.examples.bbreader/src/org/eclipse/ecf/examples/bbreader/navigator/Forum.java,v
>retrieving revision 1.1
>diff -u -r1.1 Forum.java
>--- src/org/eclipse/ecf/examples/bbreader/navigator/Forum.java	27 Feb 2007 17:41:57 -0000	1.1
>+++ src/org/eclipse/ecf/examples/bbreader/navigator/Forum.java	5 Apr 2007 21:37:44 -0000
>@@ -3,8 +3,8 @@
> */
> package org.eclipse.ecf.examples.bbreader.navigator;
> 
>-import java.net.MalformedURLException;
>-import java.net.URL;
>+import java.net.URI;
>+import java.net.URISyntaxException;
> import java.util.ArrayList;
> import java.util.List;
> 
>@@ -12,10 +12,10 @@
> import org.eclipse.ecf.bulletinboard.IThread;
> import org.eclipse.ecf.examples.bbreader.Activator;
> import org.eclipse.ecf.examples.bbreader.model.ITreeNode;
>-import org.eclipse.ecf.examples.bbreader.model.IURLProvider;
>+import org.eclipse.ecf.examples.bbreader.model.IURIProvider;
> import org.eclipse.swt.graphics.Image;
> 
>-public final class Forum implements ITreeNode, IURLProvider {
>+public final class Forum implements ITreeNode, IURIProvider {
> 	private final ITreeNode parent;
> 
> 	private final IForum forum;
>@@ -35,7 +35,7 @@
> 
> 	public List<ITreeNode> getChildren() {
> 		ArrayList<ITreeNode> list = new ArrayList<ITreeNode>();
>-		if (forum.getSubForums() != null && forum.getSubForums().size() > 0) {
>+		if (forum.getSubForums() != null && forum.getSubForums().length > 0) {
> 			for (Object o : forum.getSubForums()) {
> 				IForum f = (IForum) o;
> 				list.add(new Forum(this, f));
>@@ -46,7 +46,7 @@
> 
> 	public List<ForumThread> getThreads() {
> 		ArrayList<ForumThread> list = new ArrayList<ForumThread>();
>-		if (forum.getThreads() != null && forum.getThreads().size() > 0) {
>+		if (forum.getThreads() != null && forum.getThreads().length > 0) {
> 			for (Object o : forum.getThreads()) {
> 				IThread t = (IThread) o;
> 				list.add(new ForumThread(this, t));
>@@ -56,7 +56,7 @@
> 	}
> 
> 	public boolean hasChildren() {
>-		return !forum.getSubForums().isEmpty();
>+		return forum.getSubForums().length > 0;
> 	}
> 
> 	public ITreeNode getParent() {
>@@ -68,10 +68,10 @@
> 	 * 
> 	 * @see org.eclipse.ecf.examples.bbreader.navigator.IURLProvider#getURL()
> 	 */
>-	public URL getURL() {
>+	public URI getURI() {
> 		try {
>-			return new URL(forum.getID().toExternalForm());
>-		} catch (MalformedURLException e) {
>+			return new URI(forum.getID().toExternalForm());
>+		} catch (URISyntaxException e) {
> 			// TODO Auto-generated catch block
> 			e.printStackTrace();
> 		}
>Index: src/org/eclipse/ecf/examples/bbreader/navigator/BulletinBoard.java
>===================================================================
>RCS file: /cvsroot/technology/org.eclipse.ecf/incubation/plugins/org.eclipse.ecf.examples.bbreader/src/org/eclipse/ecf/examples/bbreader/navigator/BulletinBoard.java,v
>retrieving revision 1.1
>diff -u -r1.1 BulletinBoard.java
>--- src/org/eclipse/ecf/examples/bbreader/navigator/BulletinBoard.java	27 Feb 2007 17:41:57 -0000	1.1
>+++ src/org/eclipse/ecf/examples/bbreader/navigator/BulletinBoard.java	5 Apr 2007 21:37:44 -0000
>@@ -3,8 +3,8 @@
> */
> package org.eclipse.ecf.examples.bbreader.navigator;
> 
>-import java.net.MalformedURLException;
>-import java.net.URL;
>+import java.net.URI;
>+import java.net.URISyntaxException;
> import java.util.Arrays;
> import java.util.Collections;
> import java.util.List;
>@@ -21,10 +21,10 @@
> import org.eclipse.ecf.examples.bbreader.Activator;
> import org.eclipse.ecf.examples.bbreader.jobs.ContainerConnectJob;
> import org.eclipse.ecf.examples.bbreader.model.ITreeNode;
>-import org.eclipse.ecf.examples.bbreader.model.IURLProvider;
>+import org.eclipse.ecf.examples.bbreader.model.IURIProvider;
> import org.eclipse.swt.graphics.Image;
> 
>-public final class BulletinBoard implements ITreeNode, IURLProvider, IAdaptable {
>+public final class BulletinBoard implements ITreeNode, IURIProvider, IAdaptable {
> 	private final ITreeNode parent;
> 
> 	private IContainer container;
>@@ -91,10 +91,10 @@
> 		return containerName;
> 	}
> 
>-	public URL getURL() {
>+	public URI getURI() {
> 		try {
>-			return new URL(id.toExternalForm());
>-		} catch (MalformedURLException e) {
>+			return new URI(id.toExternalForm());
>+		} catch (URISyntaxException e) {
> 			// TODO Auto-generated catch block
> 			e.printStackTrace();
> 		}
>Index: src/org/eclipse/ecf/examples/bbreader/navigator/ForumThread.java
>===================================================================
>RCS file: /cvsroot/technology/org.eclipse.ecf/incubation/plugins/org.eclipse.ecf.examples.bbreader/src/org/eclipse/ecf/examples/bbreader/navigator/ForumThread.java,v
>retrieving revision 1.1
>diff -u -r1.1 ForumThread.java
>--- src/org/eclipse/ecf/examples/bbreader/navigator/ForumThread.java	27 Feb 2007 17:41:57 -0000	1.1
>+++ src/org/eclipse/ecf/examples/bbreader/navigator/ForumThread.java	5 Apr 2007 21:37:44 -0000
>@@ -3,8 +3,8 @@
> */
> package org.eclipse.ecf.examples.bbreader.navigator;
> 
>-import java.net.MalformedURLException;
>-import java.net.URL;
>+import java.net.URI;
>+import java.net.URISyntaxException;
> import java.util.ArrayList;
> import java.util.List;
> 
>@@ -13,10 +13,10 @@
> import org.eclipse.ecf.bulletinboard.IThreadMessage;
> import org.eclipse.ecf.examples.bbreader.Activator;
> import org.eclipse.ecf.examples.bbreader.model.ITreeNode;
>-import org.eclipse.ecf.examples.bbreader.model.IURLProvider;
>+import org.eclipse.ecf.examples.bbreader.model.IURIProvider;
> import org.eclipse.swt.graphics.Image;
> 
>-public final class ForumThread implements ITreeNode, IURLProvider {
>+public final class ForumThread implements ITreeNode, IURIProvider {
> 	private final ITreeNode parent;
> 
> 	private final IThread thread;
>@@ -37,13 +37,11 @@
> 	@SuppressWarnings("unchecked")
> 	public List<ITreeNode> getChildren() {
> 		ArrayList<ITreeNode> list = new ArrayList<ITreeNode>();
>-		List<IThreadMessage> msgs = null;
>+		IThreadMessage[] msgs = null;
> 		try {
> 			msgs = thread.getMessages();
>-			if (msgs != null && msgs.size() > 0) {
>-				for (IThreadMessage msg : msgs) {
>-					list.add(new ThreadMessage(this, msg));
>-				}
>+			for (IThreadMessage msg : msgs) {
>+				list.add(new ThreadMessage(this, msg));
> 			}
> 		} catch (BBException e) {
> 			// TODO Auto-generated catch block
>@@ -67,10 +65,10 @@
> 		return thread;
> 	}
> 
>-	public URL getURL() {
>+	public URI getURI() {
> 		try {
>-			return new URL(thread.getID().toExternalForm());
>-		} catch (MalformedURLException e) {
>+			return new URI(thread.getID().toExternalForm());
>+		} catch (URISyntaxException e) {
> 			// TODO Auto-generated catch block
> 			e.printStackTrace();
> 		}
>Index: src/org/eclipse/ecf/examples/bbreader/navigator/Member.java
>===================================================================
>RCS file: /cvsroot/technology/org.eclipse.ecf/incubation/plugins/org.eclipse.ecf.examples.bbreader/src/org/eclipse/ecf/examples/bbreader/navigator/Member.java,v
>retrieving revision 1.1
>diff -u -r1.1 Member.java
>--- src/org/eclipse/ecf/examples/bbreader/navigator/Member.java	27 Feb 2007 17:41:57 -0000	1.1
>+++ src/org/eclipse/ecf/examples/bbreader/navigator/Member.java	5 Apr 2007 21:37:44 -0000
>@@ -3,17 +3,17 @@
> */
> package org.eclipse.ecf.examples.bbreader.navigator;
> 
>-import java.net.MalformedURLException;
>-import java.net.URL;
>+import java.net.URI;
>+import java.net.URISyntaxException;
> import java.util.List;
> 
> import org.eclipse.ecf.bulletinboard.IMember;
> import org.eclipse.ecf.examples.bbreader.Activator;
> import org.eclipse.ecf.examples.bbreader.model.ITreeNode;
>-import org.eclipse.ecf.examples.bbreader.model.IURLProvider;
>+import org.eclipse.ecf.examples.bbreader.model.IURIProvider;
> import org.eclipse.swt.graphics.Image;
> 
>-public final class Member implements ITreeNode, IURLProvider {
>+public final class Member implements ITreeNode, IURIProvider {
> 	private final ITreeNode parent;
> 
> 	private final IMember member;
>@@ -43,10 +43,10 @@
> 		return parent;
> 	}
> 
>-	public URL getURL() {
>+	public URI getURI() {
> 		try {
>-			return new URL(member.getID().toExternalForm());
>-		} catch (MalformedURLException e) {
>+			return new URI(member.getID().toExternalForm());
>+		} catch (URISyntaxException e) {
> 			// TODO Auto-generated catch block
> 			e.printStackTrace();
> 		}
>Index: src/org/eclipse/ecf/examples/bbreader/views/ThreadLabelProvider.java
>===================================================================
>RCS file: /cvsroot/technology/org.eclipse.ecf/incubation/plugins/org.eclipse.ecf.examples.bbreader/src/org/eclipse/ecf/examples/bbreader/views/ThreadLabelProvider.java,v
>retrieving revision 1.1
>diff -u -r1.1 ThreadLabelProvider.java
>--- src/org/eclipse/ecf/examples/bbreader/views/ThreadLabelProvider.java	27 Feb 2007 17:41:58 -0000	1.1
>+++ src/org/eclipse/ecf/examples/bbreader/views/ThreadLabelProvider.java	5 Apr 2007 21:37:44 -0000
>@@ -24,7 +24,7 @@
> 			case 0:
> 				return t.getThread().getName();
> 			case 1:
>-				return t.getThread().getAuthor().getName();
>+				return t.getThread().getPoster().getName();
> 				/*
> 				 * case 2: return t.getThread().getTimePosted().toGMTString();
> 				 * case 3: return t.getThread().getTimeUpdated().toGMTString();
>@@ -40,7 +40,7 @@
> 			case 0:
> 				return m.getMessage().getName();
> 			case 1:
>-				return m.getMessage().getFrom().getName();
>+				return m.getMessage().getPoster().getName();
> 			case 2:
> 				Date d = m.getMessage().getTimePosted();
> 				if (d == null) {
>Index: src/org/eclipse/ecf/examples/bbreader/views/MessageView.java
>===================================================================
>RCS file: /cvsroot/technology/org.eclipse.ecf/incubation/plugins/org.eclipse.ecf.examples.bbreader/src/org/eclipse/ecf/examples/bbreader/views/MessageView.java,v
>retrieving revision 1.1
>diff -u -r1.1 MessageView.java
>--- src/org/eclipse/ecf/examples/bbreader/views/MessageView.java	27 Feb 2007 17:41:58 -0000	1.1
>+++ src/org/eclipse/ecf/examples/bbreader/views/MessageView.java	5 Apr 2007 21:37:44 -0000
>@@ -107,7 +107,7 @@
> 
> 	private void fillData() {
> 		IThreadMessage msg = getMessage();
>-		author.setText(msg.getFrom().getName());
>+		author.setText(msg.getPoster().getName());
> 		subject.setText(msg.getName());
> 		Date d = msg.getTimePosted();
> 		if (d != null) {
>@@ -115,7 +115,7 @@
> 					DateFormat.SHORT);
> 			postDate.setText(fmt.format(d));
> 		}
>-		styledText.setText(msg.getMessage());
>+		styledText.setText(msg.getBody());
> 	}
> 
> 	public void selectionChanged(IWorkbenchPart part, ISelection selection) {
>Index: src/org/eclipse/ecf/examples/bbreader/editors/MessageEditor.java
>===================================================================
>RCS file: /cvsroot/technology/org.eclipse.ecf/incubation/plugins/org.eclipse.ecf.examples.bbreader/src/org/eclipse/ecf/examples/bbreader/editors/MessageEditor.java,v
>retrieving revision 1.1
>diff -u -r1.1 MessageEditor.java
>--- src/org/eclipse/ecf/examples/bbreader/editors/MessageEditor.java	27 Feb 2007 17:41:57 -0000	1.1
>+++ src/org/eclipse/ecf/examples/bbreader/editors/MessageEditor.java	5 Apr 2007 21:37:44 -0000
>@@ -128,7 +128,7 @@
> 
> 	private void fillData() {
> 		IThreadMessage msg = getMessage();
>-		author.setText(msg.getFrom().getName());
>+		author.setText(msg.getPoster().getName());
> 		subject.setText(msg.getName());
> 		Date d = msg.getTimePosted();
> 		if (d != null) {
>@@ -136,7 +136,7 @@
> 					DateFormat.SHORT);
> 			postDate.setText(fmt.format(d));
> 		}
>-		styledText.setText(msg.getMessage());
>+		styledText.setText(msg.getBody());
> 	}
> 
> 	@Override
>Index: src/org/eclipse/ecf/examples/bbreader/editors/MessageEditorInput.java
>===================================================================
>RCS file: /cvsroot/technology/org.eclipse.ecf/incubation/plugins/org.eclipse.ecf.examples.bbreader/src/org/eclipse/ecf/examples/bbreader/editors/MessageEditorInput.java,v
>retrieving revision 1.1
>diff -u -r1.1 MessageEditorInput.java
>--- src/org/eclipse/ecf/examples/bbreader/editors/MessageEditorInput.java	27 Feb 2007 17:41:57 -0000	1.1
>+++ src/org/eclipse/ecf/examples/bbreader/editors/MessageEditorInput.java	5 Apr 2007 21:37:44 -0000
>@@ -36,7 +36,7 @@
> 	}
> 
> 	public String getToolTipText() {
>-		return msg.getMessage();
>+		return msg.getBody();
> 	}
> 
> 	public Object getAdapter(Class adapter) {
>Index: src/org/eclipse/ecf/examples/bbreader/model/IURLProvider.java
>===================================================================
>RCS file: src/org/eclipse/ecf/examples/bbreader/model/IURLProvider.java
>diff -N src/org/eclipse/ecf/examples/bbreader/model/IURLProvider.java
>--- src/org/eclipse/ecf/examples/bbreader/model/IURLProvider.java	27 Feb 2007 17:41:58 -0000	1.1
>+++ /dev/null	1 Jan 1970 00:00:00 -0000
>@@ -1,9 +0,0 @@
>-package org.eclipse.ecf.examples.bbreader.model;
>-
>-import java.net.URL;
>-
>-public interface IURLProvider {
>-
>-	public URL getURL();
>-
>-}
>\ No newline at end of file
>Index: src/org/eclipse/ecf/examples/bbreader/actions/OpenInBrowserAction.java
>===================================================================
>RCS file: /cvsroot/technology/org.eclipse.ecf/incubation/plugins/org.eclipse.ecf.examples.bbreader/src/org/eclipse/ecf/examples/bbreader/actions/OpenInBrowserAction.java,v
>retrieving revision 1.1
>diff -u -r1.1 OpenInBrowserAction.java
>--- src/org/eclipse/ecf/examples/bbreader/actions/OpenInBrowserAction.java	27 Feb 2007 17:41:58 -0000	1.1
>+++ src/org/eclipse/ecf/examples/bbreader/actions/OpenInBrowserAction.java	5 Apr 2007 21:37:42 -0000
>@@ -1,9 +1,10 @@
> package org.eclipse.ecf.examples.bbreader.actions;
> 
>+import java.net.MalformedURLException;
> import java.util.ArrayList;
> import java.util.Iterator;
> 
>-import org.eclipse.ecf.examples.bbreader.model.IURLProvider;
>+import org.eclipse.ecf.examples.bbreader.model.IURIProvider;
> import org.eclipse.jface.action.IAction;
> import org.eclipse.jface.viewers.ISelection;
> import org.eclipse.jface.viewers.StructuredSelection;
>@@ -14,7 +15,7 @@
> 
> public class OpenInBrowserAction implements IObjectActionDelegate {
> 
>-	private ArrayList<IURLProvider> urlProviders;
>+	private ArrayList<IURIProvider> urlProviders;
> 
> 	private IWorkbenchPart targetPart;
> 
>@@ -28,10 +29,15 @@
> 
> 	public void run(IAction action) {
> 		try {
>-			for (IURLProvider urlProv : urlProviders) {
>+			for (IURIProvider urlProv : urlProviders) {
> 				IWebBrowser browser = targetPart.getSite().getWorkbenchWindow()
> 						.getWorkbench().getBrowserSupport().createBrowser(null);
>-				browser.openURL(urlProv.getURL());
>+				try {
>+					browser.openURL(urlProv.getURI().toURL());
>+				} catch (MalformedURLException e) {
>+					// TODO Auto-generated catch block
>+					e.printStackTrace();
>+				}
> 			}
> 		} catch (PartInitException e) {
> 			// TODO Auto-generated catch block
>@@ -41,13 +47,13 @@
> 
> 	@SuppressWarnings("unchecked")
> 	public void selectionChanged(IAction action, ISelection selection) {
>-		urlProviders = new ArrayList<IURLProvider>();
>+		urlProviders = new ArrayList<IURIProvider>();
> 		if (selection instanceof StructuredSelection) {
> 			StructuredSelection sel = (StructuredSelection) selection;
> 			for (Iterator<Object> iter = sel.iterator(); iter.hasNext();) {
> 				Object obj = iter.next();
>-				if (obj instanceof IURLProvider) {
>-					urlProviders.add((IURLProvider) obj);
>+				if (obj instanceof IURIProvider) {
>+					urlProviders.add((IURIProvider) obj);
> 				}
> 			}
> 		}
>Index: src/org/eclipse/ecf/examples/bbreader/model/IURIProvider.java
>===================================================================
>RCS file: src/org/eclipse/ecf/examples/bbreader/model/IURIProvider.java
>diff -N src/org/eclipse/ecf/examples/bbreader/model/IURIProvider.java
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ src/org/eclipse/ecf/examples/bbreader/model/IURIProvider.java	1 Jan 1970 00:00:00 -0000
>@@ -0,0 +1,9 @@
>+package org.eclipse.ecf.examples.bbreader.model;
>+
>+import java.net.URI;
>+
>+public interface IURIProvider {
>+
>+	public URI getURI();
>+
>+}
>#P org.eclipse.ecf.bulletinboard.commons
>Index: src/org/eclipse/ecf/internal/bulletinboard/commons/AbstractBulletinBoard.java
>===================================================================
>RCS file: /cvsroot/technology/org.eclipse.ecf/incubation/plugins/org.eclipse.ecf.bulletinboard.commons/src/org/eclipse/ecf/internal/bulletinboard/commons/AbstractBulletinBoard.java,v
>retrieving revision 1.2
>diff -u -r1.2 AbstractBulletinBoard.java
>--- src/org/eclipse/ecf/internal/bulletinboard/commons/AbstractBulletinBoard.java	14 Mar 2007 23:35:29 -0000	1.2
>+++ src/org/eclipse/ecf/internal/bulletinboard/commons/AbstractBulletinBoard.java	5 Apr 2007 21:37:46 -0000
>@@ -3,11 +3,7 @@
> import java.io.IOException;
> import java.net.MalformedURLException;
> import java.net.URL;
>-import java.util.ArrayList;
>-import java.util.Collection;
> import java.util.HashMap;
>-import java.util.HashSet;
>-import java.util.List;
> import java.util.Map;
> 
> import org.apache.commons.httpclient.HttpClient;
>@@ -94,8 +90,10 @@
> 	}
> 
> 	public Object getAdapter(Class adapter) {
>-		IAdapterManager adapterManager = Activator.getDefault().getAdapterManager();
>-		if (adapterManager == null) return null;
>+		IAdapterManager adapterManager = Activator.getDefault()
>+				.getAdapterManager();
>+		if (adapterManager == null)
>+			return null;
> 		return adapterManager.getAdapter(this, adapter);
> 	}
> 
>@@ -149,7 +147,7 @@
> 
> 	protected abstract WebRequest createMemberListRequest();
> 
>-	public List<IMember> getMembers() throws BBException {
>+	public IMember[] getMembers() throws BBException {
> 		// TODO: this only returns first page
> 		if (cachedMembers.isEmpty()) {
> 			WebRequest request = createMemberListRequest();
>@@ -165,12 +163,13 @@
> 				e.printStackTrace();
> 			}
> 		}
>-		return new ArrayList<IMember>(cachedMembers.values());
>+		return cachedMembers.values()
>+				.toArray(new IMember[cachedMembers.size()]);
> 	}
> 
> 	protected abstract WebRequest createMemberGroupListRequest();
> 
>-	public Collection<IMemberGroup> getMemberGroups() throws BBException {
>+	public IMemberGroup[] getMemberGroups() throws BBException {
> 		if (cachedMemberGroups.isEmpty()) {
> 			WebRequest request = createMemberGroupListRequest();
> 			try {
>@@ -182,10 +181,11 @@
> 					((AbstractBBObject) grp).setBulletinBoard(this);
> 				}
> 			} catch (IOException e) {
>-				// log.error(e);
>+				throw new BBException(e);
> 			}
> 		}
>-		return new HashSet<IMemberGroup>(cachedMemberGroups.values());
>+		return cachedMemberGroups.values().toArray(
>+				new IMemberGroup[cachedMemberGroups.size()]);
> 	}
> 
> 	public IMemberGroup getMemberGroup(ID id) throws BBException {
>#P org.eclipse.ecf.bulletinboard
>Index: src/org/eclipse/ecf/bulletinboard/IThread.java
>===================================================================
>RCS file: /cvsroot/technology/org.eclipse.ecf/incubation/plugins/org.eclipse.ecf.bulletinboard/src/org/eclipse/ecf/bulletinboard/IThread.java,v
>retrieving revision 1.1
>diff -u -r1.1 IThread.java
>--- src/org/eclipse/ecf/bulletinboard/IThread.java	27 Feb 2007 17:39:25 -0000	1.1
>+++ src/org/eclipse/ecf/bulletinboard/IThread.java	5 Apr 2007 21:37:47 -0000
>@@ -11,12 +11,11 @@
> package org.eclipse.ecf.bulletinboard;
> 
> import java.util.Date;
>-import java.util.List;
> 
> import org.eclipse.ecf.core.identity.ID;
> 
> /**
>- * Models a thread in a forum.
>+ * Represents a thread in a forum.
> * 
> * @author Erkki
> */
>@@ -44,11 +43,11 @@
> 	public int getType();
> 
> 	/**
>-	 * Returns the author of the thread.
>+	 * Returns the poster of the thread.
> 	 * 
>-	 * @return the author of the thread.
>+	 * @return the poster of the thread.
> 	 */
>-	public IMember getAuthor();
>+	public IMember getPoster();
> 
> 	public Date getTimePosted();
> 
>@@ -79,7 +78,7 @@
> 	 * @throws BBException
> 	 * if fetching the messages failed
> 	 */
>-	public List getMessages() throws BBException;
>+	public IThreadMessage[] getMessages() throws BBException;
> 
> 	/**
> 	 * Returns all new messages in this thread. The exact meaning of when a
>@@ -91,7 +90,7 @@
> 	 * @throws BBException
> 	 * if fetching the messages failed
> 	 */
>-	public List getNewMessages() throws BBException;
>+	public IThreadMessage[] getNewMessages() throws BBException;
> 
> 	/**
> 	 * Returns all new messages since the last read message ID given in the
>@@ -106,7 +105,7 @@
> 	 * @throws BBException
> 	 * if fetching the messages failed
> 	 */
>-	public List getNewMessages(ID lastPostId) throws BBException;
>+	public IThreadMessage[] getNewMessages(ID lastPostId) throws BBException;
> 
> 	/**
> 	 * Returns your subscription status of this thread. SUBSCRIBED or -1 if the
>Index: src/org/eclipse/ecf/bulletinboard/IPoll.java
>===================================================================
>RCS file: /cvsroot/technology/org.eclipse.ecf/incubation/plugins/org.eclipse.ecf.bulletinboard/src/org/eclipse/ecf/bulletinboard/IPoll.java,v
>retrieving revision 1.1
>diff -u -r1.1 IPoll.java
>--- src/org/eclipse/ecf/bulletinboard/IPoll.java	27 Feb 2007 17:39:25 -0000	1.1
>+++ src/org/eclipse/ecf/bulletinboard/IPoll.java	5 Apr 2007 21:37:47 -0000
>@@ -11,7 +11,6 @@
> package org.eclipse.ecf.bulletinboard;
> 
> import java.util.Collection;
>-import java.util.List;
> 
> /**
> * Models a poll. Some Bulletin Board implementations only allow a single poll
>@@ -68,7 +67,7 @@
> 	 * 
> 	 * @return the options
> 	 */
>-	public List getOptions();
>+	public IPollOption[] getOptions();
> 
> 	/**
> 	 * Returns a particular option for this poll, identified by the option
>@@ -89,7 +88,7 @@
> 	 * @throws BBException
> 	 * if fetching the votes failed.
> 	 */
>-	public List getSummaryVotes() throws BBException;
>+	public IPollVote[] getSummaryVotes() throws BBException;
> 
> 	/**
> 	 * Returns all the votes for this poll. One vote will be returned for all
>@@ -99,7 +98,7 @@
> 	 * @throws BBException
> 	 * if fetching the votes failed.
> 	 */
>-	public List getDetailVotes() throws BBException;
>+	public IPollVote[] getDetailVotes() throws BBException;
> 
> 	/**
> 	 * Creates a IPollVote implementation that can be used to vote on this poll.
>Index: src/org/eclipse/ecf/bulletinboard/IMessageBase.java
>===================================================================
>RCS file: src/org/eclipse/ecf/bulletinboard/IMessageBase.java
>diff -N src/org/eclipse/ecf/bulletinboard/IMessageBase.java
>--- src/org/eclipse/ecf/bulletinboard/IMessageBase.java	27 Feb 2007 17:39:25 -0000	1.1
>+++ /dev/null	1 Jan 1970 00:00:00 -0000
>@@ -1,82 +0,0 @@
>-/*******************************************************************************
>- * Copyright (c) 2005, 2006 Erkki Lindpere and others.
>- * All rights reserved. This program and the accompanying materials
>- * are made available under the terms of the Eclipse Public License v1.0
>- * which accompanies this distribution, and is available at
>- * http://www.eclipse.org/legal/epl-v10.html
>- *
>- * Contributors:
>- * Erkki Lindpere - initial API and implementation
>- *******************************************************************************/
>-package org.eclipse.ecf.bulletinboard;
>-
>-import java.util.Date;
>-
>-/**
>- * This interface contains accessors for properties common to Private and Thread
>- * Messages.
>- * 
>- * @author Erkki
>- */
>-public interface IMessageBase extends IBBObject {
>-	/**
>-	 * Returns the moment in time when this message was posted.
>-	 * 
>-	 * TODO Design timezone handling.
>-	 * 
>-	 * @return
>-	 */
>-	public Date getTimePosted();
>-
>-	/**
>-	 * Sets the name (title) of the message.
>-	 * 
>-	 * @param name
>-	 * the name to set
>-	 * @throws IllegalWriteException
>-	 * if the message is read-only
>-	 */
>-	public void setName(String name) throws IllegalWriteException;
>-
>-	/**
>-	 * Returns the contents of the message.
>-	 * 
>-	 * @return contents
>-	 */
>-	public String getMessage();
>-
>-	/**
>-	 * Sets the contents of the message.
>-	 * 
>-	 * @param message
>-	 * the contents to set
>-	 * @throws IllegalWriteException
>-	 * if the message is read-only
>-	 */
>-	public void setMessage(String message) throws IllegalWriteException;
>-
>-	/**
>-	 * Returns the author (sender) of the message.
>-	 * 
>-	 * @return author
>-	 */
>-	public IMember getFrom();
>-
>-	/**
>-	 * Returns the message that this one is a reply to or null if it's not a
>-	 * reply.
>-	 * 
>-	 * @return the message that this is a reply to
>-	 */
>-	public IMessageBase getReplyTo();
>-
>-	/**
>-	 * Sets this message as a reply to another message.
>-	 * 
>-	 * @param message
>-	 * the message that this will be set as a reply to.
>-	 * @throws IllegalWriteException
>-	 * if the message is read-only
>-	 */
>-	public void setReplyTo(IMessageBase message) throws IllegalWriteException;
>-}
>Index: src/org/eclipse/ecf/bulletinboard/IBulletinBoardContainerAdapter.java
>===================================================================
>RCS file: /cvsroot/technology/org.eclipse.ecf/incubation/plugins/org.eclipse.ecf.bulletinboard/src/org/eclipse/ecf/bulletinboard/IBulletinBoardContainerAdapter.java,v
>retrieving revision 1.1
>diff -u -r1.1 IBulletinBoardContainerAdapter.java
>--- src/org/eclipse/ecf/bulletinboard/IBulletinBoardContainerAdapter.java	27 Feb 2007 17:39:25 -0000	1.1
>+++ src/org/eclipse/ecf/bulletinboard/IBulletinBoardContainerAdapter.java	5 Apr 2007 21:37:47 -0000
>@@ -10,9 +10,6 @@
> *******************************************************************************/
> package org.eclipse.ecf.bulletinboard;
> 
>-import java.util.Collection;
>-import java.util.List;
>-
> import org.eclipse.core.runtime.IAdaptable;
> import org.eclipse.ecf.core.identity.ID;
> import org.eclipse.ecf.core.identity.IIdentifiable;
>@@ -24,7 +21,8 @@
> * 
> * @author Erkki
> */
>-public interface IBulletinBoardContainerAdapter extends IAdaptable, IIdentifiable {
>+public interface IBulletinBoardContainerAdapter extends IAdaptable,
>+		IIdentifiable {
> 
> 	/**
> 	 * Returns the title for this Bulletin Board.
>@@ -42,7 +40,7 @@
> 	 * @throws BBException
> 	 * if fetching the forums failed.
> 	 */
>-	public List getForums() throws BBException;
>+	public IForum[] getForums() throws BBException;
> 
> 	/**
> 	 * Returns all the top-level forums (or forum categories) that are visible
>@@ -52,7 +50,7 @@
> 	 * @throws BBException
> 	 * if fetching the forums failed
> 	 */
>-	public List getTopLevelForums() throws BBException;
>+	public IForum[] getTopLevelForums() throws BBException;
> 
> 	/**
> 	 * Returns a particular forum identified by the id parameter.
>@@ -102,7 +100,7 @@
> 	 * @throws BBException
> 	 * if fetching the groups failed
> 	 */
>-	public Collection getMemberGroups() throws BBException;
>+	public IMemberGroup[] getMemberGroups() throws BBException;
> 
> 	/**
> 	 * Returns a particular member group identified by the id parameter
>@@ -124,7 +122,7 @@
> 	 * @throws BBException
> 	 * if fetching the members failed.
> 	 */
>-	public List getMembers() throws BBException;
>+	public IMember[] getMembers() throws BBException;
> 
> 	/**
> 	 * Returns a particular member of the Bulletin Board identified by the id
>Index: src/org/eclipse/ecf/bulletinboard/BBException.java
>===================================================================
>RCS file: /cvsroot/technology/org.eclipse.ecf/incubation/plugins/org.eclipse.ecf.bulletinboard/src/org/eclipse/ecf/bulletinboard/BBException.java,v
>retrieving revision 1.2
>diff -u -r1.2 BBException.java
>--- src/org/eclipse/ecf/bulletinboard/BBException.java	31 Mar 2007 21:18:59 -0000	1.2
>+++ src/org/eclipse/ecf/bulletinboard/BBException.java	5 Apr 2007 21:37:47 -0000
>@@ -10,6 +10,7 @@
> *******************************************************************************/
> package org.eclipse.ecf.bulletinboard;
> 
>+import org.eclipse.core.runtime.IStatus;
> import org.eclipse.ecf.core.util.ECFException;
> 
> /**
>@@ -35,4 +36,8 @@
> 	public BBException(Throwable cause) {
> 		super(cause);
> 	}
>+
>+	public BBException(IStatus status) {
>+		super(status);
>+	}
> }
>Index: src/org/eclipse/ecf/bulletinboard/IMemberGroup.java
>===================================================================
>RCS file: /cvsroot/technology/org.eclipse.ecf/incubation/plugins/org.eclipse.ecf.bulletinboard/src/org/eclipse/ecf/bulletinboard/IMemberGroup.java,v
>retrieving revision 1.1
>diff -u -r1.1 IMemberGroup.java
>--- src/org/eclipse/ecf/bulletinboard/IMemberGroup.java	27 Feb 2007 17:39:25 -0000	1.1
>+++ src/org/eclipse/ecf/bulletinboard/IMemberGroup.java	5 Apr 2007 21:37:47 -0000
>@@ -10,8 +10,6 @@
> *******************************************************************************/
> package org.eclipse.ecf.bulletinboard;
> 
>-import java.util.Collection;
>-
> /**
> * Models a member group of a Bulletin Board.
> * 
>@@ -30,5 +28,13 @@
> 	 * 
> 	 * @return all group members
> 	 */
>-	public Collection getMembers();
>+	public IMember[] getMembers();
>+
>+	/**
>+	 * Whether the member given in the parameter is a member of this group.
>+	 * 
>+	 * @param member
>+	 * @return
>+	 */
>+	public boolean isMember(IMember member);
> }
>Index: src/org/eclipse/ecf/bulletinboard/IForum.java
>===================================================================
>RCS file: /cvsroot/technology/org.eclipse.ecf/incubation/plugins/org.eclipse.ecf.bulletinboard/src/org/eclipse/ecf/bulletinboard/IForum.java,v
>retrieving revision 1.1
>diff -u -r1.1 IForum.java
>--- src/org/eclipse/ecf/bulletinboard/IForum.java	27 Feb 2007 17:39:25 -0000	1.1
>+++ src/org/eclipse/ecf/bulletinboard/IForum.java	5 Apr 2007 21:37:47 -0000
>@@ -10,18 +10,30 @@
> *******************************************************************************/
> package org.eclipse.ecf.bulletinboard;
> 
>-import java.util.Collection;
>-import java.util.List;
> 
> /**
>- * This interface models a forum or a forum category.
>+ * This is an interface for forums and forum categories.
> * 
> * Some bulletin boards support flexible forum structures, including forums
> * inside other forums; some support forum categories that can contain forums,
> * but no forums inside other forums. Implementations should model categories as
>- * forums that do not have the HOLDS_FORUMS type.
>+ * forums that have the HOLDS_FORUMS type, but not the HOLDS_THREADS type.
> * 
>- * Two different forum instances representing the same forum must be equal.
>+ * <pre>
>+ * Flexible structure: 
>+ * Top Level Forum 1 - HOLDS_FORUMS | HOLDS_THREADS
>+ * 		Sub Forum 2 - HOLDS_FORUMS | HOLDS_THREADS
>+ * 			Sub Sub Forum 3 - HOLDS_FORUMS | HOLDS_THREADS
>+ * 		Sub Forum 4 - HOLDS_FORUMS | HOLDS_THREADS
>+ * 
>+ * Fixed structure:
>+ * Category 1 - HOLDS_FORUMS
>+ * 		Forum 1 - HOLDS_THREADS
>+ * Category 2 - HOLDS_FORUMS
>+ * 		Forum 2 - HOLDS_THREADS
>+ * </pre>
>+ * 
>+ * Two different IForum instances representing the same forum must be equal.
> * 
> * @author Erkki
> */
>@@ -32,7 +44,7 @@
> 	public static final int HOLDS_FORUMS = 1;
> 
> 	/**
>-	 * This forum can contain messages.
>+	 * This forum can contain threads.
> 	 */
> 	public static final int HOLDS_THREADS = 2;
> 
>@@ -56,7 +68,7 @@
> 	 * 
> 	 * @return the parent of this forum or null
> 	 */
>-	public IForum getParentForum();
>+	public IForum getParent();
> 
> 	/**
> 	 * Returns the subforums of this forum or an empty list if there are none.
>@@ -65,7 +77,7 @@
> 	 * 
> 	 * @return subforums
> 	 */
>-	public List getSubForums();
>+	public IForum[] getSubForums();
> 
> 	/**
> 	 * Returns the threads in this forum or an empty list if there are none.
>@@ -74,7 +86,7 @@
> 	 * 
> 	 * @return threads
> 	 */
>-	public Collection getThreads();
>+	public IThread[] getThreads();
> 
> 	/**
> 	 * Returns a newly created thread that can be filled and posted in this
>Index: src/org/eclipse/ecf/bulletinboard/IMember.java
>===================================================================
>RCS file: /cvsroot/technology/org.eclipse.ecf/incubation/plugins/org.eclipse.ecf.bulletinboard/src/org/eclipse/ecf/bulletinboard/IMember.java,v
>retrieving revision 1.1
>diff -u -r1.1 IMember.java
>--- src/org/eclipse/ecf/bulletinboard/IMember.java	27 Feb 2007 17:39:25 -0000	1.1
>+++ src/org/eclipse/ecf/bulletinboard/IMember.java	5 Apr 2007 21:37:47 -0000
>@@ -10,7 +10,6 @@
> *******************************************************************************/
> package org.eclipse.ecf.bulletinboard;
> 
>-import java.util.Collection;
> 
> /**
> * This interface models a forum Member.
>@@ -35,5 +34,5 @@
> 	 * 
> 	 * @return
> 	 */
>-	public Collection getGroups();
>+	public IMemberGroup[] getGroups();
> }
>Index: src/org/eclipse/ecf/bulletinboard/IPrivateMessage.java
>===================================================================
>RCS file: /cvsroot/technology/org.eclipse.ecf/incubation/plugins/org.eclipse.ecf.bulletinboard/src/org/eclipse/ecf/bulletinboard/IPrivateMessage.java,v
>retrieving revision 1.1
>diff -u -r1.1 IPrivateMessage.java
>--- src/org/eclipse/ecf/bulletinboard/IPrivateMessage.java	27 Feb 2007 17:39:25 -0000	1.1
>+++ src/org/eclipse/ecf/bulletinboard/IPrivateMessage.java	5 Apr 2007 21:37:47 -0000
>@@ -10,24 +10,22 @@
> *******************************************************************************/
> package org.eclipse.ecf.bulletinboard;
> 
>-import java.util.List;
>-
> /**
>- * Models a message sent using Private Messaging of a Bulletin Board.
>+ * Represents a message sent using Private Messaging of a Bulletin Board.
> * 
>- * Extends the IMessageBase interface with additional properties that are
>+ * Extends the {@link IBBMessage} interface with additional properties that are
> * specific to private messages.
> * 
> * @author Erkki
> */
>-public interface IPrivateMessage extends IMessageBase {
>+public interface IPrivateMessage extends IBBMessage {
> 
> 	/**
> 	 * Returns the recipients of this message.
> 	 * 
> 	 * @return the recipients
> 	 */
>-	public List getRecipients();
>+	public IMember[] getRecipients();
> 
> 	/**
> 	 * Sets the recipient of this message.
>@@ -47,6 +45,6 @@
> 	 * @throws IllegalWriteException
> 	 * if the message is read-only
> 	 */
>-	public void setRecipients(List recipients)
>+	public void setRecipients(IMember[] recipients)
> 			throws IllegalWriteException;
> }
>Index: src/org/eclipse/ecf/bulletinboard/IThreadMessage.java
>===================================================================
>RCS file: /cvsroot/technology/org.eclipse.ecf/incubation/plugins/org.eclipse.ecf.bulletinboard/src/org/eclipse/ecf/bulletinboard/IThreadMessage.java,v
>retrieving revision 1.1
>diff -u -r1.1 IThreadMessage.java
>--- src/org/eclipse/ecf/bulletinboard/IThreadMessage.java	27 Feb 2007 17:39:25 -0000	1.1
>+++ src/org/eclipse/ecf/bulletinboard/IThreadMessage.java	5 Apr 2007 21:37:47 -0000
>@@ -11,14 +11,14 @@
> package org.eclipse.ecf.bulletinboard;
> 
> /**
>- * Models a thread message in a Bulletin Board forum.
>+ * Represents a thread message in a Bulletin Board forum.
> * 
>- * Extends the IMessageBase interface with additional properties that are
>+ * Extends the {@link IBBMessage} interface with additional properties that are
> * specific to thread messages.
> * 
> * @author Erkki
> */
>-public interface IThreadMessage extends IMessageBase {
>+public interface IThreadMessage extends IBBMessage {
> 	/**
> 	 * Returns the thread that this message belongs to or null if it's unknown.
> 	 * 
>Index: src/org/eclipse/ecf/bulletinboard/IBBMessage.java
>===================================================================
>RCS file: src/org/eclipse/ecf/bulletinboard/IBBMessage.java
>diff -N src/org/eclipse/ecf/bulletinboard/IBBMessage.java
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ src/org/eclipse/ecf/bulletinboard/IBBMessage.java	1 Jan 1970 00:00:00 -0000
>@@ -0,0 +1,84 @@
>+/*******************************************************************************
>+ * Copyright (c) 2005, 2006 Erkki Lindpere and others.
>+ * All rights reserved. This program and the accompanying materials
>+ * are made available under the terms of the Eclipse Public License v1.0
>+ * which accompanies this distribution, and is available at
>+ * http://www.eclipse.org/legal/epl-v10.html
>+ *
>+ * Contributors:
>+ * Erkki Lindpere - initial API and implementation
>+ *******************************************************************************/
>+package org.eclipse.ecf.bulletinboard;
>+
>+import java.util.Date;
>+
>+/**
>+ * This is a super interface for all bulletin board messages and contains
>+ * accessors for properties common to both private and thread messages.
>+ * 
>+ * @see IThreadMessage, IPrivateMessage
>+ * 
>+ * @author Erkki
>+ */
>+public interface IBBMessage extends IBBObject {
>+	/**
>+	 * Returns the poster of the message.
>+	 * 
>+	 * @return author
>+	 */
>+	public IMember getPoster();
>+
>+	/**
>+	 * Returns the moment in time when this message was posted.
>+	 * 
>+	 * TODO Design timezone handling.
>+	 * 
>+	 * @return
>+	 */
>+	public Date getTimePosted();
>+
>+	/**
>+	 * Sets the name (title) of the message.
>+	 * 
>+	 * @param name
>+	 * the name to set
>+	 * @throws IllegalWriteException
>+	 * if the message is read-only
>+	 */
>+	public void setTitle(String name) throws IllegalWriteException;
>+
>+	/**
>+	 * Returns the contents of the message.
>+	 * 
>+	 * @return contents
>+	 */
>+	public String getBody();
>+
>+	/**
>+	 * Sets the contents of the message.
>+	 * 
>+	 * @param body
>+	 * the contents to set
>+	 * @throws IllegalWriteException
>+	 * if the message is read-only
>+	 */
>+	public void setBody(String body) throws IllegalWriteException;
>+
>+	/**
>+	 * Returns the message that this one is a reply to or null if it's not a
>+	 * reply.
>+	 * 
>+	 * @return the message that this is a reply to
>+	 */
>+	public IBBMessage getReplyTo();
>+
>+	/**
>+	 * Sets this message as a reply to another message.
>+	 * 
>+	 * @param message
>+	 * the message that this will be set as a reply to.
>+	 * @throws IllegalWriteException
>+	 * if the message is read-only
>+	 */
>+	public void setReplyTo(IBBMessage message) throws IllegalWriteException;
>+}

Actions: View | Diff

Attachments on bug 180796: 62829 | 63118 | 63119