Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Made some methods/fields protected ... #620

Merged
merged 1 commit into from
Dec 3, 2014
Merged

Made some methods/fields protected ... #620

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions Frameworks/Core/ERExtensions/Sources/er/extensions/eof/ERXModelGroup.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -147,7 +147,7 @@ public class ERXModelGroup extends EOModelGroup {

protected NSArray<String> _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.
Expand Down Expand Up @@ -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);
Expand All @@ -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);
Expand Down