Issue #440: Fix remaining style issues in net.sf.eclipsecs.ui

Author: Calixte

config/checkstyle_sevntu_checks.xml

@@ -12,17 +12,7 @@
     <property name="file" value="config/sevntu_suppressions.xml"/>
   </module>
 
-  <module name="com.puppycrawl.tools.checkstyle.filters.SuppressionPatchFilter">
-    <property name="file" value="show.patch"/>
-    <property name="strategy" value="patchedline" />
-  </module>
-
   <module name="TreeWalker">
-    <module name="com.puppycrawl.tools.checkstyle.filters.SuppressionJavaPatchFilter">
-      <property name="file" value="show.patch"/>
-      <property name="strategy" value="patchedline" />
-    </module>
-
     <module name="SuppressWithNearbyCommentFilter">
       <property name="commentFormat" value="-@cs\[(\w{8,})\] \w[\(\)\-\.\'\`\,\:\;\w ]{10,}"/>
       <property name="checkFormat" value="$1"/>

net.sf.eclipsecs.core/src/net/sf/eclipsecs/core/util/CheckstylePluginException.java

@@ -46,7 +46,7 @@ public CheckstylePluginException(String msg) {
    * @param cause
    *          the causing exception
    */
-  private CheckstylePluginException(String msg, Throwable cause) {
+  public CheckstylePluginException(String msg, Throwable cause) {
     super(msg, cause);
   }
 

net.sf.eclipsecs.ui/src/net/sf/eclipsecs/ui/config/PropertiesContentAssistProcessor.java

@@ -47,23 +47,23 @@ public class PropertiesContentAssistProcessor
 
   @Override
   public IContextInformation[] computeContextInformation(ITextViewer viewer, int offset) {
-    return null;
+    return new IContextInformation[0];
   }
 
   @Override
   public IContextInformation[] computeContextInformation(
           IContentAssistSubjectControl contentAssistSubjectControl, int documentOffset) {
-    return null;
+    return new IContextInformation[0];
   }
 
   @Override
   public char[] getCompletionProposalAutoActivationCharacters() {
-    return null;
+    return new char[0];
   }
 
   @Override
   public char[] getContextInformationAutoActivationCharacters() {
-    return null;
+    return new char[0];
   }
 
   @Override
@@ -78,7 +78,7 @@ public IContextInformationValidator getContextInformationValidator() {
 
   @Override
   public ICompletionProposal[] computeCompletionProposals(ITextViewer viewer, int offset) {
-    return null;
+    return new ICompletionProposal[0];
   }
 
   @Override

net.sf.eclipsecs.ui/src/net/sf/eclipsecs/ui/config/configtypes/ProjectConfigurationEditor.java

@@ -260,7 +260,7 @@ public CheckConfigurationWorkingCopy getEditedWorkingCopy() throws CheckstylePlu
         mLocation.setText(location);
       } else if (!isFirstPartProject && workingSet instanceof GlobalCheckConfigurationWorkingSet) {
         throw new CheckstylePluginException(NLS
-                .bind(Messages.ProjectConfigurationEditor_msgNoProjectInWorkspace, tmp.segment(0)));
+                .bind(Messages.ProjectConfigurationEditor_msgNoProjectInWorkspace, tmp.segment(0)), ex);
       }
 
       if (ensureFileExists(location)) {

net.sf.eclipsecs.ui/src/net/sf/eclipsecs/ui/quickfixes/coding/SimplifyBooleanReturnQuickfix.java

@@ -23,6 +23,7 @@
 import java.util.Arrays;
 import java.util.Collection;
 import java.util.List;
+import java.util.Optional;
 
 import org.eclipse.jdt.core.dom.AST;
 import org.eclipse.jdt.core.dom.ASTVisitor;
@@ -86,9 +87,9 @@ protected ASTVisitor handleGetCorrectingASTVisitor(final IRegion lineInfo,
       public boolean visit(final IfStatement node) {
         if (containsPosition(node, markerStartOffset)) {
 
-          final Boolean isThenStatementTrue = isReturnStatementTrue(node.getThenStatement());
+          final Optional<Boolean> isThenStatementTrue = isReturnStatementTrue(node.getThenStatement());
 
-          if (isThenStatementTrue == null) {
+          if (isThenStatementTrue.isEmpty()) {
             // the AST structure of the if statement is not as expected
             return true;
           }
@@ -97,7 +98,7 @@ public boolean visit(final IfStatement node) {
           final boolean isNotCondition = condition != node.getExpression();
 
           final ReturnStatement replacement;
-          if (isThenStatementTrue ^ isNotCondition) {
+          if (isThenStatementTrue.get() ^ isNotCondition) {
             // create replacement: return condition;
             replacement = node.getAST().newReturnStatement();
             replacement.setExpression(copy(condition));
@@ -123,21 +124,21 @@ public boolean visit(final IfStatement node) {
         return true;
       }
 
-      private Boolean isReturnStatementTrue(final Statement node) {
-        if (node instanceof ReturnStatement) {
-          final Expression expression = ((ReturnStatement) node).getExpression();
-          if (expression instanceof BooleanLiteral) {
-            return ((BooleanLiteral) expression).booleanValue();
+      private Optional<Boolean> isReturnStatementTrue(final Statement node) {
+        if (node instanceof ReturnStatement returnStatement) {
+          final Expression expression = returnStatement.getExpression();
+          if (expression instanceof BooleanLiteral booleanLiteral) {
+            return Optional.of(booleanLiteral.booleanValue());
           }
-        } else if (node instanceof Block) {
+        } else if (node instanceof Block block) {
           // the return statement might be wrapped in a block statement
           @SuppressWarnings("unchecked")
-          final List<Statement> statements = ((Block) node).statements();
+          final List<Statement> statements = block.statements();
           if (!statements.isEmpty()) {
             return isReturnStatementTrue(statements.get(0));
           }
         }
-        return null;
+        return Optional.empty();
       }
 
       private Expression removeNotFromCondition(final Expression condition) {

net.sf.eclipsecs.ui/src/net/sf/eclipsecs/ui/util/table/EnhancedCheckBoxTableViewer.java

@@ -16,6 +16,7 @@
 import java.util.Enumeration;
 import java.util.List;
 import java.util.NoSuchElementException;
+import java.util.Objects;
 
 import org.eclipse.core.runtime.Assert;
 import org.eclipse.core.runtime.ListenerList;
@@ -585,19 +586,6 @@ public boolean containsKey(Object key) {
       return getEntry(key) != null;
     }
 
-    /**
-     * Answers an Enumeration on the values of this Hashtable. The results of the Enumeration may be
-     * affected if the contents of this Hashtable are modified.
-     *
-     * @return an Enumeration of the values of this Hashtable
-     */
-    public Enumeration<?> elements() {
-      if (elementCount == 0) {
-        return EMPTY_ENUMERATOR;
-      }
-      return new HashEnumerator(false);
-    }
-
     /**
      * Answers the value associated with the specified key in this Hashtable.
      *
@@ -673,36 +661,35 @@ public Enumeration<Object> keys() {
      * @return the old value associated with the specified key, null if the key did not exist
      */
     public Object put(Object key, Object value) {
-      if (key != null && value != null) {
-        int index = (hashCode(key) & 0x7F_FFF_FFF) % elementData.length;
-        HashMapEntry entry = elementData[index];
-        while (entry != null && !keyEquals(key, entry.key)) {
-          entry = entry.next;
+      Objects.requireNonNull(key);
+      Objects.requireNonNull(value);
+      int index = (hashCode(key) & 0x7F_FFF_FFF) % elementData.length;
+      HashMapEntry entry = elementData[index];
+      while (entry != null && !keyEquals(key, entry.key)) {
+        entry = entry.next;
+      }
+      if (entry == null) {
+        if (++elementCount > threshold) {
+          rehash();
+          index = (hashCode(key) & 0x7F_FFF_FFF) % elementData.length;
         }
-        if (entry == null) {
-          if (++elementCount > threshold) {
-            rehash();
-            index = (hashCode(key) & 0x7F_FFF_FFF) % elementData.length;
-          }
-          if (index < firstSlot) {
-            firstSlot = index;
-          }
-          if (index > lastSlot) {
-            lastSlot = index;
-          }
-          entry = new HashMapEntry(key, value);
-          entry.next = elementData[index];
-          elementData[index] = entry;
-          return null;
+        if (index < firstSlot) {
+          firstSlot = index;
+        }
+        if (index > lastSlot) {
+          lastSlot = index;
         }
-        Object result = entry.value;
-        entry.key = key;
-        // important to avoid hanging onto keys that
-        // are equal but "old" -- see bug 30607
-        entry.value = value;
-        return result;
+        entry = new HashMapEntry(key, value);
+        entry.next = elementData[index];
+        elementData[index] = entry;
+        return null;
       }
-      throw new NullPointerException();
+      Object result = entry.value;
+      entry.key = key;
+      // important to avoid hanging onto keys that
+      // are equal but "old" -- see bug 30607
+      entry.value = value;
+      return result;
     }
 
     /**