Release-1.2.14-20020324

1 files changed, 22 insertions, 5 deletions

diff --git a/src/namespacedef.cpp b/src/namespacedef.cpp
index 96affc7..3a98438 100644
--- a/src/namespacedef.cpp
+++ b/src/namespacedef.cpp
@@ -176,9 +176,16 @@ void NamespaceDef::writeDocumentation(OutputList &ol)
   startFile(ol,getOutputFileBase(),name(),pageTitle);
   startTitle(ol,getOutputFileBase());
   //ol.docify(pageTitle);
-  parseText(ol,theTranslator->trNamespaceReference(name()));
+  if (Config_getBool("OPTIMIZE_OUTPUT_JAVA"))
+  {
+    parseText(ol,theTranslator->trPackage(displayName()));
+  }
+  else
+  {
+    parseText(ol,theTranslator->trNamespaceReference(displayName()));
+  }
   addGroupListToTitle(ol,this);
-  endTitle(ol,getOutputFileBase(),name());
+  endTitle(ol,getOutputFileBase(),displayName());
   
   if (!Config_getString("GENERATE_TAGFILE").isEmpty())
   {
@@ -327,10 +334,10 @@ QCString NamespaceDef::getOutputFileBase() const
   return convertNameToFile(fileName); 
 }
 
-Definition *NamespaceDef::findInnerCompound(const char *name)
+Definition *NamespaceDef::findInnerCompound(const char *n)
 {
-  if (name==0) return 0;
-  return m_innerCompounds->find(name);
+  if (n==0) return 0;
+  return m_innerCompounds->find(n);
 }
 
 void NamespaceDef::addInnerCompound(Definition *d)
@@ -358,3 +365,13 @@ void NamespaceDef::addListReferences()
   docVarMembers.addListReferences(this);
 }
 
+QCString NamespaceDef::displayName() const
+{
+  QCString result=name();
+  if (Config_getBool("OPTIMIZE_OUTPUT_JAVA"))
+  {
+    result = substitute(result,"::",".");
+  }
+  return result; 
+}
+