Author: nacktschneck
Date: 2006-03-07 23:46:46 +0000 (Tue, 07 Mar 2006)
New Revision: 8190
Modified:
trunk/apps/bookmarkplugin/src/falimat/freenet/bookmarkplugin/components/BookmarkEditor.java
trunk/apps/bookmarkplugin/src/falimat/freenet/bookmarkplugin/components/BookmarkSearchForm.java
trunk/apps/bookmarkplugin/src/falimat/freenet/bookmarkplugin/components/LoginMessage.java
trunk/apps/bookmarkplugin/src/falimat/freenet/bookmarkplugin/ui/AddBookmarkPage.java
trunk/apps/bookmarkplugin/src/falimat/freenet/bookmarkplugin/ui/ChannelsPage.java
trunk/apps/bookmarkplugin/src/falimat/freenet/webplugin/Action.java
trunk/apps/bookmarkplugin/src/falimat/freenet/webplugin/FormAction.java
trunk/apps/bookmarkplugin/src/falimat/freenet/webplugin/FormComponent.java
trunk/apps/bookmarkplugin/src/falimat/freenet/webplugin/SimpleAction.java
trunk/apps/bookmarkplugin/src/falimat/freenet/webplugin/WebinterfacePlugin.java
trunk/apps/bookmarkplugin/src/falimat/freenet/webplugin/components/AbstractFormComponent.java
trunk/apps/bookmarkplugin/src/falimat/freenet/webplugin/components/Form.java
trunk/apps/bookmarkplugin/src/falimat/freenet/webplugin/components/LabeledDropdown.java
Log:
Yet more changes because PluginHTTPRequest was renamed.
Modified:
trunk/apps/bookmarkplugin/src/falimat/freenet/bookmarkplugin/components/BookmarkEditor.java
===================================================================
---
trunk/apps/bookmarkplugin/src/falimat/freenet/bookmarkplugin/components/BookmarkEditor.java
2006-03-07 23:40:14 UTC (rev 8189)
+++
trunk/apps/bookmarkplugin/src/falimat/freenet/bookmarkplugin/components/BookmarkEditor.java
2006-03-07 23:46:46 UTC (rev 8190)
@@ -24,7 +24,7 @@
import falimat.freenet.webplugin.components.LabeledTextArea;
import falimat.freenet.webplugin.components.LabeledTextField;
import falimat.freenet.webplugin.components.SubmitButton;
-import freenet.pluginmanager.PluginHTTPRequest;
+import freenet.pluginmanager.HTTPRequest;
public class BookmarkEditor extends AbstractHtmlComponent implements
ActionComponent {
@@ -88,7 +88,7 @@
this.saveButton.setAction(new FormAction(this.form) {
@Override
- protected void onSubmit(PluginHTTPRequest request) {
+ protected void onSubmit(HTTPRequest request) {
bookmark.setTitle(titleField.getValue());
bookmark.setDescription(descriptionArea.getValue());
bookmark.setRating(request.getIntParam(ratingDropdown.getName(), -1));
@@ -101,7 +101,7 @@
}
@Override
- protected void onInvalidSubmission(PluginHTTPRequest request) {
+ protected void onInvalidSubmission(HTTPRequest request) {
}
Modified:
trunk/apps/bookmarkplugin/src/falimat/freenet/bookmarkplugin/components/BookmarkSearchForm.java
===================================================================
---
trunk/apps/bookmarkplugin/src/falimat/freenet/bookmarkplugin/components/BookmarkSearchForm.java
2006-03-07 23:40:14 UTC (rev 8189)
+++
trunk/apps/bookmarkplugin/src/falimat/freenet/bookmarkplugin/components/BookmarkSearchForm.java
2006-03-07 23:46:46 UTC (rev 8190)
@@ -12,7 +12,7 @@
import falimat.freenet.webplugin.components.LabeledDropdown;
import falimat.freenet.webplugin.components.LabeledTextField;
import falimat.freenet.webplugin.components.SubmitButton;
-import freenet.pluginmanager.PluginHTTPRequest;
+import freenet.pluginmanager.HTTPRequest;
public class BookmarkSearchForm extends Form {
@@ -45,7 +45,7 @@
this.searchButton.setAction(new FormAction(this) {
@Override
- protected void onSubmit(PluginHTTPRequest request) {
+ protected void onSubmit(HTTPRequest request) {
String text = textQueryField.getValue();
Set<String> tags =
BookmarkEditor.tagsAsSet(tagQueryField.getValue());
String contentType = contentTypeDropdown.getValue();
@@ -56,7 +56,7 @@
}
@Override
- protected void onInvalidSubmission(PluginHTTPRequest request) {
+ protected void onInvalidSubmission(HTTPRequest request) {
// TODO Auto-generated method stub
}
Modified:
trunk/apps/bookmarkplugin/src/falimat/freenet/bookmarkplugin/components/LoginMessage.java
===================================================================
---
trunk/apps/bookmarkplugin/src/falimat/freenet/bookmarkplugin/components/LoginMessage.java
2006-03-07 23:40:14 UTC (rev 8189)
+++
trunk/apps/bookmarkplugin/src/falimat/freenet/bookmarkplugin/components/LoginMessage.java
2006-03-07 23:46:46 UTC (rev 8190)
@@ -10,7 +10,7 @@
import falimat.freenet.webplugin.HtmlWriter;
import falimat.freenet.webplugin.SimpleAction;
import falimat.freenet.webplugin.components.ActionButton;
-import freenet.pluginmanager.PluginHTTPRequest;
+import freenet.pluginmanager.HTTPRequest;
public class LoginMessage extends AbstractHtmlComponent implements
ActionComponent {
ActionButton logoutButton = new ActionButton("x", "Logout");
@@ -20,7 +20,7 @@
logoutButton.setAction(new SimpleAction() {
@Override
- public void execute(PluginHTTPRequest request) {
+ public void execute(HTTPRequest request) {
LoginCredentials.instance().logout();
addBookmarkPage.onLogout();
}
Modified:
trunk/apps/bookmarkplugin/src/falimat/freenet/bookmarkplugin/ui/AddBookmarkPage.java
===================================================================
---
trunk/apps/bookmarkplugin/src/falimat/freenet/bookmarkplugin/ui/AddBookmarkPage.java
2006-03-07 23:40:14 UTC (rev 8189)
+++
trunk/apps/bookmarkplugin/src/falimat/freenet/bookmarkplugin/ui/AddBookmarkPage.java
2006-03-07 23:46:46 UTC (rev 8190)
@@ -27,7 +27,7 @@
import freenet.client.HighLevelSimpleClient;
import freenet.crypt.Yarrow;
import freenet.keys.FreenetURI;
-import freenet.pluginmanager.PluginHTTPRequest;
+import freenet.pluginmanager.HTTPRequest;
public class AddBookmarkPage extends HtmlPage {
/**
@@ -81,7 +81,7 @@
this.checkButton = new SubmitButton("Create");
this.checkButton.setAction(new FormAction(this.addBookmarkForm) {
@Override
- protected void onSubmit(PluginHTTPRequest request) {
+ protected void onSubmit(HTTPRequest request) {
messageArea.hide();
try {
bookmark = createBookmark(uriTextField.getValue());
@@ -99,7 +99,7 @@
}
@Override
- protected void onInvalidSubmission(PluginHTTPRequest request) {
+ protected void onInvalidSubmission(HTTPRequest request) {
messageArea.hide();
editor.setBookmark(null);
}
@@ -121,7 +121,7 @@
newAccountButton.setAction(new SimpleAction() {
@Override
- public void execute(PluginHTTPRequest request) {
+ public void execute(HTTPRequest request) {
LoginCredentials.instance().logout();
addBookmarkForm.hide();
loginForm.hide();
@@ -175,7 +175,7 @@
submitButton.setAction(new FormAction(this) {
@Override
- protected void onSubmit(PluginHTTPRequest request) {
+ protected void onSubmit(HTTPRequest request) {
String userName = nickTextField.getValue();
@@ -202,7 +202,7 @@
}
@Override
- protected void onInvalidSubmission(PluginHTTPRequest request) {
+ protected void onInvalidSubmission(HTTPRequest request) {
// TODO Auto-generated method stub
}
@@ -214,7 +214,7 @@
cancelButton.setAction(new FormAction(this, false) {
@Override
- protected void onSubmit(PluginHTTPRequest request) {
+ protected void onSubmit(HTTPRequest request) {
NewUserForm.this.resetFormValues();
NewUserForm.this.hide();
loginForm.resetFormValues();
@@ -222,7 +222,7 @@
}
@Override
- protected void onInvalidSubmission(PluginHTTPRequest request) {
+ protected void onInvalidSubmission(HTTPRequest request) {
this.onSubmit(request);
}
@@ -260,7 +260,7 @@
loginButton.setAction(new FormAction(this) {
@Override
- protected void onSubmit(PluginHTTPRequest request) {
+ protected void onSubmit(HTTPRequest request) {
try {
LoginCredentials.instance().login(publicKeyField.getValue(),
privateKeyField.getValue());
LoginForm.this.hide();
@@ -273,7 +273,7 @@
}
@Override
- protected void onInvalidSubmission(PluginHTTPRequest request) {
+ protected void onInvalidSubmission(HTTPRequest request) {
LoginCredentials.instance().logout();
resetLoginForm();
}
Modified:
trunk/apps/bookmarkplugin/src/falimat/freenet/bookmarkplugin/ui/ChannelsPage.java
===================================================================
---
trunk/apps/bookmarkplugin/src/falimat/freenet/bookmarkplugin/ui/ChannelsPage.java
2006-03-07 23:40:14 UTC (rev 8189)
+++
trunk/apps/bookmarkplugin/src/falimat/freenet/bookmarkplugin/ui/ChannelsPage.java
2006-03-07 23:46:46 UTC (rev 8190)
@@ -22,7 +22,7 @@
import falimat.freenet.webplugin.components.Heading;
import falimat.freenet.webplugin.components.LabeledTextField;
import falimat.freenet.webplugin.components.SubmitButton;
-import freenet.pluginmanager.PluginHTTPRequest;
+import freenet.pluginmanager.HTTPRequest;
public class ChannelsPage extends HtmlPage {
final BeanTable channelsTable = new BeanTable();
@@ -54,7 +54,7 @@
this.addChannelButton.setAction(new FormAction(this.form) {
@Override
- protected void onSubmit(PluginHTTPRequest request) {
+ protected void onSubmit(HTTPRequest request) {
try {
String channelUri = addChannelUri.getValue();
Channel channel = new Channel();
@@ -84,7 +84,7 @@
}
@Override
- protected void onInvalidSubmission(PluginHTTPRequest request) {
+ protected void onInvalidSubmission(HTTPRequest request) {
// TODO Auto-generated method stub
}
@@ -162,7 +162,7 @@
submitButton.setAction(new FormAction(this.channelSettingsForm) {
@Override
- protected void onSubmit(PluginHTTPRequest request) {
+ protected void onSubmit(HTTPRequest request) {
User user = LoginCredentials.instance().getCurrentUser();
if (user==null) {
insertIntervalField.showValidationMessage("You must be
logged in to change publish preferences");
@@ -182,7 +182,7 @@
}
@Override
- protected void onInvalidSubmission(PluginHTTPRequest request) {
+ protected void onInvalidSubmission(HTTPRequest request) {
// TODO Auto-generated method stub
}
Modified: trunk/apps/bookmarkplugin/src/falimat/freenet/webplugin/Action.java
===================================================================
--- trunk/apps/bookmarkplugin/src/falimat/freenet/webplugin/Action.java
2006-03-07 23:40:14 UTC (rev 8189)
+++ trunk/apps/bookmarkplugin/src/falimat/freenet/webplugin/Action.java
2006-03-07 23:46:46 UTC (rev 8190)
@@ -1,9 +1,9 @@
package falimat.freenet.webplugin;
-import freenet.pluginmanager.PluginHTTPRequest;
+import freenet.pluginmanager.HTTPRequest;
public interface Action {
String getId();
- void execute(PluginHTTPRequest request);
+ void execute(HTTPRequest request);
}
Modified:
trunk/apps/bookmarkplugin/src/falimat/freenet/webplugin/FormAction.java
===================================================================
--- trunk/apps/bookmarkplugin/src/falimat/freenet/webplugin/FormAction.java
2006-03-07 23:40:14 UTC (rev 8189)
+++ trunk/apps/bookmarkplugin/src/falimat/freenet/webplugin/FormAction.java
2006-03-07 23:46:46 UTC (rev 8190)
@@ -1,7 +1,7 @@
package falimat.freenet.webplugin;
import falimat.freenet.webplugin.components.Form;
-import freenet.pluginmanager.PluginHTTPRequest;
+import freenet.pluginmanager.HTTPRequest;
public abstract class FormAction extends SimpleAction {
@@ -19,15 +19,15 @@
}
@Override
- public void execute(PluginHTTPRequest request) {
+ public void execute(HTTPRequest request) {
boolean validationSuccesfull = validateBeforeExecution ?
this.form.validate(request) : true;
if (validationSuccesfull) {
this.onSubmit(request);
}
}
- protected abstract void onSubmit(PluginHTTPRequest request);
+ protected abstract void onSubmit(HTTPRequest request);
- protected abstract void onInvalidSubmission(PluginHTTPRequest request);
+ protected abstract void onInvalidSubmission(HTTPRequest request);
}
Modified:
trunk/apps/bookmarkplugin/src/falimat/freenet/webplugin/FormComponent.java
===================================================================
--- trunk/apps/bookmarkplugin/src/falimat/freenet/webplugin/FormComponent.java
2006-03-07 23:40:14 UTC (rev 8189)
+++ trunk/apps/bookmarkplugin/src/falimat/freenet/webplugin/FormComponent.java
2006-03-07 23:46:46 UTC (rev 8190)
@@ -1,11 +1,11 @@
package falimat.freenet.webplugin;
-import freenet.pluginmanager.PluginHTTPRequest;
+import freenet.pluginmanager.HTTPRequest;
public interface FormComponent {
- void setValueFromRequest(PluginHTTPRequest request);
+ void setValueFromRequest(HTTPRequest request);
- boolean validate(PluginHTTPRequest request);
+ boolean validate(HTTPRequest request);
void reset();
}
Modified:
trunk/apps/bookmarkplugin/src/falimat/freenet/webplugin/SimpleAction.java
===================================================================
--- trunk/apps/bookmarkplugin/src/falimat/freenet/webplugin/SimpleAction.java
2006-03-07 23:40:14 UTC (rev 8189)
+++ trunk/apps/bookmarkplugin/src/falimat/freenet/webplugin/SimpleAction.java
2006-03-07 23:46:46 UTC (rev 8190)
@@ -1,6 +1,6 @@
package falimat.freenet.webplugin;
-import freenet.pluginmanager.PluginHTTPRequest;
+import freenet.pluginmanager.HTTPRequest;
public abstract class SimpleAction implements Action {
@@ -24,6 +24,6 @@
return this.id;
}
- public abstract void execute(PluginHTTPRequest request);
+ public abstract void execute(HTTPRequest request);
}
Modified:
trunk/apps/bookmarkplugin/src/falimat/freenet/webplugin/WebinterfacePlugin.java
===================================================================
---
trunk/apps/bookmarkplugin/src/falimat/freenet/webplugin/WebinterfacePlugin.java
2006-03-07 23:40:14 UTC (rev 8189)
+++
trunk/apps/bookmarkplugin/src/falimat/freenet/webplugin/WebinterfacePlugin.java
2006-03-07 23:46:46 UTC (rev 8190)
@@ -6,21 +6,16 @@
import freenet.pluginmanager.FredPlugin;
import freenet.pluginmanager.FredPluginHTTP;
import freenet.pluginmanager.PluginHTTPException;
-import freenet.pluginmanager.PluginHTTPRequest;
+import freenet.pluginmanager.HTTPRequest;
import freenet.pluginmanager.PluginRespirator;
public abstract class WebinterfacePlugin implements FredPlugin, FredPluginHTTP
{
private HtmlPage rootPage;
- public String handleHTTPGet(String path) throws PluginHTTPException {
- PluginHTTPRequest request;
+ public String handleHTTPGet(HTTPRequest request) throws
PluginHTTPException {
- try {
- request = new PluginHTTPRequest(path);
- } catch (URISyntaxException e) {
- throw new PluginHTTPException(501, "text/plain", "ERROR",
e.getMessage());
- }
+ String path = request.getPath();
if (path.endsWith("css")) {
try {
@@ -30,10 +25,8 @@
}
}
- // TODO: put this in PluginHTTPRequest ?
- if (path.contains("?")) {
- path = path.substring(0, path.indexOf("?"));
- }
+ // TODO: put this in HTTPRequest ?
+
if (path.startsWith("/")) {
path = path.substring(1);
}
@@ -48,7 +41,7 @@
try {
pageToBeRendered = this.rootPage.getSubPage(path);
} catch (PageNotFoundException e) {
- pageToBeRendered = new ErrorPage("404 - Page Not Found: " +
path, e);
+ pageToBeRendered = new ErrorPage("404 - Page Not Found: " +
request, e);
}
}
@@ -76,11 +69,11 @@
return stringWriter.toString();
}
- public String handleHTTPPut(String path) throws PluginHTTPException {
+ public String handleHTTPPut(HTTPRequest request) throws
PluginHTTPException {
return this.renderPage(new ErrorPage("HTTP PUT is not supported by
this plugin.", null));
}
- public String handleHTTPPost(String path) throws PluginHTTPException {
+ public String handleHTTPPost(HTTPRequest request) throws
PluginHTTPException {
return this.renderPage(new ErrorPage("HTTP POST is not supported by
this plugin.", null));
}
Modified:
trunk/apps/bookmarkplugin/src/falimat/freenet/webplugin/components/AbstractFormComponent.java
===================================================================
---
trunk/apps/bookmarkplugin/src/falimat/freenet/webplugin/components/AbstractFormComponent.java
2006-03-07 23:40:14 UTC (rev 8189)
+++
trunk/apps/bookmarkplugin/src/falimat/freenet/webplugin/components/AbstractFormComponent.java
2006-03-07 23:46:46 UTC (rev 8190)
@@ -8,7 +8,7 @@
import falimat.freenet.webplugin.AbstractHtmlComponent;
import falimat.freenet.webplugin.HtmlPage;
import falimat.freenet.webplugin.HtmlWriter;
-import freenet.pluginmanager.PluginHTTPRequest;
+import freenet.pluginmanager.HTTPRequest;
public abstract class AbstractFormComponent extends AbstractHtmlComponent {
@@ -40,11 +40,11 @@
this.value = value;
}
- public void setValueFromRequest(PluginHTTPRequest request) {
+ public void setValueFromRequest(HTTPRequest request) {
this.value = request.getParam(this.name).trim();
}
- public boolean validate(PluginHTTPRequest request) {
+ public boolean validate(HTTPRequest request) {
String newValue = this.value;
if (newValue.length() == 0) {
if (this.required) {
Modified:
trunk/apps/bookmarkplugin/src/falimat/freenet/webplugin/components/Form.java
===================================================================
---
trunk/apps/bookmarkplugin/src/falimat/freenet/webplugin/components/Form.java
2006-03-07 23:40:14 UTC (rev 8189)
+++
trunk/apps/bookmarkplugin/src/falimat/freenet/webplugin/components/Form.java
2006-03-07 23:46:46 UTC (rev 8190)
@@ -10,7 +10,7 @@
import falimat.freenet.webplugin.HtmlComponent;
import falimat.freenet.webplugin.HtmlPage;
import falimat.freenet.webplugin.HtmlWriter;
-import freenet.pluginmanager.PluginHTTPRequest;
+import freenet.pluginmanager.HTTPRequest;
public class Form extends AbstractHtmlComponent implements ActionComponent {
@@ -67,7 +67,7 @@
this.action = action;
}
- public boolean validate(PluginHTTPRequest request) {
+ public boolean validate(HTTPRequest request) {
for (HtmlComponent component : this.components) {
if (component instanceof FormComponent) {
((FormComponent) component).setValueFromRequest(request);
Modified:
trunk/apps/bookmarkplugin/src/falimat/freenet/webplugin/components/LabeledDropdown.java
===================================================================
---
trunk/apps/bookmarkplugin/src/falimat/freenet/webplugin/components/LabeledDropdown.java
2006-03-07 23:40:14 UTC (rev 8189)
+++
trunk/apps/bookmarkplugin/src/falimat/freenet/webplugin/components/LabeledDropdown.java
2006-03-07 23:46:46 UTC (rev 8190)
@@ -3,7 +3,7 @@
import falimat.freenet.webplugin.FormComponent;
import falimat.freenet.webplugin.HtmlPage;
import falimat.freenet.webplugin.HtmlWriter;
-import freenet.pluginmanager.PluginHTTPRequest;
+import freenet.pluginmanager.HTTPRequest;
public class LabeledDropdown extends AbstractFormComponent implements
FormComponent {
@@ -24,7 +24,7 @@
}
@Override
- public void setValueFromRequest(PluginHTTPRequest request) {
+ public void setValueFromRequest(HTTPRequest request) {
try {
int index = request.getIntParam(this.name, -1);
if (index >= 0) {
