language selector, bug fixed

[debian/openrocket] / src / net / sf / openrocket / startup / Application.java

diff --git a/src/net/sf/openrocket/startup/Application.java b/src/net/sf/openrocket/startup/Application.java
index 876e1c0cca03bf161ed8ef1b8f27d22a663496a9..a7847d32b82692e6bbc04ca3fc1d73915e24a7e6 100644 (file)
--- a/src/net/sf/openrocket/startup/Application.java
+++ b/src/net/sf/openrocket/startup/Application.java
@@ -1,33 +1,127 @@
 package net.sf.openrocket.startup;
 
-import net.sf.openrocket.logging.DelegatorLogger;
+import net.sf.openrocket.database.ThrustCurveMotorSetDatabase;
+import net.sf.openrocket.l10n.ClassBasedTranslator;
+import net.sf.openrocket.l10n.DebugTranslator;
+import net.sf.openrocket.l10n.ExceptionSuppressingTranslator;
+import net.sf.openrocket.l10n.Translator;
 import net.sf.openrocket.logging.LogHelper;
+import net.sf.openrocket.logging.LogLevel;
+import net.sf.openrocket.logging.LogLevelBufferLogger;
+import net.sf.openrocket.logging.PrintStreamLogger;
 
 /**
- * A class that provides singleton instances / beans for other
- * classes to utilize.
+ * A class that provides singleton instances / beans for other classes to utilize.
  * 
  * @author Sampo Niskanen <sampo.niskanen@iki.fi>
  */
 public final class Application {
        
-       private static DelegatorLogger logger = null;
+       private static LogHelper logger;
+       private static LogLevelBufferLogger logBuffer;
+       
+       private static Translator baseTranslator = new DebugTranslator(null);
+       
+       private static ThrustCurveMotorSetDatabase motorSetDatabase;
+       
 
-       public static LogHelper getLogHelper() {
-               if (logger == null) {
-                       initializeLogging();
-               }
+       // Initialize the logger to something sane for testing without executing Startup
+       static {
+               setLogOutputLevel(LogLevel.DEBUG);
+       }
+       
+       
+       /**
+        * Retrieve the logger to be used in logging.  By default this returns
+        * a logger that outputs to stdout/stderr even if not separately initialized,
+        * useful for development and debugging.
+        */
+       public static LogHelper getLogger() {
                return logger;
        }
        
+       /**
+        * Set the logger to be used in logging.  Note that calling this will only have effect
+        * on not-yet loaded classes, as the instance is stored in a static variable.
+        */
+       public static void setLogger(LogHelper logger) {
+               Application.logger = logger;
+       }
+       
+       
+
+       /**
+        * Return the log buffer.
+        * 
+        * @return the logBuffer or null if not initialized
+        */
+       public static LogLevelBufferLogger getLogBuffer() {
+               return logBuffer;
+       }
+       
+       /**
+        * Set the log buffer logger.  The logger must be separately configured
+        * to receive the logging.
+        */
+       public static void setLogBuffer(LogLevelBufferLogger logBuffer) {
+               Application.logBuffer = logBuffer;
+       }
+       
        
        /**
-        * Initializes the logging system and populates logHelper.
+        * Set the logging to output the specified log level and upwards to standard output.
+        * 
+        * @param level         the minimum logging level to output.
         */
-       private static void initializeLogging() {
-               logger = new DelegatorLogger();
+       public static void setLogOutputLevel(LogLevel level) {
+               logger = new PrintStreamLogger();
+               for (LogLevel l : LogLevel.values()) {
+                       if (l.atLeast(level)) {
+                               ((PrintStreamLogger) logger).setOutput(l, System.out);
+                       }
+               }
                
+       }
+       
+       
+       /**
+        * Return the translator to use for obtaining translated strings.
+        * @return      a translator.
+        */
+       public static Translator getTranslator() {
+               if (baseTranslator instanceof DebugTranslator) {
+                       return baseTranslator;
+               }
                
+               Translator t = baseTranslator;
+               t = new ClassBasedTranslator(t, 1);
+               t = new ExceptionSuppressingTranslator(t);
+               return t;
+       }
+       
+       /**
+        * Set the translator used in obtaining translated strings.
+        * @param translator    the translator to set.
+        */
+       public static void setBaseTranslator(Translator translator) {
+               Application.baseTranslator = translator;
        }
        
+       
+
+       /**
+        * Return the database of all thrust curves loaded into the system.
+        */
+       public static ThrustCurveMotorSetDatabase getMotorSetDatabase() {
+               return motorSetDatabase;
+       }
+       
+       /**
+        * Set the database of thrust curves loaded into the system.
+        */
+       public static void setMotorSetDatabase(ThrustCurveMotorSetDatabase motorSetDatabase) {
+               Application.motorSetDatabase = motorSetDatabase;
+       }
+       
+
 }