[Jsxe-cvs] SF.net SVN: jsxe: [1166] trunk/sourceview

[<ian...@us...>]

Revision: 1166
Author:   ian_lewis
Date:     2006-08-27 06:37:28 -0700 (Sun, 27 Aug 2006)
ViewCVS:  http://svn.sourceforge.net/jsxe/?rev=1166&view=rev

Log Message:
-----------
merge from the 0.5pre3 branch

Modified Paths:
--------------
    trunk/sourceview/Changelog
    trunk/sourceview/messages/messages.ru
    trunk/sourceview/src/sourceview/SourceView.java
    trunk/sourceview/src/sourceview/SourceViewDocument.java
Modified: trunk/sourceview/Changelog
===================================================================
--- trunk/sourceview/Changelog	2006-08-27 13:30:41 UTC (rev 1165)
+++ trunk/sourceview/Changelog	2006-08-27 13:37:28 UTC (rev 1166)
@@ -1,3 +1,13 @@
+08/22/2006  Ian Lewis   <Ian...@me...>
+
+    * Changing the encoding now updates the SourceViewDocument so that it
+      doesn't cause the SourceViewDocument to get out of sync with the 
+      XMLDocument.
+
+08/21/2006  Ian Lewis   <Ian...@me...>
+
+    * Updated russian translation.
+
 08/07/2006  Ian Lewis   <Ian...@me...>
 
     * Moved the edit menu to jsXe core and added a hack so that undo will work.

Modified: trunk/sourceview/messages/messages.ru
===================================================================
--- trunk/sourceview/messages/messages.ru	2006-08-27 13:30:41 UTC (rev 1165)
+++ trunk/sourceview/messages/messages.ru	2006-08-27 13:37:28 UTC (rev 1166)
@@ -1,10 +1,10 @@
-# JSXE source view English properties file
+# JSXE source view English properties file
 # $Id: messages 1068 2006-07-26 16:57:45Z ian_lewis $
-# Maintained by Alexandr Gridnev (ale...@ya...)
-#:mode=properties:
-#:tabSize=4:indentSize=4:noTabs=true:
-#:folding=explicit:collapseFolds=1
-
+# Maintained by Alexandr Gridnev (ale...@ya...)
+#:mode=properties:
+#:tabSize=4:indentSize=4:noTabs=true:
+#:folding=explicit:collapseFolds=1
+
 #{{{ Source View Options
 SourceView.Options.Title=Отображение исходником
 SourceView.Options.EndOfLineMarker=Отображать символы конца строки
@@ -29,6 +29,6 @@
 SourceView.Replace.With=Заменить на:
 SourceView.Replace.And.Find=Найти и заменить
 SourceView.No.More.Matches.title=Дальше не найдено :(
-SourceView.No.More.Matches.message="Ничего не найдено. Искать с начала документа?"
-SourceView.Search.Error.title=Ошибка поиска 0_0
+SourceView.No.More.Matches.message="Ничего не найдено. Искать с начала документа?"
+SourceView.Search.Error.title=Ошибка поиска :(
 #}}}

Modified: trunk/sourceview/src/sourceview/SourceView.java
===================================================================
--- trunk/sourceview/src/sourceview/SourceView.java	2006-08-27 13:30:41 UTC (rev 1165)
+++ trunk/sourceview/src/sourceview/SourceView.java	2006-08-27 13:37:28 UTC (rev 1166)
@@ -311,6 +311,15 @@
                     Log.log(Log.WARNING, this, e.getMessage());
                 }
             }
+            if (key.equals(XMLDocument.ENCODING)) {
+                try {
+                    //reload the document
+                    m_textarea.setDocument(new SourceViewDocument(m_document));
+                    m_textarea.setTokenMarker(new XMLTokenMarker());
+                } catch (IOException e) {
+                    Log.log(Log.ERROR, this, e);
+                }
+            }
         }//}}}
         
         //{{{ structureChanged

Modified: trunk/sourceview/src/sourceview/SourceViewDocument.java
===================================================================
--- trunk/sourceview/src/sourceview/SourceViewDocument.java	2006-08-27 13:30:41 UTC (rev 1165)
+++ trunk/sourceview/src/sourceview/SourceViewDocument.java	2006-08-27 13:37:28 UTC (rev 1166)
@@ -87,8 +87,6 @@
         super();
         m_document = document;
         
-       // document.addXMLDocumentListener(new SourceViewDocumentXMLDocumentListener());
-        
         if (document != null) {
             
             try {


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.