removed JpaProject.Manager.log(...) and .getExceptionHandler() methods;

as we should use the corresponding plug-in methods

5 files changed, 5 insertions, 80 deletions

diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/JpaProject.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/JpaProject.java
index d246640165..066cc0b35f 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/JpaProject.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/JpaProject.java
@@ -23,7 +23,6 @@ import org.eclipse.jpt.common.core.resource.java.JavaResourcePackageFragmentRoot
 import org.eclipse.jpt.common.core.resource.java.JavaResourceTypeCache;
 import org.eclipse.jpt.common.core.resource.xml.JptXmlResource;
 import org.eclipse.jpt.common.core.utility.command.JobCommand;
-import org.eclipse.jpt.common.utility.ExceptionHandler;
 import org.eclipse.jpt.common.utility.command.ExtendedCommandExecutor;
 import org.eclipse.jpt.jpa.core.context.JpaRootContextNode;
 import org.eclipse.jpt.jpa.core.resource.orm.XmlEntityMappings;
@@ -468,9 +467,6 @@ public interface JpaProject
 	 * projects
 	 */
 	interface Manager {
-
-		// ********** commands **********
-
 		/**
 		 * Execute the specified command, possibly asynchronously, synchronizing
 		 * with all the other stuff manipulating the JPA projects
@@ -481,9 +477,6 @@ public interface JpaProject
 		 */
 		void execute(JobCommand command, String jobName, JpaProject jpaProject);
 
-
-		// ********** modifying shared documents **********
-
 		/**
 		 * Return the project-wide implementation of the
 		 * {@link ExtendedCommandExecutor} interface.
@@ -494,31 +487,6 @@ public interface JpaProject
 		 * Return the JPA project's JPA workspace.
 		 */
 		JpaWorkspace getJpaWorkspace();
-
-
-		// ********** logging **********
-
-		// TODO remove (use plug-in API)
-		/**
-		 * Log the specified message.
-		 */
-		void log(String msg);
-
-		/**
-		 * Log the specified exception/error.
-		 */
-		void log(Throwable throwable);
-
-		/**
-		 * Log the specified message and exception/error.
-		 */
-		void log(String msg, Throwable throwable);
-
-		// TODO remove (use plug-in API)
-		/**
-		 * Return an exception handler that can be used by the JPA model.
-		 */
-		ExceptionHandler getExceptionHandler();
 	}
 
 
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/AbstractJpaNode.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/AbstractJpaNode.java
index 355b777c82..4b084646aa 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/AbstractJpaNode.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/AbstractJpaNode.java
@@ -190,30 +190,6 @@ public abstract class AbstractJpaNode
 	}
 
 
-	// ********** logging **********
-
-	/**
-	 * Log the specified message.
-	 */
-	protected void log(String msg) {
-		this.getJpaProjectManager().log(msg);
-	}
-
-	/**
-	 * Log the specified exception/error.
-	 */
-	protected void log(Throwable throwable) {
-		this.getJpaProjectManager().log(throwable);
-	}
-
-	/**
-	 * Log the specified message and exception/error.
-	 */
-	protected void log(String msg, Throwable throwable) {
-		this.getJpaProjectManager().log(msg, throwable);
-	}
-
-
 	// ********** AspectChangeSupport.Listener support **********
 
 	protected void aspectChanged(String aspectName) {
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/AbstractJpaProject.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/AbstractJpaProject.java
index 9e1d5cf735..6279660d40 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/AbstractJpaProject.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/AbstractJpaProject.java
@@ -1884,7 +1884,7 @@ public abstract class AbstractJpaProject
 		return new RepeatingJobCommandWrapper(
 					this.buildSynchronizeContextModelJobCommand(),
 					this.buildStartSynchronizeContextModelJobCommandExecutor(),
-					this.manager.getExceptionHandler()
+					JptJpaCorePlugin.instance().getExceptionHandler()
 				);
 	}
 
@@ -1959,14 +1959,14 @@ public abstract class AbstractJpaProject
 	 * Once that is complete, we delegate to the JPA project manager.
 	 */
 	protected NotifyingRepeatingJobCommand buildTempUpdateCommand() {
-		return new NotifyingRepeatingJobCommandWrapper(this.buildUpdateJobCommand(), this.manager.getExceptionHandler());
+		return new NotifyingRepeatingJobCommandWrapper(this.buildUpdateJobCommand(), JptJpaCorePlugin.instance().getExceptionHandler());
 	}
 
 	protected NotifyingRepeatingJobCommand buildUpdateCommand() {
 		return new NotifyingRepeatingJobCommandWrapper(
 					this.buildUpdateJobCommand(),
 					this.buildStartUpdateJobCommandExecutor(),
-					this.manager.getExceptionHandler()
+					JptJpaCorePlugin.instance().getExceptionHandler()
 				);
 	}
 
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/InternalJpaProjectManager.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/InternalJpaProjectManager.java
index b56f41b0dc..f92685913b 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/InternalJpaProjectManager.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/InternalJpaProjectManager.java
@@ -43,7 +43,6 @@ import org.eclipse.jpt.common.core.internal.utility.command.SimpleJobCommandExec
 import org.eclipse.jpt.common.core.internal.utility.command.SingleUseQueueingExtendedJobCommandExecutor;
 import org.eclipse.jpt.common.core.utility.command.ExtendedJobCommandExecutor;
 import org.eclipse.jpt.common.core.utility.command.JobCommand;
-import org.eclipse.jpt.common.utility.ExceptionHandler;
 import org.eclipse.jpt.common.utility.command.Command;
 import org.eclipse.jpt.common.utility.command.ExtendedCommandExecutor;
 import org.eclipse.jpt.common.utility.internal.ObjectTools;
@@ -906,25 +905,6 @@ class InternalJpaProjectManager
 	}
 
 
-	// ********** logging **********
-
-	public void log(String msg) {
-		JptJpaCorePlugin.instance().logError(msg);
-	}
-
-	public void log(Throwable throwable) {
-		JptJpaCorePlugin.instance().logError(throwable);
-	}
-
-	public void log(String msg, Throwable throwable) {
-		JptJpaCorePlugin.instance().logError(throwable, msg);
-	}
-
-	public ExceptionHandler getExceptionHandler() {
-		return JptJpaCorePlugin.instance().getExceptionHandler();
-	}
-
-
 	// ********** misc **********
 
 	public JpaWorkspace getJpaWorkspace() {
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/JavaPackageInfoResourceModelProvider.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/JavaPackageInfoResourceModelProvider.java
index 9105cb797d..c744e2d381 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/JavaPackageInfoResourceModelProvider.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/JavaPackageInfoResourceModelProvider.java
@@ -18,6 +18,7 @@ import org.eclipse.jpt.common.core.internal.resource.java.source.SourcePackageIn
 import org.eclipse.jpt.common.core.resource.java.JavaResourceCompilationUnit;
 import org.eclipse.jpt.jpa.core.JpaProject;
 import org.eclipse.jpt.jpa.core.JpaResourceModelProvider;
+import org.eclipse.jpt.jpa.core.internal.plugin.JptJpaCorePlugin;
 
 /**
  * Java package-info.java source code
@@ -55,7 +56,7 @@ public class JavaPackageInfoResourceModelProvider
 				return null;
 			} 
 		} catch (JavaModelException ex) {
-			jpaProject.getManager().log(ex);
+			JptJpaCorePlugin.instance().logError(ex);
 			// Ignore -- project is in a bad state. This will get recalled if necessary
 			return null;
 		}