diff options
Diffstat (limited to 'plugins/org.eclipse.osee.coverage')
3 files changed, 21 insertions, 11 deletions
diff --git a/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/editor/CoverageEditor.java b/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/editor/CoverageEditor.java index 35725d97c73..c2004b77dbf 100644 --- a/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/editor/CoverageEditor.java +++ b/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/editor/CoverageEditor.java @@ -38,7 +38,6 @@ import org.eclipse.osee.framework.logging.OseeLog; import org.eclipse.osee.framework.plugin.core.IActionable; import org.eclipse.osee.framework.skynet.core.artifact.Artifact; import org.eclipse.osee.framework.skynet.core.relation.RelationManager; -import org.eclipse.osee.framework.skynet.core.utility.ElapsedTime; import org.eclipse.osee.framework.ui.plugin.OseeUiActions; import org.eclipse.osee.framework.ui.plugin.util.AWorkbench; import org.eclipse.osee.framework.ui.plugin.util.HelpUtil; @@ -101,11 +100,13 @@ public class CoverageEditor extends FormEditor implements IActionable { @Override protected void doWork(IProgressMonitor monitor) throws Exception { + monitor.beginTask("Load Coverage", 3); + monitor.worked(1); @SuppressWarnings("unused") Collection<Artifact> artifactLoadCache = null; if (getCoverageEditorInput().getCoveragePackageArtifact() != null) { try { - ElapsedTime elapsedTime = new ElapsedTime("Coverage - bulk load"); + // ElapsedTime elapsedTime = new ElapsedTime("Coverage - bulk load"); artifactLoadCache = RelationManager.getRelatedArtifacts( Collections.singleton(getCoverageEditorInput().getCoveragePackageArtifact()), 8, @@ -113,17 +114,26 @@ public class CoverageEditor extends FormEditor implements IActionable { // TODO Need to bulk load binary attributes also; Some Coverage Items are binary attributes // that are not bulk loaded with attributes. This was mitigated by moving test units to seperate table // and only referencing their ids in Coverage Items. - elapsedTime.end(); + // elapsedTime.end(); } catch (OseeCoreException ex) { OseeLog.log(Activator.class, Level.SEVERE, ex); } } if (getCoverageEditorInput().getCoveragePackageArtifact() != null) { - ElapsedTime elapsedTime = new ElapsedTime("Coverage - load model"); + // ElapsedTime elapsedTime = new ElapsedTime("Coverage - load model"); CoveragePackage coveragePackage = OseeCoveragePackageStore.get(getCoverageEditorInput().getCoveragePackageArtifact()); + if (monitor.isCanceled()) { + return; + } + monitor.worked(1); getCoverageEditorInput().setCoveragePackageBase(coveragePackage); - elapsedTime.end(); + if (monitor.isCanceled()) { + return; + } + monitor.worked(1); + + // elapsedTime.end(); } if (getCoverageEditorInput().isInTest()) { diff --git a/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/store/DbWorkProductTaskProvider.java b/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/store/DbWorkProductTaskProvider.java index d5ce0c74c80..ce179b5163d 100644 --- a/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/store/DbWorkProductTaskProvider.java +++ b/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/store/DbWorkProductTaskProvider.java @@ -12,9 +12,7 @@ package org.eclipse.osee.coverage.store; import java.util.ArrayList; import java.util.Collection; -import java.util.HashMap; import java.util.List; -import java.util.Map; import java.util.logging.Level; import org.eclipse.osee.coverage.internal.Activator; import org.eclipse.osee.coverage.model.CoveragePackage; @@ -36,7 +34,6 @@ public class DbWorkProductTaskProvider implements IWorkProductTaskProvider { private CoveragePackage coveragePackage; private final Branch branch; List<WorkProductAction> actions = new ArrayList<WorkProductAction>(); - Map<String, WorkProductTask> guidToTasks = new HashMap<String, WorkProductTask>(); public DbWorkProductTaskProvider(Branch branch) { this.branch = branch; @@ -50,7 +47,6 @@ public class DbWorkProductTaskProvider implements IWorkProductTaskProvider { @Override public void reload() { actions.clear(); - guidToTasks.clear(); try { OseeCoveragePackageStore store = OseeCoveragePackageStore.get(coveragePackage, branch); IOseeCmService cm = SkynetGuiPlugin.getInstance().getOseeCmService(); diff --git a/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/store/OseeCoveragePackageStore.java b/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/store/OseeCoveragePackageStore.java index 5ff3e13e64b..cd36419caf9 100644 --- a/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/store/OseeCoveragePackageStore.java +++ b/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/store/OseeCoveragePackageStore.java @@ -98,6 +98,10 @@ public class OseeCoveragePackageStore extends OseeCoverageStore implements ISave public void loadWorkProductTaskNames(Collection<? extends ICoverage> coverages) { this.coveragePackage.getWorkProductTaskProvider().reload(); + loadWorkProductTaskNamesHelper(coverages); + } + + private void loadWorkProductTaskNamesHelper(Collection<? extends ICoverage> coverages) { for (ICoverage coverage : coverages) { if (coverage instanceof IWorkProductRelatable) { if (Strings.isValid(((IWorkProductRelatable) coverage).getWorkProductTaskGuid())) { @@ -106,10 +110,10 @@ public class OseeCoveragePackageStore extends OseeCoverageStore implements ISave } } if (coverage instanceof ICoverageUnitProvider) { - loadWorkProductTaskNames(((ICoverageUnitProvider) coverage).getCoverageUnits()); + loadWorkProductTaskNamesHelper(((ICoverageUnitProvider) coverage).getCoverageUnits()); } if (coverage instanceof ICoverageItemProvider) { - loadWorkProductTaskNames(((ICoverageItemProvider) coverage).getCoverageItems()); + loadWorkProductTaskNamesHelper(((ICoverageItemProvider) coverage).getCoverageItems()); } } } |