svn commit: r1407947 - /cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/util/EntityMergeSupport.java

[aadamchik]

Author: aadamchik
Date: Sun Nov 11 11:54:33 2012
New Revision: 1407947

URL: http://svn.apache.org/viewvc?rev=1407947&view=rev
Log:
minot cleanup... this class is a total mess

Modified:
    
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/util/EntityMergeSupport.java

Modified: 
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/util/EntityMergeSupport.java
URL: 
http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/util/EntityMergeSupport.java?rev=1407947&r1=1407946&r2=1407947&view=diff
==============================================================================
--- 
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/util/EntityMergeSupport.java
 (original)
+++ 
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/util/EntityMergeSupport.java
 Sun Nov 11 11:54:33 2012
@@ -208,21 +208,17 @@ public class EntityMergeSupport {
                 .getDbEntity());
 
         for (DbAttribute dba : objEntity.getDbEntity().getAttributes()) {
-            // already there
+            
+            if (dba.getName() == null) {
+                continue;
+            }
+            
             if (objEntity.getAttributeForDbAttribute(dba) != null) {
                 continue;
             }
 
-            // check if adding it makes sense at all
-            if (!removeMeaningfulPKs) {
-                if (dba.getName() == null) {
-                    continue;
-                }
-            }
-            else {
-                if (dba.getName() == null || dba.isPrimaryKey()) {
-                    continue;
-                }
+            if (removeMeaningfulPKs && dba.isPrimaryKey()) {
+                continue;
             }
 
             // check FK's