modifier order enforced

checkstyle.xml

@@ -120,8 +120,8 @@
         <module name="MissingSwitchDefault"/>
         <module name="FallThrough"/>
         <module name="UpperEll"/>
-<!--        <module name="ModifierOrder"/>
-        <module name="EmptyLineSeparator">
+        <module name="ModifierOrder"/>
+<!--        <module name="EmptyLineSeparator">
             <property name="tokens"
                       value="PACKAGE_DEF, IMPORT, STATIC_IMPORT, CLASS_DEF, INTERFACE_DEF, ENUM_DEF,
                     STATIC_INIT, INSTANCE_INIT, METHOD_DEF, CTOR_DEF, VARIABLE_DEF"/>

commons/src/main/java/lcsb/mapviewer/common/XmlParser.java

@@ -47,7 +47,7 @@ import lcsb.mapviewer.common.exception.InvalidXmlSchemaException;
  * @author Piotr Gawron
  * 
  */
-final public class XmlParser {
+public final class XmlParser {
 
   /**
    * Base of the hex representation.

commons/src/main/java/lcsb/mapviewer/common/geometry/ImmutableLine2D.java

@@ -11,11 +11,11 @@ import java.awt.geom.Rectangle2D;
  * @author Piotr Gawron
  *
  */
-final public class ImmutableLine2D extends Line2D {
-  final private double x1;
-  final private double y1;
-  final private double x2;
-  final private double y2;
+public final class ImmutableLine2D extends Line2D {
+  private final double x1;
+  private final double y1;
+  private final double x2;
+  private final double y2;
 
   public ImmutableLine2D(double x1, double y1, double x2, double y2) {
     this.x1 = x1;

commons/src/main/java/lcsb/mapviewer/common/geometry/ImmutablePoint2D.java

@@ -9,9 +9,9 @@ import java.awt.geom.Point2D;
  * @author Piotr Gawron
  *
  */
-final public class ImmutablePoint2D extends Point2D {
-  final private double x;
-  final private double y;
+public final class ImmutablePoint2D extends Point2D {
+  private final double x;
+  private final double y;
 
   public ImmutablePoint2D(double x, double y) {
     this.x = x;

converter-CellDesigner/src/main/java/lcsb/mapviewer/converter/model/celldesigner/alias/CompartmentAliasXmlParser.java

@@ -36,12 +36,11 @@ import lcsb.mapviewer.model.map.model.Model;
  */
 public class CompartmentAliasXmlParser extends AbstractAliasXmlParser<Compartment> {
 
-  private final static double MIN_INNER_WIDTH = 1.0;
+  private static final double MIN_INNER_WIDTH = 1.0;
 
   /**
    * Default class logger.
    */
-  @SuppressWarnings("unused")
   private Logger logger = LogManager.getLogger();
 
   /**

pathvisio/src/test/java/lcsb/mapviewer/wikipathway/ReactionElbowsTest.java

@@ -16,7 +16,6 @@ import lcsb.mapviewer.model.map.reaction.Reaction;
 import lcsb.mapviewer.wikipathway.XML.GPMLToModel;
 
 public class ReactionElbowsTest extends WikipathwaysTestFunctions {
-  private final static double EPSILON = 1e-6;
 
   /**
    * Default class logger.

persist/src/test/java/lcsb/mapviewer/persist/dao/map/DataOverlayDaoTest.java

@@ -37,7 +37,7 @@ import lcsb.mapviewer.persist.dao.ProjectDao;
 
 public class DataOverlayDaoTest extends PersistTestFunctions {
 
-  final static Logger logger = LogManager.getLogger();
+  static final Logger logger = LogManager.getLogger();
 
   @Autowired
   private DataOverlayDao dataOverlayDao;

persist/src/test/java/lcsb/mapviewer/persist/dao/map/ProjectBackgroundDaoTest.java

@@ -33,7 +33,7 @@ import lcsb.mapviewer.persist.dao.ProjectDao;
 
 public class ProjectBackgroundDaoTest extends PersistTestFunctions {
 
-  final static Logger logger = LogManager.getLogger();
+  static final Logger logger = LogManager.getLogger();
 
   @Autowired
   private ProjectBackgroundDao backgroundDao;

web/src/main/java/lcsb/mapviewer/web/config/SpringWebConfig.java

@@ -59,7 +59,7 @@ import lcsb.mapviewer.services.interfaces.IReactionService;
 @ComponentScan(basePackages = { "lcsb.mapviewer.web" })
 public class SpringWebConfig implements WebMvcConfigurer {
 
-  private final static Logger logger = LogManager.getLogger();
+  private static final Logger logger = LogManager.getLogger();
 
   private List<HandlerInterceptor> interceptors;
 

web/src/test/java/lcsb/mapviewer/web/ControllerIntegrationTest.java

@@ -116,7 +116,7 @@ import lcsb.mapviewer.web.utils.CustomCurlRequestSnippet;
 
 @WebAppConfiguration
 @ContextConfiguration(classes = SpringWebConfig.class)
-abstract public class ControllerIntegrationTest {
+public abstract class ControllerIntegrationTest {
 
   Logger logger = LogManager.getLogger();