sageplugins-commic

[jreichen <jre...@us...>]

Update of /cvsroot/sageplugins/webserver/net/sf/sageplugins/webserver
In directory vz-cvs-3.sog:/tmp/cvs-serv15805/net/sf/sageplugins/webserver

Modified Files:
	DetailedInfoServlet.java 
Log Message:
Store client, extender, and placeshifter descriptive names in Sage.properties.  Extenders.properties is no longer used.

Index: DetailedInfoServlet.java
===================================================================
RCS file: /cvsroot/sageplugins/webserver/net/sf/sageplugins/webserver/DetailedInfoServlet.java,v
retrieving revision 1.61
retrieving revision 1.62
diff -C2 -d -r1.61 -r1.62
*** DetailedInfoServlet.java	17 Jul 2010 15:12:53 -0000	1.61
--- DetailedInfoServlet.java	14 Mar 2011 03:50:43 -0000	1.62
***************
*** 898,902 ****
                          out.print("<input type=\"hidden\" name=\"returnto\" value=\""+req.getRequestURI()+"?"+Translate.encode(req.getQueryString())+"\"/>");
                          out.print("<input type=\"hidden\" name=\"" + airing.getIdArgName() + "\" value=\""+airing.id+"\"/>");
!                         out.print("<input type=\"submit\" value=\""+Translate.encode(UIContextTranslator.doTranslate(context))+"\" onclick=\"return AiringCommand('"
                                      +"MediaFileCommand?command=WatchNow&amp;context="+context+"&amp;" + airing.getIdArg()
                                      +"&amp;returnto=" + req.getRequestURI()+"?"+Translate.encode(req.getQueryString()) + "')\"/>" );
--- 898,902 ----
                          out.print("<input type=\"hidden\" name=\"returnto\" value=\""+req.getRequestURI()+"?"+Translate.encode(req.getQueryString())+"\"/>");
                          out.print("<input type=\"hidden\" name=\"" + airing.getIdArgName() + "\" value=\""+airing.id+"\"/>");
!                         out.print("<input type=\"submit\" value=\""+Translate.encode(UiContextProperties.getProperty(context, "name"))+"\" onclick=\"return AiringCommand('"
                                      +"MediaFileCommand?command=WatchNow&amp;context="+context+"&amp;" + airing.getIdArg()
                                      +"&amp;returnto=" + req.getRequestURI()+"?"+Translate.encode(req.getQueryString()) + "')\"/>" );
***************
*** 918,922 ****
                              out.print("<input type=\"hidden\" name=\"returnto\" value=\""+req.getRequestURI()+"?"+Translate.encode(req.getQueryString())+"\"/>");
                              out.print("<input type=\"hidden\" name=\"" + airing.getIdArgName() + "\" value=\""+airing.id+"\"/>");
!                             out.print("<input type=\"submit\" value=\""+Translate.encode(UIContextTranslator.doTranslate(context))+"\" onclick=\"return AiringCommand('"
                                          +"MediaFileCommand?command=WatchNow&amp;context="+context+"&amp;" + airing.getIdArg()
                                          +"&amp;returnto=" + req.getRequestURI()+"?"+Translate.encode(req.getQueryString()) + "')\"/>" );
--- 918,922 ----
                              out.print("<input type=\"hidden\" name=\"returnto\" value=\""+req.getRequestURI()+"?"+Translate.encode(req.getQueryString())+"\"/>");
                              out.print("<input type=\"hidden\" name=\"" + airing.getIdArgName() + "\" value=\""+airing.id+"\"/>");
!                             out.print("<input type=\"submit\" value=\""+Translate.encode(UiContextProperties.getProperty(context, "name"))+"\" onclick=\"return AiringCommand('"
                                          +"MediaFileCommand?command=WatchNow&amp;context="+context+"&amp;" + airing.getIdArg()
                                          +"&amp;returnto=" + req.getRequestURI()+"?"+Translate.encode(req.getQueryString()) + "')\"/>" );