From 4deb3a3f9b4a3b45a5aee769cb226fc2f5a01be5 Mon Sep 17 00:00:00 2001
From: Vojtech Moravec <vojtech.moravec.st@vsb.cz>
Date: Wed, 16 Oct 2019 11:39:30 +0200
Subject: [PATCH] Cleaned the main function.
---
src/main/java/bdv/BigDataViewer.java | 26 ++++++++++++--------------
1 file changed, 12 insertions(+), 14 deletions(-)
diff --git a/src/main/java/bdv/BigDataViewer.java b/src/main/java/bdv/BigDataViewer.java
index 0a80f4cc..7f1bf8cb 100644
--- a/src/main/java/bdv/BigDataViewer.java
+++ b/src/main/java/bdv/BigDataViewer.java
@@ -35,6 +35,7 @@ import java.io.FileWriter;
import java.io.IOException;
import java.util.ArrayList;
import java.util.List;
+import java.util.function.BiFunction;
import javax.swing.ActionMap;
import javax.swing.JFileChooser;
@@ -680,27 +681,24 @@ public class BigDataViewer
viewer.requestRepaint();
}
- public static void main( final String[] args )
- {
- if (args.length < 1)
- {
+ public static void main(final String[] args) {
+ if (args.length < 1) {
System.err.println("Error: pass XML dataset file.");
return;
}
final String fn = args[0];
- System.out.println("Loading dataset from: " + fn);
- //TODO(Moravec): Handle loading from server.
- try
- {
- System.setProperty( "apple.laf.useScreenMenuBar", "true" );
+ final boolean serverResource = fn.startsWith("http");
- final BigDataViewer bdv = open( fn, new File( fn ).getName(), new ProgressWriterConsole(), ViewerOptions.options() );
+ System.out.println(String.format("Loading dataset from %s resource: %s", serverResource ? "online" : "local", fn));
-// DumpInputConfig.writeToYaml( System.getProperty( "user.home" ) + "/.bdv/bdvkeyconfig.yaml", bdv.getViewerFrame() );
- }
- catch ( final Exception e )
- {
+
+ try {
+ System.setProperty("apple.laf.useScreenMenuBar", "true");
+
+ final String title = new File(fn).getName();
+ final BigDataViewer bdv = open(fn, title, new ProgressWriterConsole(), ViewerOptions.options());
+ } catch (final Exception e) {
e.printStackTrace();
}
}
--
GitLab