Author: dgeraskov Date: 2009-08-20 03:59:29 -0400 (Thu, 20 Aug 2009) New Revision: 17179 Modified: trunk/hibernatetools/plugins/org.hibernate.eclipse.mapper/src/org/hibernate/eclipse/mapper/editors/reveng/TablePropertiesBlock.java Log: https://jira.jboss.org/jira/browse/JBIDE-4777 Fixed NPE Fixed problem with adding primary key's columns Modified: trunk/hibernatetools/plugins/org.hibernate.eclipse.mapper/src/org/hibernate/eclipse/mapper/editors/reveng/TablePropertiesBlock.java =================================================================== --- trunk/hibernatetools/plugins/org.hibernate.eclipse.mapper/src/org/hibernate/eclipse/mapper/editors/reveng/TablePropertiesBlock.java 2009-08-20 07:20:06 UTC (rev 17178) +++ trunk/hibernatetools/plugins/org.hibernate.eclipse.mapper/src/org/hibernate/eclipse/mapper/editors/reveng/TablePropertiesBlock.java 2009-08-20 07:59:29 UTC (rev 17179) @@ -71,6 +71,7 @@ import org.hibernate.eclipse.mapper.model.RevEngPrimaryKeyAdapter; import org.hibernate.eclipse.mapper.model.RevEngTableAdapter; import org.hibernate.mapping.Column; +import org.hibernate.mapping.PrimaryKey; import org.hibernate.mapping.Table; public class TablePropertiesBlock extends MasterDetailsBlock { @@ -206,6 +207,13 @@ columns.put(lastTable,existing); } existing.add(object); + } else if (object instanceof PrimaryKey) { + List existing = (List) columns.get(lastTable); + if(existing==null) { + existing = new ArrayList(); + columns.put(lastTable,existing); + } + existing.addAll(((PrimaryKey)object).getColumns()); } } } @@ -231,7 +239,9 @@ Column column = (Column) colIterator.next(); IRevEngColumn revCol = editor.getReverseEngineeringDefinition().createColumn(); revCol.setName(column.getName()); - revCol.setJDBCType(column.getSqlType()); // TODO: should not be required + if (column.getSqlType() != null){ + revCol.setJDBCType(column.getSqlType()); // TODO: should not be required + } retable.addColumn(revCol); } }