Author: dgeraskov Date: 2010-05-27 10:06:40 -0400 (Thu, 27 May 2010) New Revision: 22370 Modified: branches/3.2.helios/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/NamingStrategyMappingTools.java branches/3.2.helios/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/java/HibernateJavaJoinColumnImpl.java branches/3.2.helios/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/orm/HibernateOrmJoinColumnImpl.java branches/3.2.helios/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/src/org/jboss/tools/hibernate/jpt/ui/internal/mappings/db/xpl/ColumnCombo.java branches/3.2.helios/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/src/org/jboss/tools/hibernate/jpt/ui/internal/mappings/db/xpl/DatabaseObjectCombo.java branches/3.2.helios/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/src/org/jboss/tools/hibernate/jpt/ui/internal/mappings/db/xpl/TableCombo.java Log: move to updated api Modified: branches/3.2.helios/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/NamingStrategyMappingTools.java =================================================================== --- branches/3.2.helios/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/NamingStrategyMappingTools.java 2010-05-27 12:43:37 UTC (rev 22369) +++ branches/3.2.helios/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/NamingStrategyMappingTools.java 2010-05-27 14:06:40 UTC (rev 22370) @@ -111,7 +111,7 @@ } String prefix = owner.getAttributeName(); if (prefix == null) { - Entity targetEntity = owner.getTargetEntity(); + Entity targetEntity = owner.getRelationshipTarget(); if (targetEntity == null) { return null; } Modified: branches/3.2.helios/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/java/HibernateJavaJoinColumnImpl.java =================================================================== --- branches/3.2.helios/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/java/HibernateJavaJoinColumnImpl.java 2010-05-27 12:43:37 UTC (rev 22369) +++ branches/3.2.helios/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/java/HibernateJavaJoinColumnImpl.java 2010-05-27 14:06:40 UTC (rev 22370) @@ -54,7 +54,7 @@ if (this.getOwner().joinColumnsSize() != 1) { return null; } - Entity targetEntity = this.getOwner().getTargetEntity(); + Entity targetEntity = this.getOwner().getRelationshipTarget(); if (targetEntity == null) { return null; } Modified: branches/3.2.helios/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/orm/HibernateOrmJoinColumnImpl.java =================================================================== --- branches/3.2.helios/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/orm/HibernateOrmJoinColumnImpl.java 2010-05-27 12:43:37 UTC (rev 22369) +++ branches/3.2.helios/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/orm/HibernateOrmJoinColumnImpl.java 2010-05-27 14:06:40 UTC (rev 22370) @@ -117,7 +117,7 @@ if (this.getOwner().joinColumnsSize() != 1) { return null; } - Entity targetEntity = this.getOwner().getTargetEntity(); + Entity targetEntity = this.getOwner().getRelationshipTarget(); if (targetEntity == null) { return null; } Modified: branches/3.2.helios/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/src/org/jboss/tools/hibernate/jpt/ui/internal/mappings/db/xpl/ColumnCombo.java =================================================================== --- branches/3.2.helios/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/src/org/jboss/tools/hibernate/jpt/ui/internal/mappings/db/xpl/ColumnCombo.java 2010-05-27 12:43:37 UTC (rev 22369) +++ branches/3.2.helios/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/src/org/jboss/tools/hibernate/jpt/ui/internal/mappings/db/xpl/ColumnCombo.java 2010-05-27 14:06:40 UTC (rev 22370) @@ -38,15 +38,6 @@ super(parentPane, subjectHolder, parent); } - public ColumnCombo( - PropertyValueModel<? extends T> subjectHolder, - Composite parent, - WidgetFactory widgetFactory) { - - super(subjectHolder, parent, widgetFactory); - } - - @Override protected Iterable<String> getValues_() { Table dbTable = this.getDbTable(); Modified: branches/3.2.helios/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/src/org/jboss/tools/hibernate/jpt/ui/internal/mappings/db/xpl/DatabaseObjectCombo.java =================================================================== --- branches/3.2.helios/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/src/org/jboss/tools/hibernate/jpt/ui/internal/mappings/db/xpl/DatabaseObjectCombo.java 2010-05-27 12:43:37 UTC (rev 22369) +++ branches/3.2.helios/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/src/org/jboss/tools/hibernate/jpt/ui/internal/mappings/db/xpl/DatabaseObjectCombo.java 2010-05-27 14:06:40 UTC (rev 22370) @@ -74,16 +74,8 @@ super(parentPane, subjectHolder, parent); } + - protected DatabaseObjectCombo( - PropertyValueModel<? extends T> subjectHolder, - Composite parent, - WidgetFactory widgetFactory) { - - super(subjectHolder, parent, widgetFactory); - } - - // ********** initialization ********** @Override Modified: branches/3.2.helios/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/src/org/jboss/tools/hibernate/jpt/ui/internal/mappings/db/xpl/TableCombo.java =================================================================== --- branches/3.2.helios/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/src/org/jboss/tools/hibernate/jpt/ui/internal/mappings/db/xpl/TableCombo.java 2010-05-27 12:43:37 UTC (rev 22369) +++ branches/3.2.helios/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/src/org/jboss/tools/hibernate/jpt/ui/internal/mappings/db/xpl/TableCombo.java 2010-05-27 14:06:40 UTC (rev 22370) @@ -38,15 +38,6 @@ super(parentPane, subjectHolder, parent); } - public TableCombo( - PropertyValueModel<? extends T> subjectHolder, - Composite parent, - WidgetFactory widgetFactory) { - - super(subjectHolder, parent, widgetFactory); - } - - @Override protected Iterable<String> getValues_() { Schema dbSchema = this.getDbSchema();