Author: vyemialyanchyk Date: 2008-08-13 13:59:34 -0400 (Wed, 13 Aug 2008) New Revision: 9707 Modified: trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/model/IReverseEngineeringDefinition.java trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/model/impl/ReverseEngineeringDefinitionImpl.java 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/model/DOMReverseEngineeringDefinition.java Log: JBIDE-1610 Modified: trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/model/IReverseEngineeringDefinition.java =================================================================== --- trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/model/IReverseEngineeringDefinition.java 2008-08-13 17:40:37 UTC (rev 9706) +++ trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/model/IReverseEngineeringDefinition.java 2008-08-13 17:59:34 UTC (rev 9707) @@ -57,6 +57,7 @@ IRevEngTable createTable(); void addTable(IRevEngTable retable); void removeTable(IRevEngTable retable); + void removeColumn(IRevEngColumn recolumn); IRevEngColumn createColumn(); IRevEngColumn createKeyColumn(); Modified: trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/model/impl/ReverseEngineeringDefinitionImpl.java =================================================================== --- trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/model/impl/ReverseEngineeringDefinitionImpl.java 2008-08-13 17:40:37 UTC (rev 9706) +++ trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/model/impl/ReverseEngineeringDefinitionImpl.java 2008-08-13 17:59:34 UTC (rev 9707) @@ -161,6 +161,10 @@ } + public void removeColumn(IRevEngColumn recolumn) { + + } + public IRevEngColumn createColumn() { return null; } 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 2008-08-13 17:40:37 UTC (rev 9706) +++ trunk/hibernatetools/plugins/org.hibernate.eclipse.mapper/src/org/hibernate/eclipse/mapper/editors/reveng/TablePropertiesBlock.java 2008-08-13 17:59:34 UTC (rev 9707) @@ -231,14 +231,20 @@ List list = ts.toList(); for (Iterator it = list.iterator(); it.hasNext();) { Object obj = it.next(); - if (!(obj instanceof IRevEngTable)) { - continue; + if (obj instanceof IRevEngTable) { + IRevEngTable retable = (IRevEngTable)obj; + if (retable instanceof RevEngTableAdapter) { + updateSelection = true; + } + editor.getReverseEngineeringDefinition().removeTable(retable); } - IRevEngTable retable = (IRevEngTable)obj; - if (retable instanceof RevEngTableAdapter) { - updateSelection = true; + else if (obj instanceof IRevEngColumn) { + IRevEngColumn recolumn = (IRevEngColumn)obj; + if (recolumn instanceof RevEngColumnAdapter) { + updateSelection = true; + } + editor.getReverseEngineeringDefinition().removeColumn(recolumn); } - editor.getReverseEngineeringDefinition().removeTable(retable); } if (updateSelection) { // if it possible select first item Modified: trunk/hibernatetools/plugins/org.hibernate.eclipse.mapper/src/org/hibernate/eclipse/mapper/model/DOMReverseEngineeringDefinition.java =================================================================== --- trunk/hibernatetools/plugins/org.hibernate.eclipse.mapper/src/org/hibernate/eclipse/mapper/model/DOMReverseEngineeringDefinition.java 2008-08-13 17:40:37 UTC (rev 9706) +++ trunk/hibernatetools/plugins/org.hibernate.eclipse.mapper/src/org/hibernate/eclipse/mapper/model/DOMReverseEngineeringDefinition.java 2008-08-13 17:59:34 UTC (rev 9707) @@ -45,6 +45,7 @@ import org.w3c.dom.Document; import org.w3c.dom.Element; import org.w3c.dom.Node; +import org.w3c.dom.NodeList; public class DOMReverseEngineeringDefinition implements IReverseEngineeringDefinition { @@ -351,19 +352,28 @@ } public void removeTable(IRevEngTable retable) { - if ( retable instanceof RevEngTableAdapter) { + if (retable instanceof RevEngTableAdapter) { RevEngTableAdapter tf = (RevEngTableAdapter) retable; Node parentNode = tf.getNode().getParentNode(); Node previousSibling = tf.getNode().getPreviousSibling(); - if(DOMModelUtil.isWhiteSpace(previousSibling)) { + if (DOMModelUtil.isWhiteSpace(previousSibling)) { parentNode.removeChild(previousSibling); } parentNode.removeChild(tf.getNode()); DOMModelUtil.formatNode(parentNode); - if(parentNode.getChildNodes().getLength()==0) { - Node parentNode2 = parentNode.getParentNode(); - parentNode2.removeChild(parentNode); + } + } + + public void removeColumn(IRevEngColumn recolumn) { + if (recolumn instanceof RevEngColumnAdapter) { + RevEngColumnAdapter cf = (RevEngColumnAdapter) recolumn; + Node parentNode = cf.getNode().getParentNode(); + Node previousSibling = cf.getNode().getPreviousSibling(); + if (DOMModelUtil.isWhiteSpace(previousSibling)) { + parentNode.removeChild(previousSibling); } + parentNode.removeChild(cf.getNode()); + DOMModelUtil.formatNode(parentNode); } }