Skip to content

Commit

Permalink
Close issue #9 - adding multiple standard rulesets
Browse files Browse the repository at this point in the history
  • Loading branch information
giancosta86 committed Nov 22, 2015
1 parent 722325b commit 3bf09a2
Show file tree
Hide file tree
Showing 2 changed files with 81 additions and 13 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -28,11 +28,13 @@
import info.gianlucacosta.helios.conversions.CollectionToArrayConverter;
import info.gianlucacosta.helios.product.ProductInfoService;
import info.gianlucacosta.helios.swing.jlist.AdvancedSelectionListModel;

import java.io.File;
import net.sourceforge.pmd.RuleSet;

import javax.swing.*;
import java.util.Collection;
import javax.swing.JFileChooser;
import javax.swing.JOptionPane;
import javax.swing.JPanel;
import javax.swing.filechooser.FileFilter;

/**
Expand Down Expand Up @@ -196,24 +198,22 @@ public void actionPerformed(java.awt.event.ActionEvent evt) {
}// </editor-fold>//GEN-END:initComponents

private void addStandardRuleSetButtonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_addStandardRuleSetButtonActionPerformed
Collection<RuleSetWrapper> standardRuleSetWrappers = standardRulesetsCatalog.getRuleSetWrappers();
StandardRuleSetsInputPanel inputPanel = new StandardRuleSetsInputPanel(standardRulesetsCatalog);

Object userChoice = JOptionPane.showInputDialog(
int userChoice = JOptionPane.showConfirmDialog(
null,
"Choose a standard rule set:",
inputPanel,
pluginInfoService.getName(),
JOptionPane.PLAIN_MESSAGE,
null,
ruleSetsArrayConverter.convert(standardRuleSetWrappers),
null);
JOptionPane.OK_CANCEL_OPTION
);

if (userChoice == null) {
if (userChoice == JOptionPane.CANCEL_OPTION) {
return;
}

RuleSet chosenRuleSet = ((RuleSetWrapper) userChoice).getRuleSet();

ruleSetsModel.addElement(chosenRuleSet.getFileName());
inputPanel.getSelectedRuleSets().forEach(ruleSet
-> ruleSetsModel.addElement(ruleSet.getFileName())
);
}//GEN-LAST:event_addStandardRuleSetButtonActionPerformed

private void removeButtonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_removeButtonActionPerformed
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,68 @@
/*
* ==========================================================================%%#
* EasyPmd
* ===========================================================================%%
* Copyright (C) 2009 - 2015 Gianluca Costa
* ===========================================================================%%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
* published by the Free Software Foundation, either version 3 of the
* License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public
* License along with this program. If not, see
* <http://www.gnu.org/licenses/gpl-3.0.html>.
* ==========================================================================%##
*/
package info.gianlucacosta.easypmd.ide.options;

import info.gianlucacosta.easypmd.pmdscanner.RuleSetWrapper;
import info.gianlucacosta.easypmd.pmdscanner.StandardRuleSetsCatalog;
import java.awt.BorderLayout;
import java.awt.Dimension;
import java.util.Collection;
import java.util.stream.Stream;
import javax.swing.BorderFactory;
import javax.swing.DefaultListModel;
import javax.swing.JLabel;
import javax.swing.JList;
import javax.swing.JPanel;
import javax.swing.JScrollPane;
import net.sourceforge.pmd.RuleSet;

/**
* Panel showing a list of available standard rule sets and allowing multiple selection
*/
public final class StandardRuleSetsInputPanel extends JPanel {
private JList<RuleSetWrapper> inputList;

public StandardRuleSetsInputPanel(StandardRuleSetsCatalog standardRuleSetsCatalog) {
Collection<RuleSetWrapper> standardRuleSetWrappers = standardRuleSetsCatalog.getRuleSetWrappers();

setLayout(new BorderLayout());

JLabel inputLabel = new JLabel("Choose a standard rule set:");
inputLabel.setBorder(BorderFactory.createEmptyBorder(0, 0, 7, 0));
add(inputLabel, BorderLayout.NORTH);

DefaultListModel<RuleSetWrapper> inputModel = new DefaultListModel<>();
standardRuleSetWrappers.forEach(ruleSetWrapper -> inputModel.addElement(ruleSetWrapper));

inputList = new JList<>(inputModel);

JScrollPane inputScroll = new JScrollPane(inputList);
add(inputScroll, BorderLayout.CENTER);

setPreferredSize(new Dimension(450, 200));
}

public Stream<RuleSet> getSelectedRuleSets() {
return inputList.getSelectedValuesList().stream()
.map(ruleSetWrapper -> ruleSetWrapper.getRuleSet());
}
}

0 comments on commit 3bf09a2

Please sign in to comment.