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 2006/10/10 07:38:33 UTC
svn commit: r454622 - in
/incubator/cayenne/main/trunk/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/pref:
CayennePreferenceEditor.java Domain.java DomainPreference.java
PreferenceDetail.java
Author: aadamchik
Date: Mon Oct 9 22:38:32 2006
New Revision: 454622
URL: http://svn.apache.org/viewvc?view=rev&rev=454622
Log:
CAY-680 - modeler update
Modified:
incubator/cayenne/main/trunk/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/pref/CayennePreferenceEditor.java
incubator/cayenne/main/trunk/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/pref/Domain.java
incubator/cayenne/main/trunk/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/pref/DomainPreference.java
incubator/cayenne/main/trunk/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/pref/PreferenceDetail.java
Modified: incubator/cayenne/main/trunk/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/pref/CayennePreferenceEditor.java
URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/pref/CayennePreferenceEditor.java?view=diff&rev=454622&r1=454621&r2=454622
==============================================================================
--- incubator/cayenne/main/trunk/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/pref/CayennePreferenceEditor.java (original)
+++ incubator/cayenne/main/trunk/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/pref/CayennePreferenceEditor.java Mon Oct 9 22:38:32 2006
@@ -55,7 +55,7 @@
}
public Domain editableInstance(Domain object) {
- if (object.getDataContext() == getEditingContext()) {
+ if (object.getObjectContext() == getEditingContext()) {
return object;
}
Modified: incubator/cayenne/main/trunk/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/pref/Domain.java
URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/pref/Domain.java?view=diff&rev=454622&r1=454621&r2=454622
==============================================================================
--- incubator/cayenne/main/trunk/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/pref/Domain.java (original)
+++ incubator/cayenne/main/trunk/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/pref/Domain.java Mon Oct 9 22:38:32 2006
@@ -29,11 +29,12 @@
import org.apache.cayenne.CayenneRuntimeException;
import org.apache.cayenne.DataObjectUtils;
-import org.apache.cayenne.access.DataContext;
+import org.apache.cayenne.ObjectContext;
import org.apache.cayenne.exp.Expression;
import org.apache.cayenne.exp.ExpressionFactory;
import org.apache.cayenne.map.DbAttribute;
import org.apache.cayenne.map.DbEntity;
+import org.apache.cayenne.query.NamedQuery;
import org.apache.cayenne.query.SelectQuery;
import org.apache.cayenne.util.Util;
@@ -116,8 +117,7 @@
return null;
}
- Domain childSubdomain = (Domain) getDataContext().createAndRegisterNewObject(
- Domain.class);
+ Domain childSubdomain = (Domain) getObjectContext().newObject(Domain.class);
addToSubdomains(childSubdomain);
childSubdomain.setName(subdomainName);
@@ -127,7 +127,7 @@
int level = getLevel().intValue() + 1;
childSubdomain.setLevel(new Integer(level));
- getDataContext().commitChanges();
+ getObjectContext().commitChanges();
return childSubdomain;
}
@@ -176,7 +176,7 @@
ids.add(DataObjectUtils.pkForObject(pref));
}
- DataContext context = getDataContext();
+ ObjectContext context = getObjectContext();
DbEntity entity = context.getEntityResolver().lookupDbEntity(javaClass);
DbAttribute pk = (DbAttribute) entity.getPrimaryKey().get(0);
@@ -222,11 +222,11 @@
return null;
}
- preferenceLink = (DomainPreference) getDataContext()
- .createAndRegisterNewObject(DomainPreference.class);
+ preferenceLink = (DomainPreference) getObjectContext().newObject(
+ DomainPreference.class);
preferenceLink.setDomain(this);
preferenceLink.setKey(key);
- getDataContext().commitChanges();
+ getObjectContext().commitChanges();
}
return (javaClass == null) ? preferenceLink.getPreference() : preferenceLink
@@ -242,11 +242,8 @@
Map params = new HashMap();
params.put("key", key);
params.put("domain", this);
- List results = getDataContext().performQuery(
- "DomainPreferenceForKey",
- params,
- false);
+ List results = getObjectContext().performQuery(
+ new NamedQuery("DomainPreferenceForKey", params));
return (results.size() < 1) ? null : (DomainPreference) results.get(0);
}
}
-
Modified: incubator/cayenne/main/trunk/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/pref/DomainPreference.java
URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/pref/DomainPreference.java?view=diff&rev=454622&r1=454621&r2=454622
==============================================================================
--- incubator/cayenne/main/trunk/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/pref/DomainPreference.java (original)
+++ incubator/cayenne/main/trunk/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/pref/DomainPreference.java Mon Oct 9 22:38:32 2006
@@ -89,8 +89,10 @@
// detail object PK must match...
int pk = DataObjectUtils.intPKForObject(this);
- PreferenceDetail preference = (PreferenceDetail) DataObjectUtils
- .objectForPK(getDataContext(), javaClass, pk);
+ PreferenceDetail preference = (PreferenceDetail) DataObjectUtils.objectForPK(
+ getObjectContext(),
+ javaClass,
+ pk);
if (preference != null) {
preference.setDomainPreference(this);
@@ -100,11 +102,10 @@
return preference;
}
- preference = (PreferenceDetail) getDataContext()
- .createAndRegisterNewObject(javaClass);
+ preference = (PreferenceDetail) getObjectContext().newObject(javaClass);
preference.setDomainPreference(this);
- getDataContext().commitChanges();
+ getObjectContext().commitChanges();
return preference;
}
@@ -142,4 +143,3 @@
}
}
-
Modified: incubator/cayenne/main/trunk/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/pref/PreferenceDetail.java
URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/pref/PreferenceDetail.java?view=diff&rev=454622&r1=454621&r2=454622
==============================================================================
--- incubator/cayenne/main/trunk/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/pref/PreferenceDetail.java (original)
+++ incubator/cayenne/main/trunk/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/pref/PreferenceDetail.java Mon Oct 9 22:38:32 2006
@@ -23,6 +23,7 @@
import org.apache.cayenne.CayenneDataObject;
import org.apache.cayenne.DataObjectUtils;
+import org.apache.cayenne.ObjectContext;
import org.apache.cayenne.ObjectId;
import org.apache.cayenne.access.DataContext;
import org.apache.cayenne.access.DataNode;
@@ -136,7 +137,7 @@
if (domainPreference == null) {
// try to fetch..
- DataContext context = getDataContext();
+ ObjectContext context = getObjectContext();
if (context != null && getObjectId() != null) {
int pk = DataObjectUtils.intPKForObject(this);
@@ -190,11 +191,12 @@
// force creation of otherId
if (otherId.isTemporary() && !otherId.isReplacementIdAttached()) {
- DbEntity entity = getDataContext().getEntityResolver().lookupDbEntity(
+ DbEntity entity = getObjectContext().getEntityResolver().lookupDbEntity(
domainPreference);
- DataNode node = getDataContext().getParentDataDomain().lookupDataNode(
- entity.getDataMap());
+ DataNode node = ((DataContext) getObjectContext())
+ .getParentDataDomain()
+ .lookupDataNode(entity.getDataMap());
try {
Object pk = node.getAdapter().getPkGenerator().generatePkForDbEntity(