X-Git-Url: http://www2.svjatoslav.eu/gitweb/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Feu%2Fsvjatoslav%2Fcommons%2Fnetwork%2Fnavigation%2FNavigation.java;h=eca13a647de3da7a7b490bd3e68429009b3a7f82;hb=b91077678c2a0af17a2f852c0b3901813837117a;hp=339db68ab5f782102ee92c2abd0e009fcd42a510;hpb=95c4e19df098e06c73cd63b03ce40e05a6b475a7;p=svjatoslav_commons.git

diff --git a/src/main/java/eu/svjatoslav/commons/network/navigation/Navigation.java b/src/main/java/eu/svjatoslav/commons/network/navigation/Navigation.java
index 339db68..eca13a6 100755
--- a/src/main/java/eu/svjatoslav/commons/network/navigation/Navigation.java
+++ b/src/main/java/eu/svjatoslav/commons/network/navigation/Navigation.java
@@ -1,88 +1,63 @@
 /*
- * Svjatoslav Commons - shared library of common functionality.
- * Copyright ©2012-2014, Svjatoslav Agejenko, svjatoslav@svjatoslav.eu
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 3 of the GNU Lesser General Public License
- * or later as published by the Free Software Foundation.
+ * Svjatoslav Commons - shared library of common functionality. Author: Svjatoslav Agejenko.
+ * This project is released under Creative Commons Zero (CC0) license.
  */
-
 package eu.svjatoslav.commons.network.navigation;
 
+import javax.servlet.http.HttpServletRequest;
 import java.net.MalformedURLException;
 import java.net.URL;
 
-import javax.servlet.http.HttpServletRequest;
-
 public class Navigation {
 
-	private NavigationItem rootNavigationItem;
-
-	private NavigationItem defaultNavigationItem;
-
-	public NavigationItem getDefaultNavigationItem() {
-		return defaultNavigationItem;
-	}
-
-	public NavigationItem getRootNavigationItem() {
-		return rootNavigationItem;
-	}
-
-	public NavigationItem getSelectedItem(final HttpServletRequest request) {
-		final String requestUrl = request.getRequestURL().toString();
+    private NavigationItem root = new NavigationItem(null, null, null);
 
-		try {
-			final String requestPath = new URL(requestUrl).getPath();
+    public NavigationItem getRoot(){
+        return root;
+    }
 
-			final NavigationItem match = rootNavigationItem
-					.getMatchingNavigationItem(requestPath);
+    public NavigationItem getSelectedItem(final HttpServletRequest request) {
+        final String requestUrl = request.getRequestURL().toString();
 
-			if (match != null)
-				return match;
-		} catch (final MalformedURLException e) {
-			System.out.println("Cannot handle URL: " + requestUrl);
-			e.printStackTrace();
-		}
+        final String requestPath;
+        try {
+            requestPath = new URL(requestUrl).getPath();
+        } catch (MalformedURLException e) {
+            throw new IllegalArgumentException("Illegal request URL provided." , e);
+        }
 
-		return getDefaultNavigationItem();
-	}
+        @SuppressWarnings("unchecked") final NavigationItem match = root.getMatch(requestPath);
 
-	public String getTopMenu(final HttpServletRequest request) {
+        if (match != null)
+            return match;
 
-		final NavigationItem selectedItem = getSelectedItem(request);
-		final StringBuffer result = new StringBuffer();
+        return root.getDefaultNavigationItem();
+    }
 
-		result.append("<div class=\"navigationMenu\">");
+    @SuppressWarnings("unchecked")
+    public String getTopMenu(final HttpServletRequest request) {
 
-		for (final NavigationItem item : getRootNavigationItem()
-				.getSubElements()) {
+        final NavigationItem selectedItem = getSelectedItem(request);
+        final StringBuilder result = new StringBuilder();
 
-			if (item == selectedItem)
-				result.append("<a class=\"menuItemSelected\" href=\""
-						+ item.getLinkUrl() + "\">");
-			else
-				result.append("<a class=\"menuItem\" href=\""
-						+ item.getLinkUrl() + "\">");
+        result.append("<div class=\"navigationMenu\">");
 
-			result.append("<div>" + item.getTitle() + "</div>");
-			result.append("</a>");
-		}
+        for (final NavigationItem item : root.getChildren()) {
 
-		result.append("</div>");
+            if (item == selectedItem)
+                result.append("<a class=\"menuItemSelected\" href=\""
+                        + item.getUrl() + "\">");
+            else
+                result.append("<a class=\"menuItem\" href=\""
+                        + item.getUrl() + "\">");
 
-		return result.toString();
-	}
+            result.append("<div>" + item.getTitle() + "</div>");
+            result.append("</a>");
+        }
 
-	public NavigationItem setDefaultNavigationItem(
-			final NavigationItem defaultNavigationItem) {
-		this.defaultNavigationItem = defaultNavigationItem;
-		return defaultNavigationItem;
-	}
+        result.append("</div>");
 
-	public NavigationItem setRootNavigationItem(
-			final NavigationItem rootNavigationItem) {
-		this.rootNavigationItem = rootNavigationItem;
-		return rootNavigationItem;
-	}
+        return result.toString();
+    }
 
 }