[Mp-plugins-svn] SF.net SVN: mp-plugins:[4114] trunk/plugins/MP4IPSymcon/MP4IPSymcon

[<ste...@us...>]

Revision: 4114
          http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=4114&view=rev
Author:   steve44src
Date:     2011-02-15 15:48:50 +0000 (Tue, 15 Feb 2011)

Log Message:
-----------


Modified Paths:
--------------
    trunk/plugins/MP4IPSymcon/MP4IPSymcon/IPSWindow.cs
    trunk/plugins/MP4IPSymcon/MP4IPSymcon/IPSWindowManager.cs
    trunk/plugins/MP4IPSymcon/MP4IPSymcon/JumpClickHandler.cs
    trunk/plugins/MP4IPSymcon/MP4IPSymcon/MP4IPSymcon.csproj

Modified: trunk/plugins/MP4IPSymcon/MP4IPSymcon/IPSWindow.cs
===================================================================
--- trunk/plugins/MP4IPSymcon/MP4IPSymcon/IPSWindow.cs	2011-02-15 15:20:35 UTC (rev 4113)
+++ trunk/plugins/MP4IPSymcon/MP4IPSymcon/IPSWindow.cs	2011-02-15 15:48:50 UTC (rev 4114)
@@ -121,15 +121,18 @@
                             if( !IPSWindowManager.getIPSWindowManager().hasWindow(oid) ) {
                                 Log.Debug("Creating new IPS Window ({0},'{1}')", oid, fmt);
                                 IPSWindow ipswin = new IPSWindow( oid, fmt);
-                                GUIWindow window = (GUIWindow)ipswin;
-                                GUIWindowManager.Add(ref window);
                                 if( ipswin.Init() ) {
+                                    GUIWindow window = (GUIWindow)ipswin;
+                                    GUIWindowManager.Add(ref window);
                                     IPSWindowManager.getIPSWindowManager().registerWindow(oid,ipswin);
-                                	Log.Debug("Adding window to known IPS Windows");
                                 } else {
                                 	Log.Error("Error when calling init");
                                 }
-                            } 
+                            } else {
+                                IPSWindow ipswin = IPSWindowManager.getIPSWindowManager().getWindowById(oid);
+                                GUIWindow window = (GUIWindow)ipswin;
+                                GUIWindowManager.Add(ref window);
+                            }
      
                             // add handler that jumps to another page.
     			          	Log.Info( "creating JumpHandler {0}", oid );

Modified: trunk/plugins/MP4IPSymcon/MP4IPSymcon/IPSWindowManager.cs
===================================================================
--- trunk/plugins/MP4IPSymcon/MP4IPSymcon/IPSWindowManager.cs	2011-02-15 15:20:35 UTC (rev 4113)
+++ trunk/plugins/MP4IPSymcon/MP4IPSymcon/IPSWindowManager.cs	2011-02-15 15:48:50 UTC (rev 4114)
@@ -17,6 +17,7 @@
     /// </summary>
     public class IPSWindowManager
     {
+        static Logger Log = LoggerFactory.getLogger("IPSWindowManager");
         public IPSWindowManager()
         {
         }
@@ -33,7 +34,11 @@
         }
         
         public void registerWindow( int oid, IPSWindow win ) {
+            Log.Debug("register window {0} -> {1}", oid, win );
             ipsWindows[oid] = win;
+            foreach( int i in ipsWindows.Keys ) {
+                Log.Debug("known windows {0} -> {1}", i, ipsWindows[i] );
+            }
         }
         
         public IPSWindow getWindowById( int id ) {

Modified: trunk/plugins/MP4IPSymcon/MP4IPSymcon/JumpClickHandler.cs
===================================================================
--- trunk/plugins/MP4IPSymcon/MP4IPSymcon/JumpClickHandler.cs	2011-02-15 15:20:35 UTC (rev 4113)
+++ trunk/plugins/MP4IPSymcon/MP4IPSymcon/JumpClickHandler.cs	2011-02-15 15:48:50 UTC (rev 4114)
@@ -7,6 +7,7 @@
 {
     class JumpClickHandler : ClickHandler
     {
+        static Logger Log = LoggerFactory.getLogger("JumpClickHandler");
         private int id;
 
         public JumpClickHandler(int id) {
@@ -21,6 +22,7 @@
             }
             else
             {
+                Log.Debug("Jumping to win {0}", id );
                 GUIWindowManager.ActivateWindow(id,true);
             }
         }

Modified: trunk/plugins/MP4IPSymcon/MP4IPSymcon/MP4IPSymcon.csproj
===================================================================
--- trunk/plugins/MP4IPSymcon/MP4IPSymcon/MP4IPSymcon.csproj	2011-02-15 15:20:35 UTC (rev 4113)
+++ trunk/plugins/MP4IPSymcon/MP4IPSymcon/MP4IPSymcon.csproj	2011-02-15 15:48:50 UTC (rev 4114)
@@ -76,6 +76,7 @@
     <Compile Include="Instance.cs" />
     <Compile Include="IPSObject.cs" />
     <Compile Include="IPSWindow.cs" />
+    <Compile Include="IPSWindowManager.cs" />
     <Compile Include="JumpClickHandler.cs" />
     <Compile Include="LabelObserver.cs" />
     <Compile Include="Logger.cs" />


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