diff --git a/modules/java/gen_java.py b/modules/java/gen_java.py index aef2a18163..ca0ddfe25c 100644 --- a/modules/java/gen_java.py +++ b/modules/java/gen_java.py @@ -589,9 +589,8 @@ class ClassInfo(object): self.jname = m[1:] self.base = '' if decl[1]: - self.base = re.sub(r"\b"+self.jname+r"\b", "", decl[1].replace(":", "")).strip() - - + #self.base = re.sub(r"\b"+self.jname+r"\b", "", decl[1].replace(":", "")).strip() + self.base = re.sub(r"^.*:", "", decl[1].split(",")[0]).strip().replace(self.jname, "") class ArgInfo(object): def __init__(self, arg_tuple): # [ ctype, name, def val, [mod], argno ] diff --git a/modules/java/rst_parser.py b/modules/java/rst_parser.py index 8503a8b889..87121b0bae 100644 --- a/modules/java/rst_parser.py +++ b/modules/java/rst_parser.py @@ -143,7 +143,7 @@ class RstParser(object): #if section_name.find(" ") >= 0 and section_name.find("::operator") < 0: if section_name.find(" ") >= 0 and not bool(re.match(r"(\w+::)*operator\s*(\w+|>>|<<|\(\)|->|\+\+|--|=|==|\+=|-=)", section_name)): if show_errors: - print "RST parser warning W%03d: SKIPPED: \"%s\" File: %s:%s" % (WARNING_002_HDRWHITESPACE, section_name, file_name, lineno) + print >> sys.stderr, "RST parser warning W%03d: SKIPPED: \"%s\" File: %s:%s" % (WARNING_002_HDRWHITESPACE, section_name, file_name, lineno) self.sections_skipped += 1 return