You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cayenne.apache.org by an...@apache.org on 2009/08/26 22:32:16 UTC
svn commit: r808172 - in
/cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler:
dialog/autorelationship/ dialog/db/ util/
Author: andrey
Date: Wed Aug 26 20:32:15 2009
New Revision: 808172
URL: http://svn.apache.org/viewvc?rev=808172&view=rev
Log:
CAY-1246 Naming strategy getting stuck in (incorrect) preferences location
Added:
cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/util/NamingStrategyPreferences.java
Modified:
cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/autorelationship/InferRelationshipsController.java
cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/autorelationship/InferRelationshipsControllerBase.java
cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/autorelationship/InferRelationshipsDialog.java
cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/autorelationship/InferRelationshipsPanel.java
cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/autorelationship/InferRelationshipsTabController.java
cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/db/DbLoaderOptionsDialog.java
Modified: cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/autorelationship/InferRelationshipsController.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/autorelationship/InferRelationshipsController.java?rev=808172&r1=808171&r2=808172&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/autorelationship/InferRelationshipsController.java (original)
+++ cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/autorelationship/InferRelationshipsController.java Wed Aug 26 20:32:15 2009
@@ -19,14 +19,10 @@
package org.apache.cayenne.modeler.dialog.autorelationship;
import java.awt.Component;
-import java.util.Vector;
-import javax.swing.DefaultComboBoxModel;
import javax.swing.JOptionPane;
-import org.apache.cayenne.access.DbLoader;
import org.apache.cayenne.map.DataMap;
-import org.apache.cayenne.map.DbEntity;
import org.apache.cayenne.map.DbJoin;
import org.apache.cayenne.map.DbRelationship;
import org.apache.cayenne.map.Entity;
@@ -34,30 +30,16 @@
import org.apache.cayenne.map.event.RelationshipEvent;
import org.apache.cayenne.map.naming.NamingStrategy;
import org.apache.cayenne.modeler.Application;
-import org.apache.cayenne.modeler.CayenneModelerController;
import org.apache.cayenne.modeler.ClassLoadingService;
-import org.apache.cayenne.modeler.ModelerPreferences;
import org.apache.cayenne.modeler.ProjectController;
-import org.apache.cayenne.modeler.action.CreateRelationshipAction;
import org.apache.cayenne.modeler.dialog.ErrorDebugDialog;
import org.apache.cayenne.modeler.util.CayenneController;
-import org.apache.cayenne.modeler.util.ProjectUtil;
-import org.apache.cayenne.project.NamedObjectFactory;
+import org.apache.cayenne.modeler.util.NamingStrategyPreferences;
import org.apache.cayenne.swing.BindingBuilder;
-import org.apache.cayenne.util.Util;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
public class InferRelationshipsController extends InferRelationshipsControllerBase {
-
- private static final String STRATEGIES_PREFERENCE = "recent.preferences";
-
- private static final Vector<String> PREDEFINED_STRATEGIES = new Vector<String>();
- static {
- PREDEFINED_STRATEGIES.add("org.apache.cayenne.map.naming.BasicNamingStrategy");
- PREDEFINED_STRATEGIES.add("org.apache.cayenne.map.naming.SmartNamingStrategy");
- };
-
public static final int SELECT = 1;
public static final int CANCEL = 0;
@@ -137,14 +119,7 @@
/**
* Be user-friendly and update preferences with specified strategy
*/
- ModelerPreferences pref = ModelerPreferences.getPreferences();
- Vector arr = pref.getVector(STRATEGIES_PREFERENCE, PREDEFINED_STRATEGIES);
-
- // move to top
- arr.remove(strategyClass);
- arr.add(0, strategyClass);
-
- pref.setProperty(STRATEGIES_PREFERENCE, arr);
+ NamingStrategyPreferences.getInstance().addToLastUsedStrategies(strategyClass);
}
catch (Throwable th) {
logObj.error("Error in " + getClass().getName(), th);
Modified: cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/autorelationship/InferRelationshipsControllerBase.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/autorelationship/InferRelationshipsControllerBase.java?rev=808172&r1=808171&r2=808172&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/autorelationship/InferRelationshipsControllerBase.java (original)
+++ cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/autorelationship/InferRelationshipsControllerBase.java Wed Aug 26 20:32:15 2009
@@ -21,11 +21,8 @@
import java.awt.Component;
import java.util.ArrayList;
import java.util.Collection;
-import java.util.HashMap;
import java.util.HashSet;
-import java.util.Iterator;
import java.util.List;
-import java.util.Map;
import java.util.Set;
import org.apache.cayenne.map.DataMap;
@@ -33,15 +30,11 @@
import org.apache.cayenne.map.DbEntity;
import org.apache.cayenne.map.DbJoin;
import org.apache.cayenne.map.DbRelationship;
-import org.apache.cayenne.map.ObjEntity;
import org.apache.cayenne.map.Relationship;
import org.apache.cayenne.map.naming.BasicNamingStrategy;
import org.apache.cayenne.map.naming.ExportedKey;
import org.apache.cayenne.map.naming.NamingStrategy;
import org.apache.cayenne.modeler.util.CayenneController;
-import org.apache.cayenne.project.NamedObjectFactory;
-import org.apache.cayenne.validation.ValidationFailure;
-import org.apache.cayenne.validation.ValidationResult;
import org.apache.commons.collections.Predicate;
public class InferRelationshipsControllerBase extends CayenneController {
Modified: cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/autorelationship/InferRelationshipsDialog.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/autorelationship/InferRelationshipsDialog.java?rev=808172&r1=808171&r2=808172&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/autorelationship/InferRelationshipsDialog.java (original)
+++ cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/autorelationship/InferRelationshipsDialog.java Wed Aug 26 20:32:15 2009
@@ -22,7 +22,6 @@
import java.awt.Component;
import java.awt.Container;
import java.awt.FlowLayout;
-import java.util.Vector;
import javax.swing.Box;
import javax.swing.DefaultComboBoxModel;
@@ -31,23 +30,11 @@
import javax.swing.JDialog;
import javax.swing.JLabel;
import javax.swing.JPanel;
-import javax.swing.JTabbedPane;
-import javax.swing.SwingConstants;
-import org.apache.cayenne.map.naming.NamingStrategy;
import org.apache.cayenne.modeler.Application;
-import org.apache.cayenne.modeler.ModelerPreferences;
+import org.apache.cayenne.modeler.util.NamingStrategyPreferences;
public class InferRelationshipsDialog extends JDialog {
-
- private static final String STRATEGIES_PREFERENCE = "recent.preferences";
-
- private static final Vector<String> PREDEFINED_STRATEGIES = new Vector<String>();
- static {
- PREDEFINED_STRATEGIES.add("org.apache.cayenne.map.naming.BasicNamingStrategy");
- PREDEFINED_STRATEGIES.add("org.apache.cayenne.map.naming.SmartNamingStrategy");
- };
-
public static final int SELECT = 1;
public static final int CANCEL = 0;
protected int choice;
@@ -92,9 +79,8 @@
this.choice = CANCEL;
- ModelerPreferences pref = ModelerPreferences.getPreferences();
- Vector<?> arr = pref.getVector(STRATEGIES_PREFERENCE, PREDEFINED_STRATEGIES);
- strategyCombo.setModel(new DefaultComboBoxModel(arr));
+ strategyCombo.setModel(new DefaultComboBoxModel(
+ NamingStrategyPreferences.getInstance().getLastUsedStrategies()));
setTitle("Infer Relationships");
}
Modified: cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/autorelationship/InferRelationshipsPanel.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/autorelationship/InferRelationshipsPanel.java?rev=808172&r1=808171&r2=808172&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/autorelationship/InferRelationshipsPanel.java (original)
+++ cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/autorelationship/InferRelationshipsPanel.java Wed Aug 26 20:32:15 2009
@@ -23,21 +23,14 @@
import java.awt.FlowLayout;
import java.awt.event.ItemEvent;
import java.awt.event.ItemListener;
-import java.util.Vector;
-import javax.swing.AbstractButton;
-import javax.swing.DefaultComboBoxModel;
import javax.swing.JCheckBox;
-import javax.swing.JComboBox;
import javax.swing.JLabel;
import javax.swing.JPanel;
import javax.swing.JScrollPane;
import javax.swing.JTable;
import javax.swing.ScrollPaneConstants;
-import org.apache.cayenne.map.naming.NamingStrategy;
-import org.apache.cayenne.modeler.ModelerPreferences;
-
public class InferRelationshipsPanel extends JPanel {
protected JTable table;
Modified: cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/autorelationship/InferRelationshipsTabController.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/autorelationship/InferRelationshipsTabController.java?rev=808172&r1=808171&r2=808172&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/autorelationship/InferRelationshipsTabController.java (original)
+++ cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/autorelationship/InferRelationshipsTabController.java Wed Aug 26 20:32:15 2009
@@ -20,10 +20,6 @@
import java.awt.Component;
-import javax.swing.JTable;
-import javax.swing.table.DefaultTableModel;
-import javax.swing.table.TableColumn;
-
import org.apache.cayenne.modeler.util.CayenneController;
import org.apache.cayenne.swing.BindingBuilder;
import org.apache.cayenne.swing.ObjectBinding;
Modified: cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/db/DbLoaderOptionsDialog.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/db/DbLoaderOptionsDialog.java?rev=808172&r1=808171&r2=808172&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/db/DbLoaderOptionsDialog.java (original)
+++ cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/db/DbLoaderOptionsDialog.java Wed Aug 26 20:32:15 2009
@@ -42,8 +42,8 @@
import org.apache.cayenne.map.naming.NamingStrategy;
import org.apache.cayenne.modeler.Application;
import org.apache.cayenne.modeler.ClassLoadingService;
-import org.apache.cayenne.modeler.ModelerPreferences;
import org.apache.cayenne.modeler.util.CayenneDialog;
+import org.apache.cayenne.modeler.util.NamingStrategyPreferences;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -55,20 +55,6 @@
*/
public class DbLoaderOptionsDialog extends CayenneDialog {
private static final Log logObj = LogFactory.getLog(DbLoaderOptionsDialog.class);
-
- /**
- * Preference to store latest strategies
- */
- private static final String STRATEGIES_PREFERENCE = "recent.preferences";
-
- /**
- * Naming strategies to appear in combobox by default
- */
- private static final Vector<String> PREDEFINED_STRATEGIES = new Vector<String>();
- static {
- PREDEFINED_STRATEGIES.add("org.apache.cayenne.map.naming.BasicNamingStrategy");
- PREDEFINED_STRATEGIES.add("org.apache.cayenne.map.naming.SmartNamingStrategy");
- };
public static final int CANCEL = 0;
public static final int SELECT = 1;
@@ -182,8 +168,7 @@
this.procNamePatternField.setEnabled(shouldLoadProcedures);
this.procedureLabel.setEnabled(shouldLoadProcedures);
- ModelerPreferences pref = ModelerPreferences.getPreferences();
- Vector<?> arr = pref.getVector(STRATEGIES_PREFERENCE, PREDEFINED_STRATEGIES);
+ Vector<String> arr = NamingStrategyPreferences.getInstance().getLastUsedStrategies();
strategyCombo.setModel(new DefaultComboBoxModel(arr));
boolean showSchemaSelector = schemas != null && !schemas.isEmpty();
@@ -220,14 +205,7 @@
/**
* Be user-friendly and update preferences with specified strategy
*/
- ModelerPreferences pref = ModelerPreferences.getPreferences();
- Vector arr = pref.getVector(STRATEGIES_PREFERENCE, PREDEFINED_STRATEGIES);
-
- //move to top
- arr.remove(strategyClass);
- arr.add(0, strategyClass);
-
- pref.setProperty(STRATEGIES_PREFERENCE, arr);
+ NamingStrategyPreferences.getInstance().addToLastUsedStrategies(strategyClass);
}
catch (Throwable th) {
logObj.error("Error in " + getClass().getName(), th);
Added: cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/util/NamingStrategyPreferences.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/util/NamingStrategyPreferences.java?rev=808172&view=auto
==============================================================================
--- cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/util/NamingStrategyPreferences.java (added)
+++ cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/util/NamingStrategyPreferences.java Wed Aug 26 20:32:15 2009
@@ -0,0 +1,85 @@
+/*****************************************************************
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ ****************************************************************/
+package org.apache.cayenne.modeler.util;
+
+import java.util.Arrays;
+import java.util.Vector;
+
+import org.apache.cayenne.modeler.Application;
+import org.apache.cayenne.pref.Domain;
+
+/**
+ * Helper class to store/read information about naming strategies have been used
+ */
+public class NamingStrategyPreferences {
+ private static final String STRATEGIES_PREFERENCE = "recent.strategies";
+
+ /**
+ * Naming strategies to appear in combobox by default
+ */
+ private static final Vector<String> PREDEFINED_STRATEGIES = new Vector<String>();
+ static {
+ PREDEFINED_STRATEGIES.add("org.apache.cayenne.map.naming.BasicNamingStrategy");
+ PREDEFINED_STRATEGIES.add("org.apache.cayenne.map.naming.SmartNamingStrategy");
+ };
+
+ static final NamingStrategyPreferences instance = new NamingStrategyPreferences();
+
+ public static NamingStrategyPreferences getInstance() {
+ return instance;
+ }
+
+ Domain getDomain() {
+ return Application.getInstance().getPreferenceDomain().getSubdomain(getClass());
+ }
+
+ /**
+ * @return last used strategies, PREDEFINED_STRATEGIES by default
+ */
+ public Vector<String> getLastUsedStrategies() {
+ String prop =
+ getDomain().getDetail(STRATEGIES_PREFERENCE, true).getProperty(STRATEGIES_PREFERENCE);
+ if (prop == null) {
+ return PREDEFINED_STRATEGIES;
+ }
+
+ return new Vector<String>(Arrays.asList(prop.split(",")));
+ }
+
+ /**
+ * Adds strategy to history
+ */
+ public void addToLastUsedStrategies(String strategy) {
+ Vector<String> strategies = getLastUsedStrategies();
+
+ //move to top
+ strategies.remove(strategy);
+ strategies.add(0, strategy);
+
+ StringBuilder res = new StringBuilder();
+ for (String str : strategies) {
+ res.append(str).append(",");
+ }
+ if (strategies.size() > 0) {
+ res.deleteCharAt(res.length() - 1);
+ }
+
+ getDomain().getDetail(STRATEGIES_PREFERENCE, true).setProperty(STRATEGIES_PREFERENCE, res.toString());
+ }
+}