From cc182bbf8e4a5cd188d61434195c99c45972284d Mon Sep 17 00:00:00 2001
From: Tobias Pietzsch <tobias.pietzsch@gmail.com>
Date: Mon, 12 Jan 2015 19:05:23 +0100
Subject: [PATCH] format code
---
src/main/java/bdv/server/BigDataServer.java | 20 +++++-----
src/main/java/bdv/server/CellHandler.java | 41 +++++++++++---------
src/main/java/bdv/server/ManagerHandler.java | 35 ++++++++++-------
3 files changed, 54 insertions(+), 42 deletions(-)
diff --git a/src/main/java/bdv/server/BigDataServer.java b/src/main/java/bdv/server/BigDataServer.java
index a2329df..801f928 100644
--- a/src/main/java/bdv/server/BigDataServer.java
+++ b/src/main/java/bdv/server/BigDataServer.java
@@ -1,15 +1,17 @@
package bdv.server;
+import java.util.HashMap;
+
import mpicbg.spim.data.SpimDataException;
+
import org.eclipse.jetty.server.Server;
import org.eclipse.jetty.server.handler.HandlerCollection;
import org.eclipse.jetty.util.log.Log;
-import java.util.HashMap;
-
public class BigDataServer
{
static HashMap< String, String > dataSet = new HashMap<>();
+
private static final org.eclipse.jetty.util.log.Logger LOG = Log.getLogger( BigDataServer.class );
public static void main( final String[] args ) throws Exception
@@ -22,9 +24,9 @@ public class BigDataServer
System.setProperty( "org.eclipse.jetty.util.log.class", "org.eclipse.jetty.util.log.StdErrLog" );
final Server server = new Server( port );
- String baseURL = "http://" + server.getURI().getHost() + ":" + port;
+ final String baseURL = "http://" + server.getURI().getHost() + ":" + port;
- HandlerCollection handlers = createHandlers( baseURL, dataSet );
+ final HandlerCollection handlers = createHandlers( baseURL, dataSet );
handlers.addHandler( new ManagerHandler( baseURL, server, handlers ) );
LOG.info( "Set handler: " + handlers );
@@ -34,14 +36,14 @@ public class BigDataServer
server.join();
}
- static private HandlerCollection createHandlers( String baseURL, HashMap< String, String > dataSet ) throws SpimDataException
+ static private HandlerCollection createHandlers( final String baseURL, final HashMap< String, String > dataSet ) throws SpimDataException
{
- HandlerCollection handlers = new HandlerCollection( true );
+ final HandlerCollection handlers = new HandlerCollection( true );
- for ( String key : dataSet.keySet() )
+ for ( final String key : dataSet.keySet() )
{
- String context = "/" + key;
- CellHandler ctx = new CellHandler( baseURL + context + "/", dataSet.get( key ) );
+ final String context = "/" + key;
+ final CellHandler ctx = new CellHandler( baseURL + context + "/", dataSet.get( key ) );
ctx.setContextPath( context );
handlers.addHandler( ctx );
}
diff --git a/src/main/java/bdv/server/CellHandler.java b/src/main/java/bdv/server/CellHandler.java
index 42fefe1..5628d0f 100644
--- a/src/main/java/bdv/server/CellHandler.java
+++ b/src/main/java/bdv/server/CellHandler.java
@@ -1,5 +1,24 @@
package bdv.server;
+import java.io.IOException;
+import java.io.OutputStream;
+import java.io.PrintWriter;
+
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import mpicbg.spim.data.SpimDataException;
+import net.imglib2.img.basictypeaccess.volatiles.array.VolatileShortArray;
+import net.imglib2.realtransform.AffineTransform3D;
+
+import org.eclipse.jetty.server.Request;
+import org.eclipse.jetty.server.handler.ContextHandler;
+import org.jdom2.Document;
+import org.jdom2.Element;
+import org.jdom2.input.SAXBuilder;
+import org.jdom2.output.XMLOutputter;
+
import bdv.img.cache.CacheHints;
import bdv.img.cache.LoadingStrategy;
import bdv.img.cache.VolatileCell;
@@ -10,23 +29,8 @@ import bdv.img.remote.RemoteImageLoaderMetaData;
import bdv.spimdata.SequenceDescriptionMinimal;
import bdv.spimdata.SpimDataMinimal;
import bdv.spimdata.XmlIoSpimDataMinimal;
-import com.google.gson.GsonBuilder;
-import mpicbg.spim.data.SpimDataException;
-import net.imglib2.img.basictypeaccess.volatiles.array.VolatileShortArray;
-import net.imglib2.realtransform.AffineTransform3D;
-import org.eclipse.jetty.server.Request;
-import org.eclipse.jetty.server.handler.ContextHandler;
-import org.jdom2.Document;
-import org.jdom2.Element;
-import org.jdom2.input.SAXBuilder;
-import org.jdom2.output.XMLOutputter;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import java.io.IOException;
-import java.io.OutputStream;
-import java.io.PrintWriter;
+import com.google.gson.GsonBuilder;
public class CellHandler extends ContextHandler
{
@@ -56,7 +60,8 @@ public class CellHandler extends ContextHandler
metadataJson = gsonBuilder.create().toJson( metadata );
cacheHints = new CacheHints( LoadingStrategy.BLOCKING, 0, false );
- // dataSetURL property is used for providing the XML file by replace SequenceDescription>ImageLoader>baseUrl
+ // dataSetURL property is used for providing the XML file by replace
+ // SequenceDescription>ImageLoader>baseUrl
xmlFile = xmlFilename;
dataSetURL = baseUrl;
}
@@ -152,4 +157,4 @@ public class CellHandler extends ContextHandler
ow.write( new XMLOutputter().outputString( doc ) );
ow.close();
}
-}
\ No newline at end of file
+}
diff --git a/src/main/java/bdv/server/ManagerHandler.java b/src/main/java/bdv/server/ManagerHandler.java
index 0039019..2deff29 100644
--- a/src/main/java/bdv/server/ManagerHandler.java
+++ b/src/main/java/bdv/server/ManagerHandler.java
@@ -1,6 +1,14 @@
package bdv.server;
+import java.io.IOException;
+import java.io.PrintWriter;
+
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
import mpicbg.spim.data.SpimDataException;
+
import org.eclipse.jetty.server.Handler;
import org.eclipse.jetty.server.Request;
import org.eclipse.jetty.server.Server;
@@ -8,20 +16,17 @@ import org.eclipse.jetty.server.handler.ContextHandler;
import org.eclipse.jetty.server.handler.HandlerCollection;
import org.eclipse.jetty.util.log.Log;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import java.io.IOException;
-import java.io.PrintWriter;
-
public class ManagerHandler extends ContextHandler
{
private static final org.eclipse.jetty.util.log.Logger LOG = Log.getLogger( ManagerHandler.class );
+
private final String baseURL;
+
private final Server server;
+
private final HandlerCollection handlers;
- public ManagerHandler( String baseURL, Server server, HandlerCollection handlers )
+ public ManagerHandler( final String baseURL, final Server server, final HandlerCollection handlers )
{
this.baseURL = baseURL;
this.server = server;
@@ -40,13 +45,13 @@ public class ManagerHandler extends ContextHandler
}
else if ( op.equals( "deploy" ) )
{
- String ds = request.getParameter( "ds" );
- String file = request.getParameter( "file" );
+ final String ds = request.getParameter( "ds" );
+ final String file = request.getParameter( "file" );
deploy( ds, file, baseRequest, response );
}
else if ( op.equals( "undeploy" ) )
{
- String ds = request.getParameter( "ds" );
+ final String ds = request.getParameter( "ds" );
undeploy( ds, baseRequest, response );
}
else
@@ -64,7 +69,7 @@ public class ManagerHandler extends ContextHandler
final PrintWriter ow = response.getWriter();
- for ( Handler handler : server.getChildHandlersByClass( CellHandler.class ) )
+ for ( final Handler handler : server.getChildHandlersByClass( CellHandler.class ) )
{
CellHandler contextHandler = null;
if ( handler instanceof CellHandler )
@@ -85,7 +90,7 @@ public class ManagerHandler extends ContextHandler
{
ctx = new CellHandler( baseURL + datasetName + "/", fileLocation );
}
- catch ( SpimDataException e )
+ catch ( final SpimDataException e )
{
LOG.warn( "Failed to create a CellHandler", e );
e.printStackTrace();
@@ -107,7 +112,7 @@ public class ManagerHandler extends ContextHandler
LOG.info( "Remove the context: " + datasetName );
boolean ret = false;
- for ( Handler handler : server.getChildHandlersByClass( CellHandler.class ) )
+ for ( final Handler handler : server.getChildHandlersByClass( CellHandler.class ) )
{
CellHandler contextHandler = null;
if ( handler instanceof CellHandler )
@@ -119,7 +124,7 @@ public class ManagerHandler extends ContextHandler
{
contextHandler.stop();
}
- catch ( Exception e )
+ catch ( final Exception e )
{
e.printStackTrace();
}
@@ -142,4 +147,4 @@ public class ManagerHandler extends ContextHandler
ow.close();
}
}
-}
\ No newline at end of file
+}
--
GitLab