Author: dgeraskov
Date: 2009-12-29 05:19:29 -0500 (Tue, 29 Dec 2009)
New Revision: 19601
Modified:
trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/internal/jpa/collect/AllEntitiesInfoCollector.java
trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/wizards/ConfigurationActor.java
trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/wizards/NewHibernateMappingFilePage.java
trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/wizards/NewHibernateMappingFileWizard.java
Log:
https://jira.jboss.org/jira/browse/JBIDE-5330
Modified:
trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/internal/jpa/collect/AllEntitiesInfoCollector.java
===================================================================
---
trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/internal/jpa/collect/AllEntitiesInfoCollector.java 2009-12-28
17:16:02 UTC (rev 19600)
+++
trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/internal/jpa/collect/AllEntitiesInfoCollector.java 2009-12-29
10:19:29 UTC (rev 19601)
@@ -40,15 +40,19 @@
* javaProjectName + "/" + fullyQualifiedName entity name -> EntityInfo
* this collection of processed entities
*/
- protected Map<String, EntityInfo> mapCUs_Info = new TreeMap<String,
EntityInfo>();
+ protected Map<String, EntityInfo> mapCUs_Info;
/**
* annotation style preference
*/
protected AnnotStyle annotationStylePreference = AnnotStyle.FIELDS;
+
+ public AllEntitiesInfoCollector() {
+ initCollector();
+ }
public void initCollector() {
// clear collection
- mapCUs_Info.clear();
+ mapCUs_Info = new TreeMap<String, EntityInfo>();
}
/**
Modified:
trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/wizards/ConfigurationActor.java
===================================================================
---
trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/wizards/ConfigurationActor.java 2009-12-28
17:16:02 UTC (rev 19600)
+++
trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/wizards/ConfigurationActor.java 2009-12-29
10:19:29 UTC (rev 19601)
@@ -135,7 +135,7 @@
processor.setEntities(entities);
for (Entry<String, EntityInfo> entry : entities.entrySet()) {
- String fullyQualifiedName = entry.getKey();
+ String fullyQualifiedName = entry.getValue().getFullyQualifiedName();
ICompilationUnit icu = Utils.findCompilationUnit(project, fullyQualifiedName);
CompilationUnit cu = Utils.getCompilationUnit(icu, true);
@@ -276,7 +276,7 @@
rootClass.setLazy(true);
rootClass.setTable(table);
rootClass.setAbstract(entryInfo.isAbstractFlag());//abstract or interface
- rootClasses.put(entry.getKey(), rootClass);
+ rootClasses.put(entryInfo.getFullyQualifiedName(), rootClass);
}
typeVisitor = new TypeVisitor(rootClasses);
}
Modified:
trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/wizards/NewHibernateMappingFilePage.java
===================================================================
---
trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/wizards/NewHibernateMappingFilePage.java 2009-12-28
17:16:02 UTC (rev 19600)
+++
trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/wizards/NewHibernateMappingFilePage.java 2009-12-29
10:19:29 UTC (rev 19601)
@@ -185,6 +185,12 @@
this.project = iProject;
}
+ @Override
+ public String toString() {
+ return "TableLine [className=" + className + ", projectName="
//$NON-NLS-1$ //$NON-NLS-2$
+ + projectName + "]"; //$NON-NLS-1$
+ }
+
}
private enum Columns {
Modified:
trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/wizards/NewHibernateMappingFileWizard.java
===================================================================
---
trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/wizards/NewHibernateMappingFileWizard.java 2009-12-28
17:16:02 UTC (rev 19600)
+++
trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/wizards/NewHibernateMappingFileWizard.java 2009-12-29
10:19:29 UTC (rev 19601)
@@ -26,13 +26,10 @@
import java.util.Map.Entry;
import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IFolder;
import org.eclipse.core.resources.IResource;
import org.eclipse.core.runtime.Assert;
import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.Path;
import org.eclipse.jdt.core.ICompilationUnit;
import org.eclipse.jdt.core.IJavaElement;
import org.eclipse.jdt.core.IJavaProject;
@@ -246,17 +243,21 @@
try {
- IResource container = entry.getKey().getPackageFragmentRoots().length > 0
+ /* IResource container = entry.getKey().getPackageFragmentRoots().length > 0
? entry.getKey().getPackageFragmentRoots()[0].getResource()
: entry.getKey().getResource();
- IPath temp_path = entry.getKey().getProject().getLocation()
- .append(".settings").append("org.hibernate_tools.temp");
+ IPath temp_path =
entry.getKey().getProject().getLocation().append(".settings").append("org.hibernate_tools.temp");
IFolder temp_folder = entry.getKey().getProject().getFolder(new
Path(".settings/org.hibernate_tools.temp"));
+ */
+ IResource container = entry.getKey().getPackageFragmentRoots().length > 0
+ ? entry.getKey().getPackageFragmentRoots()[0].getResource()
+ : entry.getKey().getResource();
+
HibernateMappingExporter hce = new HibernateMappingExporter(config,
- temp_folder.getLocation().toFile());
+ container.getLocation().toFile());
hce.setGlobalSettings(hmgs);
//hce.setForEach("entity");
@@ -341,7 +342,7 @@
//separate by parent project
while (it.hasNext()) {
ICompilationUnit cu = it.next();
- Set<ICompilationUnit> set = mapJP_CUSet.get(cu.getJavaProject());
+ Set<ICompilationUnit> set =
mapJP_CUSet.get(cu.getJavaProject().getElementName());
if (set == null) {
set = new HashSet<ICompilationUnit>();
mapJP_CUSet.put(cu.getJavaProject(), set);