You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cayenne.apache.org by aa...@apache.org on 2010/02/22 16:16:26 UTC
svn commit: r912604 - in
/cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne:
modeler/ pref/
Author: aadamchik
Date: Mon Feb 22 15:16:26 2010
New Revision: 912604
URL: http://svn.apache.org/viewvc?rev=912604&view=rev
Log:
formal code review, no real changes
Added:
cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/pref/PreferenceDecorator.java
- copied, changed from r912581, cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/pref/CayennePreferenceDecorator.java
Removed:
cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/pref/CayennePreferenceDecorator.java
Modified:
cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/Main.java
cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ModelerPreferences.java
cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/pref/CayennePreference.java
cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/pref/ChildrenMapPreference.java
cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/pref/PrefDetail.java
cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/pref/Preference.java
cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/pref/UpgradeCayennePreference.java
Modified: cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/Main.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/Main.java?rev=912604&r1=912603&r2=912604&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/Main.java (original)
+++ cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/Main.java Mon Feb 22 15:16:26 2010
@@ -17,7 +17,6 @@
* under the License.
****************************************************************/
-
package org.apache.cayenne.modeler;
import java.io.File;
@@ -48,7 +47,7 @@
*/
public class Main {
- private static Log logObj = LogFactory.getLog(Main.class);
+ private static Log logger = LogFactory.getLog(Main.class);
/**
* Main method that starts the CayenneModeler.
@@ -75,7 +74,9 @@
f = new File(f, Configuration.DEFAULT_DOMAIN_FILE);
}
- if (f.isFile() && f.getName().startsWith("cayenne") && f.getName().endsWith(".xml")) {
+ if (f.isFile()
+ && f.getName().startsWith("cayenne")
+ && f.getName().endsWith(".xml")) {
return f;
}
}
@@ -84,15 +85,21 @@
}
protected static File projectFileFromPrefs() {
- // This must be run after the application has already been bootstrapped. Otherwise, the returned
+ // This must be run after the application has already been bootstrapped.
+ // Otherwise, the returned
// app instance will be null.
-
- Preferences autoLoadPref = Application.getInstance().getPreferencesNode(ClassGenerationAction.class, "");
-
- if ((autoLoadPref != null) && (true == autoLoadPref.getBoolean(GeneralPreferences.AUTO_LOAD_PROJECT_PREFERENCE, false))) {
+
+ Preferences autoLoadPref = Application.getInstance().getPreferencesNode(
+ ClassGenerationAction.class,
+ "");
+
+ if ((autoLoadPref != null)
+ && (true == autoLoadPref.getBoolean(
+ GeneralPreferences.AUTO_LOAD_PROJECT_PREFERENCE,
+ false))) {
List<String> arr = ModelerPreferences.getLastProjFiles();
- if(arr.size()>0){
+ if (arr.size() > 0) {
return new File((String) arr.get(0));
}
}
@@ -100,7 +107,7 @@
}
protected void runModeler(final File projectFile) {
- logObj.info("Starting CayenneModeler.");
+ logger.info("Starting CayenneModeler.");
// set up UI
configureLookAndFeel();
@@ -117,7 +124,8 @@
File projectFileFromPrefs = projectFileFromPrefs();
if (null != projectFileFromPrefs) {
- OpenProjectAction action = new OpenProjectAction(Application.instance);
+ OpenProjectAction action = new OpenProjectAction(
+ Application.instance);
action.openProject(projectFileFromPrefs);
}
}
@@ -133,8 +141,8 @@
return true;
}
catch (Exception ex) {
- logObj.fatal("CayenneModeler requires JDK 1.5.");
- logObj.fatal("Found : '"
+ logger.fatal("CayenneModeler requires JDK 1.5.");
+ logger.fatal("Found : '"
+ System.getProperty("java.version")
+ "' at "
+ System.getProperty("java.home"));
@@ -154,10 +162,10 @@
* Configures Log4J appenders to perform logging to $HOME/.cayenne/modeler.log.
*/
protected void configureLogging() {
-
+
// get preferences
Preferences prefs = ModelerPreferences.getEditorPreferences();
-
+
// check whether to set up logging to a file
boolean logfileEnabled = prefs.getBoolean(
ModelerPreferences.EDITOR_LOGFILE_ENABLED,
@@ -167,9 +175,8 @@
if (logfileEnabled) {
String defaultPath = getLogFile().getPath();
- String logfilePath = prefs.get(
- ModelerPreferences.EDITOR_LOGFILE,
- defaultPath);
+ String logfilePath = prefs
+ .get(ModelerPreferences.EDITOR_LOGFILE, defaultPath);
try {
// use logfile from preferences or default
@@ -190,13 +197,10 @@
// remember working path
prefs.put(ModelerPreferences.EDITOR_LOGFILE, logfilePath);
-
- // TODO: andrus, 8/16/2006 - redirect STDOUT and STDERR to file??
- // TODO: andrus, 8/16/2006 - use Java logging API with comons-logging
}
}
catch (IOException ioex) {
- logObj.warn("Error setting logging - " + logfilePath, ioex);
+ logger.warn("Error setting logging - " + logfilePath, ioex);
}
}
}
@@ -231,7 +235,7 @@
if (PlasticLookAndFeel.class.isAssignableFrom(lf)) {
PlasticTheme foundTheme = themeWithName(themeName);
if (foundTheme == null) {
- logObj.warn("Could not set selected theme '"
+ logger.warn("Could not set selected theme '"
+ themeName
+ "' - using default '"
+ ModelerConstants.DEFAULT_THEME_NAME
@@ -249,7 +253,7 @@
UIManager.setLookAndFeel(lfName);
}
catch (Exception e) {
- logObj.warn("Could not set selected LookAndFeel '"
+ logger.warn("Could not set selected LookAndFeel '"
+ lfName
+ "' - using default '"
+ ModelerConstants.DEFAULT_LAF_NAME
Modified: cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ModelerPreferences.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ModelerPreferences.java?rev=912604&r1=912603&r2=912604&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ModelerPreferences.java (original)
+++ cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ModelerPreferences.java Mon Feb 22 15:16:26 2010
@@ -42,12 +42,12 @@
public class ModelerPreferences implements PreferenceChangeListener {
private static Preferences cayennePrefs;
-
+
private static final Log logObj = LogFactory.getLog(ModelerPreferences.class);
/** Name of the log file. */
public static final String LOGFILE_NAME = "modeler.log";
-
+
/** List of the last 12 opened project files. */
public static final int LAST_PROJ_FILES_SIZE = 12;
@@ -58,9 +58,9 @@
/** Log file */
public static final String EDITOR_LOGFILE_ENABLED = "logfileEnabled";
public static final String EDITOR_LOGFILE = "logfile";
-
+
/*
- * Number of items in combobox visible without scrolling
+ * Number of items in combobox visible without scrolling
*/
public static final int COMBOBOX_MAX_VISIBLE_SIZE = 12;
@@ -68,18 +68,19 @@
* Returns Cayenne preferences singleton.
*/
public static Preferences getPreferences() {
- if(cayennePrefs==null){
- Preference decoratedPref = new UpgradeCayennePreference(new CayennePreference());
+ if (cayennePrefs == null) {
+ Preference decoratedPref = new UpgradeCayennePreference(
+ new CayennePreference());
cayennePrefs = decoratedPref.getCayennePreference();
cayennePrefs.addPreferenceChangeListener(new ModelerPreferences());
}
return cayennePrefs;
}
-
+
public static Preferences getEditorPreferences() {
return getPreferences().node(CayennePreference.EDITOR);
}
-
+
public static Preferences getLastProjFilesPref() {
return getEditorPreferences().node(CayennePreference.LAST_PROJ_FILES);
}
@@ -94,10 +95,10 @@
catch (BackingStoreException e) {
logObj.warn("Error reading preferences file.", e);
}
- if(keys!=null){
+ if (keys != null) {
int len = keys.length;
- for(int i = 0; i< len; i++){
- arrayLastProjFiles.add(filesPrefs.get(keys[i], ""));
+ for (int i = 0; i < len; i++) {
+ arrayLastProjFiles.add(filesPrefs.get(keys[i], ""));
}
}
return arrayLastProjFiles;
Modified: cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/pref/CayennePreference.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/pref/CayennePreference.java?rev=912604&r1=912603&r2=912604&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/pref/CayennePreference.java (original)
+++ cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/pref/CayennePreference.java Mon Feb 22 15:16:26 2010
@@ -24,15 +24,12 @@
private Preferences rootPreference;
private Preferences cayennePreference;
-
private Preferences currentPreference;
-
public Preferences getCurrentPreference() {
return currentPreference;
}
-
public void setCurrentPreference(Preferences currentPreference) {
this.currentPreference = currentPreference;
}
@@ -46,7 +43,7 @@
public Preferences getCayennePreference() {
if (cayennePreference == null) {
- cayennePreference = getRootPreference().node(CAYENNE_PREFERENCE);
+ cayennePreference = getRootPreference().node(CAYENNE_PREFERENCES_PATH);
}
return cayennePreference;
}
@@ -61,13 +58,13 @@
public void setCurrentNodeForPreference(Class className, String path) {
currentPreference = getNode(className, path);
}
-
- public void setObject(CayennePreference object){
+
+ public void setObject(CayennePreference object) {
}
-
+
public void saveObjectPreference() {
}
-
+
public static String filePathToPrefereceNodePath(String path) {
return path.replace(".xml", "");
}
Modified: cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/pref/ChildrenMapPreference.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/pref/ChildrenMapPreference.java?rev=912604&r1=912603&r2=912604&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/pref/ChildrenMapPreference.java (original)
+++ cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/pref/ChildrenMapPreference.java Mon Feb 22 15:16:26 2010
@@ -29,31 +29,21 @@
import org.apache.cayenne.CayenneRuntimeException;
+public class ChildrenMapPreference extends PreferenceDecorator {
-public class ChildrenMapPreference extends CayennePreferenceDecorator {
-
- private Map<String, Object> childrens;
+ private Map<String, Object> children;
private List<String> removeObject;
-
- public ChildrenMapPreference(CayennePreference decoratedPreference) {
- super(decoratedPreference);
- this.childrens = new HashMap<String, Object>();
+ public ChildrenMapPreference(CayennePreference delegate) {
+ super(delegate);
+ this.children = new HashMap<String, Object>();
this.removeObject = new ArrayList<String>();
}
-
- public ChildrenMapPreference(CayennePreference decoratedPreference, Preferences preferences) {
- super(decoratedPreference);
- decoratedPreference.setCurrentPreference(preferences);
- this.childrens = new HashMap<String, Object>();
- }
- public Preferences getCayennePreference() {
- return decoratedPreference.getCayennePreference();
- }
-
- public Preferences getRootPreference() {
- return decoratedPreference.getRootPreference();
+ public ChildrenMapPreference(CayennePreference delegate, Preferences preferences) {
+ super(delegate);
+ delegate.setCurrentPreference(preferences);
+ this.children = new HashMap<String, Object>();
}
public void initChildrenPreferences() {
@@ -63,7 +53,7 @@
for (int i = 0; i < names.length; i++) {
try {
- Class cls = decoratedPreference.getClass();
+ Class cls = delegate.getClass();
Class partypes[] = new Class[2];
partypes[0] = String.class;
partypes[1] = boolean.class;
@@ -80,7 +70,7 @@
}
- this.childrens.putAll(children);
+ this.children.putAll(children);
}
catch (BackingStoreException e) {
e.printStackTrace();
@@ -88,25 +78,21 @@
}
public Map getChildrenPreferences() {
- return childrens;
- }
-
- public Preferences getCurrentPreference() {
- return decoratedPreference.getCurrentPreference();
+ return children;
}
public CayennePreference getObject(String key) {
- return (CayennePreference) childrens.get(key);
+ return (CayennePreference) children.get(key);
}
public void remove(String key) {
removeObject.add(key);
- childrens.remove(key);
+ children.remove(key);
}
public CayennePreference create(String nodeName) {
try {
- Class cls = decoratedPreference.getClass();
+ Class cls = delegate.getClass();
Class partypes[] = new Class[2];
partypes[0] = String.class;
partypes[1] = boolean.class;
@@ -115,23 +101,23 @@
arglist[0] = nodeName;
arglist[1] = false;
Object retobj = ct.newInstance(arglist);
- childrens.put(nodeName, retobj);
+ children.put(nodeName, retobj);
}
catch (Throwable e) {
new CayenneRuntimeException("Error creating preference");
}
- return (CayennePreference) childrens.get(nodeName);
+ return (CayennePreference) children.get(nodeName);
}
public void create(String nodeName, Object obj) {
- childrens.put(nodeName, obj);
+ children.put(nodeName, obj);
}
public void save() {
if (removeObject.size() > 0) {
for (int i = 0; i < removeObject.size(); i++) {
try {
- decoratedPreference
+ delegate
.getCurrentPreference()
.node(removeObject.get(i))
.removeNode();
@@ -141,20 +127,19 @@
}
}
}
-
- Iterator it = childrens.entrySet().iterator();
+
+ Iterator it = children.entrySet().iterator();
while (it.hasNext()) {
- Map.Entry pairs = (Map.Entry)it.next();
-
- decoratedPreference.getCurrentPreference().node((String) pairs.getKey());
- ((CayennePreference) pairs.getValue())
- .saveObjectPreference();
-
+ Map.Entry pairs = (Map.Entry) it.next();
+
+ delegate.getCurrentPreference().node((String) pairs.getKey());
+ ((CayennePreference) pairs.getValue()).saveObjectPreference();
+
}
}
public void cancel() {
- this.childrens.clear();
+ this.children.clear();
initChildrenPreferences();
}
}
Modified: cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/pref/PrefDetail.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/pref/PrefDetail.java?rev=912604&r1=912603&r2=912604&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/pref/PrefDetail.java (original)
+++ cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/pref/PrefDetail.java Mon Feb 22 15:16:26 2010
@@ -20,7 +20,6 @@
import java.util.prefs.Preferences;
-
public class PrefDetail extends CayennePreference {
public PrefDetail(Preferences node) {
Modified: cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/pref/Preference.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/pref/Preference.java?rev=912604&r1=912603&r2=912604&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/pref/Preference.java (original)
+++ cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/pref/Preference.java Mon Feb 22 15:16:26 2010
@@ -20,21 +20,26 @@
import java.util.prefs.Preferences;
-
public interface Preference {
- /** Key for preferences. */
- public static final String CAYENNE_PREFERENCE = "org/apache/cayenne";
-
- /** node name for editor */
+ /**
+ * Key for preferences.
+ */
+ public static final String CAYENNE_PREFERENCES_PATH = "org/apache/cayenne";
+
+ /**
+ * Preferences node name for the editor
+ */
public static final String EDITOR = "editor";
-
- /** node name for list of the last 12 opened project files. */
+
+ /**
+ * Preferences node name for list of the last 12 opened project files.
+ */
public static final String LAST_PROJ_FILES = "lastSeveralProjectFiles";
-
- public Preferences getRootPreference();
-
- public Preferences getCayennePreference();
-
- public Preferences getCurrentPreference();
+
+ Preferences getRootPreference();
+
+ Preferences getCayennePreference();
+
+ Preferences getCurrentPreference();
}
Copied: cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/pref/PreferenceDecorator.java (from r912581, cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/pref/CayennePreferenceDecorator.java)
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/pref/PreferenceDecorator.java?p2=cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/pref/PreferenceDecorator.java&p1=cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/pref/CayennePreferenceDecorator.java&r1=912581&r2=912604&rev=912604&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/pref/CayennePreferenceDecorator.java (original)
+++ cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/pref/PreferenceDecorator.java Mon Feb 22 15:16:26 2010
@@ -18,13 +18,25 @@
****************************************************************/
package org.apache.cayenne.pref;
-public abstract class CayennePreferenceDecorator implements Preference {
+import java.util.prefs.Preferences;
- protected Preference decoratedPreference;
-
- public CayennePreferenceDecorator (Preference decoratedPreference) {
- this.decoratedPreference = decoratedPreference;
+public abstract class PreferenceDecorator implements Preference {
+
+ protected Preference delegate;
+
+ public PreferenceDecorator(Preference delegate) {
+ this.delegate = delegate;
+ }
+
+ public Preferences getCayennePreference() {
+ return delegate.getCayennePreference();
}
-
+ public Preferences getCurrentPreference() {
+ return delegate.getCurrentPreference();
+ }
+
+ public Preferences getRootPreference() {
+ return delegate.getRootPreference();
+ }
}
Modified: cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/pref/UpgradeCayennePreference.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/pref/UpgradeCayennePreference.java?rev=912604&r1=912603&r2=912604&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/pref/UpgradeCayennePreference.java (original)
+++ cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/pref/UpgradeCayennePreference.java Mon Feb 22 15:16:26 2010
@@ -30,7 +30,7 @@
import org.apache.cayenne.modeler.util.CayenneUserDir;
import org.apache.commons.collections.ExtendedProperties;
-public class UpgradeCayennePreference extends CayennePreferenceDecorator {
+public class UpgradeCayennePreference extends PreferenceDecorator {
/** Name of the preferences file. */
public static final String PREFERENCES_NAME_OLD = "modeler.preferences";
@@ -45,14 +45,14 @@
public static final String EDITOR_LOGFILE_ENABLED_OLD = "Editor.logfileEnabled";
public static final String EDITOR_LOGFILE_OLD = "Editor.logfile";
- public UpgradeCayennePreference(Preference decoratedPreference) {
- super(decoratedPreference);
+ public UpgradeCayennePreference(Preference delegate) {
+ super(delegate);
}
public void upgrade() {
try {
- if (!Preferences.userRoot().nodeExists(CAYENNE_PREFERENCE)) {
+ if (!Preferences.userRoot().nodeExists(CAYENNE_PREFERENCES_PATH)) {
File prefsFile = new File(preferencesDirectory(), PREFERENCES_NAME_OLD);
if (prefsFile.exists()) {
@@ -61,26 +61,33 @@
ep.load(new FileInputStream(prefsFile));
Preferences prefEditor = Preferences.userRoot().node(
- CAYENNE_PREFERENCE).node(EDITOR);
+ CAYENNE_PREFERENCES_PATH).node(EDITOR);
+
+ prefEditor.putBoolean(
+ ModelerPreferences.EDITOR_LOGFILE_ENABLED,
+ ep.getBoolean(EDITOR_LOGFILE_ENABLED_OLD));
+ prefEditor.put(ModelerPreferences.EDITOR_LOGFILE, ep
+ .getString(EDITOR_LOGFILE_OLD));
+ prefEditor.put(ModelerPreferences.EDITOR_LAFNAME, ep
+ .getString(EDITOR_LAFNAME_OLD));
+ prefEditor.put(ModelerPreferences.EDITOR_THEMENAME, ep
+ .getString(EDITOR_THEMENAME_OLD));
- prefEditor.putBoolean(ModelerPreferences.EDITOR_LOGFILE_ENABLED, ep.getBoolean(EDITOR_LOGFILE_ENABLED_OLD));
- prefEditor.put(ModelerPreferences.EDITOR_LOGFILE, ep.getString(EDITOR_LOGFILE_OLD));
- prefEditor.put(ModelerPreferences.EDITOR_LAFNAME, ep.getString(EDITOR_LAFNAME_OLD));
- prefEditor.put(ModelerPreferences.EDITOR_THEMENAME, ep.getString(EDITOR_THEMENAME_OLD));
-
Preferences frefLastProjFiles = prefEditor.node(LAST_PROJ_FILES);
-
+
Vector arr = ep.getVector(LAST_PROJ_FILES_OLD);
-
+
while (arr.size() > ModelerPreferences.LAST_PROJ_FILES_SIZE) {
arr.remove(arr.size() - 1);
}
-
+
frefLastProjFiles.clear();
int size = arr.size();
-
- for (int i=0; i< size; i++) {
- frefLastProjFiles.put(String.valueOf(i), arr.get(i).toString());
+
+ for (int i = 0; i < size; i++) {
+ frefLastProjFiles.put(String.valueOf(i), arr
+ .get(i)
+ .toString());
}
}
catch (FileNotFoundException e) {
@@ -105,19 +112,21 @@
return CayenneUserDir.getInstance().getDirectory();
}
+ @Override
public Preferences getRootPreference() {
upgrade();
- return decoratedPreference.getRootPreference();
+ return delegate.getRootPreference();
}
+ @Override
public Preferences getCayennePreference() {
upgrade();
- return decoratedPreference.getCayennePreference();
+ return delegate.getCayennePreference();
}
+ @Override
public Preferences getCurrentPreference() {
upgrade();
- return decoratedPreference.getCayennePreference();
+ return delegate.getCayennePreference();
}
-
}