ziver/hal
1
1
Fork 0
Code Pull requests Releases Activity

Added redirection page and fixed Navigation class

Browse source
This commit is contained in:
Ziver Koc 2016-06-19 17:12:43 +02:00
parent 2c46c7ecf3
commit 095109eb41
4 changed files with 133 additions and 46 deletions
Download patch file Download diff file Expand all files Collapse all files

17
src/zutil/net/http/HttpHeader.java
View file

@ -86,6 +86,22 @@ public class HttpHeader {
public String getRequestURL(){ public String getRequestURL(){
return url; return url;
} }
/**
* @return parses out the page name from the request url and returns it.
*/
public String getRequestPage() {
if (url != null){
int start = 0;
if (url.charAt(0) == '/')
start = 1;
int end = url.indexOf('?');
if (end < 0)
end = url.length();
return url.substring(start, end);
}
return null;
}
/** /**
* @return a Iterator with all defined url keys * @return a Iterator with all defined url keys
*/ */
@ -187,4 +203,5 @@ public class HttpHeader {
public String toStringAttributes(){ public String toStringAttributes(){
return Converter.toString(urlAttributes); return Converter.toString(urlAttributes);
} }
} }

2
src/zutil/net/http/page/HttpFilePage.java
View file

@ -142,7 +142,7 @@ public class HttpFilePage implements HttpPage{
out.setHeader("Cache-Control", "max-age=" + MAX_CACHE_AGE_SECONDS); out.setHeader("Cache-Control", "max-age=" + MAX_CACHE_AGE_SECONDS);
out.setHeader("ETag", "\"" + eTag + "\""); out.setHeader("ETag", "\"" + eTag + "\"");
if (headers.getHeader("If-None-Match") != null && if (eTag != null && headers.getHeader("If-None-Match") != null &&
eTag.equals(StringUtil.trimQuotes(headers.getHeader("If-None-Match")))){ // File has not changed eTag.equals(StringUtil.trimQuotes(headers.getHeader("If-None-Match")))){ // File has not changed
out.setStatusCode(304); out.setStatusCode(304);
} else { } else {

48
src/zutil/net/http/page/HttpRedirectPage.java Executable file
View file

@ -0,0 +1,48 @@
package zutil.net.http.page;
import zutil.net.http.HttpHeader;
import zutil.net.http.HttpPage;
import zutil.net.http.HttpPrintStream;
import java.io.IOException;
import java.util.Map;
/**
* Created by Ziver on 2016-06-19.
*/
public class HttpRedirectPage implements HttpPage{
private String redirectUrl;
public HttpRedirectPage(String redirectUrl){
this.redirectUrl = redirectUrl;
}
@Override
public void respond(HttpPrintStream out,
HttpHeader headers,
Map<String, Object> session,
Map<String, String> cookie,
Map<String, String> request) throws IOException {
out.setStatusCode(301);
out.setHeader("Location", redirectUrl);
out.print(
"<!DOCTYPE HTML>\n" +
"<html lang='en-US'>\n" +
" <head>\n" +
" <meta charset='UTF-8'>\n" +
" <meta http-equiv='refresh' content='0;url="+ redirectUrl +"'>\n" +
" <script type='text/javascript'>\n" +
" window.location.href = '"+ redirectUrl +"'\n" +
" </script>\n" +
" <title>Page Redirection</title>\n" +
" </head>\n" +
" <body>\n" +
" If you are not redirected automatically, follow the <a href='"+ redirectUrl +"'>link to "+ redirectUrl +"</a>\n" +
" </body>\n" +
"</html>"
);
}
}

112
src/zutil/ui/Navigation.java
View file

@ -22,6 +22,8 @@
package zutil.ui; package zutil.ui;
import zutil.net.http.HttpHeader;
import java.util.*; import java.util.*;
/** /**
@ -45,21 +47,32 @@ public class Navigation implements Iterable{
private Navigation(String id, String name) { private Navigation(String id, String name) {
this.id = id; if (id == null) this.id = ""+navMap.size();
this.navMap.put(this.id, this); else this.id = id;
this.name = name; this.name = name;
this.subNav = new ArrayList<>(); this.subNav = new ArrayList<>();
this.navMap.put(this.id, this);
} }
public List<Navigation> getSubNavs() { /**
return subNav; * Will return a existing Navigation or create a new one.
*
* @param name the nice String name of the destination
*/
public Navigation createSubNav(String name) {
return createSubNav(null, name);
} }
/** /**
* Will create a new sub-nav if it does not already exist or return a existing one. * Will return a existing Navigation or create a new one.
*
* @param id the unique id or page name
* @param name the nice String name of the destination
*/ */
public Navigation createSubNav(String id, String name) { public Navigation createSubNav(String id, String name) {
Navigation nav = getSubNav(name); Navigation nav = getSubNav(id, name);
if(nav != null) if(nav != null)
return nav; return nav;
@ -69,16 +82,6 @@ public class Navigation implements Iterable{
sortSubNavs(); sortSubNavs();
return nav; return nav;
} }
/**
* Searches for and returns the specified sub-nav or returns null if it was not found.
*/
private Navigation getSubNav(String name) {
for(Navigation nav : subNav) {
if(nav.equals(name))
return nav;
}
return null;
}
private void sortSubNavs(){ private void sortSubNavs(){
Collections.sort(subNav, new Comparator<Navigation>() { Collections.sort(subNav, new Comparator<Navigation>() {
@Override @Override
@ -89,15 +92,23 @@ public class Navigation implements Iterable{
} }
}); });
} }
/**
* Searches for and returns the specified sub-nav with the id or name.
* Returns null if no navigation object found.
*/
private Navigation getSubNav(String id, String name) {
for(Navigation nav : subNav) {
if(nav.equals(id) || nav.equals(name))
return nav;
}
return null;
}
@Override @Override
public Iterator iterator() { public Iterator iterator() {
return subNav.iterator(); return subNav.iterator();
} }
private void setParentNav(Navigation nav){
this.parentNav = nav;
}
public String getName(){ public String getName(){
@ -108,6 +119,10 @@ public class Navigation implements Iterable{
} }
private void setParentNav(Navigation nav){
this.parentNav = nav;
}
/** /**
* Assign a resource object specific to this navigation object. * Assign a resource object specific to this navigation object.
* This can be used if target page needs some additional information. * This can be used if target page needs some additional information.
@ -142,7 +157,7 @@ public class Navigation implements Iterable{
* Will create a clone of the navigation tree with some request instance specific information * Will create a clone of the navigation tree with some request instance specific information
*/ */
public NavInstance createParameterizedNavInstance(Map<String, String> request){ public NavInstance createParameterizedNavInstance(Map<String, String> request){
return createParameterizedNavInstance(getBreadcrumb(getNavigation(request))); return createParameterizedNavInstance(getBreadcrumb(getParameterizedNavigation(request)));
} }
private NavInstance createParameterizedNavInstance(List<Navigation> activeList){ private NavInstance createParameterizedNavInstance(List<Navigation> activeList){
NavInstance instance = new ParameterizedNavInstance(this); NavInstance instance = new ParameterizedNavInstance(this);
@ -151,9 +166,21 @@ public class Navigation implements Iterable{
instance.addSubNav(nav.createParameterizedNavInstance(activeList)); instance.addSubNav(nav.createParameterizedNavInstance(activeList));
return instance; return instance;
} }
/**
* @return the specific Navigation object requested by client
*/
public static Navigation getParameterizedNavigation(Map<String, String> request) {
if(request.containsKey(NAVIGATION_URL_KEY))
return navMap.get(request.get(NAVIGATION_URL_KEY));
return null;
}
public NavInstance createPagedNavInstance(Map<String, String> request){ public NavInstance createPagedNavInstance(HttpHeader header){
return createPagedNavInstance(getBreadcrumb(getNavigation(request))); Navigation nav = getPagedNavigation(header);
if (nav != null)
return createPagedNavInstance(getBreadcrumb(nav));
return null;
} }
private NavInstance createPagedNavInstance(List<Navigation> activeList){ private NavInstance createPagedNavInstance(List<Navigation> activeList){
NavInstance instance = new PagedNavInstance(this); NavInstance instance = new PagedNavInstance(this);
@ -162,6 +189,12 @@ public class Navigation implements Iterable{
instance.addSubNav(nav.createPagedNavInstance(activeList)); instance.addSubNav(nav.createPagedNavInstance(activeList));
return instance; return instance;
} }
/**
* @return the specific Navigation object requested by client
*/
public static Navigation getPagedNavigation(HttpHeader header) {
return navMap.get(header.getRequestPage());
}
@ -169,30 +202,19 @@ public class Navigation implements Iterable{
return new Navigation(null, null); return new Navigation(null, null);
} }
public static Navigation getRootNav(Map<String, String> request) { public static Navigation getRootNav(Map<String, String> request) {
List<Navigation> breadcrumb = getBreadcrumb(getNavigation(request)); List<Navigation> breadcrumb = getBreadcrumb(getParameterizedNavigation(request));
if (!breadcrumb.isEmpty()) if (!breadcrumb.isEmpty())
return breadcrumb.get(0); return breadcrumb.get(0);
return null; return null;
} }
/** /**
* @return the specific Navigation object requested by client * @param nav the
*/
public static Navigation getNavigation(Map<String, String> request) {
if(request.containsKey(NAVIGATION_URL_KEY))
return navMap.get(Integer.parseInt(request.get(NAVIGATION_URL_KEY)));
return null;
}
/**
* @param pageId the ID of the requested page
* @return a List of Navigation objects depicting the navigation hierarchy for the * @return a List of Navigation objects depicting the navigation hierarchy for the
* requested page from the client. First entry will be the root navigation object. * requested page from the client. First entry will be the root navigation object.
*/ */
public static List<Navigation> getBreadcrumb(String pageId) { public static List<Navigation> getBreadcrumb(Navigation nav) {
return getBreadcrumb(navMap.get(pageId));
}
private static List<Navigation> getBreadcrumb(Navigation nav) {
LinkedList list = new LinkedList(); LinkedList list = new LinkedList();
if (nav != null){ if (nav != null){
while(nav != null){ while(nav != null){
@ -209,30 +231,30 @@ public class Navigation implements Iterable{
public abstract static class NavInstance{ public abstract static class NavInstance{
protected Navigation nav; protected Navigation nav;
protected boolean active; protected boolean active;
protected ArrayList<NavInstance> subNavs; protected ArrayList<NavInstance> subNavInstance;
protected NavInstance(Navigation nav){ protected NavInstance(Navigation nav){
this.nav = nav; this.nav = nav;
this.subNavs = new ArrayList<>(); this.subNavInstance = new ArrayList<>();
} }
protected void setActive(boolean active){ protected void setActive(boolean active){
this.active = active; this.active = active;
} }
protected void addSubNav(NavInstance subNav){ protected void addSubNav(NavInstance subNav){
subNavs.add(subNav); subNavInstance.add(subNav);
} }
public boolean isActive(){ public boolean isActive(){
return active; return active;
} }
public List<NavInstance> getSubNavs() { return subNavs; } public List<NavInstance> getSubNavs() { return subNavInstance; }
// Mirror getters from Navigation // Mirror getters from Navigation
public String getName(){ return nav.getName(); } public String getName(){ return nav.getName(); }
public Object getResource(){ return nav.getResource(); } public Object getResource(){ return nav.getResource(); }
public abstract String getUrl(); public abstract String getURL();
public boolean equals(Object o){ public boolean equals(Object o){
@ -247,7 +269,7 @@ public class Navigation implements Iterable{
public static class ParameterizedNavInstance extends NavInstance{ public static class ParameterizedNavInstance extends NavInstance{
protected ParameterizedNavInstance(Navigation nav) { super(nav); } protected ParameterizedNavInstance(Navigation nav) { super(nav); }
public String getUrl(){ public String getURL(){
return "?"+NAVIGATION_URL_KEY+"="+nav.id; return "?"+NAVIGATION_URL_KEY+"="+nav.id;
} }
} }
@ -255,8 +277,8 @@ public class Navigation implements Iterable{
public static class PagedNavInstance extends NavInstance{ public static class PagedNavInstance extends NavInstance{
protected PagedNavInstance(Navigation nav) { super(nav); } protected PagedNavInstance(Navigation nav) { super(nav); }
public String getUrl(){ public String getURL(){
return nav.id; return "/" + nav.id;
} }
} }
} }