From b55958b062d7960c814ffbb81db0420130274fad Mon Sep 17 00:00:00 2001
From: Britt Park <britt.park@alfresco.com>
Date: Wed, 28 Jun 2006 13:45:17 +0000
Subject: [PATCH] Made Lookup::getIndirectionPath() somewhat less ridiculous.

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/WCM-DEV2/root@3262 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
---
 .../repo/avm/LayeredDirectoryNodeImpl.java    |  1 -
 source/java/org/alfresco/repo/avm/Lookup.java | 47 +++++++++----------
 2 files changed, 21 insertions(+), 27 deletions(-)

diff --git a/source/java/org/alfresco/repo/avm/LayeredDirectoryNodeImpl.java b/source/java/org/alfresco/repo/avm/LayeredDirectoryNodeImpl.java
index 2752efc625..6364beca4a 100644
--- a/source/java/org/alfresco/repo/avm/LayeredDirectoryNodeImpl.java
+++ b/source/java/org/alfresco/repo/avm/LayeredDirectoryNodeImpl.java
@@ -238,7 +238,6 @@ class LayeredDirectoryNodeImpl extends DirectoryNodeImpl implements LayeredDirec
     {
         // Capture the repository.
         Repository repo = lPath.getRepository();
-        // Otherwise we do an actual copy.
         LayeredDirectoryNodeImpl newMe = null;
         if (!lPath.isInThisLayer())
         {
diff --git a/source/java/org/alfresco/repo/avm/Lookup.java b/source/java/org/alfresco/repo/avm/Lookup.java
index f024bcbae0..e9625abae6 100644
--- a/source/java/org/alfresco/repo/avm/Lookup.java
+++ b/source/java/org/alfresco/repo/avm/Lookup.java
@@ -22,7 +22,7 @@ import java.util.List;
 
 /**
  * This holds all the information necessary to perform operations
- * on AVMNodes, and is internall structured as a list of path components
+ * on AVMNodes, and is structured internally as a list of path components
  * from the root directory of a repository.
  * @author britt
  */
@@ -258,33 +258,28 @@ class Lookup
      */
     public String getIndirectionPath()
     {
-        // The path is the underlying path of the lowest layer that is directly contained
-        // by the top layer that is a primary indirection node.
-        for (int pos = fLowestLayerIndex; pos >= fTopLayerIndex; pos--)
+        // The path is the underlying path of the lowest layer (in the path sense) 
+        // that is directly contained by the top layer and is a primary indirection node.
+        int pos = fLowestLayerIndex;
+        AVMNode node = fComponents.get(pos).getNode();
+        LayeredDirectoryNode oNode = null;
+        while (pos >= fTopLayerIndex && node.getType() != AVMNodeType.LAYERED_DIRECTORY &&
+               ((oNode = (LayeredDirectoryNode)node).getLayerID() != fTopLayer.getLayerID() ||
+                !oNode.getPrimaryIndirection()))
         {
-            AVMNode node = fComponents.get(pos).getNode();
-            if (node.getType() != AVMNodeType.LAYERED_DIRECTORY)
-            {
-                continue;
-            }
-            LayeredDirectoryNode oNode =
-                (LayeredDirectoryNode)node;
-            if (oNode.getLayerID() == fTopLayer.getLayerID() &&
-                oNode.getPrimaryIndirection())
-            {
-                StringBuilder builder = new StringBuilder();
-                builder.append(oNode.getUnderlying());
-                for (int i = pos + 1; i <= fPosition; i++)
-                {
-                    builder.append("/");
-                    builder.append(fComponents.get(i).getName());
-                }
-                return builder.toString();
-            }
+            pos--;
+            node = fComponents.get(pos).getNode();
         }
-        // TODO This is gross.  There has to be a neater way to do this.
-        assert false : "Not reached.";
-        return "bogus";
+        oNode = (LayeredDirectoryNode)node;
+        // We've found it.
+        StringBuilder builder = new StringBuilder();
+        builder.append(oNode.getUnderlying());
+        for (int i = pos + 1; i <= fPosition; i++)
+        {
+            builder.append("/");
+            builder.append(fComponents.get(i).getName());
+        }
+        return builder.toString();
     }
     
     /**