X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=server%2Fcompbio%2Fcontrollers%2FDocumentationController.java;fp=server%2Fcompbio%2Fcontrollers%2FDocumentationController.java;h=07c72b91258e02c438d3a8055c1a7eb413f3ae7a;hb=025c55d49c191f24d0e06c5cbb69a9894c50af22;hp=9e7de42570e6fc0a71c834a8a546fbeb182cd454;hpb=67ee99b3cfa17f03dbe839f5ab3ec215541330d8;p=proteocache.git

diff --git a/server/compbio/controllers/DocumentationController.java b/server/compbio/controllers/DocumentationController.java
index 9e7de42..07c72b9 100644
--- a/server/compbio/controllers/DocumentationController.java
+++ b/server/compbio/controllers/DocumentationController.java
@@ -1,6 +1,5 @@
 package compbio.controllers;
 
-import java.security.Principal;
 import java.util.Map;
 
 import org.springframework.stereotype.Controller;
@@ -14,36 +13,30 @@ import org.springframework.web.bind.annotation.RequestMethod;
  * @author Natasha Sherstneva
  */
 @Controller
-public class DocumentationController {
+public class DocumentationController extends BasicController {
 
 	@RequestMapping(value = "/help/overview", method = RequestMethod.GET)
-	public String formOverviewPage(Map<String, Object> model, Principal principal) {
-		model.put("username", getPrincipleName(principal));
+	public String formOverviewPage(Map<String, Object> model) {
+		model.put("username", getPrincipalName());
 		return "help/Overview";
 	}
 
 	@RequestMapping(value = "/help/howto", method = RequestMethod.GET)
-	public String formHowtoPage(Map<String, Object> model, Principal principal) {
-		model.put("username", getPrincipleName(principal));
+	public String formHowtoPage(Map<String, Object> model) {
+		model.put("username", getPrincipalName());
 		return "support/Notimplemented";
 	}
 
 	@RequestMapping(value = "/help/doc", method = RequestMethod.GET)
-	public String formDocPage(Map<String, Object> model, Principal principal) {
-		model.put("username", getPrincipleName(principal));
+	public String formDocPage(Map<String, Object> model) {
+		model.put("username", getPrincipalName());
 		return "support/Notimplemented";
 	}
 
 	@RequestMapping(value = "/help/javadoc", method = RequestMethod.GET)
-	public String formJavadoc(Map<String, Object> model, Principal principal) {
-		model.put("username", getPrincipleName(principal));
+	public String formJavadoc(Map<String, Object> model) {
+		model.put("username", getPrincipalName());
 		return "support/Notimplemented";
 	}
 
-	private String getPrincipleName(Principal principal) {
-		if (null != principal.getName()) {
-			return principal.getName();
-		}
-		return "unknown";
-	}
 }