ynkmr/Sourcetrail
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

data: java fixes

Browse Source 
* fixed java indexer to continue working when a dependency path does not exist
* updated JavSymbolSolver with a lot of fixes for solving types that are defined inside jar files
This commit is contained in:
mlangkabel
2017-08-23 12:21:48 +02:00
parent 937ae0355b
commit 4037593a05
4 changed files with 23 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java_indexer/src/main/java/com/sourcetrail/JavaIndexer.java
+23 -16
View File
@@ -30,7 +30,7 @@ public class JavaIndexer
{
AstVisitorClient astVisitorClient = new JavaIndexerAstVisitorClient(address);
astVisitorClient.logInfo( "indexing source file: " + filePath);
astVisitorClient.logInfo("indexing source file: " + filePath);
try
{
@@ -48,28 +48,35 @@ public class JavaIndexer
}
else
{
TypeSolver typeSolver = null;
if (path.endsWith(".jar"))
try
{
try
TypeSolver typeSolver = null;
if (path.endsWith(".jar"))
{
typeSolver = new JarTypeSolver(path);
try
{
typeSolver = new JarTypeSolver(path);
}
catch (IOException e)
{
System.out.println("unable to add jar file: " + path);
}
}
catch (IOException e)
else if (!path.isEmpty())
{
System.out.println("unable to add jar file: " + path);
typeSolver = new SynchronizedJavaParserTypeSolver(new File(path));
}
if (typeSolver != null)
{
typeSolvers.put(path, typeSolver);
combinedTypeSolver.add(typeSolver);
}
}
else if (!path.isEmpty())
catch (Exception e)
{
typeSolver = new SynchronizedJavaParserTypeSolver(new File(path));
}
if (typeSolver != null)
{
typeSolvers.put(path, typeSolver);
combinedTypeSolver.add(typeSolver);
astVisitorClient.logWarning("unable to add dependency: " + path);
}
}
}