summaryrefslogtreecommitdiffstats
path: root/src/classdef.cpp
diff options
context:
space:
mode:
authorDimitri van Heesch <dimitri@stack.nl>2014-04-28 19:36:59 (GMT)
committerDimitri van Heesch <dimitri@stack.nl>2014-08-14 18:40:39 (GMT)
commitc3ddf3331239fb3f41e502a8337eee786ceaad06 (patch)
tree4ba8a522c371fb3b5b24666d3358b05560fa4eef /src/classdef.cpp
parent7d9d4320f5d183c4e1ebc87a316589c36f0afeed (diff)
downloadDoxygen-c3ddf3331239fb3f41e502a8337eee786ceaad06.zip
Doxygen-c3ddf3331239fb3f41e502a8337eee786ceaad06.tar.gz
Doxygen-c3ddf3331239fb3f41e502a8337eee786ceaad06.tar.bz2
Bug 583958 - Class diagrams and class hierarchy don't work for java generic classes
Bug 631675 - Java inheritance of instantiated generics not recognized.
Diffstat (limited to 'src/classdef.cpp')
-rw-r--r--src/classdef.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/classdef.cpp b/src/classdef.cpp
index b32d5a8..c36a83f 100644
--- a/src/classdef.cpp
+++ b/src/classdef.cpp
@@ -249,7 +249,7 @@ void ClassDefImpl::init(const char *defFileName, const char *name,
{
isLocal=FALSE;
}
- isGeneric = lang==SrcLangExt_CSharp && QCString(name).find('<')!=-1;
+ isGeneric = (lang==SrcLangExt_CSharp || lang==SrcLangExt_Java) && QCString(name).find('<')!=-1;
isAnonymous = QCString(name).find('@')!=-1;
}