MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-01-06 03:21:12 +07:00
Code Issues Packages Projects Releases Wiki Activity

Refactor NullableNotNullManager: extract support of particular annotation packages to separate classes

Browse Source 
GitOrigin-RevId: 43ed85f1cca9b5feb55048272ac03b20d6a33874
This commit is contained in:
Tagir Valeev
2019-10-16 18:11:06 +07:00
committed by intellij-monorepo-bot
parent 97b2d5e43b
commit 00eb737bda
12 changed files with 354 additions and 140 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
java/openapi/src/com/intellij/codeInsight/AnnotationsPanel.java
View File

@@ -22,8 +22,10 @@ import javax.swing.table.DefaultTableModel;
import javax.swing.table.TableCellRenderer;
import javax.swing.table.TableColumn;
import java.awt.*;
import java.util.ArrayList;
import java.util.HashSet;
import java.util.List;
import java.util.*;
import java.util.Set;
public class AnnotationsPanel {
private final Project myProject;
@@ -37,13 +39,13 @@ public class AnnotationsPanel {
String name,
String defaultAnnotation,
List<String> annotations,
String[] defaultAnnotations,
List<String> defaultAnnotations,
Set<String> checkedAnnotations,
boolean showInstrumentationOptions,
boolean showDefaultActions) {
myProject = project;
myDefaultAnnotation = defaultAnnotation;
myDefaultAnnotations = new HashSet<>(Arrays.asList(defaultAnnotations));
myDefaultAnnotations = new HashSet<>(defaultAnnotations);
myTableModel = new DefaultTableModel() {
@Override
public boolean isCellEditable(int row, int column) {

4
java/openapi/src/com/intellij/codeInsight/NullableNotNullDialog.java
View File

@@ -37,12 +37,12 @@ public class NullableNotNullDialog extends DialogWrapper {
myNullablePanel = new AnnotationsPanel(project,
"Nullable",
manager.getDefaultNullable(),
manager.getNullables(), NullableNotNullManager.DEFAULT_NULLABLES,
manager.getNullables(), manager.getDefaultNullables(),
Collections.emptySet(), false, true);
myNotNullPanel = new AnnotationsPanel(project,
"NotNull",
manager.getDefaultNotNull(),
manager.getNotNulls(), NullableNotNullManager.DEFAULT_NOT_NULLS,
manager.getNotNulls(), manager.getDefaultNotNulls(),
new HashSet<>(manager.getInstrumentedNotNulls()), showInstrumentationOptions, true);
init();