From 7f865e010e29770fb68226bb9b4056c008f08ace Mon Sep 17 00:00:00 2001 From: "Lincoln Baxter, III" Date: Fri, 17 Jan 2014 14:58:49 -0500 Subject: [PATCH] Renamed transaction control commands to better mirror names --- .../java/org/jboss/forge/addon/shell/ShellFactoryImpl.java | 2 +- .../src/main/java/org/jboss/forge/addon/shell/ShellImpl.java | 3 +-- ...itTransactionCommand.java => TransactionCommitCommand.java} | 0 ...TransactionCommand.java => TransactionRollbackCommand.java} | 0 ...artTransactionCommand.java => TransactionStartCommand.java} | 0 5 files changed, 2 insertions(+), 3 deletions(-) rename shell/impl/src/main/java/org/jboss/forge/addon/shell/command/transaction/{CommitTransactionCommand.java => TransactionCommitCommand.java} (100%) rename shell/impl/src/main/java/org/jboss/forge/addon/shell/command/transaction/{RollbackTransactionCommand.java => TransactionRollbackCommand.java} (100%) rename shell/impl/src/main/java/org/jboss/forge/addon/shell/command/transaction/{StartTransactionCommand.java => TransactionStartCommand.java} (100%) diff --git a/shell/impl/src/main/java/org/jboss/forge/addon/shell/ShellFactoryImpl.java b/shell/impl/src/main/java/org/jboss/forge/addon/shell/ShellFactoryImpl.java index 40b44b9e3d..660bd59976 100644 --- a/shell/impl/src/main/java/org/jboss/forge/addon/shell/ShellFactoryImpl.java +++ b/shell/impl/src/main/java/org/jboss/forge/addon/shell/ShellFactoryImpl.java @@ -48,7 +48,7 @@ public Shell createShell(File initialSelection, Settings settings) { Assert.notNull(settings, "Settings cannot be null"); FileResource initialResource = resourceFactory.create(initialSelection).reify(FileResource.class); - return new ShellImpl(resourceFactory, initialResource, settings, commandManager, addonRegistry, commandFactory); + return new ShellImpl(initialResource, settings, commandManager, addonRegistry, commandFactory); } } diff --git a/shell/impl/src/main/java/org/jboss/forge/addon/shell/ShellImpl.java b/shell/impl/src/main/java/org/jboss/forge/addon/shell/ShellImpl.java index 4e4f91663b..dc0770495c 100644 --- a/shell/impl/src/main/java/org/jboss/forge/addon/shell/ShellImpl.java +++ b/shell/impl/src/main/java/org/jboss/forge/addon/shell/ShellImpl.java @@ -27,7 +27,6 @@ import org.jboss.forge.addon.resource.DirectoryResource; import org.jboss.forge.addon.resource.FileResource; import org.jboss.forge.addon.resource.Resource; -import org.jboss.forge.addon.resource.ResourceFactory; import org.jboss.forge.addon.shell.aesh.ForgeCommandRegistry; import org.jboss.forge.addon.shell.aesh.ForgeManProvider; import org.jboss.forge.addon.shell.ui.ShellContextImpl; @@ -64,7 +63,7 @@ public class ShellImpl implements Shell, UIRuntime private final UIOutput output; private final List executionListeners = new LinkedList<>(); - public ShellImpl(ResourceFactory factory, FileResource initialResource, Settings settings, + public ShellImpl(FileResource initialResource, Settings settings, CommandManager commandManager, AddonRegistry addonRegistry, CommandControllerFactory commandFactory) { this.currentResource = initialResource; diff --git a/shell/impl/src/main/java/org/jboss/forge/addon/shell/command/transaction/CommitTransactionCommand.java b/shell/impl/src/main/java/org/jboss/forge/addon/shell/command/transaction/TransactionCommitCommand.java similarity index 100% rename from shell/impl/src/main/java/org/jboss/forge/addon/shell/command/transaction/CommitTransactionCommand.java rename to shell/impl/src/main/java/org/jboss/forge/addon/shell/command/transaction/TransactionCommitCommand.java diff --git a/shell/impl/src/main/java/org/jboss/forge/addon/shell/command/transaction/RollbackTransactionCommand.java b/shell/impl/src/main/java/org/jboss/forge/addon/shell/command/transaction/TransactionRollbackCommand.java similarity index 100% rename from shell/impl/src/main/java/org/jboss/forge/addon/shell/command/transaction/RollbackTransactionCommand.java rename to shell/impl/src/main/java/org/jboss/forge/addon/shell/command/transaction/TransactionRollbackCommand.java diff --git a/shell/impl/src/main/java/org/jboss/forge/addon/shell/command/transaction/StartTransactionCommand.java b/shell/impl/src/main/java/org/jboss/forge/addon/shell/command/transaction/TransactionStartCommand.java similarity index 100% rename from shell/impl/src/main/java/org/jboss/forge/addon/shell/command/transaction/StartTransactionCommand.java rename to shell/impl/src/main/java/org/jboss/forge/addon/shell/command/transaction/TransactionStartCommand.java