Changeset 7758

Timestamp:

Nov 27, 2019, 12:58:04 PM (3 years ago)

Author:

Nicklas Nordborg

Message:

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

Implemented functioanlity for easier handling of dynamic attributes to all action implementations that are subclasses to DynamicActionAttributeSupport. This includes the ButtonBean implementation that is used by the file view/download actions.

Location:

trunk/src/clients/web/net/sf/basedb/clients/web/extensions

Files:

• DynamicActionAttributeSupport.java (modified) (4 diffs)
• fileviewer/ViewAndDownloadActionFactory.java (modified) (3 diffs)

trunk/src/clients/web/net/sf/basedb/clients/web/extensions/DynamicActionAttributeSupport.java

@@ -21 +21 @@
 package net.sf.basedb.clients.web.extensions;
 
+import java.util.HashMap;
 import java.util.Iterator;
+import java.util.Map;
+
+import org.apache.commons.collections4.iterators.IteratorChain;
 
 import net.sf.basedb.util.extensions.Action;
@@ -39 +43 @@
   private Iterator<DynamicActionAttribute> dynamicAttributes;
   private DynamicActionAttributes source;
+  private Map<String, DynamicActionAttribute> moreAttributes;
+  
   
   /**
@@ -83 +89 @@
       it = source.getDynamicActionAttributes();
     }
+    if (moreAttributes != null)
+    {
+      if (it != null)
+      {
+        it = new IteratorChain<>(it, moreAttributes.values().iterator());
+      }
+      else
+      {
+        it = moreAttributes.values().iterator();
+      }
+    }
     return it;
   }
@@ -96 +113 @@
     this.source = source;
   }
+  
+  /**
+    Adds a dynamic attribute to the action. The name should be unique or it will overwrite any
+    existing attribute. Attributes that are set via this method are merged with attributes
+    that are set via {@link #setDynamicActionAttributesSource(DynamicActionAttributes)}.
+    Duplicates are not removed in this case.
+    @since 3.16
+  */
+  public void setDynamicAttribute(String name, Object value)
+  {
+    if (moreAttributes == null) moreAttributes = new HashMap<String, DynamicActionAttribute>();
+    moreAttributes.put(name, new DynamicActionAttribute(name, value == null ? null : value.toString()));
+  }
 
 }

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

@@ -44 +44 @@
       String bytes = Values.formatBytes(f.getSize(), 1);
       
-      // TODO -- we are lacking a simple way to add data-* attributes so the icons are not linked
-      
       ButtonBean view = new ButtonBean();
       view.setVisible(true);
@@ -51 +49 @@
       view.setTitle("View the contents of this file (" + bytes + ")");
       view.setIcon(jspContext.getRoot()+"/images/view.png");
+      view.setDynamicAttribute("data-file-id", f.getId());
+      view.setDynamicAttribute("data-auto-init", "view-file");
       
       ButtonBean download = new ButtonBean();
@@ -57 +57 @@
       download.setTitle("Download the contents of this file (" + bytes + ")");
       download.setIcon(jspContext.getRoot()+"/images/download.png");
+      download.setDynamicAttribute("data-file-id", f.getId());
+      download.setDynamicAttribute("data-auto-init", "download-file");
       
       actions = new ButtonAction[] { view, download };