options,
+ @Nullable String displayName,
+ @Nullable TextRange fixRange,
+ @Nullable HighlightDisplayKey key) {
if (info == null || action == null) return;
if (fixRange == null) fixRange = new TextRange(info.startOffset, info.endOffset);
if (info.quickFixActionRanges == null) {
@@ -85,11 +86,11 @@ public final class QuickFixAction {
}
}
- public static void registerQuickFixAction(HighlightInfo info, TextRange fixRange, IntentionAction action, final HighlightDisplayKey key) {
+ public static void registerQuickFixAction(@Nullable HighlightInfo info, @Nullable TextRange fixRange, @Nullable IntentionAction action, @Nullable final HighlightDisplayKey key) {
doRegister(info, action, null, HighlightDisplayKey.getDisplayNameByKey(key), fixRange, key);
}
- public static void registerQuickFixAction(HighlightInfo info, TextRange fixRange, IntentionAction action) {
+ public static void registerQuickFixAction(@Nullable HighlightInfo info, @Nullable TextRange fixRange, @Nullable IntentionAction action) {
doRegister(info, action, null, null, fixRange, null);
}
diff --git a/platform/lang-impl/src/com/intellij/psi/impl/PsiDocumentManagerImpl.java b/platform/lang-impl/src/com/intellij/psi/impl/PsiDocumentManagerImpl.java
index 594088b83af1..6740f388b45c 100644
--- a/platform/lang-impl/src/com/intellij/psi/impl/PsiDocumentManagerImpl.java
+++ b/platform/lang-impl/src/com/intellij/psi/impl/PsiDocumentManagerImpl.java
@@ -55,6 +55,7 @@ import com.intellij.util.SmartList;
import com.intellij.util.concurrency.Semaphore;
import com.intellij.util.containers.ContainerUtil;
import com.intellij.util.messages.MessageBus;
+import com.intellij.util.ui.UIUtil;
import org.jetbrains.annotations.NonNls;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
@@ -795,7 +796,11 @@ public class PsiDocumentManagerImpl extends PsiDocumentManager implements Projec
@Override
public void save() {
// Ensure all documents are committed on save so file content dependent indices, that use PSI to build have consistent content.
- commitAllDocuments();
+ UIUtil.invokeLaterIfNeeded(new Runnable() {
+ public void run() {
+ commitAllDocuments();
+ }
+ });
}
@NonNls
diff --git a/platform/lang-impl/src/com/intellij/refactoring/changeSignature/ChangeSignatureDialogBase.java b/platform/lang-impl/src/com/intellij/refactoring/changeSignature/ChangeSignatureDialogBase.java
index a2f5b4e4cc17..b57406143617 100644
--- a/platform/lang-impl/src/com/intellij/refactoring/changeSignature/ChangeSignatureDialogBase.java
+++ b/platform/lang-impl/src/com/intellij/refactoring/changeSignature/ChangeSignatureDialogBase.java
@@ -18,6 +18,7 @@ package com.intellij.refactoring.changeSignature;
import com.intellij.openapi.Disposable;
import com.intellij.openapi.actionSystem.AnActionEvent;
import com.intellij.openapi.actionSystem.CustomShortcutSet;
+import com.intellij.openapi.diagnostic.Logger;
import com.intellij.openapi.editor.Document;
import com.intellij.openapi.editor.event.DocumentAdapter;
import com.intellij.openapi.editor.event.DocumentEvent;
@@ -53,6 +54,7 @@ import com.intellij.util.ui.table.JBListTable;
import com.intellij.util.ui.table.JBTableRow;
import com.intellij.util.ui.table.JBTableRowEditor;
import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
import javax.swing.*;
import javax.swing.border.EmptyBorder;
@@ -72,28 +74,36 @@ import java.util.Set;
/**
* @author Konstantin Bulenkov
*/
-public abstract class ChangeSignatureDialogBase>
- extends RefactoringDialog {
+public abstract class ChangeSignatureDialogBase<
+ ParamInfo extends ParameterInfo,
+ Method extends PsiElement,
+ Visibility,
+ Descriptor extends MethodDescriptor,
+ ParameterTableModelItem extends ParameterTableModelItemBase,
+ ParameterTableModel extends ParameterTableModelBase
+ > extends RefactoringDialog {
+
+ private static final Logger LOG = Logger.getInstance(ChangeSignatureDialogBase.class);
protected static final String EXIT_SILENTLY = "";
- protected final D myMethod;
+ protected final Descriptor myMethod;
private final boolean myAllowDelegation;
protected JPanel myNamePanel;
protected EditorTextField myNameField;
protected EditorTextField myReturnTypeField;
protected JBListTable myParametersList;
- protected TableView> myParametersTable;
- protected final ParameterTableModelBase myParametersTableModel;
+ protected TableView myParametersTable;
+ protected final ParameterTableModel myParametersTableModel;
protected final UpdateSignatureListener mySignatureUpdater = new UpdateSignatureListener();
private MethodSignatureComponent mySignatureArea;
private final Alarm myUpdateSignatureAlarm = new Alarm(Alarm.ThreadToUse.SWING_THREAD);
- protected VisibilityPanelBase myVisibilityPanel;
+ protected VisibilityPanelBase myVisibilityPanel;
protected PsiCodeFragment myReturnTypeCodeFragment;
private DelegationPanel myDelegationPanel;
protected AnActionButton myPropagateParamChangesButton;
- protected Set myMethodsToPropagateParameters = null;
+ protected Set myMethodsToPropagateParameters = null;
private Tree myParameterPropagationTreeToReuse;
@@ -101,21 +111,23 @@ public abstract class ChangeSignatureDialogBase createParametersInfoModel(MethodDescriptor method);
+ protected abstract ParameterTableModel createParametersInfoModel(Descriptor method);
protected abstract BaseRefactoringProcessor createRefactoringProcessor();
protected abstract PsiCodeFragment createReturnTypeCodeFragment();
- protected abstract CallerChooserBase createCallerChooser(String title, Tree treeToReuse, Consumer> callback);
+ @Nullable
+ protected abstract CallerChooserBase createCallerChooser(String title, Tree treeToReuse, Consumer> callback);
+ @Nullable
protected abstract String validateAndCommitData();
protected abstract String calculateSignature();
- protected abstract VisibilityPanelBase createVisibilityControl();
+ protected abstract VisibilityPanelBase createVisibilityControl();
- public ChangeSignatureDialogBase(Project project, final D method, boolean allowDelegation, PsiElement defaultValueContext) {
+ public ChangeSignatureDialogBase(Project project, final Descriptor method, boolean allowDelegation, PsiElement defaultValueContext) {
super(project, true);
myMethod = method;
myDefaultValueContext = defaultValueContext;
@@ -134,7 +146,7 @@ public abstract class ChangeSignatureDialogBase parameterInfos) {
+ public void setParameterInfos(List parameterInfos) {
myParametersTableModel.setParameterInfos(parameterInfos);
updateSignature();
}
@@ -148,7 +160,8 @@ public abstract class ChangeSignatureDialogBase getParameters() {
- List
result = new ArrayList
(myParametersTableModel.getRowCount());
- for (ParameterTableModelItemBase
item : myParametersTableModel.getItems()) {
+ public List getParameters() {
+ List result = new ArrayList(myParametersTableModel.getRowCount());
+ for (ParameterTableModelItemBase item : myParametersTableModel.getItems()) {
result.add(item.parameter);
}
return result;
@@ -319,18 +332,17 @@ public abstract class ChangeSignatureDialogBase> chooser = new Ref>();
- Consumer> callback = new Consumer>() {
+ final Ref> chooser = new Ref>();
+ Consumer> callback = new Consumer>() {
@Override
- public void consume(Set callers) {
+ public void consume(Set callers) {
myMethodsToPropagateParameters = callers;
myParameterPropagationTreeToReuse = chooser.get().getTree();
}
};
try {
- chooser.set(
- createCallerChooser(RefactoringBundle.message("changeSignature.parameter.caller.chooser"), myParameterPropagationTreeToReuse,
- callback));
+ String message = RefactoringBundle.message("changeSignature.parameter.caller.chooser");
+ chooser.set(createCallerChooser(message, myParameterPropagationTreeToReuse, callback));
}
catch (ProcessCanceledException ex) {
// user cancelled initial callers search, don't show dialog
@@ -368,7 +380,7 @@ public abstract class ChangeSignatureDialogBase>(myParametersTableModel) {
+ myParametersTable = new TableView(myParametersTableModel) {
public void removeEditor() {
clearEditorListeners();
@@ -427,7 +439,7 @@ public abstract class ChangeSignatureDialogBase> items = myParametersTable.getItems();
+ final List items = myParametersTable.getItems();
final JComponent component = getRowPresentation(items.get(row), selected, focused);
for (EditorTextField editorTextField : UIUtil.findComponentsOfType(component, EditorTextField.class)) {
editorTextField.addSettingsProvider(new EditorSettingsProvider() {
@@ -442,14 +454,15 @@ public abstract class ChangeSignatureDialogBase> items = myParametersTable.getItems();
+ final List items = myParametersTable.getItems();
return isEmptyRow(items.get(row));
}
@Override
protected JBTableRowEditor getRowEditor(final int row) {
- final List> items = myParametersTable.getItems();
+ final List items = myParametersTable.getItems();
JBTableRowEditor editor = getTableEditor(myParametersList.getTable(), items.get(row));
+ LOG.assertTrue(editor != null);
editor.addDocumentListener(new JBTableRowEditor.RowDocumentListener() {
@Override
public void documentChanged(DocumentEvent e, int column) {
@@ -496,19 +509,21 @@ public abstract class ChangeSignatureDialogBase item) {
+ @Nullable
+ protected JBTableRowEditor getTableEditor(JTable table, ParameterTableModelItemBase item) {
return null;
}
- protected boolean isEmptyRow(ParameterTableModelItemBase row) {
+ protected boolean isEmptyRow(ParameterTableModelItemBase row) {
return false;
}
- protected JComponent getRowPresentation(ParameterTableModelItemBase item, boolean selected, boolean focused) {
+ @Nullable
+ protected JComponent getRowPresentation(ParameterTableModelItemBase item, boolean selected, boolean focused) {
return null;
}
- protected void customizeParametersTable(TableView> table) {
+ protected void customizeParametersTable(TableView table) {
}
private JComponent createSignaturePanel() {
@@ -592,7 +607,7 @@ public abstract class ChangeSignatureDialogBase infos = getParameters();
+ final List infos = getParameters();
if (infos.size() <= myMethod.getParametersCount()) return false;
for (int i = 0; i < myMethod.getParametersCount(); i++) {
if (infos.get(i).getOldIndex() != i) return false;
diff --git a/platform/lang-impl/src/com/intellij/refactoring/changeSignature/ParameterTableModelBase.java b/platform/lang-impl/src/com/intellij/refactoring/changeSignature/ParameterTableModelBase.java
index 976933fb98b3..67c1a7e5b301 100644
--- a/platform/lang-impl/src/com/intellij/refactoring/changeSignature/ParameterTableModelBase.java
+++ b/platform/lang-impl/src/com/intellij/refactoring/changeSignature/ParameterTableModelBase.java
@@ -35,8 +35,7 @@ import java.awt.*;
import java.util.ArrayList;
import java.util.List;
-public abstract class ParameterTableModelBase extends ListTableModel>
- implements RowEditableTableModel {
+public abstract class ParameterTableModelBase> extends ListTableModel implements RowEditableTableModel {
protected final PsiElement myTypeContext;
protected final PsiElement myDefaultValueContext;
@@ -49,14 +48,14 @@ public abstract class ParameterTableModelBase extends L
myDefaultValueContext = defaultValueContext;
}
- protected abstract ParameterTableModelItemBase
createRowItem(@Nullable P parameterInfo);
+ protected abstract TableItem createRowItem(@Nullable P parameterInfo);
public void addRow() {
addRow(createRowItem(null));
}
public void setParameterInfos(List
parameterInfos) {
- List> items = new ArrayList>(parameterInfos.size());
+ List items = new ArrayList(parameterInfos.size());
for (P parameterInfo : parameterInfos) {
items.add(createRowItem(parameterInfo));
}
@@ -73,8 +72,8 @@ public abstract class ParameterTableModelBase extends L
fireTableCellUpdated(rowIndex, columnIndex); // to update signature
}
- protected static abstract class ColumnInfoBase
- extends ColumnInfo, Aspect> {
+ protected static abstract class ColumnInfoBase, Aspect>
+ extends ColumnInfo {
private TableCellRenderer myRenderer;
private TableCellEditor myEditor;
@@ -83,7 +82,7 @@ public abstract class ParameterTableModelBase extends L
}
@Override
- public final TableCellEditor getEditor(ParameterTableModelItemBase
o) {
+ public final TableCellEditor getEditor(TableItem o) {
if (myEditor == null) {
myEditor = doCreateEditor(o);
}
@@ -91,7 +90,7 @@ public abstract class ParameterTableModelBase
extends L
}
@Override
- public final TableCellRenderer getRenderer(ParameterTableModelItemBase
item) {
+ public final TableCellRenderer getRenderer(TableItem item) {
if (myRenderer == null) {
final TableCellRenderer original = doCreateRenderer(item);
myRenderer = new TableCellRenderer() {
@@ -119,12 +118,12 @@ public abstract class ParameterTableModelBase
extends L
return myRenderer;
}
- protected abstract TableCellRenderer doCreateRenderer(ParameterTableModelItemBase
item);
+ protected abstract TableCellRenderer doCreateRenderer(TableItem item);
- protected abstract TableCellEditor doCreateEditor(ParameterTableModelItemBase
item);
+ protected abstract TableCellEditor doCreateEditor(TableItem item);
}
- protected static class TypeColumn
extends ColumnInfoBase {
+ protected static class TypeColumn> extends ColumnInfoBase {
protected final Project myProject;
private final FileType myFileType;
@@ -139,25 +138,25 @@ public abstract class ParameterTableModelBase extends L
}
@Override
- public PsiCodeFragment valueOf(ParameterTableModelItemBase
item) {
+ public PsiCodeFragment valueOf(TableItem item) {
return item.typeCodeFragment;
}
@Override
- public boolean isCellEditable(ParameterTableModelItemBase
pParameterTableModelItemBase) {
+ public boolean isCellEditable(TableItem pParameterTableModelItemBase) {
return true;
}
- public TableCellRenderer doCreateRenderer(ParameterTableModelItemBase
pParameterTableModelItemBase) {
+ public TableCellRenderer doCreateRenderer(TableItem pParameterTableModelItemBase) {
return new CodeFragmentTableCellRenderer(myProject, myFileType);
}
- public TableCellEditor doCreateEditor(ParameterTableModelItemBase
o) {
+ public TableCellEditor doCreateEditor(TableItem o) {
return new CodeFragmentTableCellEditorBase(myProject, myFileType);
}
}
- protected static class NameColumn
extends ColumnInfoBase {
+ protected static class NameColumn> extends ColumnInfoBase {
private final Project myProject;
public NameColumn(Project project) {
@@ -170,21 +169,21 @@ public abstract class ParameterTableModelBase extends L
}
@Override
- public String valueOf(ParameterTableModelItemBase
item) {
+ public String valueOf(TableItem item) {
return item.parameter.getName();
}
@Override
- public void setValue(ParameterTableModelItemBase
item, String value) {
+ public void setValue(TableItem item, String value) {
item.parameter.setName(value);
}
@Override
- public boolean isCellEditable(ParameterTableModelItemBase
pParameterTableModelItemBase) {
+ public boolean isCellEditable(TableItem pParameterTableModelItemBase) {
return true;
}
- public TableCellRenderer doCreateRenderer(ParameterTableModelItemBase
item) {
+ public TableCellRenderer doCreateRenderer(TableItem item) {
return new ColoredTableCellRenderer() {
public void customizeCellRenderer(JTable table, Object value,
boolean isSelected, boolean hasFocus, int row, int column) {
@@ -194,12 +193,12 @@ public abstract class ParameterTableModelBase
extends L
};
}
- public TableCellEditor doCreateEditor(ParameterTableModelItemBase
o) {
+ public TableCellEditor doCreateEditor(TableItem o) {
return new StringTableCellEditor(myProject);
}
}
- protected static class DefaultValueColumn
extends ColumnInfoBase {
+ protected static class DefaultValueColumn> extends ColumnInfoBase {
private final Project myProject;
private final FileType myFileType;
@@ -214,50 +213,50 @@ public abstract class ParameterTableModelBase extends L
}
@Override
- public boolean isCellEditable(ParameterTableModelItemBase
item) {
+ public boolean isCellEditable(TableItem item) {
return !item.isEllipsisType() && item.parameter.getOldIndex() == -1;
}
@Override
- public PsiCodeFragment valueOf(ParameterTableModelItemBase
item) {
+ public PsiCodeFragment valueOf(TableItem item) {
return item.defaultValueCodeFragment;
}
- public TableCellRenderer doCreateRenderer(ParameterTableModelItemBase
item) {
+ public TableCellRenderer doCreateRenderer(TableItem item) {
return new CodeFragmentTableCellRenderer(myProject, myFileType);
}
- public TableCellEditor doCreateEditor(ParameterTableModelItemBase
item) {
+ public TableCellEditor doCreateEditor(TableItem item) {
return new CodeFragmentTableCellEditorBase(myProject, myFileType);
}
}
- protected static class AnyVarColumn
extends ColumnInfoBase {
+ protected static class AnyVarColumn> extends ColumnInfoBase {
public AnyVarColumn() {
super(RefactoringBundle.message("column.name.any.var"));
}
@Override
- public boolean isCellEditable(ParameterTableModelItemBase item) {
+ public boolean isCellEditable(TableItem item) {
return !item.isEllipsisType() && item.parameter.getOldIndex() == -1;
}
@Override
- public Boolean valueOf(ParameterTableModelItemBase
item) {
+ public Boolean valueOf(TableItem item) {
return item.parameter.isUseAnySingleVariable();
}
@Override
- public void setValue(ParameterTableModelItemBase
item, Boolean value) {
+ public void setValue(TableItem item, Boolean value) {
item.parameter.setUseAnySingleVariable(value);
}
- public TableCellRenderer doCreateRenderer(ParameterTableModelItemBase
item) {
+ public TableCellRenderer doCreateRenderer(TableItem item) {
return new BooleanTableCellRenderer();
}
- public TableCellEditor doCreateEditor(ParameterTableModelItemBase
item) {
+ public TableCellEditor doCreateEditor(TableItem item) {
return new BooleanTableCellEditor(false);
}
diff --git a/platform/lang-impl/src/com/intellij/refactoring/rename/AutomaticRenamingDialog.java b/platform/lang-impl/src/com/intellij/refactoring/rename/AutomaticRenamingDialog.java
index e22dcc4d8923..9e6dfc0a4d16 100644
--- a/platform/lang-impl/src/com/intellij/refactoring/rename/AutomaticRenamingDialog.java
+++ b/platform/lang-impl/src/com/intellij/refactoring/rename/AutomaticRenamingDialog.java
@@ -36,7 +36,6 @@ import com.intellij.ui.TableUtil;
import com.intellij.ui.table.JBTable;
import com.intellij.usageView.UsageInfo;
import com.intellij.usages.impl.UsagePreviewPanel;
-import com.intellij.util.ui.Table;
import javax.swing.*;
import javax.swing.event.ListSelectionEvent;
@@ -134,9 +133,11 @@ public class AutomaticRenamingDialog extends DialogWrapper {
protected void handleChanges() {
final int selectedRow = myTable.getSelectedRow();
- final boolean validName = RenameUtil.isValidName(myProject, myRenames[selectedRow], myNewNames[selectedRow]);
- getOKAction().setEnabled(validName);
- setErrorText(validName ? null : "Identifier \'" + myNewNames[selectedRow] + "\' is invalid");
+ if (selectedRow > -1) {
+ final boolean validName = RenameUtil.isValidName(myProject, myRenames[selectedRow], myNewNames[selectedRow]);
+ getOKAction().setEnabled(validName);
+ setErrorText(validName ? null : "Identifier \'" + myNewNames[selectedRow] + "\' is invalid");
+ }
}
protected JComponent createCenterPanel() {
diff --git a/platform/lang-impl/src/com/intellij/refactoring/rename/inplace/InplaceRefactoring.java b/platform/lang-impl/src/com/intellij/refactoring/rename/inplace/InplaceRefactoring.java
index 7f743742985f..ad16b2b986fe 100644
--- a/platform/lang-impl/src/com/intellij/refactoring/rename/inplace/InplaceRefactoring.java
+++ b/platform/lang-impl/src/com/intellij/refactoring/rename/inplace/InplaceRefactoring.java
@@ -696,20 +696,21 @@ public abstract class InplaceRefactoring {
releaseIfNotRestart();
}
});
- myEditor.getScrollingModel().scrollToCaret(ScrollType.MAKE_VISIBLE);
+ final Editor topLevelEditor = InjectedLanguageUtil.getTopLevelEditor(myEditor);
+ topLevelEditor.getScrollingModel().scrollToCaret(ScrollType.MAKE_VISIBLE);
final JBPopupFactory popupFactory = JBPopupFactory.getInstance();
- myBalloon.show(new PositionTracker(myEditor.getContentComponent()) {
+ myBalloon.show(new PositionTracker(topLevelEditor.getContentComponent()) {
@Override
public RelativePoint recalculateLocation(Balloon object) {
- if (myTarget != null && !popupFactory.isBestPopupLocationVisible(myEditor)) {
+ if (myTarget != null && !popupFactory.isBestPopupLocationVisible(topLevelEditor)) {
return myTarget;
}
- final RelativePoint target = popupFactory.guessBestPopupLocation(myEditor);
+ final RelativePoint target = popupFactory.guessBestPopupLocation(topLevelEditor);
if (target == null) return myTarget;
final Point screenPoint = target.getScreenPoint();
int y = screenPoint.y;
- if (target.getPoint().getY() > myEditor.getLineHeight() + myBalloon.getPreferredSize().getHeight()) {
- y -= myEditor.getLineHeight();
+ if (target.getPoint().getY() > topLevelEditor.getLineHeight() + myBalloon.getPreferredSize().getHeight()) {
+ y -= topLevelEditor.getLineHeight();
}
myTarget = new RelativePoint(new Point(screenPoint.x, y));
return myTarget;
diff --git a/platform/lang-impl/src/com/intellij/ui/debugger/ShowUIDefaultsAction.java b/platform/lang-impl/src/com/intellij/ui/debugger/ShowUIDefaultsAction.java
index 737f4f6da3fa..f1b11c6d469a 100644
--- a/platform/lang-impl/src/com/intellij/ui/debugger/ShowUIDefaultsAction.java
+++ b/platform/lang-impl/src/com/intellij/ui/debugger/ShowUIDefaultsAction.java
@@ -19,11 +19,14 @@ import com.intellij.openapi.actionSystem.AnAction;
import com.intellij.openapi.actionSystem.AnActionEvent;
import com.intellij.openapi.ui.DialogWrapper;
import com.intellij.openapi.util.text.StringUtil;
+import com.intellij.ui.Cell;
import com.intellij.ui.ColorPicker;
import com.intellij.ui.ColorUtil;
import com.intellij.ui.TableSpeedSearch;
import com.intellij.ui.components.JBScrollPane;
import com.intellij.ui.table.JBTable;
+import com.intellij.util.PairFunction;
+import org.jetbrains.annotations.Nullable;
import javax.swing.*;
import javax.swing.border.Border;
@@ -31,6 +34,7 @@ import javax.swing.plaf.ColorUIResource;
import javax.swing.table.DefaultTableCellRenderer;
import javax.swing.table.DefaultTableModel;
import java.awt.*;
+import java.awt.event.MouseEvent;
import java.util.Arrays;
import java.util.Comparator;
import java.util.Enumeration;
@@ -76,7 +80,7 @@ public class ShowUIDefaultsAction extends AnAction {
}) {
@Override
public boolean editCellAt(int row, int column, EventObject e) {
- if (isCellEditable(row, column)) {
+ if (isCellEditable(row, column) && e instanceof MouseEvent) {
final Object color = getValueAt(row, column);
final Color newColor = ColorPicker.showDialog(this, "Choose Color", (Color)color, true, null);
if (newColor != null) {
@@ -107,16 +111,20 @@ public class ShowUIDefaultsAction extends AnAction {
panel.setBackground(c);
return panel;
} else if (value instanceof Icon) {
- //final Icon icon = (Icon)value;
- //if (icon.getIconHeight() <= 20) {
- // //label.setIcon(icon);
- //}
- //label.setText(String.format("(%dx%d) %s)",icon.getIconWidth(), icon.getIconHeight(), label.getText()));
+ try {
+ final Icon icon = (Icon)value;
+ if (icon.getIconHeight() <= 20) {
+ label.setIcon(icon);
+ }
+ label.setText(String.format("(%dx%d) %s)",icon.getIconWidth(), icon.getIconHeight(), label.getText()));
+ }
+ catch (Throwable e1) {//
+ }
return panel;
} else if (value instanceof Border) {
try {
final Insets i = ((Border)value).getBorderInsets(null);
- label.setText(String.format("border[%d, %d, %d, %d] %s", i.top, i.left, i.bottom, i.right, label.getText()));
+ label.setText(String.format("[%d, %d, %d, %d] %s", i.top, i.left, i.bottom, i.right, label.getText()));
return panel;
} catch (Exception ignore) {}
}
@@ -124,7 +132,13 @@ public class ShowUIDefaultsAction extends AnAction {
}
});
final JBScrollPane pane = new JBScrollPane(table);
- new TableSpeedSearch(table);
+ new TableSpeedSearch(table, new PairFunction() {
+ @Nullable
+ @Override
+ public String fun(Object o, Cell cell) {
+ return cell.column == 1 ? null : String.valueOf(o);
+ }
+ });
table.setShowGrid(false);
final JPanel panel = new JPanel(new BorderLayout());
panel.add(pane, BorderLayout.CENTER);
diff --git a/platform/platform-api/src/com/intellij/execution/configurations/ParametersList.java b/platform/platform-api/src/com/intellij/execution/configurations/ParametersList.java
index ea58d2795e91..c7a03937eef3 100644
--- a/platform/platform-api/src/com/intellij/execution/configurations/ParametersList.java
+++ b/platform/platform-api/src/com/intellij/execution/configurations/ParametersList.java
@@ -22,8 +22,8 @@ import com.intellij.openapi.diagnostic.Logger;
import com.intellij.openapi.util.text.StringUtil;
import com.intellij.util.ArrayUtil;
import com.intellij.util.EnvironmentUtil;
-import com.intellij.util.StringBuilderSpinAllocator;
import com.intellij.util.containers.ContainerUtil;
+import com.intellij.util.execution.ParametersListUtil;
import gnu.trove.THashMap;
import org.jetbrains.annotations.NonNls;
import org.jetbrains.annotations.NotNull;
@@ -254,64 +254,27 @@ public class ParametersList implements Cloneable {
}
/**
- * Joins list of parameters into single string, which may be then parsed back into list by {@link #parse(String)}.
- *
- *
- * Conversion rules:
- *
- * - double quotes are escaped by backslash (
\);
- * - empty parameters parameters and parameters with spaces inside are surrounded with double quotes (
");
- * - parameters are separated by single whitespace.
- *
- *
- *
- * Examples:
- *
- * ['a', 'b'] => 'a b'
- * ['a="1 2"', 'b'] => '"a \"1 2\"" b'
- *
- *
- * @param parameters a list of parameters to join.
- * @return a string with parameters.
+ * @see ParametersListUtil#join(java.util.List)
*/
@NotNull
public static String join(@NotNull final List parameters) {
- return ParametersTokenizer.encode(parameters);
- }
-
- @NotNull
- public static String join(final String... parameters) {
- return ParametersTokenizer.encode(Arrays.asList(parameters));
+ return ParametersListUtil.join(parameters);
}
/**
- * Converts single parameter string (as created by {@link #join(java.util.List)}) into list of parameters.
- *
- *
- * Conversion rules:
- *
- * - starting/whitespaces are trimmed;
- * - parameters are split by whitespaces, whitespaces itself are dropped
- * - parameters inside double quotes (
"a b") are kept as single one;
- * - double quotes are dropped, escaped double quotes (
\") are un-escaped.
- *
- *
- *
- * Examples:
- *
- * ' a b ' => ['a', 'b']
- * 'a="1 2" b' => ['a=1 2', 'b']
- * 'a " " b' => ['a', ' ', 'b']
- * '"a \"1 2\"" b' => ['a="1 2"', 'b']
- *
- *
- * @param string parameter string to split.
- * @return array of parameters.
+ * @see ParametersListUtil#join(java.util.List)
+ */
+ @NotNull
+ public static String join(final String... parameters) {
+ return ParametersListUtil.join(parameters);
+ }
+
+ /**
+ * @see ParametersListUtil#parseToArray(String)
*/
@NotNull
public static String[] parse(@NotNull final String string) {
- final List params = ParametersTokenizer.decode(string);
- return ArrayUtil.toStringArray(params);
+ return ParametersListUtil.parseToArray(string);
}
public String expandMacros(String text) {
@@ -356,84 +319,4 @@ public class ParametersList implements Cloneable {
return myParameters.toString();
}
- private static class ParametersTokenizer {
- private ParametersTokenizer() {
- }
-
- @NotNull
- public static String encode(@NotNull final List parameters) {
- final StringBuilder buffer = new StringBuilder();
- for (final String parameter : parameters) {
- if (buffer.length() > 0) {
- buffer.append(' ');
- }
- buffer.append(encode(parameter));
- }
- return buffer.toString();
- }
-
- @NotNull
- public static String encode(@NotNull String parameter) {
- final StringBuilder builder = StringBuilderSpinAllocator.alloc();
- try {
- builder.append(parameter);
- StringUtil.escapeQuotes(builder);
- if (builder.length() == 0 || StringUtil.indexOf(builder, ' ') >= 0 || StringUtil.indexOf(builder, '|') >= 0) {
- StringUtil.quote(builder);
- }
- return builder.toString();
- }
- finally {
- StringBuilderSpinAllocator.dispose(builder);
- }
- }
-
- @NotNull
- public static List decode(@NotNull String parameterString) {
- parameterString = parameterString.trim();
-
- final ArrayList params = ContainerUtil.newArrayList();
- final StringBuilder token = new StringBuilder(128);
- boolean inQuotes = false;
- boolean escapedQuote = false;
- boolean nonEmpty = false;
-
- for (int i = 0; i < parameterString.length(); i++) {
- final char ch = parameterString.charAt(i);
-
- if (ch == '\"') {
- if (!escapedQuote) {
- inQuotes = !inQuotes;
- nonEmpty = true;
- continue;
- }
- escapedQuote = false;
- }
- else if (Character.isWhitespace(ch)) {
- if (!inQuotes) {
- if (token.length() > 0 || nonEmpty) {
- params.add(token.toString());
- token.setLength(0);
- nonEmpty = false;
- }
- continue;
- }
- }
- else if (ch == '\\') {
- if (i < parameterString.length() - 1 && parameterString.charAt(i + 1) == '"') {
- escapedQuote = true;
- continue;
- }
- }
-
- token.append(ch);
- }
-
- if (token.length() > 0 || nonEmpty) {
- params.add(token.toString());
- }
-
- return params;
- }
- }
}
diff --git a/platform/platform-api/src/com/intellij/ide/util/treeView/PresentableNodeDescriptor.java b/platform/platform-api/src/com/intellij/ide/util/treeView/PresentableNodeDescriptor.java
index c4add9f856f1..6816f1442adc 100644
--- a/platform/platform-api/src/com/intellij/ide/util/treeView/PresentableNodeDescriptor.java
+++ b/platform/platform-api/src/com/intellij/ide/util/treeView/PresentableNodeDescriptor.java
@@ -17,6 +17,7 @@ package com.intellij.ide.util.treeView;
import com.intellij.ide.projectView.PresentationData;
import com.intellij.openapi.project.Project;
+import com.intellij.ui.Gray;
import com.intellij.ui.SimpleTextAttributes;
import com.intellij.util.ui.UIUtil;
import org.jetbrains.annotations.NotNull;
@@ -167,7 +168,7 @@ public abstract class PresentableNodeDescriptor extends NodeDescriptor {
}
public Color getHighlightColor() {
- return UIUtil.isUnderDarcula() ? UIUtil.getPanelBackground().brighter() : UIUtil.getTreeBackground().brighter();
+ return UIUtil.isUnderDarcula() ? Gray._100 : UIUtil.getTreeBackground().brighter();
}
public static class ColoredFragment {
diff --git a/platform/platform-api/src/com/intellij/xml/util/XmlStringUtil.java b/platform/platform-api/src/com/intellij/xml/util/XmlStringUtil.java
index b211e11310a4..844be9811c0a 100644
--- a/platform/platform-api/src/com/intellij/xml/util/XmlStringUtil.java
+++ b/platform/platform-api/src/com/intellij/xml/util/XmlStringUtil.java
@@ -16,6 +16,8 @@
package com.intellij.xml.util;
+import org.jetbrains.annotations.Nullable;
+
/**
* @author yole
*/
@@ -23,11 +25,11 @@ public class XmlStringUtil {
private XmlStringUtil() {
}
- public static String escapeString(String str) {
+ public static String escapeString(@Nullable String str) {
return escapeString(str, false);
}
- public static String escapeString(String str, final boolean escapeWhiteSpace) {
+ public static String escapeString(@Nullable String str, final boolean escapeWhiteSpace) {
return XmlTagUtilBase.escapeString(str, escapeWhiteSpace);
}
}
\ No newline at end of file
diff --git a/platform/platform-api/src/com/intellij/xml/util/XmlTagUtilBase.java b/platform/platform-api/src/com/intellij/xml/util/XmlTagUtilBase.java
index b93a7b722e88..f3d9c9a86ae1 100644
--- a/platform/platform-api/src/com/intellij/xml/util/XmlTagUtilBase.java
+++ b/platform/platform-api/src/com/intellij/xml/util/XmlTagUtilBase.java
@@ -16,9 +16,10 @@
package com.intellij.xml.util;
import org.jetbrains.annotations.NonNls;
+import org.jetbrains.annotations.Nullable;
public class XmlTagUtilBase {
- public static String escapeString(final String str, final boolean escapeWhiteSpace) {
+ public static String escapeString(@Nullable final String str, final boolean escapeWhiteSpace) {
if (str == null) return null;
StringBuffer buffer = null;
for (int i = 0; i < str.length(); i++) {
diff --git a/platform/platform-impl/src/com/intellij/ide/dnd/FileCopyPasteUtil.java b/platform/platform-impl/src/com/intellij/ide/dnd/FileCopyPasteUtil.java
index 215a90fd41c5..382c9736322e 100644
--- a/platform/platform-impl/src/com/intellij/ide/dnd/FileCopyPasteUtil.java
+++ b/platform/platform-impl/src/com/intellij/ide/dnd/FileCopyPasteUtil.java
@@ -16,6 +16,9 @@
package com.intellij.ide.dnd;
import com.intellij.openapi.diagnostic.Logger;
+import com.intellij.openapi.util.Condition;
+import com.intellij.openapi.util.text.StringUtil;
+import com.intellij.util.containers.ContainerUtil;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
@@ -94,8 +97,14 @@ public class FileCopyPasteUtil {
public static List getFileList(@NotNull final Transferable transferable) {
try {
if (transferable.isDataFlavorSupported(DataFlavor.javaFileListFlavor)) {
- @SuppressWarnings({"unchecked"}) final List fileList = (List)transferable.getTransferData(DataFlavor.javaFileListFlavor);
- return fileList;
+ @SuppressWarnings({"unchecked"})
+ final List fileList = (List)transferable.getTransferData(DataFlavor.javaFileListFlavor);
+ return ContainerUtil.filter(fileList, new Condition() {
+ @Override
+ public boolean value(File file) {
+ return !StringUtil.isEmptyOrSpaces(file.getPath());
+ }
+ });
}
else {
return LinuxDragAndDropSupport.getFiles(transferable);
@@ -105,4 +114,5 @@ public class FileCopyPasteUtil {
return null;
}
+
}
diff --git a/platform/platform-impl/src/com/intellij/ide/ui/laf/darcula/DarculaLaf.java b/platform/platform-impl/src/com/intellij/ide/ui/laf/darcula/DarculaLaf.java
index 449e2dc54eab..721770359a4e 100644
--- a/platform/platform-impl/src/com/intellij/ide/ui/laf/darcula/DarculaLaf.java
+++ b/platform/platform-impl/src/com/intellij/ide/ui/laf/darcula/DarculaLaf.java
@@ -21,7 +21,8 @@ import com.intellij.openapi.util.IconLoader;
import com.intellij.openapi.util.SystemInfo;
import com.intellij.openapi.util.text.StringUtil;
import com.intellij.ui.ColorUtil;
-import org.jetbrains.annotations.Nullable;
+import com.intellij.util.containers.hash.HashMap;
+import org.jetbrains.annotations.NotNull;
import javax.swing.*;
import javax.swing.plaf.ColorUIResource;
@@ -104,8 +105,7 @@ public final class DarculaLaf extends BasicLookAndFeel {
@SuppressWarnings({"HardCodedStringLiteral"})
static void initIdeaDefaults(UIDefaults defaults) {
- loadDefaults(defaults, null); //load defaults
- loadDefaults(defaults, SystemInfo.isMac ? "mac" : SystemInfo.isWindows ? "windows" : "linux"); // load OS customization
+ loadDefaults(defaults);
defaults.put("Table.ancestorInputMap", new UIDefaults.LazyInputMap(new Object[] {
"ctrl C", "copy",
"ctrl V", "paste",
@@ -158,44 +158,70 @@ public final class DarculaLaf extends BasicLookAndFeel {
}));
}
- private static void loadDefaults(UIDefaults defaults, @Nullable String postfix) {
+ private static void loadDefaults(UIDefaults defaults) {
+ final Properties properties = new Properties();
+ final String osSuffix = SystemInfo.isMac ? "mac" : SystemInfo.isWindows ? "windows" : "linux";
try {
- final Properties properties = new Properties();
- final String secondPart = postfix == null ? "" : "_" + postfix;
- final String name = "darcula" + secondPart + ".properties";
- final InputStream stream = DarculaLaf.class.getResourceAsStream(name);
+ InputStream stream = DarculaLaf.class.getResourceAsStream("darcula.properties");
properties.load(stream);
+ stream.close();
+
+ stream = DarculaLaf.class.getResourceAsStream("darcula_" + osSuffix + ".properties");
+ properties.load(stream);
+ stream.close();
+
+ HashMap darculaGlobalSettings = new HashMap();
+ final String prefix = "darcula.";
for (String key : properties.stringPropertyNames()) {
- final String value = properties.getProperty(key);
- if (key.endsWith("Insets")) {
- final List numbers = StringUtil.split(value, ",");
- defaults.put(key, new InsetsUIResource(Integer.parseInt(numbers.get(0)),
- Integer.parseInt(numbers.get(1)),
- Integer.parseInt(numbers.get(2)),
- Integer.parseInt(numbers.get(3))));
- } else if (key.endsWith(".border")) {
- try {
- defaults.put(key, Class.forName(value).newInstance());
- } catch (Exception e) {log(e);}
- } else {
- final Color color = ColorUtil.fromHex(value, null);
- final Integer invVal = getInteger(value);
- Icon icon = value != null && value.startsWith("AllIcons.") ? IconLoader.getIcon(value) : null;
- if (color != null) {
- defaults.put(key, new ColorUIResource(color));
- } else if (invVal != null) {
- defaults.put(key, invVal);
- } else if (icon != null) {
- defaults.put(key, new IconUIResource(icon));
- } else {
- defaults.put(key, value);
+ if (key.startsWith(prefix)) {
+ darculaGlobalSettings.put(key.substring(prefix.length()), parseValue(key, properties.getProperty(key)));
+ }
+ }
+
+ for (Object key : defaults.keySet()) {
+ if (key instanceof String && ((String)key).contains(".")) {
+ final String s = (String)key;
+ final String darculaKey = s.substring(s.lastIndexOf('.') + 1);
+ if (darculaGlobalSettings.containsKey(darculaKey)) {
+ defaults.put(key, darculaGlobalSettings.get(darculaKey));
}
}
}
+
+ for (String key : properties.stringPropertyNames()) {
+ final String value = properties.getProperty(key);
+ defaults.put(key, parseValue(key, value));
+ }
}
catch (IOException e) {log(e);}
}
+ private static Object parseValue(String key, @NotNull String value) {
+ if (key.endsWith("Insets")) {
+ final List numbers = StringUtil.split(value, ",");
+ return new InsetsUIResource(Integer.parseInt(numbers.get(0)),
+ Integer.parseInt(numbers.get(1)),
+ Integer.parseInt(numbers.get(2)),
+ Integer.parseInt(numbers.get(3)));
+ } else if (key.endsWith(".border")) {
+ try {
+ return Class.forName(value).newInstance();
+ } catch (Exception e) {log(e);}
+ } else {
+ final Color color = ColorUtil.fromHex(value, null);
+ final Integer invVal = getInteger(value);
+ Icon icon = value.startsWith("AllIcons.") ? IconLoader.getIcon(value) : null;
+ if (color != null) {
+ return new ColorUIResource(color);
+ } else if (invVal != null) {
+ return invVal;
+ } else if (icon != null) {
+ return new IconUIResource(icon);
+ }
+ }
+ return value;
+ }
+
private static Integer getInteger(String value) {
try {
return Integer.parseInt(value);
diff --git a/platform/platform-impl/src/com/intellij/ide/ui/laf/darcula/darcula.properties b/platform/platform-impl/src/com/intellij/ide/ui/laf/darcula/darcula.properties
index a767d6aef668..9a1a2bee2097 100644
--- a/platform/platform-impl/src/com/intellij/ide/ui/laf/darcula/darcula.properties
+++ b/platform/platform-impl/src/com/intellij/ide/ui/laf/darcula/darcula.properties
@@ -1,84 +1,50 @@
+darcula.background=535353
+darcula.textBackground=535353
+darcula.foreground=eeeeee
+darcula.textForeground=eeeeee
+darcula.caretForeground=eeeeee
+
text=eeeeee
Menu.maxGutterIconWidth=18
MenuItem.maxGutterIconWidth=18
MenuItem.acceleratorDelimiter=-
-#Trees
-Tree.background=535353
-Tree.foreground=eeeeee
-Tree.textForeground=eeeeee
-Tree.textBackground=535353
-#Tree.selectionBackground=BEBEBE
-#Tree.selectionForeground=535353
-
-EditorPane.background=535353
EditorPane.inactiveBackground=535353
-EditorPane.foreground=eeeeee
EditorPane.inactiveForeground=eeeeee
EditorPaneUI=com.intellij.ide.ui.laf.darcula.ui.DarculaEditorPaneUI
-#Lists
-List.background=535353
-List.foreground=eeeeee
-#Tables
-Table.background=535353
-Table.foreground=eeeeee
control=535353
-Panel.background=535353
-Panel.foreground=eeeeee
+
+ScrollBarUI=com.intellij.ide.ui.laf.darcula.ui.DarculaScrollBarUI
+
Menu.selectionBackground=bebebe
-MenuBar.background=535353
MenuBar.disabledBackground=535353
MenuBar.shadow=535353
-Menu.background=535353
-MenuItem.background=535353
-Menu.foreground=eeeeee
-MenuItem.foreground=eeeeee
TabbedPane.tabInsets=0,4,0,4
-ToggleButton.foreground=eeeeee
-Separator.background=535353
Separator.foreground=888888
-Label.background=535353
-Label.foreground=eeeeee
Focus.color=ff0000
-TextField.background=535353
-TextField.foreground=eeeeee
-TextField.caretForeground=eeeeee
-#TextFieldUI=com.intellij.ide.ui.laf.darcula.ui.DarculaTextFieldUI
+TextField.background=737373
+TextFieldUI=com.intellij.ide.ui.laf.darcula.ui.DarculaTextFieldUI
+TextField.border=com.intellij.ide.ui.laf.darcula.ui.DarculaTextBorder
-PasswordField.background=535353
-PasswordField.foreground=eeeeee
-PasswordField.caretForeground=eeeeee
+PasswordField.background=aaaaaa
-TextArea.background=535353
-TextArea.foreground=eeeeee
-TextArea.caretForeground=eeeeee
-
-TextPane.background=535353
-TextPane.foreground=eeeeee
-TextPane.caretForeground=eeeeee
-
-CheckBox.background=535353
-CheckBox.foreground=eeeeee
CheckBoxUI=com.intellij.ide.ui.laf.darcula.ui.DarculaCheckBoxUI
-
-RadioButton.foreground=eeeeee
-RadioButton.background=535353
+#ComboBoxUI=com.intellij.ide.ui.laf.darcula.ui.DarculaComboBoxUI
+ComboBox.background=eeeeee
+ComboBox.foreground=000000
RadioButtonUI=com.intellij.ide.ui.laf.darcula.ui.DarculaRadioButtonUI
StatusBar.topColor=2c2c2c
StatusBar.top2Color=2c2c2c
StatusBar.bottomColor=2c2c2c
-Button.foreground=eeeeee
-Button.background=535353
Button.border=com.intellij.ide.ui.laf.darcula.ui.DarculaButtonPainter
#ButtonUI=com.intellij.ide.ui.laf.borders.DarculaButtonUI
MenuItem.acceleratorForeground=eeeeee
-PopupMenu.background=535353
PopupMenu.translucentBackground=535353
diff --git a/platform/platform-impl/src/com/intellij/ide/ui/laf/darcula/ui/DarculaButtonPainter.java b/platform/platform-impl/src/com/intellij/ide/ui/laf/darcula/ui/DarculaButtonPainter.java
index 6c4e03292e74..b571c8e5a78c 100644
--- a/platform/platform-impl/src/com/intellij/ide/ui/laf/darcula/ui/DarculaButtonPainter.java
+++ b/platform/platform-impl/src/com/intellij/ide/ui/laf/darcula/ui/DarculaButtonPainter.java
@@ -63,6 +63,6 @@ public class DarculaButtonPainter implements Border, UIResource {
@Override
public boolean isBorderOpaque() {
- return false;
+ return true;
}
}
diff --git a/platform/platform-impl/src/com/intellij/ide/ui/laf/darcula/ui/DarculaComboBoxButton.java b/platform/platform-impl/src/com/intellij/ide/ui/laf/darcula/ui/DarculaComboBoxButton.java
new file mode 100644
index 000000000000..3669d47c86aa
--- /dev/null
+++ b/platform/platform-impl/src/com/intellij/ide/ui/laf/darcula/ui/DarculaComboBoxButton.java
@@ -0,0 +1,56 @@
+/*
+ * Copyright 2000-2012 JetBrains s.r.o.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.intellij.ide.ui.laf.darcula.ui;
+
+import com.intellij.icons.AllIcons;
+
+import javax.swing.*;
+import javax.swing.plaf.basic.BasicButtonUI;
+import java.awt.*;
+
+/**
+ * @author Konstantin Bulenkov
+ */
+public class DarculaComboBoxButton extends JButton {
+ private final JComboBox myComboBox;
+
+ public DarculaComboBoxButton(JComboBox comboBox) {
+ myComboBox = comboBox;
+ setUI(new BasicButtonUI() {
+ @Override
+ public void paint(Graphics g, JComponent c) {
+ final Icon i;
+ if (myComboBox.isEditable()) {
+ g.drawLine(0,0,0,c.getHeight());
+ i = AllIcons.Mac.Tree_white_down_arrow;
+ } else {
+ i = AllIcons.Ide.Statusbar_arrows;
+ }
+ i.paintIcon(c, g, (c.getWidth() - i.getIconWidth()) / 2, (c.getHeight() - i.getIconHeight()) / 2);
+ }
+
+ @Override
+ public Dimension getPreferredSize(JComponent c) {
+ return super.getPreferredSize(c);
+ }
+ });
+ }
+
+ @Override
+ protected void paintComponent(Graphics g) {
+ super.paintComponent(g);
+ }
+}
diff --git a/platform/platform-impl/src/com/intellij/ide/ui/laf/darcula/ui/DarculaComboBoxUI.java b/platform/platform-impl/src/com/intellij/ide/ui/laf/darcula/ui/DarculaComboBoxUI.java
new file mode 100644
index 000000000000..f9a5b2b6144c
--- /dev/null
+++ b/platform/platform-impl/src/com/intellij/ide/ui/laf/darcula/ui/DarculaComboBoxUI.java
@@ -0,0 +1,88 @@
+/*
+ * Copyright 2000-2012 JetBrains s.r.o.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.intellij.ide.ui.laf.darcula.ui;
+
+import javax.swing.*;
+import javax.swing.plaf.ComponentUI;
+import javax.swing.plaf.basic.BasicComboBoxUI;
+import java.awt.*;
+
+/**
+ * @author Konstantin Bulenkov
+ */
+public class DarculaComboBoxUI extends BasicComboBoxUI {
+ private final JComboBox myComboBox;
+
+ public DarculaComboBoxUI(JComboBox c) {
+ myComboBox = c;
+ c.setBorder(null);
+ }
+
+ @SuppressWarnings({"MethodOverridesStaticMethodOfSuperclass", "UnusedDeclaration"})
+ public static ComponentUI createUI(JComponent c) {
+ return new DarculaComboBoxUI(((JComboBox)c));
+ }
+
+ @Override
+ protected LayoutManager createLayoutManager() {
+ return new DarculaComboBoxLayoutManager();
+ }
+
+ @Override
+ public void paintCurrentValueBackground(Graphics g, Rectangle bounds, boolean hasFocus) {
+ super.paintCurrentValueBackground(g, bounds, false);
+ }
+
+ @Override
+ public void paint(Graphics g, JComponent c) {
+ super.paint(g, c);
+ }
+
+ @Override
+ protected JButton createArrowButton() {
+ return new DarculaComboBoxButton(myComboBox);
+ }
+
+ class DarculaComboBoxLayoutManager extends BasicComboBoxUI.ComboBoxLayoutManager {
+ public void layoutContainer(final Container parent) {
+ if (arrowButton != null && !comboBox.isEditable()) {
+ final Insets insets = comboBox.getInsets();
+ final int width = comboBox.getWidth();
+ final int height = comboBox.getHeight();
+ arrowButton.setBounds(insets.left, insets.top, width - (insets.left + insets.right), height - (insets.top + insets.bottom));
+ return;
+ }
+
+ final JComboBox cb = (JComboBox)parent;
+ final int width = cb.getWidth();
+ final int height = cb.getHeight();
+
+ final Insets insets = getInsets();
+ final int buttonHeight = height - (insets.top + insets.bottom);
+ final int buttonWidth = 20;
+
+ if (arrowButton != null) {
+ arrowButton.setBounds(width - (insets.right + buttonWidth), insets.top, buttonWidth, buttonHeight);
+ }
+
+ if (editor != null) {
+ final Rectangle editorRect = rectangleForCurrentValue();
+ editorRect.width += 4;
+ editor.setBounds(editorRect);
+ }
+ }
+ }
+}
diff --git a/platform/platform-impl/src/com/intellij/ide/ui/laf/darcula/ui/DarculaScrollBarUI.java b/platform/platform-impl/src/com/intellij/ide/ui/laf/darcula/ui/DarculaScrollBarUI.java
new file mode 100644
index 000000000000..39704f20de1d
--- /dev/null
+++ b/platform/platform-impl/src/com/intellij/ide/ui/laf/darcula/ui/DarculaScrollBarUI.java
@@ -0,0 +1,32 @@
+/*
+ * Copyright 2000-2012 JetBrains s.r.o.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.intellij.ide.ui.laf.darcula.ui;
+
+import com.intellij.util.ui.ButtonlessScrollBarUI;
+
+import javax.swing.*;
+import javax.swing.plaf.ComponentUI;
+
+/**
+ * @author Konstantin Bulenkov
+ */
+public class DarculaScrollBarUI extends ButtonlessScrollBarUI {
+
+ @SuppressWarnings({"MethodOverridesStaticMethodOfSuperclass", "UnusedDeclaration"})
+ public static ComponentUI createUI(JComponent c) {
+ return new DarculaScrollBarUI();
+ }
+}
diff --git a/platform/platform-impl/src/com/intellij/ide/ui/laf/darcula/ui/DarculaTest.form b/platform/platform-impl/src/com/intellij/ide/ui/laf/darcula/ui/DarculaTest.form
new file mode 100644
index 000000000000..f79276e2ca53
--- /dev/null
+++ b/platform/platform-impl/src/com/intellij/ide/ui/laf/darcula/ui/DarculaTest.form
@@ -0,0 +1,417 @@
+
+
diff --git a/platform/platform-impl/src/com/intellij/ide/ui/laf/darcula/ui/DarculaTest.java b/platform/platform-impl/src/com/intellij/ide/ui/laf/darcula/ui/DarculaTest.java
new file mode 100644
index 000000000000..75fb440d792a
--- /dev/null
+++ b/platform/platform-impl/src/com/intellij/ide/ui/laf/darcula/ui/DarculaTest.java
@@ -0,0 +1,58 @@
+/*
+ * Copyright 2000-2012 JetBrains s.r.o.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.intellij.ide.ui.laf.darcula.ui;
+
+import com.intellij.ide.ui.laf.darcula.DarculaLaf;
+import com.intellij.ui.components.JBCheckBox;
+
+import javax.swing.*;
+
+/**
+ * @author Konstantin Bulenkov
+ */
+public class DarculaTest {
+ private JBCheckBox myJBCheckBox1;
+ private JBCheckBox myJBCheckBox2;
+ private JBCheckBox myJBCheckBox3;
+ private JBCheckBox myJBCheckBox4;
+ private JBCheckBox myJBCheckBox5;
+ private JComboBox myComboBox1;
+ private JComboBox myComboBox2;
+ private JComboBox myComboBox3;
+ private JComboBox myComboBox4;
+ private JComboBox myComboBox5;
+ private JTextField myTextField1;
+ private JTextField myThisTextIsDisabledTextField;
+ private JPasswordField myPasswordField1;
+ private JPanel myRoot;
+
+ public static void main(String[] args) {
+ try {
+ UIManager.setLookAndFeel(new DarculaLaf());
+ }
+ catch (UnsupportedLookAndFeelException ignored) {}
+ final JFrame frame = new JFrame("Darcula Demo");
+ frame.setSize(600, 500);
+ frame.setContentPane(new DarculaTest().myRoot);
+ frame.setDefaultCloseOperation(WindowConstants.EXIT_ON_CLOSE);
+ SwingUtilities.invokeLater(new Runnable() {
+ @Override
+ public void run() {
+ frame.setVisible(true);
+ }
+ });
+ }
+}
diff --git a/platform/platform-impl/src/com/intellij/ide/ui/laf/darcula/ui/DarculaTextBorder.java b/platform/platform-impl/src/com/intellij/ide/ui/laf/darcula/ui/DarculaTextBorder.java
new file mode 100644
index 000000000000..65f1993bcc8c
--- /dev/null
+++ b/platform/platform-impl/src/com/intellij/ide/ui/laf/darcula/ui/DarculaTextBorder.java
@@ -0,0 +1,82 @@
+/*
+ * Copyright 2000-2012 JetBrains s.r.o.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.intellij.ide.ui.laf.darcula.ui;
+
+import com.intellij.ide.ui.laf.darcula.DarculaUIUtil;
+import com.intellij.openapi.ui.GraphicsConfig;
+import com.intellij.openapi.util.SystemInfo;
+import com.intellij.ui.ColorUtil;
+import com.intellij.util.ui.JBInsets;
+
+import javax.swing.border.Border;
+import javax.swing.plaf.UIResource;
+import java.awt.*;
+
+/**
+ * @author Konstantin Bulenkov
+ */
+public class DarculaTextBorder implements Border, UIResource {
+ private JBInsets myInsets = new JBInsets(4, 7, 4, 7);
+
+ @Override
+ public JBInsets getBorderInsets(Component c) {
+ return myInsets;
+ }
+
+ @Override
+ public boolean isBorderOpaque() {
+ return false;
+ }
+
+ @Override
+ public void paintBorder(Component c, Graphics g2, int x, int y, int width, int height) {
+ Graphics2D g = ((Graphics2D)g2);
+ g.setColor(ColorUtil.fromHex("737373"));
+ int cX = myInsets.right;
+ int cY = myInsets.top;
+ int cW = width - myInsets.width();
+ int cH = height - myInsets.height();
+ final GraphicsConfig config = new GraphicsConfig(g);
+ g.translate(x, y);
+
+ if (c.hasFocus()) {
+ int sysOffX = SystemInfo.isMac ? 0 : 1;
+ int sysOffY = SystemInfo.isMac ? 0 : -1;
+ DarculaUIUtil.paintFocusRing(g, 2, 2, width-4, height-4);
+
+ //g.setColor(DarculaUIUtil.GLOW_COLOR.darker().darker());
+ //g.drawRect(1, 1, width - 2, height - 2);
+ //g.drawRect(2, 2, width-4, height-4);
+ //g.setColor(ColorUtil.toAlpha(DarculaUIUtil.GLOW_COLOR, 70));
+ //g.drawRoundRect(0, 0, width, height, 5, 5);
+ //g.setColor(ColorUtil.toAlpha(DarculaUIUtil.GLOW_COLOR, 80));
+ //g.drawRoundRect(1, 1, width - 2, height-2, 5, 5);
+ //g.setColor(ColorUtil.toAlpha(DarculaUIUtil.GLOW_COLOR, 120));
+ //g.drawRoundRect(2, 2, width - 4, height - 4, 5, 5);
+ //g.setColor(ColorUtil.toAlpha(DarculaUIUtil.GLOW_COLOR, 140));
+ //g.drawRoundRect(3, 2, width - 6, height - 4, 5, 5);
+ } else {
+ //g.fillRect(2, 1, cX-2, height - 2); //left
+ //g.fillRect(cX + cW , 1, width-cW - cX, height - 2); //right
+ //g.fillRect(1, 1, width - 2, cY); //top
+ //g.fillRect(1, cY + cH, width - 2, height - 2); //bottom
+ g.setColor(ColorUtil.fromHex("939393"));
+ g.drawRect(1, 1, width - 2, height - 2);
+ }
+ g.translate(-x, -y);
+ config.restore();
+ }
+}
diff --git a/platform/platform-impl/src/com/intellij/ide/ui/laf/darcula/ui/DarculaTextFieldUI.java b/platform/platform-impl/src/com/intellij/ide/ui/laf/darcula/ui/DarculaTextFieldUI.java
index 6ce1da2d01d3..04cbd44f9107 100644
--- a/platform/platform-impl/src/com/intellij/ide/ui/laf/darcula/ui/DarculaTextFieldUI.java
+++ b/platform/platform-impl/src/com/intellij/ide/ui/laf/darcula/ui/DarculaTextFieldUI.java
@@ -15,9 +15,17 @@
*/
package com.intellij.ide.ui.laf.darcula.ui;
+import com.intellij.openapi.ui.GraphicsConfig;
+import com.intellij.util.ui.JBInsets;
+
import javax.swing.*;
+import javax.swing.border.Border;
import javax.swing.plaf.ComponentUI;
import javax.swing.plaf.basic.BasicTextFieldUI;
+import javax.swing.text.JTextComponent;
+import java.awt.*;
+import java.awt.event.FocusAdapter;
+import java.awt.event.FocusEvent;
/**
* @author Konstantin Bulenkov
@@ -25,7 +33,57 @@ import javax.swing.plaf.basic.BasicTextFieldUI;
public class DarculaTextFieldUI extends BasicTextFieldUI {
@SuppressWarnings("MethodOverridesStaticMethodOfSuperclass")
- public static ComponentUI createUI(JComponent c) {
+ public static ComponentUI createUI(final JComponent c) {
+ c.addFocusListener(new FocusAdapter() {
+ @Override
+ public void focusGained(FocusEvent e) {
+ c.repaint();
+ }
+
+ @Override
+ public void focusLost(FocusEvent e) {
+ c.repaint();
+ }
+ });
return new DarculaTextFieldUI();
}
+
+ @Override
+ protected void installDefaults() {
+ super.installDefaults();
+ }
+
+ @Override
+ protected void paintSafely(Graphics g) {
+ super.paintSafely(g);
+ }
+
+ @Override
+ protected void paintBackground(Graphics g) {
+ final JTextComponent c = getComponent();
+ final Container parent = c.getParent();
+ if (parent != null) {
+ g.setColor(parent.getBackground());
+ g.fillRect(0,0,c.getWidth(), c.getHeight());
+ }
+ final Border border = c.getBorder();
+ if (border instanceof DarculaTextBorder) {
+ g.setColor(c.getBackground());
+ final int width = c.getWidth();
+ final int height = c.getHeight();
+ final JBInsets insets = ((DarculaTextBorder)border).getBorderInsets(c);
+ if (c.hasFocus()) {
+ final GraphicsConfig config = new GraphicsConfig(g);
+ ((Graphics2D)g).setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON);
+ ((Graphics2D)g).setRenderingHint(RenderingHints.KEY_STROKE_CONTROL, RenderingHints.VALUE_STROKE_NORMALIZE);
+
+ g.fillRoundRect(insets.left-5, insets.top-2, width - insets.width() + 10, height - insets.height() + 6, 5, 5);
+ config.restore();
+ } else {
+ g.fillRect(insets.left-5, insets.top-2, width - insets.width() + 12, height - insets.height() + 6);
+ }
+ } else {
+ super.paintBackground(g);
+ }
+ }
}
diff --git a/platform/platform-impl/src/com/intellij/internal/anomalies/TopAnomaliesAction.java b/platform/platform-impl/src/com/intellij/internal/anomalies/TopAnomaliesAction.java
new file mode 100644
index 000000000000..e6e892dad43f
--- /dev/null
+++ b/platform/platform-impl/src/com/intellij/internal/anomalies/TopAnomaliesAction.java
@@ -0,0 +1,273 @@
+/*
+ * Copyright 2000-2012 JetBrains s.r.o.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.intellij.internal.anomalies;
+
+import com.intellij.openapi.Disposable;
+import com.intellij.openapi.actionSystem.ActionGroup;
+import com.intellij.openapi.actionSystem.AnAction;
+import com.intellij.openapi.actionSystem.AnActionEvent;
+import com.intellij.openapi.util.Disposer;
+import com.intellij.openapi.util.Pair;
+import com.intellij.openapi.util.objectTree.ObjectNode;
+import com.intellij.openapi.util.objectTree.ObjectTree;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+import javax.swing.*;
+import java.awt.*;
+import java.lang.reflect.Field;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+import java.util.*;
+
+/**
+ * User: Vassiliy.Kudryashov
+ */
+public class TopAnomaliesAction extends ActionGroup {
+ private static final Comparator> COMPARATOR = new Comparator>() {
+ @Override
+ public int compare(Pair o1, Pair o2) {
+ int i = o2.getSecond() - o1.getSecond();
+ if (i != 0) {
+ return i;
+ }
+ int h1 = o1.hashCode();
+ int h2 = o2.hashCode();
+ if (h1 > h2) {
+ return 1;
+ }
+ if (h1 < h2) {
+ return -1;
+ }
+ return 0;
+ }
+ };
+ private static final int LIMIT = 10;
+
+ private static final ResettableAction TOP_PARENTS = new ResettableAction("Parents") {
+ TreeSet> top = new TreeSet>(COMPARATOR);
+ TreeSet> old = new TreeSet>(COMPARATOR);
+
+ @Override
+ public void update(AnActionEvent e) {
+ e.getPresentation().setText("Top " + LIMIT + " component parents");
+ }
+
+ @Override
+ void reset() {
+ top.clear();
+ old.clear();
+ }
+
+ @Override
+ public void actionPerformed(AnActionEvent e) {
+ old = new TreeSet>(top);
+ top.clear();
+ Window[] windows = Window.getWindows();
+ for (Window window : windows) {
+ if (window.isVisible() && (window instanceof JFrame)) {
+ JFrame f = (JFrame)window;
+ checkParents((JComponent)f.getContentPane(), top, LIMIT);
+ }
+ }
+
+ System.out.println("Top " + LIMIT + " component parents");
+ for (Pair pair : top) {
+ System.out.println(
+ pair.first.getClass().getName() + " (" + pair.second + " children)" + getChange(old, pair.first, pair.second));
+ }
+ }
+
+ private void checkParents(JComponent component, Set> top, int limit) {
+ top.add(Pair.create(component, component.getComponentCount()));
+
+ trimToLimit(top, limit);
+
+ for (int i = 0; i < component.getComponentCount(); i++) {
+ Component child = component.getComponent(i);
+ if (child instanceof JComponent) {
+ checkParents((JComponent)child, top, limit);
+ }
+ }
+ }
+ };
+
+ private static final ResettableAction TOP_UI_PROPERTIES = new ResettableAction("ClientProperties") {
+ TreeSet> top = new TreeSet>(COMPARATOR);
+ TreeSet> old = new TreeSet>(COMPARATOR);
+
+ @Override
+ public void update(AnActionEvent e) {
+ e.getPresentation().setText("Top " + LIMIT + " ClientProperties");
+ }
+
+ @Override
+ void reset() {
+ top.clear();
+ old.clear();
+ }
+
+ @Override
+ public void actionPerformed(AnActionEvent e) {
+ old = new TreeSet>(top);
+ top.clear();
+ Window[] windows = Window.getWindows();
+ for (Window window : windows) {
+ if (window.isVisible() && (window instanceof JFrame)) {
+ JFrame f = (JFrame)window;
+ checkClientProperties((JComponent)f.getContentPane(), top, LIMIT);
+ }
+ }
+ System.out.println("Top " + LIMIT + " ClientProperties");
+ for (Pair pair : top) {
+ System.out.println(pair.first.getClass().getName() + " (" + pair.second + " properties)" + getChange(old, pair.first, pair.second));
+ }
+ }
+
+ private void checkClientProperties(JComponent component, Set> top, int limit) {
+ try {
+ Field clientProperties = JComponent.class.getDeclaredField("clientProperties");
+ clientProperties.setAccessible(true);
+ Object o = clientProperties.get(component);
+ if (o != null) {
+ Method size = o.getClass().getMethod("size");
+ size.setAccessible(true);
+ Object sizeResult = size.invoke(o);
+ if (sizeResult instanceof Integer) {
+ top.add(Pair.create(component, (Integer)sizeResult));
+ trimToLimit(top, limit);
+ }
+ }
+ }
+ catch (NoSuchMethodException e) {
+ }
+ catch (InvocationTargetException e) {
+ }
+ catch (IllegalAccessException e) {
+ }
+ catch (NoSuchFieldException e) {
+ }
+ for (int i = 0; i < component.getComponentCount(); i++) {
+ Component child = component.getComponent(i);
+ if (child instanceof JComponent) {
+ checkClientProperties((JComponent)child, top, limit);
+ }
+ }
+ }
+ };
+
+ private static final ResettableAction TOP_DISPOSABLE = new ResettableAction("Disposable") {
+ TreeSet> top = new TreeSet>(COMPARATOR);
+ TreeSet> old = new TreeSet>(COMPARATOR);
+
+ @Override
+ public void update(AnActionEvent e) {
+ e.getPresentation().setText("Top " + LIMIT + " disposables");
+ }
+
+ @Override
+ void reset() {
+ top.clear();
+ old.clear();
+ }
+
+ @Override
+ public void actionPerformed(AnActionEvent e) {
+ old = new TreeSet>(top);
+ top.clear();
+ ObjectTree tree = Disposer.getTree();
+ Set roots = tree.getRootObjects();
+ for (Disposable root : roots) {
+ checkDisposables(tree, root, top, LIMIT);
+ }
+ System.out.println("Top " + LIMIT + " disposables");
+ for (Pair pair : top) {
+ System.out.println(pair.first.getClass().getName() + " (" + pair.second + " related)" + getChange(old, pair.first, pair.second));
+ }
+ }
+
+ private void checkDisposables(ObjectTree tree, Object key, Set> top, int limit) {
+ ObjectNode node = tree.getNode(key);
+ if (node == null) {
+ return;
+ }
+ Collection children = node.getChildren();
+ top.add(Pair.create(key, children.size()));
+ trimToLimit(top, limit);
+ for (Object child : children) {
+ checkDisposables(tree, child, top, limit);
+ }
+ }
+ };
+
+ private static final ResettableAction RESET_THEM_ALL = new ResettableAction("Reset statistics") {
+ @Override
+ void reset() {
+ }
+
+ @Override
+ public void actionPerformed(AnActionEvent e) {
+ for (ResettableAction action : CHILDREN) {
+ action.reset();
+ }
+ }
+ };
+
+ private static ResettableAction[] CHILDREN = {TOP_PARENTS, TOP_UI_PROPERTIES, TOP_DISPOSABLE, RESET_THEM_ALL};
+
+ @Override
+ public void update(AnActionEvent e) {
+ e.getPresentation().setText("Top " + LIMIT);
+ }
+
+ @NotNull
+ @Override
+ public AnAction[] getChildren(@Nullable AnActionEvent e) {
+ return CHILDREN;
+ }
+
+ private static void trimToLimit(Set> top, int limit) {
+ int k = 0;
+ for (Iterator> iterator = top.iterator(); iterator.hasNext(); ) {
+ k++;
+ iterator.next();
+ if (k >= limit) {
+ iterator.remove();
+ }
+ }
+ }
+
+ private static String getChange(Set> old, K key, int newResult) {
+ for (Pair