Remove this-escape compiler warnings

core/src/main/java/org/eclipse/angus/mail/util/MailConnectException.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2023 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2024 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0, which is available at
@@ -30,17 +30,19 @@
  */
 
 public class MailConnectException extends MessagingException {
-    private String host;
-    private int port;
-    private int cto;
+    private final String host;
+    private final int port;
+    private final int cto;
 
     private static final long serialVersionUID = -3818807731125317729L;
 
     /**
      * Constructs a MailConnectException.
      *
      * @param    cex    the SocketConnectException with the details
+     * @throws NullPointerException if given exception is {@code null}.
      */
+    @SuppressWarnings("this-escape")
     public MailConnectException(SocketConnectException cex) {
         super(
                 "Couldn't connect to host, port: " +
@@ -51,7 +53,7 @@ public MailConnectException(SocketConnectException cex) {
         this.host = cex.getHost();
         this.port = cex.getPort();
         this.cto = cex.getConnectionTimeout();
-        setNextException(cex.getException());
+        super.setNextException(cex.getException());
     }
 
     /**

core/src/main/java/org/eclipse/angus/mail/util/SocketConnectException.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2023 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2024 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0, which is available at
@@ -32,15 +32,15 @@ public class SocketConnectException extends IOException {
     /**
      * The socket host name.
      */
-    private String host;
+    private final String host;
     /**
      * The socket port.
      */
-    private int port;
+    private final int port;
     /**
      * The connection timeout.
      */
-    private int cto;
+    private final int cto;
     /**
      * The generated serial id.
      */
@@ -57,8 +57,7 @@ public class SocketConnectException extends IOException {
      */
     public SocketConnectException(String msg, Exception cause,
                                   String host, int port, int cto) {
-        super(msg);
-        initCause(cause);
+        super(msg, cause);
         this.host = host;
         this.port = port;
         this.cto = cto;
@@ -71,8 +70,8 @@ public SocketConnectException(String msg, Exception cause,
      */
     public Exception getException() {
         // the "cause" is always an Exception; see constructor above
-        Throwable t = getCause();
-        assert t == null || t instanceof Exception;
+        Throwable t = super.getCause();
+        assert t == null || t instanceof Exception : t;
         return (Exception) t;
     }
 

demos/client/src/main/java/example/client/ComponentFrame.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2023 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2024 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Distribution License v. 1.0, which is available at
@@ -20,6 +20,7 @@
  * @author Christopher Cotton
  */
 public class ComponentFrame extends JFrame {
+    private static final long serialVersionUID = -1L;
 
     /**
      * creates the frame
@@ -36,6 +37,7 @@ public ComponentFrame(Component what) {
      * @param what the component to display
      * @param name the name of the Frame
      */
+    @SuppressWarnings("this-escape")
     public ComponentFrame(Component what, String name) {
         super(name);
 

demos/client/src/main/java/example/client/FolderModel.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2023 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2024 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Distribution License v. 1.0, which is available at
@@ -25,12 +25,12 @@
  * @author Bill Shannon
  */
 public class FolderModel extends AbstractTableModel {
-
+    private static final long serialVersionUID = -1L;
     Folder folder;
     Message[] messages;
 
     String[] columnNames = {"Date", "From", "Subject"};
-    Class[] columnTypes = {String.class, String.class, String.class};
+    Class<?>[] columnTypes = {String.class, String.class, String.class};
 
     public void setFolder(Folder what) throws MessagingException {
         if (what != null) {
@@ -62,26 +62,31 @@ public Message getMessage(int which) {
     // Implementation of the TableModel methods
     //---------------------
 
+    @Override
     public String getColumnName(int column) {
         return columnNames[column];
     }
 
-    public Class getColumnClass(int column) {
+    @Override
+    public Class<?> getColumnClass(int column) {
         return columnTypes[column];
     }
 
 
+    @Override
     public int getColumnCount() {
         return columnNames.length;
     }
 
+    @Override
     public int getRowCount() {
         if (messages == null)
             return 0;
 
         return messages.length;
     }
 
+    @Override
     public Object getValueAt(int aRow, int aColumn) {
         switch (aColumn) {
             case 0:    // date

demos/client/src/main/java/example/client/FolderTreeNode.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2023 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2024 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Distribution License v. 1.0, which is available at
@@ -21,7 +21,7 @@
  * @author Christopher Cotton
  */
 public class FolderTreeNode extends DefaultMutableTreeNode {
-
+    private static final long serialVersionUID = -1L;
     protected Folder folder = null;
     protected boolean hasLoaded = false;
 

demos/client/src/main/java/example/client/FolderViewer.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2023 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2024 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Distribution License v. 1.0, which is available at
@@ -24,6 +24,7 @@
  * @author Bill Shannon
  */
 public class FolderViewer extends JPanel {
+    private static final long serialVersionUID = -1L;
 
     FolderModel model = new FolderModel();
     JScrollPane scrollpane;
@@ -33,6 +34,7 @@ public FolderViewer() {
         this(null);
     }
 
+    @SuppressWarnings("this-escape")
     public FolderViewer(Folder what) {
         super(new GridLayout(1, 1));
 

demos/client/src/main/java/example/client/MessageViewer.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2023 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2024 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Distribution License v. 1.0, which is available at
@@ -32,6 +32,7 @@
  * @author Bill Shannon
  */
 public class MessageViewer extends JPanel implements CommandObject {
+    private static final long serialVersionUID = -1L;
 
     Message displayed = null;
     DataHandler dataHandler = null;
@@ -43,6 +44,7 @@ public MessageViewer() {
         this(null);
     }
 
+    @SuppressWarnings("this-escape")
     public MessageViewer(Message what) {
         // set our layout
         super(new GridBagLayout());

demos/client/src/main/java/example/client/MultipartViewer.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2023 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2024 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Distribution License v. 1.0, which is available at
@@ -29,7 +29,7 @@
  * @author Christopher Cotton
  */
 public class MultipartViewer extends JPanel implements CommandObject {
-
+    private static final long serialVersionUID = -1L;
     protected DataHandler dh = null;
     protected String verb = null;
 
@@ -38,6 +38,7 @@ public MultipartViewer() {
     }
 
 
+    @Override
     public void setCommandContext(String verb, DataHandler dh) throws IOException {
         this.verb = verb;
         this.dh = dh;
@@ -157,11 +158,12 @@ public AttachmentViewer(BodyPart part) {
             bp = part;
         }
 
+        @Override
         public void actionPerformed(ActionEvent e) {
             ComponentFrame f = new ComponentFrame(
                     getComponent(bp), "Attachment");
             f.pack();
-            f.show();
+            f.setVisible(true);
         }
     }
 

demos/client/src/main/java/example/client/SimpleAuthenticator.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2023 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2024 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Distribution License v. 1.0, which is available at
@@ -116,10 +116,11 @@ protected PasswordAuthentication getPasswordAuthentication() {
         int result = JOptionPane.showConfirmDialog(frame, d, "Login",
                 JOptionPane.OK_CANCEL_OPTION, JOptionPane.QUESTION_MESSAGE);
 
-        if (result == JOptionPane.OK_OPTION)
+        if (result == JOptionPane.OK_OPTION) {
+            char[] pw = password.getPassword();
             return new PasswordAuthentication(username.getText(),
-                    password.getText());
-        else
+                    pw == null ? (String) null : new String(pw));
+        } else
             return null;
     }
 

demos/client/src/main/java/example/client/SimpleClient.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2023 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2024 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Distribution License v. 1.0, which is available at
@@ -41,7 +41,7 @@
 
 public class SimpleClient {
 
-    static Vector url = new Vector();
+    static Vector<String> url = new Vector<>();
     static FolderViewer fv;
     static MessageViewer mv;
 
@@ -60,7 +60,7 @@ public static void main(String[] argv) {
             }
         }
 
-        if (usage || url.size() == 0) {
+        if (usage || url.isEmpty()) {
             System.out.println("Usage: client.SimpleClient -L url");
             System.out.println("   where url is protocol://username:password@hostname/");
             System.exit(1);
@@ -81,6 +81,7 @@ public static void main(String[] argv) {
 
             JFrame frame = new JFrame("Simple Jakarta Mail Client");
             frame.addWindowListener(new WindowAdapter() {
+                @Override
                 public void windowClosing(WindowEvent e) {
                     System.exit(0);
                 }
@@ -96,8 +97,8 @@ public void windowClosing(WindowEvent e) {
             DefaultMutableTreeNode root = new DefaultMutableTreeNode("Root");
 
             // create a node for each store we have
-            for (Enumeration e = url.elements(); e.hasMoreElements(); ) {
-                String urlstring = (String) e.nextElement();
+            for (Enumeration<String> e = url.elements(); e.hasMoreElements(); ) {
+                String urlstring = e.nextElement();
                 URLName urln = new URLName(urlstring);
                 Store store = session.getStore(urln);
 
@@ -130,7 +131,7 @@ public void windowClosing(WindowEvent e) {
 
             frame.getContentPane().add(jsp2);
             frame.pack();
-            frame.show();
+            frame.setVisible(true);
 
         } catch (Exception ex) {
             System.out.println("SimpletClient caught exception");
@@ -143,6 +144,7 @@ public void windowClosing(WindowEvent e) {
 
 class TreePress implements TreeSelectionListener {
 
+    @Override
     public void valueChanged(TreeSelectionEvent e) {
         TreePath path = e.getNewLeadSelectionPath();
         if (path != null) {

demos/client/src/main/java/example/client/StoreTreeNode.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2023 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2024 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Distribution License v. 1.0, which is available at
@@ -23,7 +23,7 @@
  * @author Christopher Cotton
  */
 public class StoreTreeNode extends DefaultMutableTreeNode {
-
+    private static final long serialVersionUID = -1L;
     protected Store store = null;
     protected Folder folder = null;
     protected String display = null;

demos/client/src/main/java/example/client/TextViewer.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2023 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2024 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Distribution License v. 1.0, which is available at
@@ -26,13 +26,15 @@
  */
 public class TextViewer extends JPanel implements CommandObject {
 
+    private static final long serialVersionUID = -1L;
     private JTextArea text_area = null;
     private DataHandler dh = null;
     private String verb = null;
 
     /**
      * Constructor
      */
+    @SuppressWarnings("this-escape")
     public TextViewer() {
         super(new GridLayout(1, 1));