/*
 * Copyright (c) 2006-2014 DMDirc Developers
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to deal
 * in the Software without restriction, including without limitation the rights
 * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
 * copies of the Software, and to permit persons to whom the Software is
 * furnished to do so, subject to the following conditions:
 *
 * The above copyright notice and this permission notice shall be included in
 * all copies or substantial portions of the Software.
 *
 * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
 * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
 * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
 * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 * SOFTWARE.
 */

package com.dmdirc.addons.ui_swing.components.renderers;

import java.beans.IntrospectionException;
import java.beans.PropertyDescriptor;
import java.lang.reflect.Method;

import javax.swing.ListCellRenderer;

/**
 * Displays the text from the specified getter as the list cell. If the getter does not exist it
 * will fall back to the toString method.
 *
 * @param <E> the type of values this renderer can be used for
 */
public class PropertyListCellRenderer<E> extends MethodListCellRenderer<E> {

    /** Serial version UID. */
    private static final long serialVersionUID = 1L;

    /**
     * Creates a renderer.
     *
     * @param parentRenderer Parent renderer
     * @param type           Type of object to be rendered
     * @param property       The name of the property to use when rendering. The type must implement
     *                       a 'get' method for this property that returns a string.
     */
    public PropertyListCellRenderer(final ListCellRenderer<? super E> parentRenderer,
            final Class<? super E> type, final String property) {
        super(parentRenderer, getMethod(property, type));
    }

    private static <E> Method getMethod(final String property, final Class<E> type) {
        final PropertyDescriptor propertyDescriptor;
        Method readMethod;
        try {
            propertyDescriptor = new PropertyDescriptor(property, type);
            readMethod = propertyDescriptor.getReadMethod();
            if (readMethod == null || readMethod.getReturnType() != String.class) {
                readMethod = getToStringMethod(type);
            }
        } catch (IntrospectionException ex) {
            readMethod = getToStringMethod(type);
        }
        return readMethod;
    }

    private static <E> Method getToStringMethod(final Class<E> type) {
        try {
            return type.getMethod("toString");
        } catch (NoSuchMethodException | SecurityException ex1) {
            throw new IllegalStateException("Unable to access toString method", ex1);
        }
    }

}

@@ -1183,88 +1183,8 @@
 s;%0A%0A
-import java.beans.IntrospectionException;%0Aimport java.beans.PropertyDescriptor;%0A
 impo
@@ -2282,316 +2282,242 @@
     
-final PropertyDescriptor propertyDescriptor;%0A        Method readMethod;%0A        try %7B%0A            propertyDescriptor = new PropertyDescriptor(property, type);%0A            readMethod = propertyDescriptor.getReadMethod();%0A            if (readMethod == null %7C%7C readMethod.getReturnType() != String.class) %7B%0A    
+Method readMethod;%0A        try %7B%0A            readMethod = type.getMethod(%22get%22 + (property.substring(0, 1).toUpperCase() + property.%0A                    substring(1)));%0A        %7D catch (NoSuchMethodException %7C SecurityException ex) %7B%0A
     
@@ -2566,28 +2566,24 @@
 e);%0A        
-    
 %7D%0A        %7D 
@@ -2584,42 +2584,76 @@
     
-%7D catch (IntrospectionException ex
+if (readMethod == null %7C%7C readMethod.getReturnType() != String.class
 ) %7B%0A

Stop using PropertyDescriptor, it requries a getter/setter pair.