From 51ee7620f82e4232baf587ee052001751c23e481 Mon Sep 17 00:00:00 2001
From: Dwayne Boone <dwayne@zeroc.com>
Date: Fri, 2 Jan 2009 15:16:46 -0330
Subject: Merged with R3_3_branch

---
 cpp/src/Slice/JavaUtil.cpp | 19 -------------------
 1 file changed, 19 deletions(-)

(limited to 'cpp/src/Slice/JavaUtil.cpp')

diff --git a/cpp/src/Slice/JavaUtil.cpp b/cpp/src/Slice/JavaUtil.cpp
index 3f35bf1af32..1c9675f087c 100644
--- a/cpp/src/Slice/JavaUtil.cpp
+++ b/cpp/src/Slice/JavaUtil.cpp
@@ -8,7 +8,6 @@
 // **********************************************************************
 
 #include <Slice/JavaUtil.h>
-#include <Slice/SignalHandler.h>
 #include <IceUtil/Functional.h>
 
 #include <sys/types.h>
@@ -27,20 +26,6 @@ using namespace Slice;
 using namespace IceUtil;
 using namespace IceUtilInternal;
 
-//
-// Callback for Crtl-C signal handling
-//
-static Slice::JavaGenerator* _javaGen = 0;
-
-static void closeCallback()
-{
-    if(_javaGen != 0)
-    {
-        _javaGen->close();
-    }
-}
-
-
 Slice::JavaOutput::JavaOutput()
 {
 }
@@ -124,7 +109,6 @@ Slice::JavaOutput::openClass(const string& cls, const string& prefix)
         path += "/";
     }
     path += file;
-    SignalHandler::addFile(path);
 
     open(path.c_str());
     if(isOpen())
@@ -174,7 +158,6 @@ Slice::JavaGenerator::JavaGenerator(const string& dir) :
     _dir(dir),
     _out(0)
 {
-    SignalHandler::setCallback(closeCallback);
 }
 
 Slice::JavaGenerator::JavaGenerator(const string& dir, Slice::FeatureProfile profile) :
@@ -198,7 +181,6 @@ Slice::JavaGenerator::open(const string& absolute)
     if(out->openClass(absolute, _dir))
     {
         _out = out;
-        _javaGen = this; // For Ctrl-C handling
     }
     else
     {
@@ -215,7 +197,6 @@ Slice::JavaGenerator::close()
     *_out << nl;
     delete _out;
     _out = 0;
-    _javaGen = 0; // For Ctrl-C handling
 }
 
 Output&
-- 
cgit v1.2.3