Fresco/Berlin/modules/Commands Makefile.in,1.7,1.8 TextBufferImpl.cc,1.10,1.11 TextBufferImpl.hh,1.9,1.10 VisualTextBufferImpl.cc,1.3,NONE VisualTextBufferImpl.hh,1.2,NONE
Tobias Hunger <[email protected]> Fri, 01 Aug 2003 11:47:50 -0500
| Newsgroups | gmane.comp.video.fresco.cvs |
|---|---|
| Message-ID | <[email protected]> |
Update of /cvs/fresco/Fresco/Berlin/modules/Commands
In directory purcel:/tmp/cvs-serv24256/Berlin/modules/Commands
Modified Files:
Makefile.in TextBufferImpl.cc TextBufferImpl.hh
Removed Files:
VisualTextBufferImpl.cc VisualTextBufferImpl.hh
Log Message:
Babylon work over:
* Use iconv to convert characters to/from Babylon
* Updtae to Unicode Version 4.0
* Added unit tests (some fail for now, still need to work on that)
* Removed the VisualTextBuffer from the CommandKit: I still like the idea,
unfortunately it won't work out in the real world:-|
* Updated code to the changed Babylon interfaces whereever needed.
Index: Makefile.in
===================================================================
RCS file: /cvs/fresco/Fresco/Berlin/modules/Commands/Makefile.in,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- Makefile.in 20 Nov 2002 07:14:00 -0000 1.7
+++ Makefile.in 1 Aug 2003 16:47:17 -0000 1.8
@@ -30,7 +30,7 @@
SRC := BoundedValueImpl.cc BoundedRangeImpl.cc TelltaleImpl.cc \
SelectionImpl.cc TextBufferImpl.cc StreamBufferImpl.cc \
- CommandKitImpl.cc VisualTextBufferImpl.cc # ReactorImpl.cc
+ CommandKitImpl.cc # VisualTextBufferImpl.cc ReactorImpl.cc
MODULE := CommandKit
Index: TextBufferImpl.cc
===================================================================
RCS file: /cvs/fresco/Fresco/Berlin/modules/Commands/TextBufferImpl.cc,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- TextBufferImpl.cc 29 May 2002 06:49:38 -0000 1.10
+++ TextBufferImpl.cc 1 Aug 2003 16:47:17 -0000 1.11
@@ -21,18 +21,13 @@
*/
#include "TextBufferImpl.hh"
-#include "VisualTextBufferImpl.hh"
#include <iostream>
using namespace Prague;
using namespace Fresco;
-TextBufferImpl::TextBufferImpl() : _visual(0) {
- Prague::Trace trace("TextBufferImpl::TextBufferImpl()");
-}
-TextBufferImpl::~TextBufferImpl() {
- Prague::Trace trace("TextBufferImpl::~TextBufferImpl()");
-}
+TextBufferImpl::TextBufferImpl() { }
+TextBufferImpl::~TextBufferImpl() { }
CORBA::ULong TextBufferImpl::size()
{
@@ -240,26 +235,4 @@
CORBA::Any any;
any <<= ch;
notify(any);
-}
-
-Fresco::TextBuffer::StringOrder TextBufferImpl::order() {
- Prague::Trace trace("TextBufferImpl::order()");
- return Fresco::TextBuffer::memory_order;
-}
-
-
-TextBuffer_ptr TextBufferImpl::get_memory_buffer() {
- Prague::Trace trace("TextBufferImpl::get_memory_buffer()");
- return _this();
-}
-
-TextBuffer_ptr TextBufferImpl::get_visual_buffer() {
- Prague::Trace trace("TextBufferImpl::get_visualbuffer()");
- if (!_visual) {
- VisualTextBufferImpl * visual = new VisualTextBufferImpl(this);
- Prague::Guard<Mutex> guard(_mutex);
- _visual = visual;
- activate(_visual);
- }
- return _visual->_this();
}
Index: TextBufferImpl.hh
===================================================================
RCS file: /cvs/fresco/Fresco/Berlin/modules/Commands/TextBufferImpl.hh,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- TextBufferImpl.hh 29 May 2002 06:49:38 -0000 1.9
+++ TextBufferImpl.hh 1 Aug 2003 16:47:18 -0000 1.10
@@ -29,14 +29,10 @@
#include <Berlin/SubjectImpl.hh>
#include <Berlin/GapBuffer.hh>
-class VisualTextBufferImpl;
-
class TextBufferImpl : public virtual POA_Fresco::TextBuffer,
public SubjectImpl
{
-public:
- friend class VisualTextBufferImpl;
-
+ public:
TextBufferImpl();
virtual ~TextBufferImpl();
virtual CORBA::ULong size();
@@ -52,13 +48,9 @@
virtual void remove_backward(CORBA::ULong);
virtual void remove_forward(CORBA::ULong);
virtual void clear();
- virtual Fresco::TextBuffer::StringOrder order();
- virtual Fresco::TextBuffer_ptr get_memory_buffer();
- virtual Fresco::TextBuffer_ptr get_visual_buffer();
-private:
+ private:
GapBuffer<Fresco::Unichar, 32> _buffer;
Prague::Mutex _mutex;
- VisualTextBufferImpl * _visual;
};
#endif
--- VisualTextBufferImpl.cc DELETED ---
--- VisualTextBufferImpl.hh DELETED ---