summaryrefslogtreecommitdiff
path: root/cpp/src/slice2java/Gen.cpp
diff options
context:
space:
mode:
authorMichi Henning <michi@zeroc.com>2009-07-07 18:41:04 +1000
committerMichi Henning <michi@zeroc.com>2009-07-07 18:41:04 +1000
commit96e5354bd6760d43b031906e745ab741ad5d38f2 (patch)
tree46d2abbd537c9d9f93572b0aae15584b57bbb6c0 /cpp/src/slice2java/Gen.cpp
parentFixed compilation error in BatchOneways.java (diff)
downloadice-96e5354bd6760d43b031906e745ab741ad5d38f2.tar.bz2
ice-96e5354bd6760d43b031906e745ab741ad5d38f2.tar.xz
ice-96e5354bd6760d43b031906e745ab741ad5d38f2.zip
Bug 3502: Improve javadoc support in Eclipse.
Diffstat (limited to 'cpp/src/slice2java/Gen.cpp')
-rw-r--r--cpp/src/slice2java/Gen.cpp96
1 files changed, 0 insertions, 96 deletions
diff --git a/cpp/src/slice2java/Gen.cpp b/cpp/src/slice2java/Gen.cpp
index 40eca501be7..212e2e6a2cd 100644
--- a/cpp/src/slice2java/Gen.cpp
+++ b/cpp/src/slice2java/Gen.cpp
@@ -1201,39 +1201,6 @@ Slice::JavaVisitor::writeDispatchAndMarshalling(Output& out, const ClassDefPtr&
}
-//
-// Turn scoped identifiers such as "::A::B" and "B::C::D"
-// into "A.B" and "B.C.D", respectively.
-//
-string
-Slice::JavaVisitor::convertScoped(const string& s)
-{
- //
- // Strip surrounding white space.
- //
- string result = IceUtilInternal::trim(s);
-
- //
- // Delete leading "::", if any.
- //
- if(result.size() > 1 && result[0] == ':' && result[1] == ':')
- {
- result = result.substr(2);
- }
-
- //
- // Replace "::" with "."
- //
- string::size_type pos = result.find("::");
- while(pos != string::npos)
- {
- result = result.replace(pos, 2, ".");
- pos = result.find("::", pos);
- }
-
- return result;
-}
-
StringList
Slice::JavaVisitor::splitComment(const ContainedPtr& p)
{
@@ -1253,69 +1220,6 @@ Slice::JavaVisitor::splitComment(const ContainedPtr& p)
result.push_back(lastLine);
}
- //
- // Rewrite @see sections to replace "::" with "."
- //
- const string seeTag = "@see";
- StringList::iterator i = result.begin();
- while(i != result.end())
- {
- string::size_type pos = i->find(seeTag);
- if(pos != string::npos)
- {
- *i = seeTag + " " + convertScoped(i->substr(pos + seeTag.size()));
- }
- ++i;
- }
-
- //
- // Strip square brackets from comments with hyperlinks such as [ObjectAdapter].
- //
- StringList::iterator j;
- for(j = result.begin(); j != result.end(); ++j)
- {
- pos = j->find('[', 0);
- while(pos != string::npos)
- {
- //
- // Don't erase escaped opening bracket: \[, erase
- // the backslash instead.
- //
- if(pos != 0 && (*j)[pos - 1] == '\\')
- {
- *j = j->erase(pos - 1, 1);
- pos = j->find('[', pos);
- continue;
- }
-
- *j = j->erase(pos, 1); // Erase [
- pos = j->find(']', pos);
- if(pos != string::npos)
- {
- *j = j->erase(pos, 1); // Erase ]
- pos = j->find('[', pos);
- }
- }
- }
-
- //
- // Strip HTML tags.
- //
- for(j = result.begin(); j != result.end(); ++j)
- {
- pos = j->find('<', 0);
- while(pos != string::npos)
- {
- nextPos = j->find('>', pos + 1);
- if(pos != string::npos)
- {
- *j = j->erase(pos, nextPos - pos + 1);
- pos = j->find('<', pos);
- }
- }
- }
-
-
return result;
}