Commit c990500e authored by Ralf Habacker's avatar Ralf Habacker

Fix 'java import resolves templated class type into wrong java source'.

BUG:368484
FIXED-IN:2.10.2 (KDE Applications 16.08.2)
parent 4ae4ef19
......@@ -159,6 +159,12 @@ UMLObject* JavaImport::resolveClass (const QString& className)
baseClassName.remove(QLatin1Char('['));
baseClassName.remove(QLatin1Char(']'));
// remove template class name so that the class itself can be resolved
int index = baseClassName.indexOf(QLatin1Char('<'));
if (index != -1) {
baseClassName = baseClassName.remove(index, baseClassName.size()-index);
}
// java has a few implicit imports. Most relevant for this is the
// current package, which is in the same directory as the current file
// being parsed
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment