You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cayenne.apache.org by ol...@apache.org on 2010/03/11 16:31:12 UTC
svn commit: r921899 - in
/cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler:
./ dialog/codegen/ dialog/pref/
Author: oltka
Date: Thu Mar 11 15:31:12 2010
New Revision: 921899
URL: http://svn.apache.org/viewvc?rev=921899&view=rev
Log:
CAY-1327 Migrate HSQLDB modeler preferences to Java preferences API
* remove unnecessary import
Modified:
cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/CodeTemplateManager.java
cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/codegen/CodeGeneratorControllerBase.java
cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/pref/DBConnectionInfoEditorView.java
cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/pref/TemplateCreator.java
cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/pref/TemplatePreferences.java
Modified: cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/CodeTemplateManager.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/CodeTemplateManager.java?rev=921899&r1=921898&r2=921899&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/CodeTemplateManager.java (original)
+++ cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/CodeTemplateManager.java Thu Mar 11 15:31:12 2010
@@ -45,7 +45,7 @@ public class CodeTemplateManager {
static final String LIGHT_SERVER_SUPERCLASS = "Light Server Superclass";
public static final String NODE_NAME = "codeTemplateManager";
-
+
protected List<String> standardSubclassTemplates;
protected List<String> standardSuperclassTemplates;
protected Map<String, String> customTemplates;
Modified: cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/codegen/CodeGeneratorControllerBase.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/codegen/CodeGeneratorControllerBase.java?rev=921899&r1=921898&r2=921899&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/codegen/CodeGeneratorControllerBase.java (original)
+++ cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/codegen/CodeGeneratorControllerBase.java Thu Mar 11 15:31:12 2010
@@ -21,7 +21,6 @@ package org.apache.cayenne.modeler.dialo
import java.awt.Component;
import java.util.ArrayList;
-import java.util.Collection;
import java.util.HashSet;
import java.util.List;
import java.util.Set;
Modified: cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/pref/DBConnectionInfoEditorView.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/pref/DBConnectionInfoEditorView.java?rev=921899&r1=921898&r2=921899&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/pref/DBConnectionInfoEditorView.java (original)
+++ cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/pref/DBConnectionInfoEditorView.java Thu Mar 11 15:31:12 2010
@@ -56,7 +56,7 @@ public class DBConnectionInfoEditorView
url = new JTextField();
userName = new JTextField();
password = new JPasswordField();
- labels = new ArrayList();
+ labels = new ArrayList<JLabel>();
// assemble
FormLayout layout = new FormLayout("right:pref, 3dlu, fill:160dlu:grow", "");
Modified: cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/pref/TemplateCreator.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/pref/TemplateCreator.java?rev=921899&r1=921898&r2=921899&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/pref/TemplateCreator.java (original)
+++ cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/pref/TemplateCreator.java Thu Mar 11 15:31:12 2010
@@ -76,7 +76,8 @@ public class TemplateCreator extends Cay
// find start directory in preferences
FSPath path = new FSPath(application.getPreferencesNode(
- CodeTemplateManager.class, "lastTemplate"));
+ CodeTemplateManager.class,
+ "lastTemplate"));
if (path.getPath() == null) {
path.setPath(getLastDirectory().getPath());
Modified: cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/pref/TemplatePreferences.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/pref/TemplatePreferences.java?rev=921899&r1=921898&r2=921899&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/pref/TemplatePreferences.java (original)
+++ cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/pref/TemplatePreferences.java Thu Mar 11 15:31:12 2010
@@ -44,7 +44,7 @@ public class TemplatePreferences extends
protected CayennePreferenceEditor editor;
protected List<FSPath> templateEntries;
protected ObjectBinding tableBinding;
-
+
private static Log logger = LogFactory.getLog(TemplatePreferences.class);
public TemplatePreferences(PreferenceDialog parent) {
@@ -79,7 +79,9 @@ public class TemplatePreferences extends
}
protected Preferences getTemplatePreferences() {
- return application.getPreferencesNode(CodeTemplateManager.class, CodeTemplateManager.NODE_NAME);
+ return application.getPreferencesNode(
+ CodeTemplateManager.class,
+ CodeTemplateManager.NODE_NAME);
}
protected void initBindings() {