Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRyan D. Brooks2011-02-17 22:16:02 +0000
committerRyan D. Brooks2011-02-17 22:16:02 +0000
commitbced99a8533a7cc33fd61732df906d761eb91b9d (patch)
treef37f9f263f87988b7d923a00b2f99e213e5ab3be /plugins
parent0e556afb330218182dc25a6ed9afce8c917d7269 (diff)
downloadorg.eclipse.osee-bced99a8533a7cc33fd61732df906d761eb91b9d.tar.gz
org.eclipse.osee-bced99a8533a7cc33fd61732df906d761eb91b9d.tar.xz
org.eclipse.osee-bced99a8533a7cc33fd61732df906d761eb91b9d.zip
refactor: Make RenderingUtil.ensureRenderFolderExists private
Diffstat (limited to 'plugins')
-rw-r--r--plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/operation/ExportChangeReportOperation.java16
-rw-r--r--plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/render/RenderingUtil.java2
2 files changed, 13 insertions, 5 deletions
diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/operation/ExportChangeReportOperation.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/operation/ExportChangeReportOperation.java
index 6587c06ecc4..65ca0f67b52 100644
--- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/operation/ExportChangeReportOperation.java
+++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/operation/ExportChangeReportOperation.java
@@ -10,6 +10,9 @@
*******************************************************************************/
package org.eclipse.osee.ats.operation;
+import static org.eclipse.osee.framework.ui.skynet.render.IRenderer.NO_DISPLAY;
+import static org.eclipse.osee.framework.ui.skynet.render.IRenderer.SKIP_DIALOGS;
+import java.io.File;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
@@ -33,7 +36,6 @@ import org.eclipse.osee.framework.skynet.core.change.Change;
import org.eclipse.osee.framework.skynet.core.revision.ChangeManager;
import org.eclipse.osee.framework.skynet.core.transaction.TransactionManager;
import org.eclipse.osee.framework.skynet.core.types.IArtifact;
-import org.eclipse.osee.framework.ui.skynet.render.IRenderer;
import org.eclipse.osee.framework.ui.skynet.render.RendererManager;
/**
@@ -41,6 +43,7 @@ import org.eclipse.osee.framework.ui.skynet.render.RendererManager;
*/
public class ExportChangeReportOperation extends AbstractOperation {
private final Collection<TeamWorkFlowArtifact> workflows;
+ private String resultFolder;
public ExportChangeReportOperation(Collection<TeamWorkFlowArtifact> workflows) {
super("Exporting Change Report(s)", AtsPlugin.PLUGIN_ID);
@@ -53,7 +56,7 @@ public class ExportChangeReportOperation extends AbstractOperation {
Collection<Change> changes = computeChanges(workflow, monitor);
if (!changes.isEmpty() && changes.size() < 4000) {
String legacyPcrId = workflow.getSoleAttributeValueAsString(AtsAttributeTypes.LegacyPcrId, null);
- generateDiffReport(changes, legacyPcrId, monitor);
+ resultFolder = generateDiffReport(changes, legacyPcrId, monitor);
}
monitor.worked(calculateWork(0.50));
}
@@ -100,8 +103,13 @@ public class ExportChangeReportOperation extends AbstractOperation {
return TransactionManager.getTransactionId(minTransactionId);
}
- private void generateDiffReport(Collection<Change> changes, String legacyPcrId, IProgressMonitor monitor) {
+ private String generateDiffReport(Collection<Change> changes, String legacyPcrId, IProgressMonitor monitor) {
Collection<ArtifactDelta> artifactDeltas = ChangeManager.getCompareArtifacts(changes);
- RendererManager.diff(artifactDeltas, "/" + legacyPcrId, IRenderer.NO_DISPLAY, true, IRenderer.SKIP_DIALOGS, true);
+ String filePath = RendererManager.diff(artifactDeltas, "/" + legacyPcrId, NO_DISPLAY, true, SKIP_DIALOGS, true);
+ return filePath.substring(0, filePath.lastIndexOf(File.separator));
+ }
+
+ public String getResultFolder() {
+ return resultFolder;
}
} \ No newline at end of file
diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/render/RenderingUtil.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/render/RenderingUtil.java
index 907b4e2fef4..da65b2a99f1 100644
--- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/render/RenderingUtil.java
+++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/render/RenderingUtil.java
@@ -162,7 +162,7 @@ public final class RenderingUtil {
return name.toString();
}
- public static IFile getRenderFile(IRenderer renderer, String subFolder, String fileName, PresentationType presentationType) throws OseeCoreException {
+ private static IFile getRenderFile(IRenderer renderer, String subFolder, String fileName, PresentationType presentationType) throws OseeCoreException {
try {
IFolder baseFolder = ensureRenderFolderExists(presentationType);
IFolder renderFolder = baseFolder.getFolder(subFolder);

Back to the top