diff options
author | Ryan D. Brooks | 2011-02-28 21:35:26 +0000 |
---|---|---|
committer | Ryan D. Brooks | 2011-02-28 21:35:26 +0000 |
commit | 5f2c7dc480ee7ca052b9ffd9fc8cd9178703d960 (patch) | |
tree | f5d5a5f948d5017f66235ce6dad385b8d31f90b1 /plugins/org.eclipse.osee.framework.server.admin | |
parent | e5c5143a0100f67e3ca636e810e0a45d47933898 (diff) | |
download | org.eclipse.osee-5f2c7dc480ee7ca052b9ffd9fc8cd9178703d960.tar.gz org.eclipse.osee-5f2c7dc480ee7ca052b9ffd9fc8cd9178703d960.tar.xz org.eclipse.osee-5f2c7dc480ee7ca052b9ffd9fc8cd9178703d960.zip |
refactor: Rename OperationReporter to OperationLogger
Diffstat (limited to 'plugins/org.eclipse.osee.framework.server.admin')
4 files changed, 18 insertions, 18 deletions
diff --git a/plugins/org.eclipse.osee.framework.server.admin/src/org/eclipse/osee/framework/server/admin/DuplicateAttributesOperation.java b/plugins/org.eclipse.osee.framework.server.admin/src/org/eclipse/osee/framework/server/admin/DuplicateAttributesOperation.java index ca9655db817..47a8c5f0d5c 100644 --- a/plugins/org.eclipse.osee.framework.server.admin/src/org/eclipse/osee/framework/server/admin/DuplicateAttributesOperation.java +++ b/plugins/org.eclipse.osee.framework.server.admin/src/org/eclipse/osee/framework/server/admin/DuplicateAttributesOperation.java @@ -17,7 +17,7 @@ import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.osee.framework.core.enums.TxChange; import org.eclipse.osee.framework.core.exception.OseeCoreException; import org.eclipse.osee.framework.core.exception.OseeDataStoreException; -import org.eclipse.osee.framework.core.operation.OperationReporter; +import org.eclipse.osee.framework.core.operation.OperationLogger; import org.eclipse.osee.framework.database.IOseeDatabaseService; import org.eclipse.osee.framework.database.core.AbstractDbTxOperation; import org.eclipse.osee.framework.database.core.ExportImportJoinQuery; @@ -32,12 +32,12 @@ public final class DuplicateAttributesOperation extends AbstractDbTxOperation { private static final String SELECT_DUPLICATES = "select txs1.branch_id, txs1.gamma_id as gamma1, txs2.gamma_id as gamma2 from osee_join_export_import idj, osee_txs txs1, osee_txs txs2 where idj.query_id = ? and idj.id1 = txs1.gamma_id and idj.id2 = txs2.gamma_id and txs1.branch_id = txs2.branch_id and txs1.tx_current = ? and txs2.tx_current = ?"; private final ExportImportJoinQuery gammaJoin; - private final OperationReporter reporter; + private final OperationLogger logger; - public DuplicateAttributesOperation(OperationReporter reporter, IOseeDatabaseService databaseService) throws OseeDataStoreException { + public DuplicateAttributesOperation(OperationLogger logger, IOseeDatabaseService databaseService) throws OseeDataStoreException { super(databaseService, "Duplicate Attributes", Activator.PLUGIN_ID); gammaJoin = JoinUtility.createExportImportJoinQuery(); - this.reporter = reporter; + this.logger = logger; } @Override @@ -47,7 +47,7 @@ public final class DuplicateAttributesOperation extends AbstractDbTxOperation { gammaJoin.store(connection); selectDuplicates(connection); } catch (Exception ex) { - reporter.report(ex); + logger.log(ex); } finally { gammaJoin.delete(connection); } @@ -71,7 +71,7 @@ public final class DuplicateAttributesOperation extends AbstractDbTxOperation { chStmt.runPreparedQuery(SELECT_DUPLICATES, gammaJoin.getQueryId(), TxChange.CURRENT.getValue(), TxChange.CURRENT.getValue()); while (chStmt.next()) { - reporter.report("branch: " + chStmt.getInt("branch_id"), "gamma1: " + chStmt.getLong("gamma1"), + logger.log("branch: " + chStmt.getInt("branch_id"), "gamma1: " + chStmt.getLong("gamma1"), "gamma2: " + chStmt.getLong("gamma2")); } } finally { diff --git a/plugins/org.eclipse.osee.framework.server.admin/src/org/eclipse/osee/framework/server/admin/ServerAdminCommandProvider.java b/plugins/org.eclipse.osee.framework.server.admin/src/org/eclipse/osee/framework/server/admin/ServerAdminCommandProvider.java index 68992db0c79..5843d1b15cc 100644 --- a/plugins/org.eclipse.osee.framework.server.admin/src/org/eclipse/osee/framework/server/admin/ServerAdminCommandProvider.java +++ b/plugins/org.eclipse.osee.framework.server.admin/src/org/eclipse/osee/framework/server/admin/ServerAdminCommandProvider.java @@ -15,8 +15,8 @@ import org.eclipse.core.runtime.jobs.Job; import org.eclipse.osee.framework.branch.management.TxCurrentsAndModTypesCommand; import org.eclipse.osee.framework.core.enums.OseeCacheEnum; import org.eclipse.osee.framework.core.exception.OseeDataStoreException; -import org.eclipse.osee.framework.core.operation.CommandInterpreterReporter; -import org.eclipse.osee.framework.core.operation.OperationReporter; +import org.eclipse.osee.framework.core.operation.CommandInterpreterLogger; +import org.eclipse.osee.framework.core.operation.OperationLogger; import org.eclipse.osee.framework.core.operation.Operations; import org.eclipse.osee.framework.server.admin.internal.Activator; import org.eclipse.osee.framework.server.admin.management.AdminCommands; @@ -78,14 +78,14 @@ public class ServerAdminCommandProvider implements CommandProvider { } public Job _tx_currents(CommandInterpreter ci) { - OperationReporter reporter = new CommandInterpreterReporter(ci); + OperationLogger logger = new CommandInterpreterLogger(ci); boolean archived = Boolean.parseBoolean(ci.nextArgument()); - return Operations.executeAsJob(new TxCurrentsAndModTypesCommand(reporter, archived), false); + return Operations.executeAsJob(new TxCurrentsAndModTypesCommand(logger, archived), false); } public Job _duplicate_attr(CommandInterpreter ci) throws OseeDataStoreException { - OperationReporter reporter = new CommandInterpreterReporter(ci); - return Operations.executeAsJob(new DuplicateAttributesOperation(reporter, Activator.getOseeDatabaseService()), + OperationLogger logger = new CommandInterpreterLogger(ci); + return Operations.executeAsJob(new DuplicateAttributesOperation(logger, Activator.getOseeDatabaseService()), false); } diff --git a/plugins/org.eclipse.osee.framework.server.admin/src/org/eclipse/osee/framework/server/admin/branch/BranchImportWorker.java b/plugins/org.eclipse.osee.framework.server.admin/src/org/eclipse/osee/framework/server/admin/branch/BranchImportWorker.java index 469d2d5eef9..de667c9b9f3 100644 --- a/plugins/org.eclipse.osee.framework.server.admin/src/org/eclipse/osee/framework/server/admin/branch/BranchImportWorker.java +++ b/plugins/org.eclipse.osee.framework.server.admin/src/org/eclipse/osee/framework/server/admin/branch/BranchImportWorker.java @@ -16,8 +16,8 @@ import java.util.List; import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.osee.framework.branch.management.ImportOptions; import org.eclipse.osee.framework.core.exception.OseeArgumentException; -import org.eclipse.osee.framework.core.operation.CommandInterpreterReporter; -import org.eclipse.osee.framework.core.operation.OperationReporter; +import org.eclipse.osee.framework.core.operation.CommandInterpreterLogger; +import org.eclipse.osee.framework.core.operation.OperationLogger; import org.eclipse.osee.framework.resource.management.Options; import org.eclipse.osee.framework.resource.management.util.ResourceLocator; import org.eclipse.osee.framework.server.admin.BaseServerCommand; @@ -88,8 +88,8 @@ public class BranchImportWorker extends BaseServerCommand { for (String fileToImport : importFiles) { URI uri = new URI("exchange://" + fileToImport); - OperationReporter reporter = new CommandInterpreterReporter(getCommandInterpreter()); - Activator.getBranchExchange().importBranch(new ResourceLocator(uri), options, branchIds, reporter); + OperationLogger logger = new CommandInterpreterLogger(getCommandInterpreter()); + Activator.getBranchExchange().importBranch(new ResourceLocator(uri), options, branchIds, logger); } } } diff --git a/plugins/org.eclipse.osee.framework.server.admin/src/org/eclipse/osee/framework/server/admin/management/ConsolidateArtifactVersionsCommand.java b/plugins/org.eclipse.osee.framework.server.admin/src/org/eclipse/osee/framework/server/admin/management/ConsolidateArtifactVersionsCommand.java index b7006d896ce..81ddd8b8de7 100644 --- a/plugins/org.eclipse.osee.framework.server.admin/src/org/eclipse/osee/framework/server/admin/management/ConsolidateArtifactVersionsCommand.java +++ b/plugins/org.eclipse.osee.framework.server.admin/src/org/eclipse/osee/framework/server/admin/management/ConsolidateArtifactVersionsCommand.java @@ -12,7 +12,7 @@ package org.eclipse.osee.framework.server.admin.management; import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.osee.framework.core.exception.OseeCoreException; -import org.eclipse.osee.framework.core.operation.CommandInterpreterReporter; +import org.eclipse.osee.framework.core.operation.CommandInterpreterLogger; import org.eclipse.osee.framework.core.operation.Operations; import org.eclipse.osee.framework.database.operation.ConsolidateArtifactVersionTxOperation; import org.eclipse.osee.framework.server.admin.BaseServerCommand; @@ -33,7 +33,7 @@ public class ConsolidateArtifactVersionsCommand extends BaseServerCommand { try { Operations.executeWorkAndCheckStatus( new ConsolidateArtifactVersionTxOperation(Activator.getOseeDatabaseService(), - new CommandInterpreterReporter(getCommandInterpreter())), monitor); + new CommandInterpreterLogger(getCommandInterpreter())), monitor); } catch (OseeCoreException ex) { printStackTrace(ex); } |