Ignore:
Timestamp:
2014-04-26T17:39:23+02:00 (11 years ago)
Author:
Don-vip
Message:

see #8465 - use diamond operator where applicable

File:
1 edited

Legend:

Unmodified
Added
Removed

  • trunk/src/org/openstreetmap/josm/gui/preferences/plugin/PluginPreferencesModel.java

    r6906 r7005  
    2525 */
    2626public class PluginPreferencesModel extends Observable {
    27     private final List<PluginInformation> availablePlugins = new ArrayList<PluginInformation>();
    28     private final List<PluginInformation> displayedPlugins = new ArrayList<PluginInformation>();
    29     private final Map<PluginInformation, Boolean> selectedPluginsMap = new HashMap<PluginInformation, Boolean>();
    30     private Set<String> pendingDownloads = new HashSet<String>();
     27    private final List<PluginInformation> availablePlugins = new ArrayList<>();
     28    private final List<PluginInformation> displayedPlugins = new ArrayList<>();
     29    private final Map<PluginInformation, Boolean> selectedPluginsMap = new HashMap<>();
     30    private Set<String> pendingDownloads = new HashSet<>();
    3131    private String filterExpression;
    3232    private Set<String> currentActivePlugins;
    … …  
    3636     */
    3737    public PluginPreferencesModel() {
    38         currentActivePlugins = new HashSet<String>();
     38        currentActivePlugins = new HashSet<>();
    3939        currentActivePlugins.addAll(Main.pref.getCollection("plugins", currentActivePlugins));
    4040    }
    … …  
    7777        sort();
    7878        filterDisplayedPlugins(filterExpression);
    79         Set<String> activePlugins = new HashSet<String>();
     79        Set<String> activePlugins = new HashSet<>();
    8080        activePlugins.addAll(Main.pref.getCollection("plugins", activePlugins));
    8181        for (PluginInformation pi: availablePlugins) {
    … …  
    119119     */
    120120    public List<PluginInformation> getSelectedPlugins() {
    121         List<PluginInformation> ret = new LinkedList<PluginInformation>();
     121        List<PluginInformation> ret = new LinkedList<>();
    122122        for (PluginInformation pi: availablePlugins) {
    123123            if (selectedPluginsMap.get(pi) == null) {
    … …  
    137137     */
    138138    public Set<String> getSelectedPluginNames() {
    139         Set<String> ret = new HashSet<String>();
     139        Set<String> ret = new HashSet<>();
    140140        for (PluginInformation pi: getSelectedPlugins()) {
    141141            ret.add(pi.name);
    … …  
    177177     */
    178178    public List<PluginInformation> getPluginsScheduledForUpdateOrDownload() {
    179         List<PluginInformation> ret = new ArrayList<PluginInformation>();
     179        List<PluginInformation> ret = new ArrayList<>();
    180180        for (String plugin: pendingDownloads) {
    181181            PluginInformation pi = getPluginInformation(plugin);
    … …  
    274274     */
    275275    public List<PluginInformation> getNewlyActivatedPlugins() {
    276         List<PluginInformation> ret = new LinkedList<PluginInformation>();
     276        List<PluginInformation> ret = new LinkedList<>();
    277277        for (Entry<PluginInformation, Boolean> entry: selectedPluginsMap.entrySet()) {
    278278            PluginInformation pi = entry.getKey();
    … …  
    292292     */
    293293    public List<PluginInformation> getNewlyDeactivatedPlugins() {
    294         List<PluginInformation> ret = new LinkedList<PluginInformation>();
     294        List<PluginInformation> ret = new LinkedList<>();
    295295        for (PluginInformation pi: availablePlugins) {
    296296            if (!currentActivePlugins.contains(pi.name)) {
    … …  
    310310     */
    311311    public List<PluginInformation> getAvailablePlugins() {
    312         return new LinkedList<PluginInformation>(availablePlugins);
     312        return new LinkedList<>(availablePlugins);
    313313    }
    314314
    … …  
    320320     */
    321321    public Set<String> getNewlyActivatedPluginNames() {
    322         Set<String> ret = new HashSet<String>();
     322        Set<String> ret = new HashSet<>();
    323323        List<PluginInformation> plugins = getNewlyActivatedPlugins();
    324324        for (PluginInformation pi: plugins) {
Note: See TracChangeset for help on using the changeset viewer.