mirror of
https://gitflic.ru/project/openide/openide.git
synced 2026-09-27 10:03:11 +07:00
Raw Api Doc support for jQuery (some fixes and a unit test)
This commit is contained in:
@@ -44,10 +44,7 @@ import javax.swing.table.DefaultTableCellRenderer;
|
||||
import javax.swing.table.TableColumn;
|
||||
import java.awt.*;
|
||||
import java.awt.event.*;
|
||||
import java.util.ArrayList;
|
||||
import java.util.Arrays;
|
||||
import java.util.Comparator;
|
||||
import java.util.Set;
|
||||
import java.util.*;
|
||||
|
||||
public class EditLibraryDialog extends DialogWrapper {
|
||||
|
||||
@@ -166,9 +163,9 @@ public class EditLibraryDialog extends DialogWrapper {
|
||||
this(title, provider, project);
|
||||
myLibName.setText(lib.getName());
|
||||
myFileTableModel.setFiles(lib.getSourceFiles(), lib.getCompactFiles());
|
||||
String[] docUrls = lib.getDocUrls();
|
||||
Set<String> docUrls = lib.getDocUrls();
|
||||
myDocUrlListModel.setDocUrls(docUrls);
|
||||
if (docUrls.length > 0) {
|
||||
if (docUrls.size() > 0) {
|
||||
myRemoveDocUrlButton.setEnabled(true);
|
||||
}
|
||||
checkDownloadOfflineDocEnabled();
|
||||
@@ -469,9 +466,9 @@ public class EditLibraryDialog extends DialogWrapper {
|
||||
|
||||
private ArrayList<String> myDocUrls = new ArrayList<String>();
|
||||
|
||||
public void setDocUrls(String[] urls) {
|
||||
if (urls != null && urls.length > 0) {
|
||||
myDocUrls.addAll(Arrays.asList(urls));
|
||||
public void setDocUrls(Set<String> urls) {
|
||||
if (urls != null && urls.size() > 0) {
|
||||
myDocUrls.addAll(urls);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
+3
-1
@@ -29,6 +29,8 @@ import com.intellij.openapi.util.EmptyRunnable;
|
||||
import com.intellij.openapi.vfs.VirtualFile;
|
||||
import org.jetbrains.annotations.Nullable;
|
||||
|
||||
import java.util.Set;
|
||||
|
||||
/**
|
||||
* @author Rustam Vishnyakov
|
||||
*/
|
||||
@@ -259,7 +261,7 @@ public class ScriptingLibraryManager {
|
||||
return myLibTable.isLibraryFile(file);
|
||||
}
|
||||
|
||||
public String[] getDocUrlsFor(VirtualFile file) {
|
||||
public Set<String> getDocUrlsFor(VirtualFile file) {
|
||||
ensureModel();
|
||||
assert myLibTable != null;
|
||||
return myLibTable.getDocUrlsFor(file);
|
||||
|
||||
+7
-7
@@ -21,7 +21,6 @@ import com.intellij.openapi.roots.libraries.Library;
|
||||
import com.intellij.openapi.roots.libraries.LibraryTable;
|
||||
import com.intellij.openapi.roots.libraries.LibraryType;
|
||||
import com.intellij.openapi.vfs.VirtualFile;
|
||||
import com.intellij.util.ArrayUtil;
|
||||
import com.intellij.util.containers.HashSet;
|
||||
import com.intellij.util.containers.hash.HashMap;
|
||||
import org.jetbrains.annotations.NotNull;
|
||||
@@ -30,6 +29,7 @@ import org.jetbrains.annotations.Nullable;
|
||||
import java.util.ArrayList;
|
||||
import java.util.Arrays;
|
||||
import java.util.Set;
|
||||
import java.util.TreeSet;
|
||||
|
||||
/**
|
||||
* @author Rustam Vishnyakov
|
||||
@@ -65,14 +65,14 @@ public class ScriptingLibraryTable {
|
||||
return false;
|
||||
}
|
||||
|
||||
public String[] getDocUrlsFor(VirtualFile file) {
|
||||
public Set<String> getDocUrlsFor(VirtualFile file) {
|
||||
Set<String> urls = new HashSet<String>();
|
||||
for (LibraryModel libraryModel : myLibraryModels) {
|
||||
if (libraryModel.containsFile(file)) {
|
||||
urls.addAll(Arrays.asList(libraryModel.getDocUrls()));
|
||||
urls.addAll(libraryModel.getDocUrls());
|
||||
}
|
||||
}
|
||||
return ArrayUtil.toStringArray(urls);
|
||||
return urls;
|
||||
}
|
||||
|
||||
public boolean isCompactFile(VirtualFile file) {
|
||||
@@ -151,7 +151,7 @@ public class ScriptingLibraryTable {
|
||||
private String myName;
|
||||
private Set<VirtualFile> mySourceFiles = new HashSet<VirtualFile>();
|
||||
private Set<VirtualFile> myCompactFiles = new HashSet<VirtualFile>();
|
||||
private ArrayList<String> myDocUrls = new ArrayList<String>();
|
||||
private Set<String> myDocUrls = new TreeSet<String>();
|
||||
|
||||
public LibraryModel(String name, VirtualFile[] sourceFiles, VirtualFile[] compactFiles, String[] docUrls) {
|
||||
this(name);
|
||||
@@ -191,8 +191,8 @@ public class ScriptingLibraryTable {
|
||||
return myCompactFiles;
|
||||
}
|
||||
|
||||
public String[] getDocUrls() {
|
||||
return ArrayUtil.toStringArray(myDocUrls);
|
||||
public Set<String> getDocUrls() {
|
||||
return myDocUrls;
|
||||
}
|
||||
|
||||
@NotNull
|
||||
|
||||
Reference in New Issue
Block a user