Author: dgeraskov Date: 2008-10-20 05:44:15 -0400 (Mon, 20 Oct 2008) New Revision: 10967 Modified: branches/jbosstools-3.0.0.Beta1/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/launch/CodeGenerationLaunchDelegate.java branches/jbosstools-3.0.0.Beta1/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/launch/ExporterAttributes.java Log: http://jira.jboss.com/jira/browse/JBIDE-1178 Reveng filter storage moved from launch configuration to xml file. File stored in .settings dir of the project. Modified: branches/jbosstools-3.0.0.Beta1/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/launch/CodeGenerationLaunchDelegate.java =================================================================== --- branches/jbosstools-3.0.0.Beta1/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/launch/CodeGenerationLaunchDelegate.java 2008-10-20 09:44:10 UTC (rev 10966) +++ branches/jbosstools-3.0.0.Beta1/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/launch/CodeGenerationLaunchDelegate.java 2008-10-20 09:44:15 UTC (rev 10967) @@ -266,7 +266,6 @@ final String reverseEngineeringStrategy = attributes.getRevengStrategy(); final boolean preferBasicCompositeids = attributes.isPreferBasicCompositeIds(); final IResource revengres = PathHelper.findMember( root, attributes.getRevengSettings()); - final String revengTables = attributes.getRevengTables(); if(reveng) { Configuration configuration = null; @@ -291,12 +290,7 @@ OverrideRepository repository = null; - if (revengTables != null){ - repository = new OverrideRepository(); - repository.addInputStream(new ByteArrayInputStream(revengTables.getBytes())); - } else if(revengres!=null) { - /*Configuration configuration = cc.buildWith(new Configuration(), false);*/ - /*Settings settings = cc.getSettings(configuration);*/ + if(revengres!=null) { File file = PathHelper.getLocation( revengres ).toFile(); repository = new OverrideRepository(); repository.addFile(file); Modified: branches/jbosstools-3.0.0.Beta1/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/launch/ExporterAttributes.java =================================================================== --- branches/jbosstools-3.0.0.Beta1/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/launch/ExporterAttributes.java 2008-10-20 09:44:10 UTC (rev 10966) +++ branches/jbosstools-3.0.0.Beta1/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/launch/ExporterAttributes.java 2008-10-20 09:44:15 UTC (rev 10967) @@ -74,7 +74,6 @@ private String templatePath; private List exporterFactories; // if set then build reveng strategy relying on the list of tables - private String revengTables; private boolean autoManyToManyDetection; private boolean autoVersioning; @@ -110,7 +109,6 @@ } exporterFactories = readExporterFactories(configuration); - revengTables = configuration.getAttribute(HibernateLaunchConstants.ATTR_REVENG_TABLES, (String)null); } catch (CoreException e) { throw new CoreException(HibernateConsolePlugin.throwableToStatus(e, 666)); } @@ -347,19 +345,12 @@ return exporterFactories; } -public boolean detectManyToMany() { - return autoManyToManyDetection; -} + public boolean detectManyToMany() { + return autoManyToManyDetection; + } public boolean detectOptimisticLock() { return autoVersioning; } - public String getRevengTables() { - return revengTables; - } - - - - }