Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorkmoore2012-05-11 10:46:55 -0400
committerkmoore2012-05-11 10:46:55 -0400
commit1d88a0c8ea582415c89058b309bbe46d5785664e (patch)
tree9a76c7cc4c669f4919c91bc8048a3a75f0cb6edf
parent98d40e41a08cdc9285be81f5d7015bcb234b16c9 (diff)
downloadwebtools.dali-R3_0_2_patches.tar.gz
webtools.dali-R3_0_2_patches.tar.xz
webtools.dali-R3_0_2_patches.zip
Bug 374638 - java.lang.IllegalStateException: Not startedR3_0_2_patches
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/GenericJpaProjectManager.java10
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/platform/JpaPlatformManagerImpl.java4
2 files changed, 5 insertions, 9 deletions
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/GenericJpaProjectManager.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/GenericJpaProjectManager.java
index 44d0ded6b1..7d4c657144 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/GenericJpaProjectManager.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/GenericJpaProjectManager.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2006, 2010 Oracle. All rights reserved.
+ * Copyright (c) 2006, 2012 Oracle. All rights reserved.
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v1.0, which accompanies this distribution
* and is available at http://www.eclipse.org/legal/epl-v10.html.
@@ -233,18 +233,14 @@ class GenericJpaProjectManager
*/
private void buildJpaProjects() {
try {
- this.buildJpaProjects_();
- } catch (CoreException ex) {
+ this.getWorkspace().getRoot().accept(new ResourceProxyVisitor(), IResource.NONE);
+ } catch (Exception ex) {
// if we have a problem, leave the currently built JPA projects in
// place and keep executing (should be OK...)
JptJpaCorePlugin.log(ex);
}
}
- private void buildJpaProjects_() throws CoreException {
- this.getWorkspace().getRoot().accept(new ResourceProxyVisitor(), IResource.NONE);
- }
-
/**
* Internal: called by {@link JptJpaCorePlugin Dali plug-in}.
*/
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/platform/JpaPlatformManagerImpl.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/platform/JpaPlatformManagerImpl.java
index 409d8bba48..e773357b43 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/platform/JpaPlatformManagerImpl.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/platform/JpaPlatformManagerImpl.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2006, 2011 Oracle. All rights reserved.
+ * Copyright (c) 2006, 2012 Oracle. All rights reserved.
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v1.0, which accompanies this distribution
* and is available at http://www.eclipse.org/legal/epl-v10.html.
@@ -231,7 +231,7 @@ public class JpaPlatformManagerImpl
String jpaPlatformId = JptJpaCorePlugin.getJpaPlatformId(project);
JpaPlatformDescriptionImpl platformDesc = this.jpaPlatformDescriptions.getItem(jpaPlatformId);
if (platformDesc == null) {
- throw new IllegalArgumentException("Project does not have a recognized JPA platform.");
+ throw new IllegalArgumentException("Project does not have a recognized JPA platform: " + jpaPlatformId);
}
return platformDesc.buildJpaPlatform();
}

Back to the top