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

WI-629 Help userto download JDBC drivers

Browse Source
This commit is contained in:
Gregory Shrago
2009-11-18 20:37:43 +03:00
parent 2c477507d9
commit 22a9be346b
10 changed files with 72 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/icons/src/actions/apache.png
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 578 B

After

Width:  |  Height:  |  Size: 1.3 KiB

platform/icons/src/actions/ibm.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 165 B

platform/icons/src/actions/microsoft.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 594 B

platform/icons/src/actions/mysql.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 333 B

platform/icons/src/actions/postgresql.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.4 KiB

platform/icons/src/actions/sqlite.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 301 B

platform/icons/src/actions/sun.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.3 KiB

platform/lang-impl/src/com/intellij/util/ui/classpath/SimpleClasspathPanel.java
+69 -57
View File
@@ -10,6 +10,7 @@ import com.intellij.openapi.application.ApplicationManager;
import com.intellij.openapi.application.ModalityState;
import com.intellij.openapi.fileChooser.FileChooserDescriptor;
import com.intellij.openapi.fileChooser.ex.FileChooserDialogImpl;
import com.intellij.openapi.project.DumbAwareAction;
import com.intellij.openapi.project.ProjectBundle;
import com.intellij.openapi.project.ProjectManager;
import com.intellij.openapi.roots.OrderRootType;
@@ -77,6 +78,7 @@ public class SimpleClasspathPanel extends JPanel {
controller.addRemoveAction(ProjectBundle.message("module.remove.action"));
controller.addMoveUpAction();
controller.addMoveDownAction();
customizeToolbarActions(actionGroup);
myList.setCellRenderer(new ColoredListCellRenderer() {
protected void customizeCellRenderer(JList list, Object value, int index, boolean selected, boolean hasFocus) {
if (value instanceof Library) {
@@ -108,6 +110,9 @@ public class SimpleClasspathPanel extends JPanel {
});
}
protected void customizeToolbarActions(DefaultActionGroup actionGroup) {
}
private void listChanged(final ListDataEvent e) {
myClassLoader = null;
processClasspathChanged();
@@ -181,7 +186,7 @@ public class SimpleClasspathPanel extends JPanel {
return Collections.singletonList(library);
}
private abstract static class PopupAction implements ActionListener {
public abstract static class PopupAction implements ActionListener {
private final String myTitle;
private final Icon myIcon;
private final int myIndex;
@@ -204,8 +209,7 @@ public class SimpleClasspathPanel extends JPanel {
return myIndex;
}
protected void executeImpl() {
}
protected abstract void executeImpl();
public void execute() {
executeImpl();
@@ -216,62 +220,17 @@ public class SimpleClasspathPanel extends JPanel {
}
}
private class AddAction extends AnAction {
public static abstract class PopupActionGroupAction extends DumbAwareAction {
private PopupAction[] myPopupActions;
private Icon[] myIcons;
public AddAction() {
super(ProjectBundle.message("module.add.action"), null, IconLoader.getIcon("/general/add.png"));
protected PopupActionGroupAction(String text, String description, Icon icon) {
super(text, description, icon);
}
private void initPopupActions() {
if (myPopupActions == null) {
int index = 1;
final List<PopupAction> actions = new ArrayList<PopupAction>();
actions.add(new ChooseAndAddAction(index++, "Jar...", Icons.JAR_ICON) {
@NotNull
protected List<Library> doChoose() {
final ChooseJarDialog dialog = new ChooseJarDialog(SimpleClasspathPanel.this, getVirtualFiles(), myDisposable);
dialog.doChoose();
return dialog.getChosenElements();
}
});
actions.add(new ChooseAndAddAction(index++, "Library...", Icons.LIBRARY_ICON) {
@NotNull
protected List<Library> doChoose() {
final Set<VirtualFile> existingFiles = getVirtualFiles();
final ChooseLibrariesDialog dialog = new ChooseLibrariesDialog(ProjectManager.getInstance().getDefaultProject(), "Choose Existing Libraries") {
@Override
protected boolean acceptsElement(final Object element) {
if (!(element instanceof Library)) return true;
final Library library = (Library)element;
return !existingFiles.containsAll(Arrays.asList(library.getFiles(OrderRootType.CLASSES)));
}
@Override
protected JComponent createCenterPanel() {
final JPanel panel = new JPanel(new BorderLayout());
panel.add(super.createCenterPanel(), BorderLayout.CENTER);
final MultiLineLabel label = new MultiLineLabel("Please note that project-level and module-level libraries will not be\n\n" +
" added as a whole but will be converted to jars and folders instead.");
label.setIcon(Messages.getWarningIcon());
label.setIcon(Messages.getWarningIcon());
panel.add(label, BorderLayout.SOUTH);
return panel;
}
};
dialog.show();
final List<Library> libraries = dialog.getSelectedLibraries();
final ArrayList<Library> result = new ArrayList<Library>();
for (Library o : libraries) {
result.addAll(ensureApplicationLevel(o, existingFiles, myDisposable));
}
return result;
}
});
myPopupActions = actions.toArray(new PopupAction[actions.size()]);
myPopupActions = createPopupActions();
myIcons = new Icon[myPopupActions.length];
for (int idx = 0; idx < myPopupActions.length; idx++) {
@@ -280,9 +239,11 @@ public class SimpleClasspathPanel extends JPanel {
}
}
protected abstract PopupAction[] createPopupActions();
public void actionPerformed(final AnActionEvent e) {
initPopupActions();
final JBPopup popup = JBPopupFactory.getInstance().createWizardStep(new BaseListPopupStep<PopupAction>(null, myPopupActions, myIcons) {
final JBPopup popup = JBPopupFactory.getInstance().createListPopup(new BaseListPopupStep<PopupAction>(null, myPopupActions, myIcons) {
public boolean isMnemonicsNavigationEnabled() {
return true;
}
@@ -297,7 +258,7 @@ public class SimpleClasspathPanel extends JPanel {
selectedValue.execute();
}
}, ModalityState.stateForComponent(e.getInputEvent().getComponent()));
return PopupStep.FINAL_CHOICE;
return FINAL_CHOICE;
}
@NotNull
@@ -307,10 +268,61 @@ public class SimpleClasspathPanel extends JPanel {
});
popup.showUnderneathOf(e.getInputEvent().getComponent());
}
}
public Object fun(final AnActionEvent s) {
actionPerformed(s);
return null;
private class AddAction extends PopupActionGroupAction {
public AddAction() {
super(ProjectBundle.message("module.add.action"), null, IconLoader.getIcon("/general/add.png"));
}
protected PopupAction[] createPopupActions() {
int index = 1;
final List<PopupAction> actions = new ArrayList<PopupAction>();
actions.add(new ChooseAndAddAction(index++, "Jar...", Icons.JAR_ICON) {
@NotNull
protected List<Library> doChoose() {
final ChooseJarDialog dialog = new ChooseJarDialog(SimpleClasspathPanel.this, getVirtualFiles(), myDisposable);
dialog.doChoose();
return dialog.getChosenElements();
}
});
actions.add(new ChooseAndAddAction(index++, "Library...", Icons.LIBRARY_ICON) {
@NotNull
protected List<Library> doChoose() {
final Set<VirtualFile> existingFiles = getVirtualFiles();
final ChooseLibrariesDialog dialog = new ChooseLibrariesDialog(ProjectManager.getInstance().getDefaultProject(), "Choose Existing Libraries") {
@Override
protected boolean acceptsElement(final Object element) {
if (!(element instanceof Library)) return true;
final Library library = (Library)element;
return !existingFiles.containsAll(Arrays.asList(library.getFiles(OrderRootType.CLASSES)));
}
@Override
protected JComponent createCenterPanel() {
final JPanel panel = new JPanel(new BorderLayout());
panel.add(super.createCenterPanel(), BorderLayout.CENTER);
final MultiLineLabel label = new MultiLineLabel("Please note that project-level and module-level libraries will not be\n\n" +
" added as a whole but will be converted to jars and folders instead.");
label.setIcon(Messages.getWarningIcon());
label.setIcon(Messages.getWarningIcon());
panel.add(label, BorderLayout.SOUTH);
return panel;
}
};
dialog.show();
final List<Library> libraries = dialog.getSelectedLibraries();
final ArrayList<Library> result = new ArrayList<Library>();
for (Library o : libraries) {
result.addAll(ensureApplicationLevel(o, existingFiles, myDisposable));
}
return result;
}
});
return actions.toArray(new PopupAction[actions.size()]);
}
}
platform/platform-api/src/com/intellij/ide/BrowserUtil.java
+1 -1
View File
@@ -205,7 +205,7 @@ public class BrowserUtil {
@NotNull
public static String escapeUrl(@NotNull @NonNls String url) {
if (SystemInfo.isWindows) {
return "\"" + url + "\"";
return url.indexOf(' ') > 0? "\"" + url + "\"" : url;
}
else {
return url.replaceAll(" ", "%20");
platform/platform-api/src/com/intellij/ui/ReorderableListController.java
+2 -1
View File
@@ -16,6 +16,7 @@
package com.intellij.ui;
import com.intellij.openapi.actionSystem.*;
import com.intellij.openapi.project.DumbAwareAction;
import com.intellij.openapi.util.Condition;
import com.intellij.openapi.util.Factory;
import com.intellij.openapi.util.IconLoader;
@@ -154,7 +155,7 @@ public abstract class ReorderableListController <T> {
myShowText = showText;
}
protected static class BaseAction<V> extends AnAction {
protected static class BaseAction<V> extends DumbAwareAction {
private final ActionBehaviour<V> myBehaviour;
private final CustomActionDescription<V> myCustomActionDescription;