Révision 448
| tmp/org.txm.core/src/java/org/txm/Toolbox.java (revision 448) | ||
|---|---|---|
| 56 | 56 |
* |
| 57 | 57 |
* It initialize its engines Service |
| 58 | 58 |
* |
| 59 |
* @author mdecorde, sjacquot |
|
| 59 |
* @author mdecorde |
|
| 60 |
* @author sjacquot |
|
| 61 |
* |
|
| 60 | 62 |
*/ |
| 61 | 63 |
public class Toolbox {
|
| 62 | 64 |
|
| ... | ... | |
| 117 | 119 |
} |
| 118 | 120 |
|
| 119 | 121 |
/** |
| 120 |
* Use TXMPreferences.getString(TBXPreferences.PREFERENCES_NODE, key) instead
|
|
| 122 |
* Use TXMPreferences.getString(key, TBXPreferences.PREFERENCES_NODE) instead
|
|
| 121 | 123 |
* |
| 122 | 124 |
* @param key |
| 123 | 125 |
* @return |
| 124 | 126 |
*/ |
| 125 | 127 |
@Deprecated |
| 126 | 128 |
public static String getParam(String key) {
|
| 127 |
return TXMPreferences.getString(TBXPreferences.PREFERENCES_NODE, key);
|
|
| 129 |
return TXMPreferences.getString(key, TBXPreferences.PREFERENCES_NODE);
|
|
| 128 | 130 |
} |
| 129 | 131 |
|
| 130 | 132 |
/** |
| ... | ... | |
| 177 | 179 |
state = startWorkspace(); |
| 178 | 180 |
|
| 179 | 181 |
Log.warning("Initializing logger");
|
| 180 |
Log.setLevel(Level.parse(TXMPreferences.getString(TBXPreferences.PREFERENCES_NODE, TBXPreferences.LOG_LEVEL)));
|
|
| 181 |
Log.setPrintInConsole(Boolean.parseBoolean(TXMPreferences.getString(TBXPreferences.PREFERENCES_NODE, TBXPreferences.ADD_TECH_LOGS)));
|
|
| 182 |
Log.setLevel(Level.parse(TXMPreferences.getString(TBXPreferences.LOG_LEVEL, TBXPreferences.PREFERENCES_NODE)));
|
|
| 183 |
Log.setPrintInConsole(Boolean.parseBoolean(TXMPreferences.getString(TBXPreferences.ADD_TECH_LOGS, TBXPreferences.PREFERENCES_NODE)));
|
|
| 182 | 184 |
|
| 183 |
if (TXMPreferences.getString(TBXPreferences.PREFERENCES_NODE, TBXPreferences.LOG_DIR) != null)
|
|
| 184 |
Log.setPrintInFile(Boolean.parseBoolean(TXMPreferences.getString(TBXPreferences.PREFERENCES_NODE, TBXPreferences.LOG_IN_FILE)), new File(TXMPreferences.getString(TBXPreferences.PREFERENCES_NODE, TBXPreferences.LOG_DIR)));
|
|
| 185 |
if (!TXMPreferences.getString(TBXPreferences.LOG_DIR, TBXPreferences.PREFERENCES_NODE).isEmpty())
|
|
| 186 |
Log.setPrintInFile(Boolean.parseBoolean(TXMPreferences.getString(TBXPreferences.LOG_IN_FILE, TBXPreferences.PREFERENCES_NODE)), new File(TXMPreferences.getString(TBXPreferences.LOG_DIR, TBXPreferences.PREFERENCES_NODE)));
|
|
| 185 | 187 |
else |
| 186 |
Log.setPrintInFile(Boolean.parseBoolean(TXMPreferences.getString(TBXPreferences.PREFERENCES_NODE, TBXPreferences.LOG_IN_FILE)));
|
|
| 188 |
Log.setPrintInFile(Boolean.parseBoolean(TXMPreferences.getString(TBXPreferences.LOG_IN_FILE, TBXPreferences.PREFERENCES_NODE)));
|
|
| 187 | 189 |
|
| 188 | 190 |
} catch (Exception e) {
|
| 189 | 191 |
initializing = false; |
| ... | ... | |
| 443 | 445 |
private static boolean startWorkspace() {
|
| 444 | 446 |
try {
|
| 445 | 447 |
System.out.println("Starting workspace...");
|
| 446 |
String txmhome = TXMPreferences.getString(TBXPreferences.PREFERENCES_NODE, TBXPreferences.USER_TXM_HOME);
|
|
| 448 |
String txmhome = TXMPreferences.getString(TBXPreferences.USER_TXM_HOME, TBXPreferences.PREFERENCES_NODE);
|
|
| 447 | 449 |
if (txmhome.length() == 0) {
|
| 448 | 450 |
state = false; |
| 449 | 451 |
return false; |
| 450 | 452 |
} |
| 451 |
String location = TXMPreferences.getString(TBXPreferences.PREFERENCES_NODE, TBXPreferences.WORKSPACE_LOCATION);
|
|
| 453 |
String location = TXMPreferences.getString(TBXPreferences.WORKSPACE_LOCATION, TBXPreferences.PREFERENCES_NODE);
|
|
| 452 | 454 |
|
| 453 | 455 |
//System.out.println("Toolbox.startWorkspace(): workspace location = " + location);
|
| 454 | 456 |
|
| ... | ... | |
| 470 | 472 |
//System.out.println(TXMCoreMessages.DONE); |
| 471 | 473 |
} |
| 472 | 474 |
} catch (Exception e) {
|
| 473 |
System.err.println(TXMCoreMessages.Toolbox_workspace_init_failed + TXMPreferences.getString(TBXPreferences.PREFERENCES_NODE, TBXPreferences.WORKSPACE_LOCATION));
|
|
| 475 |
System.err.println(TXMCoreMessages.Toolbox_workspace_init_failed + TXMPreferences.getString(TBXPreferences.WORKSPACE_LOCATION, TBXPreferences.PREFERENCES_NODE));
|
|
| 474 | 476 |
Log.severe(TXMCoreMessages.Toolbox_15 + Log.toString(e)); |
| 475 | 477 |
Log.printStackTrace(e); |
| 476 | 478 |
state = false; |
Formats disponibles : Unified diff