Menu
▾
▴
sageplugins-commic
|
From: jreichen <jre...@us...> - 2011-03-15 00:55:03
|
Update of /cvsroot/sageplugins/webserver/net/sf/sageplugins/webserver
In directory vz-cvs-3.sog:/tmp/cvs-serv15427/net/sf/sageplugins/webserver
Modified Files:
HomeServlet.java ExtenderCommandServlet.java
Added Files:
ExtenderDetailsServlet.java
Log Message:
Store and edit client, extender, and placeshifter descriptive names in Sage.properties. Extenders.properties is no longer used.
Index: ExtenderCommandServlet.java
===================================================================
RCS file: /cvsroot/sageplugins/webserver/net/sf/sageplugins/webserver/ExtenderCommandServlet.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** ExtenderCommandServlet.java 4 Feb 2009 15:02:48 -0000 1.4
--- ExtenderCommandServlet.java 15 Mar 2011 00:55:00 -0000 1.5
***************
*** 93,97 ****
out.println("<p>Are you sure you want to "+command+" the "+
(isMvp(uicontext)?"MVP":(isHDExtender(uicontext)?"HD Extender":"Placeshifter"))+
! " at "+UIContextTranslator.doTranslate(uicontext) +"?</p>");
out.println("<form method=\"get\" action=\"ExtenderCommand\">\n"+
--- 93,97 ----
out.println("<p>Are you sure you want to "+command+" the "+
(isMvp(uicontext)?"MVP":(isHDExtender(uicontext)?"HD Extender":"Placeshifter"))+
! " at "+UiContextProperties.getProperty(uicontext, "name") +"?</p>");
out.println("<form method=\"get\" action=\"ExtenderCommand\">\n"+
***************
*** 114,118 ****
if ( req.getParameter("confirm").equalsIgnoreCase("yes")) {
! Object ret;
if ( command.equalsIgnoreCase("poweroff")) {
if ( isMvp(uicontext))
--- 114,118 ----
if ( req.getParameter("confirm").equalsIgnoreCase("yes")) {
! Object ret = null;
if ( command.equalsIgnoreCase("poweroff")) {
if ( isMvp(uicontext))
***************
*** 132,138 ****
SageApi.ApiUI(uicontext, "Exit");
ret=Boolean.TRUE;
! } else
throw new Exception ("Invalid command passed");
!
if (ret instanceof String) {
--- 132,142 ----
SageApi.ApiUI(uicontext, "Exit");
ret=Boolean.TRUE;
! } else if ( command.equalsIgnoreCase("rename") ) {
! String contextName = req.getParameter("name");
! contextName = (contextName == null) ? "" : contextName;
! UiContextProperties.setProperty(uicontext, "name", contextName);
! } else {
throw new Exception ("Invalid command passed");
! }
if (ret instanceof String) {
--- NEW FILE: ExtenderDetailsServlet.java ---
/*
* Created on Mar 7, 2011
*
*/
package net.sf.sageplugins.webserver;
import java.io.PrintWriter;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import net.sf.sageplugins.sageutils.SageApi;
/**
* @author Owner
*
*/
public class ExtenderDetailsServlet extends SageServlet {
/**
*
*/
private static final long serialVersionUID = -1282179705230630195L;
public ExtenderDetailsServlet() {
}
/* (non-Javadoc)
* @see net.sf.sageplugins.webserver.SageServlet#doServletGet(javax.servlet.http.HttpServletRequest, javax.servlet.http.HttpServletResponse)
*/
protected void doServletGet(HttpServletRequest req, HttpServletResponse resp)
throws Exception {
String pageTitle = "";
String context = req.getParameter("context");
htmlHeaders(resp);
noCacheHeaders(resp);
PrintWriter out = getGzippedWriter(req,resp);
// must catch and report all errors within Gzipped Writer
try {
xhtmlHeaders(out);
out.println("<head>");
jsCssImport(req, out);
Boolean isClient = (Boolean) SageApi.ApiUI(context, "IsClient");
if (isClient) {
pageTitle = "Client Details";
} else {
pageTitle = "Extender Details";
}
out.println("<title>" + pageTitle + "</title>");
out.println("</head>");
out.println("<body>");
printTitle(out,pageTitle);
out.println("<div id=\"content\">");
out.println("<div id=\"airdetailedinfo\">");
out.println(" <form method=\"post\" action=\"ExtenderCommand\">");
out.println(" <dl>");
// Properties for ui contexts
// Context id
out.println(" <dt>Id:</dt>");
out.println(" <dd>");
out.println(" " + context);
out.println(" </dd>");
// Name
out.println(" <dt>Name:</dt>");
out.println(" <dd>");
out.println(" <input type=\"hidden\" name=\"context\" value=\"" + context + "\"/>");
out.println(" <input type=\"text\" name=\"name\" value=\"" + net.sf.sageplugins.webserver.UiContextProperties.getProperty(context, "name") + "\"/>");
out.println(" <input type=\"hidden\" name=\"confirm\" value=\"yes\"/>");
out.println(" <input type=\"hidden\" name=\"returnto\" value=\"ExtenderDetails?" + req.getQueryString() + "\"/>");
out.println(" <button type=\"submit\" name=\"command\" value=\"rename\">Rename</button>");
out.println(" ");
out.println(" </dd>");
// Type
String uiType = (String) SageApi.ApiUI(context, "GetRemoteUIType");
out.println(" <dt>Type:</dt>");
out.println(" <dd>");
out.println(" " + uiType);
out.println(" </dd>");
// Platform
// No API for GetOS that takes context as a parameter
// String platform = (String) SageApi.ApiUI(context, "GetOS");
// out.println(" <dt>Platform:</dt>");
// out.println(" <dd>");
// out.println(" " + platform);
// out.println(" </dd>");
// Version
String uiVersion = (String) SageApi.ApiUI(context, "GetRemoteClientVersion");
out.println(" <dt>Version:</dt>");
out.println(" <dd>");
out.println(" " + uiVersion);
out.println(" </dd>");
// Full screen
Boolean isFullScreen = (Boolean) SageApi.ApiUI(context, "IsFullScreen");
out.println(" <dt>Full Screen:</dt>");
out.println(" <dd>");
out.println(" " + (isFullScreen ? "Yes" : "No"));
out.println(" </dd>");
// Window Size
Integer width = (Integer) SageApi.ApiUI(context, "GetFullUIWidth");
Integer height = (Integer) SageApi.ApiUI(context, "GetFullUIHeight");
out.println(" <dt>Window Size:</dt>");
out.println(" <dd>");
out.println(" " + width + "x" + height);
out.println(" </dd>");
// Resolution
String uiResolution = (String) SageApi.ApiUI(context, "GetDisplayResolution");
out.println(" <dt>Display Resolution:</dt>");
out.println(" <dd>");
out.println(" " + uiResolution);
out.println(" </dd>");
// Display Resolution Options
String[] uiResolutionOptions = (String[]) SageApi.ApiUI(context, "GetDisplayResolutionOptions");
if ((uiResolutionOptions != null) && (uiResolutionOptions.length > 0))
{
out.println(" <dt>Display Resolution Options:</dt>");
out.println(" <dd>");
for (String uiResolutionOption : uiResolutionOptions)
{
out.println(" <p>" + uiResolutionOption + "</p>");
}
out.println(" </dd>");
}
// Available Update
// String availableUpdate = (String) SageApi.ApiUI(context, "GetAvailableUpdate");
// out.println(" <dt>Available Update:</dt>");
// out.println(" <dd>");
// out.println(" " + availableUpdate);
// out.println(" </dd>");
// Asleep
Boolean isAsleep = (Boolean) SageApi.ApiUI(context, "IsAsleep");
out.println(" <dt>Asleep:</dt>");
out.println(" <dd>");
out.println(" " + (isAsleep ? "Yes" : "No"));
out.println(" </dd>");
// End of properties, close the form element
out.println(" </form>");
out.println("</div>");//airdetailedinfo
out.println("<div id=\"commands\">");
out.println(" <ul>");
out.println(" <li>");
out.println(" (No Commands)");
out.println(" </li>");
out.println(" </ul>");
out.println("</div>");//commands
printFooter(req,out);
out.println("</div>");//content
printMenu(req,out);
out.println("</body>");
out.println("</html>");
out.close();
} catch (Throwable e) {
if (!resp.isCommitted()){
resp.setStatus(HttpServletResponse.SC_INTERNAL_SERVER_ERROR);
resp.setContentType("text/html");
}
out.println();
out.println();
out.println("<body><pre>");
out.println("Exception while processing servlet:\r\n"+e.toString());
e.printStackTrace(out);
out.println("</pre>");
out.close();
log("Exception while processing servlet",e);
}
}
}
Index: HomeServlet.java
===================================================================
RCS file: /cvsroot/sageplugins/webserver/net/sf/sageplugins/webserver/HomeServlet.java,v
retrieving revision 1.36
retrieving revision 1.37
diff -C2 -d -r1.36 -r1.37
*** HomeServlet.java 17 Jul 2010 15:23:09 -0000 1.36
--- HomeServlet.java 15 Mar 2011 00:55:00 -0000 1.37
***************
*** 174,181 ****
if ( ! context.equals("SAGETV_PROCESS_LOCAL_UI")) {
! out.println("<h3>On Sage Extender at: "+UIContextTranslator.doTranslate(context)+":");
out.println("<a href=\""+xmlurl+"currplaying&context="+URLEncoder.encode(context,charset)+"\" title=\"Return currently playing in XML\"><img src=\"xml_button.png\" alt=\"[XML]\"/></a>");
out.println("<a href=\"webremote.html?context="+URLEncoder.encode(context,charset)
! +"&contextname="+URLEncoder.encode(UIContextTranslator.doTranslate(context),charset)
+"\" target=\"webremote\" title=\"Webremote for Sage Extender\" >"
+"[WebRemote]</a>\r\n");
--- 174,181 ----
if ( ! context.equals("SAGETV_PROCESS_LOCAL_UI")) {
! out.println("<h3>On Sage Extender at: <a href=\"ExtenderDetails?context="+URLEncoder.encode(context,charset)+"\">"+UiContextProperties.getProperty(context, "name")+"</a>:");
out.println("<a href=\""+xmlurl+"currplaying&context="+URLEncoder.encode(context,charset)+"\" title=\"Return currently playing in XML\"><img src=\"xml_button.png\" alt=\"[XML]\"/></a>");
out.println("<a href=\"webremote.html?context="+URLEncoder.encode(context,charset)
! +"&contextname="+URLEncoder.encode(UiContextProperties.getProperty(context, "name"),charset)
+"\" target=\"webremote\" title=\"Webremote for Sage Extender\" >"
+"[WebRemote]</a>\r\n");
***************
*** 236,243 ****
{
String context = ConnectedClients[i];
! out.println("<h3>On Sage Client at: "+UIContextTranslator.doTranslate(context)+":");
out.println("<a href=\""+xmlurl+"currplaying&context="+URLEncoder.encode(context,charset)+"\" title=\"Return currently playing in XML\"><img src=\"xml_button.png\" alt=\"[XML]\"/></a>");
out.println("<a href=\"webremote.html?context="+URLEncoder.encode(context,charset)
! +"&contextname="+URLEncoder.encode(UIContextTranslator.doTranslate(context),charset)
+"\" target=\"webremote\" title=\"Webremote for Sage Extender\" >"
+"[WebRemote]</a>\r\n");
--- 236,243 ----
{
String context = ConnectedClients[i];
! out.println("<h3>On Sage Client at: <a href=\"ExtenderDetails?context="+URLEncoder.encode(context,charset)+"\">"+UiContextProperties.getProperty(context, "name")+"</a>:");
out.println("<a href=\""+xmlurl+"currplaying&context="+URLEncoder.encode(context,charset)+"\" title=\"Return currently playing in XML\"><img src=\"xml_button.png\" alt=\"[XML]\"/></a>");
out.println("<a href=\"webremote.html?context="+URLEncoder.encode(context,charset)
! +"&contextname="+URLEncoder.encode(UiContextProperties.getProperty(context, "name"),charset)
+"\" target=\"webremote\" title=\"Webremote for Sage Extender\" >"
+"[WebRemote]</a>\r\n");
|
×
Want the latest updates on software, tech news, and AI?
Get latest updates about software, tech news, and AI from SourceForge directly in your inbox once a month.
Thanks for helping keep SourceForge clean.
X