[Openrpg2 dev] SF.net SVN: openrpg:[104] trunk/src/openrpg2

[<sno...@us...>]

Revision: 104
          http://sourceforge.net/p/openrpg/svn/104
Author:   snowdog_
Date:     2013-09-23 02:22:54 +0000 (Mon, 23 Sep 2013)
Log Message:
-----------
Fixed Null Pointer Exception in ClientList

Modified Paths:
--------------
    trunk/src/openrpg2/common/core/group/GroupServerModule.java
    trunk/src/openrpg2/server/core/modules/clientlist/ClientList.java
    trunk/src/openrpg2/server/core/modules/clientlist/ClientListTableModel.java

Modified: trunk/src/openrpg2/common/core/group/GroupServerModule.java
===================================================================
--- trunk/src/openrpg2/common/core/group/GroupServerModule.java	2013-09-20 03:17:23 UTC (rev 103)
+++ trunk/src/openrpg2/common/core/group/GroupServerModule.java	2013-09-23 02:22:54 UTC (rev 104)
@@ -212,10 +212,12 @@
         switch(e.id){
             case(NetworkServerModule.EVENT_CLIENT_JOIN):{ 
                 groupManager.clientConnect(cid);
+                sendEventChanged();
                 break;
             }
             case(NetworkServerModule.EVENT_CLIENT_DISCONNECT):{ 
                 groupManager.clientDisconnect(cid);
+                sendEventChanged();
                 break;
             }
 

Modified: trunk/src/openrpg2/server/core/modules/clientlist/ClientList.java
===================================================================
--- trunk/src/openrpg2/server/core/modules/clientlist/ClientList.java	2013-09-20 03:17:23 UTC (rev 103)
+++ trunk/src/openrpg2/server/core/modules/clientlist/ClientList.java	2013-09-23 02:22:54 UTC (rev 104)
@@ -44,8 +44,6 @@
         this.setModuleAuthor("Snowdog");
         this.setModuleShortDescription("Client List for Server");
         
-        this.dataSource = new ClientListTableModel(this.modCom);
-        
         buildGUI();
         
         log.info("Module Instanced.");
@@ -58,12 +56,9 @@
         
         table = new JTable(this.dataSource);
         
-        
         JScrollPane sp = new JScrollPane(table);
         table.setFillsViewportHeight(false);        
         panel.add(sp, BorderLayout.CENTER);
-        
-        
     }
 
     @Override
@@ -72,10 +67,15 @@
         this.modCom.registerEventInterest(this, GroupServerModule.class.getSimpleName(), GroupServerModule.EVENT_GROUPDATA_CHANGED);
         
     }
-
+    
     @Override
+    public void activate(){
+         this.dataSource = new ClientListTableModel(this.modCom);
+    }
+    
+    @Override
     public void notifyOfModuleEvent(ORPGEvent e) {
-        this.log.info("Got event notification "+e.src()+" i="+e.id);
+       // this.log.info("Got event notification "+e.src()+" i="+e.id);
         this.dataSource.updateData();
     }
     

Modified: trunk/src/openrpg2/server/core/modules/clientlist/ClientListTableModel.java
===================================================================
--- trunk/src/openrpg2/server/core/modules/clientlist/ClientListTableModel.java	2013-09-20 03:17:23 UTC (rev 103)
+++ trunk/src/openrpg2/server/core/modules/clientlist/ClientListTableModel.java	2013-09-23 02:22:54 UTC (rev 104)
@@ -35,8 +35,9 @@
     
     
     public void updateData(){
+        if( this.mc == null){ Logger.getLogger(ClientListTableModel.class.getName()).log(Level.SEVERE, "Module Communicator Reference NULL"); return; }
         try {
-             rowData = (ArrayList<HashMap>)this.mc.requestModuleAction("GroupServerModule", GroupServerModule.ACTION_GET_INFO, null);
+            rowData = (ArrayList<HashMap>)this.mc.requestModuleAction("GroupServerModule", GroupServerModule.ACTION_GET_INFO, null);
             
         } catch (NoSuchModuleException ex) {
             Logger.getLogger(ClientListTableModel.class.getName()).log(Level.SEVERE, ex.getMessage(), ex);

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.