You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@servicemix.apache.org by gn...@apache.org on 2008/04/25 14:27:29 UTC
svn commit: r651590 -
/servicemix/smx3/branches/servicemix-3.2/web/servicemix-web-console/src/main/java/org/apache/servicemix/web/view/DotView.java
Author: gnodet
Date: Fri Apr 25 05:27:23 2008
New Revision: 651590
URL: http://svn.apache.org/viewvc?rev=651590&view=rev
Log:
Try to fix the dot graphs on mac/linux
Modified:
servicemix/smx3/branches/servicemix-3.2/web/servicemix-web-console/src/main/java/org/apache/servicemix/web/view/DotView.java
Modified: servicemix/smx3/branches/servicemix-3.2/web/servicemix-web-console/src/main/java/org/apache/servicemix/web/view/DotView.java
URL: http://svn.apache.org/viewvc/servicemix/smx3/branches/servicemix-3.2/web/servicemix-web-console/src/main/java/org/apache/servicemix/web/view/DotView.java?rev=651590&r1=651589&r2=651590&view=diff
==============================================================================
--- servicemix/smx3/branches/servicemix-3.2/web/servicemix-web-console/src/main/java/org/apache/servicemix/web/view/DotView.java (original)
+++ servicemix/smx3/branches/servicemix-3.2/web/servicemix-web-console/src/main/java/org/apache/servicemix/web/view/DotView.java Fri Apr 25 05:27:23 2008
@@ -63,9 +63,14 @@
FileWriter w = new FileWriter(dotSrc);
w.write(o.toString());
w.close();
- dotImg = File.createTempFile("smx_", ".dot." + getDotFormat());
-
- String cmd = "-T" + getDotFormat() + " \"" + dotSrc.getCanonicalPath() + "\" -o\"" + dotImg.getAbsolutePath() + "\"";
+ dotImg = new File(dotSrc.getAbsolutePath() + "." + getDotFormat());
+
+ String cmd;
+ if (System.getProperty("os.name").contains("Windows")) {
+ cmd = "-T" + getDotFormat() + " \"" + dotSrc.getAbsolutePath() + "\" -o\"" + dotImg.getAbsolutePath() + "\"";
+ } else {
+ cmd = "-T " + getDotFormat() + " " + dotSrc.getAbsolutePath() + " -o " + dotImg.getAbsolutePath();
+ }
Dot.run(cmd);
InputStream is = new FileInputStream(dotImg);
@@ -77,7 +82,7 @@
FileUtil.copyInputStream(is, response.getOutputStream());
} finally {
if (dotSrc != null) {
- //dotSrc.delete();
+ dotSrc.delete();
}
if (dotImg != null) {
dotImg.delete();