[Jnode-svn-commits] SF.net SVN: jnode:[4644] trunk/gui/src/driver/org/jnode/driver/textscreen/ fb/FBConsole.java

[<ls...@us...>]

Revision: 4644
          http://jnode.svn.sourceforge.net/jnode/?rev=4644&view=rev
Author:   lsantha
Date:     2008-10-22 20:31:08 +0000 (Wed, 22 Oct 2008)

Log Message:
-----------
Fixed the startup of FBConsole.

Modified Paths:
--------------
    trunk/gui/src/driver/org/jnode/driver/textscreen/fb/FBConsole.java

Modified: trunk/gui/src/driver/org/jnode/driver/textscreen/fb/FBConsole.java
===================================================================
--- trunk/gui/src/driver/org/jnode/driver/textscreen/fb/FBConsole.java	2008-10-22 20:04:26 UTC (rev 4643)
+++ trunk/gui/src/driver/org/jnode/driver/textscreen/fb/FBConsole.java	2008-10-22 20:31:08 UTC (rev 4644)
@@ -6,15 +6,10 @@
 import org.jnode.driver.Device;
 import org.jnode.driver.DeviceManagerListener;
 import org.jnode.driver.DeviceUtils;
-import org.jnode.driver.console.ConsoleManager;
-import org.jnode.driver.console.TextConsole;
 import org.jnode.driver.textscreen.TextScreenManager;
 import org.jnode.driver.video.FrameBufferAPI;
 import org.jnode.driver.video.FrameBufferConfiguration;
 import org.jnode.naming.InitialNaming;
-import org.jnode.naming.NameSpaceListener;
-import org.jnode.shell.CommandShell;
-import org.jnode.shell.ShellManager;
 
 /**
  * @author Levente S\u00e1ntha
@@ -23,38 +18,15 @@
     private static final Logger log = Logger.getLogger(FBConsole.class);
 
     public static void start() throws Exception {
-        InitialNaming.addNameSpaceListener(ShellManager.NAME, new NameSpaceListener<ShellManager>() {
-
-            @Override
-            public void serviceBound(ShellManager service) {
-                try {
-                    shellManagerAvailable();
-                } catch (Exception e) {
-                    log.error(e);
-                }
-            }
-
-            @Override
-            public void serviceUnbound(ShellManager service) {
-                // nothing
-            }            
-        });
-    }
-    
-    private static void shellManagerAvailable() throws Exception {
-        Device dev = null;
         final Collection<Device> devs = DeviceUtils.getDevicesByAPI(FrameBufferAPI.class);
         int dev_count = devs.size();
         if (dev_count > 0) {
-            Device[] dev_a = devs.toArray(new Device[dev_count]);
-            dev = dev_a[0];
-        }
-
-        if (dev == null) {
+            startFBConsole(devs.iterator().next());
+        } else {
             DeviceUtils.getDeviceManager().addListener(new DeviceManagerListener() {
-
+                
                 public void deviceRegistered(Device device) {
-                    if (device.implementsAPI(FrameBufferAPI.class)) {                        
+                    if (device.implementsAPI(FrameBufferAPI.class)) {
                         startFBConsole(device);
                     }
                 }
@@ -63,11 +35,9 @@
                     // TODO stop the FBConsole
                 }
             });
-        } else {
-            startFBConsole(dev);
         }
     }
-    
+
     private static void startFBConsole(Device dev) {
         FbTextScreenManager fbTsMgr = null;
         try {
@@ -77,33 +47,12 @@
             fbTsMgr = new FbTextScreenManager(api, conf);
             InitialNaming.unbind(TextScreenManager.NAME);
             InitialNaming.bind(TextScreenManager.NAME, fbTsMgr);
-                            
-            //// FIXME we shouldn't need that code since command shell is already created elsewhere
-            // but without that code :
-            // - it's impossible to scroll nor to type anything that is displayed in the console
-            // - it's also impossible to switch between consoles
-            // NB : I have checked and the scrollUp/ScrollDown method are called properly 
-            ConsoleManager mgr = InitialNaming.lookup(ConsoleManager.NAME);
-            final TextConsole first = (TextConsole) mgr.getFocus();                
-            new CommandShell(first).run();
-//            CommandShell newShell = new CommandShell(first);
-//            CommandShell oldShell = (CommandShell) ShellUtils.getShellManager().registerMainShell(newShell);
-//            if (oldShell != null) {
-//                oldShell.consoleClosed(new ConsoleEvent(first));
-//            }
-//            
-//            newShell.run();
-            
-            Thread.sleep(60 * 1000);
-            //// end of FIXME
-            
         } catch (Throwable ex) {
             log.error("Error in FBConsole", ex);
-        } finally {
             if (fbTsMgr != null) {
                 log.info("Close graphics");
                 fbTsMgr.ownershipLost();
             }
-        }        
+        }
     }
 }


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