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

IDEA-138039 Eclipse import: Unix file system: user library gets wrong paths

Browse Source
This commit is contained in:
Vladimir Krivosheev
2015-04-21 16:57:53 +02:00
parent 9b96cd4e8e
commit 689d2f5639
2 changed files with 38 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/eclipse/src/org/jetbrains/idea/eclipse/conversion/EclipseUserLibrariesHelper.java
+32 -18
View File
@@ -1,5 +1,5 @@
/*
* Copyright 2000-2009 JetBrains s.r.o.
* Copyright 2000-2015 JetBrains s.r.o.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -20,6 +20,8 @@
*/
package org.jetbrains.idea.eclipse.conversion;
import com.intellij.openapi.application.AccessToken;
import com.intellij.openapi.application.WriteAction;
import com.intellij.openapi.project.Project;
import com.intellij.openapi.roots.OrderRootType;
import com.intellij.openapi.roots.impl.libraries.ProjectLibraryTable;
@@ -28,13 +30,14 @@ import com.intellij.openapi.roots.libraries.LibraryTable;
import com.intellij.openapi.roots.libraries.LibraryTablesRegistrar;
import com.intellij.openapi.util.JDOMUtil;
import com.intellij.openapi.vfs.JarFileSystem;
import com.intellij.openapi.vfs.VfsUtil;
import com.intellij.openapi.vfs.LocalFileSystem;
import com.intellij.openapi.vfs.VfsUtilCore;
import com.intellij.openapi.vfs.VirtualFile;
import com.intellij.openapi.vfs.VirtualFileManager;
import com.intellij.util.containers.ContainerUtil;
import org.jdom.Document;
import org.jdom.Element;
import org.jdom.JDOMException;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import java.io.File;
@@ -87,31 +90,39 @@ public class EclipseUserLibrariesHelper {
}
public static void readProjectLibrariesContent(File exportedFile, Project project, Collection<String> unknownLibraries)
public static void readProjectLibrariesContent(@NotNull VirtualFile exportedFile, Project project, Collection<String> unknownLibraries)
throws IOException, JDOMException {
if (exportedFile.exists()) {
final LibraryTable libraryTable = ProjectLibraryTable.getInstance(project);
final Element rootElement = JDOMUtil.loadDocument(exportedFile).getRootElement();
for (Object o : rootElement.getChildren("library")) {
final Element libElement = (Element)o;
final String libName = libElement.getAttributeValue("name");
if (!exportedFile.isValid()) {
return;
}
LibraryTable libraryTable = ProjectLibraryTable.getInstance(project);
Element element = JDOMUtil.load(exportedFile.getInputStream());
AccessToken token = WriteAction.start();
try {
for (Element libElement : element.getChildren("library")) {
String libName = libElement.getAttributeValue("name");
Library libraryByName = libraryTable.getLibraryByName(libName);
if (libraryByName == null) {
final LibraryTable.ModifiableModel model = libraryTable.getModifiableModel();
LibraryTable.ModifiableModel model = libraryTable.getModifiableModel();
libraryByName = model.createLibrary(libName);
model.commit();
}
if (libraryByName != null) {
final Library.ModifiableModel model = libraryByName.getModifiableModel();
for (Object a : libElement.getChildren("archive")) {
String rootPath = ((Element)a).getAttributeValue("path");
if (rootPath.startsWith("/")) { //relative to workspace root
Library.ModifiableModel model = libraryByName.getModifiableModel();
for (Element a : libElement.getChildren("archive")) {
String rootPath = a.getAttributeValue("path");
// IDEA-138039 Eclipse import: Unix file system: user library gets wrong paths
LocalFileSystem fileSystem = LocalFileSystem.getInstance();
VirtualFile localFile = fileSystem.findFileByPath(rootPath);
if (rootPath.startsWith("/") && (localFile == null || !localFile.isValid())) {
// relative to workspace root
rootPath = project.getBaseDir().getPath() + rootPath;
localFile = fileSystem.findFileByPath(rootPath);
}
String url = VfsUtil.pathToUrl(rootPath);
final VirtualFile localFile = VirtualFileManager.getInstance().findFileByUrl(url);
String url = localFile == null ? VfsUtilCore.pathToUrl(rootPath) : localFile.getUrl();
if (localFile != null) {
final VirtualFile jarFile = JarFileSystem.getInstance().getJarRootForLocalFile(localFile);
VirtualFile jarFile = JarFileSystem.getInstance().getJarRootForLocalFile(localFile);
if (jarFile != null) {
url = jarFile.getUrl();
}
@@ -123,5 +134,8 @@ public class EclipseUserLibrariesHelper {
unknownLibraries.remove(libName); //ignore finally found libraries
}
}
finally {
token.finish();
}
}
}
plugins/eclipse/src/org/jetbrains/idea/eclipse/importWizard/EclipseImportBuilder.java
+6 -10
View File
@@ -396,16 +396,12 @@ public class EclipseImportBuilder extends ProjectImportBuilder<String> implement
descriptor.setTitle(getTitle());
final VirtualFile selectedFile = FileChooser.chooseFile(descriptor, project, project.getBaseDir());
if (selectedFile != null) {
ApplicationManager.getApplication().runWriteAction(new Runnable() {
public void run() {
try {
EclipseUserLibrariesHelper.readProjectLibrariesContent(new File(selectedFile.getPath()), project, unknownLibraries);
}
catch (Exception e) {
LOG.error(e);
}
}
});
try {
EclipseUserLibrariesHelper.readProjectLibrariesContent(selectedFile, project, unknownLibraries);
}
catch (Exception e) {
LOG.error(e);
}
}
}
}