Merge pull request #39 from diorcety/gsoc2012-doxygen

This merge fixes doxygen '\link' tag when converted to Javadoc. Before this fix:

\link SomeAnotherClass#classMethodExtended(int, int) a link text \endlink --> {@link SomeAnotherClass#classMethodExtended(int,int) } 

Result after the fix:
{@link SomeAnotherClass#classMethodExtended(int,int) a link text} 
Test case 'doxygen_parsing.i' was updated to reflect this fix.

1 files changed, 2 insertions, 1 deletions

diff --git a/Source/DoxygenTranslator/src/JavaDocConverter.cpp b/Source/DoxygenTranslator/src/JavaDocConverter.cpp
index b0a18b991..7f12af96d 100644
--- a/Source/DoxygenTranslator/src/JavaDocConverter.cpp
+++ b/Source/DoxygenTranslator/src/JavaDocConverter.cpp
@@ -646,6 +646,7 @@ string JavaDocConverter::convertLink(string linkObject)
   string paramsStr = linkObject.substr(lbracePos + 1,
       rbracePos - lbracePos - 1);
   // strip the params, to fill them later
+  string additionalObject = linkObject.substr(rbracePos + 1, string::npos);
   linkObject = linkObject.substr(0, lbracePos);
 
   // find all the params
@@ -720,7 +721,7 @@ string JavaDocConverter::convertLink(string linkObject)
   }
   linkObject += ")";
 
-  return linkObject;
+  return linkObject + additionalObject;
 }
 
 void JavaDocConverter::handleTagLink(DoxygenEntity& tag,