Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--common/plugins/org.eclipse.jpt.common.core/src/org/eclipse/jpt/common/core/internal/utility/command/SingleUseQueueingExtendedJobCommandContext.java (renamed from common/plugins/org.eclipse.jpt.common.core/src/org/eclipse/jpt/common/core/internal/utility/command/SingleUseQueueingExtendedJobCommandExecutor.java)14
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/InternalJpaProjectManager.java10
2 files changed, 12 insertions, 12 deletions
diff --git a/common/plugins/org.eclipse.jpt.common.core/src/org/eclipse/jpt/common/core/internal/utility/command/SingleUseQueueingExtendedJobCommandExecutor.java b/common/plugins/org.eclipse.jpt.common.core/src/org/eclipse/jpt/common/core/internal/utility/command/SingleUseQueueingExtendedJobCommandContext.java
index b107bf2191..364b8f2fcf 100644
--- a/common/plugins/org.eclipse.jpt.common.core/src/org/eclipse/jpt/common/core/internal/utility/command/SingleUseQueueingExtendedJobCommandExecutor.java
+++ b/common/plugins/org.eclipse.jpt.common.core/src/org/eclipse/jpt/common/core/internal/utility/command/SingleUseQueueingExtendedJobCommandContext.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2012 Oracle. All rights reserved.
+ * Copyright (c) 2012, 2013 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.
@@ -18,26 +18,26 @@ import org.eclipse.jpt.common.utility.command.StatefulExtendedCommandContext;
import org.eclipse.jpt.common.utility.internal.command.SingleUseQueueingExtendedCommandExecutor;
/**
- * This command executor wraps and extends a {@link SingleUseQueueingExtendedCommandExecutor},
+ * This command context wraps and extends a {@link SingleUseQueueingExtendedCommandExecutor},
* adding support for executing {@link JobCommand}s.
*/
-public class SingleUseQueueingExtendedJobCommandExecutor
+public class SingleUseQueueingExtendedJobCommandContext
extends AbstractSingleUseQueueingJobCommandContext<SingleUseQueueingExtendedCommandExecutor, StatefulExtendedCommandContext>
implements CombinedExtendedCommandContext, StatefulExtendedCommandContext
{
- public SingleUseQueueingExtendedJobCommandExecutor() {
+ public SingleUseQueueingExtendedJobCommandContext() {
this(new SingleUseQueueingExtendedCommandExecutor());
}
- public SingleUseQueueingExtendedJobCommandExecutor(ExtendedCommandContext commandExecutor) {
+ public SingleUseQueueingExtendedJobCommandContext(ExtendedCommandContext commandExecutor) {
this(new SingleUseQueueingExtendedCommandExecutor(commandExecutor));
}
- public SingleUseQueueingExtendedJobCommandExecutor(StatefulExtendedCommandContext commandExecutor) {
+ public SingleUseQueueingExtendedJobCommandContext(StatefulExtendedCommandContext commandExecutor) {
this(new SingleUseQueueingExtendedCommandExecutor(commandExecutor));
}
- public SingleUseQueueingExtendedJobCommandExecutor(SingleUseQueueingExtendedCommandExecutor commandExecutor) {
+ public SingleUseQueueingExtendedJobCommandContext(SingleUseQueueingExtendedCommandExecutor commandExecutor) {
super(commandExecutor);
}
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 c2101c1b86..6f478d8f9f 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
@@ -42,7 +42,7 @@ import org.eclipse.jpt.common.core.internal.utility.command.CommandJobCommandAda
import org.eclipse.jpt.common.core.internal.utility.command.InactiveExtendedJobCommandContext;
import org.eclipse.jpt.common.core.internal.utility.command.JobCommandAdapter;
import org.eclipse.jpt.common.core.internal.utility.command.SimpleJobCommandExecutor;
-import org.eclipse.jpt.common.core.internal.utility.command.SingleUseQueueingExtendedJobCommandExecutor;
+import org.eclipse.jpt.common.core.internal.utility.command.SingleUseQueueingExtendedJobCommandContext;
import org.eclipse.jpt.common.core.utility.command.ExtendedJobCommandContext;
import org.eclipse.jpt.common.core.utility.command.JobCommand;
import org.eclipse.jpt.common.utility.command.Command;
@@ -1132,7 +1132,7 @@ class InternalJpaProjectManager
// save the current executor
SimpleJobCommandExecutor oldContext = (SimpleJobCommandExecutor) this.commandContext;
// install a new (not-yet-started) executor
- SingleUseQueueingExtendedJobCommandExecutor newContext = this.buildSynchronousCommandContext();
+ SingleUseQueueingExtendedJobCommandContext newContext = this.buildSynchronousCommandContext();
this.commandContext = newContext;
// wait for all the outstanding commands to finish
oldContext.waitToExecute(NullCommand.instance());
@@ -1141,12 +1141,12 @@ class InternalJpaProjectManager
newContext.start();
}
- private SingleUseQueueingExtendedJobCommandExecutor buildSynchronousCommandContext() {
- return new SingleUseQueueingExtendedJobCommandExecutor();
+ private SingleUseQueueingExtendedJobCommandContext buildSynchronousCommandContext() {
+ return new SingleUseQueueingExtendedJobCommandContext();
}
private synchronized void executeCommandsAsynchronously() {
- if ( ! (this.commandContext instanceof SingleUseQueueingExtendedJobCommandExecutor)) {
+ if ( ! (this.commandContext instanceof SingleUseQueueingExtendedJobCommandContext)) {
throw new IllegalStateException();
}

Back to the top