[Phex-svn] SF.net SVN: phex:[4488] phex/trunk/src/main/java/phex/utils

[<Ar...@us...>]

Revision: 4488
          http://phex.svn.sourceforge.net/phex/?rev=4488&view=rev
Author:   ArneBab
Date:     2009-09-21 23:44:47 +0000 (Mon, 21 Sep 2009)

Log Message:
-----------
python interpreter: Added a quit and a help command. Quit currently doesn't work in headless mode, though.

Modified Paths:
--------------
    phex/trunk/src/main/java/phex/utils/JythonInterpreter.java
    phex/trunk/src/main/java/phex/utils/Localizer.java

Modified: phex/trunk/src/main/java/phex/utils/JythonInterpreter.java
===================================================================
--- phex/trunk/src/main/java/phex/utils/JythonInterpreter.java	2009-09-21 13:41:01 UTC (rev 4487)
+++ phex/trunk/src/main/java/phex/utils/JythonInterpreter.java	2009-09-21 23:44:47 UTC (rev 4488)
@@ -25,17 +25,19 @@
 
     public void startConsole() {
         // System.out.println("Hello");
-        // offer a servent object for controlling Phex
+	// First add some info as __doc__ string
+	interp.push("__doc__ = 'The Phex Python interpreter. To get a list of available commands, please call help().'");
+        // offer a servent and a server object for controlling Phex
         interp.push("from phex.servent import Servent");
         interp.push("servent = Servent.getInstance()");
-        // get a way to shut down
         interp.push("from phex.net.server import OIOServer");
         interp.push("server = OIOServer( servent )");
-	// interp.push("from phex.gui.actions import ExitPhexAction");
-	// interp.push("ex = ExitPhexAction()");
-	// interp.push("shutdown = ex.shutdown")
-        // interp.push("shutdown = server.shutdown");
+	interp.push("from phex.gui.common import GUIRegistry");
+	// A quit action. BUG: Only works in GUI mode. TODO: Create a function which also works in headless mode. 
+	interp.push("quit = GUIRegistry.getInstance().getGlobalAction( GUIRegistry.EXIT_PHEX_ACTION).shutdown");
+	interp.push("help = dir");
+	// interp.push("quit = servent.stop");
         // Now start the interactive console
-        interp.interact("Hello from console. Call dir() for available commands.", null);
+        interp.interact("Hello from console. Call help() for available commands.", null);
     }
 }

Modified: phex/trunk/src/main/java/phex/utils/Localizer.java
===================================================================
--- phex/trunk/src/main/java/phex/utils/Localizer.java	2009-09-21 13:41:01 UTC (rev 4487)
+++ phex/trunk/src/main/java/phex/utils/Localizer.java	2009-09-21 23:44:47 UTC (rev 4488)
@@ -225,7 +225,7 @@
             value = defaultLangKeyMap.get( key );
             if ( value == null )
             {
-                NLogger.error( Localizer.class, "Missing language key: " + key );
+                // NLogger.error( Localizer.class, "Missing language key: " + key );
                 value = key;
             }
         } else if ( value.replace(" ","").length() == 0 )
@@ -234,7 +234,7 @@
             value = defaultLangKeyMap.get( key );
             if ( value == null )
             {
-                NLogger.error( Localizer.class, "Missing language key: " + key );
+                // NLogger.error( Localizer.class, "Missing language key: " + key );
                 value = key;
             }
         }
@@ -276,7 +276,7 @@
                 lookupValue = defaultLangKeyMap.get( key );
             }
             if ( lookupValue == null) {
-                NLogger.info(Localizer.class, "Missing language key: " + key );
+                // NLogger.info(Localizer.class, "Missing language key: " + key );
                 value = key;
             } else {
                 value = MessageFormat.format( lookupValue, obj );
@@ -287,7 +287,7 @@
             // The string is not internacionalized
             lookupValue = defaultLangKeyMap.get( key );
             if ( lookupValue == null) {
-                NLogger.info(Localizer.class, "Missing language key: " + key );
+                // NLogger.info(Localizer.class, "Missing language key: " + key );
                 value = key;
             } else {
                 value = MessageFormat.format( lookupValue, obj );
@@ -380,4 +380,4 @@
         }
         return langKeyMapTmp;
     }
-}
\ No newline at end of file
+}


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