From 1b97b600da357ebca8f73c0ad874b88660cd1b3c Mon Sep 17 00:00:00 2001 From: Kevin Ruland Date: Thu, 22 Dec 2011 02:33:43 +0000 Subject: [PATCH] Repackage ProgressOutputStream to net.sf.openrocket.gui.util --- .../sf/openrocket/{ => gui}/util/ProgressOutputStream.java | 4 +++- src/net/sf/openrocket/gui/util/SaveCSVWorker.java | 1 - src/net/sf/openrocket/gui/util/SaveFileWorker.java | 1 - 3 files changed, 3 insertions(+), 3 deletions(-) rename src/net/sf/openrocket/{ => gui}/util/ProgressOutputStream.java (95%) diff --git a/src/net/sf/openrocket/util/ProgressOutputStream.java b/src/net/sf/openrocket/gui/util/ProgressOutputStream.java similarity index 95% rename from src/net/sf/openrocket/util/ProgressOutputStream.java rename to src/net/sf/openrocket/gui/util/ProgressOutputStream.java index c52a21266..229357368 100644 --- a/src/net/sf/openrocket/util/ProgressOutputStream.java +++ b/src/net/sf/openrocket/gui/util/ProgressOutputStream.java @@ -1,4 +1,4 @@ -package net.sf.openrocket.util; +package net.sf.openrocket.gui.util; import java.io.FilterOutputStream; import java.io.IOException; @@ -7,6 +7,8 @@ import java.io.OutputStream; import javax.swing.SwingWorker; +import net.sf.openrocket.util.MathUtil; + public abstract class ProgressOutputStream extends FilterOutputStream { diff --git a/src/net/sf/openrocket/gui/util/SaveCSVWorker.java b/src/net/sf/openrocket/gui/util/SaveCSVWorker.java index 55ef4da7c..efa7d13d9 100644 --- a/src/net/sf/openrocket/gui/util/SaveCSVWorker.java +++ b/src/net/sf/openrocket/gui/util/SaveCSVWorker.java @@ -18,7 +18,6 @@ import net.sf.openrocket.simulation.FlightDataType; import net.sf.openrocket.startup.Application; import net.sf.openrocket.unit.Unit; import net.sf.openrocket.util.BugException; -import net.sf.openrocket.util.ProgressOutputStream; public class SaveCSVWorker extends SwingWorker { diff --git a/src/net/sf/openrocket/gui/util/SaveFileWorker.java b/src/net/sf/openrocket/gui/util/SaveFileWorker.java index 9e5f41174..1ccc3145b 100644 --- a/src/net/sf/openrocket/gui/util/SaveFileWorker.java +++ b/src/net/sf/openrocket/gui/util/SaveFileWorker.java @@ -9,7 +9,6 @@ import javax.swing.SwingWorker; import net.sf.openrocket.document.OpenRocketDocument; import net.sf.openrocket.file.RocketSaver; import net.sf.openrocket.startup.Application; -import net.sf.openrocket.util.ProgressOutputStream; public class SaveFileWorker extends SwingWorker {