[MMBASE CVS] contributions/CMSContainer/cmsc/richtext/src/java/com/finalist/cmsc/richtext RichTextGetProcessor.java RichText.java

[jkoster]

Update of 
/var/cvs/contributions/CMSContainer/cmsc/richtext/src/java/com/finalist/cmsc/richtext
In directory 
james.mmbase.org:/tmp/cvs-serv2545/cmsc/richtext/src/java/com/finalist/cmsc/richtext

Modified Files:
        RichTextGetProcessor.java RichText.java 
Log Message:
CMSC-1028 - Better handling of missing content elements in portlets - Improved 
thread listing view - Added thread dump cleaning line.


See also: 
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer/cmsc/richtext/src/java/com/finalist/cmsc/richtext
See also: http://www.mmbase.org/jira/browse/CMSC-1028


Index: RichTextGetProcessor.java
===================================================================
RCS file: 
/var/cvs/contributions/CMSContainer/cmsc/richtext/src/java/com/finalist/cmsc/richtext/RichTextGetProcessor.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- RichTextGetProcessor.java   9 Jun 2008 21:23:23 -0000       1.11
+++ RichTextGetProcessor.java   25 Jul 2008 12:17:20 -0000      1.12
@@ -241,7 +241,7 @@
             if ("attachments".equals(builderName)) {
                name = 
destinationNode.getStringValue(RichText.DESCRIPTION_ATTR);
                if (StringUtils.isBlank(name)) {
-                  name = destinationNode.getStringValue(RichText.TITLE_ATTR);
+                  name = destinationNode.getStringValue(RichText.TITLE_FIELD);
                }
                url = ResourcesUtil.getServletPath(destinationNode, 
destinationNode.getStringValue("number"));
             }
@@ -251,8 +251,8 @@
                   url = destinationNode.getStringValue("url");
                }
                else {
-                  if 
(destinationNode.getNodeManager().hasField(RichText.TITLE_ATTR)) {
-                     name = 
destinationNode.getStringValue(RichText.TITLE_ATTR);
+                  if 
(destinationNode.getNodeManager().hasField(RichText.TITLE_FIELD)) {
+                     name = 
destinationNode.getStringValue(RichText.TITLE_FIELD);
                   }
                   else {
                      if (destinationNode.getNodeManager().hasField("name")) {
@@ -287,7 +287,13 @@
 
 
    private String getContentUrl(Node node) {
-      String title = node.getStringValue("title");
+      String title = null;
+      
+      //Check for the existence of title field of the node
+      if (node.getNodeManager().hasField(RichText.TITLE_FIELD)) {
+         title = node.getStringValue(RichText.TITLE_FIELD);
+      }
+      
       String id = node.getStringValue("number");
       return ResourcesUtil.getServletPathWithAssociation("content", 
"/content/*", id, title);
    }


Index: RichText.java
===================================================================
RCS file: 
/var/cvs/contributions/CMSContainer/cmsc/richtext/src/java/com/finalist/cmsc/richtext/RichText.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- RichText.java       16 May 2008 11:46:32 -0000      1.6
+++ RichText.java       25 Jul 2008 12:17:20 -0000      1.7
@@ -52,11 +52,12 @@
    public static final String WIDTH_ATTR = "width";
    public static final String HEIGHT_ATTR = "height";
 
-   // mmbase stuff
+   // MMBase stuff
    public final static String RICHTEXT_TYPE = "cmscrichtext";
    public final static String INLINEREL_NM = "inlinerel";
    public final static String IMAGEINLINEREL_NM = "imageinlinerel";
    public static final String REFERID_FIELD = "referid";
+   public static final String TITLE_FIELD = "title";
 
 
    public final static boolean hasRichtextItems(String in) {
_______________________________________________
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs