[Mc4j-cvs] mc4j/src/org/mc4j/console/bean/notification/tracker NotificationTracker.java,1.4,1.5

[Greg H. <gh...@us...>]

Update of /cvsroot/mc4j/mc4j/src/org/mc4j/console/bean/notification/tracker
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20162/src/org/mc4j/console/bean/notification/tracker

Modified Files:
	NotificationTracker.java 
Log Message:
Merging EMS into head for the 2.0 release work

Index: NotificationTracker.java
===================================================================
RCS file: /cvsroot/mc4j/mc4j/src/org/mc4j/console/bean/notification/tracker/NotificationTracker.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** NotificationTracker.java	5 Oct 2004 05:15:56 -0000	1.4
--- NotificationTracker.java	12 Apr 2006 19:14:01 -0000	1.5
***************
*** 17,25 ****
  package org.mc4j.console.bean.notification.tracker;
  
  import org.openide.windows.Mode;
  import org.openide.windows.TopComponent;
  import org.openide.windows.WindowManager;
  
- import javax.management.Notification;
  import javax.swing.*;
  import javax.swing.table.DefaultTableModel;
--- 17,25 ----
  package org.mc4j.console.bean.notification.tracker;
  
+ import org.mc4j.ems.connection.bean.notification.EmsNotificationEvent;
  import org.openide.windows.Mode;
  import org.openide.windows.TopComponent;
  import org.openide.windows.WindowManager;
  
  import javax.swing.*;
  import javax.swing.table.DefaultTableModel;
***************
*** 78,89 ****
      }
  
!     public void addNotification(Notification notif) {
          // message, sequence #, source, timestamp, type, userdata
          this.model.addRow(
              new Object[] {
                  notif.getMessage(),
!                 new Long(notif.getSequenceNumber()),
                  notif.getSource(),
!                 new Long(notif.getTimeStamp()),
                  notif.getType(),
                  notif.getUserData()
--- 78,89 ----
      }
  
!     public void addNotification(EmsNotificationEvent notif) {
          // message, sequence #, source, timestamp, type, userdata
          this.model.addRow(
              new Object[] {
                  notif.getMessage(),
!                 notif.getSequenceNumber(),
                  notif.getSource(),
!                 notif.getTimeStamp(),
                  notif.getType(),
                  notif.getUserData()