[Gzz-commits] navidoc/navidoc/link javadoc.py

[Asko Soukka]

CVSROOT:        /cvsroot/navidoc
Module name:    navidoc
Branch:         
Changes by:     Asko Soukka <address@hidden>    03/08/11 07:49:19

Modified files:
        navidoc/link   : javadoc.py 

Log message:
        jlink nested javadoc classes

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/navidoc/navidoc/navidoc/link/javadoc.py.diff?tr1=1.12&tr2=1.13&r1=text&r2=text

Patches:
Index: navidoc/navidoc/link/javadoc.py
diff -u navidoc/navidoc/link/javadoc.py:1.12 
navidoc/navidoc/link/javadoc.py:1.13
--- navidoc/navidoc/link/javadoc.py:1.12        Mon Jun 30 09:56:10 2003
+++ navidoc/navidoc/link/javadoc.py     Mon Aug 11 07:49:19 2003
@@ -19,7 +19,7 @@
 # MA  02111-1307  USA
 # 
 
-#$Id: javadoc.py,v 1.12 2003/06/30 13:56:10 humppake Exp $
+#$Id: javadoc.py,v 1.13 2003/08/11 11:49:19 humppake Exp $
 
 #
 # Written by Asko Soukka
@@ -76,12 +76,25 @@
                 dbg_navidoc('[jlink] Target not found: %s.' % (self.target))
             dbg(self.key+" Javadoc target: %s, error: %s" % (self.target, 
self.error))
 
+    def _join(self, parts):
+        """
+        Returns a javadoc filepath constructed from given
+        parts. Although, no (.html) posfix is added.
+        """
+        if len(parts) == 0: return ''
+        for index in range(len(parts)-1):
+            if parts[index][0].isupper():
+                parts[index] = parts[index]+'.'
+            else:
+                parts[index] = parts[index]+'/'
+        return ''.join(parts)
+
     def set_target(self):
          """
          Set the javadoc target.
          """
          parts = self.target.split('.')
-         self.target = '/'.join(parts);
+         self.target = self._join(parts);
 
          if re.match('^[a-z]', parts[-1]):
              self.target = slashify(self.target) + 'package-summary.html'
@@ -97,7 +110,7 @@
  
          if len(config.linkpackages['jlink']) > 0:
              package_parts = config.linkpackages['jlink'].split('.')
-             jlinkpackage = '/'.join(package_parts)
+             jlinkpackage = self._join(package_parts)
              self.target = slashify(jlinkpackage)+self.target
 
          for dir in config.javadoc_directories: