MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

IDEA-54210 Generate GroovyDoc dialog has too small minimum size

Browse Source
This commit is contained in:
Maxim.Medvedev
2012-05-04 14:34:30 +04:00
parent d50971ecbe
commit dba5db237d
3 changed files with 14 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/groovy/src/org/jetbrains/plugins/groovy/doc/GenerateGroovyDocDialog.java
+7 -6
View File
@@ -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;
}
}
plugins/groovy/src/org/jetbrains/plugins/groovy/doc/GroovyDocGenerationPanel.java
+5 -28
View File
@@ -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<String> packagesNames = new ArrayList<String>();
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;
}
plugins/groovy/src/org/jetbrains/plugins/groovy/doc/actions/GenerateGroovyDocAction.java
+2 -2
View File
@@ -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 += ",";