From 906fc50a087cf5fe944b452ee94e68e1cf5a744e Mon Sep 17 00:00:00 2001
From: Greg DiCristofaro <gregd@basistech.com>
Date: Wed, 18 Mar 2020 11:02:53 -0400
Subject: [PATCH] using list renderer

---
 .../optionspanel/EamDbSettingsDialog.java     |  5 +-
 .../TypedBasicComboBoxRenderer.java           | 71 -------------------
 2 files changed, 4 insertions(+), 72 deletions(-)
 delete mode 100644 Core/src/org/sleuthkit/autopsy/centralrepository/optionspanel/TypedBasicComboBoxRenderer.java

diff --git a/Core/src/org/sleuthkit/autopsy/centralrepository/optionspanel/EamDbSettingsDialog.java b/Core/src/org/sleuthkit/autopsy/centralrepository/optionspanel/EamDbSettingsDialog.java
index 09b98a7337..fda6935999 100644
--- a/Core/src/org/sleuthkit/autopsy/centralrepository/optionspanel/EamDbSettingsDialog.java
+++ b/Core/src/org/sleuthkit/autopsy/centralrepository/optionspanel/EamDbSettingsDialog.java
@@ -24,6 +24,7 @@ import java.awt.Cursor;
 import java.awt.HeadlessException;
 import java.io.File;
 import java.io.IOException;
+import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collection;
@@ -31,9 +32,11 @@ import java.util.logging.Level;
 import javax.swing.JDialog;
 import javax.swing.JFileChooser;
 import javax.swing.JFrame;
+import javax.swing.JLabel;
 import javax.swing.JList;
 import javax.swing.JOptionPane;
 import javax.swing.JTextField;
+import javax.swing.ListCellRenderer;
 import javax.swing.SwingUtilities;
 import javax.swing.event.DocumentEvent;
 import javax.swing.event.DocumentListener;
@@ -64,7 +67,7 @@ public class EamDbSettingsDialog extends JDialog {
     /**
      * This class handles displaying and rendering drop down menu for database choices in central repo.
      */
-    private class DbChoiceRenderer extends TypedBasicComboBoxRenderer<CentralRepoDbChoice> {
+    private class DbChoiceRenderer extends JLabel implements ListCellRenderer<CentralRepoDbChoice>, Serializable {
         private static final long serialVersionUID = 1L;
         
         public Component getListCellRendererComponent(
diff --git a/Core/src/org/sleuthkit/autopsy/centralrepository/optionspanel/TypedBasicComboBoxRenderer.java b/Core/src/org/sleuthkit/autopsy/centralrepository/optionspanel/TypedBasicComboBoxRenderer.java
deleted file mode 100644
index 8788651f73..0000000000
--- a/Core/src/org/sleuthkit/autopsy/centralrepository/optionspanel/TypedBasicComboBoxRenderer.java
+++ /dev/null
@@ -1,71 +0,0 @@
-/*
- * Central Repository
- *
- * Copyright 2015-2020 Basis Technology Corp.
- * Contact: carrier <at> sleuthkit <dot> org
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.sleuthkit.autopsy.centralrepository.optionspanel;
-
-import java.awt.Dimension;
-import java.io.Serializable;
-import javax.swing.JLabel;
-import javax.swing.ListCellRenderer;
-import javax.swing.border.Border;
-import javax.swing.border.EmptyBorder;
-
-/**
- * This class implements the same behavior as the BasicComboBoxRenderer while
- * providing type safety.
- * @param <E>   The object type that will be used in the combo box.
- */
-public abstract class TypedBasicComboBoxRenderer<E> extends JLabel
-implements ListCellRenderer<E>, Serializable {
-
-    protected static Border noFocusBorder = new EmptyBorder(1, 1, 1, 1);
-    private final static Border SAFE_NO_FOCUS_BORDER = new EmptyBorder(1, 1, 1, 1);
-
-    /**
-     * The main constructor for this class.
-     */
-    public TypedBasicComboBoxRenderer() {
-        super();
-        setOpaque(true);
-        setBorder(getNoFocusBorder());
-    }
-
-    private static Border getNoFocusBorder() {
-        if (System.getSecurityManager() != null) {
-            return SAFE_NO_FOCUS_BORDER;
-        } else {
-            return noFocusBorder;
-        }
-    }
-
-    @Override
-    public Dimension getPreferredSize() {
-        Dimension size;
-
-        if ((this.getText() == null) || (this.getText().equals( "" ))) {
-            setText( " " );
-            size = super.getPreferredSize();
-            setText( "" );
-        }
-        else {
-            size = super.getPreferredSize();
-        }
-
-        return size;
-    }
-}