[MMBASE CVS] applications/media/src/org/mmbase/applications/media/builders MediaProviders.java

[Michiel Meeuwissen]

Update of /var/cvs/applications/media/src/org/mmbase/applications/media/builders
In directory james.mmbase.org:/tmp/cvs-serv24142

Modified Files:
        MediaProviders.java 
Log Message:
Using the actual url in the gui function too


See also: 
http://cvs.mmbase.org/viewcvs/applications/media/src/org/mmbase/applications/media/builders


Index: MediaProviders.java
===================================================================
RCS file: 
/var/cvs/applications/media/src/org/mmbase/applications/media/builders/MediaProviders.java,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -b -r1.16 -r1.17
--- MediaProviders.java 16 Apr 2009 13:28:21 -0000      1.16
+++ MediaProviders.java 17 Apr 2009 19:45:18 -0000      1.17
@@ -26,7 +26,7 @@
  * be online/offline.
  *
 * @author Michiel Meeuwissen
- * @version $Id: MediaProviders.java,v 1.16 2009/04/16 13:28:21 michiel Exp $
+ * @version $Id: MediaProviders.java,v 1.17 2009/04/17 19:45:18 michiel Exp $
  * @since MMBase-1.7
  */
 public class MediaProviders extends MMObjectBuilder {
@@ -37,10 +37,11 @@
 
 
     {
-        addFunction(new NodeFunction<String>("url", new Parameter[] { 
Parameter.REQUEST, Parameter.CLOUD }) {
+        final NodeFunction urlFunction = new NodeFunction<String>("url", new 
Parameter[] { Parameter.REQUEST, Parameter.CLOUD }) {
                 {
                     setDescription("");
                 }
+            @Override
                 public String getFunctionValue(Node node, Parameters 
parameters) {
                     String protocol = node.getStringValue("protocol");
                     String host = node.getStringValue("host");
@@ -52,6 +53,17 @@
                         return protocol + "://" + host + rootpath;
                     }
                 }
+        };
+        addFunction(urlFunction);
+
+
+        addFunction(new GuiFunction() {
+                @Override
+                public String getFunctionValue(Node node, Parameters 
parameters) {
+                    Parameters urlParams = urlFunction.createParameters();
+                    urlParams.setAllIfDefined(parameters);
+                    return node.getStringValue("name") + " " + 
urlFunction.getFunctionValue(urlParams);
+                }
             });
     }
 
@@ -89,9 +101,5 @@
     }
 
 
-    @Override
-    protected String getNodeGUIIndicator(MMObjectNode node, 
org.mmbase.util.functions.Parameters params) {
-        return node.getStringValue("name") + " " + 
node.getStringValue("protocol") + "://" + node.getStringValue("host") + 
node.getStringValue("rootpath");
-    }
 
 }
_______________________________________________
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs