[Crossfire-cvs] CVS commit: CFJavaEditor/src/cfeditor

[<cro...@li...>]

Module Name:	CFJavaEditor
Committed By:	avogl
Date:		Sat Jul 19 15:15:36 UTC 2003

Modified Files:
	CFJavaEditor/src/cfeditor: ArchObjectStack.java CFJavaEditor.java
	    JFontChooser.java
	CFJavaEditor/src/cfeditor/textedit/textarea: CTokenMarker.java
	    DefaultInputHandler.java HTMLTokenMarker.java InputHandler.java
	    JEditTextArea.java JavaScriptTokenMarker.java KeywordMap.java
	    PythonTokenMarker.java SyntaxDocument.java SyntaxStyle.java
	    SyntaxUtilities.java TextAreaPainter.java TextUtilities.java
	    Token.java TokenMarker.java XMLTokenMarker.java

Log Message:
Fixed a bug which prevented the last image in the archive
to get loaded properly.
Also fixed a problem which might have caused the <Strg>-S
quicksave shortcut not to work in the script pad.

--AndreasV



Start of context diffs


Index: CFJavaEditor/src/cfeditor/ArchObjectStack.java
diff -c CFJavaEditor/src/cfeditor/ArchObjectStack.java:1.12 CFJavaEditor/src/cfeditor/ArchObjectStack.java:1.13
*** CFJavaEditor/src/cfeditor/ArchObjectStack.java:1.12	Thu Jul 17 13:36:43 2003
--- CFJavaEditor/src/cfeditor/ArchObjectStack.java	Sat Jul 19 08:15:36 2003
***************
*** 500,506 ****
                              c = (char)r;
                              face += String.valueOf(c);
                          }
!                         //System.out.println("face = '"+face+"'");
                          // r == -1 means End of File reached!
                          if (r != -1) {
                              for (t=0; t<3; t++)
--- 500,506 ----
                              c = (char)r;
                              face += String.valueOf(c);
                          }
! 
                          // r == -1 means End of File reached!
                          if (r != -1) {
                              for (t=0; t<3; t++)
***************
*** 540,548 ****
                          } while (t < tag.length() && r != -1);
  
                          // again, r == -1 means End of File reached
!                         if (r != -1) {
!                             size -= tag.length();  // must subtract the size of final string
! 
                              stream.getBufferedStream().reset(); // jump to beginning of png data
  
                              // now we create a buffer of appropriate size and
--- 540,554 ----
                          } while (t < tag.length() && r != -1);
  
                          // again, r == -1 means End of File reached
!                         if (r != -1 || size > 0) {
!                             if (r == -1) {
!                                 // for the last png, subtract one because last was EOF
!                                 size--;
!                             }
!                             else {
!                                 // for all other pngs, must subtract the size of next starting tag
!                                 size -= tag.length();
!                             }
                              stream.getBufferedStream().reset(); // jump to beginning of png data
  
                              // now we create a buffer of appropriate size and

Index: CFJavaEditor/src/cfeditor/CFJavaEditor.java
diff -c CFJavaEditor/src/cfeditor/CFJavaEditor.java:1.15 CFJavaEditor/src/cfeditor/CFJavaEditor.java:1.16
*** CFJavaEditor/src/cfeditor/CFJavaEditor.java:1.15	Thu Jul 17 13:36:43 2003
--- CFJavaEditor/src/cfeditor/CFJavaEditor.java	Sat Jul 19 08:15:36 2003
***************
*** 31,37 ****
   * The launcher that launches the whole level editor application.
   *
   * @author <a href="mailto:mic...@no...">Michael Toennies</a>
!  * @version $Revision: 1.15 $
   */
  public class CFJavaEditor {
      /**
--- 31,37 ----
   * The launcher that launches the whole level editor application.
   *
   * @author <a href="mailto:mic...@no...">Michael Toennies</a>
!  * @version $Revision: 1.16 $
   */
  public class CFJavaEditor {
      /**

Index: CFJavaEditor/src/cfeditor/JFontChooser.java
diff -c CFJavaEditor/src/cfeditor/JFontChooser.java:1.11 CFJavaEditor/src/cfeditor/JFontChooser.java:1.12
*** CFJavaEditor/src/cfeditor/JFontChooser.java:1.11	Thu Jul 17 13:36:43 2003
--- CFJavaEditor/src/cfeditor/JFontChooser.java	Sat Jul 19 08:15:36 2003
***************
*** 10,16 ****
   *
   * Valentin Tablan 06/04/2001
   *
!  * $Id: JFontChooser.java,v 1.11 2003/07/17 20:36:43 avogl Exp $
   *
   */
  package cfeditor;
--- 10,16 ----
   *
   * Valentin Tablan 06/04/2001
   *
!  * $Id: JFontChooser.java,v 1.12 2003/07/19 15:15:36 avogl Exp $
   *
   */
  package cfeditor;

Index: CFJavaEditor/src/cfeditor/textedit/textarea/CTokenMarker.java
diff -c CFJavaEditor/src/cfeditor/textedit/textarea/CTokenMarker.java:1.1 CFJavaEditor/src/cfeditor/textedit/textarea/CTokenMarker.java:1.2
*** CFJavaEditor/src/cfeditor/textedit/textarea/CTokenMarker.java:1.1	Mon Apr  7 17:45:02 2003
--- CFJavaEditor/src/cfeditor/textedit/textarea/CTokenMarker.java	Sat Jul 19 08:15:36 2003
***************
*** 14,20 ****
   * C token marker.
   *
   * @author Slava Pestov
!  * @version $Id: CTokenMarker.java,v 1.1 2003/04/08 00:45:02 avogl Exp $
   */
  public class CTokenMarker extends TokenMarker
  {
--- 14,20 ----
   * C token marker.
   *
   * @author Slava Pestov
!  * @version $Id: CTokenMarker.java,v 1.2 2003/07/19 15:15:36 avogl Exp $
   */
  public class CTokenMarker extends TokenMarker
  {