svn commit: r559063 - in /lenya/trunk/src: modules-core/sitemanagement/java/src/org/apache/lenya/cms/metadata/usecases/ modules-core/sitemanagement/java/src/org/apache/lenya/cms/site/usecases/ modules-core/workflow/java/src/org/apache/lenya/cms/workflo...

Author: rfrovarp
Date: Tue Jul 24 07:38:01 2007
New Revision: 559063

URL: http://svn.apache.org/viewvc?view=rev&rev=559063
Log:
Last changes to prevent NPEs when selecting authoring node under site tab.

Modified:
    lenya/trunk/src/modules-core/sitemanagement/java/src/org/apache/lenya/cms/metadata/usecases/Metadata.java
    lenya/trunk/src/modules-core/sitemanagement/java/src/org/apache/lenya/cms/site/usecases/MoveSubsite.java
    lenya/trunk/src/modules-core/workflow/java/src/org/apache/lenya/cms/workflow/usecases/Deactivate.java
    lenya/trunk/src/modules-core/workflow/java/src/org/apache/lenya/cms/workflow/usecases/InvokeWorkflow.java
    lenya/trunk/src/modules-core/workflow/java/src/org/apache/lenya/cms/workflow/usecases/Publish.java
    lenya/trunk/src/modules/sitetree/java/src/org/apache/lenya/cms/site/usecases/Nudge.java

Modified: lenya/trunk/src/modules-core/sitemanagement/java/src/org/apache/lenya/cms/metadata/usecases/Metadata.java
URL: http://svn.apache.org/viewvc/lenya/trunk/src/modules-core/sitemanagement/java/src/org/apache/lenya/cms/metadata/usecases/Metadata.java?view=diff&rev=559063&r1=559062&r2=559063
==============================================================================
--- lenya/trunk/src/modules-core/sitemanagement/java/src/org/apache/lenya/cms/metadata/usecases/Metadata.java (original)
+++ lenya/trunk/src/modules-core/sitemanagement/java/src/org/apache/lenya/cms/metadata/usecases/Metadata.java Tue Jul 24 07:38:01 2007
@@ -45,7 +45,10 @@
      * @see org.apache.lenya.cms.usecase.AbstractUsecase#getNodesToLock()
      */
     protected Node[] getNodesToLock() throws UsecaseException {
-        Node[] objects = { getSourceDocument().getRepositoryNode() };
+        Node[] objects = new Node[0];
+        if(getSourceDocument() != null) {
+            objects = new Node[] { getSourceDocument().getRepositoryNode() };
+        }
         return objects;
     }
 

Modified: lenya/trunk/src/modules-core/sitemanagement/java/src/org/apache/lenya/cms/site/usecases/MoveSubsite.java
URL: http://svn.apache.org/viewvc/lenya/trunk/src/modules-core/sitemanagement/java/src/org/apache/lenya/cms/site/usecases/MoveSubsite.java?view=diff&rev=559063&r1=559062&r2=559063
==============================================================================
--- lenya/trunk/src/modules-core/sitemanagement/java/src/org/apache/lenya/cms/site/usecases/MoveSubsite.java (original)
+++ lenya/trunk/src/modules-core/sitemanagement/java/src/org/apache/lenya/cms/site/usecases/MoveSubsite.java Tue Jul 24 07:38:01 2007
@@ -98,27 +98,30 @@
      * changes to the site structure would compromise the operation.
      */
     protected Node[] getNodesToLock() throws UsecaseException {
-        try {
-
-            Set nodes = new HashSet();
-
-            SiteStructure sourceSite = getSourceDocument().area().getSite();
-            SiteStructure targetSite = getSourceDocument().getPublication()
-                    .getArea(getTargetArea()).getSite();
+        Set nodes = new HashSet();
+  
+        if(getSourceDocument() != null) {
+            try {
 
-            nodes.add(sourceSite.getRepositoryNode());
-            nodes.add(targetSite.getRepositoryNode());
+                SiteStructure sourceSite = getSourceDocument().area().getSite();
+                SiteStructure targetSite = getSourceDocument().getPublication()
+                        .getArea(getTargetArea()).getSite();
+
+                nodes.add(sourceSite.getRepositoryNode());
+                nodes.add(targetSite.getRepositoryNode());
+
+                Document[] docs = SiteUtil.getSubSite(this.manager,
+                        getSourceDocument().getLink().getNode()).getDocuments();
+                for (int i = 0; i < docs.length; i++) {
+                    nodes.add(docs[i].getRepositoryNode());
+                }
 
-            Document[] docs = SiteUtil.getSubSite(this.manager,
-                    getSourceDocument().getLink().getNode()).getDocuments();
-            for (int i = 0; i < docs.length; i++) {
-                nodes.add(docs[i].getRepositoryNode());
+            } catch (PublicationException e) {
+                throw new UsecaseException(e);
             }
-
-            return (Node[]) nodes.toArray(new Node[nodes.size()]);
-        } catch (PublicationException e) {
-            throw new UsecaseException(e);
         }
+ 
+        return (Node[]) nodes.toArray(new Node[nodes.size()]);
     }
 
     /**
@@ -215,4 +218,4 @@
         return path.substring(0, path.lastIndexOf("/"));
     }
 
-}
\ No newline at end of file
+}

Modified: lenya/trunk/src/modules-core/workflow/java/src/org/apache/lenya/cms/workflow/usecases/Deactivate.java
URL: http://svn.apache.org/viewvc/lenya/trunk/src/modules-core/workflow/java/src/org/apache/lenya/cms/workflow/usecases/Deactivate.java?view=diff&rev=559063&r1=559062&r2=559063
==============================================================================
--- lenya/trunk/src/modules-core/workflow/java/src/org/apache/lenya/cms/workflow/usecases/Deactivate.java (original)
+++ lenya/trunk/src/modules-core/workflow/java/src/org/apache/lenya/cms/workflow/usecases/Deactivate.java Tue Jul 24 07:38:01 2007
@@ -86,9 +86,11 @@
             List nodes = new ArrayList();
 
             Document doc = getSourceDocument();
-            Document liveDoc = doc.getAreaVersion(Publication.LIVE_AREA);
-            nodes.add(liveDoc.getRepositoryNode());
-            nodes.add(liveDoc.area().getSite().getRepositoryNode());
+            if(doc != null) {
+                Document liveDoc = doc.getAreaVersion(Publication.LIVE_AREA);
+                nodes.add(liveDoc.getRepositoryNode());
+                nodes.add(liveDoc.area().getSite().getRepositoryNode());
+            }
             return (org.apache.lenya.cms.repository.Node[]) nodes.toArray(new org.apache.lenya.cms.repository.Node[nodes.size()]);
 
         } catch (Exception e) {
@@ -201,4 +203,4 @@
 
     }
 
-}
\ No newline at end of file
+}

Modified: lenya/trunk/src/modules-core/workflow/java/src/org/apache/lenya/cms/workflow/usecases/InvokeWorkflow.java
URL: http://svn.apache.org/viewvc/lenya/trunk/src/modules-core/workflow/java/src/org/apache/lenya/cms/workflow/usecases/InvokeWorkflow.java?view=diff&rev=559063&r1=559062&r2=559063
==============================================================================
--- lenya/trunk/src/modules-core/workflow/java/src/org/apache/lenya/cms/workflow/usecases/InvokeWorkflow.java (original)
+++ lenya/trunk/src/modules-core/workflow/java/src/org/apache/lenya/cms/workflow/usecases/InvokeWorkflow.java Tue Jul 24 07:38:01 2007
@@ -41,7 +41,10 @@
      * @see org.apache.lenya.cms.usecase.AbstractUsecase#getNodesToLock()
      */
     protected Node[] getNodesToLock() throws UsecaseException {
-        Node[] objects = { getSourceDocument().getRepositoryNode() };
+        Node[] objects = new Node[0];
+        if(getSourceDocument() != null) {
+            objects = new Node[] { getSourceDocument().getRepositoryNode() };
+        }
         return objects;
     }
 
@@ -54,4 +57,4 @@
                 getEvent());
     }
 
-}
\ No newline at end of file
+}

Modified: lenya/trunk/src/modules-core/workflow/java/src/org/apache/lenya/cms/workflow/usecases/Publish.java
URL: http://svn.apache.org/viewvc/lenya/trunk/src/modules-core/workflow/java/src/org/apache/lenya/cms/workflow/usecases/Publish.java?view=diff&rev=559063&r1=559062&r2=559063
==============================================================================
--- lenya/trunk/src/modules-core/workflow/java/src/org/apache/lenya/cms/workflow/usecases/Publish.java (original)
+++ lenya/trunk/src/modules-core/workflow/java/src/org/apache/lenya/cms/workflow/usecases/Publish.java Tue Jul 24 07:38:01 2007
@@ -133,8 +133,10 @@
             List nodes = new ArrayList();
 
             Document doc = getSourceDocument();
-            nodes.add(doc.getRepositoryNode());
-            nodes.add(doc.area().getSite().getRepositoryNode());
+            if(doc != null) {
+                nodes.add(doc.getRepositoryNode());
+                nodes.add(doc.area().getSite().getRepositoryNode());
+            }
 
             return (org.apache.lenya.cms.repository.Node[]) nodes
                     .toArray(new org.apache.lenya.cms.repository.Node[nodes.size()]);

Modified: lenya/trunk/src/modules/sitetree/java/src/org/apache/lenya/cms/site/usecases/Nudge.java
URL: http://svn.apache.org/viewvc/lenya/trunk/src/modules/sitetree/java/src/org/apache/lenya/cms/site/usecases/Nudge.java?view=diff&rev=559063&r1=559062&r2=559063
==============================================================================
--- lenya/trunk/src/modules/sitetree/java/src/org/apache/lenya/cms/site/usecases/Nudge.java (original)
+++ lenya/trunk/src/modules/sitetree/java/src/org/apache/lenya/cms/site/usecases/Nudge.java Tue Jul 24 07:38:01 2007
@@ -104,8 +104,11 @@
      * @see org.apache.lenya.cms.usecase.AbstractUsecase#getNodesToLock()
      */
     protected Node[] getNodesToLock() throws UsecaseException {
-        Node node = getSourceDocument().area().getSite().getRepositoryNode();
-        Node[] nodes = { node };
+        Node[] nodes = new Node[0];
+        if(getSourceDocument() != null) {
+            Node node = getSourceDocument().area().getSite().getRepositoryNode();
+            nodes = new Node[] { node };
+        }
         return nodes;
     }
 
@@ -150,4 +153,4 @@
         }
 
     }
-}
\ No newline at end of file
+}