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

[kevinshen]

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

Modified Files:
      Tag: b1_6
        RichTextGetProcessor.java 
Log Message:
CMSC-1298 Clone channel feature


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-1298


Index: RichTextGetProcessor.java
===================================================================
RCS file: 
/var/cvs/contributions/CMSContainer/cmsc/richtext/src/java/com/finalist/cmsc/richtext/RichTextGetProcessor.java,v
retrieving revision 1.14.2.3
retrieving revision 1.14.2.4
diff -u -b -r1.14.2.3 -r1.14.2.4
--- RichTextGetProcessor.java   25 Mar 2009 08:56:43 -0000      1.14.2.3
+++ RichTextGetProcessor.java   25 Mar 2009 09:16:19 -0000      1.14.2.4
@@ -356,9 +356,9 @@
                else {
                   Integer destination = copiedNodes.get(source);
                   if (destination  != null && destination > 0 && 
sourceNode.getCloud().hasNode(destination)) {
-                     Relation rel = 
RelationUtil.getRelation(sourceNode.getCloud().getNodeManager("inlinerel"), 
destinationNode.getNumber(), destination);
+                     Relation rel = 
RelationUtil.getRelation(sourceNode.getCloud().getNodeManager(RichText.INLINEREL_NM),
 destinationNode.getNumber(), destination);
                      if(rel == null) {
-                        rel = RelationUtil.createRelation(destinationNode, 
sourceNode.getCloud().getNode(destination), "inlinerel");
+                        rel = RelationUtil.createRelation(destinationNode, 
sourceNode.getCloud().getNode(destination), RichText.INLINEREL_NM);
                      }
                      link.setAttribute(RichText.DESTINATION_ATTR, 
String.valueOf(destination));
                      link.setAttribute(RichText.RELATIONID_ATTR, 
String.valueOf(rel.getNumber()));
@@ -416,9 +416,9 @@
                else {
                   Integer destination = copiedNodes.get(source);
                   if (destination  != null && destination > 0 && 
sourceNode.getCloud().hasNode(destination)) {
-                     Relation rel = 
RelationUtil.getRelation(sourceNode.getCloud().getNodeManager("imageinlinerel"),
 destinationNode.getNumber(), destination);
+                     Relation rel = 
RelationUtil.getRelation(sourceNode.getCloud().getNodeManager(RichText.IMAGEINLINEREL_NM),
 destinationNode.getNumber(), destination);
                      if(rel == null) {
-                        rel = RelationUtil.createRelation(destinationNode, 
sourceNode.getCloud().getNode(destination), "imageinlinerel");
+                        rel = RelationUtil.createRelation(destinationNode, 
sourceNode.getCloud().getNode(destination), RichText.IMAGEINLINEREL_NM);
                      }
                      image.setAttribute(RichText.DESTINATION_ATTR, 
String.valueOf(destination));
                      image.setAttribute(RichText.RELATIONID_ATTR, 
String.valueOf(rel.getNumber()));
_______________________________________________
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs