[Sageplugins-commit] JettyStarter/WebContent/apps index.jsp, 1.3, 1.4

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

Update of /cvsroot/sageplugins/JettyStarter/WebContent/apps
In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv19097/WebContent/apps

Modified Files:
	index.jsp 
Log Message:
Fix displayed version of installed plugin

Index: index.jsp
===================================================================
RCS file: /cvsroot/sageplugins/JettyStarter/WebContent/apps/index.jsp,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** index.jsp	2 Jan 2011 03:24:32 -0000	1.3
--- index.jsp	14 Jan 2011 05:36:52 -0000	1.4
***************
*** 97,104 ****
--- 97,111 ----
        else
        {
+          Object[] installedPlugins = PluginAPI.GetInstalledPlugins();
+ 
           for (int i = 0; i < handlerList.size(); i++)
           {
              ContextHandler context = (ContextHandler) handlerList.get(i);
  
+             Object pluginIdAttribute = context.getAttribute("pluginid");
+             String pluginId = (pluginIdAttribute == null) ? null : pluginIdAttribute.toString();
+             Object webpageAttribute = context.getAttribute("webpage");
+             String webpage = (webpageAttribute == null) ? null : webpageAttribute.toString();
+             
              Resource faviconResource = context.getResource("/favicon.ico");
              String favIconPath = "/apps/favicon.ico";
***************
*** 115,118 ****
--- 122,141 ----
              }
  
+             String installedPluginVersion = null;
+             if (pluginId != null)
+             {
+                 for (Object installedPlugin : installedPlugins)
+                 {
+                     String installedPluginName = PluginAPI.GetPluginName(installedPlugin);
+                     String installedPluginId = PluginAPI.GetPluginIdentifier(installedPlugin);
+                     
+                     if (pluginId.equals(installedPluginId))
+                     {
+                         installedPluginVersion = PluginAPI.GetPluginVersion(installedPlugin);
+                         break;
+                     }
+                 }
+             }
+ 
              if (context.isRunning())
              {
***************
*** 139,146 ****
                 }
                 out.write("<div class=\"appdetails\">");
!                if (context.getAttribute("pluginid") != null)
                 {
!                   Object plugin = PluginAPI.GetAvailablePluginForID(context.getAttribute("pluginid").toString());
!                   out.write("Version " + PluginAPI.GetPluginVersion(plugin));
                 }
                 out.write("</div></div></a></li>\n");
--- 162,168 ----
                 }
                 out.write("<div class=\"appdetails\">");
!                if (installedPluginVersion != null)
                 {
!                    out.write("Version " + installedPluginVersion + "\n");
                 }
                 out.write("</div></div></a></li>\n");
***************
*** 164,170 ****
                 if (context.isStopped())
                    out.write("<br> [stopped]");
!                if (context.getAttribute("version") != null)
                 {
!                   out.write("Version " + context.getAttribute("version"));
                 }
                 out.write("</div></div></li>\n");
--- 186,192 ----
                 if (context.isStopped())
                    out.write("<br> [stopped]");
!                if (installedPluginVersion != null)
                 {
!                    out.write("Version " + installedPluginVersion + "\n");
                 }
                 out.write("</div></div></li>\n");