[MMBASE CVS] contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/tree NewsletterPublicationTreeItemRenderer.java NewsletterTreeItemRenderer.java

[jkoster]

Update of 
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/tree
In directory 
james.mmbase.org:/tmp/cvs-serv11482/portlets-newsletter/src/java/com/finalist/newsletter/tree

Modified Files:
        NewsletterPublicationTreeItemRenderer.java 
        NewsletterTreeItemRenderer.java 
Log Message:
CMSC-1100 - Rename a newsletter publication to newsletter edition - also made 
resource bundles more similar.


See also: 
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/tree
See also: http://www.mmbase.org/jira/browse/CMSC-1100


Index: NewsletterPublicationTreeItemRenderer.java
===================================================================
RCS file: 
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/tree/NewsletterPublicationTreeItemRenderer.java,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -b -r1.17 -r1.18
--- NewsletterPublicationTreeItemRenderer.java  14 Oct 2008 11:22:44 -0000      
1.17
+++ NewsletterPublicationTreeItemRenderer.java  24 Oct 2008 13:54:12 -0000      
1.18
@@ -37,7 +37,7 @@
       TreeElement element = renderer.createElement(parentNode, role, name, 
fragment, secure);
 
       if (SecurityUtil.isEditor(role)) {
-         element.addOption(renderer.createTreeOption("edit_defaults.png", 
"site.newsletterpublication.edit", "newsletter",
+         element.addOption(renderer.createTreeOption("edit_defaults.png", 
"site.newsletteredition.edit", "newsletter",
                   "../newsletter/NewsletterPublicationEdit.do?number=" + id));
 
          boolean isSingleApplication = true;
@@ -54,11 +54,11 @@
          log.debug("Publication " + parentNode.getNumber() + "'s publication 
status:" + isPublished + " in single:" + isSingleApplication);
 
          if (SecurityUtil.isWebmaster(role) || 
(model.getChildCount(parentNode) == 0 && !isPublished)) {
-            element.addOption(renderer.createTreeOption("delete.png", 
"site.newsletterpublication.remove", "newsletter",
+            element.addOption(renderer.createTreeOption("delete.png", 
"site.newsletteredition.remove", "newsletter",
                      "../newsletter/NewsletterPublicationDelete.do?number=" + 
id));
-            element.addOption(renderer.createTreeOption("mail.png", 
"site.newsletterpublication.publish", "newsletter",
+            element.addOption(renderer.createTreeOption("mail.png", 
"site.newsletteredition.publish", "newsletter",
                      "../newsletter/NewsletterPublicationPublish.do?number=" + 
id));
-            element.addOption(renderer.createTreeOption("mail.png", 
"site.newsletterpublication.test", "newsletter",
+            element.addOption(renderer.createTreeOption("mail.png", 
"site.newsletteredition.test", "newsletter",
                      "../newsletter/NewsletterPublicationTest.do?number=" + 
id));
          }
 
@@ -67,7 +67,7 @@
          }
 
          if (SecurityUtil.isWebmaster(role) && 
ModuleUtil.checkFeature(FEATURE_WORKFLOW)) {
-            element.addOption(renderer.createTreeOption("mail.png", 
"site.newsletterpublication.publish", "newsletter",
+            element.addOption(renderer.createTreeOption("mail.png", 
"site.newsletteredition.publish", "newsletter",
                      "../workflow/publish.jsp?number=" + id));
          }
       }


Index: NewsletterTreeItemRenderer.java
===================================================================
RCS file: 
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/tree/NewsletterTreeItemRenderer.java,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -b -r1.20 -r1.21
--- NewsletterTreeItemRenderer.java     14 Oct 2008 11:22:44 -0000      1.20
+++ NewsletterTreeItemRenderer.java     24 Oct 2008 13:54:12 -0000      1.21
@@ -110,12 +110,12 @@
                )
       );
       element.addOption(
-               renderer.createTreeOption("mail.png", 
"site.newsletterpublication.new.blank", "newsletter",
+            renderer.createTreeOption("mail.png", 
"site.newsletteredition.new.blank", "newsletter",
                         "../newsletter/NewsletterPublicationCreate.do?parent=" 
+ id + "&copycontent=false"
                )
       );
       element.addOption(
-               renderer.createTreeOption("mail.png", 
"site.newsletterpublication.new.withcontent", "newsletter",
+            renderer.createTreeOption("mail.png", 
"site.newsletteredition.new.withcontent", "newsletter",
                         "../newsletter/NewsletterPublicationCreate.do?parent=" 
+ id + "&copycontent=true"
                )
       );
_______________________________________________
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs