Skip to content

Fixing compilation after platform update #52

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
VISTALL merged 1 commit into from
Sep 16, 2026
Merged

Fixing compilation after platform update #52

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
44 changes: 28 additions & 16 deletions ...ain/java/com/jetbrains/python/impl/refactoring/changeSignature/PyParameterTableModel.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,17 +13,16 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/

package com.jetbrains.python.impl.refactoring.changeSignature;

import com.jetbrains.python.PythonFileType;
import com.jetbrains.python.psi.PyParameterList;
import consulo.document.Document;
import consulo.document.event.DocumentListener;
import consulo.language.editor.refactoring.RefactoringBundle;
import consulo.language.editor.refactoring.changeSignature.ParameterInfo;
import consulo.language.editor.refactoring.changeSignature.ParameterTableModelBase;
import consulo.language.editor.refactoring.changeSignature.ParameterTableModelItemBase;
import consulo.language.editor.refactoring.localize.RefactoringLocalize;
import consulo.language.editor.refactoring.ui.CodeFragmentTableCellRenderer;
import consulo.language.editor.ui.awt.EditorTextField;
import consulo.language.psi.PsiCodeFragment;
Expand All @@ -49,22 +48,18 @@
import java.util.Set;

/**
* User : ktisha
* @author ktisha
*/

public class PyParameterTableModel extends ParameterTableModelBase<PyParameterInfo, PyParameterTableModelItem> {

private final Project myProject;

public PyParameterTableModel(PyParameterList typeContext,
PsiElement defaultValueContext,
Project project) {
public PyParameterTableModel(PyParameterList typeContext, PsiElement defaultValueContext, Project project) {
super(typeContext, defaultValueContext, getColumns(project));
myProject = project;
}

private static ColumnInfo[] getColumns(Project project) {
Collection<ColumnInfo> result = new ArrayList<ColumnInfo>();
Collection<ColumnInfo> result = new ArrayList<>();
result.add(new PyParameterColumn(project));
result.add(new PyDefaultValueColumn(project));
return result.toArray(new ColumnInfo[result.size()]);
Expand All @@ -77,7 +72,8 @@ protected PyParameterTableModelItem createRowItem(@Nullable PyParameterInfo para
}
String defaultValue = parameterInfo.getDefaultValue();
PsiCodeFragment defaultValueFragment = new PyExpressionCodeFragment(myProject, StringUtil.notNullize(defaultValue),
StringUtil.notNullize(defaultValue));
StringUtil.notNullize(defaultValue)
);
boolean defaultInSignature = parameterInfo.getDefaultInSignature();
return new PyParameterTableModelItem(parameterInfo, defaultValueFragment, defaultValueFragment, defaultInSignature);
}
Expand All @@ -93,7 +89,7 @@ protected static class PyDefaultValueColumn<P extends ParameterInfo, TableItem e
private final Project myProject;

public PyDefaultValueColumn(Project project) {
super(RefactoringBundle.message("column.name.default.value"));
super(RefactoringLocalize.columnNameDefaultValue());
myProject = project;
}

Expand All @@ -104,7 +100,10 @@ public boolean isCellEditable(TableItem item) {

@Override
public Pair<PsiCodeFragment, Boolean> valueOf(TableItem item) {
return new Pair<PsiCodeFragment, Boolean>(item.defaultValueCodeFragment, ((PyParameterTableModelItem) item).isDefaultInSignature());
return new Pair<>(
item.defaultValueCodeFragment,
((PyParameterTableModelItem) item).isDefaultInSignature()
);
}

@Override
Expand All @@ -126,19 +125,32 @@ public TableCellEditor doCreateEditor(TableItem item) {
}

private static class MyCodeFragmentTableCellRenderer extends CodeFragmentTableCellRenderer {

public MyCodeFragmentTableCellRenderer(Project project) {
super(project);
}

@Override
public Component getTableCellRendererComponent(JTable table, Object value, boolean isSelected, boolean hasFocus, int row, int column) {
public Component getTableCellRendererComponent(
JTable table,
Object value,
boolean isSelected,
boolean hasFocus,
int row,
int column
) {
JPanel panel = new JPanel();
Component component = super.getTableCellRendererComponent(table, ((Pair) value).getFirst(), isSelected, hasFocus, row, column);
panel.add(component);

Component component1 =
new BooleanTableCellRenderer().getTableCellRendererComponent(table, ((Pair) value).getSecond(), isSelected, hasFocus, row, column);
new BooleanTableCellRenderer().getTableCellRendererComponent(
table,
((Pair) value).getSecond(),
isSelected,
hasFocus,
row,
column
);
panel.add(component1);
return panel;
}
Expand All @@ -150,7 +162,7 @@ private static class MyCodeFragmentTableCellEditor extends AbstractCellEditor im
private final Project myProject;
private final FileType myFileType;
protected EditorTextField myEditorTextField;
private Set<DocumentListener> myListeners = new HashSet<DocumentListener>();
private Set<DocumentListener> myListeners = new HashSet<>();

public MyCodeFragmentTableCellEditor(Project project) {
myProject = project;
Expand Down
Loading