MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

correct selectIn

Browse Source
This commit is contained in:
Anna Kozlova
2005-03-01 16:24:19 +03:00
parent 51ca062ce5
commit 16ce7ae70a
4 changed files with 39 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/com/intellij/ide/favoritesTreeView/AddToFavoritesAction.java
+18 -18
View File
@@ -110,6 +110,24 @@ public class AddToFavoritesAction extends AnAction {
return result.isEmpty() ? null : result.toArray(new AbstractTreeNode[result.size()]);
}
//on module groups
ModuleGroup[] moduleGroups = (ModuleGroup[])dataContext.getData(DataConstantsEx.MODULE_GROUP_ARRAY);
if (moduleGroups != null) {
boolean isPackageView = false;
if (currentViewId.equals(PackageViewPane.ID)) {
isPackageView = true;
}
for (int i = 0; i < moduleGroups.length; i++) {
ModuleGroup moduleGroup = moduleGroups[i];
if (isPackageView){
result.add(new PackageViewModuleGroupNode(project, moduleGroup, favoritesConfig));
} else {
result.add(new ProjectViewModuleGroupNode(project, moduleGroup, favoritesConfig));
}
}
return result.isEmpty() ? null : result.toArray(new AbstractTreeNode[result.size()]);
}
//on module node
Module module = (Module)dataContext.getData(DataConstants.MODULE);
if (module != null) {
@@ -136,24 +154,6 @@ public class AddToFavoritesAction extends AnAction {
return result.isEmpty() ? null : result.toArray(new AbstractTreeNode[result.size()]);
}
//on module groups
ModuleGroup[] moduleGroups = (ModuleGroup[])dataContext.getData(DataConstantsEx.MODULE_GROUP_ARRAY);
if (moduleGroups != null) {
boolean isPackageView = false;
if (currentViewId.equals(PackageViewPane.ID)) {
isPackageView = true;
}
for (int i = 0; i < moduleGroups.length; i++) {
ModuleGroup moduleGroup = moduleGroups[i];
if (isPackageView){
result.add(new PackageViewModuleGroupNode(project, moduleGroup, favoritesConfig));
} else {
result.add(new ProjectViewModuleGroupNode(project, moduleGroup, favoritesConfig));
}
}
return result.isEmpty() ? null : result.toArray(new AbstractTreeNode[result.size()]);
}
//on form in editor
final VirtualFile vFile = (VirtualFile)dataContext.getData(DataConstants.VIRTUAL_FILE);
if (vFile != null) {
source/com/intellij/ide/favoritesTreeView/AddToNewFavoritesListAction.java
+1 -1
View File
@@ -9,7 +9,7 @@ import com.intellij.openapi.project.Project;
*/
class AddToNewFavoritesListAction extends AnAction {
public AddToNewFavoritesListAction() {
super("Add To New Favorites List");
super("Add to New Favorites List");
}
public void actionPerformed(AnActionEvent e) {
source/com/intellij/ide/favoritesTreeView/FavoritesTreeStructure.java
+19 -24
View File
@@ -16,7 +16,6 @@ import com.intellij.j2ee.module.view.web.ListenerUrl;
import com.intellij.j2ee.module.view.web.ServletUrl;
import com.intellij.j2ee.module.view.web.WebRootFileUrl;
import com.intellij.openapi.module.Module;
import com.intellij.openapi.module.impl.ModuleUtil;
import com.intellij.openapi.project.Project;
import com.intellij.openapi.roots.*;
import com.intellij.openapi.util.InvalidDataException;
@@ -150,44 +149,43 @@ public class FavoritesTreeStructure extends ProjectAbstractTreeStructureBase imp
public boolean contains(final VirtualFile vFile){
final ProjectFileIndex projectFileIndex = ProjectRootManager.getInstance(myProject).getFileIndex();
final Set<Boolean> find = new HashSet<Boolean>();
final ContentIterator contentIterator = new ContentIterator() {
public boolean processFile(VirtualFile fileOrDir) {
if (fileOrDir == null ? vFile == null : fileOrDir.equals(vFile)) {
return true;
if (fileOrDir == null ? vFile == null : fileOrDir.getPath().equals(vFile.getPath())) {
find.add(Boolean.TRUE);
}
return false;
return true;
}
};
for (Iterator<AbstractTreeNode> iterator = myRoot.getChildren().iterator(); iterator.hasNext();) {
AbstractTreeNode node = iterator.next();
boolean find = false;
if (node.getValue() instanceof PsiElement){
final VirtualFile virtualFile = BasePsiNode.getVirtualFile(((PsiElement)node.getValue()));
if (vFile == null ? virtualFile == null : vFile.equals(virtualFile)){
if (vFile == null ? virtualFile == null : vFile.getPath().equals(virtualFile.getPath())){
return true;
}
if (!virtualFile.isDirectory()){
continue;
}
final Module module = ModuleUtil.findModuleForPsiElement(((PsiElement)node.getValue()));
if (module != null){
find = ModuleRootManager.getInstance(module).getFileIndex().iterateContentUnderDirectory(virtualFile, contentIterator);
} else {
find = projectFileIndex.iterateContentUnderDirectory(virtualFile, contentIterator);
}
projectFileIndex.iterateContentUnderDirectory(virtualFile, contentIterator);
}
if (node.getValue() instanceof Module){
find = ModuleRootManager.getInstance(((Module)node.getValue())).getFileIndex().iterateContent(contentIterator);
ModuleRootManager.getInstance(((Module)node.getValue())).getFileIndex().iterateContent(contentIterator);
}
if (node.getValue() instanceof LibraryGroupElement){
find = ModuleRootManager.getInstance(((LibraryGroupElement)node.getValue()).getModule()).getFileIndex().isInContent(vFile) &&
projectFileIndex.isInLibraryClasses(vFile);
final boolean inLibrary =
ModuleRootManager.getInstance(((LibraryGroupElement)node.getValue()).getModule()).getFileIndex().isInContent(vFile) &&
projectFileIndex.isInLibraryClasses(vFile);
if (inLibrary){
return true;
}
}
if (node.getValue() instanceof NamedLibraryElement){
NamedLibraryElement namedLibraryElement = (NamedLibraryElement)node.getValue();
final VirtualFile[] files = namedLibraryElement.getOrderEntry().getFiles(OrderRootType.CLASSES);
if (files != null){
find = ArrayUtil.find(files, vFile) > -1;
if (files != null && ArrayUtil.find(files, vFile) > -1){
return true;
}
}
if (node.getValue() instanceof Form){
@@ -201,20 +199,17 @@ public class FavoritesTreeStructure extends ProjectAbstractTreeStructureBase imp
}
}
}
if (find){
return true;
}
if (node.getValue() instanceof ModuleGroup){
ModuleGroup group = (ModuleGroup) node.getValue();
final Module[] modules = group.modulesInGroup(myProject, true);
for (int i = 0; i < modules.length; i++) {
Module module = modules[i];
find = ModuleRootManager.getInstance(module).getFileIndex().iterateContent(contentIterator);
if (find){
return true;
}
ModuleRootManager.getInstance(module).getFileIndex().iterateContent(contentIterator);
}
}
if (!find.isEmpty()){
return true;
}
}
return false;
}
source/com/intellij/ide/favoritesTreeView/SendToFavoritesGroup.java
+1 -1
View File
@@ -18,7 +18,7 @@ public class SendToFavoritesGroup extends DefaultActionGroup{
selectedNodeDescriptors != null &&
allAddActionNamesButThis != null);
removeAll();
for (int i = 0; i < allAddActionNamesButThis.length; i++) {
for (int i = 0; allAddActionNamesButThis != null && i < allAddActionNamesButThis.length; i++) {
String addAction = allAddActionNamesButThis[i];
add(new SendToFavoritesAction(addAction));
}