Skip to content

Commit 0d62e99

Browse files
committed
non extendable api usages solved
1 parent de538fb commit 0d62e99

File tree

5 files changed

+25
-35
lines changed

5 files changed

+25
-35
lines changed

src/main/java/com/couchbase/intellij/tree/RelationshipSettingsManager.java

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -58,12 +58,8 @@ public static void showExportDialog(Project project) {
5858
}
5959

6060
public static void showImportDialog(Project project, Tree tree) {
61-
FileChooserDescriptor fcd = new FileChooserDescriptor(true, false, false, false, false, false) {
62-
@Override
63-
public boolean isFileSelectable(VirtualFile file) {
64-
return file != null && !file.isDirectory() && "properties".equals(file.getExtension());
65-
}
66-
};
61+
FileChooserDescriptor fcd = new FileChooserDescriptor(true, false, false, false, false, false)
62+
.withFileFilter(file -> file != null && !file.isDirectory() && "properties".equals(file.getExtension()));
6763
fcd.setTitle("Select Relationship File");
6864
fcd.setDescription("Choose a .properties file:");
6965

src/main/java/com/couchbase/intellij/tree/cblite/CBLCreateDatabaseDialog.java

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -103,16 +103,13 @@ protected JComponent createCenterPanel() {
103103
gbc.gridy = 2;
104104
gbc.weightx = 0.6;
105105
databasePathField = new TextFieldWithBrowseButton();
106+
FileChooserDescriptor descriptor = new FileChooserDescriptor(false, true, false, false, false, false)
107+
.withFileFilter(file -> true);
106108
databasePathField.addBrowseFolderListener(
107109
"Select the database location",
108110
"Choose a folder",
109111
project,
110-
new FileChooserDescriptor(false, true, false, false, false, false) {
111-
@Override
112-
public boolean isFileSelectable(VirtualFile file) {
113-
return true;
114-
}
115-
}
112+
descriptor
116113
);
117114

118115
panel.add(databasePathField, gbc);

src/main/java/com/couchbase/intellij/tree/cblite/ImportCBLDatabaseDialog.java

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -80,17 +80,16 @@ protected JComponent createCenterPanel() {
8080
gbc.gridy = 1;
8181
gbc.weightx = 0.6;
8282
databasePathField = new TextFieldWithBrowseButton();
83+
FileChooserDescriptor descriptor = new FileChooserDescriptor(false, true, false, false, false, false)
84+
.withFileFilter(file -> {
85+
String name = file.getName();
86+
return name.endsWith(".cblite2") || name.endsWith(".cblite3");
87+
});
8388
databasePathField.addBrowseFolderListener(
8489
"Select the database location",
8590
"Choose a .cblite2 or .cblite3 folder",
8691
project,
87-
new FileChooserDescriptor(false, true, false, false, false, false) {
88-
@Override
89-
public boolean isFileSelectable(VirtualFile file) {
90-
String name = file.getName();
91-
return name.endsWith(".cblite2") || name.endsWith(".cblite3");
92-
}
93-
}
92+
descriptor
9493
);
9594

9695
panel.add(databasePathField, gbc);

src/main/java/com/couchbase/intellij/tree/cblite/dialog/CBLAttachBlobDialog.java

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -126,18 +126,19 @@ protected JComponent createCenterPanel() {
126126
panel.add(errorLabel, constraints);
127127

128128

129-
fileField.addBrowseFolderListener("Select File", null, project,
130-
new FileChooserDescriptor(true, false, false, false, false, false) {
131-
@Override
132-
public boolean isFileSelectable(VirtualFile file) {
133-
if (file.isDirectory()) {
134-
return true;
135-
}
136-
FileType selectedFileType = (FileType) fileTypeComboBox.getSelectedItem();
137-
String[] extensions = Objects.requireNonNull(selectedFileType).getExtension().split("\\|");
138-
return Arrays.asList(extensions).contains(file.getExtension());
129+
FileChooserDescriptor descriptor = new FileChooserDescriptor(true, false, false, false, false, false)
130+
.withFileFilter(file -> {
131+
if (file.isDirectory()) {
132+
return true;
139133
}
134+
FileType selectedFileType = (FileType) fileTypeComboBox.getSelectedItem();
135+
if (selectedFileType == null) {
136+
return false;
137+
}
138+
String[] extensions = selectedFileType.getExtension().split("\\|");
139+
return Arrays.asList(extensions).contains(file.getExtension());
140140
});
141+
fileField.addBrowseFolderListener("Select File", null, project, descriptor);
141142

142143

143144
return panel;

src/main/java/com/couchbase/intellij/tree/cblite/dialog/CBLImportDialog.java

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -250,12 +250,9 @@ private void previousPage() {
250250

251251
private void addListeners() {
252252

253-
datasetField.addBrowseFolderListener("Select a File", "Please select a JSON file", null, new FileChooserDescriptor(true, false, false, false, false, false) {
254-
@Override
255-
public boolean isFileSelectable(VirtualFile file) {
256-
return "json".equalsIgnoreCase(file.getExtension());
257-
}
258-
});
253+
FileChooserDescriptor descriptor = new FileChooserDescriptor(true, false, false, false, false, false)
254+
.withFileFilter(file -> "json".equalsIgnoreCase(file.getExtension()));
255+
datasetField.addBrowseFolderListener("Select a File", "Please select a JSON file", null, descriptor);
259256

260257
datasetField.getTextField().getDocument().addDocumentListener(new DocumentAdapter() {
261258
@Override

0 commit comments

Comments
 (0)