svn commit: r883690 - in /lenya/branches/BRANCH_2_0_X/src/modules-core/sitemanagement/java/src/org/apache/lenya/cms/site/usecases: ChangeLabel.java ChangeVisibility.java

Author: rudolf
Date: Tue Nov 24 13:38:12 2009
New Revision: 883690

URL: http://svn.apache.org/viewvc?rev=883690&view=rev
Log:
Fix Bug 47677 [Latest revision loaded] is not true

Modified:
    lenya/branches/BRANCH_2_0_X/src/modules-core/sitemanagement/java/src/org/apache/lenya/cms/site/usecases/ChangeLabel.java
    lenya/branches/BRANCH_2_0_X/src/modules-core/sitemanagement/java/src/org/apache/lenya/cms/site/usecases/ChangeVisibility.java

Modified: lenya/branches/BRANCH_2_0_X/src/modules-core/sitemanagement/java/src/org/apache/lenya/cms/site/usecases/ChangeLabel.java
URL: http://svn.apache.org/viewvc/lenya/branches/BRANCH_2_0_X/src/modules-core/sitemanagement/java/src/org/apache/lenya/cms/site/usecases/ChangeLabel.java?rev=883690&r1=883689&r2=883690&view=diff
==============================================================================
--- lenya/branches/BRANCH_2_0_X/src/modules-core/sitemanagement/java/src/org/apache/lenya/cms/site/usecases/ChangeLabel.java (original)
+++ lenya/branches/BRANCH_2_0_X/src/modules-core/sitemanagement/java/src/org/apache/lenya/cms/site/usecases/ChangeLabel.java Tue Nov 24 13:38:12 2009
@@ -67,11 +67,7 @@
      */
     protected Node[] getNodesToLock() throws UsecaseException {
         List nodes = new ArrayList();
-        if(getSourceDocument() != null) {
-            SiteStructure structure = getSourceDocument().area().getSite();
-            nodes.add(structure.getRepositoryNode());
-        }    
-
+        nodes.add(getSourceDocument().getRepositoryNode());
         return (Node[]) nodes.toArray(new Node[nodes.size()]);
     }
 

Modified: lenya/branches/BRANCH_2_0_X/src/modules-core/sitemanagement/java/src/org/apache/lenya/cms/site/usecases/ChangeVisibility.java
URL: http://svn.apache.org/viewvc/lenya/branches/BRANCH_2_0_X/src/modules-core/sitemanagement/java/src/org/apache/lenya/cms/site/usecases/ChangeVisibility.java?rev=883690&r1=883689&r2=883690&view=diff
==============================================================================
--- lenya/branches/BRANCH_2_0_X/src/modules-core/sitemanagement/java/src/org/apache/lenya/cms/site/usecases/ChangeVisibility.java (original)
+++ lenya/branches/BRANCH_2_0_X/src/modules-core/sitemanagement/java/src/org/apache/lenya/cms/site/usecases/ChangeVisibility.java Tue Nov 24 13:38:12 2009
@@ -95,11 +95,16 @@
      */
     protected Node[] getNodesToLock() throws UsecaseException {
         List nodes = new ArrayList();
-        if(getSourceDocument() != null) {
-            SiteStructure structure = getSourceDocument().area().getSite();
-            nodes.add(structure.getRepositoryNode());
+				try {				
+					  SiteNode node = getSourceDocument().getLink().getNode();
+					  String[] languages = node.getLanguages();
+					  for (int l = 0; l < languages.length; l++) {
+						    Document doc = node.getLink(languages[l]).getDocument();
+                nodes.add(doc.getRepositoryNode());
+					  }
+				} catch (Exception e) {
+            throw new UsecaseException(e);
         }
-
         return (Node[]) nodes.toArray(new Node[nodes.size()]);
     }