Author: xor
Date: 2008-11-06 01:37:00 +0000 (Thu, 06 Nov 2008)
New Revision: 23330
Modified:
trunk/plugins/Freetalk/Backup.java
trunk/plugins/Freetalk/FTBoard.java
trunk/plugins/Freetalk/FTDealer.java
trunk/plugins/Freetalk/FTIdentityManager.java
trunk/plugins/Freetalk/FTMessage.java
trunk/plugins/Freetalk/FTMessageManager.java
trunk/plugins/Freetalk/FTOwnIdentity.java
trunk/plugins/Freetalk/Freetalk.java
trunk/plugins/Freetalk/WoT/FTIdentityManagerWoT.java
trunk/plugins/Freetalk/WoT/FTIdentityWoT.java
trunk/plugins/Freetalk/WoT/FTMessageManagerWoT.java
trunk/plugins/Freetalk/WoT/FTMessageWoT.java
trunk/plugins/Freetalk/WoT/FTOwnIdentityWoT.java
trunk/plugins/Freetalk/ui/Errors.java
trunk/plugins/Freetalk/ui/IdentityEditor.java
trunk/plugins/Freetalk/ui/Messages.java
trunk/plugins/Freetalk/ui/Status.java
trunk/plugins/Freetalk/ui/Welcome.java
Log:
Rename FMS to Freetalk stage 3/3: Change any usages of the old class names to
the new class names.
Modified: trunk/plugins/Freetalk/Backup.java
===================================================================
--- trunk/plugins/Freetalk/Backup.java 2008-11-06 01:12:25 UTC (rev 23329)
+++ trunk/plugins/Freetalk/Backup.java 2008-11-06 01:37:00 UTC (rev 23330)
@@ -36,10 +36,10 @@
w.write("<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n");
w.write("<fms-kidding>\n");
w.write("\t<OwnIdentities>\n");
- ObjectSet<FMSOwnIdentity> ownIdentities =
config_db.queryByExample(FMSOwnIdentity.class);
+ ObjectSet<FTOwnIdentity> ownIdentities =
config_db.queryByExample(FTOwnIdentity.class);
while (ownIdentities.hasNext()) {
- FMSOwnIdentity id = ownIdentities.next();
+ FTOwnIdentity id = ownIdentities.next();
w.write("\t\t<OwnIdentity>\n");
w.write("\t\t\t<Nick>");
XMLUtils.writeEsc(w, id.getNickName());
@@ -59,11 +59,11 @@
w.write("\t</OwnIdentities>\n");
w.write("\t<Identities>\n");
- ObjectSet<FMSIdentity> identities =
config_db.queryByExample(FMSIdentity.class);
+ ObjectSet<FTIdentity> identities =
config_db.queryByExample(FTIdentity.class);
while (identities.hasNext()) {
- FMSIdentity id = identities.next();
- if (id instanceof FMSOwnIdentity)
+ FTIdentity id = identities.next();
+ if (id instanceof FTOwnIdentity)
continue;
w.write("\t\t<Identity>\n");
w.write("\t\t\t<Nick>");
@@ -182,7 +182,7 @@
if ("OwnIdentity".equals(name)) {
// FIXME: repair this.
/*
- FMSOwnIdentity oid = new FMSOwnIdentity(nick,
requestUri, insertUri, publishTL);
+ FTOwnIdentity oid = new FTOwnIdentity(nick,
requestUri, insertUri, publishTL);
config_db.store(oid);
config_db.commit();
*/
@@ -192,7 +192,7 @@
if ("Identity".equals(name)) {
// FIXME: repair this.
/*
- FMSIdentity id = new FMSIdentity(nick,
requestUri);
+ FTIdentity id = new FTIdentity(nick,
requestUri);
config_db.store(id);
config_db.commit();
*/
Modified: trunk/plugins/Freetalk/FTBoard.java
===================================================================
--- trunk/plugins/Freetalk/FTBoard.java 2008-11-06 01:12:25 UTC (rev 23329)
+++ trunk/plugins/Freetalk/FTBoard.java 2008-11-06 01:37:00 UTC (rev 23330)
@@ -20,9 +20,9 @@
private transient final ObjectContainer db;
- private transient final FMSBoard self = this;
+ private transient final FTBoard self = this;
- private transient final FMSMessageManager mMessageManager;
+ private transient final FTMessageManager mMessageManager;
private final String mName;
@@ -33,7 +33,7 @@
return new String[] {"mName"};
}
- public FTBoard(ObjectContainer myDB, FMSMessageManager
newMessageManager, String newName) {
+ public FTBoard(ObjectContainer myDB, FTMessageManager
newMessageManager, String newName) {
if(newName==null || newName.length() == 0)
throw new IllegalArgumentException("Empty board name.");
@@ -57,11 +57,11 @@
}
/**
- * Called by the <code>FMSMessageManager</code> to add a just received
message to the board.
+ * Called by the <code>FTMessageManager</code> to add a just received
message to the board.
* The job for this function is to find the right place in the
thread-tree for the new message and to move around older messages
* if a parent message of them is received.
*/
- public synchronized void addMessage(FMSMessage newMessage) throws
UpdatableSortedLinkedListKilledException {
+ public synchronized void addMessage(FTMessage newMessage) throws
UpdatableSortedLinkedListKilledException {
synchronized(mMessageManager) {
db.store(newMessage);
db.commit();
@@ -69,8 +69,8 @@
if(!newMessage.isThread())
{
FreenetURI parentURI =
newMessage.getParentURI();
- FMSMessage parentMessage =
mMessageManager.get(parentURI); /* TODO: This allows crossposting. Figure out
whether we need to handle it specially */
- FMSMessage parentThread =
findParentThread(newMessage);
+ FTMessage parentMessage =
mMessageManager.get(parentURI); /* TODO: This allows crossposting. Figure out
whether we need to handle it specially */
+ FTMessage parentThread =
findParentThread(newMessage);
if(parentThread != null)
newMessage.setThread(parentThread);
@@ -97,20 +97,20 @@
}
}
- private synchronized void linkOrphansToNewParent(FMSMessage newMessage)
throws UpdatableSortedLinkedListKilledException {
+ private synchronized void linkOrphansToNewParent(FTMessage newMessage)
throws UpdatableSortedLinkedListKilledException {
if(newMessage.isThread()) {
- Iterator<FMSMessage> absoluteOrphans =
absoluteOrphanIterator(newMessage.getURI());
+ Iterator<FTMessage> absoluteOrphans =
absoluteOrphanIterator(newMessage.getURI());
while(absoluteOrphans.hasNext()){ /* Search in
the absolute orphans for messages which belong to this thread */
- FMSMessage orphan = absoluteOrphans.next();
+ FTMessage orphan = absoluteOrphans.next();
orphan.setParent(newMessage);
}
}
else {
- FMSMessage parentThread = newMessage.getThread();
+ FTMessage parentThread = newMessage.getThread();
if(parentThread != null) { /* Search in its parent
thread for its children */
- Iterator<FMSMessage> iter =
parentThread.childrenIterator(this);
+ Iterator<FTMessage> iter =
parentThread.childrenIterator(this);
while(iter.hasNext()) {
- FMSMessage parentThreadChild =
iter.next();
+ FTMessage parentThreadChild =
iter.next();
if(parentThreadChild.getParentURI().equals(newMessage.getURI())) { /* We found
its parent, yeah! */
parentThreadChild.setParent(newMessage); /* It's a child of the newMessage, not
of the parentThread */
@@ -118,9 +118,9 @@
}
}
else { /* The new message is an absolute orphan, find
its children amongst the other absolute orphans */
- Iterator<FMSMessage> absoluteOrphans =
absoluteOrphanIterator(newMessage.getURI());
+ Iterator<FTMessage> absoluteOrphans =
absoluteOrphanIterator(newMessage.getURI());
while(absoluteOrphans.hasNext()){ /*
Search in the orphans for messages which belong to this message */
- FMSMessage orphan =
absoluteOrphans.next();
+ FTMessage orphan =
absoluteOrphans.next();
/*
* The following if() could be joined
into the db4o query in absoluteOrphanIterator(). I did not do it because we
could
* cache the list of absolute orphans
locally.
@@ -132,15 +132,15 @@
}
}
- protected synchronized FMSMessage findParentThread(FMSMessage m) {
+ protected synchronized FTMessage findParentThread(FTMessage m) {
Query q = db.query();
- q.constrain(FMSMessage.class);
+ q.constrain(FTMessage.class);
/* FIXME: I assume that db4o is configured to keep an URI index
per board. We still have to ensure in FMS.java that it is configured to do so.
* If my second assumption - that the descend() statements are
evaluated in the specified order - is true, then it might be faste because the
* URI index is smaller per board than the global URI index. */
q.descend("mBoards").constrain(mName);
q.descend("mURI").constrain(m.getParentThreadURI());
- ObjectSet<FMSMessage> parents = q.execute();
+ ObjectSet<FTMessage> parents = q.execute();
assert(parents.size() <= 1);
@@ -149,15 +149,15 @@
/**
- * Get all threads in the board. The view is specified to the
FMSOwnIdentity displaying it, therefore you have to pass one as parameter.
+ * Get all threads in the board. The view is specified to the
FTOwnIdentity displaying it, therefore you have to pass one as parameter.
* @param identity The identity viewing the board.
* @return An iterator of the message which the identity will see
(based on its trust levels).
*/
- public synchronized Iterator<FMSMessage> threadIterator(final
FMSOwnIdentity identity) {
- return new Iterator<FMSMessage>() {
- private final FMSOwnIdentity mIdentity = identity;
- private final Iterator<FMSMessage> iter;
- private FMSMessage next;
+ public synchronized Iterator<FTMessage> threadIterator(final
FTOwnIdentity identity) {
+ return new Iterator<FTMessage>() {
+ private final FTOwnIdentity mIdentity = identity;
+ private final Iterator<FTMessage> iter;
+ private FTMessage next;
{
/* FIXME: If db4o supports precompiled queries,
this one should be stored precompiled.
@@ -165,7 +165,7 @@
* Maybe we can just keep the Query-object and
call q.execute() as many times as we like to?
* Or somehow tell db4o to keep a per-board
thread index which is sorted by Date? - This would be the best solution */
Query q = db.query();
- q.constrain(FMSMessage.class);
+ q.constrain(FTMessage.class);
q.descend("mBoards").constrain(mName); /*
FIXME: mBoards is an array. Does constrain() check whether it contains the
element mName? */
q.descend("mThread").constrain(null);
q.descend("mDate").orderDescending();
@@ -183,8 +183,8 @@
return false;
}
- public FMSMessage next() {
- FMSMessage result = hasNext() ? next : null;
+ public FTMessage next() {
+ FTMessage result = hasNext() ? next : null;
next = iter.hasNext() ? iter.next() : null;
return result;
}
@@ -199,16 +199,16 @@
/**
* Get an iterator over messages for which the parent thread with the
given URI was not known.
*/
- public synchronized Iterator<FMSMessage> absoluteOrphanIterator(final
FreenetURI thread) {
- return new Iterator<FMSMessage>() {
- private final ObjectSet<FMSMessage> mMessages;
- private final Iterator<FMSMessage> iter;
+ public synchronized Iterator<FTMessage> absoluteOrphanIterator(final
FreenetURI thread) {
+ return new Iterator<FTMessage>() {
+ private final ObjectSet<FTMessage> mMessages;
+ private final Iterator<FTMessage> iter;
{
/* FIXME: This query should be accelerated. The
amount of absolute orphans is very small usually, so we should configure db4o
* to keep a separate list of those. */
Query q = db.query();
- q.constrain(FMSMessage.class);
+ q.constrain(FTMessage.class);
q.descend("mBoards").constrain(mName); /*
FIXME: mBoards is an array. Does constrain() check whether it contains the
element mName? */
q.descend("mThreadURI").constrain(thread);
q.descend("mThread").constrain(null);
@@ -220,7 +220,7 @@
return mMessages.hasNext();
}
- public FMSMessage next() {
+ public FTMessage next() {
return mMessages.next();
}
Modified: trunk/plugins/Freetalk/FTDealer.java
===================================================================
--- trunk/plugins/Freetalk/FTDealer.java 2008-11-06 01:12:25 UTC (rev
23329)
+++ trunk/plugins/Freetalk/FTDealer.java 2008-11-06 01:37:00 UTC (rev
23330)
@@ -11,7 +11,7 @@
private final Executor _executor;
// services
- private FMSIdentityManager identManager;
+ private FTIdentityManager identManager;
FTDealer(Executor executor) {
this._executor = executor;
Modified: trunk/plugins/Freetalk/FTIdentityManager.java
===================================================================
--- trunk/plugins/Freetalk/FTIdentityManager.java 2008-11-06 01:12:25 UTC
(rev 23329)
+++ trunk/plugins/Freetalk/FTIdentityManager.java 2008-11-06 01:37:00 UTC
(rev 23330)
@@ -14,7 +14,7 @@
* @author saces, xor
*
*/
-public abstract class FTIdentityManager implements Iterable<FMSIdentity> {
+public abstract class FTIdentityManager implements Iterable<FTIdentity> {
protected final ObjectContainer db;
@@ -25,21 +25,21 @@
mExecutor = newExecutor;
}
- public synchronized Iterator<FMSIdentity> iterator() {
- ObjectSet<FMSIdentity> ids = db.query(FMSIdentity.class);
+ public synchronized Iterator<FTIdentity> iterator() {
+ ObjectSet<FTIdentity> ids = db.query(FTIdentity.class);
return ids.iterator();
}
- public synchronized Iterator<FMSOwnIdentity> ownIdentityIterator() {
- ObjectSet<FMSOwnIdentity> oids = db.query(FMSOwnIdentity.class);
+ public synchronized Iterator<FTOwnIdentity> ownIdentityIterator() {
+ ObjectSet<FTOwnIdentity> oids = db.query(FTOwnIdentity.class);
return oids.iterator();
}
- public synchronized boolean anyOwnIdentityWantsMessagesFrom(FMSIdentity
identity) {
- Iterator<FMSOwnIdentity> iter = ownIdentityIterator();
+ public synchronized boolean anyOwnIdentityWantsMessagesFrom(FTIdentity
identity) {
+ Iterator<FTOwnIdentity> iter = ownIdentityIterator();
while (iter.hasNext()) {
- FMSOwnIdentity oid = iter.next();
+ FTOwnIdentity oid = iter.next();
if (oid.wantsMessagesFrom(identity))
return true;
}
Modified: trunk/plugins/Freetalk/FTMessage.java
===================================================================
--- trunk/plugins/Freetalk/FTMessage.java 2008-11-06 01:12:25 UTC (rev
23329)
+++ trunk/plugins/Freetalk/FTMessage.java 2008-11-06 01:37:00 UTC (rev
23330)
@@ -31,10 +31,10 @@
/**
* The URI of the thread this message belongs to.
* We do not need it to construct the thread-tree from messages, but it
boosts performance of thread-tree-construction:
- * Thread-size (amount of replies) is usually infinitesimal compared to
the size of a FMSBoard (amount of threads).
+ * Thread-size (amount of replies) is usually infinitesimal compared to
the size of a FTBoard (amount of threads).
* We receive messages in random order, therefore we will usually have
orphan messages of which we need to find the parents.
* If we receive the parent messages of those messages, we will be able
to find their orphan children faster if we only need to search in
- * the thread they belong to and not in the whole FMSBoard - which may
contain many thousands of messages.
+ * the thread they belong to and not in the whole FTBoard - which may
contain many thousands of messages.
*/
private final FreenetURI mThreadURI;
@@ -46,9 +46,9 @@
/**
* The boards to which this message was posted, in alphabetical order.
*/
- private final FMSBoard[] mBoards;
+ private final FTBoard[] mBoards;
- private final FMSIdentity mAuthor;
+ private final FTIdentity mAuthor;
private final String mTitle;
@@ -67,12 +67,12 @@
/**
* The thread to which this message is a reply.
*/
- private FMSMessage mThread = null;
+ private FTMessage mThread = null;
/**
* The message to which this message is a reply.
*/
- private FMSMessage mParent = null;
+ private FTMessage mParent = null;
/**
* Get a list of fields which the database should create an index on.
@@ -81,7 +81,7 @@
return new String[] { "mURI", "mThreadURI", "mBoards"};
}
- public FTMessage(ObjectContainer db, FreenetURI newURI, FreenetURI
newThreadURI, FreenetURI newParentURI, Set<FMSBoard> newBoards, FMSIdentity
newAuthor, String newTitle, Date newDate, String newText, List<FreenetURI>
newAttachments) {
+ public FTMessage(ObjectContainer db, FreenetURI newURI, FreenetURI
newThreadURI, FreenetURI newParentURI, Set<FTBoard> newBoards, FTIdentity
newAuthor, String newTitle, Date newDate, String newText, List<FreenetURI>
newAttachments) {
if (newURI == null || newBoards == null || newAuthor == null)
throw new IllegalArgumentException();
@@ -97,7 +97,7 @@
mURI = newURI;
mThreadURI = newThreadURI;
mParentURI = newParentURI;
- mBoards = (FMSBoard[])newBoards.toArray();
+ mBoards = (FTBoard[])newBoards.toArray();
Arrays.sort(mBoards);
mAuthor = newAuthor;
mTitle = newTitle;
@@ -135,14 +135,14 @@
* Get the boards to which this message was posted.
* The boards are returned in alphabetical order.
*/
- public FMSBoard[] getBoards() {
+ public FTBoard[] getBoards() {
return mBoards;
}
/**
* Get the author of the message.
*/
- public FMSIdentity getAuthor() {
+ public FTIdentity getAuthor() {
return mAuthor;
}
@@ -174,11 +174,11 @@
return mAttachments;
}
- public synchronized FMSMessage getThread() {
+ public synchronized FTMessage getThread() {
return mThread;
}
- public synchronized void setThread(FMSMessage newParentThread) {
+ public synchronized void setThread(FTMessage newParentThread) {
assert(mThread == null);
assert(mThreadURI == null);
mThread = newParentThread;
@@ -186,26 +186,26 @@
db.commit();
}
- public synchronized FMSMessage getParent() {
+ public synchronized FTMessage getParent() {
return mParent;
}
- public synchronized void setParent(FMSMessage newParent) throws
UpdatableSortedLinkedListKilledException {
+ public synchronized void setParent(FTMessage newParent) throws
UpdatableSortedLinkedListKilledException {
/* TODO: assert(newParent contains at least one board which
mBoards contains) */
mParent = newParent;
db.store(this);
db.commit();
}
- public synchronized Iterator<FMSMessage> childrenIterator(final
FMSBoard board) {
- return new Iterator<FMSMessage>() {
- private Iterator<FMSMessage> iter;
+ public synchronized Iterator<FTMessage> childrenIterator(final FTBoard
board) {
+ return new Iterator<FTMessage>() {
+ private Iterator<FTMessage> iter;
{
/* TODO: Accelerate this query: configure db4o
to keep a per-message date-sorted index of children.
* - Not very important for now since threads
are usually small. */
Query q = db.query();
- q.constrain(FMSMessage.class);
+ q.constrain(FTMessage.class);
q.descend("mBoard").constrain(board.getName());
q.descend("mParent").constrain(this);
q.descend("mDate").orderDescending();
@@ -217,7 +217,7 @@
return iter.hasNext();
}
- public FMSMessage next() {
+ public FTMessage next() {
return iter.next();
}
Modified: trunk/plugins/Freetalk/FTMessageManager.java
===================================================================
--- trunk/plugins/Freetalk/FTMessageManager.java 2008-11-06 01:12:25 UTC
(rev 23329)
+++ trunk/plugins/Freetalk/FTMessageManager.java 2008-11-06 01:37:00 UTC
(rev 23330)
@@ -19,9 +19,9 @@
protected ObjectContainer db;
- protected FMSIdentityManager mIdentityManager;
+ protected FTIdentityManager mIdentityManager;
- public FTMessageManager(ObjectContainer myDB, FMSIdentityManager
myIdentityManager) {
+ public FTMessageManager(ObjectContainer myDB, FTIdentityManager
myIdentityManager) {
assert(myDB != null);
assert(myIdentityManager != null);
@@ -29,22 +29,22 @@
mIdentityManager = myIdentityManager;
}
- public synchronized FMSMessage get(FreenetURI uri) {
+ public synchronized FTMessage get(FreenetURI uri) {
Query query = db.query();
- query.constrain(FMSMessage.class);
+ query.constrain(FTMessage.class);
query.descend("mURI").constrain(uri);
- ObjectSet<FMSMessage> result = query.execute();
+ ObjectSet<FTMessage> result = query.execute();
assert(result.size() <= 1);
return (result.size() == 0) ? null : result.next();
}
- public synchronized FMSBoard getBoardByName(String name) {
+ public synchronized FTBoard getBoardByName(String name) {
Query query = db.query();
- query.constrain(FMSBoard.class);
+ query.constrain(FTBoard.class);
query.descend("mName").constrain(name);
- ObjectSet<FMSBoard> result = query.execute();
+ ObjectSet<FTBoard> result = query.execute();
assert(result.size() <= 1);
@@ -54,21 +54,21 @@
/**
* Get an iterator of all boards.
*/
- public synchronized Iterator<FMSBoard> boardIterator() {
+ public synchronized Iterator<FTBoard> boardIterator() {
/* FIXME: Accelerate this query. db4o should be configured to
keep an alphabetic index of boards */
Query query = db.query();
- query.constrain(FMSBoard.class);
+ query.constrain(FTBoard.class);
query.descend("mName").orderDescending();
- ObjectSet<FMSBoard> result = query.execute();
+ ObjectSet<FTBoard> result = query.execute();
return result.iterator();
}
/**
- * Returns true if the message was not downloaded yet and any of the
FMSOwnIdentity wants the message.
+ * Returns true if the message was not downloaded yet and any of the
FTOwnIdentity wants the message.
*/
- protected synchronized boolean shouldDownloadMessage(FreenetURI uri,
FMSIdentity author) {
+ protected synchronized boolean shouldDownloadMessage(FreenetURI uri,
FTIdentity author) {
return (get(uri) != null) ||
mIdentityManager.anyOwnIdentityWantsMessagesFrom(author);
}
}
Modified: trunk/plugins/Freetalk/FTOwnIdentity.java
===================================================================
--- trunk/plugins/Freetalk/FTOwnIdentity.java 2008-11-06 01:12:25 UTC (rev
23329)
+++ trunk/plugins/Freetalk/FTOwnIdentity.java 2008-11-06 01:37:00 UTC (rev
23330)
@@ -12,19 +12,19 @@
* @author saces, xor
*
*/
-public interface FTOwnIdentity extends FMSIdentity {
+public interface FTOwnIdentity extends FTIdentity {
public FreenetURI getInsertURI();
public Date getLastInsert();
- public boolean wantsMessagesFrom(FMSIdentity identity);
+ public boolean wantsMessagesFrom(FTIdentity identity);
- public void postMessage(FMSMessage message);
+ public void postMessage(FTMessage message);
- public void subscribeToBoard(FMSBoard board);
+ public void subscribeToBoard(FTBoard board);
- public void unsubscribeFromBoard(FMSBoard board);
+ public void unsubscribeFromBoard(FTBoard board);
- public Iterator<FMSBoard> subscribedBoardsIterator();
+ public Iterator<FTBoard> subscribedBoardsIterator();
}
Modified: trunk/plugins/Freetalk/Freetalk.java
===================================================================
--- trunk/plugins/Freetalk/Freetalk.java 2008-11-06 01:12:25 UTC (rev
23329)
+++ trunk/plugins/Freetalk/Freetalk.java 2008-11-06 01:37:00 UTC (rev
23330)
@@ -8,11 +8,11 @@
import java.util.ArrayList;
import java.util.List;
-import plugins.FMSPlugin.ui.Errors;
-import plugins.FMSPlugin.ui.IdentityEditor;
-import plugins.FMSPlugin.ui.Messages;
-import plugins.FMSPlugin.ui.Status;
-import plugins.FMSPlugin.ui.Welcome;
+import plugins.Freetalk.ui.Errors;
+import plugins.Freetalk.ui.IdentityEditor;
+import plugins.Freetalk.ui.Messages;
+import plugins.Freetalk.ui.Status;
+import plugins.Freetalk.ui.Welcome;
import com.db4o.Db4o;
import com.db4o.ObjectContainer;
@@ -51,7 +51,7 @@
*/
public class Freetalk implements FredPlugin, FredPluginFCP, FredPluginHTTP,
FredPluginL10n, FredPluginThemed, FredPluginThreadless, FredPluginVersioned {
- public static String SELF_URI = "/plugins/plugins.FMSPlugin.FMSPlugin";
+ public static String SELF_URI = "/plugins/plugins.Freetalk.Freetalk";
public static String SELF_TITLE = "Freenet Message System";
public static String WOT_NAME = "plugins.WoT.WoT";
@@ -80,7 +80,7 @@
pr = pr2;
pm = pr.getPageMaker();
- pm.addNavigationLink(SELF_URI + "/", "Home", "FMS plugin home",
false, null);
+ pm.addNavigationLink(SELF_URI + "/", "Home", "Freetalk plugin
home", false, null);
pm.addNavigationLink(SELF_URI + "/ownidentities", "Own
Identities", "Manage your own identities", false, null);
pm.addNavigationLink(SELF_URI + "/knownidentities", "Known
Identities", "Manage others identities", false, null);
pm.addNavigationLink(SELF_URI + "/messages", "Messages", "View
Messages", false, null);
@@ -91,18 +91,18 @@
Configuration config_config = Db4o.newConfiguration();
/* We re-use all information from the WoT-plugin's
database.
-
config_config.objectClass(FMSOwnIdentity.class).objectField("requestUri").indexed(true);
-
config_config.objectClass(FMSIdentity.class).objectField("requestUri").indexed(true);
+
config_config.objectClass(FTOwnIdentity.class).objectField("requestUri").indexed(true);
+
config_config.objectClass(FTIdentity.class).objectField("requestUri").indexed(true);
*/
db_config = Db4o.openFile(config_config, "fms_conf.db4o");
Configuration cache_config = Db4o.newConfiguration();
- for(String f : FMSMessage.getIndexedFields())
-
cache_config.objectClass(FMSMessage.class).objectField(f).indexed(true);
-
cache_config.objectClass(FMSMessage.class).cascadeOnUpdate(true);
+ for(String f : FTMessage.getIndexedFields())
+
cache_config.objectClass(FTMessage.class).objectField(f).indexed(true);
+ cache_config.objectClass(FTMessage.class).cascadeOnUpdate(true);
// TODO: decide about cascade on delete.
- for(String f : FMSBoard.getIndexedFields())
-
cache_config.objectClass(FMSBoard.class).objectField(f).indexed(true);
+ for(String f : FTBoard.getIndexedFields())
+
cache_config.objectClass(FTBoard.class).objectField(f).indexed(true);
db_cache = Db4o.openFile(cache_config, "fms_cache.db4o");
@@ -152,7 +152,7 @@
if ("/messages".equals(page))
return Messages.makeMessagesPage(this, request);
- throw new NotFoundPluginHTTPException("Resource not found in
FMSPlugin", page);
+ throw new NotFoundPluginHTTPException("Resource not found in
FreetalkPlugin", page);
}
public void handle(PluginReplySender replysender, SimpleFieldSet
params, Bucket data, int accesstype) {
@@ -221,7 +221,7 @@
// FIXME: use identity manager to implement this
throw new UnsupportedOperationException();
/*
- FMSOwnIdentity oi = new FMSOwnIdentity(nick,
requestUri, insertUri, publish);
+ FTOwnIdentity oi = new FTOwnIdentity(nick,
requestUri, insertUri, publish);
IdentityEditor.addNewOwnIdentity(db_config, oi,
err);
*/
}
@@ -249,7 +249,7 @@
// FIXME: use identity manager to implement this
throw new UnsupportedOperationException();
/*
- FMSIdentity i = new FMSIdentity("", requestUri);
+ FTIdentity i = new FTIdentity("", requestUri);
IdentityEditor.addNewKnownIdentity(db_config,
i, err);
*/
}
@@ -327,21 +327,21 @@
}
public boolean isWoTpresent() {
- FredPluginFCP plug =
pr.getNode().pluginManager.getFCPPlugin(FMS.WOT_NAME);
+ FredPluginFCP plug =
pr.getNode().pluginManager.getFCPPlugin(Freetalk.WOT_NAME);
return (plug != null);
}
public long countIdentities() {
- return db_config.queryByExample(FMSIdentity.class).size() -
countOwnIdentities();
+ return db_config.queryByExample(FTIdentity.class).size() -
countOwnIdentities();
}
public long countOwnIdentities() {
- return db_config.queryByExample(FMSOwnIdentity.class).size();
+ return db_config.queryByExample(FTOwnIdentity.class).size();
}
final public HTMLNode getPageNode() {
- return pm.getPageNode(FMS.SELF_TITLE, null);
+ return pm.getPageNode(Freetalk.SELF_TITLE, null);
}
}
Modified: trunk/plugins/Freetalk/WoT/FTIdentityManagerWoT.java
===================================================================
--- trunk/plugins/Freetalk/WoT/FTIdentityManagerWoT.java 2008-11-06
01:12:25 UTC (rev 23329)
+++ trunk/plugins/Freetalk/WoT/FTIdentityManagerWoT.java 2008-11-06
01:37:00 UTC (rev 23330)
@@ -3,7 +3,7 @@
* http://www.gnu.org/ for further details of the GPL. */
package plugins.Freetalk.WoT;
-import plugins.FMSPlugin.FMSIdentityManager;
+import plugins.Freetalk.FTIdentityManager;
import plugins.WoT.WoT;
import com.db4o.ObjectContainer;
@@ -16,7 +16,7 @@
* @author xor
*
*/
-public class FTIdentityManagerWoT extends FMSIdentityManager {
+public class FTIdentityManagerWoT extends FTIdentityManager {
private WoT mWoT;
Modified: trunk/plugins/Freetalk/WoT/FTIdentityWoT.java
===================================================================
--- trunk/plugins/Freetalk/WoT/FTIdentityWoT.java 2008-11-06 01:12:25 UTC
(rev 23329)
+++ trunk/plugins/Freetalk/WoT/FTIdentityWoT.java 2008-11-06 01:37:00 UTC
(rev 23330)
@@ -6,7 +6,7 @@
import java.util.Date;
import freenet.keys.FreenetURI;
-import plugins.FMSPlugin.FMSIdentity;
+import plugins.Freetalk.FTIdentity;
import plugins.WoT.Identity;
@@ -14,7 +14,7 @@
* @author xor
*
*/
-public class FTIdentityWoT implements FMSIdentity {
+public class FTIdentityWoT implements FTIdentity {
protected final Identity mIdentity;
Modified: trunk/plugins/Freetalk/WoT/FTMessageManagerWoT.java
===================================================================
--- trunk/plugins/Freetalk/WoT/FTMessageManagerWoT.java 2008-11-06 01:12:25 UTC
(rev 23329)
+++ trunk/plugins/Freetalk/WoT/FTMessageManagerWoT.java 2008-11-06 01:37:00 UTC
(rev 23330)
@@ -5,19 +5,19 @@
import java.util.NoSuchElementException;
-import plugins.FMSPlugin.FMSBoard;
-import plugins.FMSPlugin.FMSMessageManager;
+import plugins.Freetalk.FTBoard;
+import plugins.Freetalk.FTMessageManager;
import com.db4o.ObjectContainer;
import freenet.keys.FreenetURI;
import freenet.support.UpdatableSortedLinkedListKilledException;
-public class FTMessageManagerWoT extends FMSMessageManager {
+public class FTMessageManagerWoT extends FTMessageManager {
- protected FMSIdentityManagerWoT mIdentityManager;
+ protected FTIdentityManagerWoT mIdentityManager;
- public FTMessageManagerWoT(ObjectContainer myDB, FMSIdentityManagerWoT
myIdentityManager) {
+ public FTMessageManagerWoT(ObjectContainer myDB, FTIdentityManagerWoT
myIdentityManager) {
super(myDB, myIdentityManager);
mIdentityManager = myIdentityManager;
}
@@ -27,23 +27,23 @@
}
private synchronized void onMessageReceived(String newMessageData)
throws UpdatableSortedLinkedListKilledException {
- FMSMessageWoT newMessage = new FMSMessageWoT(db, null, null,
null, null, null, null, null, null, null);
+ FTMessageWoT newMessage = new FTMessageWoT(db, null, null,
null, null, null, null, null, null, null);
String boardName = "";
- /* FIXME: Store the description in FMSOwnIdentity. We cannot
store in FMSBoard because we want to allow per-identity customization */
+ /* FIXME: Store the description in FTOwnIdentity. We cannot
store in FTBoard because we want to allow per-identity customization */
String[] boardNames = new String[0];
- FMSBoard[] boards = new FMSBoard[boardNames.length];
+ FTBoard[] boards = new FTBoard[boardNames.length];
for(int idx = 0; idx < boards.length; ++idx) {
- FMSBoard board = getBoardByName(boardNames[idx]);
+ FTBoard board = getBoardByName(boardNames[idx]);
if(board == null)
- board = new FMSBoard(db, this, boardName);
+ board = new FTBoard(db, this, boardName);
boards[idx] = board;
}
- for(FMSBoard b : boards) {
+ for(FTBoard b : boards) {
b.addMessage(newMessage);
}
}
Modified: trunk/plugins/Freetalk/WoT/FTMessageWoT.java
===================================================================
--- trunk/plugins/Freetalk/WoT/FTMessageWoT.java 2008-11-06 01:12:25 UTC
(rev 23329)
+++ trunk/plugins/Freetalk/WoT/FTMessageWoT.java 2008-11-06 01:37:00 UTC
(rev 23330)
@@ -7,9 +7,9 @@
import java.util.List;
import java.util.Set;
-import plugins.FMSPlugin.FMSBoard;
-import plugins.FMSPlugin.FMSIdentity;
-import plugins.FMSPlugin.FMSMessage;
+import plugins.Freetalk.FTBoard;
+import plugins.Freetalk.FTIdentity;
+import plugins.Freetalk.FTMessage;
import com.db4o.ObjectContainer;
@@ -19,9 +19,9 @@
* @author xor
*
*/
-public class FTMessageWoT extends FMSMessage {
+public class FTMessageWoT extends FTMessage {
- public FTMessageWoT(ObjectContainer myDB, FreenetURI newURI, FreenetURI
newThreadURI, FreenetURI newParentURI, Set<FMSBoard> newBoards, FMSIdentity
newAuthor,
+ public FTMessageWoT(ObjectContainer myDB, FreenetURI newURI, FreenetURI
newThreadURI, FreenetURI newParentURI, Set<FTBoard> newBoards, FTIdentity
newAuthor,
String newTitle, Date newDate, String newText,
List<FreenetURI> newAttachments) {
super(myDB, newURI, newThreadURI, newParentURI, newBoards,
newAuthor, newTitle, newDate, newText, newAttachments);
// TODO Auto-generated constructor stub
Modified: trunk/plugins/Freetalk/WoT/FTOwnIdentityWoT.java
===================================================================
--- trunk/plugins/Freetalk/WoT/FTOwnIdentityWoT.java 2008-11-06 01:12:25 UTC
(rev 23329)
+++ trunk/plugins/Freetalk/WoT/FTOwnIdentityWoT.java 2008-11-06 01:37:00 UTC
(rev 23330)
@@ -7,10 +7,10 @@
import java.util.Iterator;
import java.util.LinkedList;
-import plugins.FMSPlugin.FMSBoard;
-import plugins.FMSPlugin.FMSIdentity;
-import plugins.FMSPlugin.FMSMessage;
-import plugins.FMSPlugin.FMSOwnIdentity;
+import plugins.Freetalk.FTBoard;
+import plugins.Freetalk.FTIdentity;
+import plugins.Freetalk.FTMessage;
+import plugins.Freetalk.FTOwnIdentity;
import plugins.WoT.OwnIdentity;
import freenet.keys.FreenetURI;
@@ -18,9 +18,9 @@
* @author xor
*
*/
-public class FTOwnIdentityWoT extends FMSIdentityWoT implements FMSOwnIdentity
{
+public class FTOwnIdentityWoT extends FTIdentityWoT implements FTOwnIdentity {
- private final LinkedList<FMSBoard> mSubscribedBoards = new
LinkedList<FMSBoard>();
+ private final LinkedList<FTBoard> mSubscribedBoards = new
LinkedList<FTBoard>();
public FTOwnIdentityWoT(OwnIdentity newIndentity) {
super(newIndentity);
@@ -38,12 +38,12 @@
return getOwnIdentity().getLastInsert();
}
- public synchronized void postMessage(FMSMessage message) {
+ public synchronized void postMessage(FTMessage message) {
// TODO Auto-generated method stub
}
- public synchronized void subscribeToBoard(FMSBoard board) {
+ public synchronized void subscribeToBoard(FTBoard board) {
if(mSubscribedBoards.contains(board)) {
assert(false); /* TODO: Add logging / check whether
this should be allowed to happen */
return;
@@ -51,15 +51,15 @@
mSubscribedBoards.add(board);
}
- public synchronized void unsubscribeFromBoard(FMSBoard board) {
+ public synchronized void unsubscribeFromBoard(FTBoard board) {
mSubscribedBoards.remove(board);
}
- public synchronized Iterator<FMSBoard> subscribedBoardsIterator() {
+ public synchronized Iterator<FTBoard> subscribedBoardsIterator() {
return mSubscribedBoards.iterator();
}
- public synchronized boolean wantsMessagesFrom(FMSIdentity identity) {
+ public synchronized boolean wantsMessagesFrom(FTIdentity identity) {
// TODO Auto-generated method stub
return false;
}
Modified: trunk/plugins/Freetalk/ui/Errors.java
===================================================================
--- trunk/plugins/Freetalk/ui/Errors.java 2008-11-06 01:12:25 UTC (rev
23329)
+++ trunk/plugins/Freetalk/ui/Errors.java 2008-11-06 01:37:00 UTC (rev
23330)
@@ -3,23 +3,23 @@
* http://www.gnu.org/ for further details of the GPL. */
package plugins.Freetalk.ui;
-import plugins.FMSPlugin.FMS;
+import plugins.Freetalk.Freetalk;
import freenet.support.HTMLNode;
public class Errors {
- public static String makeErrorPage(FMS fms, String error) {
+ public static String makeErrorPage(Freetalk fms, String error) {
return makeErrorPage(fms, "ERROR", error);
}
- private static String makeErrorPage(FMS fms, String title, String
error) {
+ private static String makeErrorPage(Freetalk fms, String title, String
error) {
HTMLNode pageNode = fms.getPageNode();
HTMLNode contentNode = fms.pm.getContentNode(pageNode);
contentNode.addChild(createErrorBox(fms, title, error));
return pageNode.generate();
}
- private static HTMLNode createErrorBox(FMS fms, String title, String
errmsg) {
+ private static HTMLNode createErrorBox(Freetalk fms, String title,
String errmsg) {
HTMLNode errorBox = fms.pm.getInfobox("infobox-alert", title);
errorBox.addChild("#", errmsg);
return errorBox;
Modified: trunk/plugins/Freetalk/ui/IdentityEditor.java
===================================================================
--- trunk/plugins/Freetalk/ui/IdentityEditor.java 2008-11-06 01:12:25 UTC
(rev 23329)
+++ trunk/plugins/Freetalk/ui/IdentityEditor.java 2008-11-06 01:37:00 UTC
(rev 23330)
@@ -6,10 +6,9 @@
import java.util.Date;
import java.util.List;
-import plugins.FMSPlugin.FMS;
-import plugins.FMSPlugin.FMSIdentity;
-import plugins.FMSPlugin.FMSOwnIdentity;
-import plugins.FMSPlugin.FMS;
+import plugins.Freetalk.Freetalk;
+import plugins.Freetalk.FTIdentity;
+import plugins.Freetalk.FTOwnIdentity;
import com.db4o.ObjectContainer;
import com.db4o.ObjectSet;
@@ -22,7 +21,7 @@
/* === own identities ==================== */
- public static final String makeOwnIdentitiesPage(FMS fms, HTTPRequest
request) {
+ public static final String makeOwnIdentitiesPage(Freetalk fms,
HTTPRequest request) {
HTMLNode pageNode = fms.getPageNode();
HTMLNode contentNode = fms.pm.getContentNode(pageNode);
@@ -30,7 +29,7 @@
HTMLNode boxContent = fms.pm.getContentNode(box);
contentNode.addChild(box);
- ObjectSet<FMSOwnIdentity> ownIdentities =
fms.db_config.queryByExample(FMSOwnIdentity.class);
+ ObjectSet<FTOwnIdentity> ownIdentities =
fms.db_config.queryByExample(FTOwnIdentity.class);
if (ownIdentities.size() == 0) {
boxContent.addChild("p", "You have no own identity yet,
you should create one...");
} else {
@@ -45,7 +44,7 @@
row.addChild("th");
while (ownIdentities.hasNext()) {
- FMSOwnIdentity id = ownIdentities.next();
+ FTOwnIdentity id = ownIdentities.next();
row = identitiesTable.addChild("tr");
row.addChild("td", id.getNickName());
row.addChild("td", new String[]{"title"}, new
String[]{id.getRequestURI().toACIIString()},
id.getRequestURI().toACIIString().substring(0, 35)+"...");
@@ -60,7 +59,7 @@
lastUpdateCell.addChild(new
HTMLNode("a", "href", "/" + id.getRequestURI().toString(),
id.getLastInsert().toString()));
}
HTMLNode deleteCell = row.addChild("td");
- HTMLNode deleteForm =
fms.pr.addFormChild(deleteCell, FMS.SELF_URI + "/deleteOwnIdentity",
"deleteForm");
+ HTMLNode deleteForm =
fms.pr.addFormChild(deleteCell, Freetalk.SELF_URI + "/deleteOwnIdentity",
"deleteForm");
deleteForm.addChild("input", new String[] {
"type", "name", "value" }, new String[] { "hidden", "identity",
id.getRequestURI().toACIIString()});
deleteForm.addChild("input", new String[] {
"type", "name", "value" }, new String[] { "submit", "delete", "Delete" });
}
@@ -73,18 +72,18 @@
/* === new own identity ================== */
- public static final String makeNewOwnIdentityPage(FMS fms, String nick,
String requestUri, String insertUri, boolean publish, List<String> errors) {
+ public static final String makeNewOwnIdentityPage(Freetalk fms, String
nick, String requestUri, String insertUri, boolean publish, List<String>
errors) {
HTMLNode pageNode = fms.getPageNode();
HTMLNode contentNode = fms.pm.getContentNode(pageNode);
contentNode.addChild(createNewOwnIdentityBox(fms, nick,
requestUri, insertUri, publish, errors));
return pageNode.generate();
}
- private static final HTMLNode createNewOwnIdentityBox(FMS fms) {
+ private static final HTMLNode createNewOwnIdentityBox(Freetalk fms) {
return createNewOwnIdentityBox(fms, "", "", "", true, null);
}
- private static final HTMLNode createNewOwnIdentityBox(FMS fms, String
nick, String requestUri, String insertUri, boolean publish, List<String>
errors) {
+ private static final HTMLNode createNewOwnIdentityBox(Freetalk fms,
String nick, String requestUri, String insertUri, boolean publish, List<String>
errors) {
HTMLNode addBox = fms.pm.getInfobox("New Identity");
HTMLNode addContent = fms.pm.getContentNode(addBox);
@@ -98,7 +97,7 @@
addContent.addChild(errorBox);
}
- HTMLNode addForm = fms.pr.addFormChild(addContent, FMS.SELF_URI
+ "/createownidentity", "addForm");
+ HTMLNode addForm = fms.pr.addFormChild(addContent,
Freetalk.SELF_URI + "/createownidentity", "addForm");
HTMLNode table = addForm.addChild("table", "class", "column");
HTMLNode tr1 = table.addChild("tr");
@@ -130,14 +129,14 @@
/* === delete own identity =============== */
- public static String makeDeleteOwnIdentityPage(FMS fms, String
requestUri, List<String> err) {
+ public static String makeDeleteOwnIdentityPage(Freetalk fms, String
requestUri, List<String> err) {
HTMLNode pageNode = fms.getPageNode();
HTMLNode contentNode = fms.pm.getContentNode(pageNode);
contentNode.addChild(deleteOwnIdentityBox(fms, "nick",
requestUri, "insertUri", false, err));
return pageNode.generate();
}
- private static final HTMLNode deleteOwnIdentityBox(FMS fms, String
nick, String requestUri, String insertUri, boolean publish, List<String>
errors) {
+ private static final HTMLNode deleteOwnIdentityBox(Freetalk fms, String
nick, String requestUri, String insertUri, boolean publish, List<String>
errors) {
HTMLNode deleteBox = fms.pm.getInfobox("Delete Identity");
HTMLNode deleteContent = fms.pm.getContentNode(deleteBox);
@@ -151,7 +150,7 @@
deleteContent.addChild(errorBox);
}
- HTMLNode deleteForm = fms.pr.addFormChild(deleteContent,
FMS.SELF_URI + "/deleteOwnIdentity", "deleteForm");
+ HTMLNode deleteForm = fms.pr.addFormChild(deleteContent,
Freetalk.SELF_URI + "/deleteOwnIdentity", "deleteForm");
deleteForm.addChild("input", new String[] { "type", "name",
"value" }, new String[] { "hidden", "confirmed", "true"});
deleteForm.addChild("input", new String[] { "type", "name",
"value" }, new String[] { "hidden", "identity", requestUri});
deleteForm.addChild("#", "Nick:\u00a0"+nick);
@@ -166,7 +165,7 @@
/* === others identities ================ */
- public final static String makeKnownIdentitiesPage(FMS fms, HTTPRequest
request) {
+ public final static String makeKnownIdentitiesPage(Freetalk fms,
HTTPRequest request) {
HTMLNode pageNode = fms.getPageNode();
HTMLNode contentNode = fms.pm.getContentNode(pageNode);
@@ -174,7 +173,7 @@
HTMLNode boxContent = fms.pm.getContentNode(box);
contentNode.addChild(box);
- ObjectSet<FMSIdentity> identities =
fms.db_config.queryByExample(FMSIdentity.class);
+ ObjectSet<FTIdentity> identities =
fms.db_config.queryByExample(FTIdentity.class);
HTMLNode identitiesTable = boxContent.addChild("table",
"border", "0");
HTMLNode row = identitiesTable.addChild("tr");
@@ -183,14 +182,14 @@
row.addChild("th");
while (identities.hasNext()) {
- FMSIdentity id = identities.next();
- if (id instanceof FMSOwnIdentity)
+ FTIdentity id = identities.next();
+ if (id instanceof FTOwnIdentity)
continue;
row = identitiesTable.addChild("tr");
row.addChild("td", id.getNickName());
row.addChild("td", id.getRequestURI().toACIIString());
HTMLNode deleteCell = row.addChild("td");
- HTMLNode deleteForm = fms.pr.addFormChild(deleteCell,
FMS.SELF_URI + "/deleteIdentity", "deleteForm");
+ HTMLNode deleteForm = fms.pr.addFormChild(deleteCell,
Freetalk.SELF_URI + "/deleteIdentity", "deleteForm");
deleteForm.addChild("input", new String[] { "type",
"name", "value" }, new String[] { "hidden", "identity",
id.getRequestURI().toACIIString()});
deleteForm.addChild("input", new String[] { "type",
"name", "value" }, new String[] { "submit", "delete", "Delete" });
}
@@ -202,7 +201,7 @@
/* === new others identities ============= */
- public static final String makeNewKnownIdentityPage(FMS fms, String
requestUri, List<String> errors) {
+ public static final String makeNewKnownIdentityPage(Freetalk fms,
String requestUri, List<String> errors) {
HTMLNode pageNode = fms.getPageNode();
HTMLNode contentNode = fms.pm.getContentNode(pageNode);
contentNode.addChild(createNewKnownIdentityBox(fms, requestUri,
errors));
@@ -210,11 +209,11 @@
return pageNode.generate();
}
- private static final HTMLNode createNewKnownIdentityBox(FMS fms) {
+ private static final HTMLNode createNewKnownIdentityBox(Freetalk fms) {
return createNewKnownIdentityBox(fms, "", null);
}
- private static final HTMLNode createNewKnownIdentityBox(FMS fms, String
requestUri, List<String> errors) {
+ private static final HTMLNode createNewKnownIdentityBox(Freetalk fms,
String requestUri, List<String> errors) {
HTMLNode addBox = fms.pm.getInfobox("Add Identity");
HTMLNode addContent = fms.pm.getContentNode(addBox);
@@ -228,7 +227,7 @@
addContent.addChild(errorBox);
}
- HTMLNode addForm = fms.pr.addFormChild(addContent, FMS.SELF_URI
+ "/addknownidentity", "addForm");
+ HTMLNode addForm = fms.pr.addFormChild(addContent,
Freetalk.SELF_URI + "/addknownidentity", "addForm");
addForm.addChild("#", "Request URI : ");
addForm.addChild("input", new String[] { "type", "name",
"size", "value" }, new String[] { "text", "requestURI", "70", requestUri });
@@ -237,14 +236,14 @@
}
/* delete */
- public static String makeDeleteKnownIdentityPage(FMS fms, String
requestUri, List<String> err) {
+ public static String makeDeleteKnownIdentityPage(Freetalk fms, String
requestUri, List<String> err) {
HTMLNode pageNode = fms.getPageNode();
HTMLNode contentNode = fms.pm.getContentNode(pageNode);
contentNode.addChild(deleteKnownIdentityBox(fms, "nick",
requestUri, "insertUri", false, err));
return pageNode.generate();
}
- private static final HTMLNode deleteKnownIdentityBox(FMS fms, String
nick, String requestUri, String insertUri, boolean publish, List<String>
errors) {
+ private static final HTMLNode deleteKnownIdentityBox(Freetalk fms,
String nick, String requestUri, String insertUri, boolean publish, List<String>
errors) {
HTMLNode deleteBox = fms.pm.getInfobox("Delete Identity");
HTMLNode deleteContent = fms.pm.getContentNode(deleteBox);
@@ -258,7 +257,7 @@
deleteContent.addChild(errorBox);
}
- HTMLNode deleteForm = fms.pr.addFormChild(deleteContent,
FMS.SELF_URI + "/deleteIdentity", "deleteForm");
+ HTMLNode deleteForm = fms.pr.addFormChild(deleteContent,
Freetalk.SELF_URI + "/deleteIdentity", "deleteForm");
deleteForm.addChild("input", new String[] { "type", "name",
"value" }, new String[] { "hidden", "confirmed", "true"});
deleteForm.addChild("input", new String[] { "type", "name",
"value" }, new String[] { "hidden", "identity", requestUri});
deleteForm.addChild("#", "Nick:\u00a0"+nick);
@@ -294,7 +293,7 @@
}
}
- public static final void addNewOwnIdentity(ObjectContainer db,
FMSOwnIdentity identity, List<String> err) {
+ public static final void addNewOwnIdentity(ObjectContainer db,
FTOwnIdentity identity, List<String> err) {
try {
db.store(identity);
db.commit();
@@ -305,7 +304,7 @@
}
}
- public static final void addNewKnownIdentity(ObjectContainer db,
FMSIdentity identity, List<String> err) {
+ public static final void addNewKnownIdentity(ObjectContainer db,
FTIdentity identity, List<String> err) {
try {
db.store(identity);
db.commit();
@@ -316,13 +315,13 @@
}
}
- public static void deleteIdentity(FMS fms, String requestUri,
List<String> err) {
+ public static void deleteIdentity(Freetalk fms, String requestUri,
List<String> err) {
/*
- FMSIdentity templateId = new FMSIdentity(null, requestUri);
+ FTIdentity templateId = new FTIdentity(null, requestUri);
- ObjectSet<FMSIdentity> toDelete =
fms.db_config.queryByExample(templateId);
+ ObjectSet<FTIdentity> toDelete =
fms.db_config.queryByExample(templateId);
if (toDelete.size() > 0) {
- for (FMSIdentity id:toDelete) {
+ for (FTIdentity id:toDelete) {
fms.db_config.delete(id);
}
fms.db_config.commit();
Modified: trunk/plugins/Freetalk/ui/Messages.java
===================================================================
--- trunk/plugins/Freetalk/ui/Messages.java 2008-11-06 01:12:25 UTC (rev
23329)
+++ trunk/plugins/Freetalk/ui/Messages.java 2008-11-06 01:37:00 UTC (rev
23330)
@@ -3,13 +3,13 @@
* http://www.gnu.org/ for further details of the GPL. */
package plugins.Freetalk.ui;
-import plugins.FMSPlugin.FMS;
+import plugins.Freetalk.Freetalk;
import freenet.support.HTMLNode;
import freenet.support.api.HTTPRequest;
public class Messages {
- public static String makeMessagesPage(FMS fms, HTTPRequest request ) {
+ public static String makeMessagesPage(Freetalk fms, HTTPRequest request
) {
HTMLNode pageNode = fms.getPageNode();
HTMLNode contentNode = fms.pm.getContentNode(pageNode);
contentNode.addChild("#", "makeMessagesPage");
Modified: trunk/plugins/Freetalk/ui/Status.java
===================================================================
--- trunk/plugins/Freetalk/ui/Status.java 2008-11-06 01:12:25 UTC (rev
23329)
+++ trunk/plugins/Freetalk/ui/Status.java 2008-11-06 01:37:00 UTC (rev
23330)
@@ -3,12 +3,12 @@
* http://www.gnu.org/ for further details of the GPL. */
package plugins.Freetalk.ui;
-import plugins.FMSPlugin.FMS;
+import plugins.Freetalk.Freetalk;
import freenet.support.HTMLNode;
public class Status {
- public static String makeStatusPage(FMS fms) {
+ public static String makeStatusPage(Freetalk fms) {
HTMLNode pageNode = fms.getPageNode();
HTMLNode contentNode = fms.pm.getContentNode(pageNode);
contentNode.addChild("#", "makeStatusPage");
Modified: trunk/plugins/Freetalk/ui/Welcome.java
===================================================================
--- trunk/plugins/Freetalk/ui/Welcome.java 2008-11-06 01:12:25 UTC (rev
23329)
+++ trunk/plugins/Freetalk/ui/Welcome.java 2008-11-06 01:37:00 UTC (rev
23330)
@@ -3,13 +3,12 @@
* http://www.gnu.org/ for further details of the GPL. */
package plugins.Freetalk.ui;
-import plugins.FMSPlugin.FMS;
-import plugins.FMSPlugin.FMS;
+import plugins.Freetalk.Freetalk;
import freenet.support.HTMLNode;
public class Welcome {
- public static String makeWelcomePage(FMS fms) {
+ public static String makeWelcomePage(Freetalk fms) {
HTMLNode pageNode = fms.getPageNode();
HTMLNode contentNode = fms.pm.getContentNode(pageNode);
contentNode.addChild(createWelcomeBox(fms));
@@ -18,7 +17,7 @@
return pageNode.generate();
}
- private static HTMLNode createWelcomeBox(FMS fms) {
+ private static HTMLNode createWelcomeBox(Freetalk fms) {
HTMLNode welcomeBox = fms.pm.getInfobox("Welcome");
HTMLNode welcomeContent = fms.pm.getContentNode(welcomeBox);
welcomeContent.addChild("P", "Welcome to GenTec Labs. This is
our last experiment: cloning FMS.");
@@ -26,7 +25,7 @@
return welcomeBox;
}
- private static HTMLNode createOverviewBox(FMS fms) {
+ private static HTMLNode createOverviewBox(Freetalk fms) {
HTMLNode overviewBox = fms.pm.getInfobox("Overview");
HTMLNode overviewContent = fms.pm.getContentNode(overviewBox);
HTMLNode list = overviewContent.addChild("ul");
@@ -36,7 +35,7 @@
return overviewBox;
}
- private static HTMLNode createBackupHintBox(FMS fms) {
+ private static HTMLNode createBackupHintBox(Freetalk fms) {
HTMLNode bhBox = fms.pm.getInfobox("The boring backup
reminder");
HTMLNode bhContent = fms.pm.getContentNode(bhBox);
bhContent.addChild("P", "You can not turn me off, because I'm
boring. :P");
@@ -46,10 +45,10 @@
return bhBox;
}
- private static HTMLNode createExportBox(FMS fms) {
+ private static HTMLNode createExportBox(Freetalk fms) {
HTMLNode exportBox = fms.pm.getInfobox("Export");
HTMLNode exportContent = fms.pm.getContentNode(exportBox);
- HTMLNode exportForm = fms.pr.addFormChild(exportContent,
FMS.SELF_URI + "/exportDB", "exportForm");
+ HTMLNode exportForm = fms.pr.addFormChild(exportContent,
Freetalk.SELF_URI + "/exportDB", "exportForm");
exportForm.addChild("#", "Export the database (Identities etc
pp) to xml file. \u00a0 ");
exportForm.addChild("input", new String[] { "type", "name",
"value" }, new String[] { "submit", "export", "Export" });
exportForm.addChild("br");
@@ -57,10 +56,10 @@
return exportBox;
}
- private static HTMLNode createImportBox(FMS fms) {
+ private static HTMLNode createImportBox(Freetalk fms) {
HTMLNode importBox = fms.pm.getInfobox("Import");
HTMLNode importContent = fms.pm.getContentNode(importBox);
- HTMLNode importForm = fms.pr.addFormChild(importContent,
FMS.SELF_URI + "/importDB", "importForm");
+ HTMLNode importForm = fms.pr.addFormChild(importContent,
Freetalk.SELF_URI + "/importDB", "importForm");
importForm.addChild("#", "Choose xml file to import.\u00a0");
importForm.addChild("input", new String[] { "type", "name",
"value" }, new String[] { "file", "filename", "" });
importForm.addChild("#", "\u00a0");
_______________________________________________
cvs mailing list
[email protected]
http://emu.freenetproject.org/cgi-bin/mailman/listinfo/cvs
