diff options
40 files changed, 180 insertions, 158 deletions
diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/operation/ExportChangeReportOperation.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/operation/ExportChangeReportOperation.java index 9b49d5d4593..eb32696339c 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/operation/ExportChangeReportOperation.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/operation/ExportChangeReportOperation.java @@ -55,7 +55,7 @@ public class ExportChangeReportOperation extends AbstractOperation { @Override protected void doWork(IProgressMonitor monitor) throws OseeCoreException { - report(workflows.size() + " workflows."); + log(workflows.size() + " workflows."); sortWorkflows(); diff --git a/plugins/org.eclipse.osee.framework.branch.management/src/org/eclipse/osee/framework/branch/management/IBranchExchange.java b/plugins/org.eclipse.osee.framework.branch.management/src/org/eclipse/osee/framework/branch/management/IBranchExchange.java index 7532fe5f23e..25442ea0124 100644 --- a/plugins/org.eclipse.osee.framework.branch.management/src/org/eclipse/osee/framework/branch/management/IBranchExchange.java +++ b/plugins/org.eclipse.osee.framework.branch.management/src/org/eclipse/osee/framework/branch/management/IBranchExchange.java @@ -12,7 +12,7 @@ package org.eclipse.osee.framework.branch.management; import java.util.List; import org.eclipse.osee.framework.core.exception.OseeCoreException; -import org.eclipse.osee.framework.core.operation.OperationReporter; +import org.eclipse.osee.framework.core.operation.OperationLogger; import org.eclipse.osee.framework.resource.management.IResourceLocator; import org.eclipse.osee.framework.resource.management.Options; @@ -23,7 +23,7 @@ public interface IBranchExchange { public IResourceLocator exportBranch(String exportName, Options options, List<Integer> branchIds) throws Exception; - public void importBranch(IResourceLocator fileToImport, Options options, List<Integer> branchIds, OperationReporter reporter) throws OseeCoreException; + public void importBranch(IResourceLocator fileToImport, Options options, List<Integer> branchIds, OperationLogger logger) throws OseeCoreException; public IResourceLocator checkIntegrity(IResourceLocator fileToCheck) throws Exception; } diff --git a/plugins/org.eclipse.osee.framework.branch.management/src/org/eclipse/osee/framework/branch/management/TxCurrentsAndModTypesCommand.java b/plugins/org.eclipse.osee.framework.branch.management/src/org/eclipse/osee/framework/branch/management/TxCurrentsAndModTypesCommand.java index 5d2b681e766..affee74a88e 100644 --- a/plugins/org.eclipse.osee.framework.branch.management/src/org/eclipse/osee/framework/branch/management/TxCurrentsAndModTypesCommand.java +++ b/plugins/org.eclipse.osee.framework.branch.management/src/org/eclipse/osee/framework/branch/management/TxCurrentsAndModTypesCommand.java @@ -15,26 +15,26 @@ import java.util.List; import org.eclipse.osee.framework.branch.management.internal.Activator; import org.eclipse.osee.framework.core.operation.CompositeOperation; import org.eclipse.osee.framework.core.operation.IOperation; -import org.eclipse.osee.framework.core.operation.OperationReporter; +import org.eclipse.osee.framework.core.operation.OperationLogger; import org.eclipse.osee.framework.database.operation.InvalidTxCurrentsAndModTypes; /** * @author Ryan D. Brooks */ public class TxCurrentsAndModTypesCommand extends CompositeOperation { - public TxCurrentsAndModTypesCommand(OperationReporter reporter, boolean archived) { - super("TxCurrents And Mod Types", Activator.PLUGIN_ID, buildSubOperations(reporter, archived)); + public TxCurrentsAndModTypesCommand(OperationLogger logger, boolean archived) { + super("TxCurrents And Mod Types", Activator.PLUGIN_ID, buildSubOperations(logger, archived)); } - private static List<IOperation> buildSubOperations(OperationReporter reporter, boolean archived) { + private static List<IOperation> buildSubOperations(OperationLogger logger, boolean archived) { List<IOperation> operations = new ArrayList<IOperation>(3); - operations.add(buildFixOperation(reporter, archived, "1/3 ", "osee_artifact", "art_id")); - operations.add(buildFixOperation(reporter, archived, "2/3 ", "osee_attribute", "attr_id")); - operations.add(buildFixOperation(reporter, archived, "3/3 ", "osee_relation_link", "rel_link_id")); + operations.add(buildFixOperation(logger, archived, "1/3 ", "osee_artifact", "art_id")); + operations.add(buildFixOperation(logger, archived, "2/3 ", "osee_attribute", "attr_id")); + operations.add(buildFixOperation(logger, archived, "3/3 ", "osee_relation_link", "rel_link_id")); return operations; } - private static IOperation buildFixOperation(OperationReporter reporter, boolean archived, String operationName, String tableName, String columnName) { - return new InvalidTxCurrentsAndModTypes(operationName, tableName, columnName, reporter, true, archived); + private static IOperation buildFixOperation(OperationLogger logger, boolean archived, String operationName, String tableName, String columnName) { + return new InvalidTxCurrentsAndModTypes(operationName, tableName, columnName, logger, true, archived); } }
\ No newline at end of file diff --git a/plugins/org.eclipse.osee.framework.branch.management/src/org/eclipse/osee/framework/branch/management/exchange/BranchExchange.java b/plugins/org.eclipse.osee.framework.branch.management/src/org/eclipse/osee/framework/branch/management/exchange/BranchExchange.java index 80268c75e33..9872694a43b 100644 --- a/plugins/org.eclipse.osee.framework.branch.management/src/org/eclipse/osee/framework/branch/management/exchange/BranchExchange.java +++ b/plugins/org.eclipse.osee.framework.branch.management/src/org/eclipse/osee/framework/branch/management/exchange/BranchExchange.java @@ -17,7 +17,7 @@ import org.eclipse.osee.framework.branch.management.exchange.handler.StandardOse import org.eclipse.osee.framework.branch.management.exchange.resource.ExchangeLocatorProvider; import org.eclipse.osee.framework.branch.management.exchange.transform.ExchangeDataProcessor; import org.eclipse.osee.framework.core.exception.OseeCoreException; -import org.eclipse.osee.framework.core.operation.OperationReporter; +import org.eclipse.osee.framework.core.operation.OperationLogger; import org.eclipse.osee.framework.jdk.core.type.Pair; import org.eclipse.osee.framework.resource.management.IResourceLocator; import org.eclipse.osee.framework.resource.management.Options; @@ -42,10 +42,10 @@ public class BranchExchange implements IBranchExchange { } @Override - public void importBranch(IResourceLocator exportDataLocator, Options options, List<Integer> branchIds, OperationReporter reporter) throws OseeCoreException { + public void importBranch(IResourceLocator exportDataLocator, Options options, List<Integer> branchIds, OperationLogger logger) throws OseeCoreException { IOseeExchangeDataProvider exportDataProvider = createExportDataProvider(exportDataLocator); ImportController importController = - new ImportController(oseeServices, exportDataProvider, options, branchIds, reporter); + new ImportController(oseeServices, exportDataProvider, options, branchIds, logger); importController.execute(); } diff --git a/plugins/org.eclipse.osee.framework.branch.management/src/org/eclipse/osee/framework/branch/management/exchange/ImportController.java b/plugins/org.eclipse.osee.framework.branch.management/src/org/eclipse/osee/framework/branch/management/exchange/ImportController.java index 227ac2dfdf3..07d94b0baf7 100644 --- a/plugins/org.eclipse.osee.framework.branch.management/src/org/eclipse/osee/framework/branch/management/exchange/ImportController.java +++ b/plugins/org.eclipse.osee.framework.branch.management/src/org/eclipse/osee/framework/branch/management/exchange/ImportController.java @@ -37,7 +37,7 @@ import org.eclipse.osee.framework.core.exception.OseeArgumentException; import org.eclipse.osee.framework.core.exception.OseeCoreException; import org.eclipse.osee.framework.core.exception.OseeExceptions; import org.eclipse.osee.framework.core.exception.OseeStateException; -import org.eclipse.osee.framework.core.operation.OperationReporter; +import org.eclipse.osee.framework.core.operation.OperationLogger; import org.eclipse.osee.framework.database.core.ConnectionHandler; import org.eclipse.osee.framework.database.core.DbTransaction; import org.eclipse.osee.framework.database.core.IOseeStatement; @@ -67,7 +67,7 @@ public final class ImportController { private final int[] branchesToImport = null; private final Map<String, SavePoint> savePoints; private final ExchangeDataProcessor exchangeDataProcessor; - private final OperationReporter reporter; + private final OperationLogger logger; private ExchangeTransformer exchangeTransformer; private TranslationManager translator; @@ -75,13 +75,13 @@ public final class ImportController { private MetaDataSaxHandler metadataHandler; private String currentSavePoint; - ImportController(OseeServices oseeServices, IOseeExchangeDataProvider exportDataProvider, Options options, List<Integer> branchIds, OperationReporter reporter) throws OseeArgumentException { + ImportController(OseeServices oseeServices, IOseeExchangeDataProvider exportDataProvider, Options options, List<Integer> branchIds, OperationLogger logger) throws OseeArgumentException { this.oseeServices = oseeServices; this.exportDataProvider = exportDataProvider; this.options = options; this.savePoints = new LinkedHashMap<String, SavePoint>(); this.exchangeDataProcessor = new ExchangeDataProcessor(exportDataProvider); - this.reporter = reporter; + this.logger = logger; if (!branchIds.isEmpty()) { throw new OseeArgumentException("selective branch import is not supported."); @@ -100,7 +100,7 @@ public final class ImportController { IExchangeTransformProvider transformProvider = new ExchangeTransformProvider(oseeServices.getCachingService()); exchangeTransformer = new ExchangeTransformer(transformProvider, exchangeDataProcessor); - exchangeTransformer.applyTransforms(reporter); + exchangeTransformer.applyTransforms(logger); currentSavePoint = "manifest"; manifestHandler = new ManifestSaxHandler(); @@ -158,7 +158,7 @@ public final class ImportController { importBranchesTx.updateBranchParentTransactionId(); - exchangeTransformer.applyFinalTransforms(reporter); + exchangeTransformer.applyFinalTransforms(logger); currentSavePoint = "stop"; addSavePoint(currentSavePoint); diff --git a/plugins/org.eclipse.osee.framework.branch.management/src/org/eclipse/osee/framework/branch/management/exchange/transform/ExchangeTransformer.java b/plugins/org.eclipse.osee.framework.branch.management/src/org/eclipse/osee/framework/branch/management/exchange/transform/ExchangeTransformer.java index 8aceb609001..0858f74e80a 100644 --- a/plugins/org.eclipse.osee.framework.branch.management/src/org/eclipse/osee/framework/branch/management/exchange/transform/ExchangeTransformer.java +++ b/plugins/org.eclipse.osee.framework.branch.management/src/org/eclipse/osee/framework/branch/management/exchange/transform/ExchangeTransformer.java @@ -13,7 +13,7 @@ package org.eclipse.osee.framework.branch.management.exchange.transform; import java.util.Collection; import org.eclipse.osee.framework.branch.management.exchange.handler.ExportItem; import org.eclipse.osee.framework.core.exception.OseeCoreException; -import org.eclipse.osee.framework.core.operation.OperationReporter; +import org.eclipse.osee.framework.core.operation.OperationLogger; import org.eclipse.osee.framework.core.util.Conditions; import org.eclipse.osee.framework.jdk.core.util.Strings; import org.osgi.framework.Version; @@ -30,7 +30,7 @@ public class ExchangeTransformer { this.processor = processor; } - public void applyTransforms(OperationReporter reporter) throws Exception { + public void applyTransforms(OperationLogger logger) throws Exception { Version exchangeVersion = getExchangeManifestVersion(); transformers = provider.getApplicableTransformers(exchangeVersion); @@ -39,16 +39,16 @@ public class ExchangeTransformer { versionRule.setReplaceVersion(true); for (IOseeExchangeVersionTransformer transformer : transformers) { - Version newVersion = transformer.applyTransform(processor, reporter); + Version newVersion = transformer.applyTransform(processor, logger); versionRule.setVersion(newVersion); processor.transform(ExportItem.EXPORT_MANIFEST, versionRule); } } - public void applyFinalTransforms(OperationReporter reporter) throws Exception { + public void applyFinalTransforms(OperationLogger logger) throws Exception { Conditions.checkNotNull(transformers, "transformers", "forgot to call apply transforms first"); for (IOseeExchangeVersionTransformer transform : transformers) { - transform.finalizeTransform(processor, reporter); + transform.finalizeTransform(processor, logger); } transformers = null; } diff --git a/plugins/org.eclipse.osee.framework.branch.management/src/org/eclipse/osee/framework/branch/management/exchange/transform/IOseeExchangeVersionTransformer.java b/plugins/org.eclipse.osee.framework.branch.management/src/org/eclipse/osee/framework/branch/management/exchange/transform/IOseeExchangeVersionTransformer.java index 6038a23cfbb..f816758aebb 100644 --- a/plugins/org.eclipse.osee.framework.branch.management/src/org/eclipse/osee/framework/branch/management/exchange/transform/IOseeExchangeVersionTransformer.java +++ b/plugins/org.eclipse.osee.framework.branch.management/src/org/eclipse/osee/framework/branch/management/exchange/transform/IOseeExchangeVersionTransformer.java @@ -11,7 +11,7 @@ package org.eclipse.osee.framework.branch.management.exchange.transform; import org.eclipse.osee.framework.core.exception.OseeCoreException; -import org.eclipse.osee.framework.core.operation.OperationReporter; +import org.eclipse.osee.framework.core.operation.OperationLogger; import org.osgi.framework.Version; /** @@ -19,9 +19,9 @@ import org.osgi.framework.Version; */ public interface IOseeExchangeVersionTransformer { - public abstract Version applyTransform(ExchangeDataProcessor processor, OperationReporter reporter) throws OseeCoreException; + public abstract Version applyTransform(ExchangeDataProcessor processor, OperationLogger logger) throws OseeCoreException; public abstract Version getMaxVersion(); - public abstract void finalizeTransform(ExchangeDataProcessor processor, OperationReporter reporter) throws OseeCoreException; + public abstract void finalizeTransform(ExchangeDataProcessor processor, OperationLogger logger) throws OseeCoreException; } diff --git a/plugins/org.eclipse.osee.framework.branch.management/src/org/eclipse/osee/framework/branch/management/exchange/transform/V0_8_3Transformer.java b/plugins/org.eclipse.osee.framework.branch.management/src/org/eclipse/osee/framework/branch/management/exchange/transform/V0_8_3Transformer.java index 2f80f14e15b..27877e862e0 100644 --- a/plugins/org.eclipse.osee.framework.branch.management/src/org/eclipse/osee/framework/branch/management/exchange/transform/V0_8_3Transformer.java +++ b/plugins/org.eclipse.osee.framework.branch.management/src/org/eclipse/osee/framework/branch/management/exchange/transform/V0_8_3Transformer.java @@ -13,7 +13,7 @@ package org.eclipse.osee.framework.branch.management.exchange.transform; import java.util.regex.Pattern; import org.eclipse.osee.framework.branch.management.exchange.handler.ExportItem; import org.eclipse.osee.framework.core.exception.OseeCoreException; -import org.eclipse.osee.framework.core.operation.OperationReporter; +import org.eclipse.osee.framework.core.operation.OperationLogger; import org.eclipse.osee.framework.jdk.core.text.rules.ReplaceAll; import org.eclipse.osee.framework.jdk.core.type.HashCollection; import org.osgi.framework.Version; @@ -25,7 +25,7 @@ public class V0_8_3Transformer implements IOseeExchangeVersionTransformer { private static final Version MAX_VERSION = new Version("0.8.3"); @Override - public Version applyTransform(ExchangeDataProcessor processor, OperationReporter reporter) throws OseeCoreException { + public Version applyTransform(ExchangeDataProcessor processor, OperationLogger logger) throws OseeCoreException { HashCollection<String, String> tableToColumns = new HashCollection<String, String>(); tableToColumns.put("osee_txs", "<column id=\"branch_id\" type=\"INTEGER\" />\n"); @@ -41,7 +41,7 @@ public class V0_8_3Transformer implements IOseeExchangeVersionTransformer { } @Override - public void finalizeTransform(ExchangeDataProcessor ruleProcessor, OperationReporter reporter) throws OseeCoreException { + public void finalizeTransform(ExchangeDataProcessor ruleProcessor, OperationLogger logger) { } @Override diff --git a/plugins/org.eclipse.osee.framework.branch.management/src/org/eclipse/osee/framework/branch/management/exchange/transform/V0_9_0Transformer.java b/plugins/org.eclipse.osee.framework.branch.management/src/org/eclipse/osee/framework/branch/management/exchange/transform/V0_9_0Transformer.java index eb059b3a9c9..c485326a53a 100644 --- a/plugins/org.eclipse.osee.framework.branch.management/src/org/eclipse/osee/framework/branch/management/exchange/transform/V0_9_0Transformer.java +++ b/plugins/org.eclipse.osee.framework.branch.management/src/org/eclipse/osee/framework/branch/management/exchange/transform/V0_9_0Transformer.java @@ -14,7 +14,7 @@ import java.util.HashMap; import org.eclipse.osee.framework.branch.management.exchange.handler.ExportItem; import org.eclipse.osee.framework.core.exception.OseeCoreException; import org.eclipse.osee.framework.core.model.cache.AbstractOseeCache; -import org.eclipse.osee.framework.core.operation.OperationReporter; +import org.eclipse.osee.framework.core.operation.OperationLogger; import org.eclipse.osee.framework.core.services.IOseeCachingService; import org.eclipse.osee.framework.jdk.core.text.rules.ReplaceAll; import org.eclipse.osee.framework.jdk.core.util.io.xml.SaxTransformer; @@ -33,7 +33,7 @@ public class V0_9_0Transformer implements IOseeExchangeVersionTransformer { } @Override - public Version applyTransform(ExchangeDataProcessor processor, OperationReporter reporter) throws OseeCoreException { + public Version applyTransform(ExchangeDataProcessor processor, OperationLogger logger) throws OseeCoreException { replaceDataTypeIdsWithGuids(processor, cachingService.getArtifactTypeCache(), ExportItem.OSEE_ARTIFACT_DATA, "art_type_id", "name"); replaceDataTypeIdsWithGuids(processor, cachingService.getAttributeTypeCache(), ExportItem.OSEE_ATTRIBUTE_DATA, @@ -63,7 +63,7 @@ public class V0_9_0Transformer implements IOseeExchangeVersionTransformer { } @Override - public void finalizeTransform(ExchangeDataProcessor processor, OperationReporter reporter) throws OseeCoreException { + public void finalizeTransform(ExchangeDataProcessor processor, OperationLogger logger) { } @Override diff --git a/plugins/org.eclipse.osee.framework.branch.management/src/org/eclipse/osee/framework/branch/management/exchange/transform/V0_9_2Transformer.java b/plugins/org.eclipse.osee.framework.branch.management/src/org/eclipse/osee/framework/branch/management/exchange/transform/V0_9_2Transformer.java index f060b243966..8d2b90c4908 100644 --- a/plugins/org.eclipse.osee.framework.branch.management/src/org/eclipse/osee/framework/branch/management/exchange/transform/V0_9_2Transformer.java +++ b/plugins/org.eclipse.osee.framework.branch.management/src/org/eclipse/osee/framework/branch/management/exchange/transform/V0_9_2Transformer.java @@ -29,7 +29,7 @@ import org.eclipse.osee.framework.core.enums.TxChange; import org.eclipse.osee.framework.core.exception.OseeCoreException; import org.eclipse.osee.framework.core.exception.OseeExceptions; import org.eclipse.osee.framework.core.exception.OseeStateException; -import org.eclipse.osee.framework.core.operation.OperationReporter; +import org.eclipse.osee.framework.core.operation.OperationLogger; import org.eclipse.osee.framework.core.operation.Operations; import org.eclipse.osee.framework.database.operation.Address; import org.eclipse.osee.framework.jdk.core.text.rules.ReplaceAll; @@ -58,7 +58,7 @@ public class V0_9_2Transformer implements IOseeExchangeVersionTransformer { } @Override - public Version applyTransform(ExchangeDataProcessor processor, OperationReporter reporter) throws OseeCoreException { + public Version applyTransform(ExchangeDataProcessor processor, OperationLogger logger) throws OseeCoreException { List<Integer> branchIds = convertBranchTable(processor); Map<Long, Long> artifactGammaToNetGammaId = convertArtifactAndConflicts(processor); @@ -81,9 +81,9 @@ public class V0_9_2Transformer implements IOseeExchangeVersionTransformer { } @Override - public void finalizeTransform(ExchangeDataProcessor processor, OperationReporter reporter) throws OseeCoreException { - Operations.executeWorkAndCheckStatus(new TxCurrentsAndModTypesCommand(reporter, false)); - Operations.executeWorkAndCheckStatus(new TxCurrentsAndModTypesCommand(reporter, true)); + public void finalizeTransform(ExchangeDataProcessor processor, OperationLogger logger) throws OseeCoreException { + Operations.executeWorkAndCheckStatus(new TxCurrentsAndModTypesCommand(logger, false)); + Operations.executeWorkAndCheckStatus(new TxCurrentsAndModTypesCommand(logger, true)); } private List<Integer> convertBranchTable(ExchangeDataProcessor processor) throws OseeCoreException { diff --git a/plugins/org.eclipse.osee.framework.branch.management/src/org/eclipse/osee/framework/branch/management/exchange/transform/V0_9_4Transformer.java b/plugins/org.eclipse.osee.framework.branch.management/src/org/eclipse/osee/framework/branch/management/exchange/transform/V0_9_4Transformer.java index 5dee7796827..44bed633d6c 100644 --- a/plugins/org.eclipse.osee.framework.branch.management/src/org/eclipse/osee/framework/branch/management/exchange/transform/V0_9_4Transformer.java +++ b/plugins/org.eclipse.osee.framework.branch.management/src/org/eclipse/osee/framework/branch/management/exchange/transform/V0_9_4Transformer.java @@ -10,7 +10,7 @@ *******************************************************************************/ package org.eclipse.osee.framework.branch.management.exchange.transform; -import org.eclipse.osee.framework.core.operation.OperationReporter; +import org.eclipse.osee.framework.core.operation.OperationLogger; import org.osgi.framework.Version; /** @@ -20,7 +20,7 @@ public class V0_9_4Transformer implements IOseeExchangeVersionTransformer { private static final Version MAX_VERSION = new Version("0.9.4"); @Override - public Version applyTransform(ExchangeDataProcessor processor, OperationReporter reporter) { + public Version applyTransform(ExchangeDataProcessor processor, OperationLogger logger) { return getMaxVersion(); } @@ -30,6 +30,6 @@ public class V0_9_4Transformer implements IOseeExchangeVersionTransformer { } @Override - public void finalizeTransform(ExchangeDataProcessor processor, OperationReporter reporter) { + public void finalizeTransform(ExchangeDataProcessor processor, OperationLogger logger) { } }
\ No newline at end of file diff --git a/plugins/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/operation/CommandInterpreterReporter.java b/plugins/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/operation/CommandInterpreterLogger.java index 22ef5ac833e..1e9c4685413 100644 --- a/plugins/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/operation/CommandInterpreterReporter.java +++ b/plugins/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/operation/CommandInterpreterLogger.java @@ -15,15 +15,15 @@ import org.eclipse.osgi.framework.console.CommandInterpreter; /** * @author Ryan D. Brooks */ -public class CommandInterpreterReporter extends OperationReporter { +public class CommandInterpreterLogger extends OperationLogger { private final CommandInterpreter ci; - public CommandInterpreterReporter(CommandInterpreter ci) { + public CommandInterpreterLogger(CommandInterpreter ci) { this.ci = ci; } @Override - public void report(String... row) { + public void log(String... row) { for (String cell : row) { ci.print(cell); ci.print(" "); @@ -32,7 +32,7 @@ public class CommandInterpreterReporter extends OperationReporter { } @Override - public void report(Throwable th) { + public void log(Throwable th) { ci.printStackTrace(th); } }
\ No newline at end of file diff --git a/plugins/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/operation/ConsoleReporter.java b/plugins/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/operation/ConsoleLogger.java index 7f32d879a79..1002319b239 100644 --- a/plugins/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/operation/ConsoleReporter.java +++ b/plugins/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/operation/ConsoleLogger.java @@ -13,10 +13,10 @@ package org.eclipse.osee.framework.core.operation; /** * @author Ryan D. Brooks */ -public class ConsoleReporter extends OperationReporter { +public class ConsoleLogger extends OperationLogger { @Override - public void report(String... row) { + public void log(String... row) { for (String cell : row) { System.out.print(cell); System.out.print(" "); @@ -25,7 +25,7 @@ public class ConsoleReporter extends OperationReporter { } @Override - public void report(Throwable th) { + public void log(Throwable th) { th.printStackTrace(); } }
\ No newline at end of file diff --git a/plugins/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/operation/NullOperationLogger.java b/plugins/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/operation/NullOperationLogger.java new file mode 100644 index 00000000000..dc0ce7b6eb8 --- /dev/null +++ b/plugins/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/operation/NullOperationLogger.java @@ -0,0 +1,23 @@ +/* + * Created on Feb 21, 2011 + * + * PLACE_YOUR_DISTRIBUTION_STATEMENT_RIGHT_HERE + */ +package org.eclipse.osee.framework.core.operation; + +public class NullOperationLogger extends OperationLogger { + private final static OperationLogger singleton = new NullOperationLogger(); + + private NullOperationLogger() { + // singleton so prevent external construction + } + + @Override + public void log(String... row) { + // no implementation since this is a null logger + } + + public static final OperationLogger getSingleton() { + return singleton; + } +}
\ No newline at end of file diff --git a/plugins/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/operation/OperationJob.java b/plugins/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/operation/OperationJob.java index 9631cd01db7..e6c46430b45 100644 --- a/plugins/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/operation/OperationJob.java +++ b/plugins/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/operation/OperationJob.java @@ -20,7 +20,7 @@ import org.eclipse.core.runtime.jobs.Job; */ public final class OperationJob extends Job { private final IOperation operation; - private final OperationReporter reporter; + private final OperationLogger logger; /** * @param operation the operation that will be executed by this Job's run method @@ -31,12 +31,12 @@ public final class OperationJob extends Job { /** * @param operation the operation that will be executed by this Job's run method - * @param reporter reporter.report(IStatus status) is passed the IStatus returned by the operation's run method + * @param logger logger.log(IStatus status) is passed the IStatus returned by the operation's run method */ - public OperationJob(IOperation operation, OperationReporter reporter) { + public OperationJob(IOperation operation, OperationLogger logger) { super(operation.getName()); this.operation = operation; - this.reporter = reporter; + this.logger = logger; } @Override @@ -44,8 +44,8 @@ public final class OperationJob extends Job { SubMonitor subMonitor = SubMonitor.convert(monitor); IStatus status = operation.run(subMonitor); - if (reporter != null) { - reporter.report(status); + if (logger != null) { + logger.log(status); } return status; } diff --git a/plugins/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/operation/OperationReporter.java b/plugins/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/operation/OperationLogger.java index 25d74ccac32..2eb2c4699b9 100644 --- a/plugins/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/operation/OperationReporter.java +++ b/plugins/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/operation/OperationLogger.java @@ -16,17 +16,17 @@ import org.eclipse.osee.framework.jdk.core.util.Lib; /** * @author Ryan D. Brooks */ -public abstract class OperationReporter { +public abstract class OperationLogger { - public abstract void report(String... row); + public abstract void log(String... row); - public void report(Throwable th) { - report(Lib.exceptionToString(th)); + public void log(Throwable th) { + log(Lib.exceptionToString(th)); } - public void report(IStatus status) { + public void log(IStatus status) { if (status.getSeverity() == IStatus.ERROR) { - report(status.getException()); + log(status.getException()); } } } diff --git a/plugins/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/operation/Operations.java b/plugins/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/operation/Operations.java index ba23957c02e..287073f7410 100644 --- a/plugins/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/operation/Operations.java +++ b/plugins/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/operation/Operations.java @@ -78,7 +78,7 @@ public final class Operations { return scheduleJob(new OperationJob(operation), user, Job.LONG, null); } - public static Job executeAsJob(IOperation operation, OperationReporter reporter, boolean user) { + public static Job executeAsJob(IOperation operation, OperationLogger logger, boolean user) { return scheduleJob(new OperationJob(operation), user, Job.LONG, null); } diff --git a/plugins/org.eclipse.osee.framework.database/src/org/eclipse/osee/framework/database/operation/ConsolidateArtifactVersionTxOperation.java b/plugins/org.eclipse.osee.framework.database/src/org/eclipse/osee/framework/database/operation/ConsolidateArtifactVersionTxOperation.java index d75f4310043..4fa03c262b8 100644 --- a/plugins/org.eclipse.osee.framework.database/src/org/eclipse/osee/framework/database/operation/ConsolidateArtifactVersionTxOperation.java +++ b/plugins/org.eclipse.osee.framework.database/src/org/eclipse/osee/framework/database/operation/ConsolidateArtifactVersionTxOperation.java @@ -17,7 +17,7 @@ import org.eclipse.osee.framework.core.enums.ModificationType; import org.eclipse.osee.framework.core.enums.TxChange; import org.eclipse.osee.framework.core.exception.OseeCoreException; import org.eclipse.osee.framework.core.exception.OseeStateException; -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; @@ -71,13 +71,13 @@ public class ConsolidateArtifactVersionTxOperation extends AbstractDbTxOperation private long previousNetGammaId; private int previousBranchId; private int previuosTransactionId; - private final OperationReporter reporter; + private final OperationLogger logger; private int updateTxsCounter; private int deleteTxsCounter; - public ConsolidateArtifactVersionTxOperation(IOseeDatabaseService databaseService, OperationReporter reporter) { + public ConsolidateArtifactVersionTxOperation(IOseeDatabaseService databaseService, OperationLogger logger) { super(databaseService, "Consolidate Artifact Versions", Activator.PLUGIN_ID); - this.reporter = reporter; + this.logger = logger; } private void init() throws OseeCoreException { @@ -158,8 +158,7 @@ public class ConsolidateArtifactVersionTxOperation extends AbstractDbTxOperation } } if (!knownCase) { - reporter.report(String.format("unknown case: artifact id: %d branch_id: %d", previousArtifactId, - previousBranchId)); + logger.log(String.format("unknown case: artifact id: %d branch_id: %d", previousArtifactId, previousBranchId)); } } @@ -171,8 +170,8 @@ public class ConsolidateArtifactVersionTxOperation extends AbstractDbTxOperation if (true) { findArtifactMods(); - reporter.report("updateTxsCurrentModData size: " + updateTxsCurrentModData.size()); - reporter.report("addressingToDelete size: " + addressingToDelete.size()); + logger.log("updateTxsCurrentModData size: " + updateTxsCurrentModData.size()); + logger.log("addressingToDelete size: " + addressingToDelete.size()); getDatabaseService().runBatchUpdate(connection, prepareSql(UPDATE_TXS_MOD_CURRENT, false), updateTxsCurrentModData); @@ -182,9 +181,9 @@ public class ConsolidateArtifactVersionTxOperation extends AbstractDbTxOperation } findObsoleteGammas(); - reporter.report("gamma join size: " + gammaJoin.size()); + logger.log("gamma join size: " + gammaJoin.size()); - reporter.report("Number of artifact version rows deleted: " + getDatabaseService().runBatchUpdate(connection, + logger.log("Number of artifact version rows deleted: " + getDatabaseService().runBatchUpdate(connection, DELETE_ARTIFACT_VERSIONS, deleteArtifactVersionData)); deleteArtifactVersionData = null; @@ -205,17 +204,17 @@ public class ConsolidateArtifactVersionTxOperation extends AbstractDbTxOperation private void updataConflicts(String columnName) throws OseeCoreException { int count = getDatabaseService().runPreparedUpdate(connection, String.format(UPDATE_CONFLICTS, columnName)); - reporter.report(String.format("updated %s in %d rows", columnName, count)); + logger.log(String.format("updated %s in %d rows", columnName, count)); } private void setBaselineTransactions() throws OseeCoreException { int count = getDatabaseService().runPreparedUpdate(connection, SET_BASELINE_TRANSACTION); - reporter.report(String.format("updated %d baseline transactions", count)); + logger.log(String.format("updated %d baseline transactions", count)); } private void populateArts() throws OseeCoreException { int count = getDatabaseService().runPreparedUpdate(connection, POPULATE_ARTS); - reporter.report(String.format("inserted %d rows into osee_artifact", count)); + logger.log(String.format("inserted %d rows into osee_artifact", count)); } private void findObsoleteGammas() throws OseeCoreException { @@ -250,7 +249,7 @@ public class ConsolidateArtifactVersionTxOperation extends AbstractDbTxOperation private void determineAffectedAddressingAndFix(boolean archived) throws OseeCoreException { try { - reporter.report("query id: " + gammaJoin.getQueryId()); + logger.log("query id: " + gammaJoin.getQueryId()); chStmt.runPreparedQuery(10000, String.format(SELECT_ADDRESSING, archived ? "_archived" : ""), gammaJoin.getQueryId()); @@ -316,7 +315,7 @@ public class ConsolidateArtifactVersionTxOperation extends AbstractDbTxOperation if (addressingToDelete.size() > 99960 || force) { deleteTxsCounter += getDatabaseService().runBatchUpdate(connection, prepareSql(DELETE_TXS, archived), addressingToDelete); - reporter.report("Number of txs" + archivedStr + " rows deleted: " + deleteTxsCounter); + logger.log("Number of txs" + archivedStr + " rows deleted: " + deleteTxsCounter); addressingToDelete.clear(); } @@ -324,7 +323,7 @@ public class ConsolidateArtifactVersionTxOperation extends AbstractDbTxOperation updateTxsCounter += getDatabaseService().runBatchUpdate(connection, prepareSql(UPDATE_TXS_GAMMAS, archived), updateAddressingData); - reporter.report("Number of txs" + archivedStr + " rows updated: " + updateTxsCounter); + logger.log("Number of txs" + archivedStr + " rows updated: " + updateTxsCounter); updateAddressingData.clear(); } diff --git a/plugins/org.eclipse.osee.framework.database/src/org/eclipse/osee/framework/database/operation/InvalidTxCurrentsAndModTypes.java b/plugins/org.eclipse.osee.framework.database/src/org/eclipse/osee/framework/database/operation/InvalidTxCurrentsAndModTypes.java index f3ff895005b..196a0ac820d 100644 --- a/plugins/org.eclipse.osee.framework.database/src/org/eclipse/osee/framework/database/operation/InvalidTxCurrentsAndModTypes.java +++ b/plugins/org.eclipse.osee.framework.database/src/org/eclipse/osee/framework/database/operation/InvalidTxCurrentsAndModTypes.java @@ -18,7 +18,7 @@ import org.eclipse.osee.framework.core.enums.TransactionDetailsType; import org.eclipse.osee.framework.core.enums.TxChange; import org.eclipse.osee.framework.core.exception.OseeCoreException; import org.eclipse.osee.framework.core.operation.AbstractOperation; -import org.eclipse.osee.framework.core.operation.OperationReporter; +import org.eclipse.osee.framework.core.operation.OperationLogger; import org.eclipse.osee.framework.database.core.ConnectionHandler; import org.eclipse.osee.framework.database.core.IOseeStatement; import org.eclipse.osee.framework.database.internal.Activator; @@ -35,7 +35,7 @@ public class InvalidTxCurrentsAndModTypes extends AbstractOperation { "update osee_txs%s set tx_current = ? where transaction_id = ? and gamma_id = ?"; private final List<Address> addresses = new ArrayList<Address>(); - private final OperationReporter reporter; + private final OperationLogger logger; private final List<Object[]> purgeData = new ArrayList<Object[]>(); private final List<Object[]> currentData = new ArrayList<Object[]>(); @@ -44,14 +44,14 @@ public class InvalidTxCurrentsAndModTypes extends AbstractOperation { private final boolean isFixOperationEnabled; private final String txsTableName; - public InvalidTxCurrentsAndModTypes(String operationName, String tableName, String columnName, OperationReporter reporter, boolean isFixOperationEnabled, boolean archived) { + public InvalidTxCurrentsAndModTypes(String operationName, String tableName, String columnName, OperationLogger logger, boolean isFixOperationEnabled, boolean archived) { super( "InvalidTxCurrentsAndModTypes " + operationName + tableName + " fix:" + isFixOperationEnabled + " archived:" + archived, Activator.PLUGIN_ID); this.tableName = tableName; this.columnName = columnName; this.isFixOperationEnabled = isFixOperationEnabled; - this.reporter = reporter; + this.logger = logger; txsTableName = archived ? "_archived" : ""; } @@ -65,7 +65,7 @@ public class InvalidTxCurrentsAndModTypes extends AbstractOperation { } private void logIssue(String issue, Address address) { - reporter.report(issue, String.valueOf(address.getBranchId()), String.valueOf(address.getItemId()), + logger.log(issue, String.valueOf(address.getBranchId()), String.valueOf(address.getItemId()), String.valueOf(address.getTransactionId()), String.valueOf(address.getGammaId()), address.getModType().toString(), address.getTxCurrent().toString()); } @@ -160,7 +160,7 @@ public class InvalidTxCurrentsAndModTypes extends AbstractOperation { @Override protected void doWork(IProgressMonitor monitor) throws Exception { - reporter.report("Starting " + getName()); + logger.log("Starting " + getName()); checkForCancelledStatus(monitor); @@ -197,6 +197,6 @@ public class InvalidTxCurrentsAndModTypes extends AbstractOperation { fixIssues(monitor); - reporter.report("Completed " + getName()); + logger.log("Completed " + getName()); } }
\ No newline at end of file diff --git a/plugins/org.eclipse.osee.framework.manager.servlet/src/org/eclipse/osee/framework/manager/servlet/BranchExchangeServlet.java b/plugins/org.eclipse.osee.framework.manager.servlet/src/org/eclipse/osee/framework/manager/servlet/BranchExchangeServlet.java index ae53555a3e5..ebf388340c7 100644 --- a/plugins/org.eclipse.osee.framework.manager.servlet/src/org/eclipse/osee/framework/manager/servlet/BranchExchangeServlet.java +++ b/plugins/org.eclipse.osee.framework.manager.servlet/src/org/eclipse/osee/framework/manager/servlet/BranchExchangeServlet.java @@ -17,7 +17,7 @@ import javax.servlet.ServletException; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import org.eclipse.osee.framework.branch.management.IBranchExchange; -import org.eclipse.osee.framework.core.operation.ConsoleReporter; +import org.eclipse.osee.framework.core.operation.ConsoleLogger; import org.eclipse.osee.framework.core.server.ISessionManager; import org.eclipse.osee.framework.core.server.SecureOseeHttpServlet; import org.eclipse.osee.framework.jdk.core.util.Lib; @@ -134,7 +134,7 @@ public class BranchExchangeServlet extends SecureOseeHttpServlet { private void executeImport(HttpBranchExchangeInfo exchangeInfo, HttpServletResponse response) throws Exception { IResourceLocator locator = locatorManager.getResourceLocator(exchangeInfo.getPath()); branchExchangeService.importBranch(locator, exchangeInfo.getOptions(), exchangeInfo.getSelectedBranchIds(), - new ConsoleReporter()); + new ConsoleLogger()); response.setStatus(HttpServletResponse.SC_ACCEPTED); response.setContentType("text/plain"); 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); } diff --git a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/importing/parsers/WordMLExtractorDelegateTableOfContentsTest.java b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/importing/parsers/WordMLExtractorDelegateTableOfContentsTest.java index fb1f513481f..40a98895fbd 100644 --- a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/importing/parsers/WordMLExtractorDelegateTableOfContentsTest.java +++ b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/importing/parsers/WordMLExtractorDelegateTableOfContentsTest.java @@ -15,7 +15,7 @@ import java.io.InputStream; import java.util.regex.Matcher; import java.util.regex.Pattern; import junit.framework.Assert; -import org.eclipse.osee.framework.core.operation.OperationReporter; +import org.eclipse.osee.framework.core.operation.OperationLogger; import org.eclipse.osee.framework.jdk.core.util.Lib; import org.eclipse.osee.framework.skynet.core.importing.parsers.WordOutlineExtractorDelegate; import org.junit.Test; @@ -33,11 +33,11 @@ public final class WordMLExtractorDelegateTableOfContentsTest { private static final String TABLE_OF_CONTENTS_FILE = "tableOfContentsHyperlinkTest.xml"; private final WordOutlineExtractorDelegate delegate = new WordOutlineExtractorDelegate(); - private class TestOperationReporter extends OperationReporter { + private class TestOperationLogger extends OperationLogger { public final StringBuilder warningMsgs = new StringBuilder(); @Override - public void report(String... row) { + public void log(String... row) { for (String warningMessage : row) { warningMsgs.append(warningMessage); } @@ -48,17 +48,17 @@ public final class WordMLExtractorDelegateTableOfContentsTest { public void tableOfContentsLinksInput() throws Exception { delegate.initialize(); - TestOperationReporter reporter = new TestOperationReporter(); + TestOperationLogger logger = new TestOperationLogger(); Matcher matcher = PARAGRAPHREGEX.matcher(getFileAsString(TABLE_OF_CONTENTS_FILE)); boolean foundSomething = false; while (matcher.find()) { foundSomething = true; - delegate.processContent(reporter, null, false, false, null, null, null, matcher.group(), false); + delegate.processContent(logger, null, false, false, null, null, null, matcher.group(), false); } Assert.assertTrue("Warnings generated and Table of Contents in WordML should be detected", - reporter.warningMsgs.length() > 0); + logger.warningMsgs.length() > 0); Assert.assertTrue(foundSomething); } diff --git a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/importing/operations/SourceToRoughArtifactOperation.java b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/importing/operations/SourceToRoughArtifactOperation.java index 9756eeac15d..f5fe4b8ef54 100644 --- a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/importing/operations/SourceToRoughArtifactOperation.java +++ b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/importing/operations/SourceToRoughArtifactOperation.java @@ -16,7 +16,7 @@ import org.eclipse.osee.framework.core.exception.OseeCoreException; import org.eclipse.osee.framework.core.exception.OseeExceptions; import org.eclipse.osee.framework.core.exception.OseeStateException; import org.eclipse.osee.framework.core.operation.AbstractOperation; -import org.eclipse.osee.framework.core.operation.OperationReporter; +import org.eclipse.osee.framework.core.operation.OperationLogger; import org.eclipse.osee.framework.skynet.core.importing.RoughArtifact; import org.eclipse.osee.framework.skynet.core.importing.RoughArtifactKind; import org.eclipse.osee.framework.skynet.core.importing.parsers.IArtifactExtractor; @@ -27,17 +27,17 @@ import org.eclipse.osee.framework.skynet.core.internal.Activator; */ public class SourceToRoughArtifactOperation extends AbstractOperation { - private final OperationReporter reporter; + private final OperationLogger logger; private final IArtifactExtractor extractor; private final File sourceFile; private final RoughArtifactCollector collector; - public SourceToRoughArtifactOperation(OperationReporter reporter, IArtifactExtractor extractor, File sourceFile, RoughArtifactCollector collector) { + public SourceToRoughArtifactOperation(OperationLogger logger, IArtifactExtractor extractor, File sourceFile, RoughArtifactCollector collector) { super("Extract artifact data from source", Activator.PLUGIN_ID); this.extractor = extractor; this.sourceFile = sourceFile; this.collector = collector; - this.reporter = reporter; + this.logger = logger; } @Override @@ -78,7 +78,7 @@ public class SourceToRoughArtifactOperation extends AbstractOperation { private void processFile(File file, RoughArtifactCollector collector, RoughArtifact parent) throws OseeCoreException { RoughArtifactCollector tempCollector = new RoughArtifactCollector(parent); try { - extractor.process(reporter, file.toURI(), tempCollector); + extractor.process(logger, file.toURI(), tempCollector); } catch (Exception ex) { OseeExceptions.wrapAndThrow(ex); } diff --git a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/importing/parsers/AbstractArtifactExtractor.java b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/importing/parsers/AbstractArtifactExtractor.java index b80954017e9..afc2204daf1 100644 --- a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/importing/parsers/AbstractArtifactExtractor.java +++ b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/importing/parsers/AbstractArtifactExtractor.java @@ -13,7 +13,7 @@ package org.eclipse.osee.framework.skynet.core.importing.parsers; import java.net.URI; import org.eclipse.osee.framework.core.exception.OseeCoreException; import org.eclipse.osee.framework.core.exception.OseeStateException; -import org.eclipse.osee.framework.core.operation.OperationReporter; +import org.eclipse.osee.framework.core.operation.OperationLogger; import org.eclipse.osee.framework.skynet.core.importing.RoughArtifact; import org.eclipse.osee.framework.skynet.core.importing.operations.RoughArtifactCollector; @@ -30,7 +30,7 @@ public abstract class AbstractArtifactExtractor implements IArtifactExtractor { // Protect Constructor } - protected abstract void extractFromSource(OperationReporter reporter, URI source, RoughArtifactCollector collector) throws Exception; + protected abstract void extractFromSource(OperationLogger logger, URI source, RoughArtifactCollector collector) throws Exception; @Override public String toString() { @@ -64,12 +64,12 @@ public abstract class AbstractArtifactExtractor implements IArtifactExtractor { } @Override - public final void process(OperationReporter reporter, URI source, RoughArtifactCollector collector) throws Exception { + public final void process(OperationLogger logger, URI source, RoughArtifactCollector collector) throws Exception { checkDelegate(); delegate.initialize(); try { - extractFromSource(reporter, source, collector); + extractFromSource(logger, source, collector); connectParentChildRelations(collector); connectCollectorParent(collector); } finally { diff --git a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/importing/parsers/ExcelArtifactExtractor.java b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/importing/parsers/ExcelArtifactExtractor.java index 6e77c585e5e..2b7fc49d1d2 100644 --- a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/importing/parsers/ExcelArtifactExtractor.java +++ b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/importing/parsers/ExcelArtifactExtractor.java @@ -23,7 +23,7 @@ import org.eclipse.osee.framework.core.enums.CoreAttributeTypes; import org.eclipse.osee.framework.core.exception.OseeArgumentException; import org.eclipse.osee.framework.core.exception.OseeCoreException; import org.eclipse.osee.framework.core.model.type.ArtifactType; -import org.eclipse.osee.framework.core.operation.OperationReporter; +import org.eclipse.osee.framework.core.operation.OperationLogger; import org.eclipse.osee.framework.jdk.core.type.DoubleKeyHashMap; import org.eclipse.osee.framework.jdk.core.util.GUID; import org.eclipse.osee.framework.jdk.core.util.Strings; @@ -73,7 +73,7 @@ public class ExcelArtifactExtractor extends AbstractArtifactExtractor { } @Override - protected void extractFromSource(OperationReporter reporter, URI source, RoughArtifactCollector collector) throws Exception { + protected void extractFromSource(OperationLogger logger, URI source, RoughArtifactCollector collector) throws Exception { XMLReader xmlReader = XMLReaderFactory.createXMLReader(); xmlReader.setContentHandler(new ExcelSaxHandler(new ExcelRowProcessor(collector), true)); xmlReader.parse(new InputSource(new InputStreamReader(source.toURL().openStream(), "UTF-8"))); diff --git a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/importing/parsers/IArtifactExtractor.java b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/importing/parsers/IArtifactExtractor.java index 4c047b59bc7..1fc99641945 100644 --- a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/importing/parsers/IArtifactExtractor.java +++ b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/importing/parsers/IArtifactExtractor.java @@ -12,7 +12,7 @@ package org.eclipse.osee.framework.skynet.core.importing.parsers; import java.io.FileFilter; import java.net.URI; -import org.eclipse.osee.framework.core.operation.OperationReporter; +import org.eclipse.osee.framework.core.operation.OperationLogger; import org.eclipse.osee.framework.skynet.core.importing.operations.RoughArtifactCollector; /** @@ -24,7 +24,7 @@ public interface IArtifactExtractor { public abstract String getDescription(); - public abstract void process(OperationReporter reporter, URI source, RoughArtifactCollector collector) throws Exception; + public abstract void process(OperationLogger logger, URI source, RoughArtifactCollector collector) throws Exception; public abstract FileFilter getFileFilter(); diff --git a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/importing/parsers/IArtifactExtractorDelegate.java b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/importing/parsers/IArtifactExtractorDelegate.java index 6df9669d50c..b33293df049 100644 --- a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/importing/parsers/IArtifactExtractorDelegate.java +++ b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/importing/parsers/IArtifactExtractorDelegate.java @@ -11,7 +11,7 @@ package org.eclipse.osee.framework.skynet.core.importing.parsers; import org.eclipse.osee.framework.core.exception.OseeCoreException; -import org.eclipse.osee.framework.core.operation.OperationReporter; +import org.eclipse.osee.framework.core.operation.OperationLogger; import org.eclipse.osee.framework.skynet.core.importing.operations.RoughArtifactCollector; /** @@ -50,7 +50,7 @@ public interface IArtifactExtractorDelegate { * and initialize it with data from the content, or to append the content to the last, or a prior created * RoughArtifact. */ - public void processContent(OperationReporter reporter, RoughArtifactCollector collector, boolean forceBody, boolean forcePrimaryType, String headerNumber, String listIdentifier, String paragraphStyle, String content, boolean isParagraph) throws OseeCoreException; + public void processContent(OperationLogger logger, RoughArtifactCollector collector, boolean forceBody, boolean forcePrimaryType, String headerNumber, String listIdentifier, String paragraphStyle, String content, boolean isParagraph) throws OseeCoreException; public void finish(); diff --git a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/importing/parsers/NativeDocumentExtractor.java b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/importing/parsers/NativeDocumentExtractor.java index c5df5aefec4..e67f510b8ad 100644 --- a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/importing/parsers/NativeDocumentExtractor.java +++ b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/importing/parsers/NativeDocumentExtractor.java @@ -14,7 +14,7 @@ import java.io.File; import java.io.FileFilter; import java.net.URI; import org.eclipse.osee.framework.core.enums.CoreAttributeTypes; -import org.eclipse.osee.framework.core.operation.OperationReporter; +import org.eclipse.osee.framework.core.operation.OperationLogger; import org.eclipse.osee.framework.jdk.core.util.Lib; import org.eclipse.osee.framework.skynet.core.importing.RoughArtifact; import org.eclipse.osee.framework.skynet.core.importing.RoughArtifactKind; @@ -28,7 +28,7 @@ public class NativeDocumentExtractor extends AbstractArtifactExtractor { } @Override - protected void extractFromSource(OperationReporter reporter, URI source, RoughArtifactCollector collector) { + protected void extractFromSource(OperationLogger logger, URI source, RoughArtifactCollector collector) { String extension = Lib.getExtension(source.toASCIIString()); String name = Lib.removeExtension(new File(source).getName()); diff --git a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/importing/parsers/NullDelegate.java b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/importing/parsers/NullDelegate.java index b5b630adbb9..70c8ab28882 100644 --- a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/importing/parsers/NullDelegate.java +++ b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/importing/parsers/NullDelegate.java @@ -10,7 +10,7 @@ *******************************************************************************/ package org.eclipse.osee.framework.skynet.core.importing.parsers; -import org.eclipse.osee.framework.core.operation.OperationReporter; +import org.eclipse.osee.framework.core.operation.OperationLogger; import org.eclipse.osee.framework.skynet.core.importing.operations.RoughArtifactCollector; public final class NullDelegate implements IArtifactExtractorDelegate { @@ -36,7 +36,7 @@ public final class NullDelegate implements IArtifactExtractorDelegate { } @Override - public void processContent(OperationReporter reporter, RoughArtifactCollector collector, boolean forceBody, boolean forcePrimaryType, String headerNumber, String listIdentifier, String paragraphStyle, String content, boolean isParagraph) { + public void processContent(OperationLogger logger, RoughArtifactCollector collector, boolean forceBody, boolean forcePrimaryType, String headerNumber, String listIdentifier, String paragraphStyle, String content, boolean isParagraph) { // } diff --git a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/importing/parsers/WholeWordDocumentExtractor.java b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/importing/parsers/WholeWordDocumentExtractor.java index 44eb10b53ae..1a9882bdb81 100644 --- a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/importing/parsers/WholeWordDocumentExtractor.java +++ b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/importing/parsers/WholeWordDocumentExtractor.java @@ -15,7 +15,7 @@ import java.io.FileFilter; import java.net.URI; import org.eclipse.osee.framework.core.enums.CoreAttributeTypes; import org.eclipse.osee.framework.core.exception.OseeArgumentException; -import org.eclipse.osee.framework.core.operation.OperationReporter; +import org.eclipse.osee.framework.core.operation.OperationLogger; import org.eclipse.osee.framework.jdk.core.util.Lib; import org.eclipse.osee.framework.skynet.core.importing.RoughArtifact; import org.eclipse.osee.framework.skynet.core.importing.RoughArtifactKind; @@ -28,7 +28,7 @@ public class WholeWordDocumentExtractor extends AbstractArtifactExtractor { } @Override - protected void extractFromSource(OperationReporter reporter, URI source, RoughArtifactCollector collector) throws Exception { + protected void extractFromSource(OperationLogger logger, URI source, RoughArtifactCollector collector) throws Exception { if (source == null) { throw new OseeArgumentException("importFile can not be null"); } diff --git a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/importing/parsers/WordOutlineExtractor.java b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/importing/parsers/WordOutlineExtractor.java index 6ff680ebe89..4d94c7cdf61 100644 --- a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/importing/parsers/WordOutlineExtractor.java +++ b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/importing/parsers/WordOutlineExtractor.java @@ -23,7 +23,7 @@ import java.util.regex.Matcher; import java.util.regex.Pattern; import org.eclipse.osee.framework.core.exception.OseeCoreException; import org.eclipse.osee.framework.core.exception.OseeStateException; -import org.eclipse.osee.framework.core.operation.OperationReporter; +import org.eclipse.osee.framework.core.operation.OperationLogger; import org.eclipse.osee.framework.jdk.core.util.Readers; import org.eclipse.osee.framework.skynet.core.importing.operations.RoughArtifactCollector; import org.eclipse.osee.framework.skynet.core.word.WordUtil; @@ -109,7 +109,7 @@ public class WordOutlineExtractor extends AbstractArtifactExtractor { } @Override - protected void extractFromSource(OperationReporter reporter, URI source, RoughArtifactCollector collector) throws OseeCoreException, IOException { + protected void extractFromSource(OperationLogger logger, URI source, RoughArtifactCollector collector) throws OseeCoreException, IOException { Reader reader = null; try { reader = new BufferedReader(new InputStreamReader(source.toURL().openStream(), "UTF-8")); @@ -162,7 +162,7 @@ public class WordOutlineExtractor extends AbstractArtifactExtractor { listIdentifier = ""; paragraphStyle = null; parseContentDetails(content, new Stack<String>()); - delegate.processContent(reporter, collector, forceBody, forcePrimaryType, headerNumber, listIdentifier, + delegate.processContent(logger, collector, forceBody, forcePrimaryType, headerNumber, listIdentifier, paragraphStyle, content.toString(), element == PARAGRAPH_TAG); } } diff --git a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/importing/parsers/WordOutlineExtractorDelegate.java b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/importing/parsers/WordOutlineExtractorDelegate.java index 396c5ca02af..5a52cfaad8c 100644 --- a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/importing/parsers/WordOutlineExtractorDelegate.java +++ b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/importing/parsers/WordOutlineExtractorDelegate.java @@ -25,7 +25,7 @@ import org.eclipse.osee.framework.core.enums.CoreAttributeTypes; import org.eclipse.osee.framework.core.exception.OseeCoreException; import org.eclipse.osee.framework.core.exception.OseeExceptions; import org.eclipse.osee.framework.core.exception.OseeStateException; -import org.eclipse.osee.framework.core.operation.OperationReporter; +import org.eclipse.osee.framework.core.operation.OperationLogger; import org.eclipse.osee.framework.jdk.core.util.Strings; import org.eclipse.osee.framework.skynet.core.importing.RoughArtifact; import org.eclipse.osee.framework.skynet.core.importing.RoughArtifactKind; @@ -153,12 +153,12 @@ public class WordOutlineExtractorDelegate implements IArtifactExtractorDelegate } @Override - public final void processContent(OperationReporter opReporter, RoughArtifactCollector collector, boolean forceBody, boolean forcePrimaryType, String headerNumber, String listIdentifier, String paragraphStyle, String content, boolean isParagraph) throws OseeCoreException { + public final void processContent(OperationLogger logger, RoughArtifactCollector collector, boolean forceBody, boolean forcePrimaryType, String headerNumber, String listIdentifier, String paragraphStyle, String content, boolean isParagraph) throws OseeCoreException { if (Strings.isValid(content) && initalized) { if (!possibleTableOfContents) { possibleTableOfContents = TOC_HYPERLINK_PATTERN.matcher(content).matches(); - if (possibleTableOfContents && opReporter != null) { - opReporter.report(detectedTableOfContentsReportError); + if (possibleTableOfContents && logger != null) { + logger.log(detectedTableOfContentsReportError); } } diff --git a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/importing/parsers/XmlDataExtractor.java b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/importing/parsers/XmlDataExtractor.java index 6bfe1b65c87..4a59d633c27 100644 --- a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/importing/parsers/XmlDataExtractor.java +++ b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/importing/parsers/XmlDataExtractor.java @@ -15,7 +15,7 @@ import java.io.FileFilter; import java.io.InputStreamReader; import java.net.URI; import org.eclipse.osee.framework.core.data.IArtifactType; -import org.eclipse.osee.framework.core.operation.OperationReporter; +import org.eclipse.osee.framework.core.operation.OperationLogger; import org.eclipse.osee.framework.jdk.core.util.Lib; import org.eclipse.osee.framework.skynet.core.artifact.ArtifactTypeManager; import org.eclipse.osee.framework.skynet.core.importing.operations.RoughArtifactCollector; @@ -29,7 +29,7 @@ import org.xml.sax.helpers.XMLReaderFactory; public class XmlDataExtractor extends AbstractArtifactExtractor { @Override - protected void extractFromSource(OperationReporter reporter, URI source, RoughArtifactCollector collector) throws Exception { + protected void extractFromSource(OperationLogger logger, URI source, RoughArtifactCollector collector) throws Exception { IArtifactType primaryArtifactType = ArtifactTypeManager.getType(Lib.removeExtension(new File(source).getName())); XMLReader xmlReader = XMLReaderFactory.createXMLReader(); xmlReader.setContentHandler(new XmlDataSaxHandler(collector, primaryArtifactType)); diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/Import/ArtifactImportOperationFactory.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/Import/ArtifactImportOperationFactory.java index 603d043d032..80a26e64932 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/Import/ArtifactImportOperationFactory.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/Import/ArtifactImportOperationFactory.java @@ -21,7 +21,7 @@ import org.eclipse.osee.framework.core.exception.OseeCoreException; import org.eclipse.osee.framework.core.operation.AbstractOperation; import org.eclipse.osee.framework.core.operation.CompositeOperation; import org.eclipse.osee.framework.core.operation.IOperation; -import org.eclipse.osee.framework.core.operation.OperationReporter; +import org.eclipse.osee.framework.core.operation.OperationLogger; import org.eclipse.osee.framework.skynet.core.artifact.Artifact; import org.eclipse.osee.framework.skynet.core.importing.RoughArtifact; import org.eclipse.osee.framework.skynet.core.importing.RoughArtifactKind; @@ -46,24 +46,24 @@ public final class ArtifactImportOperationFactory { super(); } - public static IOperation createOperation(File sourceFile, Artifact destinationArtifact, OperationReporter reporter, IArtifactExtractor extractor, IArtifactImportResolver resolver, boolean stopOnError) throws OseeCoreException { + public static IOperation createOperation(File sourceFile, Artifact destinationArtifact, OperationLogger logger, IArtifactExtractor extractor, IArtifactImportResolver resolver, boolean stopOnError) throws OseeCoreException { SkynetTransaction transaction = new SkynetTransaction(destinationArtifact.getBranch(), "Artifact Import Wizard transaction"); RoughArtifactCollector collector = new RoughArtifactCollector(new RoughArtifact(RoughArtifactKind.PRIMARY)); List<IOperation> ops = new ArrayList<IOperation>(); - ops.add(new SourceToRoughArtifactOperation(reporter, extractor, sourceFile, collector)); + ops.add(new SourceToRoughArtifactOperation(logger, extractor, sourceFile, collector)); ops.add(new RoughToRealArtifactOperation(transaction, destinationArtifact, collector, resolver, false)); ops.add(new ArtifactValidationCheckOperation(destinationArtifact.getDescendants(), stopOnError)); ops.add(new CompleteArtifactImportOperation(transaction, destinationArtifact)); return new CompositeOperation("Artifact Import", SkynetGuiPlugin.PLUGIN_ID, ops); } - public static IOperation createArtifactAndRoughToRealOperation(File sourceFile, Artifact destinationArtifact, OperationReporter reporter, IArtifactExtractor extractor, IArtifactImportResolver resolver, RoughArtifactCollector collector, Collection<IArtifactType> selectionArtifactTypes, boolean stopOnError, boolean deleteUnMatched, boolean runFilterByAttributes) { + public static IOperation createArtifactAndRoughToRealOperation(File sourceFile, Artifact destinationArtifact, OperationLogger logger, IArtifactExtractor extractor, IArtifactImportResolver resolver, RoughArtifactCollector collector, Collection<IArtifactType> selectionArtifactTypes, boolean stopOnError, boolean deleteUnMatched, boolean runFilterByAttributes) { List<IOperation> ops = new ArrayList<IOperation>(); ops.add(createArtifactsCompOperation( "Artifact Import - SourceToRoughArtifact, FilterArtifactTypesByAttributeTypes", sourceFile, - destinationArtifact, reporter, extractor, collector, selectionArtifactTypes, runFilterByAttributes)); + destinationArtifact, logger, extractor, collector, selectionArtifactTypes, runFilterByAttributes)); ops.add(createRoughToRealOperation( "Artifact Import - RoughToRealArtifactOperation, ArtifactValidationCheckOperation, CompleteArtifactImportOperation", destinationArtifact, resolver, stopOnError, collector, deleteUnMatched)); @@ -74,9 +74,9 @@ public final class ArtifactImportOperationFactory { /** * @see ArtifactImportPage */ - public static IOperation createArtifactsCompOperation(String opDescription, File sourceFile, Artifact destinationArtifact, OperationReporter reporter, IArtifactExtractor extractor, RoughArtifactCollector collector, Collection<IArtifactType> selectionArtifactTypes, boolean runFilterByAttributes) { + public static IOperation createArtifactsCompOperation(String opDescription, File sourceFile, Artifact destinationArtifact, OperationLogger logger, IArtifactExtractor extractor, RoughArtifactCollector collector, Collection<IArtifactType> selectionArtifactTypes, boolean runFilterByAttributes) { List<IOperation> ops = new ArrayList<IOperation>(); - ops.add(new SourceToRoughArtifactOperation(reporter, extractor, sourceFile, collector)); + ops.add(new SourceToRoughArtifactOperation(logger, extractor, sourceFile, collector)); if (runFilterByAttributes) { ops.add(new FilterArtifactTypesByAttributeTypes(destinationArtifact.getBranch(), collector, selectionArtifactTypes)); diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/Import/ArtifactImportPage.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/Import/ArtifactImportPage.java index 06acddf9949..645fd40b438 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/Import/ArtifactImportPage.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/Import/ArtifactImportPage.java @@ -25,7 +25,7 @@ import org.eclipse.osee.framework.core.data.IAttributeType; import org.eclipse.osee.framework.core.exception.OseeCoreException; import org.eclipse.osee.framework.core.model.type.ArtifactType; import org.eclipse.osee.framework.core.operation.IOperation; -import org.eclipse.osee.framework.core.operation.OperationReporter; +import org.eclipse.osee.framework.core.operation.OperationLogger; import org.eclipse.osee.framework.core.operation.Operations; import org.eclipse.osee.framework.jdk.core.util.Strings; import org.eclipse.osee.framework.logging.OseeLog; @@ -438,9 +438,9 @@ public class ArtifactImportPage extends WizardDataTransferPage { IOperation op = ArtifactImportOperationFactory.createArtifactsCompOperation("Extracting data from source", sourceFile, - destinationArtifact, new OperationReporter() { + destinationArtifact, new OperationLogger() { @Override - public void report(String... row) { + public void log(String... row) { for (String warningMessage : row) { operationReportMessages.append(warningMessage); } diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/dbHealth/TxCurrentChecks.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/dbHealth/TxCurrentChecks.java index 6e759054db6..0334d3acb80 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/dbHealth/TxCurrentChecks.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/dbHealth/TxCurrentChecks.java @@ -14,7 +14,7 @@ import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.nebula.widgets.xviewer.XViewerColumn; import org.eclipse.nebula.widgets.xviewer.XViewerColumn.SortDataType; import org.eclipse.osee.framework.database.operation.InvalidTxCurrentsAndModTypes; -import org.eclipse.osee.framework.ui.skynet.results.ResultsReporter; +import org.eclipse.osee.framework.ui.skynet.results.ResultsTableLogger; import org.eclipse.osee.framework.ui.skynet.results.table.ResultsEditorTableTab; import org.eclipse.swt.SWT; @@ -47,7 +47,7 @@ public class TxCurrentChecks extends DatabaseHealthOperation { resultsTab.addColumn(new XViewerColumn("6", "Mod Type", 80, SWT.LEFT, true, SortDataType.String, false, "")); resultsTab.addColumn(new XViewerColumn("7", "TX Current", 80, SWT.LEFT, true, SortDataType.String, false, "")); - doSubWork(new InvalidTxCurrentsAndModTypes("TxCurrentChecks ", tableName, columnName, new ResultsReporter( + doSubWork(new InvalidTxCurrentsAndModTypes("TxCurrentChecks ", tableName, columnName, new ResultsTableLogger( resultsTab), isFixOperationEnabled(), true), monitor, 0.3); } diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/results/ResultsReporter.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/results/ResultsTableLogger.java index 375d028a1e4..41d99f42d98 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/results/ResultsReporter.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/results/ResultsTableLogger.java @@ -10,19 +10,19 @@ *******************************************************************************/ package org.eclipse.osee.framework.ui.skynet.results; -import org.eclipse.osee.framework.core.operation.OperationReporter; +import org.eclipse.osee.framework.core.operation.OperationLogger; import org.eclipse.osee.framework.ui.skynet.results.table.ResultsEditorTableTab; import org.eclipse.osee.framework.ui.skynet.results.table.ResultsXViewerRow; -public class ResultsReporter extends OperationReporter { +public class ResultsTableLogger extends OperationLogger { private final ResultsEditorTableTab resultsTab; - public ResultsReporter(ResultsEditorTableTab resultsTab) { + public ResultsTableLogger(ResultsEditorTableTab resultsTab) { this.resultsTab = resultsTab; } @Override - public void report(String... row) { + public void log(String... row) { resultsTab.addRow(new ResultsXViewerRow(row)); } }
\ No newline at end of file |