WebSVN - bacoAlunos - Path Comparison - / Rev 104 and / Rev 105

Ignore whitespace Rev 104 → Rev 105

 /impl/src/java/jomm/web/utils/TopNav.java
 ,9 → 33,14
     }
     public void addNavPlace(String url, String messageKey,String arg)
     {
-        NavPlace n = new NavPlace(url,messageKey,navPlaces.size());
+        NavPlace n = new NavPlace(url,messageKey,navPlaces.size(),arg);
         navPlaces.add(n);
     }
+     public void addNavPlace(String url, String messageKey,String arg0,String arg1)
+    {
+        NavPlace n = new NavPlace(url,messageKey,navPlaces.size(),arg0,arg1);
+        navPlaces.add(n);
+    }
     public String getTitle() {
         return title;

 /impl/src/web/public/search/topnavSearchResults.jsp
 ,13 → 5,11
 <%@ page import="pt.estgp.estgweb.services.common.ICommonSearchResults" %>
 <%
-    ICommonSearchResults iCommonSearchResults = (ICommonSearchResults) request.getAttribute("ICommonSearchResults");
     TopNav topNav = NavPlaceServer.getInstance().createTopNav(request);
     topNav.addNavPlace("/Welcome.do", "Home");
     topNav.addNavPlace("/startSearch.do?query=" + request.getParameter("query") + "&searchType=" + request.getParameter("searchType"), "search.form");
-    if (iCommonSearchResults != null)
-        topNav.addNavPlace(null, "search.results", iCommonSearchResults.getQuery());
+    if (request.getParameter("query") != null)
+        topNav.addNavPlace(null, "search.results", request.getParameter("query") );
     else
         topNav.addNavPlace(null, "search.results");
 %>