svn commit: r596756 - in /cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne: modeler/editor/dbentity/ pref/

[aa...@apache.org]

Author: aadamchik
Date: Tue Nov 20 09:57:34 2007
New Revision: 596756

URL: http://svn.apache.org/viewvc?rev=596756&view=rev
Log:
java5 : generics

Modified:
    cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/dbentity/DbEntityTab.java
    cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/dbentity/PKDBGeneratorPanel.java
    cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/dbentity/PKGeneratorPanel.java
    cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/pref/Domain.java

Modified: cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/dbentity/DbEntityTab.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/dbentity/DbEntityTab.java?rev=596756&r1=596755&r2=596756&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/dbentity/DbEntityTab.java (original)
+++ cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/dbentity/DbEntityTab.java Tue Nov 20 09:57:34 2007
@@ -209,7 +209,7 @@
             type = PK_CUSTOM_SEQUENCE_GENERATOR;
         }
         else {
-            Iterator it = entity.getPrimaryKey().iterator();
+            Iterator it = entity.getPrimaryKeys().iterator();
             while (it.hasNext()) {
                 DbAttribute a = (DbAttribute) it.next();
                 if (a.isGenerated()) {

Modified: cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/dbentity/PKDBGeneratorPanel.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/dbentity/PKDBGeneratorPanel.java?rev=596756&r1=596755&r2=596756&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/dbentity/PKDBGeneratorPanel.java (original)
+++ cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/dbentity/PKDBGeneratorPanel.java Tue Nov 20 09:57:34 2007
@@ -76,7 +76,7 @@
     public void onInit(DbEntity entity) {
         resetStrategy(entity, true, false);
 
-        Collection pkAttributes = entity.getPrimaryKey();
+        Collection pkAttributes = entity.getPrimaryKeys();
 
         // by default check the only numeric PK
         if (pkAttributes.size() == 1) {
@@ -96,7 +96,7 @@
             attributes.removeItemListener(listeners[i]);
         }
 
-        Collection pkAttributes = entity.getPrimaryKey();
+        Collection pkAttributes = entity.getPrimaryKeys();
         if (pkAttributes.isEmpty()) {
             attributes.removeAllItems();
             attributes.addItem("<Entity has no PK columns>");

Modified: cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/dbentity/PKGeneratorPanel.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/dbentity/PKGeneratorPanel.java?rev=596756&r1=596755&r2=596756&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/dbentity/PKGeneratorPanel.java (original)
+++ cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/dbentity/PKGeneratorPanel.java Tue Nov 20 09:57:34 2007
@@ -61,7 +61,7 @@
         }
 
         if (resetDBGenerated) {
-            Iterator it = entity.getPrimaryKey().iterator();
+            Iterator it = entity.getPrimaryKeys().iterator();
             while (it.hasNext()) {
                 DbAttribute a = (DbAttribute) it.next();
                 if (a.isGenerated()) {

Modified: cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/pref/Domain.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/pref/Domain.java?rev=596756&r1=596755&r2=596756&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/pref/Domain.java (original)
+++ cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/pref/Domain.java Tue Nov 20 09:57:34 2007
@@ -178,7 +178,7 @@
 
         ObjectContext context = getObjectContext();
         DbEntity entity = context.getEntityResolver().lookupDbEntity(javaClass);
-        DbAttribute pk = (DbAttribute) entity.getPrimaryKey().get(0);
+        DbAttribute pk = entity.getPrimaryKeys().iterator().next();
 
         Expression qualifier = Expression.fromString("db:" + pk.getName() + " in $ids");
         Map params = Collections.singletonMap("ids", ids);