Skip to content

Fixing compilation after platform update. Some refactoring #614

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. Some refactoring #614

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
249 changes: 123 additions & 126 deletions ...n/java/consulo/csharp/impl/ide/refactoring/changeSignature/CSharpParameterTableModel.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,9 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/

package consulo.csharp.impl.ide.refactoring.changeSignature;

import consulo.annotation.access.RequiredReadAction;
import consulo.csharp.lang.CSharpFileType;
import consulo.csharp.lang.impl.psi.fragment.CSharpFragmentFactory;
import consulo.csharp.lang.impl.psi.source.resolve.type.CSharpTypeRefByQName;
Expand All @@ -26,6 +26,7 @@
import consulo.language.editor.ui.awt.EditorTextField;
import consulo.language.psi.PsiCodeFragment;
import consulo.language.psi.PsiElement;
import consulo.localize.LocalizeValue;
import consulo.project.Project;
import consulo.ui.ex.SimpleTextAttributes;
import consulo.ui.ex.awt.ColoredTableCellRenderer;
Expand All @@ -39,23 +40,19 @@

/**
* @author VISTALL
* @since 20.05.14
* @since 2014-05-20
*/
public class CSharpParameterTableModel extends ParameterTableModelBase<CSharpParameterInfo, CSharpParameterTableModelItem>
{
private static class VariableCompletionTableCellEditor extends StringTableCellEditor
{
public VariableCompletionTableCellEditor(Project project)
{
super(project);
}

@Override
public Component getTableCellEditorComponent(final JTable table, Object value, boolean isSelected, final int row, int column)
{
final EditorTextField textField = (EditorTextField) super.getTableCellEditorComponent(table, value, isSelected, row, column);
/*textField.registerKeyboardAction(new ActionListener()
{
public class CSharpParameterTableModel extends ParameterTableModelBase<CSharpParameterInfo, CSharpParameterTableModelItem> {
private static class VariableCompletionTableCellEditor extends StringTableCellEditor {
public VariableCompletionTableCellEditor(Project project) {
super(project);
}

@Override
public Component getTableCellEditorComponent(JTable table, Object value, boolean isSelected, int row, int column) {
EditorTextField textField = (EditorTextField) super.getTableCellEditorComponent(table, value, isSelected, row, column);
/*textField.registerKeyboardAction(new ActionListener()
{
@Override
public void actionPerformed(ActionEvent e)
{
Expand All @@ -66,9 +63,9 @@ public void actionPerformed(ActionEvent e)
}
}
}, KeyStroke.getKeyStroke(KeyEvent.VK_SPACE, InputEvent.CTRL_MASK), JComponent.WHEN_IN_FOCUSED_WINDOW);*/
textField.setBorder(new LineBorder(table.getSelectionBackground()));
return textField;
}
textField.setBorder(new LineBorder(table.getSelectionBackground()));
return textField;
}

/*private static void completeVariable(EditorTextField editorTextField, PsiType type)
{
Expand All @@ -86,110 +83,110 @@ public void actionPerformed(ActionEvent e)
editor.getSelectionModel().removeSelection();
LookupManager.getInstance(editorTextField.getProject()).showLookup(editor, lookupItems, prefix);
} */
}

private static class MyNameColumn extends NameColumn<CSharpParameterInfo, CSharpParameterTableModelItem>
{
private Project myProject;

public MyNameColumn(Project project)
{
super(project);
myProject = project;
}

@Override
public TableCellEditor doCreateEditor(CSharpParameterTableModelItem o)
{
return new VariableCompletionTableCellEditor(myProject);
}

@Override
public TableCellRenderer doCreateRenderer(CSharpParameterTableModelItem cSharpParameterTableModelItem)
{
return new ColoredTableCellRenderer()
{
@Override
public void customizeCellRenderer(JTable table, Object value, boolean isSelected, boolean hasFocus, int row, int column)
{
if(value == null)
{
return;
}
if(isSelected || hasFocus)
{
acquireState(table, true, false, row, column);
getCellState().updateRenderer(this);
setPaintFocusBorder(false);
}
append((String) value, new SimpleTextAttributes(Font.PLAIN, null));
}
};
}
}

private static class ModifierColumn extends ColumnInfoBase<CSharpParameterInfo, CSharpParameterTableModelItem, CSharpModifier>
{
public ModifierColumn()
{
super("Modifier");
}

@Nullable
@Override
public CSharpModifier valueOf(CSharpParameterTableModelItem item)
{
return item.parameter.getModifier();
}

@Override
public void setValue(CSharpParameterTableModelItem tableModelItem, CSharpModifier value)
{
tableModelItem.parameter.setModifier(value);
}

@Override
protected TableCellRenderer doCreateRenderer(CSharpParameterTableModelItem tableModelItem)
{
return new ColoredTableCellRenderer()
{
@Override
protected void customizeCellRenderer(JTable table, Object value, boolean selected, boolean hasFocus, int row, int column)
{
append(value == null ? "" : value.toString());
}
};
}

@Override
protected TableCellEditor doCreateEditor(CSharpParameterTableModelItem item)
{
throw new UnsupportedOperationException();
}
}

private final CSharpMethodDescriptor myMethodDescriptor;

public CSharpParameterTableModel(CSharpMethodDescriptor methodDescriptor, PsiElement typeContext, PsiElement defaultValueContext)
{
super(typeContext, defaultValueContext, new TypeColumn<CSharpParameterInfo, CSharpParameterTableModelItem>(methodDescriptor.getMethod().getProject(), CSharpFileType.INSTANCE), new
MyNameColumn(methodDescriptor.getMethod().getProject()),
new DefaultValueColumn<CSharpParameterInfo, CSharpParameterTableModelItem>(methodDescriptor.getMethod().getProject(), CSharpFileType.INSTANCE, "Place value:"), new ModifierColumn());
myMethodDescriptor = methodDescriptor;
}

@Override
protected CSharpParameterTableModelItem createRowItem(@Nullable CSharpParameterInfo parameterInfo)
{
Project project = myMethodDescriptor.getMethod().getProject();

if(parameterInfo == null)
{
parameterInfo = new CSharpParameterInfo("", null, new CSharpTypeRefByQName(myDefaultValueContext, DotNetTypes.System.Object), getRowCount());
}
PsiCodeFragment fragment = CSharpFragmentFactory.createTypeFragment(project, parameterInfo.getTypeText(), myDefaultValueContext);

PsiCodeFragment defaultValue = CSharpFragmentFactory.createExpressionFragment(project, "", myDefaultValueContext);
return new CSharpParameterTableModelItem(parameterInfo, fragment, defaultValue);
}
}

private static class MyNameColumn extends NameColumn<CSharpParameterInfo, CSharpParameterTableModelItem> {
private Project myProject;

public MyNameColumn(Project project) {
super(project);
myProject = project;
}

@Override
public TableCellEditor doCreateEditor(CSharpParameterTableModelItem o) {
return new VariableCompletionTableCellEditor(myProject);
}

@Override
public TableCellRenderer doCreateRenderer(CSharpParameterTableModelItem cSharpParameterTableModelItem) {
return new ColoredTableCellRenderer() {
@Override
public void customizeCellRenderer(JTable table, Object value, boolean isSelected, boolean hasFocus, int row, int column) {
if (value == null) {
return;
}
if (isSelected || hasFocus) {
acquireState(table, true, false, row, column);
getCellState().updateRenderer(this);
setPaintFocusBorder(false);
}
append((String) value, new SimpleTextAttributes(Font.PLAIN, null));
}
};
}
}

private static class ModifierColumn extends ColumnInfoBase<CSharpParameterInfo, CSharpParameterTableModelItem, CSharpModifier> {
public ModifierColumn() {
super(LocalizeValue.localizeTODO("Modifier"));
}

@Nullable
@Override
public CSharpModifier valueOf(CSharpParameterTableModelItem item) {
return item.parameter.getModifier();
}

@Override
public void setValue(CSharpParameterTableModelItem tableModelItem, CSharpModifier value) {
tableModelItem.parameter.setModifier(value);
}

@Override
protected TableCellRenderer doCreateRenderer(CSharpParameterTableModelItem tableModelItem) {
return new ColoredTableCellRenderer() {
@Override
protected void customizeCellRenderer(JTable table, Object value, boolean selected, boolean hasFocus, int row, int column) {
append(value == null ? "" : value.toString());
}
};
}

@Override
protected TableCellEditor doCreateEditor(CSharpParameterTableModelItem item) {
throw new UnsupportedOperationException();
}
}

private final CSharpMethodDescriptor myMethodDescriptor;

public CSharpParameterTableModel(CSharpMethodDescriptor methodDescriptor, PsiElement typeContext, PsiElement defaultValueContext) {
super(
typeContext,
defaultValueContext,
new TypeColumn<CSharpParameterInfo, CSharpParameterTableModelItem>(
methodDescriptor.getMethod().getProject(),
CSharpFileType.INSTANCE
),
new
MyNameColumn(methodDescriptor.getMethod().getProject()),
new DefaultValueColumn<CSharpParameterInfo, CSharpParameterTableModelItem>(
methodDescriptor.getMethod().getProject(),
CSharpFileType.INSTANCE,
LocalizeValue.localizeTODO("Place value:")
),
new ModifierColumn()
);
myMethodDescriptor = methodDescriptor;
}

@Override
@RequiredReadAction
protected CSharpParameterTableModelItem createRowItem(@Nullable CSharpParameterInfo parameterInfo) {
Project project = myMethodDescriptor.getMethod().getProject();

if (parameterInfo == null) {
parameterInfo = new CSharpParameterInfo(
"",
null,
new CSharpTypeRefByQName(myDefaultValueContext, DotNetTypes.System.Object),
getRowCount()
);
}
PsiCodeFragment fragment = CSharpFragmentFactory.createTypeFragment(project, parameterInfo.getTypeText(), myDefaultValueContext);

PsiCodeFragment defaultValue = CSharpFragmentFactory.createExpressionFragment(project, "", myDefaultValueContext);
return new CSharpParameterTableModelItem(parameterInfo, fragment, defaultValue);
}
}
Loading