From 7ea9ea84ee4dba7b3e790615a4bd5b2dfb8ab693 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ren=C3=A9=20Bock?= Date: Wed, 3 Dec 2014 18:45:18 +0100 Subject: [PATCH] Made some methods/fields protected in order to be able to override fixJDBCDictionary in a subclass of ERXModelGroup --- .../Sources/er/extensions/eof/ERXModelGroup.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Frameworks/Core/ERExtensions/Sources/er/extensions/eof/ERXModelGroup.java b/Frameworks/Core/ERExtensions/Sources/er/extensions/eof/ERXModelGroup.java index e30e8f119ac..b0702d6d4a3 100644 --- a/Frameworks/Core/ERExtensions/Sources/er/extensions/eof/ERXModelGroup.java +++ b/Frameworks/Core/ERExtensions/Sources/er/extensions/eof/ERXModelGroup.java @@ -147,7 +147,7 @@ public class ERXModelGroup extends EOModelGroup { protected NSArray _modelLoadOrder = ERXProperties.componentsSeparatedByStringWithDefault("er.extensions.ERXModelGroup.modelLoadOrder", ",", NSArray.EmptyArray); - private boolean raiseOnUnmatchingConnectionDictionaries = ERXProperties.booleanForKeyWithDefault("er.extensions.ERXModelGroup.raiseOnUnmatchingConnectionDictionaries", true); + protected boolean raiseOnUnmatchingConnectionDictionaries = ERXProperties.booleanForKeyWithDefault("er.extensions.ERXModelGroup.raiseOnUnmatchingConnectionDictionaries", true); /** * Notification that is sent when the model group was created form the bundle loading. @@ -652,7 +652,7 @@ public void modelAddedHandler(NSNotification n) { resetConnectionDictionaryInModel(model); } - private static String getProperty(String key, String alternateKey, String defaultValue) { + protected static String getProperty(String key, String alternateKey, String defaultValue) { String value = ERXProperties.stringForKey(key); if (value == null) { value = ERXProperties.stringForKey(alternateKey); @@ -663,11 +663,11 @@ private static String getProperty(String key, String alternateKey, String defaul return value; } - private static String getProperty(String key, String alternateKey) { + protected static String getProperty(String key, String alternateKey) { return getProperty(key, alternateKey, null); } - private static String decryptProperty(String key, String alternateKey) { + protected static String decryptProperty(String key, String alternateKey) { String value = ERXProperties.decryptedStringForKey(key); if (value == null) { value = ERXProperties.decryptedStringForKey(alternateKey);