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

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

Module Name:	CFJavaEditor
Committed By:	avogl
Date:		Thu Jul 17 20:36:43 UTC 2003

Modified Files:
	CFJavaEditor/src/cfeditor: ArchObjectStack.java CFJavaEditor.java
	    JFontChooser.java

Log Message:
Fixed path-related problem in the collected png
image loader.
--AV



Start of context diffs


Index: CFJavaEditor/src/cfeditor/ArchObjectStack.java
diff -c CFJavaEditor/src/cfeditor/ArchObjectStack.java:1.11 CFJavaEditor/src/cfeditor/ArchObjectStack.java:1.12
*** CFJavaEditor/src/cfeditor/ArchObjectStack.java:1.11	Sun Jul 13 10:49:11 2003
--- CFJavaEditor/src/cfeditor/ArchObjectStack.java	Thu Jul 17 13:36:43 2003
***************
*** 486,504 ****
                  do {
                      // first we parse the face name out of the ascii data
                      // that precedes the png byte-data
!                     face = ""; c = '\0'; l = '\0';
                      face_complete = false;
!                     do {
!                         r = stream.read();
!                     } while (r != -1 && (char)r != '.');
  
                      do {
!                         while(c != '.' && r != -1) {
                              r = stream.read();
                              c = (char)r;
                              face += String.valueOf(c);
                          }
! 
                          // r == -1 means End of File reached!
                          if (r != -1) {
                              for (t=0; t<3; t++)
--- 486,506 ----
                  do {
                      // first we parse the face name out of the ascii data
                      // that precedes the png byte-data
!                     face = ""; c = '\0'; l = '\0'; r = '\0';
                      face_complete = false;
!                     for (t=0; t<3; t++) {
!                         do{
!                             r = stream.read();
!                         }while(r != -1 && (char)r != ' ');
!                     }
  
                      do {
!                         while((c != '.' || face.length() < 3) && r != -1) {
                              r = stream.read();
                              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++)
***************
*** 525,531 ****
                      if (r != -1) {
                          // now we try to figure the size of the png data in byte,
                          // later we jump back to the beginning position and read those bytes
!                         stream.getBufferedStream().mark(10000);         // mark position
                          t = 0; size=0;
                          do {
                              r = stream.read();      // read one character
--- 527,533 ----
                      if (r != -1) {
                          // now we try to figure the size of the png data in byte,
                          // later we jump back to the beginning position and read those bytes
!                         stream.getBufferedStream().mark(100000);         // mark position
                          t = 0; size=0;
                          do {
                              r = stream.read();      // read one character

Index: CFJavaEditor/src/cfeditor/CFJavaEditor.java
diff -c CFJavaEditor/src/cfeditor/CFJavaEditor.java:1.14 CFJavaEditor/src/cfeditor/CFJavaEditor.java:1.15
*** CFJavaEditor/src/cfeditor/CFJavaEditor.java:1.14	Sun Jul 13 10:49:11 2003
--- CFJavaEditor/src/cfeditor/CFJavaEditor.java	Thu Jul 17 13:36:43 2003
***************
*** 31,37 ****
   * The launcher that launches the whole level editor application.
   *
   * @author <a href="mailto:mic...@no...">Michael Toennies</a>
!  * @version $Revision: 1.14 $
   */
  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.15 $
   */
  public class CFJavaEditor {
      /**

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