Changeset 2209

Timestamp:

Feb 3, 2014, 8:36:18 AM (9 years ago)

Author:

Nicklas Nordborg

Message:

Fixes #567: Update MEV extension to new scripting pattern

Location:

extensions/net.sf.basedb.mev/trunk

Files:

• .classpath (modified) (1 diff)
• META-INF/extensions.xml (modified) (4 diffs)
• build.xml (modified) (1 diff)
• resources/launch_mev.jsp (modified) (7 diffs)
• resources/options.jsp (modified) (3 diffs)
• resources/scripts/mev.js (moved) (moved from extensions/net.sf.basedb.mev/trunk/resources/scripts/mev.jsp) (1 diff)
• src/server/net/sf/basedb/mev/factory/MevButtonFactory.java (modified) (1 diff)

extensions/net.sf.basedb.mev/trunk/.classpath

@@ -8 +8 @@
   <classpathentry kind="lib" path="resources/jar/mev-gui-impl.jar" sourcepath="/mev-4.4.1/source"/>
   <classpathentry kind="lib" path="resources/jar/HTTPClient.jar"/>
-  <classpathentry kind="lib" path="lib/compile/base-core-3.1.0.jar"/>
-  <classpathentry kind="lib" path="lib/compile/base-coreplugins-3.1.0.jar"/>
-  <classpathentry kind="lib" path="lib/compile/base-webclient-3.1.0.jar"/>
-  <classpathentry kind="lib" path="lib/compile/base-webservices-client-3.1.0.jar"/>
+  <classpathentry kind="lib" path="lib/compile/base-core-3.3.0.jar"/>
+  <classpathentry kind="lib" path="lib/compile/base-coreplugins-3.3.0.jar"/>
+  <classpathentry kind="lib" path="lib/compile/base-webclient-3.3.0.jar"/>
+  <classpathentry kind="lib" path="lib/compile/base-webservices-client-3.3.0.jar"/>
   <classpathentry kind="output" path="bin"/>
 </classpath>

extensions/net.sf.basedb.mev/trunk/META-INF/extensions.xml

@@ -1 +1 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <extensions xmlns="http://base.thep.lu.se/extensions.xsd">
-  <about>
+  <about safe-scripts="1">
     <name>MEV Launcher package</name>
     <description>
@@ -12 +12 @@
     <email>basedb-users@lists.sourceforge.net</email>
     <url>http://baseplugins.thep.lu.se/wiki/net.sf.basedb.mev</url>
-    <min-base-version>3.1.0</min-base-version>    
+    <min-base-version>3.3.0</min-base-version>    
   </about>
   <plugin-definition id="PackageInstaller">
@@ -79 +79 @@
           given the option to do so.
         </tooltip>
-        <onClick>MeV.launch($ID$)</onClick>
+        <clazz>icon link auto-init</clazz>
+        <data-auto-init>launch-mev</data-auto-init>
+        <data-home>$HOME$</data-home>
         <icon>~/images/tm4.png</icon>
-        <script>~/scripts/mev.jsp</script>
+        <script>~/scripts/mev.js</script>
       </parameters>
     </action-factory>
@@ -103 +105 @@
         <title>MeV Launcher options&amp;hellip;</title>
         <tooltip>Specify options for the MeV Launcher</tooltip>
-        <onClick>Main.openPopup('$HOME$/options.jsp?ID='+getSessionId(), 'MeVLauncherOptions', 450, 300)</onClick>
+        <data-url>$HOME$/options.jsp?ID=$SESSION-ID$</data-url>
+        <data-popup>MeVLauncherOptions, 450, 300</data-popup>
         <icon>~/images/tm4.png</icon>
       </parameters>

extensions/net.sf.basedb.mev/trunk/build.xml

@@ -24 +24 @@
   <property name="javac.encoding" value="UTF-8" />
   <property name="depend.base-version" 
-    value="3.1.0" 
+    value="3.3.0" 
     description="The BASE version that this project depends on."
   />

extensions/net.sf.basedb.mev/trunk/resources/launch_mev.jsp

@@ -127 +127 @@
   {}
 %>
-<base:page type="popup" title="<%=title%>">
-<base:head>
-  <script language="JavaScript">
-  function launchMev(fileType)
-  {
-    var url = 'mev_jnlp.jsp?ID=<%=ID%>&bioassayset_id=<%=bioAssaySetId%>';
-    url += '&filetype=' + fileType;
-    window.opener.location.href = url;
-    setTimeout('window.close()', 500);
-  }
-  function exportTdms()
-  {
-    var url = getRoot()+'common/plugin/index.jsp?ID='+getSessionId();
-    url += '&cmd=NewJob&plugin_class=net.sf.basedb.mev.plugin.TdmsExporterPlugin';
-    url += '&item_type=BIOASSAYSET&context_type=ITEM';
-    url += '&job_name=' + encodeURIComponent('<%=HTML.javaScriptEncode(tdmsJobName)%>');
-    url += '&parameter:saveAs='+encodeURIComponent('<%=HTML.javaScriptEncode(defaultPath+defaultTdmsFileName)%>');
-    url += '&parameter:attachToBioAssaySet=true';
-    Main.openPopup(url, 'CreateTDMSFile', 750, 500);
-    window.close();
-  }
-  function exportCgh()
-  {
-    var frm = document.forms['mev'];
-    var url = getRoot()+'common/plugin/index.jsp?ID='+getSessionId();
-    url += '&cmd=NewJob&plugin_class=net.sf.basedb.mev.plugin.CghExporterPlugin';
-    url += '&pluginconfiguration_id=' + frm.cgh_configuration[frm.cgh_configuration.selectedIndex].value;
-    url += '&item_type=BIOASSAYSET&context_type=ITEM';
-    url += '&job_name=' + encodeURIComponent('<%=HTML.javaScriptEncode(cghJobName)%>');
-    url += '&parameter:saveAs='+encodeURIComponent('<%=HTML.javaScriptEncode(defaultPath+defaultCghFileName)%>');
-    url += '&parameter:attachToBioAssaySet=true';
-    Main.openPopup(url, 'CreateCGHFile', 750, 500);
-    window.close();
-  }
-  </script>
-</base:head>
+<base:page type="popup" title="<%=title%>" id="mev-launch">
+<base:head scripts="~scripts/mev.js" />
 <base:body>
   <h1><%=title%></h1>
+  
+  <div id="page-data" class="datacontainer"
+    data-bioassayset-id="<%=bioAssaySetId%>"
+  ></div>
 
   <form name="mev">
@@ -177 +147 @@
     <tbody>
       <tr>
-        <td style="padding-bottom: 1em;"><base:button title="Start MeV" 
-          onclick="launchMev('mev.anl')" 
-          image="<%=anlFile == null ? homeUrl + "/images/tm4_disabled.png" : homeUrl + "/images/tm4.png" %>" 
+        <td style="padding-bottom: 1em;"><base:button 
+          title="Start MeV" 
+          subclass="auto-init"
+          data-auto-init="start-mev"
+          data-mev-file-type="mev.anl"
+          image="<%=homeUrl + "/images/tm4.png" %>" 
           disabled="<%=anlFile == null%>"/></td>
         <td style="padding-bottom: 1em;">
@@ -207 +180 @@
     <tbody>
       <tr>
-        <td><base:button title="Start MeV" 
-          onclick="launchMev('mev.tdms')" 
-          image="<%=tdmsFile == null ? homeUrl + "/images/tm4_disabled.png" : homeUrl + "/images/tm4.png" %>" 
+        <td><base:button 
+          title="Start MeV" 
+          subclass="auto-init"
+          data-auto-init="start-mev"
+          data-mev-file-type="mev.tdms"
+          image="<%=homeUrl + "/images/tm4.png" %>" 
           disabled="<%=tdmsFile == null%>"/></td>
         <td>
@@ -230 +206 @@
       </tr>
       <tr>
-        <td style="padding-bottom: 1em;"><base:button title="Export" 
-          onclick="exportTdms()"
+        <td style="padding-bottom: 1em;"><base:button 
+          id="export-tdms"
+          title="Export" 
           disabled="<%=!allowCreateFile%>" 
-          image="<%=allowCreateFile ? "export.gif" : homeUrl + "/images/export_disabled.gif"%>" /></td>
+          data-job-name="<%=HTML.encodeTags(tdmsJobName) %>"
+          data-save-as="<%=HTML.encodeTags(defaultPath+defaultTdmsFileName)%>"
+          image="export.png" /></td>
         <td style="padding-bottom: 1em;">
         <%
@@ -259 +238 @@
     <tbody>
       <tr>
-        <td><base:button title="Start MeV" 
-          onclick="launchMev('mev.cgh')" 
-          image="<%=cghFile == null ? homeUrl + "/images/tm4_disabled.png" : homeUrl + "/images/tm4.png" %>" 
+        <td><base:button 
+          title="Start MeV" 
+          subclass="auto-init"
+          data-auto-init="start-mev"
+          data-mev-file-type="mev.cgh"
+          image="<%=homeUrl + "/images/tm4.png" %>" 
           disabled="<%=cghFile == null%>"/></td>
         <td>
@@ -282 +264 @@
       </tr>
       <tr>
-        <td><base:button title="Export" 
-          onclick="exportCgh()" 
+        <td><base:button 
+          id="export-cgh"
+          title="Export" 
           disabled="<%=!canCreateCGHFile%>" 
-          image="<%=canCreateCGHFile ? "export.gif" : homeUrl + "/images/export_disabled.gif"%>" /></td>
+          data-job-name="<%=HTML.encodeTags(cghJobName) %>"
+          data-save-as="<%=HTML.encodeTags(defaultPath+defaultCghFileName)%>"
+          image="export.png" /></td>
         <td>
         <%
@@ -335 +320 @@
 
   <base:buttongroup subclass="dialogbuttons">
-    <base:button onclick="window.close();" title="Close" />
+    <base:button id="close" title="Close" />
   </base:buttongroup>
 

extensions/net.sf.basedb.mev/trunk/resources/options.jsp

@@ -53 +53 @@
   int maxMemory = Values.getInt(sc.getUserClientSetting("net.sf.basedb.mev.launchmev.jvm.maxmemory"), 512);
 %>
-<base:page type="popup" title="<%="MeV Launcher options for "+HTML.encodeTags(user.getName())%>">
-<base:head scripts="tabcontrol.js" styles="tabcontrol.css">
-  <script language="JavaScript">
-  function validateOptions()
-  {
-    return true;
-  }
-  function saveSettings()
-  {
-    document.forms['mevoptions'].submit();
-  }
-  </script>
-</base:head>
+<base:page type="popup" title="<%="MeV Launcher options for "+HTML.encodeTags(user.getName())%>" id="mev-options">
+<base:head scripts="tabcontrol.js,~scripts/mev.js" styles="tabcontrol.css" />
 <base:body>
 
   <h1>MeV Launcher options for <%=HTML.encodeTags(user.getName())%></h1>
-  <form action="submit.jsp?ID=<%=ID%>" method="post" name="mevoptions" onsubmit="return false;">
+  <form action="submit.jsp?ID=<%=ID%>" method="post" name="mevoptions">
   <input type=hidden name="cmd" value="SaveOptions">
   
@@ -77 +66 @@
     <tr style="height: 3em;">
       <th>JVM max memory</td>
-      <td><input class="text" type="text" name="maxMemory" 
-          value="<%=maxMemory%>" style="width: 12em;" maxlength="6"
-          onkeypress="return Numbers.integerOnly(event)"> MB</td>
+      <td><input class="text" type="text" name="maxMemory" id="maxMemory"
+          value="<%=maxMemory%>" style="width: 12em;" maxlength="6"> MB</td>
     </tr>
     </table>
@@ -93 +81 @@
 
   <base:buttongroup subclass="dialogbuttons">
-    <base:button onclick="saveSettings();" title="Save" />
-    <base:button onclick="window.close();" title="Cancel" />
+    <base:button id="btnSave" title="Save" />
+    <base:button id="close" title="Cancel" />
   </base:buttongroup>
   

extensions/net.sf.basedb.mev/trunk/resources/scripts/mev.js

@@ -1 @@
-<%@ page 
-  pageEncoding="UTF-8"
-  session="false"
-  contentType="text/javascript"
-  import="net.sf.basedb.clients.web.extensions.ExtensionsControl"
-%>
-<%!
-  final String homeUrl = ExtensionsControl.getHomeUrl("net.sf.basedb.mev.launchmev");
-%>
-var MeV = new function()
+
+var MeV = function()
 {
-  this.launch = function(bioAssaySetId)
+  var mev = {};
+
+  mev.initPage = function()
   {
-    var url = '<%=homeUrl%>/launch_mev.jsp';
-    url += '?ID='+getSessionId();
-    url += '&bioassayset_id=' + bioAssaySetId;
-    Main.openPopup(url, 'LaunchMev', 600, 400);
+    var pageId = Doc.getPageId();
+    if (pageId == 'mev-options')
+    {
+      Buttons.addClickHandler('close', App.closeWindow);
+      Buttons.addClickHandler('btnSave', mev.saveOptions);
+      Events.addEventHandler('maxMemory', 'keypress', Events.integerOnly);
+    }
+    else if (pageId == 'mev-launch')
+    {
+      Buttons.addClickHandler('close', App.closeWindow);
+      Buttons.addClickHandler('export-tdms', mev.exportTdms);
+      Buttons.addClickHandler('export-cgh', mev.exportCgh);
+    }
+  }
+  
+  mev.initElement = function(element, autoInit)
+  {
+    if (autoInit == 'launch-mev')
+    {
+      Events.addEventHandler(element, 'click', mev.launchDialog);
+    }
+    else if (autoInit == 'start-mev')
+    {
+      Buttons.addClickHandler(element, mev.startMev);
+    }
   }
 
-}
-();
+  mev.launchDialog = function(event)
+  {
+    var bioAssaySetId = Data.int(event.currentTarget, 'item-id');
+    var homeUrl = Data.get(event.currentTarget, 'home');
+    var url = homeUrl+'/launch_mev.jsp?ID='+App.getSessionId();
+    url += '&bioassayset_id=' + bioAssaySetId;
+    Dialogs.openPopup(url, 'LaunchMev', 600, 400);
+  }
+
+  mev.startMev = function(event)
+  {
+    var fileType = Data.get(event.currentTarget, 'mev-file-type');
+    var bioAssaySetId = Data.int('page-data', 'bioassayset-id');
+    
+    var url = 'mev_jnlp.jsp?ID='+App.getSessionId();
+    url += '&bioassayset_id='+bioAssaySetId;
+    url += '&filetype=' + fileType;
+    window.opener.location.href = url;
+    setTimeout(App.closeWindow, 500);
+  }
+
+  mev.exportTdms = function(event)
+  {
+    var url = App.getRoot()+'common/plugin/index.jsp?ID='+App.getSessionId();
+    url += '&cmd=NewJob&plugin_class=net.sf.basedb.mev.plugin.TdmsExporterPlugin';
+    url += '&item_type=BIOASSAYSET&context_type=ITEM';
+    url += '&job_name=' + encodeURIComponent(Data.get(event.currentTarget, 'job-name'));
+    url += '&parameter:saveAs='+encodeURIComponent(Data.get(event.currentTarget, 'save-as'));
+    url += '&parameter:attachToBioAssaySet=true';
+    Dialogs.openPopup(url, 'CreateTDMSFile', 750, 500);
+    window.close();
+  }
+  
+  mev.exportCgh = function(event)
+  {
+    var frm = document.forms['mev'];
+    var url = App.getRoot()+'common/plugin/index.jsp?ID='+App.getSessionId();
+    url += '&cmd=NewJob&plugin_class=net.sf.basedb.mev.plugin.CghExporterPlugin';
+    url += '&pluginconfiguration_id=' + frm.cgh_configuration[frm.cgh_configuration.selectedIndex].value;
+    url += '&item_type=BIOASSAYSET&context_type=ITEM';
+    url += '&job_name=' + encodeURIComponent(Data.get(event.currentTarget, 'job-name'));
+    url += '&parameter:saveAs='+encodeURIComponent(Data.get(event.currentTarget, 'save-as'));
+    url += '&parameter:attachToBioAssaySet=true';
+    Dialogs.openPopup(url, 'CreateCGHFile', 750, 500);
+    window.close();
+  }
+
+  mev.saveOptions = function()
+  {
+    document.forms['mevoptions'].submit();
+  }
+
+  return mev;
+}();
+
+Doc.onLoad(MeV.initPage);
+Doc.addElementInitializer(MeV.initElement);

extensions/net.sf.basedb.mev/trunk/src/server/net/sf/basedb/mev/factory/MevButtonFactory.java

@@ -99 +99 @@
         action.setIcon(getIcon());
         action.setId(getId());
-        action.setOnClick(getOnClick().replace("$ID$", ID));
         action.setStyle(getStyle());
         action.setTitle(getTitle());
         action.setTooltip(getTooltip());
         action.setVisible(isVisible());
+        action.setDynamicActionAttributesSource(this);
+        setParameter("data-item-id", ID);
         actions = new ButtonAction[] { action };
       }