Update of
/var/cvs/contributions/CMSContainer/cmsc/richtext/src/java/com/finalist/cmsc/richtext
In directory
james.mmbase.org:/tmp/cvs-serv19275/richtext/src/java/com/finalist/cmsc/richtext
Modified Files:
Tag: b1_6
RichText.java 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: RichText.java
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer/cmsc/richtext/src/java/com/finalist/cmsc/richtext/RichText.java,v
retrieving revision 1.9.2.1
retrieving revision 1.9.2.2
diff -u -b -r1.9.2.1 -r1.9.2.2
--- RichText.java 5 Mar 2009 06:34:48 -0000 1.9.2.1
+++ RichText.java 5 Mar 2009 08:00:54 -0000 1.9.2.2
@@ -101,7 +101,7 @@
return doc;
}
- public final static Object stripLinkAndImage(Node sourceNode,Field
field,Map<Integer, Integer> copiedNodes,List<Integer> channels) {
+ public final static Object stripLinkAndImage(Node sourceNode,Field
field,Map<Integer, Integer> copiedNodes) {
DataType dataType = field.getDataType();
while (StringUtils.isEmpty(dataType.getName())) {
dataType = dataType.getOrigin();
@@ -116,7 +116,7 @@
if (hasRichtextItems(fieldValue)) {
Document doc = getRichTextDocument(fieldValue);
RichTextGetProcessor richTextGetProcessor = new
RichTextGetProcessor();
-
richTextGetProcessor.resolve(sourceNode,doc,copiedNodes,channels);
+ richTextGetProcessor.resolve(sourceNode,doc,copiedNodes);
String out = getRichTextString(doc);
out = WordHtmlCleaner.fixEmptyAnchors(out);
log.debug("final richtext text = " + out);
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.1
retrieving revision 1.14.2.2
diff -u -b -r1.14.2.1 -r1.14.2.2
--- RichTextGetProcessor.java 5 Mar 2009 06:34:48 -0000 1.14.2.1
+++ RichTextGetProcessor.java 5 Mar 2009 08:00:54 -0000 1.14.2.2
@@ -307,9 +307,9 @@
return ResourcesUtil.getServletPathWithAssociation("content",
"/content/*", id, title);
}
- public void resolve(Node node,Document doc,Map<Integer, Integer>
copiedNodes,List<Integer> channels) {
- resolveLinks(doc, node,copiedNodes,channels);
- resolveImages(doc, node,copiedNodes,channels);
+ public void resolve(Node node,Document doc,Map<Integer, Integer>
copiedNodes) {
+ resolveLinks(doc, node,copiedNodes);
+ resolveImages(doc, node,copiedNodes);
}
/**
* To resolve the links in Richtext fields
@@ -318,7 +318,7 @@
* @param copiedNodes
* @param channels
*/
- public static void resolveLinks(Document doc, Node sourceNode,Map<Integer,
Integer> copiedNodes,List<Integer> channels) {
+ public static void resolveLinks(Document doc, Node sourceNode,Map<Integer,
Integer> copiedNodes) {
if (doc == null) {
return;
}
@@ -372,7 +372,7 @@
* @param copiedNodes
* @param channels
*/
- public static void resolveImages(Document doc,Node sourceNode,Map<Integer,
Integer> copiedNodes,List<Integer> channels) {
+ public static void resolveImages(Document doc,Node sourceNode,Map<Integer,
Integer> copiedNodes) {
if (doc == null) {
return;
}
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
