From b842e9c0c86dabb9dfbbd9704ce2e1e5b1cdec45 Mon Sep 17 00:00:00 2001
From: Shadi Shaheen <sshahine@ccc.com.lb>
Date: Sun, 10 Sep 2017 23:01:06 +0300
Subject: [PATCH] update checkstyle dependency

---
 config/checkstyle/checkstyle.xml              | 265 +++---------------
 gradle/checkstyle.gradle                      |   4 +-
 .../com/jfoenix/controls/JFXNodesList.java    |   9 +-
 .../jfoenix/controls/JFXTreeTableView.java    |   2 +-
 4 files changed, 45 insertions(+), 235 deletions(-)

diff --git a/config/checkstyle/checkstyle.xml b/config/checkstyle/checkstyle.xml
index a896c878..487c927c 100644
--- a/config/checkstyle/checkstyle.xml
+++ b/config/checkstyle/checkstyle.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <!DOCTYPE module PUBLIC
-        "-//Puppy Crawl//DTD Check Configuration 1.3//EN"
-        "http://www.puppycrawl.com/dtds/configuration_1_3.dtd">
+    "-//Puppy Crawl//DTD Check Configuration 1.3//EN"
+    "http://checkstyle.sourceforge.net/dtds/configuration_1_3.dtd">
 
 <!--
     Checkstyle configuration that checks the Google coding conventions from Google Java Style
@@ -15,10 +15,10 @@
     Authors: Max Vetrenko, Ruslan Diachenko, Roman Ivanov.
  -->
 
-<module name="Checker">
+<module name = "Checker">
     <property name="charset" value="UTF-8"/>
 
-    <property name="severity" value="error"/>
+    <property name="severity" value="warning"/>
 
     <property name="fileExtensions" value="java, properties, xml"/>
     <!-- Checks for whitespace                               -->
@@ -31,9 +31,8 @@
         <module name="OuterTypeFilename"/>
         <module name="IllegalTokenText">
             <property name="tokens" value="STRING_LITERAL, CHAR_LITERAL"/>
-            <property name="format"
-                      value="\\u00(08|09|0(a|A)|0(c|C)|0(d|D)|22|27|5(C|c))|\\(0(10|11|12|14|15|42|47)|134)"/>
-            <property name="message" value="Avoid using corresponding octal or Unicode escape."/>
+            <property name="format" value="\\u00(09|0(a|A)|0(c|C)|0(d|D)|22|27|5(C|c))|\\(0(10|11|12|14|15|42|47)|134)"/>
+            <property name="message" value="Consider using special escape sequence instead of octal value or Unicode escaped value."/>
         </module>
         <module name="AvoidEscapedUnicodeCharacters">
             <property name="allowEscapesForControlCharacters" value="true"/>
@@ -44,23 +43,23 @@
             <property name="max" value="140"/>
             <property name="ignorePattern" value="^package.*|^import.*|a href|href|http://|https://|ftp://"/>
         </module>
+        <module name="AvoidStarImport"/>
         <module name="OneTopLevelClass"/>
         <module name="NoLineWrap"/>
         <module name="EmptyBlock">
             <property name="option" value="TEXT"/>
             <property name="tokens" value="LITERAL_TRY, LITERAL_FINALLY, LITERAL_IF, LITERAL_ELSE, LITERAL_SWITCH"/>
         </module>
+        <module name="NeedBraces"/>
         <module name="LeftCurly"/>
         <module name="RightCurly">
             <property name="id" value="RightCurlySame"/>
-            <property name="tokens"
-                      value="LITERAL_TRY, LITERAL_CATCH, LITERAL_FINALLY, LITERAL_IF, LITERAL_ELSE, LITERAL_DO"/>
+            <property name="tokens" value="LITERAL_TRY, LITERAL_CATCH, LITERAL_FINALLY, LITERAL_IF, LITERAL_ELSE, LITERAL_DO"/>
         </module>
         <module name="RightCurly">
             <property name="id" value="RightCurlyAlone"/>
             <property name="option" value="alone"/>
-            <property name="tokens"
-                      value="CLASS_DEF, METHOD_DEF, CTOR_DEF, LITERAL_FOR, LITERAL_WHILE, STATIC_INIT, INSTANCE_INIT"/>
+            <property name="tokens" value="CLASS_DEF, METHOD_DEF, CTOR_DEF, LITERAL_FOR, LITERAL_WHILE, STATIC_INIT, INSTANCE_INIT"/>
         </module>
         <module name="WhitespaceAround">
             <property name="allowEmptyConstructors" value="true"/>
@@ -92,6 +91,23 @@
             <property name="tokens" value="COMMA"/>
             <property name="option" value="EOL"/>
         </module>
+        <module name="SeparatorWrap">
+            <!-- ELLIPSIS is EOL until https://github.com/google/styleguide/issues/258 -->
+            <property name="id" value="SeparatorWrapEllipsis"/>
+            <property name="tokens" value="ELLIPSIS"/>
+            <property name="option" value="EOL"/>
+        </module>
+        <module name="SeparatorWrap">
+            <!-- ARRAY_DECLARATOR is EOL until https://github.com/google/styleguide/issues/259 -->
+            <property name="id" value="SeparatorWrapArrayDeclarator"/>
+            <property name="tokens" value="ARRAY_DECLARATOR"/>
+            <property name="option" value="EOL"/>
+        </module>
+        <module name="SeparatorWrap">
+            <property name="id" value="SeparatorWrapMethodRef"/>
+            <property name="tokens" value="METHOD_REF"/>
+            <property name="option" value="nl"/>
+        </module>
         <module name="PackageName">
             <property name="format" value="^[a-z]+(\.[a-z][a-z0-9]*)*$"/>
             <message key="name.invalidPattern"
@@ -107,28 +123,18 @@
                      value="Member name ''{0}'' must match pattern ''{1}''."/>
         </module>
         <module name="ParameterName">
-            <property name="id" value="ParameterNameNonPublic"/>
             <property name="format" value="^[a-z]([a-z0-9][a-zA-Z0-9]*)?$"/>
-            <property name="accessModifiers" value="protected, package, private"/>
-            <message key="name.invalidPattern"
-                     value="Parameter name ''{0}'' must match pattern ''{1}''."/>
-        </module>
-        <module name="ParameterName">
-            <property name="id" value="ParameterNamePublic"/>
-            <property name="format" value="^[a-z][a-z0-9][a-zA-Z0-9]*$"/>
-            <property name="accessModifiers" value="public"/>
             <message key="name.invalidPattern"
                      value="Parameter name ''{0}'' must match pattern ''{1}''."/>
         </module>
         <module name="CatchParameterName">
-            <property name="format" value="^[a-z][a-z0-9][a-zA-Z0-9]*$"/>
+            <property name="format" value="^[a-z]([a-z0-9][a-zA-Z0-9]*)?$"/>
             <message key="name.invalidPattern"
                      value="Catch parameter name ''{0}'' must match pattern ''{1}''."/>
         </module>
         <module name="LocalVariableName">
             <property name="tokens" value="VARIABLE_DEF"/>
-            <property name="format" value="^[a-z][a-z0-9][a-zA-Z0-9]*$"/>
-            <property name="allowOneCharVarInForLoop" value="true"/>
+            <property name="format" value="^[a-z]([a-z0-9][a-zA-Z0-9]*)?$"/>
             <message key="name.invalidPattern"
                      value="Local variable name ''{0}'' must match pattern ''{1}''."/>
         </module>
@@ -174,15 +180,19 @@
         <module name="OverloadMethodsDeclarationOrder"/>
         <module name="VariableDeclarationUsageDistance"/>
         <module name="CustomImportOrder">
+            <property name="sortImportsInGroupAlphabetically" value="true"/>
             <property name="separateLineBetweenGroups" value="true"/>
-            <property name="customImportOrderRules" value="THIRD_PARTY_PACKAGE###STANDARD_JAVA_PACKAGE###STATIC"/>
+            <property name="customImportOrderRules" value="STATIC###THIRD_PARTY_PACKAGE"/>
         </module>
         <module name="MethodParamPad"/>
+        <module name="NoWhitespaceBefore">
+            <property name="tokens" value="COMMA, SEMI, POST_INC, POST_DEC, DOT, ELLIPSIS, METHOD_REF"/>
+            <property name="allowLineBreaks" value="true"/>
+        </module>
         <module name="ParenPad"/>
         <module name="OperatorWrap">
             <property name="option" value="NL"/>
-            <property name="tokens"
-                      value="BAND, BOR, BSR, BXOR, DIV, EQUAL, GE, GT, LAND, LE, LITERAL_INSTANCEOF, LOR, LT, MINUS, MOD, NOT_EQUAL, PLUS, QUESTION, SL, SR, STAR, METHOD_REF "/>
+            <property name="tokens" value="BAND, BOR, BSR, BXOR, DIV, EQUAL, GE, GT, LAND, LE, LITERAL_INSTANCEOF, LOR, LT, MINUS, MOD, NOT_EQUAL, PLUS, QUESTION, SL, SR, STAR, METHOD_REF "/>
         </module>
         <module name="AnnotationLocation">
             <property name="id" value="AnnotationLocationMostCases"/>
@@ -196,8 +206,7 @@
         <module name="NonEmptyAtclauseDescription"/>
         <module name="JavadocTagContinuationIndentation"/>
         <module name="SummaryJavadoc">
-            <property name="forbiddenSummaryFragments"
-                      value="^@return the *|^This method returns |^A [{]@code [a-zA-Z0-9]+[}]( is a )"/>
+            <property name="forbiddenSummaryFragments" value="^@return the *|^This method returns |^A [{]@code [a-zA-Z0-9]+[}]( is a )"/>
         </module>
         <module name="JavadocParagraph"/>
         <module name="AtclauseOrder">
@@ -209,10 +218,9 @@
             <property name="allowMissingParamTags" value="true"/>
             <property name="allowMissingThrowsTags" value="true"/>
             <property name="allowMissingReturnTag" value="true"/>
-            <property name="minLineCount" value="7"/>
+            <property name="minLineCount" value="2"/>
             <property name="allowedAnnotations" value="Override, Test"/>
             <property name="allowThrowsTagsForSubclasses" value="true"/>
-            <property name="tokens" value="METHOD_DEF"/> <!-- do not check constructors or annotation fields -->
         </module>
         <module name="MethodName">
             <property name="format" value="^[a-z][a-z0-9][a-zA-Z0-9_]*$"/>
@@ -226,202 +234,5 @@
             <property name="exceptionVariableName" value="expected"/>
         </module>
         <module name="CommentsIndentation"/>
-
-        <!-- sevntu additions -->
-
-        <property name="tabWidth" value="4"/>
-
-        <!-- Misc -->
-        <module name="FileContentsHolder"/>
-
-        <!-- Annotation -->
-        <module name="com.github.sevntu.checkstyle.checks.annotation.ForbidAnnotationElementValue">
-            <property name="annotationName" value="Test"/>
-            <property name="elementName" value="expected"/>
-            <property name="forbiddenElementValueRegexp" value=".*"/>
-        </module>
-        <module name="com.github.sevntu.checkstyle.checks.annotation.ForbidAnnotation">
-            <property name="annotationNames" value="Ignore, VisibleForTesting"/>
-            <property name="annotationTargets" value="METHOD_DEF"/>
-        </module>
-        <module name="com.github.sevntu.checkstyle.checks.annotation.RequiredParameterForAnnotation"/>
-        <module name="com.github.sevntu.checkstyle.checks.annotation.RequiredParameterForAnnotation">
-            <property name="annotationName" value="Generated"/>
-            <property name="requiredParameters" value="value"/>
-        </module>
-
-        <!-- Coding -->
-        <module name="com.github.sevntu.checkstyle.checks.coding.ForbidCCommentsInMethods"/>
-        <module name="com.github.sevntu.checkstyle.checks.coding.NoNullForCollectionReturn">
-            <property name="collectionList"
-                      value="AbstractCollection AbstractList AbstractQueue AbstractSequentialList AbstractSet ArrayBlockingQueue ArrayDeque ArrayList AttributeList BeanContextServicesSupport BeanContextSupport ConcurrentLinkedDeque ConcurrentLinkedQueue ConcurrentSkipListSet CopyOnWriteArrayList CopyOnWriteArraySet DelayQueue EnumSet HashSet JobStateReasons LinkedBlockingDeque LinkedBlockingQueue LinkedHashSet LinkedList LinkedTransferQueue PriorityBlockingQueue PriorityQueue RoleList RoleUnresolvedList Stack SynchronousQueue TreeSet Vector Collection List Map Set"/>
-            <property name="searchThroughMethodBody" value="false"/>
-        </module>
-        <module name="com.github.sevntu.checkstyle.checks.coding.CustomDeclarationOrder">
-            <property name="customDeclarationOrder"
-                      value="Field(public) ### Field(protected) ### Field(private) ### CTOR(.*) ### Method(.*)### InnerClass()"/>
-            <property name="caseSensitive" value="true"/>
-            <property name="fieldPrefix" value=""/>
-        </module>
-        <module name="com.github.sevntu.checkstyle.checks.coding.ForbidReturnInFinallyBlock"/>
-        <module name="com.github.sevntu.checkstyle.checks.coding.MultipleStringLiteralsExtended">
-            <property name="allowedDuplicates" value="1"/>
-            <property name="ignoreOccurrenceContext" value="ANNOTATION"/>
-            <property name="ignoreStringsRegexp" value="^&quot;&quot;$"/>
-            <property name="highlightAllDuplicates" value="false"/>
-        </module>
-        <module name="com.github.sevntu.checkstyle.checks.coding.AvoidDefaultSerializableInInnerClasses">
-            <property name="allowPartialImplementation" value="false"/>
-        </module>
-        <module name="com.github.sevntu.checkstyle.checks.coding.ConfusingCondition">
-            <property name="multiplyFactorForElseBlocks" value="4"/>
-            <property name="ignoreInnerIf" value="true"/>
-            <property name="ignoreSequentialIf" value="true"/>
-            <property name="ignoreNullCaseInIf" value="true"/>
-            <property name="ignoreThrowInElse" value="true"/>
-        </module>
-        <module name="com.github.sevntu.checkstyle.checks.coding.LogicConditionNeedOptimization"/>
-        <module name="com.github.sevntu.checkstyle.checks.coding.ReturnBooleanFromTernary"/>
-        <module name="com.github.sevntu.checkstyle.checks.coding.ReturnNullInsteadOfBoolean"/>
-        <module name="com.github.sevntu.checkstyle.checks.coding.ForbidCertainImports"/>
-        <module name="com.github.sevntu.checkstyle.checks.coding.AvoidModifiersForTypes">
-            <property name="forbiddenClassesRegexpFinal" value=""/>
-            <property name="forbiddenClassesRegexpStatic" value="ULC.+"/>
-            <property name="forbiddenClassesRegexpTransient" value=""/>
-            <property name="forbiddenClassesRegexpVolatile" value=""/>
-            <property name="forbiddenClassesRegexpAnnotation" value=""/>
-            <property name="forbiddenClassesRegexpPrivate" value=""/>
-            <property name="forbiddenClassesRegexpPackagePrivate" value=""/>
-            <property name="forbiddenClassesRegexpProtected" value=""/>
-            <property name="forbiddenClassesRegexpPublic" value=""/>
-        </module>
-        <module name="com.github.sevntu.checkstyle.checks.coding.OverridableMethodInConstructor">
-            <property name="checkCloneMethod" value="false"/>
-            <property name="checkReadObjectMethod" value="false"/>
-            <property name="matchMethodsByArgCount" value="false"/>
-        </module>
-        <module name="com.github.sevntu.checkstyle.checks.coding.AvoidNotShortCircuitOperatorsForBoolean"/>
-        <module name="com.github.sevntu.checkstyle.checks.coding.MultipleVariableDeclarationsExtended">
-            <property name="ignoreCycles" value="false"/>
-            <property name="ignoreMethods" value="false"/>
-        </module>
-        <module name="com.github.sevntu.checkstyle.checks.coding.EitherLogOrThrow">
-            <property name="loggerFullyQualifiedClassName" value="org.slf4j.Logger"/>
-            <property name="loggingMethodNames" value="debug, error, info, trace, warn"/>
-        </module>
-        <module name="com.github.sevntu.checkstyle.checks.coding.AvoidHidingCauseException"/>
-        <module name="com.github.sevntu.checkstyle.checks.coding.IllegalCatchExtended">
-            <property name="allowThrow" value="true"/>
-            <property name="allowRethrow" value="false"/>
-        </module>
-        <module name="com.github.sevntu.checkstyle.checks.coding.ReturnCountExtended">
-            <property name="maxReturnCount" value="1"/>
-            <property name="ignoreMethodLinesCount" value="20"/>
-            <property name="minIgnoreReturnDepth" value="4"/>
-            <property name="ignoreEmptyReturns" value="true"/>
-            <property name="topLinesToIgnoreCount" value="5"/>
-            <property name="ignoreMethodsNames" value="equals"/>
-        </module>
-        <module name="com.github.sevntu.checkstyle.checks.coding.SimpleAccessorNameNotation"/>
-        <module name="com.github.sevntu.checkstyle.checks.coding.UnnecessaryParenthesesExtended">
-            <property name="ignoreCalculationOfBooleanVariables" value="false"/>
-            <property name="ignoreCalculationOfBooleanVariablesWithReturn" value="false"/>
-            <property name="ignoreCalculationOfBooleanVariablesWithAssert" value="false"/>
-        </module>
-        <module name="com.github.sevntu.checkstyle.checks.coding.ForbidInstantiation">
-            <property name="forbiddenClasses" value="java.lang.NullPointerException"/>
-        </module>
-        <module name="com.github.sevntu.checkstyle.checks.coding.AvoidConstantAsFirstOperandInCondition">
-            <property name="targetConstantTypes"
-                      value="LITERAL_NULL,LITERAL_TRUE,LITERAL_FALSE,NUM_INT,NUM_DOUBLE,NUM_LONG,NUM_FLOAT"/>
-        </module>
-        <module name="com.github.sevntu.checkstyle.checks.coding.FinalizeImplementation"/>
-        <module name="com.github.sevntu.checkstyle.checks.coding.ForbidThrowAnonymousExceptions">
-            <property name="exceptionClassNameRegex" value="^.*Exception"/>
-        </module>
-        <module name="com.github.sevntu.checkstyle.checks.coding.MapIterationInForEachLoop">
-            <property name="proposeValuesUsage" value="true"/>
-            <property name="proposeKeySetUsage" value="false"/>
-            <property name="proposeEntrySetUsage" value="false"/>
-        </module>
-        <module name="com.github.sevntu.checkstyle.checks.coding.TernaryPerExpressionCount">
-            <property name="maxTernaryPerExpressionCount" value="1"/>
-            <property name="ignoreTernaryOperatorsInBraces" value="true"/>
-            <property name="ignoreIsolatedTernaryOnLine" value="true"/>
-        </module>
-        <module name="com.github.sevntu.checkstyle.checks.coding.RedundantReturn">
-            <property name="allowReturnInEmptyMethodsAndConstructors" value="false"/>
-        </module>
-        <module name="com.github.sevntu.checkstyle.checks.coding.SingleBreakOrContinue"/>
-        <module name="com.github.sevntu.checkstyle.checks.coding.NumericLiteralNeedsUnderscore">
-            <property name="minDecimalSymbolLength" value="7"/>
-            <property name="maxDecimalSymbolsUntilUnderscore" value="3"/>
-            <property name="minHexSymbolLength" value="5"/>
-            <property name="maxHexSymbolsUntilUnderscore" value="4"/>
-            <property name="minBinarySymbolLength" value="9"/>
-            <property name="maxBinarySymbolsUntilUnderscore" value="8"/>
-            <property name="ignoreFieldNamePattern" value="serialVersionUID"/>
-        </module>
-        <module name="com.github.sevntu.checkstyle.checks.coding.EmptyPublicCtorInClass"/>
-        <module name="com.github.sevntu.checkstyle.checks.coding.DiamondOperatorForVariableDefinition"/>
-        <module name="com.github.sevntu.checkstyle.checks.coding.NameConventionForJunit4TestClasses"/>
-        <module name="com.github.sevntu.checkstyle.checks.coding.UselessSuperCtorCall"/>
-        <module name="com.github.sevntu.checkstyle.checks.coding.UselessSingleCatch"/>
-        <module name="com.github.sevntu.checkstyle.checks.coding.WhitespaceBeforeArrayInitializer"/>
-
-        <!-- Design -->
-        <module name="com.github.sevntu.checkstyle.checks.design.ChildBlockLength">
-            <property name="blockTypes"
-                      value="LITERAL_IF,LITERAL_ELSE,LITERAL_WHILE,LITERAL_DO,LITERAL_FOR,LITERAL_SWITCH,LITERAL_TRY,LITERAL_CATCH"/>
-            <property name="maxChildBlockPercentage" value="90"/>
-            <property name="ignoreBlockLinesCount" value="50"/>
-        </module>
-        <module name="com.github.sevntu.checkstyle.checks.design.ForbidWildcardAsReturnType">
-            <property name="checkPublicMethods" value="true"/>
-            <property name="checkPackageMethods" value="true"/>
-            <property name="checkProtectedMethods" value="true"/>
-            <property name="checkPrivateMethods" value="false"/>
-            <property name="checkOverrideMethods" value="false"/>
-            <property name="checkDeprecatedMethods" value="false"/>
-            <property name="allowReturnWildcardWithSuper" value="false"/>
-            <property name="allowReturnWildcardWithExtends" value="false"/>
-            <property name="returnTypeClassNamesIgnoreRegex" value="^(Comparator|Comparable)$"/>
-        </module>
-        <module name="com.github.sevntu.checkstyle.checks.design.NoMainMethodInAbstractClass"/>
-        <module name="com.github.sevntu.checkstyle.checks.design.PublicReferenceToPrivateType"/>
-        <module name="com.github.sevntu.checkstyle.checks.design.ConstructorWithoutParams">
-            <property name="classNameFormat" value=".*Exception$"/>
-            <property name="ignoredClassNameFormat" value="UnsupportedOperationException"/>
-        </module>
-        <module name="com.github.sevntu.checkstyle.checks.design.InnerClass"/>
-        <module name="com.github.sevntu.checkstyle.checks.design.NestedSwitch"/>
-        <module name="com.github.sevntu.checkstyle.checks.design.AvoidConditionInversion"/>
-        <module name="com.github.sevntu.checkstyle.checks.design.CauseParameterInException"/>
-
-        <!-- Naming -->
-        <module name="com.github.sevntu.checkstyle.checks.naming.EnumValueName">
-            <property name="objFormat" value="^[A-Z][a-zA-Z0-9]*$"/>
-            <property name="constFormat" value="^[A-Z][A-Z0-9]*(_[A-Z0-9]+)*$"/>
-            <property name="excludes" value="toString"/>
-        </module>
-        <module name="com.github.sevntu.checkstyle.checks.naming.UniformEnumConstantName">
-            <property name="formats" value="^[A-Z][a-zA-Z0-9]*$,^[A-Z][A-Z0-9]*(_[A-Z0-9]+)*$"/>
-        </module>
-
-        <!-- own additions -->
-        <module name="ArrayTrailingComma"/>
-
-        <module name="MissingOverride"/>
-        <module name="UnusedImports"/>
-    </module>
-
-    <!-- sevntu additions -->
-
-    <!-- Filters -->
-    <module name="SuppressionCommentFilter"/>
-    <module name="SuppressWithNearbyCommentFilter">
-        <property name="commentFormat" value="-@cs\[(\w{8,})\] \w[\(\)\-\.\'\`\,\:\;\w ]{10,}"/>
-        <property name="checkFormat" value="$1"/>
-        <property name="influenceFormat" value="3"/>
     </module>
 </module>
diff --git a/gradle/checkstyle.gradle b/gradle/checkstyle.gradle
index 3c7a2d11..384426e9 100644
--- a/gradle/checkstyle.gradle
+++ b/gradle/checkstyle.gradle
@@ -1,7 +1,7 @@
 apply plugin: 'checkstyle'
 
 checkstyle {
-    toolVersion = '7.6.1'
+    toolVersion = '8.2'
     configFile = rootProject.file('config/checkstyle/checkstyle.xml')
     showViolations = false
     ignoreFailures = true
@@ -18,5 +18,5 @@ checkstyleTest.enabled = false
 
 dependencies {
     checkstyle "com.puppycrawl.tools:checkstyle:$checkstyle.toolVersion"
-    checkstyle 'com.github.sevntu.checkstyle:sevntu-checks:1.23.1'
+    checkstyle 'com.github.sevntu-checkstyle:sevntu-checks:1.24.2'
 }
diff --git a/jfoenix/src/main/java/com/jfoenix/controls/JFXNodesList.java b/jfoenix/src/main/java/com/jfoenix/controls/JFXNodesList.java
index 88c995fb..d3ecd31c 100644
--- a/jfoenix/src/main/java/com/jfoenix/controls/JFXNodesList.java
+++ b/jfoenix/src/main/java/com/jfoenix/controls/JFXNodesList.java
@@ -24,7 +24,6 @@
 import javafx.animation.KeyFrame;
 import javafx.animation.KeyValue;
 import javafx.animation.Timeline;
-import javafx.geometry.Bounds;
 import javafx.scene.Node;
 import javafx.scene.control.Button;
 import javafx.scene.layout.Region;
@@ -85,8 +84,6 @@ public void addAnimatedNode(Region node, Callback<Boolean, Collection<KeyValue>>
 
         // init node property
         node.setVisible(false);
-//        node.minWidthProperty().bind(node.prefWidthProperty());
-//        node.minHeightProperty().bind(node.prefHeightProperty());
         if (this.getChildren().size() > 0) {
             initNode(node);
         } else {
@@ -114,15 +111,17 @@ public void addAnimatedNode(Region node, Callback<Boolean, Collection<KeyValue>>
 
     @Override
     protected double computePrefWidth(double height) {
-        if(!getChildren().isEmpty())
+        if (!getChildren().isEmpty()) {
             return getChildren().get(0).prefWidth(height);
+        }
         return super.computePrefWidth(height);
     }
 
     @Override
     protected double computePrefHeight(double width) {
-        if(!getChildren().isEmpty())
+        if (!getChildren().isEmpty()) {
             return getChildren().get(0).prefHeight(width);
+        }
         return super.computePrefHeight(width);
     }
 
diff --git a/jfoenix/src/main/java/com/jfoenix/controls/JFXTreeTableView.java b/jfoenix/src/main/java/com/jfoenix/controls/JFXTreeTableView.java
index a4a33db1..acf0dd5b 100644
--- a/jfoenix/src/main/java/com/jfoenix/controls/JFXTreeTableView.java
+++ b/jfoenix/src/main/java/com/jfoenix/controls/JFXTreeTableView.java
@@ -173,7 +173,7 @@ public void sort() {
     }
 
     // lock is used to force mutual exclusion while group/ungroup operation
-    Lock lock = new ReentrantLock(true);
+    private final Lock lock = new ReentrantLock(true);
 
     /**
      * this is a blocking method so it should not be called from the ui thread,