Update of
/var/cvs/contributions/CMSContainer/cmsc/contentrepository/src/java/com/finalist/cmsc/resources/forms
In directory
james.mmbase.org:/tmp/cvs-serv24749/cmsc/contentrepository/src/java/com/finalist/cmsc/resources/forms
Modified Files:
UrlForm.java SecondaryEditAction.java UrlAction.java
SecondaryEditForm.java
Log Message:
CMSC-1281 Assets: Relate URLs to content element - New search screen
See also:
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer/cmsc/contentrepository/src/java/com/finalist/cmsc/resources/forms
See also: http://www.mmbase.org/jira/browse/CMSC-1281
Index: UrlForm.java
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer/cmsc/contentrepository/src/java/com/finalist/cmsc/resources/forms/UrlForm.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- UrlForm.java 6 Feb 2009 06:08:19 -0000 1.5
+++ UrlForm.java 19 Feb 2009 12:09:01 -0000 1.6
@@ -3,7 +3,7 @@
@SuppressWarnings("serial")
public class UrlForm extends SearchForm {
- private String name;
+ private String title;
private String description;
private String url;
private String valid;
@@ -24,13 +24,13 @@
}
- public String getName() {
- return name;
+ public String getTitle() {
+ return title;
}
- public void setName(String name) {
- this.name = name;
+ public void setTitle(String name) {
+ this.title = name;
}
Index: SecondaryEditAction.java
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer/cmsc/contentrepository/src/java/com/finalist/cmsc/resources/forms/SecondaryEditAction.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- SecondaryEditAction.java 26 Nov 2007 11:43:39 -0000 1.3
+++ SecondaryEditAction.java 19 Feb 2009 12:09:01 -0000 1.4
@@ -20,6 +20,10 @@
if (SecondaryEditForm.ACTION_SAVE.equals(editForm.getAction())) {
Node node = cloud.getNode(editForm.getNumber());
node.setStringValue("title", editForm.getTitle());
+ String nodetype = node.getNodeManager().getName();
+ if("urls".equals(nodetype)){
+ node.setStringValue("url", editForm.getUrl());
+ }
node.setStringValue("description", editForm.getDescription());
node.commit();
@@ -35,6 +39,10 @@
else if (SecondaryEditForm.ACTION_INIT.equals(editForm.getAction())) {
Node node = cloud.getNode(editForm.getNumber());
editForm.setTitle(node.getStringValue("title"));
+ String nodetype = node.getNodeManager().getName();
+ if("urls".equals(nodetype)){
+ editForm.setUrl(node.getStringValue("url"));
+ }
editForm.setDescription(node.getStringValue("description"));
}
Index: UrlAction.java
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer/cmsc/contentrepository/src/java/com/finalist/cmsc/resources/forms/UrlAction.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- UrlAction.java 6 Feb 2009 06:08:19 -0000 1.5
+++ UrlAction.java 19 Feb 2009 12:09:01 -0000 1.6
@@ -5,7 +5,7 @@
public class UrlAction extends SearchAction {
- public static final String NAME_FIELD = "title";
+ public static final String TITLE_FIELD = "title";
public static final String DESCRIPTION_FIELD = "description";
public static final String URL_FIELD = "url";
public static final String VALID_FIELD = "valid";
@@ -15,7 +15,7 @@
protected void addConstraints(SearchForm searchForm, NodeManager
nodeManager,
QueryStringComposer queryStringComposer, NodeQuery query) {
UrlForm form = (UrlForm) searchForm;
- addField(nodeManager, queryStringComposer, query, NAME_FIELD,
form.getName());
+ addField(nodeManager, queryStringComposer, query, TITLE_FIELD,
form.getTitle());
addField(nodeManager, queryStringComposer, query, DESCRIPTION_FIELD,
form.getDescription());
addField(nodeManager, queryStringComposer, query, URL_FIELD,
form.getUrl());
addField(nodeManager, queryStringComposer, query, VALID_FIELD,
form.getValid());
Index: SecondaryEditForm.java
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer/cmsc/contentrepository/src/java/com/finalist/cmsc/resources/forms/SecondaryEditForm.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- SecondaryEditForm.java 26 Nov 2007 11:43:39 -0000 1.2
+++ SecondaryEditForm.java 19 Feb 2009 12:09:01 -0000 1.3
@@ -11,6 +11,7 @@
private int number;
private String title;
+ private String url;
private String description;
private String returnUrl;
@@ -57,6 +58,16 @@
}
+ public String getUrl() {
+ return url;
+ }
+
+
+ public void setUrl(String url) {
+ this.url = url;
+ }
+
+
public String getAction() {
return action;
}
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
