392 if (result == NULL) { |
392 if (result == NULL) { |
393 return NULL; |
393 return NULL; |
394 } |
394 } |
395 |
395 |
396 if (UsePListForConfigFile() == false) { |
396 if (UsePListForConfigFile() == false) { |
397 if (result->LoadFromFile(FileName) == false) { |
397 result->LoadFromFile(FileName); |
398 // New property file format was not found, |
|
399 // attempt to load old property file format. |
|
400 Helpers::LoadOldConfigFile(FileName, result); |
|
401 } |
|
402 } else { |
398 } else { |
403 NSBundle *mainBundle = [NSBundle mainBundle]; |
399 NSBundle *mainBundle = [NSBundle mainBundle]; |
404 NSDictionary *infoDictionary = [mainBundle infoDictionary]; |
400 NSDictionary *infoDictionary = [mainBundle infoDictionary]; |
405 std::map<TString, TString> keys = GetKeys(); |
401 std::map<TString, TString> keys = GetKeys(); |
406 |
402 |
478 CONFIG_MAINCLASSNAME_KEY, _T("JavaMainClassName"))); |
474 CONFIG_MAINCLASSNAME_KEY, _T("JavaMainClassName"))); |
479 keys.insert(std::map<TString, TString>::value_type( |
475 keys.insert(std::map<TString, TString>::value_type( |
480 CONFIG_CLASSPATH_KEY, _T("JavaAppClasspath"))); |
476 CONFIG_CLASSPATH_KEY, _T("JavaAppClasspath"))); |
481 keys.insert(std::map<TString, TString>::value_type(APP_NAME_KEY, |
477 keys.insert(std::map<TString, TString>::value_type(APP_NAME_KEY, |
482 _T("CFBundleName"))); |
478 _T("CFBundleName"))); |
483 keys.insert(std::map<TString, TString>::value_type(CONFIG_APP_ID_KEY, |
|
484 _T("JavaPreferencesID"))); |
|
485 keys.insert(std::map<TString, TString>::value_type(JAVA_RUNTIME_KEY, |
479 keys.insert(std::map<TString, TString>::value_type(JAVA_RUNTIME_KEY, |
486 _T("JavaRuntime"))); |
480 _T("JavaRuntime"))); |
487 keys.insert(std::map<TString, TString>::value_type(JPACKAGE_APP_DATA_DIR, |
481 keys.insert(std::map<TString, TString>::value_type(JPACKAGE_APP_DATA_DIR, |
488 _T("CFBundleIdentifier"))); |
482 _T("CFBundleIdentifier"))); |
489 |
483 |