From c14913afcb0de726801241e6b66533b52bce78a6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kjetil=20=C3=98rbekk?= <orbekk@pvv.ntnu.no>
Date: Fri, 3 Sep 2010 02:20:01 -0400
Subject: Minor improvements to the data objects

---
 src/lq/ImportQuotes.java | 2 +-
 src/lq/Quote.java        | 3 ++-
 src/lq/Vote.java         | 9 ++-------
 3 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/src/lq/ImportQuotes.java b/src/lq/ImportQuotes.java
index bda4a8f..30ad811 100644
--- a/src/lq/ImportQuotes.java
+++ b/src/lq/ImportQuotes.java
@@ -53,7 +53,7 @@ public class ImportQuotes extends HttpServlet {
             try {
                 String importIdString = req.getParameter("importId");
                 if (importIdString ==  null) {
-                    uploadInChunks(pm, votes, 100);
+                    // uploadInChunks(pm, votes, 100);
                     uploadInChunks(pm, quotes, 100);
                     resp.getWriter().println("Import finished.");
                 }
diff --git a/src/lq/Quote.java b/src/lq/Quote.java
index 8edefaa..7a65294 100644
--- a/src/lq/Quote.java
+++ b/src/lq/Quote.java
@@ -5,13 +5,14 @@ import com.google.appengine.api.datastore.Text;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
+import javax.jdo.annotations.Embedded;
 import javax.jdo.annotations.IdGeneratorStrategy;
 import javax.jdo.annotations.IdentityType;
 import javax.jdo.annotations.PersistenceCapable;
 import javax.jdo.annotations.Persistent;
 import javax.jdo.annotations.PrimaryKey;
 
-@PersistenceCapable(identityType = IdentityType.APPLICATION)
+@PersistenceCapable
 public class Quote {
     @PrimaryKey
     @Persistent(valueStrategy = IdGeneratorStrategy.IDENTITY)
diff --git a/src/lq/Vote.java b/src/lq/Vote.java
index 65bdf6c..e566ac5 100644
--- a/src/lq/Vote.java
+++ b/src/lq/Vote.java
@@ -2,21 +2,19 @@ package lq;
 
 import com.google.appengine.api.datastore.Key;
 import java.util.Date;
+import javax.jdo.annotations.EmbeddedOnly;
 import javax.jdo.annotations.IdGeneratorStrategy;
 import javax.jdo.annotations.IdentityType;
 import javax.jdo.annotations.PersistenceCapable;
 import javax.jdo.annotations.Persistent;
 import javax.jdo.annotations.PrimaryKey;
 
-@PersistenceCapable(identityType = IdentityType.APPLICATION)
+@PersistenceCapable
 public class Vote {
     @PrimaryKey
     @Persistent(valueStrategy = IdGeneratorStrategy.IDENTITY)
     private Key key;
 
-    @Persistent
-    private Quote quote;
-
     @Persistent
     private Long rating;
 
@@ -27,20 +25,17 @@ public class Vote {
     private String ip;
 
     public Vote(Long rating, String ip) {
-        this.quote = quote;
         this.ip = ip;
         this.rating = rating;
         timestamp = new Date();
     }
 
     public Key getKey() { return key; }
-    public Quote getQuote() { return quote; }
     public Date getTimestamp() { return timestamp; }
     public String getIp() { return ip; }
     public Long getRating() { return rating; }
 
     public void setKey(Key key) { this.key = key; }
-    public void setQuote(Quote quote) { this.quote = quote; }
     public void setTimestamp(Date timestamp) { this.timestamp = timestamp; }
     public void setIp(String ip) { this.ip = ip; }
     public void setRating(Long rating) { this.rating = rating; }
-- 
cgit v1.2.3