Changeset 8011

Timestamp:

07/12/11 17:13:59 (9 years ago)

Author:

mnagni

Message:

 

Location:

mauRepo/xmi2sqlalchemy/trunk/src/main/java/ndg/services/newmoon/velocity/python

Files:

• GenerateTables_.java (modified) (1 diff)
• PythonClassModel.java (modified) (1 diff)

mauRepo/xmi2sqlalchemy/trunk/src/main/java/ndg/services/newmoon/velocity/python/GenerateTables_.java

@@ -119 +119 @@
                 while (iter.hasNext()) {
                         item = iter.next();
-                        if (item instanceof TableModel && ((TableModel)item).isSkipIt())
+                        if (item instanceof TableModel && (((TableModel)item).isSkipIt() 
+                                        || ((TableModel)item).getAssociatedClass().equals("EARootClass")))
                                 continue;
                         

mauRepo/xmi2sqlalchemy/trunk/src/main/java/ndg/services/newmoon/velocity/python/PythonClassModel.java

@@ -91 +91 @@
         
         private void importInheritedTypes(ClassModel classModel, List toImport) {
-                if (CollectionUtils.isEmpty(classModel.getParents()))
-                        CollectionUtils.addAll(toImport, classModel.getAttributeModel().iterator());
-                for (ClassModel cm : this.getParents()) {
-                        importInheritedTypes(cm, toImport);
-                }
+                if (!CollectionUtils.isEmpty(classModel.getParents())) {
+                        for (ClassModel cm : classModel.getParents()) {
+                                importInheritedTypes(cm, toImport);
+                        }
+                }
+                        
+                CollectionUtils.addAll(toImport, classModel.getAttributeModel().iterator());
         }