Author: vyemialyanchyk
Date: 2009-05-22 08:01:46 -0400 (Fri, 22 May 2009)
New Revision: 15401
Modified:
trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/ui/veditor/editors/model/OrmDiagram.java
Log:
https://jira.jboss.org/jira/browse/JBIDE-4361 npe fix
Modified:
trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/ui/veditor/editors/model/OrmDiagram.java
===================================================================
---
trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/ui/veditor/editors/model/OrmDiagram.java 2009-05-22
10:53:12 UTC (rev 15400)
+++
trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/ui/veditor/editors/model/OrmDiagram.java 2009-05-22
12:01:46 UTC (rev 15401)
@@ -99,7 +99,14 @@
}
public IPath getStoreFolderPath() {
- return
javaProject.getProject().getLocation().append(".settings").append(HIBERNATE_MAPPING_LAYOUT_FOLDER_NAME);
//$NON-NLS-1$
+ IPath storePath = null;
+ if (javaProject != null && javaProject.getProject() != null) {
+ storePath = javaProject.getProject().getLocation();
+ }
+ else {
+ storePath = VisualEditorPlugin.getDefault().getStateLocation();
+ }
+ return
storePath.append(".settings").append(HIBERNATE_MAPPING_LAYOUT_FOLDER_NAME);
//$NON-NLS-1$
}
public IPath getStoreFilePath() {
@@ -700,7 +707,7 @@
public IFile createLayoutFile(InputStream source) {
IFile file = null;
- IPath path =
javaProject.getProject().getLocation().append(".settings").append(HIBERNATE_MAPPING_LAYOUT_FOLDER_NAME);
//$NON-NLS-1$
+ IPath path = getStoreFolderPath();
IFolder folder = ResourcesPlugin.getWorkspace().getRoot().getFolder(path);
if(!folder.exists()) {
try {