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 2013/05/26 22:33:43 UTC
svn commit: r1486473 - in
/cayenne/main/trunk/tutorials/tutorial-rop-client/src/main/java/org/apache/cayenne/tutorial/persistent/client:
Main.java auto/_Artist.java auto/_Datamap.java auto/_Gallery.java
auto/_Painting.java
Author: aadamchik
Date: Sun May 26 20:33:43 2013
New Revision: 1486473
URL: http://svn.apache.org/r1486473
Log:
updating tutorials to match 3.2 APIs
Modified:
cayenne/main/trunk/tutorials/tutorial-rop-client/src/main/java/org/apache/cayenne/tutorial/persistent/client/Main.java
cayenne/main/trunk/tutorials/tutorial-rop-client/src/main/java/org/apache/cayenne/tutorial/persistent/client/auto/_Artist.java
cayenne/main/trunk/tutorials/tutorial-rop-client/src/main/java/org/apache/cayenne/tutorial/persistent/client/auto/_Datamap.java
cayenne/main/trunk/tutorials/tutorial-rop-client/src/main/java/org/apache/cayenne/tutorial/persistent/client/auto/_Gallery.java
cayenne/main/trunk/tutorials/tutorial-rop-client/src/main/java/org/apache/cayenne/tutorial/persistent/client/auto/_Painting.java
Modified: cayenne/main/trunk/tutorials/tutorial-rop-client/src/main/java/org/apache/cayenne/tutorial/persistent/client/Main.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/tutorials/tutorial-rop-client/src/main/java/org/apache/cayenne/tutorial/persistent/client/Main.java?rev=1486473&r1=1486472&r2=1486473&view=diff
==============================================================================
--- cayenne/main/trunk/tutorials/tutorial-rop-client/src/main/java/org/apache/cayenne/tutorial/persistent/client/Main.java (original)
+++ cayenne/main/trunk/tutorials/tutorial-rop-client/src/main/java/org/apache/cayenne/tutorial/persistent/client/Main.java Sun May 26 20:33:43 2013
@@ -27,7 +27,6 @@ import org.apache.cayenne.ObjectContext;
import org.apache.cayenne.configuration.Constants;
import org.apache.cayenne.configuration.rop.client.ClientRuntime;
import org.apache.cayenne.exp.Expression;
-import org.apache.cayenne.exp.ExpressionFactory;
import org.apache.cayenne.query.SelectQuery;
public class Main {
@@ -80,14 +79,14 @@ public class Main {
SelectQuery<Painting> select1 = SelectQuery.query(Painting.class);
List<Painting> paintings1 = context.select(select1);
- Expression qualifier2 = ExpressionFactory.likeIgnoreCaseExp(Painting.NAME_PROPERTY, "gi%");
+ Expression qualifier2 = Painting.NAME.likeInsensitive("gi%");
SelectQuery<Painting> select2 = SelectQuery.query(Painting.class, qualifier2);
List<Painting> paintings2 = context.select(select2);
}
static void deleteTutorial(ObjectContext context) {
// Delete object examples
- Expression qualifier = ExpressionFactory.matchExp(Artist.NAME_PROPERTY, "Pablo Picasso");
+ Expression qualifier = Artist.NAME.eq("Pablo Picasso");
SelectQuery<Artist> selectToDelete = SelectQuery.query(Artist.class, qualifier);
Artist picasso = (Artist) Cayenne.objectForQuery(context, selectToDelete);
Modified: cayenne/main/trunk/tutorials/tutorial-rop-client/src/main/java/org/apache/cayenne/tutorial/persistent/client/auto/_Artist.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/tutorials/tutorial-rop-client/src/main/java/org/apache/cayenne/tutorial/persistent/client/auto/_Artist.java?rev=1486473&r1=1486472&r2=1486473&view=diff
==============================================================================
--- cayenne/main/trunk/tutorials/tutorial-rop-client/src/main/java/org/apache/cayenne/tutorial/persistent/client/auto/_Artist.java (original)
+++ cayenne/main/trunk/tutorials/tutorial-rop-client/src/main/java/org/apache/cayenne/tutorial/persistent/client/auto/_Artist.java Sun May 26 20:33:43 2013
@@ -4,7 +4,9 @@ import java.util.Date;
import java.util.List;
import org.apache.cayenne.PersistentObject;
+import org.apache.cayenne.exp.Property;
import org.apache.cayenne.tutorial.persistent.client.Painting;
+import org.apache.cayenne.util.PersistentObjectList;
/**
* A generated persistent class mapped as "Artist" Cayenne entity. It is a good idea to
@@ -13,10 +15,17 @@ import org.apache.cayenne.tutorial.persi
*/
public abstract class _Artist extends PersistentObject {
+ @Deprecated
public static final String DATE_OF_BIRTH_PROPERTY = "dateOfBirth";
+ @Deprecated
public static final String NAME_PROPERTY = "name";
+ @Deprecated
public static final String PAINTINGS_PROPERTY = "paintings";
+ public static final Property<Date> DATE_OF_BIRTH = new Property<Date>("dateOfBirth");
+ public static final Property<String> NAME = new Property<String>("name");
+ public static final Property<List<Painting>> PAINTINGS = new Property<List<Painting>>("paintings");
+
protected Date dateOfBirth;
protected String name;
protected List<Painting> paintings;
@@ -34,12 +43,12 @@ public abstract class _Artist extends Pe
}
Object oldValue = this.dateOfBirth;
- this.dateOfBirth = dateOfBirth;
-
// notify objectContext about simple property change
if(objectContext != null) {
objectContext.propertyChanged(this, "dateOfBirth", oldValue, dateOfBirth);
}
+
+ this.dateOfBirth = dateOfBirth;
}
public String getName() {
@@ -55,32 +64,38 @@ public abstract class _Artist extends Pe
}
Object oldValue = this.name;
- this.name = name;
-
// notify objectContext about simple property change
if(objectContext != null) {
objectContext.propertyChanged(this, "name", oldValue, name);
}
+
+ this.name = name;
}
public List<Painting> getPaintings() {
if(objectContext != null) {
objectContext.prepareForAccess(this, "paintings", true);
- }
+ } else if (this.paintings == null) {
+ this.paintings = new PersistentObjectList(this, "paintings");
+ }
return paintings;
}
public void addToPaintings(Painting object) {
if(objectContext != null) {
objectContext.prepareForAccess(this, "paintings", true);
- }
+ } else if (this.paintings == null) {
+ this.paintings = new PersistentObjectList(this, "paintings");
+ }
this.paintings.add(object);
}
public void removeFromPaintings(Painting object) {
if(objectContext != null) {
objectContext.prepareForAccess(this, "paintings", true);
- }
+ } else if (this.paintings == null) {
+ this.paintings = new PersistentObjectList(this, "paintings");
+ }
this.paintings.remove(object);
}
Modified: cayenne/main/trunk/tutorials/tutorial-rop-client/src/main/java/org/apache/cayenne/tutorial/persistent/client/auto/_Datamap.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/tutorials/tutorial-rop-client/src/main/java/org/apache/cayenne/tutorial/persistent/client/auto/_Datamap.java?rev=1486473&r1=1486472&r2=1486473&view=diff
==============================================================================
--- cayenne/main/trunk/tutorials/tutorial-rop-client/src/main/java/org/apache/cayenne/tutorial/persistent/client/auto/_Datamap.java (original)
+++ cayenne/main/trunk/tutorials/tutorial-rop-client/src/main/java/org/apache/cayenne/tutorial/persistent/client/auto/_Datamap.java Sun May 26 20:33:43 2013
@@ -1,6 +1,6 @@
package org.apache.cayenne.tutorial.persistent.client.auto;
-import org.apache.cayenne.PersistentObject;
+
/**
* This class was generated by Cayenne.
Modified: cayenne/main/trunk/tutorials/tutorial-rop-client/src/main/java/org/apache/cayenne/tutorial/persistent/client/auto/_Gallery.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/tutorials/tutorial-rop-client/src/main/java/org/apache/cayenne/tutorial/persistent/client/auto/_Gallery.java?rev=1486473&r1=1486472&r2=1486473&view=diff
==============================================================================
--- cayenne/main/trunk/tutorials/tutorial-rop-client/src/main/java/org/apache/cayenne/tutorial/persistent/client/auto/_Gallery.java (original)
+++ cayenne/main/trunk/tutorials/tutorial-rop-client/src/main/java/org/apache/cayenne/tutorial/persistent/client/auto/_Gallery.java Sun May 26 20:33:43 2013
@@ -3,7 +3,9 @@ package org.apache.cayenne.tutorial.pers
import java.util.List;
import org.apache.cayenne.PersistentObject;
+import org.apache.cayenne.exp.Property;
import org.apache.cayenne.tutorial.persistent.client.Painting;
+import org.apache.cayenne.util.PersistentObjectList;
/**
* A generated persistent class mapped as "Gallery" Cayenne entity. It is a good idea to
@@ -12,9 +14,14 @@ import org.apache.cayenne.tutorial.persi
*/
public abstract class _Gallery extends PersistentObject {
+ @Deprecated
public static final String NAME_PROPERTY = "name";
+ @Deprecated
public static final String PAINTINGS_PROPERTY = "paintings";
+ public static final Property<String> NAME = new Property<String>("name");
+ public static final Property<List<Painting>> PAINTINGS = new Property<List<Painting>>("paintings");
+
protected String name;
protected List<Painting> paintings;
@@ -31,32 +38,38 @@ public abstract class _Gallery extends P
}
Object oldValue = this.name;
- this.name = name;
-
// notify objectContext about simple property change
if(objectContext != null) {
objectContext.propertyChanged(this, "name", oldValue, name);
}
+
+ this.name = name;
}
public List<Painting> getPaintings() {
if(objectContext != null) {
objectContext.prepareForAccess(this, "paintings", true);
- }
+ } else if (this.paintings == null) {
+ this.paintings = new PersistentObjectList(this, "paintings");
+ }
return paintings;
}
public void addToPaintings(Painting object) {
if(objectContext != null) {
objectContext.prepareForAccess(this, "paintings", true);
- }
+ } else if (this.paintings == null) {
+ this.paintings = new PersistentObjectList(this, "paintings");
+ }
this.paintings.add(object);
}
public void removeFromPaintings(Painting object) {
if(objectContext != null) {
objectContext.prepareForAccess(this, "paintings", true);
- }
+ } else if (this.paintings == null) {
+ this.paintings = new PersistentObjectList(this, "paintings");
+ }
this.paintings.remove(object);
}
Modified: cayenne/main/trunk/tutorials/tutorial-rop-client/src/main/java/org/apache/cayenne/tutorial/persistent/client/auto/_Painting.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/tutorials/tutorial-rop-client/src/main/java/org/apache/cayenne/tutorial/persistent/client/auto/_Painting.java?rev=1486473&r1=1486472&r2=1486473&view=diff
==============================================================================
--- cayenne/main/trunk/tutorials/tutorial-rop-client/src/main/java/org/apache/cayenne/tutorial/persistent/client/auto/_Painting.java (original)
+++ cayenne/main/trunk/tutorials/tutorial-rop-client/src/main/java/org/apache/cayenne/tutorial/persistent/client/auto/_Painting.java Sun May 26 20:33:43 2013
@@ -2,8 +2,10 @@ package org.apache.cayenne.tutorial.pers
import org.apache.cayenne.PersistentObject;
import org.apache.cayenne.ValueHolder;
+import org.apache.cayenne.exp.Property;
import org.apache.cayenne.tutorial.persistent.client.Artist;
import org.apache.cayenne.tutorial.persistent.client.Gallery;
+import org.apache.cayenne.util.PersistentObjectHolder;
/**
* A generated persistent class mapped as "Painting" Cayenne entity. It is a good idea to
@@ -12,10 +14,17 @@ import org.apache.cayenne.tutorial.persi
*/
public abstract class _Painting extends PersistentObject {
+ @Deprecated
public static final String NAME_PROPERTY = "name";
+ @Deprecated
public static final String ARTIST_PROPERTY = "artist";
+ @Deprecated
public static final String GALLERY_PROPERTY = "gallery";
+ public static final Property<String> NAME = new Property<String>("name");
+ public static final Property<Artist> ARTIST = new Property<Artist>("artist");
+ public static final Property<Gallery> GALLERY = new Property<Gallery>("gallery");
+
protected String name;
protected ValueHolder artist;
protected ValueHolder gallery;
@@ -33,41 +42,63 @@ public abstract class _Painting extends
}
Object oldValue = this.name;
- this.name = name;
-
// notify objectContext about simple property change
if(objectContext != null) {
objectContext.propertyChanged(this, "name", oldValue, name);
}
+
+ this.name = name;
}
public Artist getArtist() {
if(objectContext != null) {
objectContext.prepareForAccess(this, "artist", true);
- }
+ } else if (this.artist == null) {
+ this.artist = new PersistentObjectHolder(this, "artist");
+ }
return (Artist) artist.getValue();
}
public void setArtist(Artist artist) {
if(objectContext != null) {
objectContext.prepareForAccess(this, "artist", true);
+ } else if (this.artist == null) {
+ this.artist = new PersistentObjectHolder(this, "artist");
+ }
+
+ // note how we notify ObjectContext of change BEFORE the object is actually
+ // changed... this is needed to take a valid current snapshot
+ Object oldValue = this.artist.getValueDirectly();
+ if (objectContext != null) {
+ objectContext.propertyChanged(this, "artist", oldValue, artist);
}
-
+
this.artist.setValue(artist);
}
public Gallery getGallery() {
if(objectContext != null) {
objectContext.prepareForAccess(this, "gallery", true);
- }
+ } else if (this.gallery == null) {
+ this.gallery = new PersistentObjectHolder(this, "gallery");
+ }
return (Gallery) gallery.getValue();
}
public void setGallery(Gallery gallery) {
if(objectContext != null) {
objectContext.prepareForAccess(this, "gallery", true);
+ } else if (this.gallery == null) {
+ this.gallery = new PersistentObjectHolder(this, "gallery");
+ }
+
+ // note how we notify ObjectContext of change BEFORE the object is actually
+ // changed... this is needed to take a valid current snapshot
+ Object oldValue = this.gallery.getValueDirectly();
+ if (objectContext != null) {
+ objectContext.propertyChanged(this, "gallery", oldValue, gallery);
}
-
+
this.gallery.setValue(gallery);
}