Attachment #103272 for bug #183778

This Bugzilla instance is a read-only archive of historic NetBeans bug reports. To report a bug in NetBeans please follow the project's instructions for reporting issues.

View | Details | Raw Unified | Return to bug 183778
Collapse All | Expand All




    <!-- ACTUAL CHANGES BEGIN HERE: -->

    <changes>
        <change id="custom-icons">
            <api name="general"/>
            <summary>Icons for update centers</summary>
            <version major="1" minor="23"/>
            <date day="30" month="11" year="2010"/>
            <author login="jtulach"/>   
            <compatibility addition="yes" binary="compatible" deletion="no"
                deprecation="yes" semantic="compatible" source="compatible"  
            />
            <description>
                <p>
                Define icon when specifying an update center using 
                <code>categoryIconBase</code> attribute.
                </p>
            </description>
            <class package="org.netbeans.api.autoupdate" name="UpdateElement"/>
            <class package="org.netbeans.api.autoupdate" name="UpdateUnitProvider"/>
            <issue number="183778"/>
        </change>
        <change id="source-group-modifier">
            <api name="general"/>
            <summary>Feature enabled only when all its dependencies are enabled</summary>

Lines 1-7 Link Here

(-)a/autoupdate.services/manifest.mf (-1 / +1 lines)
1	Manifest-Version: 1.0	1	Manifest-Version: 1.0
2	OpenIDE-Module: org.netbeans.modules.autoupdate.services	2	OpenIDE-Module: org.netbeans.modules.autoupdate.services
3	OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/autoupdate/services/resources/Bundle.properties	3	OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/autoupdate/services/resources/Bundle.properties
4	OpenIDE-Module-Specification-Version: 1.22	4	OpenIDE-Module-Specification-Version: 1.23
5	OpenIDE-Module-Layer: org/netbeans/modules/autoupdate/services/resources/layer.xml	5	OpenIDE-Module-Layer: org/netbeans/modules/autoupdate/services/resources/layer.xml
6	AutoUpdate-Show-In-Client: false	6	AutoUpdate-Show-In-Client: false
7	AutoUpdate-Essential-Module: true	7	AutoUpdate-Essential-Module: true





package org.netbeans.api.autoupdate;

import java.awt.Image;
import java.util.List;
import org.netbeans.modules.autoupdate.services.UpdateElementImpl;
import org.netbeans.api.autoupdate.UpdateUnitProvider.CATEGORY;
import org.netbeans.modules.autoupdate.services.UpdateUnitProviderImpl;

/** Instances provided by the <code>UpdateUnit</code> which represents specific version
 * of update (e.g. module or feature). The <code>UpdateElement</code> can be installed,

    /**
     * @return <code>UpdateUnitProvider.CATEGORY</code> for a quality classification 
     * for update represented by this instance
     * @deprecated Use {@link #getSourceIcon()} and {@link #getSourceDescription()}.
     */
    @Deprecated
    public CATEGORY getSourceCategory () {
        UpdateUnitProvider provider = getUpdateUnitProvider();
        return (provider != null) ? provider.getCategory() : CATEGORY.COMMUNITY;
    }
    
    /** Provides an icon associated with the provider of this update element. 
     * @return icon representing the provider of this element
     * @since 1.23
     * @see UpdateUnitProvider#getSourceIcon() 
     */
    public Image getSourceIcon() {
        UpdateUnitProvider provider = getUpdateUnitProvider();
        return provider != null ? provider.getSourceIcon() : null;
    }
    
    /** Description of the provider of this element. 
     * @return textual description of the provider of this element
     * @since 1.23
     * @see UpdateUnitProvider#getSourceDescription()
     */
    public String getSourceDescription() {
        UpdateUnitProvider provider = getUpdateUnitProvider();
        return provider != null ? provider.getSourceDescription() : null;
    }
    
    private UpdateUnitProvider getUpdateUnitProvider() {
        String source = getSource();
        UpdateUnitProvider retval = null;

Lines 44-49 Link Here

(-)a/autoupdate.services/src/org/netbeans/api/autoupdate/UpdateUnitProvider.java (-1 / +22 lines)
44		44
45	package org.netbeans.api.autoupdate;	45	package org.netbeans.api.autoupdate;
46		46
		47	import java.awt.Image;
47	import org.netbeans.spi.autoupdate.*;	48	import org.netbeans.spi.autoupdate.*;
48	import java.io.IOException;	49	import java.io.IOException;
49	import java.net.URL;	50	import java.net.URL;
Lines 106-115 Link Here
106	return impl.getDescription ();	107	return impl.getDescription ();
107	}	108	}
108		109
109		110
		111	/** @deprecated Use {@link #getSourceIcon()} and {@link #getSourceDescription()}.
		112	*/
		113	@Deprecated
110	public CATEGORY getCategory() {	114	public CATEGORY getCategory() {
111	return impl.getCategory();	115	return impl.getCategory();
112	}	116	}
		117
		118	/** The icon associated with this provider.
		119	* @since 1.23
		120	* @see UpdateElement#getSourceIcon()
		121	*/
		122	public Image getSourceIcon() {
		123	return impl.getSourceIcon();
		124	}
		125
		126	/** The description of this provider. Usually associated with {@link #getSourceIcon()}
		127	* @since 1.23
		128	* @return textual description of the provider
		129	* @see UpdateElement#getSourceDescription()
		130	*/
		131	public String getSourceDescription() {
		132	return impl.getSourceDescription();
		133	}
113		134
114	/** It's special support for <code>UpdateProvider</code> based on Autoupdate Catalog.	135	/** It's special support for <code>UpdateProvider</code> based on Autoupdate Catalog.
115	* It's most kind of Update Providers and have a special support in UI.	136	* It's most kind of Update Providers and have a special support in UI.





package org.netbeans.api.autoupdate;

import java.awt.Image;
import java.io.File;
import java.io.IOException;
import java.net.URL;
import java.util.List;
import org.netbeans.api.progress.ProgressHandle;
import org.netbeans.modules.autoupdate.services.UpdateUnitProviderImpl;
import org.netbeans.modules.autoupdate.updateprovider.ProviderCategory;

/** The factory handles <code>UpdateUnitProvider</code>, allow to create or removed them,
 * browse the providers or refresh its content.

     * comming from returned <code>UpdateUnitProvider</code>
     * @return URL-based UpdateUnitProvider
     */        
    public UpdateUnitProvider create (String name, String displayName, URL url, UpdateUnitProvider.CATEGORY category) {
        return UpdateUnitProviderImpl.createUpdateUnitProvider (name, displayName, url, ProviderCategory.forValue(category));
    }

    public UpdateUnitProvider create (String name, String displayName, URL url, String categoryIconBase, String categoryDisplayName) {
        return UpdateUnitProviderImpl.createUpdateUnitProvider (name, displayName, url, ProviderCategory.create(categoryIconBase, categoryDisplayName));
    }

    /** Creates new <code>UpdateUnitProvider</code> and store its preferences. The new provider 

     * @return URL-based UpdateUnitProvider
     */    
    public UpdateUnitProvider create (String name, String displayName, URL url) {
        return UpdateUnitProviderImpl.createUpdateUnitProvider (name, displayName, url, ProviderCategory.forValue(UpdateUnitProvider.CATEGORY.COMMUNITY));
    }
    
    /** Creates new <code>UpdateUnitProvider</code> for temporary usage. This provider contains





package org.netbeans.modules.autoupdate.services;

import java.awt.Image;
import java.io.File;
import org.netbeans.api.autoupdate.*;
import org.netbeans.spi.autoupdate.*;

import org.openide.util.LookupEvent;
import org.openide.util.LookupListener;
import org.netbeans.api.autoupdate.UpdateUnitProvider.CATEGORY;
import org.netbeans.modules.autoupdate.updateprovider.ProviderCategory;
import org.openide.filesystems.FileUtil;
import org.openide.util.ImageUtilities;


/** <code>UpdateProvider</code> providers items for Autoupdate infrastructure. The items

public final class UpdateUnitProviderImpl {

    private UpdateProvider provider;
    private static final Logger err = Logger.getLogger ("org.netbeans.modules.autoupdate.services.UpdateUnitProviderImpl");
    private static final String REMOVED_MASK ="_removed";
    private static final String URL = "url";
    private static final String DISPLAY_NAME = "displayName";    

    public CATEGORY getCategory() {
        return getUpdateProvider().getCategory();
    }
    public Image getSourceIcon() {
        UpdateProvider up = getUpdateProvider();
        if (up instanceof AutoupdateCatalogProvider) {
            return ((AutoupdateCatalogProvider)up).getProviderCategory().getIcon();
        }
        return ProviderCategory.forValue(CATEGORY.COMMUNITY).getIcon();
    }
    public String getSourceDescription() {
        UpdateProvider up = getUpdateProvider();
        if (up instanceof AutoupdateCatalogProvider) {
            return ((AutoupdateCatalogProvider) up).getProviderCategory().getDisplayName();
        }
        return ProviderCategory.forValue(CATEGORY.COMMUNITY).getDisplayName();
    }

    
    
    /** Display name of provider. This display name can be visualized in UI.
     * 

    }

    public static UpdateUnitProvider createUpdateUnitProvider (String codeName, String displayName, URL url) {
        return createUpdateUnitProvider(codeName, displayName, url, ProviderCategory.forValue(CATEGORY.COMMUNITY));
    }
    
    // static factory methods
    public static UpdateUnitProvider createUpdateUnitProvider (String codeName, String displayName, URL url, ProviderCategory category) {
        codeName = normalizeCodeName (codeName);
        // store to Preferences
        storeProvider(codeName, displayName, url);

        
        String toUrl = providerPreferences.get (URL, providerPreferences.get (AutoupdateCatalogFactory.ORIGINAL_URL, null));
        String displayName = providerPreferences.get (DISPLAY_NAME, providerPreferences.get (AutoupdateCatalogFactory.ORIGINAL_DISPLAY_NAME, codeName));
        String categoryName = providerPreferences.get (CATEGORY_NAME, providerPreferences.get (AutoupdateCatalogFactory.ORIGINAL_CATEGORY_NAME, CATEGORY.COMMUNITY.name()));
        String categoryIconBase = providerPreferences.get(AutoupdateCatalogFactory.ORIGINAL_CATEGORY_ICON_BASE, null);
        ProviderCategory pc;
        if (categoryIconBase == null) {
            pc = ProviderCategory.forValue(CATEGORY.valueOf(categoryName));
        } else {
            pc = ProviderCategory.create(categoryIconBase, categoryName);
        }
        
        // filter Providers which store only its state
        if (toUrl == null) {

        } catch (MalformedURLException mue) {
            assert false : mue;
        }
        return new AutoupdateCatalogProvider (codeName, displayName, url, pc);
        return new AutoupdateCatalogProvider (codeName, displayName, url, category);
    }
    
    private static boolean loadState (String codename) {

            }
        }
    }

    private static class LookupListenerImpl implements LookupListener {
        final Lookup.Result<UpdateProvider> result = Lookup.getDefault ().lookupResult(UpdateProvider.class);
        




    public static final String ORIGINAL_DISPLAY_NAME = "originalDisplayName"; // NOI18N
    public static final String ORIGINAL_ENABLED = "originalEnabled"; // NOI18N
    public static final String ORIGINAL_CATEGORY_NAME = "originalCategoryName"; // NOI18N
    public static final String ORIGINAL_CATEGORY_ICON_BASE = "originalCategoryIconBase"; // NOI18N
    
    public static UpdateProvider createUpdateProvider (FileObject fo) {
        String sKey = (String) fo.getAttribute ("url_key"); // NOI18N

        }
        url = modifyURL (url);
        String categoryName = (String) fo.getAttribute ("category"); // NOI18N    
        String categoryIconBase = (String) fo.getAttribute ("categoryIconBase"); // NOI18N
        AutoupdateCatalogProvider au_catalog = new AutoupdateCatalogProvider(name, displayName(fo), url, category);
        
        Preferences providerPreferences = getPreferences().node(name);
        ProviderCategory pc;
        if (categoryIconBase != null) {
            pc = ProviderCategory.create(categoryIconBase, categoryName);
            providerPreferences.put (ORIGINAL_CATEGORY_ICON_BASE, categoryIconBase);
        } else {
            CATEGORY category = (categoryName != null) ? CATEGORY.valueOf(categoryName) : CATEGORY.COMMUNITY;
            pc = ProviderCategory.forValue(category);
        }
        AutoupdateCatalogProvider au_catalog = new AutoupdateCatalogProvider(name, displayName(fo), url, pc);
        providerPreferences.put (ORIGINAL_URL, url.toExternalForm ());
        providerPreferences.put (ORIGINAL_DISPLAY_NAME, au_catalog.getDisplayName ());
        providerPreferences.put (ORIGINAL_CATEGORY_NAME, au_catalog.getCategory().name());        
        
        Boolean en = (Boolean) fo.getAttribute("enabled"); // NOI18N        
        if (en != null) {
            providerPreferences.putBoolean (ORIGINAL_ENABLED, en);




    private final String codeName;
    private String displayName;
    private AutoupdateCatalogCache cache = AutoupdateCatalogCache.getDefault ();
    private static final Logger log = Logger.getLogger ("org.netbeans.modules.autoupdate.updateprovider.AutoupdateCatalog");
    private String description = null;
    private boolean descriptionInitialized = false;
    private ProviderCategory category = null;

    public AutoupdateCatalogProvider (String name, String displayName, URL updateCenter) {
        this(name, displayName, updateCenter, ProviderCategory.forValue(CATEGORY.COMMUNITY));
    }
    
    /**
     * Creates a new instance of AutoupdateCatalog
     */
    public AutoupdateCatalogProvider (String name, String displayName, URL updateCenter, ProviderCategory category) {
        Parameters.notNull("name", name);
        this.codeName = name;
        this.displayName = displayName;
        this.updateCenter = updateCenter;
        this.category = category;
    }
    public AutoupdateCatalogProvider (String name, String displayName, URL updateCenter, CATEGORY category) {
        this(name, displayName, updateCenter, ProviderCategory.forValue(category));
    }
    
    public String getName () {

        return displayName + "[" + codeName + "] to " + updateCenter;
    }

    @Override
    public CATEGORY getCategory() {
        return category.toEnum();
    }    
    
    public ProviderCategory getProviderCategory() {
        return category;
    }
}

Lines 7-9 Link Here

(-)a/autoupdate.services/src/org/netbeans/modules/autoupdate/updateprovider/Bundle.properties (+4 lines)
7	ArtificialFeaturesProvider_Unsorted_Category=Uncategorized	7	ArtificialFeaturesProvider_Unsorted_Category=Uncategorized
8	ArtificialFeaturesProvider_Features_Category=Features	8	ArtificialFeaturesProvider_Features_Category=Features
9	NetworkAccess_Timeout=Timeout while opening connection to {0}	9	NetworkAccess_Timeout=Timeout while opening connection to {0}
		10
		11	AvailableTab_SourceCategory_Tooltip_STANDARD=Certified Plugin
		12	AvailableTab_SourceCategory_Tooltip_BETA=Beta Plugin
		13	AvailableTab_SourceCategory_Tooltip_COMMUNITY=Community Contributed Plugin




/*
 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 *
 * Copyright 2010 Oracle and/or its affiliates. All rights reserved.
 *
 * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
 * Other names may be trademarks of their respective owners.
 *
 * The contents of this file are subject to the terms of either the GNU
 * General Public License Version 2 only ("GPL") or the Common
 * Development and Distribution License("CDDL") (collectively, the
 * "License"). You may not use this file except in compliance with the
 * License. You can obtain a copy of the License at
 * http://www.netbeans.org/cddl-gplv2.html
 * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
 * specific language governing permissions and limitations under the
 * License.  When distributing the software, include this License Header
 * Notice in each file and include the License file at
 * nbbuild/licenses/CDDL-GPL-2-CP.  Oracle designates this
 * particular file as subject to the "Classpath" exception as provided
 * by Oracle in the GPL Version 2 section of the License file that
 * accompanied this code. If applicable, add the following below the
 * License Header, with the fields enclosed by brackets [] replaced by
 * your own identifying information:
 * "Portions Copyrighted [year] [name of copyright owner]"
 *
 * If you wish your version of this file to be governed by only the CDDL
 * or only the GPL Version 2, indicate your decision by adding
 * "[Contributor] elects to include this software in this distribution
 * under the [CDDL or GPL Version 2] license." If you do not indicate a
 * single choice of license, a recipient has the option to distribute
 * your version of this file under either the CDDL, the GPL Version 2 or
 * to extend the choice of license to its licensees as provided above.
 * However, if you add GPL Version 2 code and therefore, elected the GPL
 * Version 2 license, then the option applies only if the new code is
 * made subject to such option by the copyright holder.
 *
 * Contributor(s):
 *
 * Portions Copyrighted 2010 Sun Microsystems, Inc.
 */

package org.netbeans.modules.autoupdate.updateprovider;

import java.awt.Image;
import org.netbeans.api.autoupdate.UpdateUnitProvider.CATEGORY;
import org.openide.util.ImageUtilities;
import org.openide.util.NbBundle;

/** Represents provider category.
 *
 * @author Jaroslav Tulach <jtulach@netbeans.org>
 */
public final class ProviderCategory {
    private final String displayName;
    private final String iconBase;
    private final CATEGORY category;

    private ProviderCategory(String displayName, String iconBase, CATEGORY category) {
        assert (category != null) != (displayName != null && iconBase != null) : 
            "Category: " + category + " displayName: " + displayName
                    + " iconBase: " + iconBase;
        this.displayName = displayName;
        this.iconBase = iconBase;
        this.category = category;
    }

    public static ProviderCategory create(String iconBase, String categoryDisplayName) {
        return new ProviderCategory(categoryDisplayName, iconBase, null);
    }
    public String getDisplayName() {
        return category != null ? getCategoryName(category) : displayName; 
    }
    public Image getIcon() {
        return ImageUtilities.loadImage(getIconBase());
    }
    
    public static ProviderCategory forValue(CATEGORY c) {
        return new ProviderCategory(null, null, c);
    }

    CATEGORY toEnum() {
        return category == null ? CATEGORY.COMMUNITY : category;
    }
    
    static String getCategoryName(CATEGORY category) {
        String key = null;
        switch (category) {
            case STANDARD:
                key = "AvailableTab_SourceCategory_Tooltip_STANDARD"; //NOI18N
                break;
            case BETA:
                key = "AvailableTab_SourceCategory_Tooltip_BETA"; //NOI18N
                break;
            case COMMUNITY:
                key = "AvailableTab_SourceCategory_Tooltip_COMMUNITY"; //NOI18N
                break;
        }
        return (key != null) ? NbBundle.getMessage(ProviderCategory.class, key) : null;
    }
    
    String getIconBase() {
        if (iconBase != null) {
            return iconBase;
        }
        switch (category) {
            case BETA: 
                return "org/netbeans/modules/autoupdate/services/resources/icon-beta.png"; // NOI18N
            case STANDARD:
                return "org/netbeans/modules/autoupdate/services/resources/icon-standard.png"; // NOI18N
            default:
                return "org/netbeans/modules/autoupdate/services/resources/icon-community.png"; // NOI18N
        }
    }
}





package org.netbeans.api.autoupdate;

import java.net.URL;
import java.util.List;
import junit.framework.TestCase;
import org.netbeans.api.autoupdate.UpdateUnitProvider.CATEGORY;
import org.netbeans.api.progress.ProgressHandle;
import org.netbeans.junit.NbTestCase;
import org.openide.filesystems.Repository;

/**
 *

Lines 170-176 Link Here

(-)a/autoupdate.services/test/unit/src/org/netbeans/modules/autoupdate/services/UpdateUnitProviderImplTest.java (-1 / +4 lines)
170	String displayName = "2nd Update Provider";	170	String displayName = "2nd Update Provider";
171	URL url = URL_TO_TEST_CATALOG;	171	URL url = URL_TO_TEST_CATALOG;
172		172
173	UpdateUnitProvider newProvider = UpdateUnitProviderImpl.createUpdateUnitProvider(codeName, displayName, url, CATEGORY.COMMUNITY);	173	UpdateUnitProvider newProvider = UpdateUnitProviderImpl.createUpdateUnitProvider(
		174	codeName, displayName, url,
		175	ProviderCategory.forValue(CATEGORY.COMMUNITY)
		176	);
174	assertNotNull(codeName + " provider found.", newProvider);	177	assertNotNull(codeName + " provider found.", newProvider);
175		178
176	result = UpdateUnitProviderImpl.getUpdateUnitProviders(false);	179	result = UpdateUnitProviderImpl.getUpdateUnitProviders(false);

Lines 40-68 Link Here

(-)a/autoupdate.services/test/unit/src/org/netbeans/modules/autoupdate/updateprovider/AutoupdateCatalogFactoryTest.java (-8 / +27 lines)
40	* Portions Copyrighted 2010 Sun Microsystems, Inc.	40	* Portions Copyrighted 2010 Sun Microsystems, Inc.
41	*/	41	*/
42		42
43	package org.netbeans.modules.autoupdate.updateprovider;	43	package org.netbeans.modules.autoupdate.services;
44		44
		45	import org.netbeans.modules.autoupdate.updateprovider.*;
		46	import java.awt.Image;
45	import java.net.URL;	47	import java.net.URL;
		48	import org.netbeans.api.autoupdate.UpdateUnitProvider;
		49	import org.netbeans.api.autoupdate.UpdateUnitProviderFactory;
46	import org.netbeans.junit.NbTestCase;	50	import org.netbeans.junit.NbTestCase;
47	import org.netbeans.spi.autoupdate.UpdateProvider;	51	import org.netbeans.spi.autoupdate.UpdateProvider;
48	import org.openide.filesystems.FileObject;	52	import org.openide.filesystems.FileObject;
49	import org.openide.filesystems.FileUtil;	53	import org.openide.filesystems.FileUtil;
		54	import org.openide.util.ImageUtilities;
50		55
51	public class AutoupdateCatalogFactoryTest extends NbTestCase {	56	public class UpdateUnitProviderTest extends NbTestCase {
52		57
53	public AutoupdateCatalogFactoryTest(String n) {	58	public UpdateUnitProviderTest(String n) {
54	super(n);	59	super(n);
55	}	60	}
56		61
57	public void testCreateUpdateProvider() throws Exception {	62	public void testCreateUpdateProviderWithOwnIcon() throws Exception {
58	FileObject f = FileUtil.getConfigRoot().createData("whatever.instance");	63	FileObject f = FileUtil.getConfigRoot().createData("whatever.instance");
59	f.setAttribute("url", "file:/wherever.xml");	64	f.setAttribute("url", "file:/wherever.xml");
60	f.setAttribute("displayName", "Whatever");	65	f.setAttribute("displayName", "Whatever");
		66	f.setAttribute("category", "Jarda's Updates");
		67	f.setAttribute("categoryIconBase", "org/netbeans/modules/autoupdate/services/resources/icon-standard.png");
61	UpdateProvider up = AutoupdateCatalogFactory.createUpdateProvider(f);	68	UpdateProvider up = AutoupdateCatalogFactory.createUpdateProvider(f);
62	assertEquals("whatever", up.getName());	69	UpdateUnitProvider uup = Trampoline.API.createUpdateUnitProvider (new UpdateUnitProviderImpl (up));
63	assertEquals("Whatever", up.getDisplayName());	70	assertEquals("whatever", uup.getName());
64	assertEquals(AutoupdateCatalogProvider.class, up.getClass());	71	assertEquals("Whatever", uup.getDisplayName());
65	assertEquals(new URL("file:/wherever.xml"), ((AutoupdateCatalogProvider) up).getUpdateCenterURL());	72	assertEquals(new URL("file:/wherever.xml"), uup.getProviderURL());
		73	Image img = ImageUtilities.loadImage("org/netbeans/modules/autoupdate/services/resources/icon-standard.png");
		74	assertEquals("Icons are the same", img, uup.getSourceIcon());
66	}	75	}
67		76
		77	public void testFactoryMethodsAndIcons() throws Exception {
		78	Image img = ImageUtilities.loadImage("org/netbeans/modules/autoupdate/services/resources/icon-standard.png");
		79	UpdateUnitProvider res = UpdateUnitProviderFactory.getDefault().create(
		80	"code-name", "Whatever", new URL("file:/whereever.xml"),
		81	"org/netbeans/modules/autoupdate/services/resources/icon-standard.png", "my category"
		82	);
		83	assertEquals("code-name", res.getName());
		84	assertEquals("Whatever", res.getDisplayName());
		85	assertEquals("Good image", img, res.getSourceIcon());
		86	}
68	}	87	}

Lines 19-25 Link Here

(-)a/autoupdate.ui/nbproject/project.xml (-1 / +1 lines)
19	<build-prerequisite/>	19	<build-prerequisite/>
20	<compile-dependency/>	20	<compile-dependency/>
21	<run-dependency>	21	<run-dependency>
22	<specification-version>1.12</specification-version>	22	<specification-version>1.23</specification-version>
23	</run-dependency>	23	</run-dependency>
24	</dependency>	24	</dependency>
25	<dependency>	25	<dependency>





package org.netbeans.modules.autoupdate.ui;

import java.awt.Image;
import java.util.Comparator;
import java.util.HashSet;
import java.util.List;

import org.netbeans.api.autoupdate.OperationContainer.OperationInfo;
import org.netbeans.api.autoupdate.UpdateElement;
import org.netbeans.api.autoupdate.UpdateUnit;
import org.netbeans.api.autoupdate.UpdateUnitProvider.CATEGORY;
import org.openide.DialogDisplayer;
import org.openide.NotifyDescriptor;
import org.openide.util.NbBundle;

            res = u.getCategoryName();
            break;
        case 3 :
            res = u.getSourceIcon();
            break;
        }
        

            res = String.class;
            break;
        case 3 :
            res = Image.class;
            break;
        }
        

    @Override
    public String getToolTipText(int row, int col) {
        if (col == 3) {
            Unit.Available u = (Unit.Available) getUnitAtRow(row);
            return u.getSourceDescription();
        }
        return super.getToolTipText(row, col);
    }

    @Override
    public int getPreferredWidth(JTableHeader header, int col) {
        final int minWidth = super.getMinWidth(header, col);
        switch (col) {

Lines 21-29 Link Here

(-)a/autoupdate.ui/src/org/netbeans/modules/autoupdate/ui/Bundle.properties (-3 lines)
21	UnitTab_ActivateCategoryAction=Activate Category	21	UnitTab_ActivateCategoryAction=Activate Category
22	UnitTab_DeactivateAction=&Deactivate	22	UnitTab_DeactivateAction=&Deactivate
23	UnitTab_DeactivateCategoryAction=Deactivate Category	23	UnitTab_DeactivateCategoryAction=Deactivate Category
24	AvailableTab_SourceCategory_Tooltip_STANDARD=Certified Plugin
25	AvailableTab_SourceCategory_Tooltip_BETA=Beta Plugin
26	AvailableTab_SourceCategory_Tooltip_COMMUNITY=Community Contributed Plugin
27	InstallTab_Active_Tooltip=Active	24	InstallTab_Active_Tooltip=Active
28	InstallTab_InActive_Tooltip=Inactive	25	InstallTab_InActive_Tooltip=Inactive
29	InstallTab_PendingForInstall_Tooltip=Application restart needed to complete installation	26	InstallTab_PendingForInstall_Tooltip=Application restart needed to complete installation




package org.netbeans.modules.autoupdate.ui;

import java.awt.Image;
import java.net.URL;
import java.util.HashMap;
import java.util.Map;
import javax.swing.ImageIcon;
import javax.swing.text.html.*;
import javax.swing.text.*;
import org.netbeans.api.autoupdate.UpdateUnitProvider.CATEGORY;

/**
 * @author Radek Matous
 */
public class HTMLEditorKitEx extends HTMLEditorKit {
    private static final Map<URL,ImageIcon> ICONS = new HashMap<URL,ImageIcon>();
    static {
        URL u_standard = Utilities.getCategoryIcon(CATEGORY.STANDARD);
        ICONS.put(u_standard, new ImageIcon(u_standard));

        URL u_beta = Utilities.getCategoryIcon(CATEGORY.BETA);
        ICONS.put(u_beta, new ImageIcon(u_beta));

        URL u_community = Utilities.getCategoryIcon(CATEGORY.COMMUNITY);
        ICONS.put(u_community, new ImageIcon(u_community));
    }

    public ViewFactory getViewFactory() {
        return new HTMLFactory() {


        @Override
        public Image getImage() {
            return super.getImage();
            return (img != null) ? img.getImage() : super.getImage();
        }
    }
}

Lines 1-4 Link Here

(-)a/autoupdate.ui/src/org/netbeans/modules/autoupdate/ui/SettingsTab.form (-1 / +1 lines)
1	<?xml version="1.0" encoding="UTF-8" ?>	1	<?xml version="1.1" encoding="UTF-8" ?>
2		2
3	<Form version="1.4" maxVersion="1.4" type="org.netbeans.modules.form.forminfo.JPanelFormInfo">	3	<Form version="1.4" maxVersion="1.4" type="org.netbeans.modules.form.forminfo.JPanelFormInfo">
4	<NonVisualComponents>	4	<NonVisualComponents>




import java.awt.Component;
import java.awt.Dimension;
import java.awt.EventQueue;
import java.awt.Image;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
import java.io.File;

import javax.swing.AbstractAction;
import javax.swing.Action;
import javax.swing.DefaultComboBoxModel;
import javax.swing.Icon;
import javax.swing.JButton;
import javax.swing.JLabel;
import javax.swing.JScrollPane;
import javax.swing.JTable;
import javax.swing.ListSelectionModel;
import javax.swing.SwingConstants;
import javax.swing.SwingUtilities;
import javax.swing.UIManager;
import javax.swing.event.ListSelectionEvent;
import javax.swing.event.ListSelectionListener;

import javax.swing.table.TableColumn;
import javax.swing.table.TableColumnModel;
import org.netbeans.api.autoupdate.UpdateUnitProvider;
import org.netbeans.api.autoupdate.UpdateUnitProvider.CATEGORY;
import org.netbeans.api.options.OptionsDisplayer;
import org.netbeans.modules.autoupdate.ui.actions.AutoupdateSettings;
import org.openide.DialogDescriptor;


            if (value instanceof UpdateUnitProvider) {
                UpdateUnitProvider u = (UpdateUnitProvider) value;
                Image img = u.getSourceIcon();
                final Icon icon = ImageUtilities.image2Icon(img);
                renderComponent.setIcon(icon);
                } else if (CATEGORY.COMMUNITY.equals(state)) {
                    renderComponent.setIcon(ImageUtilities.loadImageIcon("org/netbeans/modules/autoupdate/ui/resources/icon-community.png", false)); // NOI18N
                } else if (CATEGORY.STANDARD.equals(state)) {
                    renderComponent.setIcon(ImageUtilities.loadImageIcon("org/netbeans/modules/autoupdate/ui/resources/icon-standard.png", false)); // NOI18N
                }
                renderComponent.setText (u.getDisplayName());
                renderComponent.setHorizontalAlignment(SwingConstants.LEFT);
            }





package org.netbeans.modules.autoupdate.ui;

import java.awt.Image;
import java.text.Collator;
import java.text.DateFormat;
import java.text.ParseException;

import org.netbeans.api.autoupdate.UpdateElement;
import org.netbeans.api.autoupdate.UpdateManager;
import org.netbeans.api.autoupdate.UpdateUnit;
import org.netbeans.api.autoupdate.UpdateUnitProvider.CATEGORY;
import org.netbeans.modules.autoupdate.ui.UnitCategoryTableModel.Type;
import org.openide.modules.SpecificationVersion;
import org.openide.util.NbBundle;

            if (u1 instanceof Unit.Available && u2 instanceof Unit.Available) {
                Unit.Available unit1 = (Unit.Available)u1;
                Unit.Available unit2 = (Unit.Available)u2;
                return Collator.getInstance().compare(unit1.getSourceDescription(), unit2.getSourceDescription());
            }
            
            throw new IllegalStateException();

            return (isNbms) ? UnitCategoryTableModel.Type.LOCAL : UnitCategoryTableModel.Type.AVAILABLE;
        }        
        
        public Image getSourceIcon() {
            return updateEl.getSourceIcon();
        }
        public String getSourceDescription() {
            return updateEl.getSourceDescription();
        }
    }





package org.netbeans.modules.autoupdate.ui;

import java.awt.Color;
import java.awt.Image;
import java.io.CharConversionException;
import java.net.URL;
import java.util.ArrayList;
import java.util.Comparator;
import java.util.HashSet;

import org.netbeans.api.autoupdate.UpdateElement;
import org.netbeans.api.autoupdate.UpdateManager;
import org.netbeans.api.autoupdate.UpdateUnit;
import org.netbeans.api.autoupdate.UpdateUnitProvider.CATEGORY;
import org.openide.util.NbBundle;
import org.openide.util.RequestProcessor;
import org.openide.xml.XMLUtil;

        StringBuilder text = new StringBuilder();
        if (u instanceof Unit.Available) {
            Unit.Available u1 = (Unit.Available) u;
            Image c = u1.getSourceIcon();
            String categoryName = u1.getSourceDescription();
            URL icon = Utilities.getCategoryIcon(c);
            text.append("<table border=\"0\" cellpadding=\"0\" cellspacing=\"0\"><tr>");
// XXX: regression?           text.append("<td><img src=\"" + icon.toExternalForm() + "\"></img></td>");
            text.append("<td></td>");
            text.append("<td>&nbsp;&nbsp;</td>");
            text.append("<td><b>" + categoryName + "</b></td>");
            text.append("</tr></table><br>");




import org.netbeans.modules.autoupdate.ui.wizards.InstallUnitWizard;
import java.awt.Component;
import java.awt.Cursor;
import java.awt.Image;
import java.awt.Point;
import java.awt.Rectangle;
import java.awt.event.ActionEvent;

import org.netbeans.api.autoupdate.OperationContainer.OperationInfo;
import org.netbeans.api.autoupdate.UpdateManager;
import org.netbeans.api.autoupdate.UpdateUnit;
import org.netbeans.api.autoupdate.UpdateUnitProvider.CATEGORY;
import org.netbeans.api.progress.ProgressHandle;
import org.netbeans.api.progress.ProgressHandleFactory;
import org.netbeans.modules.autoupdate.ui.wizards.OperationWizardModel.OperationType;

                JTable table, Object value, boolean isSelected, boolean hasFocus, int row, int column) {
            JLabel renderComponent = (JLabel)super.getTableCellRendererComponent (table, value, isSelected, hasFocus, row, column);
            
            if (value instanceof Image) {
                Unit u = model.getUnitAtRow (row);
                if (u instanceof Unit.Available) {
                    Unit.Available a = (Unit.Available)u;
                    renderComponent.setIcon(ImageUtilities.image2Icon(a.getSourceIcon()));
                    URL icon = Utilities.getCategoryIcon(state);
                    renderComponent.setIcon(new ImageIcon(icon));
                    renderComponent.setText ("");
                    renderComponent.setHorizontalAlignment (SwingConstants.CENTER);
                }




import org.openide.util.NbBundle;
import org.openide.util.NbPreferences;
import org.openide.util.RequestProcessor;
import org.netbeans.api.autoupdate.UpdateUnitProvider.CATEGORY;
import org.netbeans.modules.autoupdate.ui.actions.Installer;
import org.netbeans.modules.autoupdate.ui.actions.ShowNotifications;
import org.openide.util.Task;

        return NbPreferences.forModule (Utilities.class);
    }
    
    static String getCategoryName(CATEGORY category) {
        String key = null;
        switch (category) {
            case STANDARD:
                key = "AvailableTab_SourceCategory_Tooltip_STANDARD"; //NOI18N
                break;
            case BETA:
                key = "AvailableTab_SourceCategory_Tooltip_BETA"; //NOI18N
                break;
            case COMMUNITY:
                key = "AvailableTab_SourceCategory_Tooltip_COMMUNITY"; //NOI18N
                break;
        }
        return (key != null) ? getBundle(key) : null;
    }
    
    static URL getCategoryIcon(CATEGORY state) {
        URL retval = null;
        if (CATEGORY.BETA.equals(state)) {
            retval = Utilities.class.getResource("/org/netbeans/modules/autoupdate/ui/resources/icon-beta.png"); // NOI18N
        } else if (CATEGORY.COMMUNITY.equals(state)) {
            retval = Utilities.class.getResource("/org/netbeans/modules/autoupdate/ui/resources/icon-community.png"); // NOI18N
        } else if (CATEGORY.STANDARD.equals(state)) {
            retval = Utilities.class.getResource("/org/netbeans/modules/autoupdate/ui/resources/icon-standard.png"); // NOI18N
        }
        return retval;
    }    
}

Return to bug 183778

Lines 85-91 Link Here

(-)a/autoupdate.ui/src/org/netbeans/modules/autoupdate/ui/Utilities.java (-28 lines)
85	import org.openide.util.NbBundle;	85	import org.openide.util.NbBundle;
86	import org.openide.util.NbPreferences;	86	import org.openide.util.NbPreferences;
87	import org.openide.util.RequestProcessor;	87	import org.openide.util.RequestProcessor;
88	import org.netbeans.api.autoupdate.UpdateUnitProvider.CATEGORY;
89	import org.netbeans.modules.autoupdate.ui.actions.Installer;	88	import org.netbeans.modules.autoupdate.ui.actions.Installer;
90	import org.netbeans.modules.autoupdate.ui.actions.ShowNotifications;	89	import org.netbeans.modules.autoupdate.ui.actions.ShowNotifications;
91	import org.openide.util.Task;	90	import org.openide.util.Task;
Lines 908-938 Link Here
908	return NbPreferences.forModule (Utilities.class);	907	return NbPreferences.forModule (Utilities.class);
909	}	908	}
910		909
911	static String getCategoryName(CATEGORY category) {
912	String key = null;
913	switch (category) {
914	case STANDARD:
915	key = "AvailableTab_SourceCategory_Tooltip_STANDARD"; //NOI18N
916	break;
917	case BETA:
918	key = "AvailableTab_SourceCategory_Tooltip_BETA"; //NOI18N
919	break;
920	case COMMUNITY:
921	key = "AvailableTab_SourceCategory_Tooltip_COMMUNITY"; //NOI18N
922	break;
923	}
924	return (key != null) ? getBundle(key) : null;
925	}
926
927	static URL getCategoryIcon(CATEGORY state) {
928	URL retval = null;
929	if (CATEGORY.BETA.equals(state)) {
930	retval = Utilities.class.getResource("/org/netbeans/modules/autoupdate/ui/resources/icon-beta.png"); // NOI18N
931	} else if (CATEGORY.COMMUNITY.equals(state)) {
932	retval = Utilities.class.getResource("/org/netbeans/modules/autoupdate/ui/resources/icon-community.png"); // NOI18N
933	} else if (CATEGORY.STANDARD.equals(state)) {
934	retval = Utilities.class.getResource("/org/netbeans/modules/autoupdate/ui/resources/icon-standard.png"); // NOI18N
935	}
936	return retval;
937	}
938	}	910	}

Lines 57-62 Link Here

(-)a/autoupdate.services/apichanges.xml (+19 lines)
57	<!-- ACTUAL CHANGES BEGIN HERE: -->	57	<!-- ACTUAL CHANGES BEGIN HERE: -->
58		58
59	<changes>	59	<changes>
		60	<change id="custom-icons">
		61	<api name="general"/>
		62	<summary>Icons for update centers</summary>
		63	<version major="1" minor="23"/>
		64	<date day="30" month="11" year="2010"/>
		65	<author login="jtulach"/>
		66	<compatibility addition="yes" binary="compatible" deletion="no"
		67	deprecation="yes" semantic="compatible" source="compatible"
		68	/>
		69	<description>
		70	<p>
		71	Define icon when specifying an update center using
		72	<code>categoryIconBase</code> attribute.
		73	</p>
		74	</description>
		75	<class package="org.netbeans.api.autoupdate" name="UpdateElement"/>
		76	<class package="org.netbeans.api.autoupdate" name="UpdateUnitProvider"/>
		77	<issue number="183778"/>
		78	</change>
60	<change id="source-group-modifier">	79	<change id="source-group-modifier">
61	<api name="general"/>	80	<api name="general"/>
62	<summary>Feature enabled only when all its dependencies are enabled</summary>	81	<summary>Feature enabled only when all its dependencies are enabled</summary>

Lines 86-91 Link Here

(-)a/autoupdate.services/src/org/netbeans/modules/autoupdate/updateprovider/AutoupdateCatalogFactory.java (-3 / +12 lines)
86	public static final String ORIGINAL_DISPLAY_NAME = "originalDisplayName"; // NOI18N	86	public static final String ORIGINAL_DISPLAY_NAME = "originalDisplayName"; // NOI18N
87	public static final String ORIGINAL_ENABLED = "originalEnabled"; // NOI18N	87	public static final String ORIGINAL_ENABLED = "originalEnabled"; // NOI18N
88	public static final String ORIGINAL_CATEGORY_NAME = "originalCategoryName"; // NOI18N	88	public static final String ORIGINAL_CATEGORY_NAME = "originalCategoryName"; // NOI18N
		89	public static final String ORIGINAL_CATEGORY_ICON_BASE = "originalCategoryIconBase"; // NOI18N
89		90
90	public static UpdateProvider createUpdateProvider (FileObject fo) {	91	public static UpdateProvider createUpdateProvider (FileObject fo) {
91	String sKey = (String) fo.getAttribute ("url_key"); // NOI18N	92	String sKey = (String) fo.getAttribute ("url_key"); // NOI18N
Lines 127-139 Link Here
127	}	128	}
128	url = modifyURL (url);	129	url = modifyURL (url);
129	String categoryName = (String) fo.getAttribute ("category"); // NOI18N	130	String categoryName = (String) fo.getAttribute ("category"); // NOI18N
130	CATEGORY category = (categoryName != null) ? CATEGORY.valueOf(categoryName) : CATEGORY.COMMUNITY;	131	String categoryIconBase = (String) fo.getAttribute ("categoryIconBase"); // NOI18N
131	AutoupdateCatalogProvider au_catalog = new AutoupdateCatalogProvider(name, displayName(fo), url, category);
132
133	Preferences providerPreferences = getPreferences().node(name);	132	Preferences providerPreferences = getPreferences().node(name);
		133	ProviderCategory pc;
		134	if (categoryIconBase != null) {
		135	pc = ProviderCategory.create(categoryIconBase, categoryName);
		136	providerPreferences.put (ORIGINAL_CATEGORY_ICON_BASE, categoryIconBase);
		137	} else {
		138	CATEGORY category = (categoryName != null) ? CATEGORY.valueOf(categoryName) : CATEGORY.COMMUNITY;
		139	pc = ProviderCategory.forValue(category);
		140	}
		141	AutoupdateCatalogProvider au_catalog = new AutoupdateCatalogProvider(name, displayName(fo), url, pc);
134	providerPreferences.put (ORIGINAL_URL, url.toExternalForm ());	142	providerPreferences.put (ORIGINAL_URL, url.toExternalForm ());
135	providerPreferences.put (ORIGINAL_DISPLAY_NAME, au_catalog.getDisplayName ());	143	providerPreferences.put (ORIGINAL_DISPLAY_NAME, au_catalog.getDisplayName ());
136	providerPreferences.put (ORIGINAL_CATEGORY_NAME, au_catalog.getCategory().name());	144	providerPreferences.put (ORIGINAL_CATEGORY_NAME, au_catalog.getCategory().name());
		145
137	Boolean en = (Boolean) fo.getAttribute("enabled"); // NOI18N	146	Boolean en = (Boolean) fo.getAttribute("enabled"); // NOI18N
138	if (en != null) {	147	if (en != null) {
139	providerPreferences.putBoolean (ORIGINAL_ENABLED, en);	148	providerPreferences.putBoolean (ORIGINAL_ENABLED, en);

Lines 64-87 Link Here

(-)a/autoupdate.services/src/org/netbeans/modules/autoupdate/updateprovider/AutoupdateCatalogProvider.java (-6 / +14 lines)
64	private final String codeName;	64	private final String codeName;
65	private String displayName;	65	private String displayName;
66	private AutoupdateCatalogCache cache = AutoupdateCatalogCache.getDefault ();	66	private AutoupdateCatalogCache cache = AutoupdateCatalogCache.getDefault ();
67	private Logger log = Logger.getLogger ("org.netbeans.modules.autoupdate.updateprovider.AutoupdateCatalog");	67	private static final Logger log = Logger.getLogger ("org.netbeans.modules.autoupdate.updateprovider.AutoupdateCatalog");
68	private String description = null;	68	private String description = null;
69	private boolean descriptionInitialized = false;	69	private boolean descriptionInitialized = false;
70	private CATEGORY category = null;	70	private ProviderCategory category = null;
71		71
72	public AutoupdateCatalogProvider (String name, String displayName, URL updateCenter) {	72	public AutoupdateCatalogProvider (String name, String displayName, URL updateCenter) {
73	this(name, displayName, updateCenter, CATEGORY.COMMUNITY);	73	this(name, displayName, updateCenter, ProviderCategory.forValue(CATEGORY.COMMUNITY));
74	}	74	}
75		75
76	/**	76	/**
77	* Creates a new instance of AutoupdateCatalog	77	* Creates a new instance of AutoupdateCatalog
78	*/	78	*/
79	public AutoupdateCatalogProvider (String name, String displayName, URL updateCenter, CATEGORY category) {	79	public AutoupdateCatalogProvider (String name, String displayName, URL updateCenter, ProviderCategory category) {
80	Parameters.notNull("name", name);	80	Parameters.notNull("name", name);
81	this.codeName = name;	81	this.codeName = name;
82	this.displayName = displayName;	82	this.displayName = displayName;
83	this.updateCenter = updateCenter;	83	this.updateCenter = updateCenter;
84	this.category = (category != null) ? category : CATEGORY.COMMUNITY;	84	this.category = category;
		85	}
		86	public AutoupdateCatalogProvider (String name, String displayName, URL updateCenter, CATEGORY category) {
		87	this(name, displayName, updateCenter, ProviderCategory.forValue(category));
85	}	88	}
86		89
87	public String getName () {	90	public String getName () {
Lines 150-156 Link Here
150	return displayName + "[" + codeName + "] to " + updateCenter;	153	return displayName + "[" + codeName + "] to " + updateCenter;
151	}	154	}
152		155
		156	@Override
153	public CATEGORY getCategory() {	157	public CATEGORY getCategory() {
		158	return category.toEnum();
		159	}
		160
		161	public ProviderCategory getProviderCategory() {
154	return category;	162	return category;
155	}	163	}
156	}	164	}

Line 0 Link Here

(-)a/autoupdate.services/src/org/netbeans/modules/autoupdate/updateprovider/ProviderCategory.java (+115 lines)
		1	/*
		2	* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
		3	*
		4	* Copyright 2010 Oracle and/or its affiliates. All rights reserved.
		5	*
		6	* Oracle and Java are registered trademarks of Oracle and/or its affiliates.
		7	* Other names may be trademarks of their respective owners.
		8	*
		9	* The contents of this file are subject to the terms of either the GNU
		10	* General Public License Version 2 only ("GPL") or the Common
		11	* Development and Distribution License("CDDL") (collectively, the
		12	* "License"). You may not use this file except in compliance with the
		13	* License. You can obtain a copy of the License at
		14	* http://www.netbeans.org/cddl-gplv2.html
		15	* or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
		16	* specific language governing permissions and limitations under the
		17	* License. When distributing the software, include this License Header
		18	* Notice in each file and include the License file at
		19	* nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
		20	* particular file as subject to the "Classpath" exception as provided
		21	* by Oracle in the GPL Version 2 section of the License file that
		22	* accompanied this code. If applicable, add the following below the
		23	* License Header, with the fields enclosed by brackets [] replaced by
		24	* your own identifying information:
		25	* "Portions Copyrighted [year] [name of copyright owner]"
		26	*
		27	* If you wish your version of this file to be governed by only the CDDL
		28	* or only the GPL Version 2, indicate your decision by adding
		29	* "[Contributor] elects to include this software in this distribution
		30	* under the [CDDL or GPL Version 2] license." If you do not indicate a
		31	* single choice of license, a recipient has the option to distribute
		32	* your version of this file under either the CDDL, the GPL Version 2 or
		33	* to extend the choice of license to its licensees as provided above.
		34	* However, if you add GPL Version 2 code and therefore, elected the GPL
		35	* Version 2 license, then the option applies only if the new code is
		36	* made subject to such option by the copyright holder.
		37	*
		38	* Contributor(s):
		39	*
		40	* Portions Copyrighted 2010 Sun Microsystems, Inc.
		41	*/
		42
		43	package org.netbeans.modules.autoupdate.updateprovider;
		44
		45	import java.awt.Image;
		46	import org.netbeans.api.autoupdate.UpdateUnitProvider.CATEGORY;
		47	import org.openide.util.ImageUtilities;
		48	import org.openide.util.NbBundle;
		49
		50	/** Represents provider category.
		51	*
		52	* @author Jaroslav Tulach <jtulach@netbeans.org>
		53	*/
		54	public final class ProviderCategory {
		55	private final String displayName;
		56	private final String iconBase;
		57	private final CATEGORY category;
		58
		59	private ProviderCategory(String displayName, String iconBase, CATEGORY category) {
		60	assert (category != null) != (displayName != null && iconBase != null) :
		61	"Category: " + category + " displayName: " + displayName
		62	+ " iconBase: " + iconBase;
		63	this.displayName = displayName;
		64	this.iconBase = iconBase;
65	this.category = category;
66	}
67
68	public static ProviderCategory create(String iconBase, String categoryDisplayName) {
69	return new ProviderCategory(categoryDisplayName, iconBase, null);
70	}
71	public String getDisplayName() {
72	return category != null ? getCategoryName(category) : displayName;
73	}
74	public Image getIcon() {
75	return ImageUtilities.loadImage(getIconBase());
76	}
77
78	public static ProviderCategory forValue(CATEGORY c) {
79	return new ProviderCategory(null, null, c);
80	}
81
82	CATEGORY toEnum() {
83	return category == null ? CATEGORY.COMMUNITY : category;
84	}
85
86	static String getCategoryName(CATEGORY category) {
87	String key = null;
88	switch (category) {
89	case STANDARD:
90	key = "AvailableTab_SourceCategory_Tooltip_STANDARD"; //NOI18N
91	break;
92	case BETA:
93	key = "AvailableTab_SourceCategory_Tooltip_BETA"; //NOI18N
94	break;
95	case COMMUNITY:
96	key = "AvailableTab_SourceCategory_Tooltip_COMMUNITY"; //NOI18N
97	break;
98	}
99	return (key != null) ? NbBundle.getMessage(ProviderCategory.class, key) : null;
100	}
101
102	String getIconBase() {
103	if (iconBase != null) {
104	return iconBase;
105	}
106	switch (category) {
107	case BETA:
108	return "org/netbeans/modules/autoupdate/services/resources/icon-beta.png"; // NOI18N
109	case STANDARD:
110	return "org/netbeans/modules/autoupdate/services/resources/icon-standard.png"; // NOI18N
111	default:
112	return "org/netbeans/modules/autoupdate/services/resources/icon-community.png"; // NOI18N
113	}
114	}
115	}

Lines 48-53 Link Here

(-)a/autoupdate.ui/src/org/netbeans/modules/autoupdate/ui/SettingsTab.java (-10 / +5 lines)
48	import java.awt.Component;	48	import java.awt.Component;
49	import java.awt.Dimension;	49	import java.awt.Dimension;
50	import java.awt.EventQueue;	50	import java.awt.EventQueue;
		51	import java.awt.Image;
51	import java.awt.event.ActionEvent;	52	import java.awt.event.ActionEvent;
52	import java.awt.event.ActionListener;	53	import java.awt.event.ActionListener;
53	import java.io.File;	54	import java.io.File;
Lines 63-75 Link Here
63	import javax.swing.AbstractAction;	64	import javax.swing.AbstractAction;
64	import javax.swing.Action;	65	import javax.swing.Action;
65	import javax.swing.DefaultComboBoxModel;	66	import javax.swing.DefaultComboBoxModel;
		67	import javax.swing.Icon;
66	import javax.swing.JButton;	68	import javax.swing.JButton;
67	import javax.swing.JLabel;	69	import javax.swing.JLabel;
68	import javax.swing.JScrollPane;	70	import javax.swing.JScrollPane;
69	import javax.swing.JTable;	71	import javax.swing.JTable;
70	import javax.swing.ListSelectionModel;	72	import javax.swing.ListSelectionModel;
71	import javax.swing.SwingConstants;	73	import javax.swing.SwingConstants;
72	import javax.swing.SwingUtilities;
73	import javax.swing.UIManager;	74	import javax.swing.UIManager;
74	import javax.swing.event.ListSelectionEvent;	75	import javax.swing.event.ListSelectionEvent;
75	import javax.swing.event.ListSelectionListener;	76	import javax.swing.event.ListSelectionListener;
Lines 80-86 Link Here
80	import javax.swing.table.TableColumn;	81	import javax.swing.table.TableColumn;
81	import javax.swing.table.TableColumnModel;	82	import javax.swing.table.TableColumnModel;
82	import org.netbeans.api.autoupdate.UpdateUnitProvider;	83	import org.netbeans.api.autoupdate.UpdateUnitProvider;
83	import org.netbeans.api.autoupdate.UpdateUnitProvider.CATEGORY;
84	import org.netbeans.api.options.OptionsDisplayer;	84	import org.netbeans.api.options.OptionsDisplayer;
85	import org.netbeans.modules.autoupdate.ui.actions.AutoupdateSettings;	85	import org.netbeans.modules.autoupdate.ui.actions.AutoupdateSettings;
86	import org.openide.DialogDescriptor;	86	import org.openide.DialogDescriptor;
Lines 717-730 Link Here
717		717
718	if (value instanceof UpdateUnitProvider) {	718	if (value instanceof UpdateUnitProvider) {
719	UpdateUnitProvider u = (UpdateUnitProvider) value;	719	UpdateUnitProvider u = (UpdateUnitProvider) value;
720	CATEGORY state = u.getCategory();	720	Image img = u.getSourceIcon();
721	if (CATEGORY.BETA.equals(state)) {	721	final Icon icon = ImageUtilities.image2Icon(img);
722	renderComponent.setIcon(ImageUtilities.loadImageIcon("org/netbeans/modules/autoupdate/ui/resources/icon-beta.png", false)); // NOI18N	722	renderComponent.setIcon(icon);
723	} else if (CATEGORY.COMMUNITY.equals(state)) {
724	renderComponent.setIcon(ImageUtilities.loadImageIcon("org/netbeans/modules/autoupdate/ui/resources/icon-community.png", false)); // NOI18N
725	} else if (CATEGORY.STANDARD.equals(state)) {
726	renderComponent.setIcon(ImageUtilities.loadImageIcon("org/netbeans/modules/autoupdate/ui/resources/icon-standard.png", false)); // NOI18N
727	}
728	renderComponent.setText (u.getDisplayName());	723	renderComponent.setText (u.getDisplayName());
729	renderComponent.setHorizontalAlignment(SwingConstants.LEFT);	724	renderComponent.setHorizontalAlignment(SwingConstants.LEFT);
730	}	725	}