Skip to content

Fixing compilation after platform update. Some refactoring #81

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 17, 2026
Merged

Fixing compilation after platform update. Some refactoring #81

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
118 changes: 59 additions & 59 deletions .../org/jetbrains/plugins/groovy/impl/refactoring/changeSignature/GrParameterTableModel.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,9 @@
import consulo.language.editor.refactoring.changeSignature.ParameterTableModelBase;
import consulo.language.psi.PsiCodeFragment;
import consulo.language.psi.PsiElement;
import consulo.localize.LocalizeValue;
import consulo.project.Project;
import consulo.ui.annotation.RequiredUIAccess;
import consulo.ui.ex.awt.ColumnInfo;
import jakarta.annotation.Nullable;
import org.jetbrains.plugins.groovy.GroovyFileType;
Expand All @@ -31,77 +33,75 @@
* @author Max Medvedev
*/
public class GrParameterTableModel extends ParameterTableModelBase<GrParameterInfo, GrParameterTableModelItem> {
public GrParameterTableModel(PsiElement typeContext, PsiElement defaultValueContext, final GrChangeSignatureDialog dialog) {
this(typeContext, defaultValueContext,
new GrTypeColumn(typeContext.getProject()),
new NameColumn<GrParameterInfo, GrParameterTableModelItem>(typeContext.getProject(), "Name"),
new GrInitializerColumn(typeContext.getProject()),
new GrDefaultValueColumn(typeContext.getProject()),
new AnyVarColumn<GrParameterInfo, GrParameterTableModelItem>() {
@Override
public boolean isCellEditable(GrParameterTableModelItem item) {
boolean isGenerateDelegate = dialog.isGenerateDelegate();
return !isGenerateDelegate && super.isCellEditable(item);
}
});
}

private GrParameterTableModel(PsiElement typeContext, PsiElement defaultValueContext, ColumnInfo... columnInfos) {
super(typeContext, defaultValueContext, columnInfos);
}


@Override
protected GrParameterTableModelItem createRowItem(@Nullable GrParameterInfo parameterInfo) {
return GrParameterTableModelItem.create(parameterInfo, myTypeContext.getProject(), myDefaultValueContext);
}

private static class GrTypeColumn extends TypeColumn<GrParameterInfo, GrParameterTableModelItem> {
public GrParameterTableModel(PsiElement typeContext, PsiElement defaultValueContext, final GrChangeSignatureDialog dialog) {
this(typeContext, defaultValueContext,
new GrTypeColumn(typeContext.getProject()),
new NameColumn<GrParameterInfo, GrParameterTableModelItem>(typeContext.getProject(), LocalizeValue.localizeTODO("Name")),
new GrInitializerColumn(typeContext.getProject()),
new GrDefaultValueColumn(typeContext.getProject()),
new AnyVarColumn<GrParameterInfo, GrParameterTableModelItem>() {
@Override
@RequiredUIAccess
public boolean isCellEditable(GrParameterTableModelItem item) {
boolean isGenerateDelegate = dialog.isGenerateDelegate();
return !isGenerateDelegate && super.isCellEditable(item);
}
}
);
}

public GrTypeColumn(Project project) {
super(project, GroovyFileType.GROOVY_FILE_TYPE, "Type");
private GrParameterTableModel(PsiElement typeContext, PsiElement defaultValueContext, ColumnInfo... columnInfos) {
super(typeContext, defaultValueContext, columnInfos);
}

@Override
public TableCellEditor doCreateEditor(GrParameterTableModelItem o) {
return new JavaCodeFragmentTableCellEditor(myProject);
protected GrParameterTableModelItem createRowItem(@Nullable GrParameterInfo parameterInfo) {
return GrParameterTableModelItem.create(parameterInfo, myTypeContext.getProject(), myDefaultValueContext);
}
}

private static class GrDefaultValueColumn extends DefaultValueColumn<GrParameterInfo, GrParameterTableModelItem> {
private final Project myProject;
private static class GrTypeColumn extends TypeColumn<GrParameterInfo, GrParameterTableModelItem> {
public GrTypeColumn(Project project) {
super(project, GroovyFileType.INSTANCE, LocalizeValue.localizeTODO("Type"));
}

public GrDefaultValueColumn(Project project) {
super(project, GroovyFileType.GROOVY_FILE_TYPE);
myProject = project;
@Override
public TableCellEditor doCreateEditor(GrParameterTableModelItem o) {
return new JavaCodeFragmentTableCellEditor(myProject);
}
}

@Override
public TableCellEditor doCreateEditor(GrParameterTableModelItem item) {
return new GrCodeFragmentTableCellEditor(myProject);
}
}
private static class GrDefaultValueColumn extends DefaultValueColumn<GrParameterInfo, GrParameterTableModelItem> {
private final Project myProject;

private static class GrInitializerColumn extends GrDefaultValueColumn {
public GrInitializerColumn(Project project) {
super(project);
}
public GrDefaultValueColumn(Project project) {
super(project, GroovyFileType.INSTANCE);
myProject = project;
}

@Override
public String getName() {
return "Default initializer";
@Override
public TableCellEditor doCreateEditor(GrParameterTableModelItem item) {
return new GrCodeFragmentTableCellEditor(myProject);
}
}

@Override
public boolean isCellEditable(GrParameterTableModelItem item) {
return true;
private static class GrInitializerColumn extends GrDefaultValueColumn {
public GrInitializerColumn(Project project) {
super(project);
}

@Override
public LocalizeValue getName() {
return LocalizeValue.localizeTODO("Default initializer");
}

@Override
public boolean isCellEditable(GrParameterTableModelItem item) {
return true;
}

@Override
public PsiCodeFragment valueOf(GrParameterTableModelItem item) {
return item.initializerCodeFragment;
}
}

@Override
public PsiCodeFragment valueOf(GrParameterTableModelItem item) {
return item.initializerCodeFragment;
}


}
}
Loading