Improvement to import of incomplete Java source code:

umbrello/model_utils.cpp

• In function findUMLObject, if object names match but types are different then add further test: If the source object is a Package or a Class and the found object has the class-or-package stereotype applied then return the found object.

CCBUG:416178