[jbosstools-commits] JBoss Tools SVN: r25573 - branches/jbosstools-3.2.0.Beta1/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/model/impl.
Author: dgeraskov
Date: 2010-10-07 13:14:36 -0400 (Thu, 07 Oct 2010)
New Revision: 25573
Modified:
branches/jbosstools-3.2.0.Beta1/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/model/impl/ExporterFactory.java
Log:
https://jira.jboss.org/browse/JBIDE-7280
fixed special exporter settings problems
Modified:
branches/jbosstools-3.2.0.Beta1/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/model/impl/ExporterFactory.java
===================================================================
---
branches/jbosstools-3.2.0.Beta1/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/model/impl/ExporterFactory.java 2010-10-07
17:09:32 UTC (rev 25572)
+++
branches/jbosstools-3.2.0.Beta1/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/model/impl/ExporterFactory.java 2010-10-07
17:14:36 UTC (rev 25573)
@@ -184,7 +184,7 @@
Properties props = new Properties();
props.putAll(globalProps);
props.putAll(getProperties());
- extractExporterProperties(exporterId, props, extract);
+ extractExporterProperties(getExporterDefinitionId(), props, extract);
String outputPath = defOutDir;
if (extract.containsKey(ExporterFactoryStrings.OUTPUTDIR)) {
outputPath = extract.getProperty(ExporterFactoryStrings.OUTPUTDIR);
@@ -216,7 +216,7 @@
exporter.setProperties(props);
exporter.setArtifactCollector(collector);
- extractExporterProperties(exporterId, props, extract);
+ extractExporterProperties(getExporterDefinitionId(), props, extract);
String outputPath = defaultOutputDirectory;
if (extract.containsKey(ExporterFactoryStrings.OUTPUTDIR)) {
@@ -278,20 +278,20 @@
}
exporter.setTemplatePath(templatePathList.toArray(new
String[templatePathList.size()]));
// special handling for GenericExporter (TODO: be delegated via plugin.xml)
- if (exporterId.equals("org.hibernate.tools.hbmtemplate")) { //$NON-NLS-1$
+ if (getExporterDefinitionId().equals("org.hibernate.tools.hbmtemplate")) {
//$NON-NLS-1$
GenericExporter ge = (GenericExporter) exporter;
ge.setFilePattern(extract.getProperty(ExporterFactoryStrings.FILE_PATTERN));
ge.setTemplateName(extract.getProperty(ExporterFactoryStrings.TEMPLATE_NAME));
ge.setForEach(extract.getProperty(ExporterFactoryStrings.FOR_EACH));
}
// special handling for Hbm2DDLExporter
- if (exporterId.equals("org.hibernate.tools.hbm2ddl")) { //$NON-NLS-1$
+ if (getExporterDefinitionId().equals("org.hibernate.tools.hbm2ddl")) {
//$NON-NLS-1$
Hbm2DDLExporter ddlExporter = (Hbm2DDLExporter) exporter;
//avoid users to delete their databases with a single click
ddlExporter.setExport(Boolean.getBoolean(extract.getProperty(ExporterFactoryStrings.EXPORTTODATABASE)));
}
// special handling for QueryExporter
- if (exporterId.equals("org.hibernate.tools.query")) { //$NON-NLS-1$
+ if (getExporterDefinitionId().equals("org.hibernate.tools.query")) {
//$NON-NLS-1$
QueryExporter queryExporter = (QueryExporter) exporter;
List<String> queryStrings = new ArrayList<String>();
queryStrings.add(extract.getProperty(ExporterFactoryStrings.QUERY_STRING));