From f4f185586c1931dbd49bbc23e5b55ac3fe2fe7d9 Mon Sep 17 00:00:00 2001 From: Oleg Shpynov Date: Mon, 1 Feb 2010 13:17:08 +0300 Subject: [PATCH] Fix compilation for case insensitive file systems --- .../AbstractExtractMethodDialog.java} | 34 +++++++++++----------- .../AbstractParameterTablePanel.java} | 18 ++++++------ .../AbstractVariableData.java} | 4 +-- .../ExtractMethodDecorator.java | 4 +-- .../ExtractMethodSettings.java | 4 +-- .../ExtractMethodValidator.java | 2 +- .../PyExtractMethodDialog.form | 4 +-- 7 files changed, 35 insertions(+), 35 deletions(-) rename platform/lang-impl/src/com/intellij/refactoring/{extractmethod/ExtractMethodDialog.java => extractMethod/AbstractExtractMethodDialog.java} (81%) rename platform/lang-impl/src/com/intellij/refactoring/{extractmethod/ParameterTablePanel.java => extractMethod/AbstractParameterTablePanel.java} (94%) rename platform/lang-impl/src/com/intellij/refactoring/{extractmethod/VariableData.java => extractMethod/AbstractVariableData.java} (91%) rename platform/lang-impl/src/com/intellij/refactoring/{extractmethod => extractMethod}/ExtractMethodDecorator.java (83%) rename platform/lang-impl/src/com/intellij/refactoring/{extractmethod => extractMethod}/ExtractMethodSettings.java (88%) rename platform/lang-impl/src/com/intellij/refactoring/{extractmethod => extractMethod}/ExtractMethodValidator.java (94%) rename platform/lang-impl/src/com/intellij/refactoring/{extractmethod => extractMethod}/PyExtractMethodDialog.form (96%) diff --git a/platform/lang-impl/src/com/intellij/refactoring/extractmethod/ExtractMethodDialog.java b/platform/lang-impl/src/com/intellij/refactoring/extractMethod/AbstractExtractMethodDialog.java similarity index 81% rename from platform/lang-impl/src/com/intellij/refactoring/extractmethod/ExtractMethodDialog.java rename to platform/lang-impl/src/com/intellij/refactoring/extractMethod/AbstractExtractMethodDialog.java index c0547b43ff..41fbf33750 100644 --- a/platform/lang-impl/src/com/intellij/refactoring/extractmethod/ExtractMethodDialog.java +++ b/platform/lang-impl/src/com/intellij/refactoring/extractMethod/AbstractExtractMethodDialog.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.intellij.refactoring.extractmethod; +package com.intellij.refactoring.extractMethod; import com.intellij.codeInsight.codeFragment.CodeFragment; import com.intellij.openapi.help.HelpManager; @@ -31,9 +31,9 @@ import java.util.Collections; import java.util.List; import java.util.Map; -public class ExtractMethodDialog extends DialogWrapper implements ExtractMethodSettings { +public class AbstractExtractMethodDialog extends DialogWrapper implements ExtractMethodSettings { private JPanel myContentPane; - private ParameterTablePanel myParametersPanel; + private AbstractParameterTablePanel myParametersPanel; private JTextField myMethodNameTextField; private JTextArea mySignaturePreviewTextArea; private JTextArea myOutputVariablesTextArea; @@ -41,13 +41,13 @@ public class ExtractMethodDialog extends DialogWrapper implements ExtractMethodS private final ExtractMethodValidator myValidator; private final ExtractMethodDecorator myDecorator; - private VariableData[] myVariableData; - private Map myVariablesMap; + private AbstractVariableData[] myVariableData; + private Map myVariablesMap; private final List myArguments; private final ArrayList myOutputVariables; - public ExtractMethodDialog(final Project project, + public AbstractExtractMethodDialog(final Project project, final String defaultName, final CodeFragment fragment, final ExtractMethodValidator validator, @@ -97,10 +97,10 @@ public class ExtractMethodDialog extends DialogWrapper implements ExtractMethodS return myMethodNameTextField; } - public static VariableData[] createVariableData(final List args) { - final VariableData[] datas = new VariableData[args.size()]; + public static AbstractVariableData[] createVariableData(final List args) { + final AbstractVariableData[] datas = new AbstractVariableData[args.size()]; for (int i = 0; i < args.size(); i++) { - final VariableData data = new VariableData(); + final AbstractVariableData data = new AbstractVariableData(); final String name = args.get(i); data.originalName = name; data.name = name; @@ -110,9 +110,9 @@ public class ExtractMethodDialog extends DialogWrapper implements ExtractMethodS return datas; } - public static Map createVariableMap(final VariableData[] data) { - final HashMap map = new HashMap(); - for (VariableData variableData : data) { + public static Map createVariableMap(final AbstractVariableData[] data) { + final HashMap map = new HashMap(); + for (AbstractVariableData variableData : data) { map.put(variableData.getOriginalName(), variableData); } return map; @@ -143,9 +143,9 @@ public class ExtractMethodDialog extends DialogWrapper implements ExtractMethodS } private void createUIComponents() { - myParametersPanel = new ParameterTablePanel(myValidator){ + myParametersPanel = new AbstractParameterTablePanel(myValidator){ protected void doCancelAction() { - ExtractMethodDialog.this.doCancelAction(); + AbstractExtractMethodDialog.this.doCancelAction(); } protected void doEnterAction() { @@ -154,7 +154,7 @@ public class ExtractMethodDialog extends DialogWrapper implements ExtractMethodS protected void updateSignature() { updateOutputVariables(); - ExtractMethodDialog.this.updateSignature(); + AbstractExtractMethodDialog.this.updateSignature(); } }; } @@ -164,7 +164,7 @@ public class ExtractMethodDialog extends DialogWrapper implements ExtractMethodS boolean first = true; for (String variable : myOutputVariables) { if (myVariablesMap!=null){ - final VariableData data = myVariablesMap.get(variable); + final AbstractVariableData data = myVariablesMap.get(variable); final String outputName = data != null ? data.getName() : variable; if (first){ first = false; @@ -189,7 +189,7 @@ public class ExtractMethodDialog extends DialogWrapper implements ExtractMethodS return myMethodNameTextField.getText().trim(); } - public VariableData[] getVariableData() { + public AbstractVariableData[] getVariableData() { return myVariableData; } diff --git a/platform/lang-impl/src/com/intellij/refactoring/extractmethod/ParameterTablePanel.java b/platform/lang-impl/src/com/intellij/refactoring/extractMethod/AbstractParameterTablePanel.java similarity index 94% rename from platform/lang-impl/src/com/intellij/refactoring/extractmethod/ParameterTablePanel.java rename to platform/lang-impl/src/com/intellij/refactoring/extractMethod/AbstractParameterTablePanel.java index 4a73ce9fad..8aebfc1031 100644 --- a/platform/lang-impl/src/com/intellij/refactoring/extractmethod/ParameterTablePanel.java +++ b/platform/lang-impl/src/com/intellij/refactoring/extractMethod/AbstractParameterTablePanel.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.intellij.refactoring.extractmethod; +package com.intellij.refactoring.extractMethod; import com.intellij.ui.ScrollPaneFactory; import com.intellij.ui.TableUtil; @@ -34,10 +34,10 @@ import java.awt.event.KeyEvent; /** * @author oleg - * It`s a modified copy of com.intellij.refactoring.util.ParameterTablePanel + * It`s a modified copy of com.intellij.refactoring.util.AbstractParameterTablePanel */ -public abstract class ParameterTablePanel extends JPanel { - private VariableData[] myVariableData; +public abstract class AbstractParameterTablePanel extends JPanel { + private AbstractVariableData[] myVariableData; private Table myTable; private MyTableModel myTableModel; @@ -51,11 +51,11 @@ public abstract class ParameterTablePanel extends JPanel { protected abstract void doCancelAction(); - public void setVariableData(VariableData[] variableData) { + public void setVariableData(AbstractVariableData[] variableData) { myVariableData = variableData; } - public ParameterTablePanel(final ExtractMethodValidator validator) { + public AbstractParameterTablePanel(final ExtractMethodValidator validator) { super(new BorderLayout()); myValidator = validator; } @@ -72,7 +72,7 @@ public abstract class ParameterTablePanel extends JPanel { myTable.getColumnModel().getColumn(MyTableModel.PARAMETER_NAME_COLUMN).setCellRenderer(new DefaultTableCellRenderer() { public Component getTableCellRendererComponent(JTable table, Object value, boolean isSelected, boolean hasFocus, int row, int column) { super.getTableCellRendererComponent(table, value, isSelected, hasFocus, row, column); - VariableData data = myVariableData[row]; + AbstractVariableData data = myVariableData[row]; setText(data.name); return this; } @@ -231,7 +231,7 @@ public abstract class ParameterTablePanel extends JPanel { int targetRow = row + moveIncrement; if (targetRow < 0 || targetRow >= myVariableData.length) return; - VariableData currentItem = myVariableData[row]; + AbstractVariableData currentItem = myVariableData[row]; myVariableData[row] = myVariableData[targetRow]; myVariableData[targetRow] = currentItem; @@ -286,7 +286,7 @@ public abstract class ParameterTablePanel extends JPanel { break; } case PARAMETER_NAME_COLUMN: { - VariableData data = myVariableData[rowIndex]; + AbstractVariableData data = myVariableData[rowIndex]; String name = (String)aValue; if (myValidator.isValidName(name)) { data.name = name; diff --git a/platform/lang-impl/src/com/intellij/refactoring/extractmethod/VariableData.java b/platform/lang-impl/src/com/intellij/refactoring/extractMethod/AbstractVariableData.java similarity index 91% rename from platform/lang-impl/src/com/intellij/refactoring/extractmethod/VariableData.java rename to platform/lang-impl/src/com/intellij/refactoring/extractMethod/AbstractVariableData.java index 00b9a43437..e6346120a4 100644 --- a/platform/lang-impl/src/com/intellij/refactoring/extractmethod/VariableData.java +++ b/platform/lang-impl/src/com/intellij/refactoring/extractMethod/AbstractVariableData.java @@ -13,12 +13,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.intellij.refactoring.extractmethod; +package com.intellij.refactoring.extractMethod; /** * @author oleg */ -public class VariableData { +public class AbstractVariableData { public String originalName; public String name; public boolean passAsParameter; diff --git a/platform/lang-impl/src/com/intellij/refactoring/extractmethod/ExtractMethodDecorator.java b/platform/lang-impl/src/com/intellij/refactoring/extractMethod/ExtractMethodDecorator.java similarity index 83% rename from platform/lang-impl/src/com/intellij/refactoring/extractmethod/ExtractMethodDecorator.java rename to platform/lang-impl/src/com/intellij/refactoring/extractMethod/ExtractMethodDecorator.java index 7c28399cf9..e4826ece5f 100644 --- a/platform/lang-impl/src/com/intellij/refactoring/extractmethod/ExtractMethodDecorator.java +++ b/platform/lang-impl/src/com/intellij/refactoring/extractMethod/ExtractMethodDecorator.java @@ -13,11 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.intellij.refactoring.extractmethod; +package com.intellij.refactoring.extractMethod; /** * @author oleg */ public interface ExtractMethodDecorator { - String createMethodPreview(String methodName, VariableData[] variableDatas); + String createMethodPreview(String methodName, AbstractVariableData[] variableDatas); } diff --git a/platform/lang-impl/src/com/intellij/refactoring/extractmethod/ExtractMethodSettings.java b/platform/lang-impl/src/com/intellij/refactoring/extractMethod/ExtractMethodSettings.java similarity index 88% rename from platform/lang-impl/src/com/intellij/refactoring/extractmethod/ExtractMethodSettings.java rename to platform/lang-impl/src/com/intellij/refactoring/extractMethod/ExtractMethodSettings.java index 5916d5af67..6a9dcc4d15 100644 --- a/platform/lang-impl/src/com/intellij/refactoring/extractmethod/ExtractMethodSettings.java +++ b/platform/lang-impl/src/com/intellij/refactoring/extractMethod/ExtractMethodSettings.java @@ -13,12 +13,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.intellij.refactoring.extractmethod; +package com.intellij.refactoring.extractMethod; /** * @author oleg */ public interface ExtractMethodSettings { String getMethodName(); - VariableData[] getVariableData(); + AbstractVariableData[] getVariableData(); } \ No newline at end of file diff --git a/platform/lang-impl/src/com/intellij/refactoring/extractmethod/ExtractMethodValidator.java b/platform/lang-impl/src/com/intellij/refactoring/extractMethod/ExtractMethodValidator.java similarity index 94% rename from platform/lang-impl/src/com/intellij/refactoring/extractmethod/ExtractMethodValidator.java rename to platform/lang-impl/src/com/intellij/refactoring/extractMethod/ExtractMethodValidator.java index dcc221b2ab..cb34efae68 100644 --- a/platform/lang-impl/src/com/intellij/refactoring/extractmethod/ExtractMethodValidator.java +++ b/platform/lang-impl/src/com/intellij/refactoring/extractMethod/ExtractMethodValidator.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.intellij.refactoring.extractmethod; +package com.intellij.refactoring.extractMethod; import org.jetbrains.annotations.Nullable; diff --git a/platform/lang-impl/src/com/intellij/refactoring/extractmethod/PyExtractMethodDialog.form b/platform/lang-impl/src/com/intellij/refactoring/extractMethod/PyExtractMethodDialog.form similarity index 96% rename from platform/lang-impl/src/com/intellij/refactoring/extractmethod/PyExtractMethodDialog.form rename to platform/lang-impl/src/com/intellij/refactoring/extractMethod/PyExtractMethodDialog.form index c27b421451..fed52f40df 100644 --- a/platform/lang-impl/src/com/intellij/refactoring/extractmethod/PyExtractMethodDialog.form +++ b/platform/lang-impl/src/com/intellij/refactoring/extractMethod/PyExtractMethodDialog.form @@ -1,5 +1,5 @@ -
+ @@ -45,7 +45,7 @@ - + -- 2.11.4.GIT