Changeset 7761

Timestamp:

Nov 27, 2019, 3:23:27 PM (3 years ago)

Author:

Nicklas Nordborg

Message:

References #2199: Implement a "File viewer" extension point

Implemented in the any-to-any lists.

Location:

trunk

Files:

• src/clients/web/net/sf/basedb/clients/web/Base.java (modified) (1 diff)
• src/clients/web/net/sf/basedb/clients/web/extensions/fileviewer/FileViewerUtil.java (modified) (2 diffs)
• www/common/anytoany/list_anytoany.jsp (modified) (4 diffs)

trunk/src/clients/web/net/sf/basedb/clients/web/Base.java

@@ -1737 +1737 @@
       {
         link += " <span class=\"file-actions\">[<span title=\"This file is offline\">" + 
-            "<img src=\"" + root + "images/offline.png\" alt=\"offline\"></span>"; 
+            "<img src=\"" + root + "images/offline.png\" alt=\"offline\">]</span>"; 
       }
     }

trunk/src/clients/web/net/sf/basedb/clients/web/extensions/fileviewer/FileViewerUtil.java

@@ -62 +62 @@
   
   /**
-    Rended the extensions with the current file context information.
+    Render the extensions with the current file context information
+    and write it to the JSP output.
   */
   public void render()
     throws IOException
+  {
+    String result = renderAsString();
+    if (result.length() > 0)
+    {
+      jspContext.getOut().write(result);
+    }
+  }
+  
+  /**
+    Render the extensions with the current file context information
+    and return it as a string. Returns an empty string if there are no
+    actions.
+  */
+  public String renderAsString()
   {
     // Need to repeat this since to make sure the correct context is always used
@@ -75 +90 @@
     fileActions.renderDefault();
     jspContext.getPageContext().popBody();
-    String result = actions.toString();
     
-    // Now, write the final output to the JSP
-    if (result != null && result.length() > 0)
+    String result = "";
+    if (actions.getBuffer().length() > 0)
     {
-      jspContext.getOut().write("<span class=\"file-actions\">" + prefix + result + suffix + "</span>");
+      result = "<span class=\"file-actions\">" + prefix + actions.toString() + suffix + "</span>";
     }
+    return result;
   }
   

trunk/www/common/anytoany/list_anytoany.jsp

@@ -53 +53 @@
   import="net.sf.basedb.clients.web.extensions.list.ListColumnAction"
   import="net.sf.basedb.clients.web.extensions.list.ListColumnUtil"
+  import="net.sf.basedb.clients.web.extensions.fileviewer.FileViewerContext"
+  import="net.sf.basedb.clients.web.extensions.fileviewer.FileViewerUtil"
   import="net.sf.basedb.clients.web.extensions.renderer.PrefixSuffixRenderer"
   import="java.util.List"
@@ -84 +86 @@
   ExtensionsInvoker<ButtonAction> invoker = ToolbarUtil.useExtensions(jspContext);
   ExtensionsInvoker<ListColumnAction<AnyToAny,?>> columnsInvoker = ListColumnUtil.useExtensions(jspContext);
+  FileViewerContext fileContext = FileViewerContext.anyToAny(item);
+  FileViewerUtil fileViewer = new FileViewerUtil(jspContext, fileContext);
   %>
   <base:page type="include">
   <base:head scripts="/common/anytoany/list.js" />
   <base:body>
+    <ext:scripts context="<%=jspContext%>" />
     <base:section 
       id="anytoany" 
@@ -179 +184 @@
               
               String toLink = "";
-              if (to instanceof File)
-              {
-                File toFile = (File)to;
-                toLink = Base.getLinkedFile(ID, toFile, false, true, true, root);
-              }
-              else if (to instanceof Nameable)
+              if (to instanceof Nameable)
               {
                 Nameable nameable = (Nameable)to;
@@ -204 +204 @@
               {
                 toLink = Base.getLink(ID, to.toString(), to.getType(), to.getId(), true);
+              }
+              if (to instanceof File)
+              {
+                File toFile = (File)to;
+                fileContext.setCurrentAnyToAny(toFile, ata);
+                toLink += " " + fileViewer.renderAsString();
               }
               if (to instanceof Subtypable)