### Eclipse Workspace Patch 1.0
#P pencmsSprint
Index: src/org/opencms/jsp/CmsJspNavBuilder.java
===================================================================
RCS file: /usr/local/cvs/opencms/src/org/opencms/jsp/CmsJspNavBuilder.java,v
retrieving revision 1.26
diff -u -r1.26 CmsJspNavBuilder.java
--- src/org/opencms/jsp/CmsJspNavBuilder.java	27 Feb 2008 12:05:34 -0000	1.26
+++ src/org/opencms/jsp/CmsJspNavBuilder.java	10 Sep 2008 13:31:31 -0000
@@ -31,6 +31,15 @@
 
 package org.opencms.jsp;
 
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Locale;
+import java.util.Map;
+
+import org.opencms.file.CmsFile;
 import org.opencms.file.CmsObject;
 import org.opencms.file.CmsProperty;
 import org.opencms.file.CmsPropertyDefinition;
@@ -38,11 +47,10 @@
 import org.opencms.file.CmsResourceFilter;
 import org.opencms.main.CmsException;
 import org.opencms.main.OpenCms;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Iterator;
-import java.util.List;
+import org.opencms.util.CmsStringUtil;
+import org.opencms.xml.content.CmsXmlContent;
+import org.opencms.xml.content.CmsXmlContentFactory;
+import org.opencms.xml.types.I_CmsXmlContentValue;
 
 /**
  * Bean to provide a convenient way to build navigation structures based on the
@@ -140,25 +148,28 @@
      * @return a sorted (ascending to nav position) ArrayList of navigation elements
      */
     public static List getNavigationForFolder(CmsObject cms, String folder) {
-
+    	
         folder = CmsResource.getFolderPath(folder);
-        List result = new ArrayList();
-
-        List resources;
-        try {
-            resources = cms.getResourcesInFolder(folder, CmsResourceFilter.DEFAULT);
-        } catch (Exception e) {
-            return Collections.EMPTY_LIST;
-        }
+        List result = getNavConfigFromXml(cms, folder);
+        if (result == null){
+            result = new ArrayList();
+        	List resources;
+            try {
+                resources = cms.getResourcesInFolder(folder, CmsResourceFilter.DEFAULT);
+            } catch (Exception e) {
+                return Collections.EMPTY_LIST;
+            }
 
-        for (int i = 0; i < resources.size(); i++) {
-            CmsResource r = (CmsResource)resources.get(i);
-            CmsJspNavElement element = getNavigationForResource(cms, cms.getSitePath(r));
-            if ((element != null) && element.isInNavigation()) {
-                result.add(element);
+            for (int i = 0; i < resources.size(); i++) {
+                CmsResource r = (CmsResource)resources.get(i);
+                CmsJspNavElement element = getNavigationForResource(cms, cms.getSitePath(r), null);
+                if ((element != null) && element.isInNavigation()) {
+                    result.add(element);
+                }
             }
+            Collections.sort(result);
+            
         }
-        Collections.sort(result);
         return result;
     }
 
@@ -199,19 +210,99 @@
      * must be a full path name, e.g. "/docs/index.html".
      * @return a CmsJspNavElement for the given resource
      */
-    public static CmsJspNavElement getNavigationForResource(CmsObject cms, String resource) {
+    public static CmsJspNavElement getNavigationForResource(CmsObject cms, String resource, CmsJspNavXmlConfigElement config) {
 
-        List properties;
-        try {
-            properties = cms.readPropertyObjects(resource, false);
-        } catch (Exception e) {
-            return null;
+        List properties = new ArrayList();
+        Map propertyMap = new HashMap();
+        if (cms.existsResource(resource)) {
+	        try {
+	            properties = cms.readPropertyObjects(resource, false);
+	            propertyMap = CmsProperty.toMap(properties);
+	        } catch (Exception e) {
+	            // not able to read properties,may be an external link in XML content
+	        }
+        }
+        if(config == null){
+        	List navElements = getNavConfigFromXml(cms, CmsResource.getFolderPath(resource));
+        	if(navElements != null){
+        		for(int i=0; i<navElements.size(); i++){
+        			CmsJspNavElement current = (CmsJspNavElement) navElements.get(i);
+        			if(current.getResourceName().equals(resource))
+        				return current;
+        		}
+        	}
         }
         int level = CmsResource.getPathLevel(resource);
         if (resource.endsWith("/")) {
             level--;
         }
-        return new CmsJspNavElement(resource, CmsProperty.toMap(properties), level);
+        if(config != null){
+        	
+        	resource = config.getPath();
+        	// TODO: navtreelevel
+        	level = CmsResource.getPathLevel(config.getConfigPath());
+        	propertyMap.put(CmsPropertyDefinition.PROPERTY_NAVTEXT,config.getNavText());
+        	propertyMap.put(CmsPropertyDefinition.PROPERTY_NAVPOS ,String.valueOf(config.getNavPosition()));
+        	propertyMap.put(CmsPropertyDefinition.PROPERTY_NAVIMAGE,config.getNavImage());
+        	propertyMap.put(CmsPropertyDefinition.PROPERTY_NAVINFO ,config.getNavInfo());
+        	propertyMap.put("IsDefault",config.isDefault());
+        }
+        
+        return new CmsJspNavElement(resource, propertyMap, level);
+    }
+    
+    /**
+     * Checks for NavigationXmlContent in a given Folder
+     * If present, creates the a List of CmsJspNavElements
+     * If no NavigationXmlContent is found, null is returned
+     * 
+     * @param cms
+     * @param folderPath
+     * @return
+     */
+    
+    public static List getNavConfigFromXml(CmsObject cms, String folderPath){
+    	
+    	String navFile = folderPath + "_navigation.xml";
+        List result = null;
+        if (cms.existsResource(navFile)){
+        	Locale locale = cms.getRequestContext().getLocale();
+        	try {
+	        	CmsFile file = cms.readFile(navFile);
+	            CmsXmlContent content = CmsXmlContentFactory.unmarshal(cms, file);
+	            List navElements = content.getValues("NavigationElement", locale);
+	            result = new ArrayList(navElements.size());
+	            for (int i = 0; i < navElements.size(); i++) {
+	                I_CmsXmlContentValue element = (I_CmsXmlContentValue)navElements.get(i);
+	                String elementPath = element.getPath() + "/";
+	
+	                // get the field from the factory for the specified type
+	                String pathValue = content.getStringValue(cms, elementPath + "Path", locale);
+	                String navTextValue = content.getStringValue(cms, elementPath + "NavText", locale);
+	                // only valid Entries with at least navText and navPath should be added
+	                if(CmsStringUtil.isEmptyOrWhitespaceOnly(pathValue) || CmsStringUtil.isEmptyOrWhitespaceOnly(navTextValue))
+	                	continue;
+	                
+	                elementPath += "Config/";
+	                
+	                String navImageValue = content.getStringValue(cms, elementPath + "NavImage", locale);
+	                String navInfoValue = content.getStringValue(cms, elementPath + "NavInfo", locale);
+	                String navDefaultValue = content.getStringValue(cms, elementPath + "Default", locale);
+	                CmsJspNavXmlConfigElement navConfig = new CmsJspNavXmlConfigElement(pathValue, navTextValue, (i+1), navImageValue, navInfoValue, navDefaultValue, navFile);
+	                CmsJspNavElement navElement = getNavigationForResource(cms, pathValue, navConfig);
+	                if ((navElement != null) && navElement.isInNavigation())
+	                    result.add(navElement);
+	            }
+           	} catch(CmsException e){
+        	
+        	}
+        	return result;
+        }
+    	return result;
+    }
+    
+    public static CmsJspNavElement getNavigationForResource(CmsObject cms, String resource) {
+    	return getNavigationForResource(cms, resource, null);
     }
 
     /**
Index: src/org/opencms/jsp/CmsJspNavXmlConfigElement.java
===================================================================
RCS file: src/org/opencms/jsp/CmsJspNavXmlConfigElement.java
diff -N src/org/opencms/jsp/CmsJspNavXmlConfigElement.java
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ src/org/opencms/jsp/CmsJspNavXmlConfigElement.java	1 Jan 1970 00:00:00 -0000
@@ -0,0 +1,84 @@
+package org.opencms.jsp;
+
+public class CmsJspNavXmlConfigElement {
+	
+	/**
+	 * @param pathValue
+	 * @param navTextValue
+	 * @param navImageValue
+	 * @param navInfoValue
+	 * @param navDefaultValue
+	 */
+	
+	private String m_path;
+	private String m_configPath;
+	private String m_navText;
+	private String m_navImage;
+	private String m_navInfo;
+	private boolean m_default;
+	private float m_navPosition;
+	
+	/**
+	 * 
+	 */
+	
+	public CmsJspNavXmlConfigElement(String pathValue, String navTextValue, float navPosition, String navImageValue, String navInfoValue, String navDefaultValue, String configPath){
+		m_path = pathValue;
+		m_navText = navTextValue;
+		m_navImage = navImageValue;
+		m_navInfo = navInfoValue;
+		m_default = Boolean.valueOf(navDefaultValue).booleanValue();
+		m_navPosition = navPosition;
+		m_configPath = configPath;
+	}
+	
+	/**
+	 * @return the m_path
+	 */
+	public String getPath() {
+		return m_path;
+	}
+
+	/**
+	 * @return the m_navText
+	 */
+	public String getNavText() {
+		return m_navText;
+	}
+
+	/**
+	 * @return the m_navImage
+	 */
+	public String getNavImage() {
+		return m_navImage;
+	}
+
+	/**
+	 * @return the m_navInfo
+	 */
+	public String getNavInfo() {
+		return m_navInfo;
+	}
+
+	/**
+	 * @return the m_default
+	 */
+	public boolean isDefault() {
+		return m_default;
+	}
+
+	/**
+	 * @return the m_navPosition
+	 */
+	public float getNavPosition() {
+		return m_navPosition;
+	}
+
+	/**
+	 * @return the m_configPath
+	 */
+	public String getConfigPath() {
+		return m_configPath;
+	}
+	
+}