1 files changed, 32 insertions, 35 deletions

diff --git a/cpp/src/slice2confluence/Gen.cpp b/cpp/src/slice2confluence/Gen.cpp
index 49ad47a62bf..5610fd65c61 100644
--- a/cpp/src/slice2confluence/Gen.cpp
+++ b/cpp/src/slice2confluence/Gen.cpp
@@ -10,16 +10,17 @@
 #include <IceUtil/FileUtil.h>
 #include <IceUtil/Functional.h>
 #include <IceUtil/StringUtil.h>
+#include <IceUtil/FileUtil.h>
+#include <IceUtil/ConsoleUtil.h>
 #include <Slice/FileTracker.h>
 #include <Gen.h>
 #include <string.h>
 #include <sys/types.h>
-#include <sys/stat.h>
 
 #ifdef _WIN32
-#include <direct.h>
+#   include <direct.h>
 #else
-#include <unistd.h>
+#   include <unistd.h>
 #endif
 
 #include <iterator>
@@ -706,14 +707,10 @@ Slice::GeneratorBase::printMetaData(const ContainedPtr& p, bool isUserImplemente
     userImplementedOnly.push_back("cpp:const");
     userImplementedOnly.push_back("cpp:ice_print");
     userImplementedOnly.push_back("java:serialVersionUID");
+    userImplementedOnly.push_back("java:UserException");
     userImplementedOnly.push_back("UserException");
 
-    if (isUserImplemented)
-    {
-
-    }
-
-    if (!metaData.empty())
+    if(!metaData.empty())
     {
         string outString = "";
         StringList::const_iterator q = metaData.begin();
@@ -1228,8 +1225,8 @@ Slice::GeneratorBase::getComment(const ContainedPtr& contained, const ContainerP
             if(_warnOldCommentFiles.find(fileName) == _warnOldCommentFiles.end())
             {
                 _warnOldCommentFiles.insert(fileName);
-                cerr << fileName << ": warning: file contains old-style javadoc link syntax: `[" << literal << "]'"
-                     << endl;
+                consoleErr << fileName << ": warning: file contains old-style javadoc link syntax: `[" << literal
+                           << "]'" << endl;
             }
         }
         else if(s[i] == '{')
@@ -1271,8 +1268,8 @@ Slice::GeneratorBase::getComment(const ContainedPtr& contained, const ContainerP
 
     if(summary && _warnSummary && summarySize > _warnSummary)
     {
-        cerr << contained->file() << ": warning: summary size (" << summarySize << ") exceeds " << _warnSummary
-             << " characters: `" << comment << "'" << endl;
+        consoleErr << contained->file() << ": warning: summary size (" << summarySize << ") exceeds " << _warnSummary
+                   << " characters: `" << comment << "'" << endl;
     }
     return trim(_out.convertCommentHTML(removeNewlines(comment)));
 }
@@ -1393,14 +1390,14 @@ Slice::GeneratorBase::getLinkPath(const SyntaxTreeBasePtr& p, const ContainerPtr
     {
         // Intra-package links need package name, unlike with html dir structure
         EnumeratorPtr enumerator = EnumeratorPtr::dynamicCast(p);
-	if(enumerator)
-	{
-	    target = toStringList(enumerator->type());
-	}
-	else
-	{
-	    target = getContainer(p);
-	}
+    if(enumerator)
+    {
+        target = toStringList(enumerator->type());
+    }
+    else
+    {
+        target = getContainer(p);
+    }
         path = "";
         while (!target.empty()) {
             if (!path.empty()) {
@@ -1706,13 +1703,13 @@ Slice::GeneratorBase::warnOldStyleIdent(const string& str, const string& fileNam
             lastName = newName.substr(pos + 1);
         }
 
-        cerr << fileName << ": warning: file contains old-style javadoc identifier syntax: `" << str << "'."
-             << " Use `'" << newName << "'";
+        consoleErr << fileName << ": warning: file contains old-style javadoc identifier syntax: `" << str << "'."
+                   << " Use `'" << newName << "'";
         if(!alternateName.empty())
         {
-             cerr << " or `" << alternateName << "' if `" << lastName << "' is a member";
+             consoleErr << " or `" << alternateName << "' if `" << lastName << "' is a member";
         }
-        cerr << endl;
+        consoleErr << endl;
     }
 }
 
@@ -1956,8 +1953,8 @@ Slice::StartPageGenerator::printHeaderFooter()
     // Do nothing
 }
 
-Slice::FileVisitor::FileVisitor(Files& files)
-    : _files(files)
+Slice::FileVisitor::FileVisitor(Files& files) :
+    _files(files)
 {
 }
 
@@ -2019,8 +2016,8 @@ Slice::FileVisitor::visitEnum(const EnumPtr& e)
     _files.insert(e->file());
 }
 
-Slice::StartPageVisitor::StartPageVisitor(const Files& files)
-    : _spg(files)
+Slice::StartPageVisitor::StartPageVisitor(const Files& files) :
+    _spg(files)
 {
 }
 
@@ -2091,7 +2088,7 @@ TOCGenerator::writeEntry(const ContainedPtr& c)
     EnumPtr en = EnumPtr::dynamicCast(c);
     if(en)
     {
-        EnumeratorList enumerators = en->getEnumerators();
+        EnumeratorList enumerators = en->enumerators();
         for(EnumeratorList::const_iterator i = enumerators.begin(); i != enumerators.end(); ++i)
         {
             cl.push_back(*i);
@@ -2176,8 +2173,8 @@ TOCGenerator::writeEntry(const ContainedPtr& c)
     end();
 }
 
-TOCVisitor::TOCVisitor(const Files& files, const string& header, const string& footer)
-    : _tg(files, header, footer)
+TOCVisitor::TOCVisitor(const Files& files, const string& header, const string& footer) :
+    _tg(files, header, footer)
 {
 }
 
@@ -3202,7 +3199,7 @@ Slice::EnumGenerator::generate(const EnumPtr& e)
 
     printComment(e, e->container(), deprecateReason, false);
 
-    EnumeratorList enumerators = e->getEnumerators();
+    EnumeratorList enumerators = e->enumerators();
 
     if(!enumerators.empty())
     {
@@ -3266,8 +3263,8 @@ Slice::EnumGenerator::generate(const EnumPtr& e)
     assert(_out.currIndent() == indent);
 }
 
-Slice::PageVisitor::PageVisitor(const Files& files)
-    : _files(files)
+Slice::PageVisitor::PageVisitor(const Files& files) :
+    _files(files)
 {
 }