Author: vyemialyanchyk Date: 2010-03-31 08:04:50 -0400 (Wed, 31 Mar 2010) New Revision: 21146 Modified: branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/model/impl/TableFilterImpl.java branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/launch/CodeGenerationLaunchDelegate.java branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.eclipse.mapper/src/org/hibernate/eclipse/mapper/editors/ReverseEngineeringEditor.java branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.mediator/src/org/hibernate/mediator/stubs/OverrideRepositoryStub.java branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.mediator/src/org/hibernate/mediator/stubs/TableFilterStub.java Log: https://jira.jboss.org/jira/browse/JBIDE-6070 - update Modified: branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/model/impl/TableFilterImpl.java =================================================================== --- branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/model/impl/TableFilterImpl.java 2010-03-31 07:39:46 UTC (rev 21145) +++ branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/model/impl/TableFilterImpl.java 2010-03-31 12:04:50 UTC (rev 21146) @@ -26,7 +26,7 @@ public class TableFilterImpl implements ITableFilter { - TableFilterStub tf = new TableFilterStub(); + TableFilterStub tf = TableFilterStub.newInstance(); private final ReverseEngineeringDefinitionImpl revModel; protected TableFilterImpl( Modified: branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/launch/CodeGenerationLaunchDelegate.java =================================================================== --- branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/launch/CodeGenerationLaunchDelegate.java 2010-03-31 07:39:46 UTC (rev 21145) +++ branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/launch/CodeGenerationLaunchDelegate.java 2010-03-31 12:04:50 UTC (rev 21146) @@ -290,7 +290,7 @@ if(revengres!=null) { File file = PathHelper.getLocation( revengres ).toFile(); - repository = new OverrideRepositoryStub(); + repository = OverrideRepositoryStub.newInstance(); repository.addFile(file); } Modified: branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.eclipse.mapper/src/org/hibernate/eclipse/mapper/editors/ReverseEngineeringEditor.java =================================================================== --- branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.eclipse.mapper/src/org/hibernate/eclipse/mapper/editors/ReverseEngineeringEditor.java 2010-03-31 07:39:46 UTC (rev 21145) +++ branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.eclipse.mapper/src/org/hibernate/eclipse/mapper/editors/ReverseEngineeringEditor.java 2010-03-31 12:04:50 UTC (rev 21146) @@ -198,11 +198,11 @@ ITableFilter[] tableFilters = getReverseEngineeringDefinition().getTableFilters(); SettingsStub settings = configuration.getSettings2(); - OverrideRepositoryStub repository = new OverrideRepositoryStub();///*settings.getDefaultCatalogName(),settings.getDefaultSchemaName()*/); + OverrideRepositoryStub repository = OverrideRepositoryStub.newInstance();///*settings.getDefaultCatalogName(),settings.getDefaultSchemaName()*/); boolean hasIncludes = false; for (int i = 0; i < tableFilters.length; i++) { ITableFilter filter = tableFilters[i]; - TableFilterStub tf = new TableFilterStub(); + TableFilterStub tf = TableFilterStub.newInstance(); tf.setExclude(filter.getExclude()); if(filter.getExclude()!=null && !filter.getExclude().booleanValue()) { hasIncludes = true; @@ -212,7 +212,7 @@ tf.setMatchSchema(filter.getMatchSchema()); repository.addTableFilter(tf); } - TableFilterStub tf = new TableFilterStub(); + TableFilterStub tf = TableFilterStub.newInstance(); tf.setExclude(Boolean.FALSE); tf.setMatchCatalog(".*"); //$NON-NLS-1$ tf.setMatchSchema(".*"); //$NON-NLS-1$ Modified: branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.mediator/src/org/hibernate/mediator/stubs/OverrideRepositoryStub.java =================================================================== --- branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.mediator/src/org/hibernate/mediator/stubs/OverrideRepositoryStub.java 2010-03-31 07:39:46 UTC (rev 21145) +++ branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.mediator/src/org/hibernate/mediator/stubs/OverrideRepositoryStub.java 2010-03-31 12:04:50 UTC (rev 21146) @@ -10,6 +10,10 @@ protected OverrideRepositoryStub(Object overrideRepository) { this.overrideRepository = (OverrideRepository)overrideRepository; } + + public static OverrideRepositoryStub newInstance() { + return new OverrideRepositoryStub(new OverrideRepository()); + } public void addFile(File file) { overrideRepository.addFile(file); Modified: branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.mediator/src/org/hibernate/mediator/stubs/TableFilterStub.java =================================================================== --- branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.mediator/src/org/hibernate/mediator/stubs/TableFilterStub.java 2010-03-31 07:39:46 UTC (rev 21145) +++ branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.mediator/src/org/hibernate/mediator/stubs/TableFilterStub.java 2010-03-31 12:04:50 UTC (rev 21146) @@ -9,6 +9,10 @@ protected TableFilterStub(Object tableFilter) { this.tableFilter = (TableFilter)tableFilter; } + + public static TableFilterStub newInstance() { + return new TableFilterStub(new TableFilter()); + } public void setExclude(Boolean exclude) { tableFilter.setExclude(exclude);