Author: xor
Date: 2008-10-27 23:27:08 +0000 (Mon, 27 Oct 2008)
New Revision: 23125
Modified:
trunk/plugins/FMSPlugin/Backup.java
trunk/plugins/FMSPlugin/FMSPlugin.java
trunk/plugins/FMSPlugin/ui/IdentityEditor.java
Log:
Comment-out code which was broken by the refactoring and add FIXME there.
Modified: trunk/plugins/FMSPlugin/Backup.java
===================================================================
--- trunk/plugins/FMSPlugin/Backup.java 2008-10-27 23:09:30 UTC (rev 23124)
+++ trunk/plugins/FMSPlugin/Backup.java 2008-10-27 23:27:08 UTC (rev 23125)
@@ -47,10 +47,10 @@
XMLUtils.writeEsc(w, id.getNickName());
w.write("</Nick>\n");
w.write("\t\t\t<RequestURI>");
- w.write(id.getRequestURI());
+ w.write(id.getRequestURI().toACIIString());
w.write("</RequestURI>\n");
w.write("\t\t\t<InsertURI>");
- w.write(id.getInsertURI());
+ w.write(id.getInsertURI().toACIIString());
w.write("</InsertURI>\n");
w.write("\t\t\t<PublishTrustList>");
w.write(id.doesPublishTrustList() ? "true" : "false");
@@ -72,7 +72,7 @@
XMLUtils.writeEsc(w, id.getNickName());
w.write("</Nick>\n");
w.write("\t\t\t<RequestURI>");
- w.write(id.getRequestURI());
+ w.write(id.getRequestURI().toACIIString());
w.write("</RequestURI>\n");
w.write("\t\t</Identity>\n");
}
@@ -182,16 +182,22 @@
}
if ("OwnIdentity".equals(name)) {
+ // FIXME: repair this.
+ /*
FMSOwnIdentity oid = new FMSOwnIdentity(nick,
requestUri, insertUri, publishTL);
config_db.store(oid);
config_db.commit();
+ */
return;
}
if ("Identity".equals(name)) {
+ // FIXME: repair this.
+ /*
FMSIdentity id = new FMSIdentity(nick,
requestUri);
config_db.store(id);
config_db.commit();
+ */
return;
}
shouldRecord = false;
Modified: trunk/plugins/FMSPlugin/FMSPlugin.java
===================================================================
--- trunk/plugins/FMSPlugin/FMSPlugin.java 2008-10-27 23:09:30 UTC (rev
23124)
+++ trunk/plugins/FMSPlugin/FMSPlugin.java 2008-10-27 23:27:08 UTC (rev
23125)
@@ -207,8 +207,12 @@
IdentityEditor.checkRequestURI(err, requestUri);
if (err.size() == 0) {
+ // FIXME: use identity manager to implement this
+ throw new UnsupportedOperationException();
+ /*
FMSOwnIdentity oi = new FMSOwnIdentity(nick,
requestUri, insertUri, publish);
IdentityEditor.addNewOwnIdentity(db_config, oi,
err);
+ */
}
if (err.size() == 0) {
@@ -231,8 +235,12 @@
IdentityEditor.checkRequestURI(err, requestUri);
if (err.size() == 0) {
+ // FIXME: use identity manager to implement this
+ throw new UnsupportedOperationException();
+ /*
FMSIdentity i = new FMSIdentity("", requestUri);
IdentityEditor.addNewKnownIdentity(db_config,
i, err);
+ */
}
if (err.size() == 0) {
Modified: trunk/plugins/FMSPlugin/ui/IdentityEditor.java
===================================================================
--- trunk/plugins/FMSPlugin/ui/IdentityEditor.java 2008-10-27 23:09:30 UTC
(rev 23124)
+++ trunk/plugins/FMSPlugin/ui/IdentityEditor.java 2008-10-27 23:27:08 UTC
(rev 23125)
@@ -48,8 +48,8 @@
FMSOwnIdentity id = ownIdentities.next();
row = identitiesTable.addChild("tr");
row.addChild("td", id.getNickName());
- row.addChild("td", new String[]{"title"}, new
String[]{id.getRequestURI()}, id.getRequestURI().substring(0, 35)+"...");
- row.addChild("td", new String[]{"title"}, new
String[]{id.getInsertURI()}, id.getInsertURI().substring(0, 15)+"...");
+ row.addChild("td", new String[]{"title"}, new
String[]{id.getRequestURI().toACIIString()},
id.getRequestURI().toACIIString().substring(0, 35)+"...");
+ row.addChild("td", new String[]{"title"}, new
String[]{id.getInsertURI().toACIIString()},
id.getInsertURI().toACIIString().substring(0, 15)+"...");
row.addChild("td",
id.doesPublishTrustList()?"yes":"no");
HTMLNode lastUpdateCell = row.addChild("td");
if (id.getLastInsert() == null) {
@@ -61,7 +61,7 @@
}
HTMLNode deleteCell = row.addChild("td");
HTMLNode deleteForm =
fms.pr.addFormChild(deleteCell, FMSPlugin.SELF_URI + "/deleteOwnIdentity",
"deleteForm");
- deleteForm.addChild("input", new String[] {
"type", "name", "value" }, new String[] { "hidden", "identity",
id.getRequestURI()});
+ 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" });
}
}
@@ -188,10 +188,10 @@
continue;
row = identitiesTable.addChild("tr");
row.addChild("td", id.getNickName());
- row.addChild("td", id.getRequestURI());
+ row.addChild("td", id.getRequestURI().toACIIString());
HTMLNode deleteCell = row.addChild("td");
HTMLNode deleteForm = fms.pr.addFormChild(deleteCell,
FMSPlugin.SELF_URI + "/deleteIdentity", "deleteForm");
- deleteForm.addChild("input", new String[] { "type",
"name", "value" }, new String[] { "hidden", "identity", id.getRequestURI()});
+ 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" });
}
@@ -317,6 +317,7 @@
}
public static void deleteIdentity(FMS fms, String requestUri,
List<String> err) {
+ /*
FMSIdentity templateId = new FMSIdentity(null, requestUri);
ObjectSet<FMSIdentity> toDelete =
fms.db_config.queryByExample(templateId);
@@ -327,6 +328,8 @@
fms.db_config.commit();
} else {
err.add("Identity ?"+requestUri+"? not found, nothing
deleted");
- }
+ }*/
+
+ // FIXME: Implement by using the identity manager.
}
}
