From portal-commits at lists.jboss.org Mon Mar 17 12:22:01 2008
Content-Type: multipart/mixed; boundary="===============2584781255971018535=="
MIME-Version: 1.0
From: portal-commits at lists.jboss.org
To: portal-commits at lists.jboss.org
Subject: [portal-commits] JBoss Portal SVN: r10295 - in
 modules/portlet/trunk/portal/src/main/java/org/jboss/portal/portlet/portal:
 jsp and 1 other directory.
Date: Mon, 17 Mar 2008 12:22:01 -0400
Message-ID: <E1JbI65-00054Y-KD@committer01.frg.pub.inap.atl.jboss.com>

--===============2584781255971018535==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: julien(a)jboss.com
Date: 2008-03-17 12:22:01 -0400 (Mon, 17 Mar 2008)
New Revision: 10295

Modified:
   modules/portlet/trunk/portal/src/main/java/org/jboss/portal/portlet/port=
al/admin/ui/DebuggerPortlet.java
   modules/portlet/trunk/portal/src/main/java/org/jboss/portal/portlet/port=
al/jsp/EventRoute.java
   modules/portlet/trunk/portal/src/main/java/org/jboss/portal/portlet/port=
al/jsp/PageEventControllerContext.java
Log:
updated debugger portlet

Modified: modules/portlet/trunk/portal/src/main/java/org/jboss/portal/portl=
et/portal/admin/ui/DebuggerPortlet.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/portal/src/main/java/org/jboss/portal/portlet/por=
tal/admin/ui/DebuggerPortlet.java	2008-03-17 16:11:26 UTC (rev 10294)
+++ modules/portlet/trunk/portal/src/main/java/org/jboss/portal/portlet/por=
tal/admin/ui/DebuggerPortlet.java	2008-03-17 16:22:01 UTC (rev 10295)
@@ -60,10 +60,11 @@
 =

    private void printRoute(EventRoute route, PrintWriter writer)
    {
-      writer.print("<div>Event name: " + route.getSource().getName().getLo=
calPart() + "</div>\n");
-      writer.print("<div>Source: " + route.getSource().getWindowId() + "</=
div>\n");
-      writer.print("<div>Destination: " + route.getDestination().getWindow=
Id() + "</div>\n");
-      writer.print("<div>Acknowledgement: " + route.getAcknowledgment() + =
"</div>\n");
+      writer.print("<div>Event name: " + route.getName().getLocalPart() + =
"</div>\n");
+      writer.print("<div>Event payload: " + route.getPayload() + "</div>\n=
");
+      writer.print("<div>Source: " + route.getSource() + "</div>\n");
+      writer.print("<div>Destination: " + route.getDestination() + "</div>=
\n");
+      writer.print("<div>Acknowledgement: " + route.getAcknowledgement() +=
 "</div>\n");
       writer.print("<ul>\n");
       for (EventRoute child : route.getChildren())
       {

Modified: modules/portlet/trunk/portal/src/main/java/org/jboss/portal/portl=
et/portal/jsp/EventRoute.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/portal/src/main/java/org/jboss/portal/portlet/por=
tal/jsp/EventRoute.java	2008-03-17 16:11:26 UTC (rev 10294)
+++ modules/portlet/trunk/portal/src/main/java/org/jboss/portal/portlet/por=
tal/jsp/EventRoute.java	2008-03-17 16:22:01 UTC (rev 10295)
@@ -24,8 +24,10 @@
 =

 import org.jboss.portal.portlet.controller.event.Event;
 =

+import javax.xml.namespace.QName;
 import java.util.LinkedList;
 import java.util.List;
+import java.io.Serializable;
 =

 /**
  * @author <a href=3D"mailto:julien(a)jboss-portal.org">Julien Viet</a>
@@ -38,25 +40,43 @@
    private final EventRoute parent;
 =

    /** . */
-   private final Event source;
+   private final QName name;
 =

    /** . */
-   private final Event destination;
+   private final Serializable payload;
 =

    /** . */
+   private final String source;
+
+   /** . */
+   private final String destination;
+
+   /** . */
    final LinkedList<EventRoute> children;
 =

    /** . */
    EventAcknowledgement acknowledgement;
 =

-   public EventRoute(EventRoute parent, Event source, Event destination)
+   public EventRoute(EventRoute parent, QName name, Serializable payload, =
String source, String destination)
    {
       this.parent =3D parent;
+      this.name =3D name;
+      this.payload =3D payload;
       this.source =3D source;
       this.destination =3D destination;
       this.children =3D new LinkedList<EventRoute>();
    }
 =

+   public String getSource()
+   {
+      return source;
+   }
+
+   public String getDestination()
+   {
+      return destination;
+   }
+
    public EventRoute getParent()
    {
       return parent;
@@ -67,17 +87,17 @@
       return children;
    }
 =

-   public Event getSource()
+   public QName getName()
    {
-      return source;
+      return name;
    }
 =

-   public Event getDestination()
+   public Serializable getPayload()
    {
-      return destination;
+      return payload;
    }
 =

-   public EventAcknowledgement getAcknowledgment()
+   public EventAcknowledgement getAcknowledgement()
    {
       return acknowledgement;
    }

Modified: modules/portlet/trunk/portal/src/main/java/org/jboss/portal/portl=
et/portal/jsp/PageEventControllerContext.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/portal/src/main/java/org/jboss/portal/portlet/por=
tal/jsp/PageEventControllerContext.java	2008-03-17 16:11:26 UTC (rev 10294)
+++ modules/portlet/trunk/portal/src/main/java/org/jboss/portal/portlet/por=
tal/jsp/PageEventControllerContext.java	2008-03-17 16:22:01 UTC (rev 10295)
@@ -94,15 +94,15 @@
                   Event destinationEvent =3D new Event(producedEvent.getNa=
me(), producedEvent.getPayload(), windowId);
 =

                   //
-                  EventRoute eventRoute;
+                  EventRoute eventRoute =3D new EventRoute(relatedRoute, p=
roducedEvent.getName(), producedEvent.getPayload(), producedEvent.getWindow=
Id(), destinationEvent.getWindowId());
+
+                  //
                   if (relatedRoute !=3D null)
                   {
-                     eventRoute =3D new EventRoute(relatedRoute, producedE=
vent, destinationEvent);
                      relatedRoute.children.add(eventRoute);
                   }
                   else
                   {
-                     eventRoute =3D new EventRoute(relatedRoute, producedE=
vent, destinationEvent);
                      roots.add(eventRoute);
                   }
 =



--===============2584781255971018535==--