Merge remote-tracking branch 'aosp/upstream-master' into merge

Conflicts:
	.idea/modules.xml

Change-Id: I5e3d04bc83cdc26b2b56fca66b44b1dd8941b143

1 files changed, 22 insertions, 0 deletions

diff --git a/platform/util/src/com/intellij/util/ui/UIUtil.java b/platform/util/src/com/intellij/util/ui/UIUtil.java
index cc6d5a305bf5..7ed8021bd94b 100644
--- a/platform/util/src/com/intellij/util/ui/UIUtil.java
+++ b/platform/util/src/com/intellij/util/ui/UIUtil.java
@@ -48,7 +48,9 @@ import javax.swing.plaf.basic.BasicComboBoxUI;
 import javax.swing.plaf.basic.BasicRadioButtonUI;
 import javax.swing.plaf.basic.ComboPopup;
 import javax.swing.text.DefaultEditorKit;
+import javax.swing.text.DefaultFormatterFactory;
 import javax.swing.text.JTextComponent;
+import javax.swing.text.NumberFormatter;
 import javax.swing.text.html.HTMLEditorKit;
 import javax.swing.text.html.StyleSheet;
 import javax.swing.undo.UndoManager;
@@ -70,6 +72,7 @@ import java.lang.reflect.Field;
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
 import java.net.URL;
+import java.text.NumberFormat;
 import java.util.*;
 import java.util.List;
 import java.util.concurrent.BlockingQueue;
@@ -2982,4 +2985,23 @@ public class UIUtil {
     }
     return new EmptyBorder(0, leftGap, 0, 0);
   }
+
+  public static Color getSidePanelColor() {
+    return new JBColor(new Color(0xD2D6DD), new Color(60, 68, 71));
+  }
+
+  /**
+   * It is your responsibility to set correct horizontal align (left in case of UI Designer)
+   */
+  public static void configureNumericFormattedTextField(@NotNull JFormattedTextField textField) {
+    NumberFormat format = NumberFormat.getIntegerInstance();
+    format.setParseIntegerOnly(true);
+    format.setGroupingUsed(false);
+    NumberFormatter numberFormatter = new NumberFormatter(format);
+    numberFormatter.setMinimum(0);
+    textField.setFormatterFactory(new DefaultFormatterFactory(numberFormatter));
+    textField.setHorizontalAlignment(SwingConstants.TRAILING);
+
+    textField.setColumns(4);
+  }
 }