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 2008/04/11 18:09:45 UTC
svn commit: r647206 - in
/cayenne/main/trunk/framework/cayenne-modeler/src/main:
java/org/apache/cayenne/modeler/pref/DBGeneratorDefaults.java
java/org/apache/cayenne/modeler/pref/DataMapDefaults.java
resources/pref/ModelerPreferences.map.xml
Author: aadamchik
Date: Fri Apr 11 09:09:39 2008
New Revision: 647206
URL: http://svn.apache.org/viewvc?rev=647206&view=rev
Log:
switching prefs to callbacks
Modified:
cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/pref/DBGeneratorDefaults.java
cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/pref/DataMapDefaults.java
cayenne/main/trunk/framework/cayenne-modeler/src/main/resources/pref/ModelerPreferences.map.xml
Modified: cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/pref/DBGeneratorDefaults.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/pref/DBGeneratorDefaults.java?rev=647206&r1=647205&r2=647206&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/pref/DBGeneratorDefaults.java (original)
+++ cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/pref/DBGeneratorDefaults.java Fri Apr 11 09:09:39 2008
@@ -18,7 +18,6 @@
****************************************************************/
package org.apache.cayenne.modeler.pref;
-import org.apache.cayenne.PersistenceState;
import org.apache.cayenne.access.DbGenerator;
public class DBGeneratorDefaults extends _DBGeneratorDefaults {
@@ -35,19 +34,16 @@
generator.setShouldDropPKSupport(booleanForBooleanProperty(DROP_PK_PROPERTY));
generator.setShouldDropTables(booleanForBooleanProperty(DROP_TABLES_PROPERTY));
}
-
- public void setPersistenceState(int persistenceState) {
-
- // init defaults on insert...
- if (this.persistenceState == PersistenceState.TRANSIENT
- && persistenceState == PersistenceState.NEW) {
- setCreateFK(Boolean.TRUE);
- setCreatePK(Boolean.TRUE);
- setCreateTables(Boolean.TRUE);
- setDropPK(Boolean.FALSE);
- setDropTables(Boolean.FALSE);
- }
- super.setPersistenceState(persistenceState);
+
+ /**
+ * An initialization callback.
+ */
+ public void prePersist() {
+ setCreateFK(Boolean.TRUE);
+ setCreatePK(Boolean.TRUE);
+ setCreateTables(Boolean.TRUE);
+ setDropPK(Boolean.FALSE);
+ setDropTables(Boolean.FALSE);
}
protected boolean booleanForBooleanProperty(String property) {
Modified: cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/pref/DataMapDefaults.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/pref/DataMapDefaults.java?rev=647206&r1=647205&r2=647206&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/pref/DataMapDefaults.java (original)
+++ cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/pref/DataMapDefaults.java Fri Apr 11 09:09:39 2008
@@ -18,7 +18,6 @@
****************************************************************/
package org.apache.cayenne.modeler.pref;
-import org.apache.cayenne.PersistenceState;
import org.apache.cayenne.map.DataMap;
import org.apache.cayenne.util.Util;
@@ -57,15 +56,12 @@
setSuperclassPackage(null);
}
}
-
- public void setPersistenceState(int persistenceState) {
-
- // init defaults on insert...
- if (this.persistenceState == PersistenceState.TRANSIENT
- && persistenceState == PersistenceState.NEW) {
- setGeneratePairs(Boolean.TRUE);
- }
- super.setPersistenceState(persistenceState);
+
+ /**
+ * An initialization callback.
+ */
+ public void prePersist() {
+ setGeneratePairs(Boolean.TRUE);
}
/**
Modified: cayenne/main/trunk/framework/cayenne-modeler/src/main/resources/pref/ModelerPreferences.map.xml
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-modeler/src/main/resources/pref/ModelerPreferences.map.xml?rev=647206&r1=647205&r2=647206&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-modeler/src/main/resources/pref/ModelerPreferences.map.xml (original)
+++ cayenne/main/trunk/framework/cayenne-modeler/src/main/resources/pref/ModelerPreferences.map.xml Fri Apr 11 09:09:39 2008
@@ -63,6 +63,7 @@
<obj-attribute name="createTables" type="java.lang.Boolean" db-attribute-path="create_tables"/>
<obj-attribute name="dropPK" type="java.lang.Boolean" db-attribute-path="drop_pk"/>
<obj-attribute name="dropTables" type="java.lang.Boolean" db-attribute-path="drop_tables"/>
+ <pre-persist method-name="prePersist"/>
</obj-entity>
<obj-entity name="DataMapDefaults" className="org.apache.cayenne.modeler.pref.DataMapDefaults" lock-type="optimistic" dbEntityName="data_map_defaults" superClassName="org.apache.cayenne.pref.PreferenceDetail">
<obj-attribute name="generatePairs" type="java.lang.Boolean" db-attribute-path="generate_pairs"/>
@@ -70,6 +71,7 @@
<obj-attribute name="subclassTemplate" type="java.lang.String" db-attribute-path="subclass_template"/>
<obj-attribute name="superclassPackage" type="java.lang.String" db-attribute-path="superclass_package_suffix"/>
<obj-attribute name="superclassTemplate" type="java.lang.String" db-attribute-path="superclass_template"/>
+ <pre-persist method-name="prePersist"/>
</obj-entity>
<obj-entity name="DataNodeDefaults" className="org.apache.cayenne.modeler.pref.DataNodeDefaults" lock-type="optimistic" dbEntityName="data_node_defaults" superClassName="org.apache.cayenne.pref.PreferenceDetail">
<obj-attribute name="localDataSource" type="java.lang.String" db-attribute-path="local_data_source"/>