Skip to content
Permalink
Browse files

remove deprecated getInstance

  • Loading branch information...
bobjacobsen committed Sep 21, 2018
1 parent 36ab64c commit 182172acbdad64866c59a9429db32f02bf3345ec
Showing with 3 additions and 14 deletions.
  1. +0 −11 java/src/jmri/web/servlet/ServletUtil.java
  2. +3 −3 java/src/jmri/web/servlet/tables/TablesServlet.java
@@ -105,17 +105,6 @@ public String getNavBar(Locale locale, String context) throws IOException {
return navBar;
}

/**
* Get the default ServletUtil instance.
*
* @return the default instance of ServletUtil
* @deprecated since 4.7.4; use {@link #getDefault() } instead
*/
@Deprecated
public static ServletUtil getInstance() {
return getDefault();
}

/**
* Get the default ServletUtil instance.
*
@@ -42,9 +42,9 @@ protected void processRequest(HttpServletRequest request, HttpServletResponse re
response.getWriter().print(String.format(request.getLocale(),
FileUtil.readURL(FileUtil.findURL(Bundle.getMessage(request.getLocale(), "Tables.html"))),
Bundle.getMessage(request.getLocale(), "TablesTitle"), //page title is parm 1
ServletUtil.getInstance().getNavBar(request.getLocale(), "/tables"), //navbar is parm 2
ServletUtil.getInstance().getRailroadName(false), //railroad name is parm 3
ServletUtil.getInstance().getFooter(request.getLocale(), "/tables"), //footer is parm 4
ServletUtil.getDefault().getNavBar(request.getLocale(), "/tables"), //navbar is parm 2
ServletUtil.getDefault().getRailroadName(false), //railroad name is parm 3
ServletUtil.getDefault().getFooter(request.getLocale(), "/tables"), //footer is parm 4
tableType //tableType is parm 5
));
}

0 comments on commit 182172a

Please sign in to comment.
You can’t perform that action at this time.