From dba5db237d371acab06f3127ef64f5db9f20043f Mon Sep 17 00:00:00 2001 From: "Maxim.Medvedev" Date: Fri, 4 May 2012 11:56:43 +0400 Subject: [PATCH] IDEA-54210 Generate GroovyDoc dialog has too small minimum size --- .../groovy/doc/GenerateGroovyDocDialog.java | 13 ++++---- .../groovy/doc/GroovyDocGenerationPanel.java | 33 +++---------------- .../doc/actions/GenerateGroovyDocAction.java | 4 +-- 3 files changed, 14 insertions(+), 36 deletions(-) diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/doc/GenerateGroovyDocDialog.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/doc/GenerateGroovyDocDialog.java index 17a5d073ed6f..821db89f0fda 100644 --- a/plugins/groovy/src/org/jetbrains/plugins/groovy/doc/GenerateGroovyDocDialog.java +++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/doc/GenerateGroovyDocDialog.java @@ -38,7 +38,9 @@ public final class GenerateGroovyDocDialog extends DialogWrapper { setTitle(GroovyDocBundle.message("groovydoc.generate.title")); myPanel = new GroovyDocGenerationPanel(); + //myPanel.getPanel().setMinimumSize(new Dimension(-1, 1000)); init(); + System.out.println(myPanel.getPanel().getSize()); myPanel.reset(configuration); } @@ -98,14 +100,13 @@ public final class GenerateGroovyDocDialog extends DialogWrapper { File outputDir = new File(inputDirectory); if (!outputDir.exists()) { - int choice = Messages - .showOkCancelDialog(myProject, GroovyDocBundle.message("groovydoc.generate.input.directory.not.exists", inputDirectory), - GroovyDocBundle.message("groovydoc.generate.message.title"), Messages.getWarningIcon()); + int choice = Messages.showOkCancelDialog(myProject, + GroovyDocBundle.message("groovydoc.generate.input.directory.not.exists", inputDirectory), + GroovyDocBundle.message("groovydoc.generate.message.title"), Messages.getWarningIcon()); if (choice != 0) return false; if (!outputDir.mkdirs()) { - Messages - .showMessageDialog(myProject, GroovyDocBundle.message("groovydoc.generate.input.directory.creation.failed", inputDirectory), - CommonBundle.getErrorTitle(), Messages.getErrorIcon()); + Messages.showMessageDialog(myProject, GroovyDocBundle.message("groovydoc.generate.input.directory.creation.failed", inputDirectory), + CommonBundle.getErrorTitle(), Messages.getErrorIcon()); return false; } } diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/doc/GroovyDocGenerationPanel.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/doc/GroovyDocGenerationPanel.java index f7fc31c2cf7f..ed9137abe44e 100644 --- a/plugins/groovy/src/org/jetbrains/plugins/groovy/doc/GroovyDocGenerationPanel.java +++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/doc/GroovyDocGenerationPanel.java @@ -33,9 +33,7 @@ import org.jetbrains.plugins.groovy.doc.actions.GroovyDocReducePackageAction; import javax.swing.*; import java.awt.*; import java.io.File; -import java.util.ArrayList; import java.util.HashSet; -import java.util.List; import java.util.Set; public final class GroovyDocGenerationPanel extends JPanel { @@ -50,7 +48,6 @@ public final class GroovyDocGenerationPanel extends JPanel { private JPanel myPackagesPanel; private DefaultActionGroup myActionGroup; - private final ActionToolbar myActionToolbar; private GroovyDocAddPackageAction myAddPackageAction; private GroovyDocReducePackageAction myReducePackageAction; @@ -72,11 +69,13 @@ public final class GroovyDocGenerationPanel extends JPanel { myPackagesPanel.setLayout(new BorderLayout()); myPackagesPanel.setBorder(IdeBorderFactory.createTitledBorder("Source packages", false)); - myActionToolbar = ActionManager.getInstance().createActionToolbar("GroovyDoc", getActionGroup(), true); - myPackagesPanel.add(myActionToolbar.getComponent(), BorderLayout.NORTH); + ActionToolbar actionToolbar = ActionManager.getInstance().createActionToolbar("GroovyDoc", getActionGroup(), true); + myPackagesPanel.add(actionToolbar.getComponent(), BorderLayout.NORTH); myPackagesPanel.add(packagesScrollPane, BorderLayout.SOUTH); - myActionToolbar.updateActionsImmediately(); + actionToolbar.updateActionsImmediately(); + + myPanel.setMinimumSize(new Dimension(-1, 350)); } private ActionGroup getActionGroup() { @@ -99,28 +98,6 @@ public final class GroovyDocGenerationPanel extends JPanel { myDataModel.add(0, packagesName); } - public static class MyPackagesModel extends DefaultListModel { - List packagesNames = new ArrayList(); - - public int getSize() { - return packagesNames.size(); - } - - public Object getElementAt(final int index) { - return packagesNames.get(index); - } - - public void add(String packageName) { - final int index = getSize(); - packagesNames.add(packageName); - fireContentsChanged(this, 0, index); - } - - public Object remove(int index) { - return packagesNames.remove(index); - } - } - public DefaultListModel getDataModel() { return myDataModel; } diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/doc/actions/GenerateGroovyDocAction.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/doc/actions/GenerateGroovyDocAction.java index 23907035c07a..7065cd3d923f 100644 --- a/plugins/groovy/src/org/jetbrains/plugins/groovy/doc/actions/GenerateGroovyDocAction.java +++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/doc/actions/GenerateGroovyDocAction.java @@ -41,7 +41,7 @@ public final class GenerateGroovyDocAction extends AnAction implements DumbAware final DataContext dataContext = e.getDataContext(); final Project project = PlatformDataKeys.PROJECT.getData(dataContext); - final Module module = DataKeys.MODULE.getData(dataContext); + final Module module = LangDataKeys.MODULE.getData(dataContext); if (module == null) return; GroovyDocConfiguration configuration = new GroovyDocConfiguration(); @@ -92,7 +92,7 @@ public final class GenerateGroovyDocAction extends AnAction implements DumbAware String packages = ""; for (int i = 0; i < configuration.PACKAGES.length; i++) { final String s = configuration.PACKAGES[i]; - if ("".equals(s)) continue; + if (s != null && s.isEmpty()) continue; if (i > 0) { packages += ",";