diff options
| author | ddunne | 2011-05-20 21:45:27 +0000 |
|---|---|---|
| committer | Ryan D. Brooks | 2011-05-20 21:45:27 +0000 |
| commit | c77ef71c9d2a6e48552b362148c4c9ce592f2314 (patch) | |
| tree | bb9d90cf3e58895252ce3367d1887dcc21ac22de /plugins | |
| parent | 3c6e5413be2216a54343667c9830d25012847b65 (diff) | |
| download | org.eclipse.osee-c77ef71c9d2a6e48552b362148c4c9ce592f2314.tar.gz org.eclipse.osee-c77ef71c9d2a6e48552b362148c4c9ce592f2314.tar.xz org.eclipse.osee-c77ef71c9d2a6e48552b362148c4c9ce592f2314.zip | |
refactor: Move XResultData to framework.core; created XResultDataUI
Diffstat (limited to 'plugins')
98 files changed, 689 insertions, 532 deletions
diff --git a/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/config/copy/ConfigDataTest.java b/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/config/copy/ConfigDataTest.java index 288788b9dbf..d1bab14c9dd 100644 --- a/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/config/copy/ConfigDataTest.java +++ b/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/config/copy/ConfigDataTest.java @@ -11,7 +11,7 @@ import org.eclipse.osee.ats.core.config.TeamDefinitionArtifact; import org.eclipse.osee.ats.core.config.TeamDefinitionManager; import org.eclipse.osee.ats.core.workflow.ActionableItemManagerCore; import org.eclipse.osee.ats.util.DemoTestUtil; -import org.eclipse.osee.framework.ui.skynet.results.XResultData; +import org.eclipse.osee.framework.core.util.XResultData; import org.eclipse.osee.support.test.util.DemoActionableItems; import org.eclipse.osee.support.test.util.DemoTeam; diff --git a/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/config/copy/CopyAtsConfigurationOperationTest.java b/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/config/copy/CopyAtsConfigurationOperationTest.java index 7740a8165e4..4792c4a37cc 100644 --- a/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/config/copy/CopyAtsConfigurationOperationTest.java +++ b/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/config/copy/CopyAtsConfigurationOperationTest.java @@ -15,10 +15,10 @@ import org.eclipse.osee.ats.core.config.TeamDefinitionManager; import org.eclipse.osee.ats.health.ValidateAtsDatabase; import org.eclipse.osee.framework.core.exception.OseeCoreException; import org.eclipse.osee.framework.core.operation.Operations; +import org.eclipse.osee.framework.core.util.XResultData; import org.eclipse.osee.framework.jdk.core.type.HashCollection; import org.eclipse.osee.framework.jdk.core.util.Collections; import org.eclipse.osee.framework.skynet.core.artifact.Artifact; -import org.eclipse.osee.framework.ui.skynet.results.XResultData; import org.junit.AfterClass; import org.junit.BeforeClass; import org.junit.Test; diff --git a/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/config/copy/CopyAtsValidationTest.java b/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/config/copy/CopyAtsValidationTest.java index 8bf90ed54a5..c52b60fbad4 100644 --- a/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/config/copy/CopyAtsValidationTest.java +++ b/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/config/copy/CopyAtsValidationTest.java @@ -10,7 +10,7 @@ import org.eclipse.osee.ats.core.config.ActionableItemArtifact; import org.eclipse.osee.ats.core.config.TeamDefinitionArtifact; import org.eclipse.osee.ats.util.DemoTestUtil; import org.eclipse.osee.framework.core.exception.OseeCoreException; -import org.eclipse.osee.framework.ui.skynet.results.XResultData; +import org.eclipse.osee.framework.core.util.XResultData; import org.eclipse.osee.support.test.util.DemoActionableItems; import org.eclipse.osee.support.test.util.DemoTeam; import org.junit.BeforeClass; diff --git a/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/editor/SMAPrintTest.java b/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/editor/SMAPrintTest.java index 0a6ea4fd904..a1fb3a5a19e 100644 --- a/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/editor/SMAPrintTest.java +++ b/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/editor/SMAPrintTest.java @@ -16,11 +16,11 @@ import org.eclipse.osee.ats.core.review.ReviewManager; import org.eclipse.osee.ats.core.task.TaskArtifact; import org.eclipse.osee.ats.core.team.TeamWorkFlowArtifact; import org.eclipse.osee.ats.core.type.AtsArtifactTypes; -import org.eclipse.osee.ats.editor.SMAPrint; import org.eclipse.osee.ats.util.AtsUtil; +import org.eclipse.osee.framework.core.util.XResultData; import org.eclipse.osee.framework.logging.SevereLoggingMonitor; import org.eclipse.osee.framework.skynet.core.artifact.search.ArtifactQuery; -import org.eclipse.osee.framework.ui.skynet.results.XResultData; +import org.eclipse.osee.framework.ui.skynet.results.XResultDataUI; import org.eclipse.osee.support.test.util.DemoArtifactTypes; import org.eclipse.osee.support.test.util.TestUtil; import org.junit.Assert; @@ -48,14 +48,14 @@ public class SMAPrintTest { XResultData resultData = smaPrint.getResultData(); Assert.assertNotNull(resultData); // Make sure it's a reasonable length - Assert.assertTrue(resultData.getReport("report").getManipulatedHtml().length() > 7000); + Assert.assertTrue(XResultDataUI.getReport(resultData, "report").getManipulatedHtml().length() > 7000); PeerToPeerReviewArtifact peerArt = (PeerToPeerReviewArtifact) ReviewManager.getReviews(teamArt).iterator().next(); smaPrint = new SMAPrint(peerArt); resultData = smaPrint.getResultData(); Assert.assertNotNull(resultData); // Make sure it's a reasonable length - Assert.assertTrue(resultData.getReport("report").getManipulatedHtml().length() > 3500); + Assert.assertTrue(XResultDataUI.getReport(resultData,"report").getManipulatedHtml().length() > 3500); TaskArtifact taskArt = null; for (TaskArtifact taskArtifact : teamArt.getTaskArtifacts()) { @@ -68,7 +68,7 @@ public class SMAPrintTest { resultData = smaPrint.getResultData(); Assert.assertNotNull(resultData); // Make sure it's a reasonable length - Assert.assertTrue(resultData.getReport("report").getManipulatedHtml().length() > 2700); + Assert.assertTrue(XResultDataUI.getReport(resultData,"report").getManipulatedHtml().length() > 2700); teamArt = (TeamWorkFlowArtifact) ArtifactQuery.getArtifactFromTypeAndName(AtsArtifactTypes.TeamWorkflow, @@ -79,7 +79,7 @@ public class SMAPrintTest { resultData = smaPrint.getResultData(); Assert.assertNotNull(resultData); // Make sure it's a reasonable length - Assert.assertTrue(resultData.getReport("report").getManipulatedHtml().length() > 2900); + Assert.assertTrue(XResultDataUI.getReport(resultData,"report").getManipulatedHtml().length() > 2900); TestUtil.severeLoggingEnd(monitorLog); } diff --git a/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/health/AtsValidateAtsDatabaseTest.java b/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/health/AtsValidateAtsDatabaseTest.java index a6d3b0823a3..0310654b3d1 100644 --- a/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/health/AtsValidateAtsDatabaseTest.java +++ b/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/health/AtsValidateAtsDatabaseTest.java @@ -14,9 +14,9 @@ import static org.junit.Assert.fail; import java.util.regex.Matcher; import java.util.regex.Pattern; import org.eclipse.osee.ats.core.config.AtsBulkLoad; -import org.eclipse.osee.ats.health.ValidateAtsDatabase; +import org.eclipse.osee.framework.core.util.XResultData; import org.eclipse.osee.framework.logging.SevereLoggingMonitor; -import org.eclipse.osee.framework.ui.skynet.results.XResultData; +import org.eclipse.osee.framework.ui.skynet.results.XResultDataUI; import org.eclipse.osee.support.test.util.TestUtil; /** @@ -39,7 +39,7 @@ public class AtsValidateAtsDatabaseTest { validateAtsDatabase.setFixAssignees(false); validateAtsDatabase.setFixAttributeValues(false); validateAtsDatabase.runIt(null, rd); - Matcher m = Pattern.compile("Error:.*$").matcher(rd.getReport("").getManipulatedHtml()); + Matcher m = Pattern.compile("Error:.*$").matcher(XResultDataUI.getReport(rd, "").getManipulatedHtml()); while (m.find()) { fail(m.group()); } diff --git a/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/util/ImportActionsViaSpreadsheetTest.java b/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/util/ImportActionsViaSpreadsheetTest.java index f45e138a94d..a03f6773e18 100644 --- a/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/util/ImportActionsViaSpreadsheetTest.java +++ b/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/util/ImportActionsViaSpreadsheetTest.java @@ -22,9 +22,9 @@ import org.eclipse.osee.ats.core.type.AtsArtifactTypes; import org.eclipse.osee.ats.core.type.AtsAttributeTypes; import org.eclipse.osee.ats.util.Import.ImportActionsViaSpreadsheetBlam; import org.eclipse.osee.ats.util.Import.ImportActionsViaSpreadsheetBlam.ImportOption; +import org.eclipse.osee.framework.core.util.XResultData; import org.eclipse.osee.framework.skynet.core.artifact.Artifact; import org.eclipse.osee.framework.skynet.core.artifact.search.ArtifactQuery; -import org.eclipse.osee.framework.ui.skynet.results.XResultData; import org.junit.AfterClass; import org.junit.Assert; import org.junit.Before; diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/actions/AddNoteAction.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/actions/AddNoteAction.java index 0256f0217dd..13687e6af9b 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/actions/AddNoteAction.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/actions/AddNoteAction.java @@ -19,7 +19,6 @@ import org.eclipse.jface.resource.ImageDescriptor; import org.eclipse.jface.wizard.WizardDialog; import org.eclipse.osee.ats.AtsImage; import org.eclipse.osee.ats.actions.wizard.NewNoteWizard; -import org.eclipse.osee.ats.artifact.WorkflowManager; import org.eclipse.osee.ats.core.workdef.StateDefinition; import org.eclipse.osee.ats.core.workflow.AbstractWorkflowArtifact; import org.eclipse.osee.ats.core.workflow.note.NoteType; diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/actions/ShowBranchChangeDataAction.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/actions/ShowBranchChangeDataAction.java index 13667f46c92..24b97736f24 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/actions/ShowBranchChangeDataAction.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/actions/ShowBranchChangeDataAction.java @@ -20,12 +20,13 @@ import org.eclipse.osee.ats.core.workflow.AbstractWorkflowArtifact; import org.eclipse.osee.ats.internal.AtsPlugin; import org.eclipse.osee.ats.util.AtsBranchManager; import org.eclipse.osee.framework.core.exception.OseeCoreException; +import org.eclipse.osee.framework.core.util.XResultData; import org.eclipse.osee.framework.logging.OseeLevel; import org.eclipse.osee.framework.logging.OseeLog; import org.eclipse.osee.framework.skynet.core.change.Change; import org.eclipse.osee.framework.skynet.core.revision.ChangeData; import org.eclipse.osee.framework.ui.plugin.util.AWorkbench; -import org.eclipse.osee.framework.ui.skynet.results.XResultData; +import org.eclipse.osee.framework.ui.skynet.results.XResultDataUI; import org.eclipse.osee.framework.ui.swt.ImageManager; /** @@ -59,7 +60,7 @@ public class ShowBranchChangeDataAction extends Action { for (Change change : changeData.getChanges()) { result.log(String.format("Change [%s]", change)); } - result.report(String.format("Branch Change Data Report [%s]", awa)); + XResultDataUI.report(result, String.format("Branch Change Data Report [%s]", awa)); } catch (OseeCoreException ex) { OseeLog.log(AtsPlugin.class, OseeLevel.SEVERE_POPUP, ex); } diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/actions/WorkflowDebugAction.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/actions/WorkflowDebugAction.java index 0a68891f9f6..3c2c5d2d90c 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/actions/WorkflowDebugAction.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/actions/WorkflowDebugAction.java @@ -24,10 +24,11 @@ import org.eclipse.osee.ats.core.workdef.WidgetDefinition; import org.eclipse.osee.ats.core.workflow.AbstractWorkflowArtifact; import org.eclipse.osee.ats.internal.AtsPlugin; import org.eclipse.osee.framework.core.exception.OseeCoreException; +import org.eclipse.osee.framework.core.util.XResultData; import org.eclipse.osee.framework.jdk.core.util.AHTML; import org.eclipse.osee.framework.logging.OseeLevel; import org.eclipse.osee.framework.logging.OseeLog; -import org.eclipse.osee.framework.ui.skynet.results.XResultData; +import org.eclipse.osee.framework.ui.skynet.results.XResultDataUI; import org.eclipse.osee.framework.ui.swt.ImageManager; /** @@ -47,7 +48,7 @@ public class WorkflowDebugAction extends Action { public void run() { try { XResultData result = getReport(); - result.report(String.format("Workflow Debug [%s]", sma)); + XResultDataUI.report(result, String.format("Workflow Debug [%s]", sma)); } catch (OseeCoreException ex) { OseeLog.log(AtsPlugin.class, OseeLevel.SEVERE_POPUP, ex); } diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/config/AtsConfigManager.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/config/AtsConfigManager.java index 51d3c0cf7eb..0cf79078c4b 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/config/AtsConfigManager.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/config/AtsConfigManager.java @@ -40,6 +40,7 @@ import org.eclipse.osee.framework.core.exception.OseeArgumentException; import org.eclipse.osee.framework.core.exception.OseeCoreException; import org.eclipse.osee.framework.core.operation.AbstractOperation; import org.eclipse.osee.framework.core.operation.IOperation; +import org.eclipse.osee.framework.core.util.XResultData; import org.eclipse.osee.framework.logging.OseeLevel; import org.eclipse.osee.framework.logging.OseeLog; import org.eclipse.osee.framework.plugin.core.util.Jobs; @@ -50,7 +51,6 @@ import org.eclipse.osee.framework.skynet.core.artifact.search.ArtifactQuery; import org.eclipse.osee.framework.skynet.core.transaction.SkynetTransaction; import org.eclipse.osee.framework.ui.skynet.render.PresentationType; import org.eclipse.osee.framework.ui.skynet.render.RendererManager; -import org.eclipse.osee.framework.ui.skynet.results.XResultData; import org.eclipse.ui.progress.UIJob; /** diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/config/AtsDatabaseConfig.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/config/AtsDatabaseConfig.java index caca71106b9..dc1239875dc 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/config/AtsDatabaseConfig.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/config/AtsDatabaseConfig.java @@ -20,11 +20,11 @@ import org.eclipse.osee.ats.workdef.AtsWorkDefinitionSheetProviders; import org.eclipse.osee.framework.core.data.IArtifactToken; import org.eclipse.osee.framework.core.exception.OseeCoreException; import org.eclipse.osee.framework.core.model.Branch; +import org.eclipse.osee.framework.core.util.XResultData; import org.eclipse.osee.framework.database.init.IDbInitializationTask; import org.eclipse.osee.framework.skynet.core.OseeSystemArtifacts; import org.eclipse.osee.framework.skynet.core.artifact.Artifact; import org.eclipse.osee.framework.skynet.core.transaction.SkynetTransaction; -import org.eclipse.osee.framework.ui.skynet.results.XResultData; public class AtsDatabaseConfig implements IDbInitializationTask { diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/config/copy/ConfigData.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/config/copy/ConfigData.java index 1cf57950962..99cd5ca35a1 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/config/copy/ConfigData.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/config/copy/ConfigData.java @@ -12,9 +12,9 @@ import org.eclipse.osee.ats.core.config.TeamDefinitionManager; import org.eclipse.osee.ats.core.type.AtsRelationTypes; import org.eclipse.osee.ats.core.workflow.ActionableItemManagerCore; import org.eclipse.osee.framework.core.exception.OseeCoreException; +import org.eclipse.osee.framework.core.util.XResultData; import org.eclipse.osee.framework.jdk.core.util.Strings; import org.eclipse.osee.framework.skynet.core.artifact.Artifact; -import org.eclipse.osee.framework.ui.skynet.results.XResultData; public class ConfigData { diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/config/copy/CopyAtsConfigurationBlam.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/config/copy/CopyAtsConfigurationBlam.java index 0137e42b2bc..75e410f0cf6 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/config/copy/CopyAtsConfigurationBlam.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/config/copy/CopyAtsConfigurationBlam.java @@ -13,13 +13,14 @@ import org.eclipse.osee.ats.core.config.TeamDefinitionArtifact; import org.eclipse.osee.ats.util.widgets.XActionableItemCombo; import org.eclipse.osee.ats.util.widgets.XTeamDefinitionCombo; import org.eclipse.osee.framework.core.exception.OseeCoreException; +import org.eclipse.osee.framework.core.util.XResultData; import org.eclipse.osee.framework.plugin.core.util.Jobs; import org.eclipse.osee.framework.skynet.core.artifact.Artifact; import org.eclipse.osee.framework.skynet.core.artifact.ArtifactCache; import org.eclipse.osee.framework.ui.plugin.util.AWorkbench; import org.eclipse.osee.framework.ui.skynet.blam.AbstractBlam; import org.eclipse.osee.framework.ui.skynet.blam.VariableMap; -import org.eclipse.osee.framework.ui.skynet.results.XResultData; +import org.eclipse.osee.framework.ui.skynet.results.XResultDataUI; import org.eclipse.osee.framework.ui.skynet.widgets.XModifiedListener; import org.eclipse.osee.framework.ui.skynet.widgets.XWidget; import org.eclipse.osee.framework.ui.skynet.widgets.workflow.DynamicXWidgetLayout; @@ -79,7 +80,7 @@ public class CopyAtsConfigurationBlam extends AbstractBlam { new CopyAtsValidation(data, resultData).validate(); if (resultData.isErrors() || !data.isPersistChanges()) { resultData.log("Validation Complete"); - resultData.report(getName()); + XResultDataUI.report(resultData,getName()); return; } diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/config/copy/CopyAtsConfigurationOperation.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/config/copy/CopyAtsConfigurationOperation.java index f91982a95f1..b3ab662650d 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/config/copy/CopyAtsConfigurationOperation.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/config/copy/CopyAtsConfigurationOperation.java @@ -22,9 +22,10 @@ import org.eclipse.osee.framework.core.enums.CoreRelationTypes; import org.eclipse.osee.framework.core.exception.OseeArgumentException; import org.eclipse.osee.framework.core.exception.OseeCoreException; import org.eclipse.osee.framework.core.operation.AbstractOperation; +import org.eclipse.osee.framework.core.util.XResultData; import org.eclipse.osee.framework.skynet.core.artifact.Artifact; import org.eclipse.osee.framework.skynet.core.transaction.SkynetTransaction; -import org.eclipse.osee.framework.ui.skynet.results.XResultData; +import org.eclipse.osee.framework.ui.skynet.results.XResultDataUI; public class CopyAtsConfigurationOperation extends AbstractOperation { @@ -85,7 +86,7 @@ public class CopyAtsConfigurationOperation extends AbstractOperation { } persistOrUndoChanges(); - resultData.report(getName()); + XResultDataUI.report(resultData,getName()); } finally { monitor.subTask("Done"); } diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/config/copy/CopyAtsValidation.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/config/copy/CopyAtsValidation.java index c2149f5ea0d..4da1a746b2e 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/config/copy/CopyAtsValidation.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/config/copy/CopyAtsValidation.java @@ -13,9 +13,9 @@ import org.eclipse.osee.ats.core.config.TeamDefinitionManager; import org.eclipse.osee.ats.core.workflow.ActionableItemManagerCore; import org.eclipse.osee.ats.health.ValidateAtsDatabase; import org.eclipse.osee.framework.core.exception.OseeCoreException; +import org.eclipse.osee.framework.core.util.XResultData; import org.eclipse.osee.framework.jdk.core.type.HashCollection; import org.eclipse.osee.framework.skynet.core.artifact.Artifact; -import org.eclipse.osee.framework.ui.skynet.results.XResultData; public class CopyAtsValidation { diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/SMAPrint.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/SMAPrint.java index fdbe0611371..d011e256949 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/SMAPrint.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/SMAPrint.java @@ -37,11 +37,12 @@ import org.eclipse.osee.ats.util.AtsUtil; import org.eclipse.osee.ats.util.Overview; import org.eclipse.osee.ats.workdef.StateXWidgetPage; import org.eclipse.osee.framework.core.exception.OseeCoreException; +import org.eclipse.osee.framework.core.util.XResultData; import org.eclipse.osee.framework.jdk.core.util.AHTML; import org.eclipse.osee.framework.jdk.core.util.DateUtil; import org.eclipse.osee.framework.logging.OseeLevel; import org.eclipse.osee.framework.logging.OseeLog; -import org.eclipse.osee.framework.ui.skynet.results.XResultData; +import org.eclipse.osee.framework.ui.skynet.results.XResultDataUI; import org.eclipse.osee.framework.ui.skynet.results.html.XResultPage.Manipulations; /** @@ -61,7 +62,7 @@ public class SMAPrint extends Action { public void run() { try { XResultData xResultData = getResultData(); - xResultData.report("Print Preview of " + sma.getName(), Manipulations.RAW_HTML); + XResultDataUI.report(xResultData, "Print Preview of " + sma.getName(), Manipulations.RAW_HTML); } catch (OseeCoreException ex) { OseeLog.log(AtsPlugin.class, OseeLevel.SEVERE_POPUP, ex); } @@ -117,7 +118,7 @@ public class SMAPrint extends Action { XResultData rd = new XResultData(); rd.addRaw(AHTML.beginMultiColumnTable(100, 1)); - rd.addRaw(AHTML.addRowMultiColumnTable(new String[] {resultData.getReport("").getManipulatedHtml( + rd.addRaw(AHTML.addRowMultiColumnTable(new String[] {XResultDataUI.getReport(resultData, "").getManipulatedHtml( Arrays.asList(Manipulations.NONE))})); rd.addRaw(AHTML.endMultiColumnTable()); diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/export/AtsExportManager.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/export/AtsExportManager.java index 87769977b12..9adb9950150 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/export/AtsExportManager.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/export/AtsExportManager.java @@ -41,6 +41,7 @@ import org.eclipse.osee.framework.skynet.core.utility.Artifacts; import org.eclipse.osee.framework.ui.plugin.util.AWorkbench; import org.eclipse.osee.framework.ui.skynet.FrameworkImage; import org.eclipse.osee.framework.ui.skynet.results.ResultsEditor; +import org.eclipse.osee.framework.ui.skynet.results.XResultDataUI; import org.eclipse.osee.framework.ui.swt.ImageManager; import org.eclipse.search.ui.text.Match; import org.eclipse.ui.PlatformUI; @@ -134,7 +135,7 @@ public class AtsExportManager extends Action { if (artifact instanceof AbstractWorkflowArtifact) { SMAPrint smaPrint = new SMAPrint(((AbstractWorkflowArtifact) artifact)); smaPrint.setIncludeTaskList(includeTaskList); - String html = smaPrint.getResultData().getReport("").getManipulatedHtml(); + String html = XResultDataUI.getReport(smaPrint.getResultData(), "").getManipulatedHtml(); if (multipleFile) { try { if (asHtmlToFile) { diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/health/IAtsHealthCheck.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/health/IAtsHealthCheck.java index d08d43c2f47..fe02f9f6894 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/health/IAtsHealthCheck.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/health/IAtsHealthCheck.java @@ -14,10 +14,10 @@ import java.util.Collection; import org.eclipse.osee.ats.core.team.TeamWorkFlowArtifact; import org.eclipse.osee.framework.core.exception.OseeCoreException; import org.eclipse.osee.framework.core.util.Result; +import org.eclipse.osee.framework.core.util.XResultData; import org.eclipse.osee.framework.jdk.core.type.HashCollection; import org.eclipse.osee.framework.skynet.core.artifact.Artifact; import org.eclipse.osee.framework.skynet.core.revision.ChangeData; -import org.eclipse.osee.framework.ui.skynet.results.XResultData; /** * @author Donald G. Dunne diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/health/ValidateAtsDatabase.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/health/ValidateAtsDatabase.java index 95b91c52afa..9adff3eaab7 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/health/ValidateAtsDatabase.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/health/ValidateAtsDatabase.java @@ -60,6 +60,7 @@ import org.eclipse.osee.framework.core.exception.OseeCoreException; import org.eclipse.osee.framework.core.model.Branch; import org.eclipse.osee.framework.core.model.type.AttributeType; import org.eclipse.osee.framework.core.util.IWorkPage; +import org.eclipse.osee.framework.core.util.XResultData; import org.eclipse.osee.framework.jdk.core.type.HashCollection; import org.eclipse.osee.framework.jdk.core.util.Collections; import org.eclipse.osee.framework.jdk.core.util.DateUtil; @@ -81,7 +82,7 @@ import org.eclipse.osee.framework.skynet.core.utility.Artifacts; import org.eclipse.osee.framework.ui.plugin.PluginUiImage; import org.eclipse.osee.framework.ui.plugin.xnavigate.XNavigateComposite.TableLoadOption; import org.eclipse.osee.framework.ui.plugin.xnavigate.XNavigateItem; -import org.eclipse.osee.framework.ui.skynet.results.XResultData; +import org.eclipse.osee.framework.ui.skynet.results.XResultDataUI; import org.eclipse.osee.framework.ui.skynet.util.email.EmailUtil; import org.eclipse.osee.framework.ui.swt.Displays; @@ -134,9 +135,9 @@ public class ValidateAtsDatabase extends WorldXNavigateItemAction { XResultData rd = new XResultData(); runIt(monitor, rd); - rd.report(getName()); + XResultDataUI.report(rd, getName()); if (Strings.isValid(emailOnComplete)) { - String html = rd.getReport(getName()).getManipulatedHtml(); + String html = XResultDataUI.getReport(rd, getName()).getManipulatedHtml(); EmailUtil.emailHtml(java.util.Collections.singleton(emailOnComplete), String.format("Sync - %s [%s]", DateUtil.getDateNow(), getName()), html); } @@ -239,7 +240,7 @@ public class ValidateAtsDatabase extends WorldXNavigateItemAction { // Check that HRIDs not duplicated on Common branch if (hrids.contains(artifact.getHumanReadableId())) { testNameToResultsMap.put("testArtifactIds", - "Error: Duplicate HRIDs: " + XResultData.getHyperlink(artifact)); + "Error: Duplicate HRIDs: " + XResultDataUI.getHyperlink(artifact)); } // Check that duplicate Legacy PCR IDs team arts do not exist with different parent actions if (artifact.isOfType(AtsArtifactTypes.TeamWorkflow)) { @@ -260,7 +261,7 @@ public class ValidateAtsDatabase extends WorldXNavigateItemAction { } catch (Exception ex) { testNameToResultsMap.put( "testArtifactIds", - "Error: " + artifact.getArtifactTypeName() + " " + XResultData.getHyperlink(artifact) + " exception: " + ex.getLocalizedMessage()); + "Error: " + artifact.getArtifactTypeName() + " " + XResultDataUI.getHyperlink(artifact) + " exception: " + ex.getLocalizedMessage()); } } } @@ -278,7 +279,7 @@ public class ValidateAtsDatabase extends WorldXNavigateItemAction { } catch (Exception ex) { testNameToResultsMap.put( "testVersionArtifacts", - "Error: " + verArt.getArtifactTypeName() + " " + XResultData.getHyperlink(verArt) + " exception testing testVersionArtifacts: " + ex.getLocalizedMessage()); + "Error: " + verArt.getArtifactTypeName() + " " + XResultDataUI.getHyperlink(verArt) + " exception testing testVersionArtifacts: " + ex.getLocalizedMessage()); } } } @@ -297,7 +298,7 @@ public class ValidateAtsDatabase extends WorldXNavigateItemAction { } catch (Exception ex) { testNameToResultsMap.put( "testTeamDefinitionss", - "Error: " + teamDef.getArtifactTypeName() + " " + XResultData.getHyperlink(teamDef) + " exception testing testTeamDefinitions: " + ex.getLocalizedMessage()); + "Error: " + teamDef.getArtifactTypeName() + " " + XResultDataUI.getHyperlink(teamDef) + " exception testing testTeamDefinitions: " + ex.getLocalizedMessage()); } } } @@ -310,16 +311,16 @@ public class ValidateAtsDatabase extends WorldXNavigateItemAction { try { if (teamArt.getActionableItemsDam().getActionableItems().isEmpty()) { testNameToResultsMap.put("testTeamWorkflows", - "Error: TeamWorkflow " + XResultData.getHyperlink(teamArt) + " has 0 ActionableItems"); + "Error: TeamWorkflow " + XResultDataUI.getHyperlink(teamArt) + " has 0 ActionableItems"); } if (teamArt.getTeamDefinition() == null) { testNameToResultsMap.put("testTeamWorkflows", - "Error: TeamWorkflow " + XResultData.getHyperlink(teamArt) + " has no TeamDefinition"); + "Error: TeamWorkflow " + XResultDataUI.getHyperlink(teamArt) + " has no TeamDefinition"); } } catch (Exception ex) { testNameToResultsMap.put( "testTeamWorkflows", - teamArt.getArtifactTypeName() + " " + XResultData.getHyperlink(teamArt) + " exception: " + ex.getLocalizedMessage()); + teamArt.getArtifactTypeName() + " " + XResultDataUI.getHyperlink(teamArt) + " exception: " + ex.getLocalizedMessage()); } } } @@ -335,7 +336,7 @@ public class ValidateAtsDatabase extends WorldXNavigateItemAction { if (workingBranch != null && branchesCommittedTo.size() > 0 && workingBranch.getBranchState() != BranchState.COMMITTED && workingBranch.getBranchType() != BranchType.BASELINE) { testNameToResultsMap.put( "testAtsBranchManagerA", - "Error: TeamWorkflow " + XResultData.getHyperlink(teamArt) + " has committed branches but working branch [" + workingBranch.getGuid() + "] != COMMITTED"); + "Error: TeamWorkflow " + XResultDataUI.getHyperlink(teamArt) + " has committed branches but working branch [" + workingBranch.getGuid() + "] != COMMITTED"); } if (workingBranch != null && workingBranch.getBranchState() == BranchState.COMMITTED && workingBranch.getArchiveState() == BranchArchivedState.UNARCHIVED) { String fixStr = ""; @@ -346,12 +347,12 @@ public class ValidateAtsDatabase extends WorldXNavigateItemAction { } testNameToResultsMap.put( "testAtsBranchManagerB", - "Error: TeamWorkflow " + XResultData.getHyperlink(teamArt) + " has committed working branch [" + workingBranch.getGuid() + "] but not archived" + fixStr); + "Error: TeamWorkflow " + XResultDataUI.getHyperlink(teamArt) + " has committed working branch [" + workingBranch.getGuid() + "] but not archived" + fixStr); } } catch (Exception ex) { testNameToResultsMap.put( "testAtsBranchManager", - teamArt.getArtifactTypeName() + " " + XResultData.getHyperlink(teamArt) + " exception: " + ex.getLocalizedMessage()); + teamArt.getArtifactTypeName() + " " + XResultDataUI.getHyperlink(teamArt) + " exception: " + ex.getLocalizedMessage()); } } } @@ -382,7 +383,7 @@ public class ValidateAtsDatabase extends WorldXNavigateItemAction { } catch (Exception ex) { testNameToResultsMap.put( "validateBranchGuid", - "Error: " + artifact.getArtifactTypeName() + " " + XResultData.getHyperlink(artifact) + " exception: " + ex.getLocalizedMessage()); + "Error: " + artifact.getArtifactTypeName() + " " + XResultDataUI.getHyperlink(artifact) + " exception: " + ex.getLocalizedMessage()); } } @@ -411,7 +412,7 @@ public class ValidateAtsDatabase extends WorldXNavigateItemAction { if (attr.getValue() == null) { testNameToResultsMap.put( "testAtsAttributeValues", - "Error: Artifact: " + XResultData.getHyperlink(artifact) + " Types: " + artifact.getArtifactTypeName() + " - Null Attribute"); + "Error: Artifact: " + XResultDataUI.getHyperlink(artifact) + " Types: " + artifact.getArtifactTypeName() + " - Null Attribute"); if (fixAttributeValues) { attr.delete(); } @@ -430,7 +431,7 @@ public class ValidateAtsDatabase extends WorldXNavigateItemAction { if ((state.getName().equals("Completed") || state.getName().equals("Cancelled")) && state.getPercentComplete() != 0) { testNameToResultsMap.put( "testAtsAttributeValues", - "Error: ats.State error for SMA: " + XResultData.getHyperlink(artifact) + " State: " + state.getName() + " Percent: " + state.getPercentComplete()); + "Error: ats.State error for SMA: " + XResultDataUI.getHyperlink(artifact) + " State: " + state.getName() + " Percent: " + state.getPercentComplete()); if (fixAttributeValues) { state.setPercentComplete(0); stateDam.setState(state); @@ -447,7 +448,7 @@ public class ValidateAtsDatabase extends WorldXNavigateItemAction { if ((state.getName().equals("Completed") || state.getName().equals("Cancelled")) && state.getPercentComplete() != 0) { testNameToResultsMap.put( "testAtsAttributeValues", - "Error: ats.CurrentState error for SMA: " + XResultData.getHyperlink(artifact) + " State: " + state.getName() + " Percent: " + state.getPercentComplete()); + "Error: ats.CurrentState error for SMA: " + XResultDataUI.getHyperlink(artifact) + " State: " + state.getName() + " Percent: " + state.getPercentComplete()); if (fixAttributeValues) { state.setPercentComplete(0); currentStateDam.setState(state); @@ -460,8 +461,9 @@ public class ValidateAtsDatabase extends WorldXNavigateItemAction { } } catch (OseeCoreException ex) { OseeLog.log(AtsPlugin.class, Level.SEVERE, ex); - testNameToResultsMap.put("testAtsAttributeValues", - "Error: Artifact: " + XResultData.getHyperlink(artifact) + " Exception: " + ex.getLocalizedMessage()); + testNameToResultsMap.put( + "testAtsAttributeValues", + "Error: Artifact: " + XResultDataUI.getHyperlink(artifact) + " Exception: " + ex.getLocalizedMessage()); } } transaction.execute(); @@ -478,7 +480,7 @@ public class ValidateAtsDatabase extends WorldXNavigateItemAction { if (count > attrType.getMaxOccurrences()) { String result = String.format( - "Error: Artifact: " + XResultData.getHyperlink(artifact) + " Type [%s] AttrType [%s] Max [%d] Actual [%d] Values [%s] ", + "Error: Artifact: " + XResultDataUI.getHyperlink(artifact) + " Type [%s] AttrType [%s] Max [%d] Actual [%d] Values [%s] ", artifact.getArtifactTypeName(), attrType.getName(), attrType.getMaxOccurrences(), count, artifact.getAttributesToString(attrType)); Map<String, Attribute<?>> valuesAttrMap = new HashMap<String, Attribute<?>>(); @@ -517,7 +519,7 @@ public class ValidateAtsDatabase extends WorldXNavigateItemAction { try { if (artifact.isOfType(AtsArtifactTypes.Action) && ActionManager.getTeams(artifact).isEmpty()) { testNameToResultsMap.put("testAtsActionsHaveTeamWorkflow", - "Error: Action " + XResultData.getHyperlink(artifact) + " has no Team Workflows\n"); + "Error: Action " + XResultDataUI.getHyperlink(artifact) + " has no Team Workflows\n"); } } catch (OseeCoreException ex) { OseeLog.log(AtsPlugin.class, Level.SEVERE, ex); @@ -534,12 +536,12 @@ public class ValidateAtsDatabase extends WorldXNavigateItemAction { try { if (((TeamWorkFlowArtifact) artifact).getParentActionArtifact() == null) { testNameToResultsMap.put("testAtsWorkflowsHaveAction", - "Error: Team " + XResultData.getHyperlink(artifact) + " has no parent Action\n"); + "Error: Team " + XResultDataUI.getHyperlink(artifact) + " has no parent Action\n"); noParent = true; } } catch (Exception ex) { testNameToResultsMap.put("testAtsWorkflowsHaveAction", - "Error: Team " + XResultData.getHyperlink(artifact) + " has no parent Action: exception " + ex); + "Error: Team " + XResultDataUI.getHyperlink(artifact) + " has no parent Action: exception " + ex); noParent = true; } // Create temporary action so these can be either purged or re-assigned @@ -550,7 +552,7 @@ public class ValidateAtsDatabase extends WorldXNavigateItemAction { tempParentAction.setName("Temp Parent Action"); testNameToResultsMap.put( "testAtsWorkflowsHaveAction", - "Error: Temp Parent Action " + XResultData.getHyperlink(tempParentAction) + " created for orphaned teams."); + "Error: Temp Parent Action " + XResultDataUI.getHyperlink(tempParentAction) + " created for orphaned teams."); } tempParentAction.addRelation(AtsRelationTypes.ActionToWorkflow_WorkFlow, artifact); @@ -575,7 +577,7 @@ public class ValidateAtsDatabase extends WorldXNavigateItemAction { if (teamArt.getRelatedArtifacts(AtsRelationTypes.TeamWorkflowTargetedForVersion_Version).size() > 1) { testNameToResultsMap.put( "testAtsWorkflowsHaveZeroOrOneVersion", - "Error: Team workflow " + XResultData.getHyperlink(teamArt) + " has " + teamArt.getRelatedArtifacts( + "Error: Team workflow " + XResultDataUI.getHyperlink(teamArt) + " has " + teamArt.getRelatedArtifacts( AtsRelationTypes.TeamWorkflowTargetedForVersion_Version).size() + " versions"); } } @@ -597,7 +599,7 @@ public class ValidateAtsDatabase extends WorldXNavigateItemAction { if (taskArtifact.getRelatedArtifacts(AtsRelationTypes.SmaToTask_Sma).size() != 1) { testNameToResultsMap.put( "testTasksHaveParentWorkflow", - "Error: Task " + XResultData.getHyperlink(taskArtifact) + " has " + taskArtifact.getRelatedArtifacts( + "Error: Task " + XResultDataUI.getHyperlink(taskArtifact) + " has " + taskArtifact.getRelatedArtifacts( AtsRelationTypes.SmaToTask_Sma).size() + " parents."); badTasks.add(taskArtifact); } @@ -626,7 +628,7 @@ public class ValidateAtsDatabase extends WorldXNavigateItemAction { if (aia.isActionable() && TeamDefinitionManagerCore.getImpactedTeamDefs(Arrays.asList(aia)).isEmpty()) { testNameToResultsMap.put( "testActionableItemToTeamDefinition", - "Error: ActionableItem " + XResultData.getHyperlink(artifact.getName(), artifact) + " has to related TeamDefinition and is set to Actionable"); + "Error: ActionableItem " + XResultDataUI.getHyperlink(artifact.getName(), artifact) + " has to related TeamDefinition and is set to Actionable"); } } } catch (OseeCoreException ex) { @@ -645,7 +647,7 @@ public class ValidateAtsDatabase extends WorldXNavigateItemAction { if (teamDef.isActionable() && WorkDefinitionFactoryLegacyMgr.getWorkFlowDefinitionFromTeamDefinition(teamDef) == null) { testNameToResultsMap.put( "testTeamDefinitionHasWorkflow", - "Error: TeamDefintion " + XResultData.getHyperlink(artifact.getName(), artifact) + " has no related workflow and is set to Actionable"); + "Error: TeamDefintion " + XResultDataUI.getHyperlink(artifact.getName(), artifact) + " has no related workflow and is set to Actionable"); } } } catch (OseeCoreException ex) { @@ -664,18 +666,18 @@ public class ValidateAtsDatabase extends WorldXNavigateItemAction { reviewArtifact).isEmpty()) { testNameToResultsMap.put( "testReviewsHaveValidDefectAndRoleXml", - "Error: Review " + XResultData.getHyperlink(reviewArtifact) + " has defect attribute, but no defects (xml parsing error)."); + "Error: Review " + XResultDataUI.getHyperlink(reviewArtifact) + " has defect attribute, but no defects (xml parsing error)."); } if (reviewArtifact.getAttributes(AtsAttributeTypes.Role).size() > 0 && UserRoleManager.getUserRoles( reviewArtifact).isEmpty()) { testNameToResultsMap.put( "testReviewsHaveValidDefectAndRoleXml", - "Error: Review " + XResultData.getHyperlink(reviewArtifact) + " has role attribute, but no roles (xml parsing error)."); + "Error: Review " + XResultDataUI.getHyperlink(reviewArtifact) + " has role attribute, but no roles (xml parsing error)."); } } catch (OseeCoreException ex) { testNameToResultsMap.put( "testReviewsHaveValidDefectAndRoleXml", - "Error: Exception processing Review " + XResultData.getHyperlink(reviewArtifact) + " defect test " + ex.getLocalizedMessage()); + "Error: Exception processing Review " + XResultDataUI.getHyperlink(reviewArtifact) + " defect test " + ex.getLocalizedMessage()); } } } @@ -689,7 +691,7 @@ public class ValidateAtsDatabase extends WorldXNavigateItemAction { if (reviewArtifact.getRelatedArtifacts(AtsRelationTypes.TeamWorkflowToReview_Team).isEmpty() && reviewArtifact.getActionableItemsDam().getActionableItemGuids().isEmpty()) { testNameToResultsMap.put( "testReviewsHaveParentWorkflowOrActionableItems", - "Error: Review " + XResultData.getHyperlink(reviewArtifact) + " has 0 related parents and 0 actionable items."); + "Error: Review " + XResultDataUI.getHyperlink(reviewArtifact) + " has 0 related parents and 0 actionable items."); } } } catch (OseeCoreException ex) { @@ -709,11 +711,11 @@ public class ValidateAtsDatabase extends WorldXNavigateItemAction { try { testNameToResultsMap.put( "testAtsLogs", - "Error: " + awa.getArtifactTypeName() + " " + XResultData.getHyperlink(awa) + " originator == null"); + "Error: " + awa.getArtifactTypeName() + " " + XResultDataUI.getHyperlink(awa) + " originator == null"); } catch (Exception ex) { testNameToResultsMap.put( "testAtsLogs", - "Error: " + awa.getArtifactTypeName() + " " + XResultData.getHyperlink(awa) + " exception accessing originator: " + ex.getLocalizedMessage()); + "Error: " + awa.getArtifactTypeName() + " " + XResultDataUI.getHyperlink(awa) + " exception accessing originator: " + ex.getLocalizedMessage()); } } for (IWorkPage state : Arrays.asList(TeamState.Completed, TeamState.Cancelled)) { @@ -723,22 +725,22 @@ public class ValidateAtsDatabase extends WorldXNavigateItemAction { try { testNameToResultsMap.put( "testAtsLogs", - "Error: " + awa.getArtifactTypeName() + " " + XResultData.getHyperlink(awa) + " state \"" + state + "\" logItem == null"); + "Error: " + awa.getArtifactTypeName() + " " + XResultDataUI.getHyperlink(awa) + " state \"" + state + "\" logItem == null"); } catch (Exception ex) { testNameToResultsMap.put( "testAtsLogs", - "Error: " + awa.getArtifactTypeName() + " " + XResultData.getHyperlink(awa) + " exception accessing logItem: " + ex.getLocalizedMessage()); + "Error: " + awa.getArtifactTypeName() + " " + XResultDataUI.getHyperlink(awa) + " exception accessing logItem: " + ex.getLocalizedMessage()); } } else if (logItem.getDate() == null) { try { testNameToResultsMap.put( "testAtsLogs", - "Error: " + awa.getArtifactTypeName() + " " + XResultData.getHyperlink(awa) + " state \"" + state + "\" logItem.date == null"); + "Error: " + awa.getArtifactTypeName() + " " + XResultDataUI.getHyperlink(awa) + " state \"" + state + "\" logItem.date == null"); } catch (Exception ex) { testNameToResultsMap.put( "testAtsLogs", - "Error: " + awa.getArtifactTypeName() + " " + XResultData.getHyperlink(awa) + " exception accessing logItem.date: " + ex.getLocalizedMessage()); + "Error: " + awa.getArtifactTypeName() + " " + XResultDataUI.getHyperlink(awa) + " exception accessing logItem.date: " + ex.getLocalizedMessage()); } } @@ -751,13 +753,13 @@ public class ValidateAtsDatabase extends WorldXNavigateItemAction { if (logItem.getUser() == null) { testNameToResultsMap.put( "testAtsLogs", - "Error: " + awa.getArtifactTypeName() + " " + XResultData.getHyperlink(awa) + " user == null for userId \"" + logItem.getUserId() + "\""); + "Error: " + awa.getArtifactTypeName() + " " + XResultDataUI.getHyperlink(awa) + " user == null for userId \"" + logItem.getUserId() + "\""); } } } catch (Exception ex) { testNameToResultsMap.put( "testAtsLogs", - "Error: " + awa.getArtifactTypeName() + " " + XResultData.getHyperlink(awa) + " exception accessing AtsLog: " + ex.getLocalizedMessage()); + "Error: " + awa.getArtifactTypeName() + " " + XResultDataUI.getHyperlink(awa) + " exception accessing AtsLog: " + ex.getLocalizedMessage()); } } } @@ -784,7 +786,7 @@ public class ValidateAtsDatabase extends WorldXNavigateItemAction { if ((awa.isCompleted() || awa.isCancelled()) && awa.getStateMgr().getAssignees().size() > 0) { testNameToResultsMap.put( "testStateMachineAssignees", - "Error: " + awa.getArtifactTypeName() + " " + XResultData.getHyperlink(awa) + " cancel/complete with attribute assignees"); + "Error: " + awa.getArtifactTypeName() + " " + XResultDataUI.getHyperlink(awa) + " cancel/complete with attribute assignees"); if (fixAssignees) { awa.getStateMgr().clearAssignees(); awa.persist(); @@ -795,7 +797,7 @@ public class ValidateAtsDatabase extends WorldXNavigateItemAction { unAssignedUser)) { testNameToResultsMap.put( "testStateMachineAssignees", - "Error: " + awa.getArtifactTypeName() + " " + XResultData.getHyperlink(awa) + " is unassigned and assigned => " + Artifacts.toString( + "Error: " + awa.getArtifactTypeName() + " " + XResultDataUI.getHyperlink(awa) + " is unassigned and assigned => " + Artifacts.toString( "; ", awa.getStateMgr().getAssignees())); if (fixAssignees) { awa.getStateMgr().removeAssignee(unAssignedUser); @@ -810,7 +812,7 @@ public class ValidateAtsDatabase extends WorldXNavigateItemAction { if (!awa.isCompleted() && !awa.isCancelled() && awa.getStateMgr().getAssignees().isEmpty()) { testNameToResultsMap.put( "testStateMachineAssignees", - "Error: " + awa.getArtifactTypeName() + " " + XResultData.getHyperlink(awa) + " In Work without assignees"); + "Error: " + awa.getArtifactTypeName() + " " + XResultDataUI.getHyperlink(awa) + " In Work without assignees"); } } catch (OseeCoreException ex) { testNameToResultsMap.put("testStateMachineAssignees", diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/health/ValidateChangeReportByHrid.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/health/ValidateChangeReportByHrid.java index c06e4e79afd..81f1eda7e32 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/health/ValidateChangeReportByHrid.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/health/ValidateChangeReportByHrid.java @@ -18,6 +18,7 @@ import org.eclipse.core.runtime.jobs.Job; import org.eclipse.osee.ats.core.team.TeamWorkFlowArtifact; import org.eclipse.osee.ats.internal.AtsPlugin; import org.eclipse.osee.ats.util.AtsUtil; +import org.eclipse.osee.framework.core.util.XResultData; import org.eclipse.osee.framework.database.core.OseeInfo; import org.eclipse.osee.framework.jdk.core.util.Strings; import org.eclipse.osee.framework.logging.OseeLog; @@ -27,7 +28,7 @@ import org.eclipse.osee.framework.ui.plugin.PluginUiImage; import org.eclipse.osee.framework.ui.plugin.xnavigate.XNavigateComposite.TableLoadOption; import org.eclipse.osee.framework.ui.plugin.xnavigate.XNavigateItem; import org.eclipse.osee.framework.ui.plugin.xnavigate.XNavigateItemAction; -import org.eclipse.osee.framework.ui.skynet.results.XResultData; +import org.eclipse.osee.framework.ui.skynet.results.XResultDataUI; import org.eclipse.osee.framework.ui.skynet.widgets.dialog.EntryCheckDialog; /** @@ -73,7 +74,7 @@ public class ValidateChangeReportByHrid extends XNavigateItemAction { } catch (Exception ex) { rd.logError(ex.getLocalizedMessage()); } - rd.report(getName()); + XResultDataUI.report(rd,getName()); } catch (Exception ex) { OseeLog.log(AtsPlugin.class, Level.SEVERE, ex); return new Status(IStatus.ERROR, AtsPlugin.PLUGIN_ID, -1, ex.getMessage(), ex); diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/health/ValidateChangeReports.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/health/ValidateChangeReports.java index 345ade8832b..d3541779496 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/health/ValidateChangeReports.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/health/ValidateChangeReports.java @@ -37,6 +37,7 @@ import org.eclipse.osee.framework.core.enums.ModificationType; import org.eclipse.osee.framework.core.exception.OseeCoreException; import org.eclipse.osee.framework.core.exception.OseeStateException; import org.eclipse.osee.framework.core.util.Result; +import org.eclipse.osee.framework.core.util.XResultData; import org.eclipse.osee.framework.database.core.OseeInfo; import org.eclipse.osee.framework.jdk.core.util.AHTML; import org.eclipse.osee.framework.jdk.core.util.AXml; @@ -60,7 +61,7 @@ import org.eclipse.osee.framework.ui.plugin.xnavigate.XNavigateComposite.TableLo import org.eclipse.osee.framework.ui.plugin.xnavigate.XNavigateItem; import org.eclipse.osee.framework.ui.plugin.xnavigate.XNavigateItemAction; import org.eclipse.osee.framework.ui.skynet.compare.CompareHandler; -import org.eclipse.osee.framework.ui.skynet.results.XResultData; +import org.eclipse.osee.framework.ui.skynet.results.XResultDataUI; import org.eclipse.osee.framework.ui.swt.Displays; /** @@ -108,7 +109,7 @@ public class ValidateChangeReports extends XNavigateItemAction { try { final XResultData rd = new XResultData(); runIt(monitor, rd); - rd.report(getName()); + XResultDataUI.report(rd,getName()); } catch (Exception ex) { OseeLog.log(AtsPlugin.class, Level.SEVERE, ex); return new Status(IStatus.ERROR, AtsPlugin.PLUGIN_ID, -1, ex.getMessage(), ex); diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/navigate/ArtifactImpactToActionSearchItem.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/navigate/ArtifactImpactToActionSearchItem.java index b04031a03a3..4cd5b6058b4 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/navigate/ArtifactImpactToActionSearchItem.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/navigate/ArtifactImpactToActionSearchItem.java @@ -26,6 +26,7 @@ import org.eclipse.osee.framework.core.enums.SystemUser; import org.eclipse.osee.framework.core.exception.OseeCoreException; import org.eclipse.osee.framework.core.model.Branch; import org.eclipse.osee.framework.core.model.TransactionRecord; +import org.eclipse.osee.framework.core.util.XResultData; import org.eclipse.osee.framework.jdk.core.type.HashCollection; import org.eclipse.osee.framework.jdk.core.util.AHTML; import org.eclipse.osee.framework.logging.OseeLog; @@ -38,7 +39,7 @@ import org.eclipse.osee.framework.ui.plugin.xnavigate.XNavigateComposite.TableLo import org.eclipse.osee.framework.ui.plugin.xnavigate.XNavigateItem; import org.eclipse.osee.framework.ui.plugin.xnavigate.XNavigateItemAction; import org.eclipse.osee.framework.ui.skynet.FrameworkImage; -import org.eclipse.osee.framework.ui.skynet.results.XResultData; +import org.eclipse.osee.framework.ui.skynet.results.XResultDataUI; import org.eclipse.osee.framework.ui.skynet.widgets.dialog.ArtifactCheckTreeDialog; import org.eclipse.osee.framework.ui.skynet.widgets.dialog.EntryDialogWithBranchSelect; import org.eclipse.osee.framework.ui.swt.Displays; @@ -83,7 +84,7 @@ public class ArtifactImpactToActionSearchItem extends XNavigateItemAction { this.monitor = monitor; try { getMatrixItems(); - rd.report(TITLE + " - \"" + artifactName + "\""); + XResultDataUI.report(rd, TITLE + " - \"" + artifactName + "\""); return Status.OK_STATUS; } catch (Exception ex) { OseeLog.log(AtsPlugin.class, Level.SEVERE, ex); @@ -140,7 +141,7 @@ public class ArtifactImpactToActionSearchItem extends XNavigateItemAction { rd.addRaw(AHTML.addRowMultiColumnTable(new String[] { assocArt.getArtifactTypeName(), "Working", - XResultData.getHyperlink(assocArt), + XResultDataUI.getHyperlink(assocArt), assocArt.getName()})); } else { rd.addRaw(AHTML.addRowMultiColumnTable(new String[] {"Branch", "", branch.getName()})); diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/navigate/AtsRemoteEventTestItem.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/navigate/AtsRemoteEventTestItem.java index 5ae9de89844..8fa2ce6b06c 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/navigate/AtsRemoteEventTestItem.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/navigate/AtsRemoteEventTestItem.java @@ -18,7 +18,6 @@ import org.eclipse.jface.dialogs.MessageDialog; import org.eclipse.osee.ats.AtsOpenOption; import org.eclipse.osee.ats.actions.wizard.NewActionJob; import org.eclipse.osee.ats.artifact.ActionManager; -import org.eclipse.osee.ats.column.ChangeTypeColumn; import org.eclipse.osee.ats.core.team.TeamState; import org.eclipse.osee.ats.core.team.TeamWorkFlowArtifact; import org.eclipse.osee.ats.core.type.AtsArtifactTypes; @@ -36,6 +35,7 @@ import org.eclipse.osee.ats.util.AtsUtil; import org.eclipse.osee.ats.world.WorldXNavigateItemAction; import org.eclipse.osee.framework.core.exception.OseeCoreException; import org.eclipse.osee.framework.core.exception.OseeStateException; +import org.eclipse.osee.framework.core.util.XResultData; import org.eclipse.osee.framework.logging.OseeLog; import org.eclipse.osee.framework.skynet.core.UserManager; import org.eclipse.osee.framework.skynet.core.artifact.Artifact; @@ -45,7 +45,7 @@ import org.eclipse.osee.framework.skynet.core.transaction.SkynetTransaction; import org.eclipse.osee.framework.ui.plugin.util.AWorkbench; import org.eclipse.osee.framework.ui.plugin.xnavigate.XNavigateComposite.TableLoadOption; import org.eclipse.osee.framework.ui.plugin.xnavigate.XNavigateItem; -import org.eclipse.osee.framework.ui.skynet.results.XResultData; +import org.eclipse.osee.framework.ui.skynet.results.XResultDataUI; import org.eclipse.osee.framework.ui.skynet.widgets.dialog.EntryDialog; import org.eclipse.osee.framework.ui.swt.Displays; @@ -150,7 +150,7 @@ public class AtsRemoteEventTestItem extends WorldXNavigateItemAction { return; } - resultData.report(title); + XResultDataUI.report(resultData, title); } public static void sleep(long milliseconds) { @@ -312,7 +312,7 @@ public class AtsRemoteEventTestItem extends WorldXNavigateItemAction { AtsUtil.openATSAction(actionArt, AtsOpenOption.OpenOneOrPopupSelect); } validateActionAtStart(actionArt); - resultData.report(title); + XResultDataUI.report(resultData, title); } private void runDestinationTestEnd(String ttNum) throws OseeCoreException { @@ -330,7 +330,7 @@ public class AtsRemoteEventTestItem extends WorldXNavigateItemAction { AtsUtil.openATSAction(actionArt, AtsOpenOption.OpenOneOrPopupSelect); } validateActionAtEnd(actionArt); - resultData.report(title); + XResultDataUI.report(resultData, title); } } diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/navigate/CreateNewUsersByNameItem.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/navigate/CreateNewUsersByNameItem.java index 92c718602ae..b6eeebb7197 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/navigate/CreateNewUsersByNameItem.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/navigate/CreateNewUsersByNameItem.java @@ -20,6 +20,7 @@ import org.eclipse.osee.framework.core.enums.CoreArtifactTypes; import org.eclipse.osee.framework.core.enums.CoreAttributeTypes; import org.eclipse.osee.framework.core.exception.OseeCoreException; import org.eclipse.osee.framework.core.exception.UserNotInDatabase; +import org.eclipse.osee.framework.core.util.XResultData; import org.eclipse.osee.framework.jdk.core.util.GUID; import org.eclipse.osee.framework.jdk.core.util.Strings; import org.eclipse.osee.framework.logging.OseeLevel; @@ -35,7 +36,7 @@ import org.eclipse.osee.framework.ui.skynet.FrameworkImage; import org.eclipse.osee.framework.ui.skynet.artifact.massEditor.MassArtifactEditor; import org.eclipse.osee.framework.ui.skynet.render.PresentationType; import org.eclipse.osee.framework.ui.skynet.render.RendererManager; -import org.eclipse.osee.framework.ui.skynet.results.XResultData; +import org.eclipse.osee.framework.ui.skynet.results.XResultDataUI; import org.eclipse.osee.framework.ui.skynet.widgets.dialog.EntryDialog; import org.eclipse.osee.framework.ui.swt.Displays; @@ -76,7 +77,7 @@ public class CreateNewUsersByNameItem extends XNavigateItemAction { } if (!resultData.isEmpty()) { resultData.log("\nErrors found while creating users.\nPlease resolve and try again."); - resultData.report("Create New User(s) Error"); + XResultDataUI.report(resultData,"Create New User(s) Error"); return; } try { diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/navigate/FirstTimeQualityMetricReportItem.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/navigate/FirstTimeQualityMetricReportItem.java index a4481ab17d5..6f4e8cfbef3 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/navigate/FirstTimeQualityMetricReportItem.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/navigate/FirstTimeQualityMetricReportItem.java @@ -18,7 +18,6 @@ import org.eclipse.core.runtime.Status; import org.eclipse.core.runtime.jobs.Job; import org.eclipse.jface.dialogs.MessageDialog; import org.eclipse.osee.ats.AtsImage; -import org.eclipse.osee.ats.column.PriorityColumn; import org.eclipse.osee.ats.core.config.TeamDefinitionArtifact; import org.eclipse.osee.ats.core.config.TeamDefinitionManager; import org.eclipse.osee.ats.core.team.TeamWorkFlowArtifact; @@ -36,6 +35,7 @@ import org.eclipse.osee.ats.version.VersionTeamMetrics; import org.eclipse.osee.framework.core.enums.Active; import org.eclipse.osee.framework.core.exception.MultipleAttributesExist; import org.eclipse.osee.framework.core.exception.OseeCoreException; +import org.eclipse.osee.framework.core.util.XResultData; import org.eclipse.osee.framework.jdk.core.util.AHTML; import org.eclipse.osee.framework.jdk.core.util.DateUtil; import org.eclipse.osee.framework.logging.OseeLevel; @@ -44,7 +44,7 @@ import org.eclipse.osee.framework.ui.plugin.util.AWorkbench; import org.eclipse.osee.framework.ui.plugin.xnavigate.XNavigateComposite.TableLoadOption; import org.eclipse.osee.framework.ui.plugin.xnavigate.XNavigateItem; import org.eclipse.osee.framework.ui.plugin.xnavigate.XNavigateItemAction; -import org.eclipse.osee.framework.ui.skynet.results.XResultData; +import org.eclipse.osee.framework.ui.skynet.results.XResultDataUI; import org.eclipse.osee.framework.ui.skynet.results.html.XResultPage.Manipulations; import org.eclipse.osee.framework.ui.swt.Displays; @@ -121,7 +121,7 @@ public class FirstTimeQualityMetricReportItem extends XNavigateItemAction { XResultData resultData = new XResultData(); String html = getTeamWorkflowReport(getName(), teamDef, monitor); resultData.addRaw(html); - resultData.report(getName(), Manipulations.RAW_HTML); + XResultDataUI.report(resultData, getName(), Manipulations.RAW_HTML); } catch (Exception ex) { return new Status(IStatus.ERROR, AtsPlugin.PLUGIN_ID, -1, ex.toString(), ex); } diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/navigate/GenerateGuid.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/navigate/GenerateGuid.java index 31a583b3e41..7ffcf349685 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/navigate/GenerateGuid.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/navigate/GenerateGuid.java @@ -11,11 +11,12 @@ package org.eclipse.osee.ats.navigate; import org.eclipse.osee.ats.AtsImage; +import org.eclipse.osee.framework.core.util.XResultData; import org.eclipse.osee.framework.jdk.core.util.GUID; import org.eclipse.osee.framework.ui.plugin.xnavigate.XNavigateComposite.TableLoadOption; import org.eclipse.osee.framework.ui.plugin.xnavigate.XNavigateItem; import org.eclipse.osee.framework.ui.plugin.xnavigate.XNavigateItemAction; -import org.eclipse.osee.framework.ui.skynet.results.XResultData; +import org.eclipse.osee.framework.ui.skynet.results.XResultDataUI; public class GenerateGuid extends XNavigateItemAction { @@ -33,7 +34,7 @@ public class GenerateGuid extends XNavigateItemAction { } resultData.log(guid); } - resultData.report("GUIDs"); + XResultDataUI.report(resultData,"GUIDs"); } } diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/navigate/report/CreateActionArtifactChangeReportJob.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/navigate/report/CreateActionArtifactChangeReportJob.java index d0fab2b257e..c9afb3360e7 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/navigate/report/CreateActionArtifactChangeReportJob.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/navigate/report/CreateActionArtifactChangeReportJob.java @@ -31,6 +31,7 @@ import org.eclipse.osee.framework.core.enums.ModificationType; import org.eclipse.osee.framework.core.exception.OseeCoreException; import org.eclipse.osee.framework.core.exception.OseeStateException; import org.eclipse.osee.framework.core.util.Result; +import org.eclipse.osee.framework.core.util.XResultData; import org.eclipse.osee.framework.jdk.core.util.AHTML; import org.eclipse.osee.framework.logging.OseeLog; import org.eclipse.osee.framework.skynet.core.artifact.Artifact; @@ -38,7 +39,7 @@ import org.eclipse.osee.framework.skynet.core.attribute.EnumeratedAttribute; import org.eclipse.osee.framework.skynet.core.revision.ChangeData; import org.eclipse.osee.framework.skynet.core.revision.ChangeData.KindType; import org.eclipse.osee.framework.ui.plugin.util.AWorkbench; -import org.eclipse.osee.framework.ui.skynet.results.XResultData; +import org.eclipse.osee.framework.ui.skynet.results.XResultDataUI; import org.eclipse.osee.framework.ui.skynet.results.html.XResultPage.Manipulations; import org.eclipse.osee.framework.ui.skynet.util.HtmlExportTable; import org.eclipse.osee.framework.ui.swt.Displays; @@ -71,7 +72,7 @@ public class CreateActionArtifactChangeReportJob extends Job { if (rd.toString().equals("")) { rd.log("No Problems Found"); } - final String html = rd.getReport(jobName).getManipulatedHtml(Arrays.asList(Manipulations.NONE)); + final String html = XResultDataUI.getReport(rd,jobName).getManipulatedHtml(Arrays.asList(Manipulations.NONE)); final String title = jobName; Displays.pendInDisplayThread(new Runnable() { @Override diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/notify/AtsNotificationNavigateItem.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/notify/AtsNotificationNavigateItem.java index 50b7998f6a8..bf3135a62b3 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/notify/AtsNotificationNavigateItem.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/notify/AtsNotificationNavigateItem.java @@ -17,6 +17,7 @@ import org.eclipse.osee.ats.util.AtsUtil; import org.eclipse.osee.framework.core.exception.OseeCoreException; import org.eclipse.osee.framework.core.operation.AbstractOperation; import org.eclipse.osee.framework.core.operation.Operations; +import org.eclipse.osee.framework.core.util.XResultData; import org.eclipse.osee.framework.jdk.core.util.AHTML; import org.eclipse.osee.framework.logging.OseeLevel; import org.eclipse.osee.framework.logging.OseeLog; @@ -29,7 +30,7 @@ import org.eclipse.osee.framework.ui.plugin.xnavigate.XNavigateItemAction; import org.eclipse.osee.framework.ui.skynet.notify.OseeNotificationEvent; import org.eclipse.osee.framework.ui.skynet.notify.OseeNotificationManager; import org.eclipse.osee.framework.ui.skynet.notify.OseeNotifyUsersJob; -import org.eclipse.osee.framework.ui.skynet.results.XResultData; +import org.eclipse.osee.framework.ui.skynet.results.XResultDataUI; /** * @author Donald G. Dunne @@ -85,7 +86,7 @@ public class AtsNotificationNavigateItem extends XNavigateItemAction { for (OseeNotificationEvent event : notify.getNotificationEvents(monitor)) { numEvents++; rd.addRaw(AHTML.addRowMultiColumnTable(event.getType(), event.getDescription(), - XResultData.getHyperlink(event.getId(), event.getId(), AtsUtil.getAtsBranch().getId()), + XResultDataUI.getHyperlink(event.getId(), event.getId(), AtsUtil.getAtsBranch().getId()), Artifacts.toString("; ", event.getUsers()), OseeNotifyUsersJob.getHyperlink(event))); if (sendNotifications) { OseeNotificationManager.getInstance().addNotificationEvent(event); @@ -93,7 +94,7 @@ public class AtsNotificationNavigateItem extends XNavigateItemAction { } } rd.addRaw(AHTML.endMultiColumnTable()); - rd.report(getName() + " - (" + numEvents + " Events)"); + XResultDataUI.report(rd, getName() + " - (" + numEvents + " Events)"); if (sendNotifications) { OseeNotificationManager.getInstance().sendNotifications(); AWorkbench.popup("Complete", numEvents + " Notifications Sent"); diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/operation/PurgeUser.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/operation/PurgeUser.java index b20d4529485..206691d39f5 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/operation/PurgeUser.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/operation/PurgeUser.java @@ -16,6 +16,7 @@ import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.jface.dialogs.MessageDialog; import org.eclipse.osee.ats.internal.AtsPlugin; import org.eclipse.osee.framework.core.exception.OseeCoreException; +import org.eclipse.osee.framework.core.util.XResultData; import org.eclipse.osee.framework.database.core.ConnectionHandler; import org.eclipse.osee.framework.database.core.DbTransaction; import org.eclipse.osee.framework.database.core.OseeConnection; @@ -28,7 +29,7 @@ import org.eclipse.osee.framework.skynet.core.artifact.search.ArtifactQuery; import org.eclipse.osee.framework.ui.plugin.util.AWorkbench; import org.eclipse.osee.framework.ui.skynet.blam.AbstractBlam; import org.eclipse.osee.framework.ui.skynet.blam.VariableMap; -import org.eclipse.osee.framework.ui.skynet.results.XResultData; +import org.eclipse.osee.framework.ui.skynet.results.XResultDataUI; import org.eclipse.osee.framework.ui.swt.Displays; /** @@ -181,7 +182,7 @@ public class PurgeUser extends AbstractBlam { Integer.toString(numOfUpdatedBSideRelations)})); rd.addRaw(AHTML.endMultiColumnTable()); } finally { - rd.report(getName()); + XResultDataUI.report(rd,getName()); } } diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/DoesNotWorkItemAts.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/DoesNotWorkItemAts.java index 0257479b550..e5898cb4cbd 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/DoesNotWorkItemAts.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/DoesNotWorkItemAts.java @@ -22,6 +22,7 @@ import org.eclipse.osee.ats.workdef.AtsWorkDefinitionSheetProviders; import org.eclipse.osee.ats.workdef.provider.ConvertWorkDefinitionToAtsDsl; import org.eclipse.osee.framework.core.exception.OseeCoreException; import org.eclipse.osee.framework.core.exception.OseeWrappedException; +import org.eclipse.osee.framework.core.util.XResultData; import org.eclipse.osee.framework.jdk.core.util.Lib; import org.eclipse.osee.framework.logging.OseeLevel; import org.eclipse.osee.framework.logging.OseeLog; @@ -32,7 +33,6 @@ import org.eclipse.osee.framework.ui.plugin.util.AWorkbench; import org.eclipse.osee.framework.ui.plugin.xnavigate.XNavigateComposite.TableLoadOption; import org.eclipse.osee.framework.ui.plugin.xnavigate.XNavigateItem; import org.eclipse.osee.framework.ui.plugin.xnavigate.XNavigateItemAction; -import org.eclipse.osee.framework.ui.skynet.results.XResultData; import org.eclipse.osee.framework.ui.ws.AWorkspace; /** diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/Import/ExcelAtsActionArtifactExtractor.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/Import/ExcelAtsActionArtifactExtractor.java index 04dd770325c..fcdec21d101 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/Import/ExcelAtsActionArtifactExtractor.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/Import/ExcelAtsActionArtifactExtractor.java @@ -45,6 +45,7 @@ import org.eclipse.osee.framework.core.exception.OseeCoreException; import org.eclipse.osee.framework.core.exception.OseeExceptions; import org.eclipse.osee.framework.core.exception.UserNotInDatabase; import org.eclipse.osee.framework.core.model.IBasicUser; +import org.eclipse.osee.framework.core.util.XResultData; import org.eclipse.osee.framework.jdk.core.util.Strings; import org.eclipse.osee.framework.jdk.core.util.io.xml.ExcelSaxHandler; import org.eclipse.osee.framework.jdk.core.util.io.xml.RowProcessor; @@ -55,7 +56,7 @@ import org.eclipse.osee.framework.skynet.core.UserManager; import org.eclipse.osee.framework.skynet.core.artifact.Artifact; import org.eclipse.osee.framework.skynet.core.transaction.SkynetTransaction; import org.eclipse.osee.framework.ui.plugin.util.AWorkbench; -import org.eclipse.osee.framework.ui.skynet.results.XResultData; +import org.eclipse.osee.framework.ui.skynet.results.XResultDataUI; import org.xml.sax.InputSource; import org.xml.sax.SAXException; import org.xml.sax.XMLReader; @@ -254,7 +255,7 @@ public class ExcelAtsActionArtifactExtractor { rd.logError("Exception in parsing import (see log for details) " + (Strings.isValid(ex.getLocalizedMessage()) ? ex.getLocalizedMessage() : "")); } if (!rd.isEmpty()) { - rd.report("Action Import Validation Errors"); + XResultDataUI.report(rd, "Action Import Validation Errors"); dataIsValid = MessageDialog.openConfirm(AWorkbench.getDisplay().getActiveShell(), "Validation Results", "Validation Issues Reported, Continue Anyway?"); diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/Import/ImportActionsViaSpreadsheetBlam.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/Import/ImportActionsViaSpreadsheetBlam.java index 899de8b6db7..da207ff9996 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/Import/ImportActionsViaSpreadsheetBlam.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/Import/ImportActionsViaSpreadsheetBlam.java @@ -14,6 +14,7 @@ import org.eclipse.osee.ats.util.AtsUtil; import org.eclipse.osee.ats.world.WorldEditor; import org.eclipse.osee.ats.world.WorldEditorSimpleProvider; import org.eclipse.osee.framework.core.exception.OseeCoreException; +import org.eclipse.osee.framework.core.util.XResultData; import org.eclipse.osee.framework.jdk.core.util.Collections; import org.eclipse.osee.framework.jdk.core.util.Strings; import org.eclipse.osee.framework.logging.OseeLevel; @@ -24,7 +25,7 @@ import org.eclipse.osee.framework.skynet.core.transaction.SkynetTransaction; import org.eclipse.osee.framework.ui.plugin.util.AWorkbench; import org.eclipse.osee.framework.ui.skynet.blam.AbstractBlam; import org.eclipse.osee.framework.ui.skynet.blam.VariableMap; -import org.eclipse.osee.framework.ui.skynet.results.XResultData; +import org.eclipse.osee.framework.ui.skynet.results.XResultDataUI; import org.eclipse.osee.framework.ui.skynet.widgets.XButtonPush; import org.eclipse.osee.framework.ui.skynet.widgets.XModifiedListener; import org.eclipse.osee.framework.ui.skynet.widgets.XWidget; @@ -91,7 +92,7 @@ public class ImportActionsViaSpreadsheetBlam extends AbstractBlam { XResultData rd = extractor.dataIsValid(); if (!rd.toString().equals("")) { if (popupReport) { - rd.report("Ats Action Import Errors"); + XResultDataUI.report(rd,"Ats Action Import Errors"); } } else { SkynetTransaction transaction = diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/Overview.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/Overview.java index bca53c761fd..8d2808931ce 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/Overview.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/Overview.java @@ -33,7 +33,7 @@ import org.eclipse.osee.framework.logging.OseeLog; import org.eclipse.osee.framework.skynet.core.artifact.Artifact; import org.eclipse.osee.framework.skynet.core.relation.RelationLink; import org.eclipse.osee.framework.skynet.core.utility.Artifacts; -import org.eclipse.osee.framework.ui.skynet.results.XResultData; +import org.eclipse.osee.framework.ui.skynet.results.XResultDataUI; import org.eclipse.osee.framework.ui.skynet.results.html.XResultBrowserHyperCmd; public class Overview { @@ -264,7 +264,7 @@ public class Overview { } public static String getOpenHyperlinkHtml(String name, String guidOrHrid, int branchId) { - return XResultData.getHyperlink(name, guidOrHrid, branchId); + return XResultDataUI.getHyperlink(name, guidOrHrid, branchId); } public static String getOpenHyperlinkHtml(String name, Artifact art) { diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/migrate/ConvertAIsAndTeamDefinitions.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/migrate/ConvertAIsAndTeamDefinitions.java index f0c178b7617..0332800cf34 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/migrate/ConvertAIsAndTeamDefinitions.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/migrate/ConvertAIsAndTeamDefinitions.java @@ -12,10 +12,11 @@ package org.eclipse.osee.ats.util.migrate; import org.eclipse.osee.ats.AtsImage; import org.eclipse.osee.ats.workdef.provider.AtsWorkDefinitionProvider; +import org.eclipse.osee.framework.core.util.XResultData; import org.eclipse.osee.framework.ui.plugin.xnavigate.XNavigateComposite.TableLoadOption; import org.eclipse.osee.framework.ui.plugin.xnavigate.XNavigateItem; import org.eclipse.osee.framework.ui.plugin.xnavigate.XNavigateItemAction; -import org.eclipse.osee.framework.ui.skynet.results.XResultData; +import org.eclipse.osee.framework.ui.skynet.results.XResultDataUI; public class ConvertAIsAndTeamDefinitions extends XNavigateItemAction { @@ -27,7 +28,7 @@ public class ConvertAIsAndTeamDefinitions extends XNavigateItemAction { public void run(TableLoadOption... tableLoadOptions) throws Exception { XResultData resultData = new XResultData(false); AtsWorkDefinitionProvider.get().convertAndOpenAIandTeamAtsDsl(resultData); - resultData.report(getName()); + XResultDataUI.report(resultData, getName()); } } diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/migrate/ConvertAtsFor096Database.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/migrate/ConvertAtsFor096Database.java index 7624c8cacfa..933aff249d3 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/migrate/ConvertAtsFor096Database.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/migrate/ConvertAtsFor096Database.java @@ -24,6 +24,7 @@ import org.eclipse.osee.ats.util.AtsUtil; import org.eclipse.osee.framework.access.AccessControlManager; import org.eclipse.osee.framework.core.enums.CoreRelationTypes; import org.eclipse.osee.framework.core.enums.PermissionEnum; +import org.eclipse.osee.framework.core.util.XResultData; import org.eclipse.osee.framework.logging.OseeLog; import org.eclipse.osee.framework.plugin.core.util.Jobs; import org.eclipse.osee.framework.skynet.core.User; @@ -34,7 +35,7 @@ import org.eclipse.osee.framework.ui.plugin.PluginUiImage; import org.eclipse.osee.framework.ui.plugin.xnavigate.XNavigateComposite.TableLoadOption; import org.eclipse.osee.framework.ui.plugin.xnavigate.XNavigateItem; import org.eclipse.osee.framework.ui.plugin.xnavigate.XNavigateItemAction; -import org.eclipse.osee.framework.ui.skynet.results.XResultData; +import org.eclipse.osee.framework.ui.skynet.results.XResultDataUI; import org.eclipse.osee.framework.ui.swt.Displays; /** @@ -85,7 +86,7 @@ public class ConvertAtsFor096Database extends XNavigateItemAction { } } transaction.execute(); - rd.report(getName()); + XResultDataUI.report(rd,getName()); } catch (Exception ex) { OseeLog.log(AtsPlugin.class, Level.SEVERE, ex); return new Status(IStatus.ERROR, AtsPlugin.PLUGIN_ID, -1, ex.getMessage(), ex); diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/migrate/ConvertAtsFor097Database.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/migrate/ConvertAtsFor097Database.java index 748eeaaef2d..17179b7e675 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/migrate/ConvertAtsFor097Database.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/migrate/ConvertAtsFor097Database.java @@ -32,6 +32,7 @@ import org.eclipse.osee.framework.core.enums.CoreArtifactTypes; import org.eclipse.osee.framework.core.enums.CoreAttributeTypes; import org.eclipse.osee.framework.core.exception.OseeCoreException; import org.eclipse.osee.framework.core.util.WorkPageType; +import org.eclipse.osee.framework.core.util.XResultData; import org.eclipse.osee.framework.jdk.core.type.HashCollection; import org.eclipse.osee.framework.logging.OseeLog; import org.eclipse.osee.framework.logging.SevereLoggingMonitor; @@ -45,7 +46,7 @@ import org.eclipse.osee.framework.ui.plugin.xnavigate.XNavigateComposite.TableLo import org.eclipse.osee.framework.ui.plugin.xnavigate.XNavigateItem; import org.eclipse.osee.framework.ui.plugin.xnavigate.XNavigateItemAction; import org.eclipse.osee.framework.ui.skynet.notify.OseeNotificationManager; -import org.eclipse.osee.framework.ui.skynet.results.XResultData; +import org.eclipse.osee.framework.ui.skynet.results.XResultDataUI; import org.eclipse.osee.framework.ui.skynet.widgets.workflow.WorkPageDefinition; import org.eclipse.osee.framework.ui.swt.Displays; @@ -83,7 +84,7 @@ public class ConvertAtsFor097Database extends XNavigateItemAction { OseeNotificationManager.getInstance().setEmailEnabled(false); XResultData rd = new XResultData(false); runIt(monitor, rd); - rd.report(getName()); + XResultDataUI.report(rd, getName()); } catch (Exception ex) { OseeLog.log(AtsPlugin.class, Level.SEVERE, ex); return new Status(IStatus.ERROR, AtsPlugin.PLUGIN_ID, -1, ex.getMessage(), ex); @@ -177,7 +178,7 @@ public class ConvertAtsFor097Database extends XNavigateItemAction { } if (testNameToResultsMap != null && set) { testNameToResultsMap.put("setCreatedAttributes", - "Info: " + XResultData.getHyperlink(aba.getName(), aba) + " adding created attributes."); + "Info: " + XResultDataUI.getHyperlink(aba.getName(), aba) + " adding created attributes."); } } } @@ -210,7 +211,7 @@ public class ConvertAtsFor097Database extends XNavigateItemAction { } if (testNameToResultsMap != null && set) { testNameToResultsMap.put("setCancelledAttributes", - "Info: " + XResultData.getHyperlink(aba.getName(), aba) + " adding cancelled attributes."); + "Info: " + XResultDataUI.getHyperlink(aba.getName(), aba) + " adding cancelled attributes."); } } } @@ -244,7 +245,7 @@ public class ConvertAtsFor097Database extends XNavigateItemAction { } if (testNameToResultsMap != null && set) { testNameToResultsMap.put("setCompletedAttributes", - "Info: " + XResultData.getHyperlink(aba.getName(), aba) + " adding completed attributes."); + "Info: " + XResultDataUI.getHyperlink(aba.getName(), aba) + " adding completed attributes."); } } } @@ -267,7 +268,7 @@ public class ConvertAtsFor097Database extends XNavigateItemAction { } if (testNameToResultsMap != null && set) { testNameToResultsMap.put("setCurrentStateType", - "Info: " + XResultData.getHyperlink(aba.getName(), aba) + " adding current state type."); + "Info: " + XResultDataUI.getHyperlink(aba.getName(), aba) + " adding current state type."); } } @@ -280,7 +281,7 @@ public class ConvertAtsFor097Database extends XNavigateItemAction { if (testNameToResultsMap != null) { testNameToResultsMap.put( "convertWorkPageDefinitions", - "Info: WorkPageDefinition: " + XResultData.getHyperlink(artifact.getName(), artifact) + " adding Work Page Type attribute."); + "Info: WorkPageDefinition: " + XResultDataUI.getHyperlink(artifact.getName(), artifact) + " adding Work Page Type attribute."); } if (page.getPageName().equals("Completed")) { artifact.setSoleAttributeValue(CoreAttributeTypes.WorkPageType, WorkPageType.Completed.name()); diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/migrate/ConvertAtsSingleFor097Database.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/migrate/ConvertAtsSingleFor097Database.java index 072ed0d3928..52bdb7172b1 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/migrate/ConvertAtsSingleFor097Database.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/migrate/ConvertAtsSingleFor097Database.java @@ -15,6 +15,7 @@ import org.eclipse.osee.ats.health.ValidateAtsDatabase; import org.eclipse.osee.ats.internal.AtsPlugin; import org.eclipse.osee.ats.util.AtsUtil; import org.eclipse.osee.framework.core.exception.OseeCoreException; +import org.eclipse.osee.framework.core.util.XResultData; import org.eclipse.osee.framework.jdk.core.type.HashCollection; import org.eclipse.osee.framework.logging.OseeLevel; import org.eclipse.osee.framework.logging.OseeLog; @@ -26,7 +27,7 @@ import org.eclipse.osee.framework.ui.plugin.util.AWorkbench; import org.eclipse.osee.framework.ui.plugin.xnavigate.XNavigateComposite.TableLoadOption; import org.eclipse.osee.framework.ui.plugin.xnavigate.XNavigateItem; import org.eclipse.osee.framework.ui.plugin.xnavigate.XNavigateItemAction; -import org.eclipse.osee.framework.ui.skynet.results.XResultData; +import org.eclipse.osee.framework.ui.skynet.results.XResultDataUI; import org.eclipse.osee.framework.ui.skynet.widgets.dialog.EntryDialog; /** @@ -58,7 +59,7 @@ public class ConvertAtsSingleFor097Database extends XNavigateItemAction { transaction.execute(); XResultData xResultData = new XResultData(false); ValidateAtsDatabase.addResultsMapToResultData(xResultData, testNameToResultsMap); - xResultData.report(getName()); + XResultDataUI.report(xResultData,getName()); } } catch (OseeCoreException ex) { OseeLog.log(AtsPlugin.class, OseeLevel.SEVERE_POPUP, ex); diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/migrate/ConvertWorkFlowDefinitions.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/migrate/ConvertWorkFlowDefinitions.java index b235d205c39..c06a010bd8c 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/migrate/ConvertWorkFlowDefinitions.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/migrate/ConvertWorkFlowDefinitions.java @@ -17,11 +17,12 @@ import org.eclipse.osee.ats.core.workdef.WorkDefinition; import org.eclipse.osee.ats.workdef.WorkDefinitionFactoryLegacy; import org.eclipse.osee.ats.workdef.provider.AtsWorkDefinitionProvider; import org.eclipse.osee.framework.core.exception.OseeCoreException; +import org.eclipse.osee.framework.core.util.XResultData; import org.eclipse.osee.framework.skynet.core.artifact.Artifact; import org.eclipse.osee.framework.ui.plugin.xnavigate.XNavigateComposite.TableLoadOption; import org.eclipse.osee.framework.ui.plugin.xnavigate.XNavigateItem; import org.eclipse.osee.framework.ui.plugin.xnavigate.XNavigateItemAction; -import org.eclipse.osee.framework.ui.skynet.results.XResultData; +import org.eclipse.osee.framework.ui.skynet.results.XResultDataUI; import org.eclipse.osee.framework.ui.skynet.widgets.dialog.ArtifactCheckTreeDialog; import org.eclipse.osee.framework.ui.skynet.widgets.workflow.WorkFlowDefinition; import org.eclipse.osee.framework.ui.skynet.widgets.workflow.WorkItemDefinition; @@ -80,7 +81,7 @@ public class ConvertWorkFlowDefinitions extends XNavigateItemAction { String filename = idToName.get(selectedWorkFlowDef.getName()); convert(selectedWorkFlowDef, resultData, filename); } - resultData.report(getName()); + XResultDataUI.report(resultData,getName()); } } diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/validate/AttributeRuleCheckOperation.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/validate/AttributeRuleCheckOperation.java index fc71dac3042..1506a2300aa 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/validate/AttributeRuleCheckOperation.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/validate/AttributeRuleCheckOperation.java @@ -15,9 +15,9 @@ import java.util.List; import java.util.Set; import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.osee.framework.core.operation.AbstractOperation; +import org.eclipse.osee.framework.core.util.XResultData; import org.eclipse.osee.framework.skynet.core.artifact.Artifact; import org.eclipse.osee.framework.ui.skynet.SkynetGuiPlugin; -import org.eclipse.osee.framework.ui.skynet.results.XResultData; /** * @author Donald G. Dunne diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/validate/RelationRuleCheckOperation.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/validate/RelationRuleCheckOperation.java index c8722d62c8d..33c48785e6b 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/validate/RelationRuleCheckOperation.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/validate/RelationRuleCheckOperation.java @@ -16,9 +16,9 @@ import java.util.Set; import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.osee.framework.core.enums.CoreArtifactTypes; import org.eclipse.osee.framework.core.operation.AbstractOperation; +import org.eclipse.osee.framework.core.util.XResultData; import org.eclipse.osee.framework.skynet.core.artifact.Artifact; import org.eclipse.osee.framework.ui.skynet.SkynetGuiPlugin; -import org.eclipse.osee.framework.ui.skynet.results.XResultData; /** * @author Donald G. Dunne diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/validate/ValidateReqChangeReport.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/validate/ValidateReqChangeReport.java index ada859d462f..b02d3ceab77 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/validate/ValidateReqChangeReport.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/validate/ValidateReqChangeReport.java @@ -15,8 +15,9 @@ import org.eclipse.core.runtime.IStatus; import org.eclipse.osee.ats.core.team.TeamWorkFlowArtifact; import org.eclipse.osee.framework.core.operation.IOperation; import org.eclipse.osee.framework.core.operation.Operations; +import org.eclipse.osee.framework.core.util.XResultData; import org.eclipse.osee.framework.skynet.core.artifact.Artifact; -import org.eclipse.osee.framework.ui.skynet.results.XResultData; +import org.eclipse.osee.framework.ui.skynet.results.XResultDataUI; /** * @author Donald G. Dunne @@ -45,7 +46,7 @@ public class ValidateReqChangeReport { } static String getRequirementHyperlink(Artifact art) { - return XResultData.getHyperlink(art.getName() + "(" + art.getHumanReadableId() + ")", art.getHumanReadableId(), + return XResultDataUI.getHyperlink(art.getName() + "(" + art.getHumanReadableId() + ")", art.getHumanReadableId(), art.getBranch().getId()); } }
\ No newline at end of file diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/validate/ValidationReportOperation.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/validate/ValidationReportOperation.java index 16d4c1f8d46..3c13591a25b 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/validate/ValidationReportOperation.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/validate/ValidationReportOperation.java @@ -25,13 +25,14 @@ 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.Operations; +import org.eclipse.osee.framework.core.util.XResultData; import org.eclipse.osee.framework.logging.OseeLog; import org.eclipse.osee.framework.skynet.core.artifact.Artifact; import org.eclipse.osee.framework.skynet.core.revision.ChangeData; import org.eclipse.osee.framework.skynet.core.revision.ChangeData.KindType; import org.eclipse.osee.framework.ui.skynet.ArtifactValidationCheckOperation; import org.eclipse.osee.framework.ui.skynet.SkynetGuiPlugin; -import org.eclipse.osee.framework.ui.skynet.results.XResultData; +import org.eclipse.osee.framework.ui.skynet.results.XResultDataUI; import org.eclipse.osee.framework.ui.skynet.results.html.XResultPage.Manipulations; import org.eclipse.osee.framework.ui.swt.Displays; @@ -86,7 +87,7 @@ public class ValidationReportOperation extends AbstractOperation { if (title.length() > 60) { title = title.substring(0, 59) + "..."; } - rd.report(title, Manipulations.CONVERT_NEWLINES, Manipulations.ERROR_RED, + XResultDataUI.report(rd, title, Manipulations.CONVERT_NEWLINES, Manipulations.ERROR_RED, Manipulations.ERROR_WARNING_HEADER, Manipulations.WARNING_YELLOW); } }); diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/version/CreateNewVersionItem.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/version/CreateNewVersionItem.java index f1b4e8f95e0..bc6d909c873 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/version/CreateNewVersionItem.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/version/CreateNewVersionItem.java @@ -23,6 +23,7 @@ import org.eclipse.osee.ats.util.AtsUtil; import org.eclipse.osee.ats.util.widgets.dialog.TeamDefinitionDialog; import org.eclipse.osee.framework.core.enums.Active; import org.eclipse.osee.framework.core.exception.OseeCoreException; +import org.eclipse.osee.framework.core.util.XResultData; import org.eclipse.osee.framework.jdk.core.util.Strings; import org.eclipse.osee.framework.logging.OseeLevel; import org.eclipse.osee.framework.logging.OseeLog; @@ -36,7 +37,7 @@ import org.eclipse.osee.framework.ui.skynet.FrameworkImage; import org.eclipse.osee.framework.ui.skynet.artifact.massEditor.MassArtifactEditor; import org.eclipse.osee.framework.ui.skynet.render.PresentationType; import org.eclipse.osee.framework.ui.skynet.render.RendererManager; -import org.eclipse.osee.framework.ui.skynet.results.XResultData; +import org.eclipse.osee.framework.ui.skynet.results.XResultDataUI; import org.eclipse.osee.framework.ui.skynet.widgets.dialog.EntryDialog; import org.eclipse.osee.framework.ui.swt.Displays; @@ -92,7 +93,7 @@ public class CreateNewVersionItem extends XNavigateItemAction { resultData.log(String.format( "\nErrors found while creating version(s) for [%s].\nPlease resolve and try again.", teamDefHoldingVersions)); - resultData.report("Create New Version Error"); + XResultDataUI.report(resultData,"Create New Version Error"); return; } try { diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/version/GenerateFullVersionReportItem.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/version/GenerateFullVersionReportItem.java index f153a24d9d7..d82a8a00a38 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/version/GenerateFullVersionReportItem.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/version/GenerateFullVersionReportItem.java @@ -25,6 +25,7 @@ import org.eclipse.osee.ats.util.widgets.dialog.TeamDefinitionDialog; import org.eclipse.osee.framework.core.enums.Active; import org.eclipse.osee.framework.core.exception.MultipleAttributesExist; import org.eclipse.osee.framework.core.exception.OseeCoreException; +import org.eclipse.osee.framework.core.util.XResultData; import org.eclipse.osee.framework.jdk.core.util.DateUtil; import org.eclipse.osee.framework.jdk.core.util.Strings; import org.eclipse.osee.framework.logging.OseeLevel; @@ -33,7 +34,7 @@ import org.eclipse.osee.framework.ui.plugin.xnavigate.XNavigateComposite.TableLo import org.eclipse.osee.framework.ui.plugin.xnavigate.XNavigateItem; import org.eclipse.osee.framework.ui.plugin.xnavigate.XNavigateItemAction; import org.eclipse.osee.framework.ui.skynet.FrameworkImage; -import org.eclipse.osee.framework.ui.skynet.results.XResultData; +import org.eclipse.osee.framework.ui.skynet.results.XResultDataUI; import org.eclipse.osee.framework.ui.skynet.results.html.XResultPage.Manipulations; import org.eclipse.osee.framework.ui.swt.Displays; @@ -118,7 +119,7 @@ public class GenerateFullVersionReportItem extends XNavigateItemAction { String html = VersionReportJob.getFullReleaseReport(teamDef, monitor); XResultData rd = new XResultData(); rd.addRaw(html); - rd.report(getName(), Manipulations.RAW_HTML); + XResultDataUI.report(rd,getName(), Manipulations.RAW_HTML); } catch (Exception ex) { return new Status(IStatus.ERROR, AtsPlugin.PLUGIN_ID, -1, ex.toString(), ex); } diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/workdef/AtsWorkDefinitionSheetProviders.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/workdef/AtsWorkDefinitionSheetProviders.java index 64139be4751..d85135196f7 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/workdef/AtsWorkDefinitionSheetProviders.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/workdef/AtsWorkDefinitionSheetProviders.java @@ -31,6 +31,7 @@ import org.eclipse.osee.framework.core.enums.CoreArtifactTypes; import org.eclipse.osee.framework.core.exception.ArtifactDoesNotExist; import org.eclipse.osee.framework.core.exception.OseeCoreException; import org.eclipse.osee.framework.core.exception.OseeStateException; +import org.eclipse.osee.framework.core.util.XResultData; import org.eclipse.osee.framework.jdk.core.util.Strings; import org.eclipse.osee.framework.logging.OseeLevel; import org.eclipse.osee.framework.logging.OseeLog; @@ -39,7 +40,6 @@ import org.eclipse.osee.framework.skynet.core.OseeSystemArtifacts; import org.eclipse.osee.framework.skynet.core.artifact.Artifact; import org.eclipse.osee.framework.skynet.core.artifact.search.ArtifactQuery; import org.eclipse.osee.framework.skynet.core.transaction.SkynetTransaction; -import org.eclipse.osee.framework.ui.skynet.results.XResultData; import org.osgi.framework.Bundle; /** diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/workdef/config/ImportWorkDefinitionsItem.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/workdef/config/ImportWorkDefinitionsItem.java index ce8318740f5..1feec5f6c65 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/workdef/config/ImportWorkDefinitionsItem.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/workdef/config/ImportWorkDefinitionsItem.java @@ -16,13 +16,14 @@ import org.eclipse.osee.ats.core.config.AtsArtifactToken; import org.eclipse.osee.ats.core.workdef.WorkDefinitionSheet; import org.eclipse.osee.ats.util.AtsUtil; import org.eclipse.osee.ats.workdef.AtsWorkDefinitionSheetProviders; +import org.eclipse.osee.framework.core.util.XResultData; import org.eclipse.osee.framework.skynet.core.OseeSystemArtifacts; import org.eclipse.osee.framework.skynet.core.artifact.Artifact; import org.eclipse.osee.framework.skynet.core.transaction.SkynetTransaction; import org.eclipse.osee.framework.ui.plugin.xnavigate.XNavigateComposite.TableLoadOption; import org.eclipse.osee.framework.ui.plugin.xnavigate.XNavigateItem; import org.eclipse.osee.framework.ui.plugin.xnavigate.XNavigateItemAction; -import org.eclipse.osee.framework.ui.skynet.results.XResultData; +import org.eclipse.osee.framework.ui.skynet.results.XResultDataUI; public class ImportWorkDefinitionsItem extends XNavigateItemAction { @@ -47,7 +48,7 @@ public class ImportWorkDefinitionsItem extends XNavigateItemAction { if (!resultData.isErrors()) { transaction.execute(); } - resultData.report(getName()); + XResultDataUI.report(resultData,getName()); } } } diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/workdef/editor/AtsWorkDefinitionRenderer.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/workdef/editor/AtsWorkDefinitionRenderer.java index 733e3a52bbf..65ee761e429 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/workdef/editor/AtsWorkDefinitionRenderer.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/workdef/editor/AtsWorkDefinitionRenderer.java @@ -22,12 +22,12 @@ import org.eclipse.osee.ats.editor.AtsRenderer; import org.eclipse.osee.ats.internal.AtsPlugin; import org.eclipse.osee.ats.workdef.provider.AtsWorkDefinitionProvider; import org.eclipse.osee.framework.core.exception.OseeCoreException; +import org.eclipse.osee.framework.core.util.XResultData; import org.eclipse.osee.framework.logging.OseeLevel; import org.eclipse.osee.framework.logging.OseeLog; import org.eclipse.osee.framework.skynet.core.artifact.Artifact; import org.eclipse.osee.framework.skynet.core.types.IArtifact; import org.eclipse.osee.framework.ui.skynet.render.PresentationType; -import org.eclipse.osee.framework.ui.skynet.results.XResultData; import org.eclipse.osee.framework.ui.swt.ImageManager; /** diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/workdef/provider/AtsWorkDefinitionProvider.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/workdef/provider/AtsWorkDefinitionProvider.java index 4ead10bfc87..836b257f37e 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/workdef/provider/AtsWorkDefinitionProvider.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/workdef/provider/AtsWorkDefinitionProvider.java @@ -28,6 +28,7 @@ import org.eclipse.osee.framework.core.exception.ArtifactDoesNotExist; import org.eclipse.osee.framework.core.exception.OseeCoreException; import org.eclipse.osee.framework.core.exception.OseeStateException; import org.eclipse.osee.framework.core.exception.OseeWrappedException; +import org.eclipse.osee.framework.core.util.XResultData; import org.eclipse.osee.framework.jdk.core.util.Lib; import org.eclipse.osee.framework.logging.OseeLog; import org.eclipse.osee.framework.plugin.core.util.OseeData; @@ -37,7 +38,6 @@ import org.eclipse.osee.framework.skynet.core.artifact.BranchManager; import org.eclipse.osee.framework.skynet.core.artifact.search.ArtifactQuery; import org.eclipse.osee.framework.skynet.core.transaction.SkynetTransaction; import org.eclipse.osee.framework.ui.plugin.util.AWorkbench; -import org.eclipse.osee.framework.ui.skynet.results.XResultData; import org.eclipse.osee.framework.ui.swt.Displays; import org.eclipse.osee.framework.ui.ws.AWorkspace; diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/workdef/provider/ConvertAIsAndTeamsToAtsDsl.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/workdef/provider/ConvertAIsAndTeamsToAtsDsl.java index c01887db30e..48b67e7b67d 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/workdef/provider/ConvertAIsAndTeamsToAtsDsl.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/workdef/provider/ConvertAIsAndTeamsToAtsDsl.java @@ -27,11 +27,11 @@ import org.eclipse.osee.framework.core.enums.CoreAttributeTypes; import org.eclipse.osee.framework.core.exception.ArtifactDoesNotExist; import org.eclipse.osee.framework.core.exception.OseeCoreException; import org.eclipse.osee.framework.core.model.IBasicUser; +import org.eclipse.osee.framework.core.util.XResultData; import org.eclipse.osee.framework.logging.OseeLevel; import org.eclipse.osee.framework.logging.OseeLog; import org.eclipse.osee.framework.skynet.core.User; import org.eclipse.osee.framework.skynet.core.artifact.Artifact; -import org.eclipse.osee.framework.ui.skynet.results.XResultData; /** * Take existing AIs, TeamDefs and Versions and create AtsDsl diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/workdef/provider/ConvertWorkDefinitionToAtsDsl.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/workdef/provider/ConvertWorkDefinitionToAtsDsl.java index 145d8aaaf4a..9d1a8b30462 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/workdef/provider/ConvertWorkDefinitionToAtsDsl.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/workdef/provider/ConvertWorkDefinitionToAtsDsl.java @@ -44,8 +44,8 @@ import org.eclipse.osee.ats.dsl.atsDsl.WidgetRef; import org.eclipse.osee.ats.dsl.atsDsl.WorkDef; import org.eclipse.osee.ats.dsl.atsDsl.WorkflowEventType; import org.eclipse.osee.ats.dsl.atsDsl.impl.AtsDslFactoryImpl; +import org.eclipse.osee.framework.core.util.XResultData; import org.eclipse.osee.framework.jdk.core.util.Strings; -import org.eclipse.osee.framework.ui.skynet.results.XResultData; public class ConvertWorkDefinitionToAtsDsl { diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/WorldXViewer.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/WorldXViewer.java index 87894764c91..e44b4860b29 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/WorldXViewer.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/WorldXViewer.java @@ -60,6 +60,7 @@ import org.eclipse.osee.ats.util.xviewer.column.XViewerAtsAttributeColumn; import org.eclipse.osee.ats.workflow.TransitionToMenu; import org.eclipse.osee.framework.core.data.IAttributeType; import org.eclipse.osee.framework.core.exception.OseeCoreException; +import org.eclipse.osee.framework.core.util.XResultData; import org.eclipse.osee.framework.logging.OseeLevel; import org.eclipse.osee.framework.logging.OseeLog; import org.eclipse.osee.framework.skynet.core.artifact.Artifact; @@ -70,7 +71,7 @@ import org.eclipse.osee.framework.ui.plugin.util.AWorkbench; import org.eclipse.osee.framework.ui.skynet.ArtifactDoubleClick; import org.eclipse.osee.framework.ui.skynet.OpenContributionItem; import org.eclipse.osee.framework.ui.skynet.artifact.ArtifactPromptChange; -import org.eclipse.osee.framework.ui.skynet.results.XResultData; +import org.eclipse.osee.framework.ui.skynet.results.XResultDataUI; import org.eclipse.osee.framework.ui.skynet.widgets.xviewer.skynet.column.AttributeColumn; import org.eclipse.osee.framework.ui.swt.Displays; import org.eclipse.osee.framework.ui.swt.IDirtiableEditor; @@ -231,7 +232,7 @@ public class WorldXViewer extends XViewer implements ISelectedAtsArtifacts, IPer try { if (!rData.isEmpty()) { - rData.report("Column Multi Edit Errors"); + XResultDataUI.report(rData, "Column Multi Edit Errors"); return; } if (useArts.size() > 0) { diff --git a/plugins/org.eclipse.osee.coverage.test/src/org/eclipse/osee/coverage/CoveragePackageImportTest.java b/plugins/org.eclipse.osee.coverage.test/src/org/eclipse/osee/coverage/CoveragePackageImportTest.java index daf6b5317f1..b2455bfd2f0 100644 --- a/plugins/org.eclipse.osee.coverage.test/src/org/eclipse/osee/coverage/CoveragePackageImportTest.java +++ b/plugins/org.eclipse.osee.coverage.test/src/org/eclipse/osee/coverage/CoveragePackageImportTest.java @@ -48,12 +48,12 @@ import org.eclipse.osee.framework.core.exception.ArtifactDoesNotExist; import org.eclipse.osee.framework.core.exception.OseeCoreException; import org.eclipse.osee.framework.core.exception.OseeStateException; import org.eclipse.osee.framework.core.util.Result; +import org.eclipse.osee.framework.core.util.XResultData; import org.eclipse.osee.framework.jdk.core.util.Strings; import org.eclipse.osee.framework.skynet.core.OseeSystemArtifacts; import org.eclipse.osee.framework.skynet.core.artifact.Artifact; import org.eclipse.osee.framework.skynet.core.artifact.search.ArtifactQuery; import org.eclipse.osee.framework.skynet.core.transaction.SkynetTransaction; -import org.eclipse.osee.framework.ui.skynet.results.XResultData; import org.junit.AfterClass; import org.junit.Assert; import org.junit.BeforeClass; diff --git a/plugins/org.eclipse.osee.coverage.test/src/org/eclipse/osee/coverage/VectorCastImportTest.java b/plugins/org.eclipse.osee.coverage.test/src/org/eclipse/osee/coverage/VectorCastImportTest.java index 2d49111a03f..884cc9307bf 100644 --- a/plugins/org.eclipse.osee.coverage.test/src/org/eclipse/osee/coverage/VectorCastImportTest.java +++ b/plugins/org.eclipse.osee.coverage.test/src/org/eclipse/osee/coverage/VectorCastImportTest.java @@ -36,13 +36,13 @@ import org.eclipse.osee.coverage.vcast.VectorCastAdaCoverageImporter; import org.eclipse.osee.framework.core.data.IOseeBranch; import org.eclipse.osee.framework.core.exception.OseeCoreException; import org.eclipse.osee.framework.core.util.Result; +import org.eclipse.osee.framework.core.util.XResultData; import org.eclipse.osee.framework.jdk.core.util.Strings; import org.eclipse.osee.framework.plugin.core.PluginUtil; import org.eclipse.osee.framework.plugin.core.util.OseeData; import org.eclipse.osee.framework.skynet.core.artifact.Artifact; import org.eclipse.osee.framework.skynet.core.artifact.search.ArtifactQuery; import org.eclipse.osee.framework.skynet.core.transaction.SkynetTransaction; -import org.eclipse.osee.framework.ui.skynet.results.XResultData; import org.junit.AfterClass; import org.junit.Assert; import org.junit.BeforeClass; diff --git a/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/action/RemoveRelatedWorkProductAction.java b/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/action/RemoveRelatedWorkProductAction.java index 54145632fcb..5781dcffdcf 100644 --- a/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/action/RemoveRelatedWorkProductAction.java +++ b/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/action/RemoveRelatedWorkProductAction.java @@ -23,11 +23,12 @@ import org.eclipse.osee.coverage.model.ICoverage; import org.eclipse.osee.coverage.model.IWorkProductRelatable; import org.eclipse.osee.coverage.model.WorkProductAction; import org.eclipse.osee.coverage.model.WorkProductTask; +import org.eclipse.osee.framework.core.util.XResultData; import org.eclipse.osee.framework.jdk.core.util.Strings; import org.eclipse.osee.framework.plugin.core.util.Jobs; import org.eclipse.osee.framework.ui.plugin.util.AWorkbench; import org.eclipse.osee.framework.ui.skynet.FrameworkImage; -import org.eclipse.osee.framework.ui.skynet.results.XResultData; +import org.eclipse.osee.framework.ui.skynet.results.XResultDataUI; import org.eclipse.osee.framework.ui.swt.Displays; import org.eclipse.osee.framework.ui.swt.ImageManager; import org.eclipse.swt.widgets.Display; @@ -63,7 +64,7 @@ public class RemoveRelatedWorkProductAction extends Action { resultData.log("Selected Work Product Actions have related Tasks. Remove first before removing Action.\n"); validateWorkProductGuid(selActions, coverageEditorWorkProductTab.getCoveragePackage(), resultData); if (resultData.isErrors()) { - resultData.report("Work Product Report"); + XResultDataUI.report(resultData,"Work Product Report"); return; } diff --git a/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/action/ShowMergeDetailsAction.java b/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/action/ShowMergeDetailsAction.java index 028f3bba5aa..39666d711f3 100644 --- a/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/action/ShowMergeDetailsAction.java +++ b/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/action/ShowMergeDetailsAction.java @@ -23,11 +23,12 @@ import org.eclipse.osee.coverage.model.CoverageImport; import org.eclipse.osee.coverage.model.CoveragePackage; import org.eclipse.osee.coverage.model.ICoverage; import org.eclipse.osee.framework.core.exception.OseeCoreException; +import org.eclipse.osee.framework.core.util.XResultData; import org.eclipse.osee.framework.logging.OseeLevel; import org.eclipse.osee.framework.logging.OseeLog; import org.eclipse.osee.framework.ui.plugin.util.AWorkbench; import org.eclipse.osee.framework.ui.skynet.FrameworkImage; -import org.eclipse.osee.framework.ui.skynet.results.XResultData; +import org.eclipse.osee.framework.ui.skynet.results.XResultDataUI; import org.eclipse.osee.framework.ui.swt.ImageManager; /** @@ -67,7 +68,7 @@ public class ShowMergeDetailsAction extends Action { if (matchItem != null && matchItem.getPackageItem() != null) { MergeManager mergeManager = new MergeManager(coveragePackage, coverageImport); XResultData resultData = mergeManager.getMergeDetails(importCoverageEditorItem, new XResultData(false)); - resultData.report("Merge Details - " + importCoverageEditorItem.getName()); + XResultDataUI.report(resultData,"Merge Details - " + importCoverageEditorItem.getName()); } else { AWorkbench.popup("Can't find match item"); return; diff --git a/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/editor/CoverageEditorLoadingTab.java b/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/editor/CoverageEditorLoadingTab.java index 952d79efc66..5e97493f301 100644 --- a/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/editor/CoverageEditorLoadingTab.java +++ b/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/editor/CoverageEditorLoadingTab.java @@ -12,10 +12,11 @@ package org.eclipse.osee.coverage.editor; import org.eclipse.osee.coverage.help.ui.CoverageHelpContext; import org.eclipse.osee.coverage.util.CoverageImage; +import org.eclipse.osee.framework.core.util.XResultData; import org.eclipse.osee.framework.ui.plugin.util.HelpUtil; import org.eclipse.osee.framework.ui.skynet.action.RefreshAction; import org.eclipse.osee.framework.ui.skynet.action.RefreshAction.IRefreshActionHandler; -import org.eclipse.osee.framework.ui.skynet.results.XResultData; +import org.eclipse.osee.framework.ui.skynet.results.XResultDataUI; import org.eclipse.osee.framework.ui.skynet.results.html.XResultsComposite; import org.eclipse.osee.framework.ui.swt.ALayout; import org.eclipse.osee.framework.ui.swt.Displays; @@ -73,7 +74,7 @@ public class CoverageEditorLoadingTab extends FormPage implements IRefreshAction Displays.ensureInDisplayThread(new Runnable() { @Override public void run() { - xResultsComp.setHtmlText(rd.getReport("").getManipulatedHtml(), ""); + xResultsComp.setHtmlText(XResultDataUI.getReport(rd,"").getManipulatedHtml(), ""); } }); } diff --git a/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/editor/CoverageEditorMergeTab.java b/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/editor/CoverageEditorMergeTab.java index 7bbd1ddcde0..06a6193b584 100644 --- a/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/editor/CoverageEditorMergeTab.java +++ b/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/editor/CoverageEditorMergeTab.java @@ -49,6 +49,7 @@ import org.eclipse.osee.framework.core.model.Branch; import org.eclipse.osee.framework.core.operation.AbstractOperation; import org.eclipse.osee.framework.core.operation.Operations; import org.eclipse.osee.framework.core.util.Result; +import org.eclipse.osee.framework.core.util.XResultData; import org.eclipse.osee.framework.logging.OseeLevel; import org.eclipse.osee.framework.logging.OseeLog; import org.eclipse.osee.framework.skynet.core.artifact.Artifact; @@ -59,7 +60,7 @@ import org.eclipse.osee.framework.ui.skynet.FrameworkImage; import org.eclipse.osee.framework.ui.skynet.action.CollapseAllAction; import org.eclipse.osee.framework.ui.skynet.action.ExpandAllAction; import org.eclipse.osee.framework.ui.skynet.action.RefreshAction; -import org.eclipse.osee.framework.ui.skynet.results.XResultData; +import org.eclipse.osee.framework.ui.skynet.results.XResultDataUI; import org.eclipse.osee.framework.ui.skynet.widgets.dialog.CheckBoxDialog; import org.eclipse.osee.framework.ui.swt.ALayout; import org.eclipse.osee.framework.ui.swt.Displays; @@ -173,7 +174,7 @@ public class CoverageEditorMergeTab extends FormPage implements ISaveable { "Save Import Record?"); if (dialog.open() == 0) { XResultData rd = new MergeImportManager(mergeManager).importItems(this, mergeItems); - rd.report("Import"); + XResultDataUI.report(rd,"Import"); if (dialog.isChecked()) { Branch branch = coverageEditor.getBranch(); if (branch == null) { @@ -335,7 +336,7 @@ public class CoverageEditorMergeTab extends FormPage implements ISaveable { // elapsedTime.logPoint("setInput"); xImportViewer2.getXViewer().setInput(mergeItems); if (debugReport) { - resultData.report("Re-Load"); + XResultDataUI.report(resultData,"Re-Load"); } // elapsedTime.end(); } diff --git a/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/editor/CoverageEditorOverviewTab.java b/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/editor/CoverageEditorOverviewTab.java index b50d46d9d82..7e18c416383 100644 --- a/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/editor/CoverageEditorOverviewTab.java +++ b/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/editor/CoverageEditorOverviewTab.java @@ -24,13 +24,14 @@ import org.eclipse.osee.coverage.model.CoveragePackageBase; import org.eclipse.osee.coverage.model.CoverageUnit; import org.eclipse.osee.coverage.util.CoverageUtil; import org.eclipse.osee.coverage.validate.CoveragePackageOrderValidator; +import org.eclipse.osee.framework.core.util.XResultData; import org.eclipse.osee.framework.jdk.core.util.AHTML; import org.eclipse.osee.framework.ui.plugin.util.HelpUtil; import org.eclipse.osee.framework.ui.skynet.action.RefreshAction; import org.eclipse.osee.framework.ui.skynet.action.RefreshAction.IRefreshActionHandler; import org.eclipse.osee.framework.ui.skynet.action.browser.BrowserPrintAction; import org.eclipse.osee.framework.ui.skynet.action.browser.IBrowserActionHandler; -import org.eclipse.osee.framework.ui.skynet.results.XResultData; +import org.eclipse.osee.framework.ui.skynet.results.XResultDataUI; import org.eclipse.osee.framework.ui.skynet.results.html.XResultsComposite; import org.eclipse.osee.framework.ui.swt.Displays; import org.eclipse.osee.framework.ui.swt.ImageManager; @@ -123,13 +124,13 @@ public class CoverageEditorOverviewTab extends FormPage implements IRefreshActio if (coveragePackageBase.getLog() != null) { rd.log(AHTML.newline() + AHTML.bold("Log:") + AHTML.newline()); - rd.addRaw(coveragePackageBase.getLog().getReport("").getManipulatedHtml()); + rd.addRaw(XResultDataUI.getReport(coveragePackageBase.getLog(), "").getManipulatedHtml()); } Displays.ensureInDisplayThread(new Runnable() { @Override public void run() { - String html = rd.getReport(coveragePackageBase.getName()).getManipulatedHtml(); + String html = XResultDataUI.getReport(rd, coveragePackageBase.getName()).getManipulatedHtml(); xResultsComp.setHtmlText(html, coveragePackageBase.getName()); } }); diff --git a/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/editor/xmerge/CoverageMergeXViewer.java b/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/editor/xmerge/CoverageMergeXViewer.java index 2281e06fa81..9b50e05f8f8 100644 --- a/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/editor/xmerge/CoverageMergeXViewer.java +++ b/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/editor/xmerge/CoverageMergeXViewer.java @@ -24,9 +24,9 @@ import org.eclipse.osee.coverage.merge.IMergeItem; import org.eclipse.osee.coverage.merge.MergeManager; import org.eclipse.osee.coverage.model.ICoverage; import org.eclipse.osee.framework.core.exception.OseeCoreException; +import org.eclipse.osee.framework.core.util.XResultData; import org.eclipse.osee.framework.logging.OseeLevel; import org.eclipse.osee.framework.logging.OseeLog; -import org.eclipse.osee.framework.ui.skynet.results.XResultData; import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.TreeColumn; import org.eclipse.swt.widgets.TreeItem; diff --git a/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/merge/MergeImportManager.java b/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/merge/MergeImportManager.java index dd7442e4070..da76fb8444f 100644 --- a/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/merge/MergeImportManager.java +++ b/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/merge/MergeImportManager.java @@ -24,11 +24,11 @@ import org.eclipse.osee.coverage.util.ISaveable; import org.eclipse.osee.framework.core.exception.OseeCoreException; import org.eclipse.osee.framework.core.exception.OseeStateException; import org.eclipse.osee.framework.core.util.Result; +import org.eclipse.osee.framework.core.util.XResultData; import org.eclipse.osee.framework.jdk.core.util.Strings; import org.eclipse.osee.framework.logging.OseeLevel; import org.eclipse.osee.framework.logging.OseeLog; import org.eclipse.osee.framework.ui.plugin.util.AWorkbench; -import org.eclipse.osee.framework.ui.skynet.results.XResultData; /** * @author Donald G. Dunne diff --git a/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/merge/MergeManager.java b/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/merge/MergeManager.java index 9e63283796d..92a7e0f455c 100644 --- a/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/merge/MergeManager.java +++ b/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/merge/MergeManager.java @@ -31,9 +31,9 @@ import org.eclipse.osee.coverage.model.ICoverage; import org.eclipse.osee.coverage.util.CoverageUtil; import org.eclipse.osee.framework.core.exception.OseeCoreException; import org.eclipse.osee.framework.core.exception.OseeStateException; +import org.eclipse.osee.framework.core.util.XResultData; import org.eclipse.osee.framework.jdk.core.util.AHTML; import org.eclipse.osee.framework.jdk.core.util.Strings; -import org.eclipse.osee.framework.ui.skynet.results.XResultData; /** * @author Donald G. Dunne diff --git a/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/model/CoverageImport.java b/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/model/CoverageImport.java index 21bf872364e..51e8fbba4eb 100644 --- a/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/model/CoverageImport.java +++ b/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/model/CoverageImport.java @@ -15,11 +15,11 @@ import java.util.ArrayList; import java.util.Date; import java.util.List; import org.eclipse.osee.framework.core.exception.OseeArgumentException; +import org.eclipse.osee.framework.core.util.XResultData; import org.eclipse.osee.framework.jdk.core.util.AHTML; import org.eclipse.osee.framework.jdk.core.util.DateUtil; import org.eclipse.osee.framework.jdk.core.util.Strings; import org.eclipse.osee.framework.skynet.core.artifact.KeyValueArtifact; -import org.eclipse.osee.framework.ui.skynet.results.XResultData; /** * Single import of coverage information that includes diff --git a/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/model/CoveragePackage.java b/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/model/CoveragePackage.java index d4a643f480f..57413093c16 100644 --- a/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/model/CoveragePackage.java +++ b/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/model/CoveragePackage.java @@ -11,11 +11,11 @@ package org.eclipse.osee.coverage.model; import java.util.Date; +import org.eclipse.osee.framework.core.util.XResultData; import org.eclipse.osee.framework.jdk.core.util.AHTML; import org.eclipse.osee.framework.jdk.core.util.DateUtil; import org.eclipse.osee.framework.jdk.core.util.Strings; import org.eclipse.osee.framework.skynet.core.artifact.KeyValueArtifact; -import org.eclipse.osee.framework.ui.skynet.results.XResultData; public class CoveragePackage extends CoveragePackageBase { diff --git a/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/model/CoveragePackageBase.java b/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/model/CoveragePackageBase.java index 3bc11c2f4f4..eb54ec01cfa 100644 --- a/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/model/CoveragePackageBase.java +++ b/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/model/CoveragePackageBase.java @@ -21,8 +21,8 @@ import org.eclipse.osee.coverage.util.CoverageUtil; import org.eclipse.osee.framework.core.data.NamedIdentity; import org.eclipse.osee.framework.core.exception.OseeCoreException; import org.eclipse.osee.framework.core.util.Result; +import org.eclipse.osee.framework.core.util.XResultData; import org.eclipse.osee.framework.skynet.core.artifact.KeyValueArtifact; -import org.eclipse.osee.framework.ui.skynet.results.XResultData; import org.eclipse.osee.framework.ui.swt.KeyedImage; /** diff --git a/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/validate/CoveragePackageOrderValidator.java b/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/validate/CoveragePackageOrderValidator.java index 797562a8532..66b8d543a25 100644 --- a/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/validate/CoveragePackageOrderValidator.java +++ b/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/validate/CoveragePackageOrderValidator.java @@ -13,9 +13,9 @@ import org.eclipse.osee.coverage.model.CoverageItem; import org.eclipse.osee.coverage.model.CoveragePackageBase; import org.eclipse.osee.coverage.model.CoverageUnit; import org.eclipse.osee.coverage.model.ICoverage; +import org.eclipse.osee.framework.core.util.XResultData; import org.eclipse.osee.framework.jdk.core.util.AHTML; import org.eclipse.osee.framework.jdk.core.util.Strings; -import org.eclipse.osee.framework.ui.skynet.results.XResultData; /** * Validate that all coverage objects valid order numbers. Not duplicates and no missing numbers. Add error to list that diff --git a/plugins/org.eclipse.osee.define/META-INF/MANIFEST.MF b/plugins/org.eclipse.osee.define/META-INF/MANIFEST.MF index e9aa02dcb6a..4fd6fe61f90 100644 --- a/plugins/org.eclipse.osee.define/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.osee.define/META-INF/MANIFEST.MF @@ -42,6 +42,7 @@ Import-Package: org.apache.commons.lang;version="2.4.0", org.eclipse.osee.framework.core.model, org.eclipse.osee.framework.core.model.type, org.eclipse.osee.framework.core.operation, + org.eclipse.osee.framework.core.util, org.eclipse.osee.framework.logging, org.eclipse.osee.framework.skynet.core, org.eclipse.osee.framework.skynet.core.artifact, diff --git a/plugins/org.eclipse.osee.define/src/org/eclipse/osee/define/blam/operation/RequirementsTestReport.java b/plugins/org.eclipse.osee.define/src/org/eclipse/osee/define/blam/operation/RequirementsTestReport.java index 51fdf51b86b..aea71f9d723 100644 --- a/plugins/org.eclipse.osee.define/src/org/eclipse/osee/define/blam/operation/RequirementsTestReport.java +++ b/plugins/org.eclipse.osee.define/src/org/eclipse/osee/define/blam/operation/RequirementsTestReport.java @@ -20,12 +20,13 @@ import org.eclipse.osee.framework.core.enums.CoreAttributeTypes; import org.eclipse.osee.framework.core.enums.CoreRelationTypes; import org.eclipse.osee.framework.core.exception.OseeCoreException; import org.eclipse.osee.framework.core.model.type.ArtifactType; +import org.eclipse.osee.framework.core.util.XResultData; import org.eclipse.osee.framework.jdk.core.util.AHTML; import org.eclipse.osee.framework.skynet.core.artifact.Artifact; import org.eclipse.osee.framework.skynet.core.relation.RelationManager; import org.eclipse.osee.framework.ui.skynet.blam.AbstractBlam; import org.eclipse.osee.framework.ui.skynet.blam.VariableMap; -import org.eclipse.osee.framework.ui.skynet.results.XResultData; +import org.eclipse.osee.framework.ui.skynet.results.XResultDataUI; import org.eclipse.osee.framework.ui.skynet.results.html.XResultPage.Manipulations; public class RequirementsTestReport extends AbstractBlam { @@ -128,7 +129,7 @@ public class RequirementsTestReport extends AbstractBlam { report.append(AHTML.endMultiColumnTable()); XResultData rd = new XResultData(); rd.addRaw(report.toString()); - rd.report("Requirements Test Report", Manipulations.RAW_HTML); + XResultDataUI.report(rd,"Requirements Test Report", Manipulations.RAW_HTML); } private void init(VariableMap variableMap) throws OseeCoreException, IOException { diff --git a/plugins/org.eclipse.osee.define/src/org/eclipse/osee/define/blam/operation/SubsystemRequirementVerificationLevel.java b/plugins/org.eclipse.osee.define/src/org/eclipse/osee/define/blam/operation/SubsystemRequirementVerificationLevel.java index c55fce0d296..d7b01e89b6c 100644 --- a/plugins/org.eclipse.osee.define/src/org/eclipse/osee/define/blam/operation/SubsystemRequirementVerificationLevel.java +++ b/plugins/org.eclipse.osee.define/src/org/eclipse/osee/define/blam/operation/SubsystemRequirementVerificationLevel.java @@ -18,6 +18,7 @@ import org.eclipse.osee.framework.core.enums.CoreAttributeTypes; import org.eclipse.osee.framework.core.enums.CoreRelationTypes; import org.eclipse.osee.framework.core.exception.OseeCoreException; import org.eclipse.osee.framework.core.model.Branch; +import org.eclipse.osee.framework.core.util.XResultData; import org.eclipse.osee.framework.jdk.core.util.AHTML; import org.eclipse.osee.framework.skynet.core.artifact.Artifact; import org.eclipse.osee.framework.skynet.core.artifact.search.ArtifactQuery; @@ -25,7 +26,7 @@ import org.eclipse.osee.framework.skynet.core.relation.RelationManager; import org.eclipse.osee.framework.skynet.core.transaction.SkynetTransaction; import org.eclipse.osee.framework.ui.skynet.blam.AbstractBlam; import org.eclipse.osee.framework.ui.skynet.blam.VariableMap; -import org.eclipse.osee.framework.ui.skynet.results.XResultData; +import org.eclipse.osee.framework.ui.skynet.results.XResultDataUI; import org.eclipse.osee.framework.ui.skynet.results.html.XResultPage.Manipulations; public class SubsystemRequirementVerificationLevel extends AbstractBlam { @@ -80,7 +81,7 @@ public class SubsystemRequirementVerificationLevel extends AbstractBlam { report.append(AHTML.endMultiColumnTable()); XResultData rd = new XResultData(); rd.addRaw(report.toString()); - rd.report("Set Verification Level", Manipulations.RAW_HTML); + XResultDataUI.report(rd,"Set Verification Level", Manipulations.RAW_HTML); } private void beginReport() { diff --git a/plugins/org.eclipse.osee.define/src/org/eclipse/osee/define/traceability/blam/UiToTestBlam.java b/plugins/org.eclipse.osee.define/src/org/eclipse/osee/define/traceability/blam/UiToTestBlam.java index 137bdbc82f2..ccd39fe8ad3 100644 --- a/plugins/org.eclipse.osee.define/src/org/eclipse/osee/define/traceability/blam/UiToTestBlam.java +++ b/plugins/org.eclipse.osee.define/src/org/eclipse/osee/define/traceability/blam/UiToTestBlam.java @@ -32,6 +32,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.model.Branch; +import org.eclipse.osee.framework.core.util.XResultData; import org.eclipse.osee.framework.jdk.core.util.Lib; import org.eclipse.osee.framework.jdk.core.util.Strings; import org.eclipse.osee.framework.plugin.core.util.AIFile; @@ -40,7 +41,6 @@ import org.eclipse.osee.framework.skynet.core.artifact.Artifact; import org.eclipse.osee.framework.skynet.core.artifact.search.ArtifactQuery; import org.eclipse.osee.framework.ui.skynet.blam.AbstractBlam; import org.eclipse.osee.framework.ui.skynet.blam.VariableMap; -import org.eclipse.osee.framework.ui.skynet.results.XResultData; import org.eclipse.swt.program.Program; /** diff --git a/plugins/org.eclipse.osee.define/src/org/eclipse/osee/define/traceability/operations/TraceUnitReportProcessor.java b/plugins/org.eclipse.osee.define/src/org/eclipse/osee/define/traceability/operations/TraceUnitReportProcessor.java index 78b393f6210..c5da6e3f18d 100644 --- a/plugins/org.eclipse.osee.define/src/org/eclipse/osee/define/traceability/operations/TraceUnitReportProcessor.java +++ b/plugins/org.eclipse.osee.define/src/org/eclipse/osee/define/traceability/operations/TraceUnitReportProcessor.java @@ -13,9 +13,10 @@ package org.eclipse.osee.define.traceability.operations; import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.osee.define.traceability.data.TraceMark; import org.eclipse.osee.define.traceability.data.TraceUnit; +import org.eclipse.osee.framework.core.util.XResultData; import org.eclipse.osee.framework.jdk.core.util.AHTML; import org.eclipse.osee.framework.jdk.core.util.Lib; -import org.eclipse.osee.framework.ui.skynet.results.XResultData; +import org.eclipse.osee.framework.ui.skynet.results.XResultDataUI; /** * @author Roberto E. Escobar @@ -67,6 +68,6 @@ public final class TraceUnitReportProcessor implements ITraceUnitProcessor { resultData.addRaw(AHTML.endMultiColumnTable()); System.out.println(String.format("Completed in: %s", Lib.getElapseString(startTime))); System.out.println(String.format("Memory Leaked: %s", Runtime.getRuntime().totalMemory() - startMemory)); - resultData.report("Report"); + XResultDataUI.report(resultData,"Report"); } } diff --git a/plugins/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/util/IResultDataListener.java b/plugins/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/util/IResultDataListener.java new file mode 100644 index 00000000000..f1d9d9fac10 --- /dev/null +++ b/plugins/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/util/IResultDataListener.java @@ -0,0 +1,14 @@ +/* + * Created on May 20, 2011 + * + * PLACE_YOUR_DISTRIBUTION_STATEMENT_RIGHT_HERE + */ +package org.eclipse.osee.framework.core.util; + +/** + * @author Donald G. Dunne + */ +public interface IResultDataListener { + + public void log(XResultData.Type type, String str); +} diff --git a/plugins/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/util/XResultData.java b/plugins/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/util/XResultData.java new file mode 100644 index 00000000000..8628ca0d959 --- /dev/null +++ b/plugins/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/util/XResultData.java @@ -0,0 +1,191 @@ +/******************************************************************************* + * Copyright (c) 2004, 2007 Boeing. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v1.0 + * which accompanies this distribution, and is available at + * http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Boeing - initial API and implementation + *******************************************************************************/ + +package org.eclipse.osee.framework.core.util; + +import java.util.List; +import java.util.concurrent.CopyOnWriteArrayList; +import java.util.regex.Pattern; +import org.eclipse.core.runtime.IProgressMonitor; +import org.eclipse.osee.framework.jdk.core.type.CountingMap; +import org.eclipse.osee.framework.jdk.core.util.Collections; +import org.eclipse.osee.framework.jdk.core.util.Lib; +import org.eclipse.osee.framework.logging.IHealthStatus; +import org.eclipse.osee.framework.logging.SevereLoggingMonitor; + +/** + * Used to log Info, Warning and Errors to multiple locations (logger, stderr/out and XResultView). Upon completion, a + * call to report(title) will open results in the ResultsView + * + * @author Donald G. Dunne + */ +public final class XResultData { + + public static final Pattern ErrorPattern = Pattern.compile("Error: "); + public static final Pattern WarningPattern = Pattern.compile("Warning: "); + public List<IResultDataListener> listeners; + public String title; + + public static enum Type { + Severe, + Warning, + Info; + } + + private StringBuffer sb; + private CountingMap<Type> count; + + private boolean enableOseeLog; + + public XResultData() { + this(true); + } + + public XResultData(boolean enableOseeLog) { + super(); + this.enableOseeLog = enableOseeLog; + clear(); + } + + public XResultData(boolean enableOseeLog, IResultDataListener... listeners) { + super(); + this.enableOseeLog = enableOseeLog; + clear(); + if (listeners != null && listeners.length > 0) { + this.listeners = Collections.getAggregate(listeners); + } + } + + public void clear() { + sb = new StringBuffer(); + count = new CountingMap<Type>(); + } + + public void addRaw(String str) { + sb.append(str); + } + + public void reportSevereLoggingMonitor(SevereLoggingMonitor monitorLog) { + List<IHealthStatus> stats = monitorLog.getAllLogs(); + for (IHealthStatus stat : new CopyOnWriteArrayList<IHealthStatus>(stats)) { + if (stat.getException() != null) { + logError("Exception: " + Lib.exceptionToString(stat.getException())); + } + } + } + + public void log(IProgressMonitor monitor, String str) { + log(str); + if (monitor != null) { + monitor.setTaskName(str); + } + } + + public void log(String str) { + logStr(Type.Info, str + "\n"); + } + + public void logWithFormat(String formatStr, Object... objs) { + logStr(Type.Info, String.format(formatStr, objs)); + } + + public void logError(String str) { + logStr(Type.Severe, str + "\n"); + } + + public void logErrorWithFormat(String formatStr, Object... objs) { + logStr(Type.Severe, String.format(formatStr + "\n", objs)); + } + + public void logWarning(String str) { + logStr(Type.Warning, str + "\n"); + } + + public void logWarningWithFormat(String formatStr, Object... objs) { + logStr(Type.Warning, String.format(formatStr + "\n", objs)); + } + + public boolean isEmpty() { + return toString().equals(""); + } + + public void logStr(Type type, final String str) { + count.put(type); + String resultStr = ""; + if (type == Type.Warning) { + resultStr = "Warning: " + str; + } else if (type == Type.Severe) { + resultStr = "Error: " + str; + } else { + resultStr = str; + } + sb.append(resultStr); + if (listeners != null) { + for (IResultDataListener listener : listeners) { + listener.log(type, resultStr); + } + } + } + + @Override + public String toString() { + return sb.toString(); + } + + private int getCount(Type type) { + return count.get(type); + } + + public int getNumErrors() { + return getCount(Type.Severe); + } + + /** + * XResultData counts number of errors logged with logError, however users can insert their own "Error: " strings to + * produce errors. This counts based on these occurences. + */ + public int getNumErrorsViaSearch() { + return Lib.getMatcherCount(ErrorPattern, sb.toString()); + } + + /** + * XResultData counts number of warnings logged with logWarning, however users can insert their own "Error: " strings + * to produce errors. This counts based on these occurences. + */ + public int getNumWarningsViaSearch() { + return Lib.getMatcherCount(WarningPattern, sb.toString()); + } + + public int getNumWarnings() { + return getCount(Type.Warning); + } + + public boolean isEnableOseeLog() { + return enableOseeLog; + } + + public void setEnableOseeLog(boolean enableOseeLog) { + this.enableOseeLog = enableOseeLog; + } + + public boolean isErrors() { + return getNumErrors() > 0; + } + + public String getTitle() { + return title; + } + + public void setTitle(String title) { + this.title = title; + } + +} diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/ArtifactValidationCheckOperation.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/ArtifactValidationCheckOperation.java index d10b61ed794..7feae7d9ab6 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/ArtifactValidationCheckOperation.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/ArtifactValidationCheckOperation.java @@ -20,7 +20,7 @@ import org.eclipse.osee.framework.core.operation.AbstractOperation; import org.eclipse.osee.framework.skynet.core.artifact.Artifact; import org.eclipse.osee.framework.skynet.core.validation.IOseeValidator; import org.eclipse.osee.framework.skynet.core.validation.OseeValidator; -import org.eclipse.osee.framework.ui.skynet.results.XResultData; +import org.eclipse.osee.framework.ui.skynet.results.XResultDataUI; /** * @author Roberto E. Escobar @@ -45,7 +45,7 @@ public class ArtifactValidationCheckOperation extends AbstractOperation { private void handleStatus(Artifact itemChecked, IStatus status) throws Exception { if (!status.isOK()) { String link = - XResultData.getHyperlink( + XResultDataUI.getHyperlink( String.format("%s:[%s]", itemChecked.getArtifactTypeName(), itemChecked.getName()), itemChecked.getHumanReadableId(), itemChecked.getBranch().getId()); String message = String.format("%s: %s", link, status.getMessage()); diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/TableViewerReport.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/TableViewerReport.java index 17e4d504deb..5bbfe2c072b 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/TableViewerReport.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/TableViewerReport.java @@ -16,8 +16,9 @@ import org.eclipse.jface.viewers.IBaseLabelProvider; import org.eclipse.jface.viewers.ITableLabelProvider; import org.eclipse.jface.viewers.LabelProvider; import org.eclipse.jface.viewers.TableViewer; +import org.eclipse.osee.framework.core.util.XResultData; import org.eclipse.osee.framework.jdk.core.util.AHTML; -import org.eclipse.osee.framework.ui.skynet.results.XResultData; +import org.eclipse.osee.framework.ui.skynet.results.XResultDataUI; import org.eclipse.osee.framework.ui.skynet.results.html.XResultPage.Manipulations; import org.eclipse.swt.widgets.TableColumn; import org.eclipse.swt.widgets.TableItem; @@ -44,7 +45,7 @@ public class TableViewerReport { String html = getHtml(items); XResultData xResultData = new XResultData(); xResultData.addRaw(html); - xResultData.report(title, Manipulations.RAW_HTML); + XResultDataUI.report(xResultData, title, Manipulations.RAW_HTML); } public String getHtml(TableItem items[]) { diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/TreeViewerReport.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/TreeViewerReport.java index 9f03864c28d..4e02ede801a 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/TreeViewerReport.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/TreeViewerReport.java @@ -14,8 +14,9 @@ package org.eclipse.osee.framework.ui.skynet; import java.util.ArrayList; import org.eclipse.jface.viewers.ITableLabelProvider; import org.eclipse.jface.viewers.TreeViewer; +import org.eclipse.osee.framework.core.util.XResultData; import org.eclipse.osee.framework.jdk.core.util.AHTML; -import org.eclipse.osee.framework.ui.skynet.results.XResultData; +import org.eclipse.osee.framework.ui.skynet.results.XResultDataUI; import org.eclipse.osee.framework.ui.skynet.results.html.XResultPage.Manipulations; import org.eclipse.swt.widgets.TreeColumn; import org.eclipse.swt.widgets.TreeItem; @@ -47,7 +48,7 @@ public class TreeViewerReport { String html = getHtml(items); XResultData xResultData = new XResultData(); xResultData.addRaw(html); - xResultData.report(title, Manipulations.RAW_HTML); + XResultDataUI.report(xResultData, title, Manipulations.RAW_HTML); } public String getHtml(TreeItem items[]) { diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/blam/operation/AdvancedKeywordSearchBlam.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/blam/operation/AdvancedKeywordSearchBlam.java index 0c4f13cc33c..f5383e4338a 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/blam/operation/AdvancedKeywordSearchBlam.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/blam/operation/AdvancedKeywordSearchBlam.java @@ -20,6 +20,7 @@ import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.osee.framework.core.data.IArtifactType; import org.eclipse.osee.framework.core.model.Branch; import org.eclipse.osee.framework.core.model.type.AttributeType; +import org.eclipse.osee.framework.core.util.XResultData; import org.eclipse.osee.framework.jdk.core.type.HashCollection; import org.eclipse.osee.framework.jdk.core.util.AHTML; import org.eclipse.osee.framework.jdk.core.util.Collections; @@ -29,7 +30,7 @@ import org.eclipse.osee.framework.skynet.core.artifact.search.ArtifactQuery; import org.eclipse.osee.framework.ui.plugin.util.AWorkbench; import org.eclipse.osee.framework.ui.skynet.blam.AbstractBlam; import org.eclipse.osee.framework.ui.skynet.blam.VariableMap; -import org.eclipse.osee.framework.ui.skynet.results.XResultData; +import org.eclipse.osee.framework.ui.skynet.results.XResultDataUI; /** * Perform keyword search (in word order) for a list of keywords. Results will be in an excel spreadsheet where each @@ -79,7 +80,7 @@ public class AdvancedKeywordSearchBlam extends AbstractBlam { for (Entry<Artifact, Collection<String>> entry : artifactToMatch.entrySet()) { List<String> valueList = new ArrayList<String>(); valueList.addAll(Arrays.asList(entry.getKey().getName(), Collections.toString(";", entry.getValue()), - entry.getKey().getGuid(), XResultData.getHyperlink("open", entry.getKey()), + entry.getKey().getGuid(), XResultDataUI.getHyperlink("open", entry.getKey()), entry.getKey().getArtifactTypeName())); for (AttributeType attrType : attrTypes) { valueList.add(entry.getKey().getAttributesToString(attrType)); @@ -88,7 +89,7 @@ public class AdvancedKeywordSearchBlam extends AbstractBlam { } resultData.addRaw(AHTML.endMultiColumnTable()); resultData.log("Keywordgroups: \n" + keywordgroups); - resultData.report(String.format("[%s] on branch [%s]", getName(), branch)); + XResultDataUI.report(resultData, String.format("[%s] on branch [%s]", getName(), branch)); } @Override diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/blam/operation/CountArtifactsOfTypeBlam.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/blam/operation/CountArtifactsOfTypeBlam.java index 50b585c7a22..3a6426340ec 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/blam/operation/CountArtifactsOfTypeBlam.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/blam/operation/CountArtifactsOfTypeBlam.java @@ -15,12 +15,13 @@ import java.util.Collection; import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.osee.framework.core.data.IArtifactType; import org.eclipse.osee.framework.core.enums.DeletionFlag; +import org.eclipse.osee.framework.core.util.XResultData; import org.eclipse.osee.framework.jdk.core.util.AHTML; import org.eclipse.osee.framework.skynet.core.artifact.ArtifactTypeManager; import org.eclipse.osee.framework.skynet.core.artifact.search.ArtifactQuery; import org.eclipse.osee.framework.ui.skynet.blam.AbstractBlam; import org.eclipse.osee.framework.ui.skynet.blam.VariableMap; -import org.eclipse.osee.framework.ui.skynet.results.XResultData; +import org.eclipse.osee.framework.ui.skynet.results.XResultDataUI; /** * Counts artifact of type or inherited type @@ -48,7 +49,7 @@ public class CountArtifactsOfTypeBlam extends AbstractBlam { rd.addRaw(AHTML.addRowMultiColumnTable(artType.toString(), String.valueOf(count))); } rd.addRaw(AHTML.endMultiColumnTable()); - rd.report("Artifact Type Count"); + XResultDataUI.report(rd,"Artifact Type Count"); } else { IArtifactType artType = variableMap.getArtifactType("Artifact Type"); int count = diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/blam/operation/DatabaseHealth.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/blam/operation/DatabaseHealth.java index 2ba4e43451e..db21e4fd76e 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/blam/operation/DatabaseHealth.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/blam/operation/DatabaseHealth.java @@ -19,6 +19,7 @@ import org.eclipse.osee.framework.access.AccessControlManager; import org.eclipse.osee.framework.core.exception.OseeAccessDeniedException; import org.eclipse.osee.framework.core.operation.AbstractOperation; import org.eclipse.osee.framework.core.operation.Operations; +import org.eclipse.osee.framework.core.util.XResultData; import org.eclipse.osee.framework.jdk.core.util.AXml; import org.eclipse.osee.framework.jdk.core.util.Strings; import org.eclipse.osee.framework.ui.skynet.SkynetGuiPlugin; @@ -27,7 +28,7 @@ import org.eclipse.osee.framework.ui.skynet.blam.VariableMap; import org.eclipse.osee.framework.ui.skynet.dbHealth.DatabaseHealthOperation; import org.eclipse.osee.framework.ui.skynet.dbHealth.DatabaseHealthOpsExtensionManager; import org.eclipse.osee.framework.ui.skynet.results.ResultsEditor; -import org.eclipse.osee.framework.ui.skynet.results.XResultData; +import org.eclipse.osee.framework.ui.skynet.results.XResultDataUI; import org.eclipse.osee.framework.ui.skynet.results.html.XResultPage.Manipulations; /** @@ -134,7 +135,7 @@ public class DatabaseHealth extends AbstractBlam { if (Strings.isValid(detailedReport)) { XResultData result = new XResultData(); result.addRaw(detailedReport.toString()); - result.report(operation.getName(), Manipulations.RAW_HTML); + XResultDataUI.report(result, operation.getName(), Manipulations.RAW_HTML); } else { ResultsEditor.open(operation.getResultsProvider()); } diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/blam/operation/FixTemplateContentArtifacts.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/blam/operation/FixTemplateContentArtifacts.java index 697adc7fbab..64e674f0970 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/blam/operation/FixTemplateContentArtifacts.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/blam/operation/FixTemplateContentArtifacts.java @@ -38,6 +38,7 @@ import org.eclipse.osee.framework.core.exception.OseeCoreException; import org.eclipse.osee.framework.core.exception.OseeExceptions; import org.eclipse.osee.framework.core.util.HttpProcessor; import org.eclipse.osee.framework.core.util.HttpProcessor.AcquireResult; +import org.eclipse.osee.framework.core.util.XResultData; import org.eclipse.osee.framework.database.core.ConnectionHandler; import org.eclipse.osee.framework.database.core.IOseeStatement; import org.eclipse.osee.framework.jdk.core.util.AHTML; @@ -51,7 +52,7 @@ import org.eclipse.osee.framework.ui.skynet.SkynetGuiPlugin; import org.eclipse.osee.framework.ui.skynet.blam.AbstractBlam; import org.eclipse.osee.framework.ui.skynet.blam.VariableMap; import org.eclipse.osee.framework.ui.skynet.render.WordTemplateRenderer; -import org.eclipse.osee.framework.ui.skynet.results.XResultData; +import org.eclipse.osee.framework.ui.skynet.results.XResultDataUI; import org.eclipse.osee.framework.ui.skynet.results.html.XResultPage.Manipulations; import org.w3c.dom.Document; import org.w3c.dom.Element; @@ -173,7 +174,7 @@ public class FixTemplateContentArtifacts extends AbstractBlam { sbFull.append(AHTML.endMultiColumnTable()); XResultData rd = new XResultData(); rd.addRaw(sbFull.toString()); - rd.report("Fix bad data", Manipulations.RAW_HTML); + XResultDataUI.report(rd,"Fix bad data", Manipulations.RAW_HTML); } diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/blam/operation/ReportAttributeTypesUsageBlam.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/blam/operation/ReportAttributeTypesUsageBlam.java index 9227a3e27f7..16e3d5519d1 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/blam/operation/ReportAttributeTypesUsageBlam.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/blam/operation/ReportAttributeTypesUsageBlam.java @@ -15,13 +15,14 @@ import java.util.Collection; import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.osee.framework.core.model.Branch; import org.eclipse.osee.framework.core.model.type.AttributeType; +import org.eclipse.osee.framework.core.util.XResultData; import org.eclipse.osee.framework.jdk.core.util.AHTML; import org.eclipse.osee.framework.skynet.core.artifact.Artifact; import org.eclipse.osee.framework.skynet.core.artifact.search.ArtifactQuery; import org.eclipse.osee.framework.skynet.core.attribute.AttributeTypeManager; import org.eclipse.osee.framework.ui.skynet.blam.AbstractBlam; import org.eclipse.osee.framework.ui.skynet.blam.VariableMap; -import org.eclipse.osee.framework.ui.skynet.results.XResultData; +import org.eclipse.osee.framework.ui.skynet.results.XResultDataUI; /** * @author Donald G. Dunne @@ -47,7 +48,7 @@ public class ReportAttributeTypesUsageBlam extends AbstractBlam { xResultData.addRaw(AHTML.addRowMultiColumnTable(attributeType.getName(), String.valueOf(arts.size()))); } xResultData.addRaw(AHTML.endMultiColumnTable()); - xResultData.report(getName() + " " + branch.getName()); + XResultDataUI.report(xResultData,getName() + " " + branch.getName()); } @Override diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/blam/operation/ValidateArtifactsToDelete.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/blam/operation/ValidateArtifactsToDelete.java index b86e8332500..9137cb316d3 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/blam/operation/ValidateArtifactsToDelete.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/blam/operation/ValidateArtifactsToDelete.java @@ -15,6 +15,7 @@ import java.util.Collection; import java.util.List; import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.core.runtime.IStatus; +import org.eclipse.osee.framework.core.util.XResultData; import org.eclipse.osee.framework.logging.OseeLevel; import org.eclipse.osee.framework.logging.OseeLog; import org.eclipse.osee.framework.skynet.core.artifact.Artifact; @@ -24,7 +25,7 @@ import org.eclipse.osee.framework.skynet.core.utility.Artifacts; import org.eclipse.osee.framework.ui.skynet.SkynetGuiPlugin; import org.eclipse.osee.framework.ui.skynet.blam.AbstractBlam; import org.eclipse.osee.framework.ui.skynet.blam.VariableMap; -import org.eclipse.osee.framework.ui.skynet.results.XResultData; +import org.eclipse.osee.framework.ui.skynet.results.XResultDataUI; /** * Calls extensions to determine if artifacts are valid to delete. @@ -68,7 +69,7 @@ public class ValidateArtifactsToDelete extends AbstractBlam { } rd.log("\n"); rd.log("Validation Complete - Any errors will be displayed."); - rd.report("Validate Artifacts to Delete"); + XResultDataUI.report(rd,"Validate Artifacts to Delete"); } catch (Exception ex) { OseeLog.log(SkynetGuiPlugin.class, OseeLevel.SEVERE_POPUP, ex); } diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/dbHealth/AuthorIdCheck.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/dbHealth/AuthorIdCheck.java index 9732babfb72..a183fc69c5f 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/dbHealth/AuthorIdCheck.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/dbHealth/AuthorIdCheck.java @@ -14,6 +14,7 @@ import java.util.HashSet; import java.util.Set; import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.osee.framework.core.enums.SystemUser; +import org.eclipse.osee.framework.core.util.XResultData; import org.eclipse.osee.framework.database.core.ConnectionHandler; import org.eclipse.osee.framework.database.core.IOseeStatement; import org.eclipse.osee.framework.jdk.core.util.AHTML; @@ -21,7 +22,7 @@ import org.eclipse.osee.framework.skynet.core.UserManager; import org.eclipse.osee.framework.skynet.core.artifact.Artifact; import org.eclipse.osee.framework.skynet.core.artifact.BranchManager; import org.eclipse.osee.framework.skynet.core.artifact.search.ArtifactQuery; -import org.eclipse.osee.framework.ui.skynet.results.XResultData; +import org.eclipse.osee.framework.ui.skynet.results.XResultDataUI; /** * @author Donald G. Dunne @@ -106,7 +107,7 @@ public class AuthorIdCheck extends DatabaseHealthOperation { getSummary().append("Processed " + authors.size() + " author ids\n"); } finally { - rd.report(getName()); + XResultDataUI.report(rd,getName()); } } diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/dbHealth/DatabaseIntegrityCheckApplication.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/dbHealth/DatabaseIntegrityCheckApplication.java index 451d9d62e71..5eee2d57158 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/dbHealth/DatabaseIntegrityCheckApplication.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/dbHealth/DatabaseIntegrityCheckApplication.java @@ -22,13 +22,14 @@ import org.eclipse.equinox.app.IApplicationContext; import org.eclipse.nebula.widgets.xviewer.XViewerColumn; import org.eclipse.nebula.widgets.xviewer.XViewerColumn.SortDataType; import org.eclipse.osee.framework.core.operation.Operations; +import org.eclipse.osee.framework.core.util.XResultData; import org.eclipse.osee.framework.jdk.core.util.Lib; import org.eclipse.osee.framework.jdk.core.util.Strings; import org.eclipse.osee.framework.skynet.core.UserManager; import org.eclipse.osee.framework.ui.skynet.results.IResultsEditorProvider; import org.eclipse.osee.framework.ui.skynet.results.IResultsEditorTab; import org.eclipse.osee.framework.ui.skynet.results.ResultsEditorConverter; -import org.eclipse.osee.framework.ui.skynet.results.XResultData; +import org.eclipse.osee.framework.ui.skynet.results.XResultDataUI; import org.eclipse.osee.framework.ui.skynet.results.html.XResultPage; import org.eclipse.osee.framework.ui.skynet.results.html.XResultPage.Manipulations; import org.eclipse.osee.framework.ui.skynet.results.table.ResultsEditorTableTab; @@ -92,7 +93,7 @@ public class DatabaseIntegrityCheckApplication implements IApplication { if (Strings.isValid(detailedReport)) { XResultData result = new XResultData(); result.addRaw(detailedReport.toString()); - XResultPage page = result.getReport(operation.getName(), Manipulations.RAW_HTML); + XResultPage page = XResultDataUI.getReport(result, operation.getName(), Manipulations.RAW_HTML); String fileName = generateFileName("html", operation); summaryLinks.add(fileName); diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/dbHealth/DuplicateAttributes.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/dbHealth/DuplicateAttributes.java index db63a0d05cb..2fd8ceb9eb3 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/dbHealth/DuplicateAttributes.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/dbHealth/DuplicateAttributes.java @@ -14,10 +14,11 @@ import java.util.LinkedList; import java.util.List; import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.osee.framework.core.exception.OseeCoreException; +import org.eclipse.osee.framework.core.util.XResultData; import org.eclipse.osee.framework.database.core.ConnectionHandler; import org.eclipse.osee.framework.database.core.IOseeStatement; import org.eclipse.osee.framework.jdk.core.util.AHTML; -import org.eclipse.osee.framework.ui.skynet.results.XResultData; +import org.eclipse.osee.framework.ui.skynet.results.XResultDataUI; import org.eclipse.osee.framework.ui.skynet.results.html.XResultPage.Manipulations; /** @@ -127,7 +128,7 @@ public class DuplicateAttributes extends DatabaseHealthOperation { sbFull.append(AHTML.endMultiColumnTable()); XResultData rd = new XResultData(); rd.addRaw(sbFull.toString()); - rd.report(getVerifyTaskName(), Manipulations.RAW_HTML); + XResultDataUI.report(rd,getVerifyTaskName(), Manipulations.RAW_HTML); } } diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/dbHealth/DuplicateHRID.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/dbHealth/DuplicateHRID.java index bfc4307e1b2..40a616ba41f 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/dbHealth/DuplicateHRID.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/dbHealth/DuplicateHRID.java @@ -18,11 +18,12 @@ import java.util.List; import java.util.Map; import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.osee.framework.core.exception.OseeCoreException; +import org.eclipse.osee.framework.core.util.XResultData; import org.eclipse.osee.framework.database.core.ConnectionHandler; import org.eclipse.osee.framework.database.core.IOseeStatement; import org.eclipse.osee.framework.jdk.core.util.AHTML; import org.eclipse.osee.framework.jdk.core.util.Strings; -import org.eclipse.osee.framework.ui.skynet.results.XResultData; +import org.eclipse.osee.framework.ui.skynet.results.XResultDataUI; /** * @author Megumi Telles @@ -134,7 +135,7 @@ public class DuplicateHRID extends DatabaseHealthOperation { rd.addRaw(AHTML.endMultiColumnTable()); } finally { - rd.report(getName()); + XResultDataUI.report(rd,getName()); } } diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/dbHealth/ItemsDeletedWithNoOtherModification.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/dbHealth/ItemsDeletedWithNoOtherModification.java index 9b0a92cbfc2..ff5bc13d6f9 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/dbHealth/ItemsDeletedWithNoOtherModification.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/dbHealth/ItemsDeletedWithNoOtherModification.java @@ -20,10 +20,11 @@ import org.eclipse.osee.framework.core.enums.BranchType; 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.util.XResultData; import org.eclipse.osee.framework.database.core.ConnectionHandler; import org.eclipse.osee.framework.database.core.IOseeStatement; import org.eclipse.osee.framework.jdk.core.util.AHTML; -import org.eclipse.osee.framework.ui.skynet.results.XResultData; +import org.eclipse.osee.framework.ui.skynet.results.XResultDataUI; import org.eclipse.osee.framework.ui.skynet.results.html.XResultPage.Manipulations; /** @@ -141,7 +142,7 @@ public class ItemsDeletedWithNoOtherModification extends DatabaseHealthOperation sbFull.append(AHTML.endMultiColumnTable()); XResultData rd = new XResultData(); rd.addRaw(sbFull.toString()); - rd.report(getVerifyTaskName(), Manipulations.RAW_HTML); + XResultDataUI.report(rd,getVerifyTaskName(), Manipulations.RAW_HTML); monitor.worked(calculateWork(0.10)); } diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/dbHealth/MultipleParentRelations.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/dbHealth/MultipleParentRelations.java index f40618abc4a..6b7ccd226ab 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/dbHealth/MultipleParentRelations.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/dbHealth/MultipleParentRelations.java @@ -17,11 +17,12 @@ import java.util.List; import java.util.Map; import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.osee.framework.core.exception.OseeCoreException; +import org.eclipse.osee.framework.core.util.XResultData; import org.eclipse.osee.framework.database.core.ConnectionHandler; import org.eclipse.osee.framework.database.core.IOseeStatement; import org.eclipse.osee.framework.jdk.core.util.AHTML; import org.eclipse.osee.framework.jdk.core.util.Strings; -import org.eclipse.osee.framework.ui.skynet.results.XResultData; +import org.eclipse.osee.framework.ui.skynet.results.XResultDataUI; import org.eclipse.osee.framework.ui.skynet.results.html.XResultPage.Manipulations; /** @@ -173,7 +174,7 @@ public class MultipleParentRelations extends DatabaseHealthOperation { sbFull.append(AHTML.endMultiColumnTable()); XResultData rd = new XResultData(); rd.addRaw(sbFull.toString()); - rd.report(getVerifyTaskName(), Manipulations.RAW_HTML); + XResultDataUI.report(rd,getVerifyTaskName(), Manipulations.RAW_HTML); sbFull = new StringBuffer(AHTML.beginMultiColumnTable(100, 1)); sbFull.append(AHTML.beginMultiColumnTable(100, 1)); @@ -182,7 +183,7 @@ public class MultipleParentRelations extends DatabaseHealthOperation { sbFull.append(AHTML.endMultiColumnTable()); rd = new XResultData(); rd.addRaw(sbFull.toString()); - rd.report(getVerifyTaskName() + " Verbose", Manipulations.RAW_HTML); + XResultDataUI.report(rd,getVerifyTaskName() + " Verbose", Manipulations.RAW_HTML); } //{"Rel Link ID 1", "Rel Link ID 2", "Parent Art ID 1", "Parent Art ID 2", "Child Art ID", diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/dbHealth/RelationIntegrityCheck.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/dbHealth/RelationIntegrityCheck.java index f90aa5f9021..f7262cb735d 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/dbHealth/RelationIntegrityCheck.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/dbHealth/RelationIntegrityCheck.java @@ -19,11 +19,12 @@ import org.eclipse.core.runtime.IProgressMonitor; 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.util.XResultData; import org.eclipse.osee.framework.database.core.ConnectionHandler; import org.eclipse.osee.framework.database.core.IOseeStatement; import org.eclipse.osee.framework.jdk.core.type.DoubleKeyHashMap; import org.eclipse.osee.framework.jdk.core.util.AHTML; -import org.eclipse.osee.framework.ui.skynet.results.XResultData; +import org.eclipse.osee.framework.ui.skynet.results.XResultDataUI; import org.eclipse.osee.framework.ui.skynet.results.html.XResultPage.Manipulations; /** @@ -277,7 +278,7 @@ public class RelationIntegrityCheck extends DatabaseHealthOperation { sbFull.append(AHTML.endMultiColumnTable()); XResultData rd = new XResultData(); rd.addRaw(sbFull.toString()); - rd.report(getVerifyTaskName(), Manipulations.RAW_HTML); + XResultDataUI.report(rd,getVerifyTaskName(), Manipulations.RAW_HTML); monitor.worked(calculateWork(0.10)); } diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/notify/OseeNotifyUsersJob.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/notify/OseeNotifyUsersJob.java index 1b7c556d7bc..31fb4153b40 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/notify/OseeNotifyUsersJob.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/notify/OseeNotifyUsersJob.java @@ -24,13 +24,13 @@ import org.eclipse.core.runtime.jobs.Job; import org.eclipse.osee.framework.core.enums.SystemUser; import org.eclipse.osee.framework.core.exception.OseeCoreException; import org.eclipse.osee.framework.core.model.IBasicUser; +import org.eclipse.osee.framework.core.util.XResultData; import org.eclipse.osee.framework.jdk.core.util.AHTML; import org.eclipse.osee.framework.jdk.core.util.Strings; import org.eclipse.osee.framework.logging.OseeLevel; import org.eclipse.osee.framework.logging.OseeLog; import org.eclipse.osee.framework.skynet.core.UserManager; import org.eclipse.osee.framework.ui.skynet.SkynetGuiPlugin; -import org.eclipse.osee.framework.ui.skynet.results.XResultData; import org.eclipse.osee.framework.ui.skynet.util.OseeEmail; import org.eclipse.osee.framework.ui.skynet.util.OseeEmail.BodyType; import org.eclipse.osee.framework.ui.skynet.util.email.EmailUtil; diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/results/XResultData.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/results/XResultData.java deleted file mode 100644 index 6de0782d2ad..00000000000 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/results/XResultData.java +++ /dev/null @@ -1,310 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2004, 2007 Boeing. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Boeing - initial API and implementation - *******************************************************************************/ - -package org.eclipse.osee.framework.ui.skynet.results; - -import java.util.List; -import java.util.concurrent.CopyOnWriteArrayList; -import java.util.logging.Level; -import java.util.regex.Pattern; -import org.eclipse.core.runtime.IProgressMonitor; -import org.eclipse.osee.framework.core.exception.OseeCoreException; -import org.eclipse.osee.framework.jdk.core.type.CountingMap; -import org.eclipse.osee.framework.jdk.core.util.AHTML; -import org.eclipse.osee.framework.jdk.core.util.DateUtil; -import org.eclipse.osee.framework.jdk.core.util.Lib; -import org.eclipse.osee.framework.logging.IHealthStatus; -import org.eclipse.osee.framework.logging.OseeLevel; -import org.eclipse.osee.framework.logging.OseeLog; -import org.eclipse.osee.framework.logging.SevereLoggingMonitor; -import org.eclipse.osee.framework.skynet.core.UserManager; -import org.eclipse.osee.framework.skynet.core.artifact.Artifact; -import org.eclipse.osee.framework.skynet.core.artifact.BranchManager; -import org.eclipse.osee.framework.ui.skynet.SkynetGuiPlugin; -import org.eclipse.osee.framework.ui.skynet.results.html.XResultBrowserHyperCmd; -import org.eclipse.osee.framework.ui.skynet.results.html.XResultPage; -import org.eclipse.osee.framework.ui.skynet.results.html.XResultPage.Manipulations; -import org.eclipse.osee.framework.ui.swt.Displays; - -/** - * Used to log Info, Warning and Errors to multiple locations (logger, stderr/out and XResultView). Upon completion, a - * call to report(title) will open results in the ResultsView - * - * @author Donald G. Dunne - */ -public final class XResultData { - - public static final Pattern ErrorPattern = Pattern.compile("Error: "); - public static final Pattern WarningPattern = Pattern.compile("Warning: "); - - private static enum Type { - Severe, - Warning, - Info; - } - - private StringBuffer sb; - private CountingMap<Type> count; - - private boolean enableOseeLog; - - public XResultData() { - this(true); - } - - public XResultData(boolean enableOseeLog) { - super(); - this.enableOseeLog = enableOseeLog; - clear(); - } - - public void clear() { - sb = new StringBuffer(); - count = new CountingMap<Type>(); - } - - public void addRaw(String str) { - sb.append(str); - } - - public void reportSevereLoggingMonitor(SevereLoggingMonitor monitorLog) { - List<IHealthStatus> stats = monitorLog.getAllLogs(); - for (IHealthStatus stat : new CopyOnWriteArrayList<IHealthStatus>(stats)) { - if (stat.getException() != null) { - logError("Exception: " + Lib.exceptionToString(stat.getException())); - } - } - } - - public void log(IProgressMonitor monitor, String str) { - log(str); - if (monitor != null) { - monitor.setTaskName(str); - } - } - - public void log(String str) { - logStr(Type.Info, str + "\n", null); - } - - public void logWithFormat(String formatStr, Object... objs) { - logStr(Type.Info, String.format(formatStr, objs), null); - } - - public void log(String str, IProgressMonitor monitor) { - logStr(Type.Info, str + "\n", monitor); - } - - public void logError(String str) { - logStr(Type.Severe, str + "\n", null); - } - - public void logErrorWithFormat(String formatStr, Object... objs) { - logStr(Type.Severe, String.format(formatStr + "\n", objs), null); - } - - public void logWarning(String str) { - logStr(Type.Warning, str + "\n", null); - } - - public void logWarningWithFormat(String formatStr, Object... objs) { - logStr(Type.Warning, String.format(formatStr + "\n", objs), null); - } - - public boolean isEmpty() { - return toString().equals(""); - } - - public void logStr(Type type, final String str, final IProgressMonitor monitor) { - count.put(type); - String resultStr = ""; - if (type == Type.Warning) { - resultStr = "Warning: " + str; - } else if (type == Type.Severe) { - resultStr = "Error: " + str; - } else { - resultStr = str; - } - sb.append(resultStr); - if (enableOseeLog) { - OseeLog.log(SkynetGuiPlugin.class, Level.parse(type.name().toUpperCase()), resultStr); - } - if (monitor != null) { - Displays.ensureInDisplayThread(new Runnable() { - @Override - public void run() { - monitor.subTask(str); - } - }); - } - } - - @Override - public String toString() { - return sb.toString(); - } - - public void report(final String title) { - report(title, Manipulations.ALL); - } - - public void report(final String title, final Manipulations... manipulations) { - final String html = getReport(title, manipulations).getManipulatedHtml(); - ResultsEditor.open("Results", title, html); - } - - public XResultPage getReport(final String title) { - return getReport(title, Manipulations.ALL); - } - - public XResultPage getReport(final String title, Manipulations... manipulations) { - return new XResultPage(title + " - " + DateUtil.getMMDDYYHHMM(), - (sb.toString().equals("") ? "Nothing Logged" : sb.toString()), manipulations); - } - - /* - * Creates hyperlink using hrid as name. Default editor will open. - */ - public static String getHyperlink(Artifact art) { - return getHyperlink(art.getHumanReadableId(), art.getHumanReadableId(), art.getBranch().getId()); - } - - public static String getHyperlinkWithName(Artifact art) { - return getHyperlink(art.toStringWithId(), art.getHumanReadableId(), art.getBranch().getId()); - } - - /* - * Creates hyperlink using name. Default editor will open. - */ - public static String getHyperlink(String name, Artifact art) { - return getHyperlink(name, art.getHumanReadableId(), art.getBranch().getId()); - } - - /* - * Creates hyperlink using name. Default editor will open hrid for branchId given - */ - public static String getHyperlink(String name, String hrid, int branchId) { - return AHTML.getHyperlink( - XResultBrowserHyperCmd.getHyperCmdStr(XResultBrowserHyperCmd.openArtifactBranch, hrid + "(" + branchId + ")"), - name); - } - - public static String getHyperlinkUrlExternal(String name, String url) { - return AHTML.getHyperlink(XResultBrowserHyperCmd.getHyperCmdStr(XResultBrowserHyperCmd.browserExternal, url), - name); - } - - public static String getHyperlinkUrlInternal(String name, String url) { - return AHTML.getHyperlink(XResultBrowserHyperCmd.getHyperCmdStr(XResultBrowserHyperCmd.browserInternal, url), - name); - } - - public static String getHyperlinkForArtifactEditor(String name, String hrid) { - return AHTML.getHyperlink(XResultBrowserHyperCmd.getHyperCmdStr(XResultBrowserHyperCmd.openArtifactEditor, hrid), - name); - } - - public static String getHyperlinkForAction(String name, String hrid) { - return AHTML.getHyperlink(XResultBrowserHyperCmd.getHyperCmdStr(XResultBrowserHyperCmd.openAction, hrid), name); - } - - public static String getHyperlinkForAction(Artifact artifact) { - return getHyperlinkForAction(artifact.getHumanReadableId(), artifact); - } - - public static String getHyperlinkForAction(String name, Artifact art) { - return AHTML.getHyperlink( - XResultBrowserHyperCmd.getHyperCmdStr(XResultBrowserHyperCmd.openAction, art.getGuid()), name); - } - - private int getCount(Type type) { - return count.get(type); - } - - public int getNumErrors() { - return getCount(Type.Severe); - } - - /** - * XResultData counts number of errors logged with logError, however users can insert their own "Error: " strings to - * produce errors. This counts based on these occurences. - */ - public int getNumErrorsViaSearch() { - return Lib.getMatcherCount(ErrorPattern, sb.toString()); - } - - /** - * XResultData counts number of warnings logged with logWarning, however users can insert their own "Error: " strings - * to produce errors. This counts based on these occurences. - */ - public int getNumWarningsViaSearch() { - return Lib.getMatcherCount(WarningPattern, sb.toString()); - } - - public int getNumWarnings() { - return getCount(Type.Warning); - } - - public boolean isEnableOseeLog() { - return enableOseeLog; - } - - public void setEnableOseeLog(boolean enableOseeLog) { - this.enableOseeLog = enableOseeLog; - } - - public static void runExample() { - runExample("This is my report title"); - } - - public static void runExample(String title) { - try { - XResultData rd = new XResultData(); - rd.log("This is just a normal log message"); - rd.logWarning("This is a warning"); - rd.logError("This is an error"); - - rd.log("\n\nExample of hyperlinked hrid: " + XResultData.getHyperlink(UserManager.getUser())); - - rd.log("Example of hyperlinked artifact different hyperlink string: " + XResultData.getHyperlink( - "Different string", UserManager.getUser())); - - rd.log("Example of hyperlinked hrid on another branch: " + getHyperlink( - UserManager.getUser().getHumanReadableId(), UserManager.getUser().getHumanReadableId(), - BranchManager.getCommonBranch().getId())); - rd.addRaw(AHTML.newline()); - rd.addRaw("Example of hyperlink that opens external browser " + getHyperlinkUrlExternal("Google", - "http://www.google.com") + AHTML.newline()); - rd.addRaw("Example of hyperlink that opens internal browser " + getHyperlinkUrlInternal("Google", - "http://www.google.com") + AHTML.newline()); - - rd.log("\n\nHere is a nice table"); - rd.addRaw(AHTML.beginMultiColumnTable(95, 1)); - rd.addRaw(AHTML.addHeaderRowMultiColumnTable(new String[] {"Type", "Title", "Status"})); - for (int x = 0; x < 3; x++) { - rd.addRaw(AHTML.addRowMultiColumnTable(new String[] {"Type " + x, "Title " + x, x + ""})); - } - rd.addRaw(AHTML.addRowMultiColumnTable(new String[] { - "Error / Warning in table ", - "Error: this is error", - "Warning: this is warning"})); - rd.addRaw(AHTML.endMultiColumnTable()); - rd.report("This is my report title"); - } catch (OseeCoreException ex) { - OseeLog.log(SkynetGuiPlugin.class, OseeLevel.SEVERE_POPUP, ex); - } - } - - public boolean isErrors() { - return getNumErrors() > 0; - } - -} diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/results/XResultDataLoggerListener.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/results/XResultDataLoggerListener.java new file mode 100644 index 00000000000..aadfbea2b66 --- /dev/null +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/results/XResultDataLoggerListener.java @@ -0,0 +1,26 @@ +/* + * Created on May 20, 2011 + * + * PLACE_YOUR_DISTRIBUTION_STATEMENT_RIGHT_HERE + */ +package org.eclipse.osee.framework.ui.skynet.results; + +import java.util.logging.Level; +import org.eclipse.osee.framework.core.util.IResultDataListener; +import org.eclipse.osee.framework.core.util.XResultData; +import org.eclipse.osee.framework.logging.OseeLog; +import org.eclipse.osee.framework.ui.skynet.SkynetGuiPlugin; + +/** + * Added to XResultData if desire results to be OseeLog + * + * @author Donald G. Dunne + */ +public class XResultDataLoggerListener implements IResultDataListener { + + @Override + public void log(final XResultData.Type type, final String str) { + OseeLog.log(SkynetGuiPlugin.class, Level.parse(type.name().toUpperCase()), str); + } + +} diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/results/XResultDataMonitorListener.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/results/XResultDataMonitorListener.java new file mode 100644 index 00000000000..95195231aa2 --- /dev/null +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/results/XResultDataMonitorListener.java @@ -0,0 +1,39 @@ +/* + * Created on May 20, 2011 + * + * PLACE_YOUR_DISTRIBUTION_STATEMENT_RIGHT_HERE + */ +package org.eclipse.osee.framework.ui.skynet.results; + +import org.eclipse.core.runtime.IProgressMonitor; +import org.eclipse.osee.framework.core.util.IResultDataListener; +import org.eclipse.osee.framework.core.util.XResultData; +import org.eclipse.osee.framework.ui.swt.Displays; + +/** + * Added to XResultData if desire results to be output to monitor + * + * @author Donald G. Dunne + */ +public class XResultDataMonitorListener implements IResultDataListener { + + private final IProgressMonitor monitor; + + public XResultDataMonitorListener(final IProgressMonitor monitor) { + this.monitor = monitor; + } + + @Override + public void log(XResultData.Type type, final String str) { + if (monitor != null) { + Displays.ensureInDisplayThread(new Runnable() { + @Override + public void run() { + monitor.subTask(str); + } + }); + } + + } + +} diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/results/XResultDataUI.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/results/XResultDataUI.java new file mode 100644 index 00000000000..6f440694403 --- /dev/null +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/results/XResultDataUI.java @@ -0,0 +1,142 @@ +/* + * Created on May 20, 2011 + * + * PLACE_YOUR_DISTRIBUTION_STATEMENT_RIGHT_HERE + */ +package org.eclipse.osee.framework.ui.skynet.results; + +import org.eclipse.osee.framework.core.exception.OseeCoreException; +import org.eclipse.osee.framework.core.util.XResultData; +import org.eclipse.osee.framework.jdk.core.util.AHTML; +import org.eclipse.osee.framework.jdk.core.util.DateUtil; +import org.eclipse.osee.framework.logging.OseeLevel; +import org.eclipse.osee.framework.logging.OseeLog; +import org.eclipse.osee.framework.skynet.core.UserManager; +import org.eclipse.osee.framework.skynet.core.artifact.Artifact; +import org.eclipse.osee.framework.skynet.core.artifact.BranchManager; +import org.eclipse.osee.framework.ui.skynet.SkynetGuiPlugin; +import org.eclipse.osee.framework.ui.skynet.results.html.XResultBrowserHyperCmd; +import org.eclipse.osee.framework.ui.skynet.results.html.XResultPage; +import org.eclipse.osee.framework.ui.skynet.results.html.XResultPage.Manipulations; + +/** + * @author Donald G. Dunne + */ +public class XResultDataUI { + + /* + * Creates hyperlink using name. Default editor will open hrid for branchId given + */ + public static String getHyperlink(String name, String hrid, int branchId) { + return AHTML.getHyperlink( + XResultBrowserHyperCmd.getHyperCmdStr(XResultBrowserHyperCmd.openArtifactBranch, hrid + "(" + branchId + ")"), + name); + } + + public static String getHyperlinkUrlExternal(String name, String url) { + return AHTML.getHyperlink(XResultBrowserHyperCmd.getHyperCmdStr(XResultBrowserHyperCmd.browserExternal, url), + name); + } + + public static String getHyperlinkUrlInternal(String name, String url) { + return AHTML.getHyperlink(XResultBrowserHyperCmd.getHyperCmdStr(XResultBrowserHyperCmd.browserInternal, url), + name); + } + + public static String getHyperlinkForArtifactEditor(String name, String hrid) { + return AHTML.getHyperlink(XResultBrowserHyperCmd.getHyperCmdStr(XResultBrowserHyperCmd.openArtifactEditor, hrid), + name); + } + + public static String getHyperlinkForAction(String name, String hrid) { + return AHTML.getHyperlink(XResultBrowserHyperCmd.getHyperCmdStr(XResultBrowserHyperCmd.openAction, hrid), name); + } + + public static String getHyperlinkForAction(Artifact artifact) { + return getHyperlinkForAction(artifact.getHumanReadableId(), artifact); + } + + public static String getHyperlinkForAction(String name, Artifact art) { + return AHTML.getHyperlink( + XResultBrowserHyperCmd.getHyperCmdStr(XResultBrowserHyperCmd.openAction, art.getGuid()), name); + } + + /* + * Creates hyperlink using hrid as name. Default editor will open. + */ + public static String getHyperlink(Artifact art) { + return getHyperlink(art.getHumanReadableId(), art.getHumanReadableId(), art.getBranch().getId()); + } + + public static String getHyperlinkWithName(Artifact art) { + return getHyperlink(art.toStringWithId(), art.getHumanReadableId(), art.getBranch().getId()); + } + + /* + * Creates hyperlink using name. Default editor will open. + */ + public static String getHyperlink(String name, Artifact art) { + return getHyperlink(name, art.getHumanReadableId(), art.getBranch().getId()); + } + + public static void report(XResultData resultData, final String title) { + report(resultData, title, Manipulations.ALL); + } + + public static void report(XResultData resultData, final String title, final Manipulations... manipulations) { + final String html = getReport(resultData, title, manipulations).getManipulatedHtml(); + ResultsEditor.open("Results", title, html); + } + + public static XResultPage getReport(XResultData resultData, final String title) { + return getReport(resultData, title, Manipulations.ALL); + } + + public static XResultPage getReport(XResultData resultData, final String title, Manipulations... manipulations) { + return new XResultPage(title + " - " + DateUtil.getMMDDYYHHMM(), + (resultData.toString().equals("") ? "Nothing Logged" : resultData.toString()), manipulations); + } + + public static void runExample() { + runExample("This is my report title"); + } + + public static void runExample(String title) { + try { + XResultData rd = new XResultData(); + rd.log("This is just a normal log message"); + rd.logWarning("This is a warning"); + rd.logError("This is an error"); + + rd.log("\n\nExample of hyperlinked hrid: " + getHyperlink(UserManager.getUser())); + + rd.log("Example of hyperlinked artifact different hyperlink string: " + getHyperlink("Different string", + UserManager.getUser())); + + rd.log("Example of hyperlinked hrid on another branch: " + getHyperlink( + UserManager.getUser().getHumanReadableId(), UserManager.getUser().getHumanReadableId(), + BranchManager.getCommonBranch().getId())); + rd.addRaw(AHTML.newline()); + rd.addRaw("Example of hyperlink that opens external browser " + getHyperlinkUrlExternal("Google", + "http://www.google.com") + AHTML.newline()); + rd.addRaw("Example of hyperlink that opens internal browser " + getHyperlinkUrlInternal("Google", + "http://www.google.com") + AHTML.newline()); + + rd.log("\n\nHere is a nice table"); + rd.addRaw(AHTML.beginMultiColumnTable(95, 1)); + rd.addRaw(AHTML.addHeaderRowMultiColumnTable(new String[] {"Type", "Title", "Status"})); + for (int x = 0; x < 3; x++) { + rd.addRaw(AHTML.addRowMultiColumnTable(new String[] {"Type " + x, "Title " + x, x + ""})); + } + rd.addRaw(AHTML.addRowMultiColumnTable(new String[] { + "Error / Warning in table ", + "Error: this is error", + "Warning: this is warning"})); + rd.addRaw(AHTML.endMultiColumnTable()); + report(rd, "This is my report title"); + } catch (OseeCoreException ex) { + OseeLog.log(SkynetGuiPlugin.class, OseeLevel.SEVERE_POPUP, ex); + } + } + +} diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/results/example/XResultDataExample.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/results/example/XResultDataExample.java index 5aad8bdb0b8..1c796d3c672 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/results/example/XResultDataExample.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/results/example/XResultDataExample.java @@ -14,7 +14,7 @@ import org.eclipse.osee.framework.ui.plugin.PluginUiImage; import org.eclipse.osee.framework.ui.plugin.xnavigate.XNavigateComposite.TableLoadOption; import org.eclipse.osee.framework.ui.plugin.xnavigate.XNavigateItem; import org.eclipse.osee.framework.ui.plugin.xnavigate.XNavigateItemAction; -import org.eclipse.osee.framework.ui.skynet.results.XResultData; +import org.eclipse.osee.framework.ui.skynet.results.XResultDataUI; /** * @author Donald G. Dunne @@ -29,7 +29,7 @@ public final class XResultDataExample extends XNavigateItemAction { @Override public void run(TableLoadOption... tableLoadOptions) throws Exception { - XResultData.runExample(); + XResultDataUI.runExample(); } } diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/results/html/XResultPage.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/results/html/XResultPage.java index 9a6f6382224..e8390f76cb5 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/results/html/XResultPage.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/results/html/XResultPage.java @@ -23,7 +23,7 @@ import org.eclipse.osee.framework.jdk.core.util.Lib; import org.eclipse.osee.framework.logging.OseeLevel; import org.eclipse.osee.framework.logging.OseeLog; import org.eclipse.osee.framework.ui.skynet.SkynetGuiPlugin; -import org.eclipse.osee.framework.ui.skynet.results.XResultData; +import org.eclipse.osee.framework.ui.skynet.results.XResultDataUI; import org.eclipse.osee.framework.ui.skynet.widgets.dialog.Dialogs; import org.eclipse.swt.program.Program; @@ -178,14 +178,14 @@ public class XResultPage { String hrid = value; hrid = hrid.replaceAll("^.*:", ""); if (cmdNameHrid.startsWith(HyperType.BOTH.name())) { - String replaceStr = hrid + " (" + XResultData.getHyperlinkForAction("ATS-" + name, hrid); - replaceStr += " " + XResultData.getHyperlinkForArtifactEditor("AE-" + name, hrid); + String replaceStr = hrid + " (" + XResultDataUI.getHyperlinkForAction("ATS-" + name, hrid); + replaceStr += " " + XResultDataUI.getHyperlinkForArtifactEditor("AE-" + name, hrid); replaceStr += ")"; str = str.replaceAll(cmdNameHrid, replaceStr); } else if (cmdNameHrid.startsWith(HyperType.ATS.name())) { - str = str.replaceAll(cmdNameHrid, XResultData.getHyperlinkForAction(name, hrid)); + str = str.replaceAll(cmdNameHrid, XResultDataUI.getHyperlinkForAction(name, hrid)); } else if (cmdNameHrid.startsWith(HyperType.ART.name())) { - str = str.replaceAll(cmdNameHrid, XResultData.getHyperlinkForArtifactEditor(name, hrid)); + str = str.replaceAll(cmdNameHrid, XResultDataUI.getHyperlinkForArtifactEditor(name, hrid)); } } // Retrieve all ATS=HRSID matches and replace with hyperlinking @@ -198,14 +198,14 @@ public class XResultPage { String hrid = cmdHrid; hrid = hrid.replaceAll("^.*?=", ""); if (cmdHrid.startsWith(HyperType.BOTH.name())) { - String replaceStr = hrid + " (" + XResultData.getHyperlinkForAction("ATS", hrid); - replaceStr += " " + XResultData.getHyperlinkForArtifactEditor("AE", hrid); + String replaceStr = hrid + " (" + XResultDataUI.getHyperlinkForAction("ATS", hrid); + replaceStr += " " + XResultDataUI.getHyperlinkForArtifactEditor("AE", hrid); replaceStr += ")"; str = str.replaceAll(cmdHrid, replaceStr); } else if (cmdHrid.startsWith(HyperType.ATS.name())) { - str = str.replaceAll(cmdHrid, XResultData.getHyperlinkForAction(hrid, hrid)); + str = str.replaceAll(cmdHrid, XResultDataUI.getHyperlinkForAction(hrid, hrid)); } else if (cmdHrid.startsWith(HyperType.ART.name())) { - str = str.replaceAll(cmdHrid, XResultData.getHyperlinkForArtifactEditor(hrid, hrid)); + str = str.replaceAll(cmdHrid, XResultDataUI.getHyperlinkForArtifactEditor(hrid, hrid)); } } } diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/util/WordUiUtil.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/util/WordUiUtil.java index 63115258f59..6bb35a2002c 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/util/WordUiUtil.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/util/WordUiUtil.java @@ -12,12 +12,13 @@ package org.eclipse.osee.framework.ui.skynet.util; import java.util.Collection; import java.util.logging.Level; +import org.eclipse.osee.framework.core.util.XResultData; import org.eclipse.osee.framework.jdk.core.util.AHTML; import org.eclipse.osee.framework.logging.OseeLog; import org.eclipse.osee.framework.skynet.core.artifact.Artifact; import org.eclipse.osee.framework.ui.skynet.SkynetGuiPlugin; import org.eclipse.osee.framework.ui.skynet.render.RenderingUtil; -import org.eclipse.osee.framework.ui.skynet.results.XResultData; +import org.eclipse.osee.framework.ui.skynet.results.XResultDataUI; import org.eclipse.osee.framework.ui.swt.Displays; /** @@ -38,11 +39,11 @@ public final class WordUiUtil { for (Artifact artifact : artifacts) { rd.addRaw(AHTML.addRowMultiColumnTable(new String[] { artifact.toString(), - XResultData.getHyperlink(artifact)})); + XResultDataUI.getHyperlink(artifact)})); } rd.addRaw(AHTML.endMultiColumnTable()); if (RenderingUtil.arePopupsAllowed()) { - rd.report("Unhandled Artifacts"); + XResultDataUI.report(rd, "Unhandled Artifacts"); } else { OseeLog.log(SkynetGuiPlugin.class, Level.INFO, String.format("Test - Skip Unhandled Artifacts Report - %s - [%s]", warningString, artifacts)); diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/dialog/EntryDialog.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/dialog/EntryDialog.java index 2063bec9b1f..0f23062508d 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/dialog/EntryDialog.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/dialog/EntryDialog.java @@ -15,9 +15,10 @@ import java.text.ParseException; import java.util.ArrayList; import java.util.List; import org.eclipse.jface.dialogs.MessageDialog; +import org.eclipse.osee.framework.core.util.XResultData; import org.eclipse.osee.framework.jdk.core.util.Strings; import org.eclipse.osee.framework.ui.plugin.util.IShellCloseEvent; -import org.eclipse.osee.framework.ui.skynet.results.XResultData; +import org.eclipse.osee.framework.ui.skynet.results.XResultDataUI; import org.eclipse.osee.framework.ui.skynet.widgets.XText; import org.eclipse.osee.framework.ui.swt.Displays; import org.eclipse.osee.framework.ui.swt.FontManager; @@ -116,7 +117,7 @@ public class EntryDialog extends MessageDialog { public void handleEvent(Event event) { XResultData resultData = new XResultData(); resultData.addRaw(entryText); - resultData.report(dialogTitle); + XResultDataUI.report(resultData,dialogTitle); close(); } }); diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xviewer/OseeXViewerTreeReport.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xviewer/OseeXViewerTreeReport.java index ef9e3890be5..b1599e65fe3 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xviewer/OseeXViewerTreeReport.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xviewer/OseeXViewerTreeReport.java @@ -13,10 +13,11 @@ package org.eclipse.osee.framework.ui.skynet.widgets.xviewer; import org.eclipse.nebula.widgets.xviewer.XViewer; import org.eclipse.nebula.widgets.xviewer.XViewerTreeReport; +import org.eclipse.osee.framework.core.util.XResultData; import org.eclipse.osee.framework.logging.OseeLevel; import org.eclipse.osee.framework.logging.OseeLog; import org.eclipse.osee.framework.ui.skynet.SkynetGuiPlugin; -import org.eclipse.osee.framework.ui.skynet.results.XResultData; +import org.eclipse.osee.framework.ui.skynet.results.XResultDataUI; import org.eclipse.osee.framework.ui.skynet.results.html.XResultPage.Manipulations; import org.eclipse.swt.widgets.TreeItem; @@ -36,7 +37,7 @@ public class OseeXViewerTreeReport extends XViewerTreeReport { String html = getHtml(items); XResultData xResultData = new XResultData(); xResultData.addRaw(html); - xResultData.report(title, Manipulations.RAW_HTML); + XResultDataUI.report(xResultData, title, Manipulations.RAW_HTML); } catch (Exception ex) { OseeLog.log(SkynetGuiPlugin.class, OseeLevel.SEVERE_POPUP, ex); } |