From 4800db9024c27080ddd06881d88fec0c085e9ed3 Mon Sep 17 00:00:00 2001 From: Evgeny Zakrevsky Date: Thu, 22 Sep 2011 21:18:46 +0400 Subject: [PATCH] removed unused code --- .../debugger/ui/DebuggerStatementEditor.java | 1 - .../extractMethod/ExtractMethodDialog.java | 4 +-- .../ParameterTableModelBase.java | 4 --- .../src/com/intellij/ui/EditorTextField.java | 31 +++---------------- .../plugins/xpathView/ui/MultilineEditor.java | 1 - 5 files changed, 7 insertions(+), 34 deletions(-) diff --git a/java/debugger/impl/src/com/intellij/debugger/ui/DebuggerStatementEditor.java b/java/debugger/impl/src/com/intellij/debugger/ui/DebuggerStatementEditor.java index 24f603b5096b..e13accdb05bb 100644 --- a/java/debugger/impl/src/com/intellij/debugger/ui/DebuggerStatementEditor.java +++ b/java/debugger/impl/src/com/intellij/debugger/ui/DebuggerStatementEditor.java @@ -61,7 +61,6 @@ public class DebuggerStatementEditor extends DebuggerEditorImpl { return false; } }; - myEditor.setCenterByHeight(false); setLayout(new BorderLayout()); add(addChooseFactoryLabel(myEditor, true)); diff --git a/java/java-impl/src/com/intellij/refactoring/extractMethod/ExtractMethodDialog.java b/java/java-impl/src/com/intellij/refactoring/extractMethod/ExtractMethodDialog.java index 239c30235315..0e19662e1dea 100644 --- a/java/java-impl/src/com/intellij/refactoring/extractMethod/ExtractMethodDialog.java +++ b/java/java-impl/src/com/intellij/refactoring/extractMethod/ExtractMethodDialog.java @@ -101,8 +101,8 @@ public class ExtractMethodDialog extends AbstractExtractDialog { myVariableData = inputVariables; myHelpId = helpId; mySignature = new MethodSignatureComponent("", project, JavaFileType.INSTANCE); - mySignature.setPreferredSize(new Dimension(450, 100)); - mySignature.setMinimumSize(new Dimension(450, 100)); + mySignature.setPreferredSize(new Dimension(-1, 100)); + mySignature.setMinimumSize(new Dimension(-1, 100)); setTitle(title); // Create UI components 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 10103c76e611..592fe93ef711 100644 --- a/platform/lang-impl/src/com/intellij/refactoring/changeSignature/ParameterTableModelBase.java +++ b/platform/lang-impl/src/com/intellij/refactoring/changeSignature/ParameterTableModelBase.java @@ -108,10 +108,6 @@ public abstract class ParameterTableModelBase

extends L component.setBackground(new Color(bg.getRed(), bg.getGreen(), bg.getBlue(), 230)); } - if (component instanceof EditorTextField) { - ((EditorTextField)component).setCenterByHeight(false); - } - if (component instanceof SimpleColoredComponent) { ((SimpleColoredComponent)component).setIpad(new Insets(0, 0, 0, 0)); } diff --git a/platform/platform-impl/src/com/intellij/ui/EditorTextField.java b/platform/platform-impl/src/com/intellij/ui/EditorTextField.java index b3227bd02208..b2c9c7f083bd 100644 --- a/platform/platform-impl/src/com/intellij/ui/EditorTextField.java +++ b/platform/platform-impl/src/com/intellij/ui/EditorTextField.java @@ -75,7 +75,6 @@ public class EditorTextField extends NonOpaquePanel implements DocumentListener, private boolean myInheritSwingFont = true; private Color myEnforcedBgColor = null; private boolean myOneLineMode; // use getter to access this field! It is allowed to override getter and change initial behaviour - private boolean myCenterByHeight = false; private boolean myEnsureWillComputePreferredSize; private Dimension myPassivePreferredSize; private CharSequence myHintText; @@ -111,7 +110,7 @@ public class EditorTextField extends NonOpaquePanel implements DocumentListener, setDocument(document); myProject = project; myFileType = fileType; - setLayout(null); + setLayout(new BorderLayout()); enableEvents(AWTEvent.KEY_EVENT_MASK); // todo[dsl,max] setFocusable(true); @@ -218,7 +217,7 @@ public class EditorTextField extends NonOpaquePanel implements DocumentListener, Editor editor = myEditor; myEditor = createEditor(); releaseEditor(editor); - add(myEditor.getComponent()); + add(myEditor.getComponent(), BorderLayout.CENTER); validate(); if (isFocused) { @@ -348,7 +347,7 @@ public class EditorTextField extends NonOpaquePanel implements DocumentListener, private void initEditor() { myEditor = createEditor(); final JComponent component = myEditor.getComponent(); - add(component); + add(component, BorderLayout.CENTER); } public void removeNotify() { @@ -571,10 +570,7 @@ public class EditorTextField extends NonOpaquePanel implements DocumentListener, Editor editor = myEditor; releaseEditor(editor); myEditor = createEditor(); - add(myEditor.getComponent() - - - ); + add(myEditor.getComponent(), BorderLayout.CENTER); revalidate(); } } @@ -595,19 +591,6 @@ public class EditorTextField extends NonOpaquePanel implements DocumentListener, super.addImpl(comp, constraints, index); } - @Override - public void doLayout() { - Component c = getComponent(0); - Insets insets = getInsets() != null ? getInsets() : new Insets(0, 0, 0, 0); - int prefHeight = c.getPreferredSize().height; - if (myOneLineMode && getSize().height > prefHeight && myCenterByHeight) { - int y = insets.top + getSize().height / 2 - prefHeight / 2; - c.setBounds(insets.left, y, getSize().width - insets.left - insets.right, prefHeight + 1); - } else { - c.setBounds(insets.left, insets.top, getSize().width - insets.left - insets.right, getSize().height - insets.top - insets.bottom); - } - } - public Dimension getPreferredSize() { if (super.isPreferredSizeSet()) { return super.getPreferredSize(); @@ -621,7 +604,7 @@ public class EditorTextField extends NonOpaquePanel implements DocumentListener, } - Dimension size = new Dimension(100, 20); + Dimension size = new Dimension(100, UIUtil.isUnderAquaLookAndFeel() ? 28 : 20); if (myEditor != null) { final Dimension preferredSize = new Dimension(myEditor.getComponent().getPreferredSize()); @@ -743,10 +726,6 @@ public class EditorTextField extends NonOpaquePanel implements DocumentListener, setDocument(document); } - public void setCenterByHeight(boolean centerByHeight) { - myCenterByHeight = centerByHeight; - } - public void ensureWillComputePreferredSize() { myEnsureWillComputePreferredSize = true; } diff --git a/plugins/xpath/xpath-view/src/org/intellij/plugins/xpathView/ui/MultilineEditor.java b/plugins/xpath/xpath-view/src/org/intellij/plugins/xpathView/ui/MultilineEditor.java index a183e8261d4e..f2674382f872 100644 --- a/plugins/xpath/xpath-view/src/org/intellij/plugins/xpathView/ui/MultilineEditor.java +++ b/plugins/xpath/xpath-view/src/org/intellij/plugins/xpathView/ui/MultilineEditor.java @@ -75,7 +75,6 @@ public class MultilineEditor extends JPanel { return false; } }; - myEditorTextField.setCenterByHeight(false); add(myEditorTextField, BorderLayout.CENTER); model.addListDataListener(new ListDataListener() { public void intervalAdded(ListDataEvent e) {