[subversion:9] Fix for issue #114 - Error on non-ASCII character

[dkaspar@kenai.com]

Repository: subversion
Revision:   9
Author:     dkaspar
Date:       2009-01-06 13:18:55 UTC

Log Message:
-----------
Fix for issue #114 - Error on non-ASCII character


Modified Paths:
--------------
   
trunk/com.sun.javafx.eclipse.core/src/com/sun/javafx/eclipse/core/build
er/JavaFXBuilder.java
   
trunk/com.sun.javafx.eclipse.core/src/com/sun/javafx/eclipse/core/build
er/classpath/SourceFileObject.java

Diffs:
-----
Index:
trunk/com.sun.javafx.eclipse.core/src/com/sun/javafx/eclipse/core/build
er/classpath/SourceFileObject.java
===================================================================
---
trunk/com.sun.javafx.eclipse.core/src/com/sun/javafx/eclipse/core/build
er/classpath/SourceFileObject.java   (revision 8)
+++
trunk/com.sun.javafx.eclipse.core/src/com/sun/javafx/eclipse/core/build
er/classpath/SourceFileObject.java   (revision 9)
@@ -217,26 +217,27 @@
     
     
     private CharBuffer getCharContentImpl (boolean assign) throws
IOException {
-       char[] result = null;
-        int length = 0;
+                       StringBuffer sb = new StringBuffer ();
             Reader in = this.openReader (true);
-            int red = 0, rv;
             try {
                IFileStore store =
EFS.getStore(this.file.getLocationURI());
                IFileInfo info = store.fetchInfo();
-                int len = (int) info.getLength();
-                result = new char [len+1];
-                while ((rv=in.read(result,red,len-red))>0 &&
(red=red+rv)<len);
-                length = len;
+               char[] mem = new char[1024];
+               for (;;) {
+                       int len = in.read (mem);
+                       if (len < 0)
+                               break;
+                       sb.append (new String (mem, 0, len));
+               }
             } catch (CoreException e) {
                                throw new IOException("CoreException: "
+ e.getMessage());
                        } finally {
                 in.close();
             }
                        
-        String str = new String(result,0,length);
-       CharBuffer charBuffer = CharBuffer.wrap (str);
-        if (assign) text = str;
-        return charBuffer;
+                       CharBuffer charBuffer = CharBuffer.wrap (sb);
+                       if (assign)
+                               text = sb.toString();
+                       return charBuffer;
     }
  }
Index:
trunk/com.sun.javafx.eclipse.core/src/com/sun/javafx/eclipse/core/build
er/JavaFXBuilder.java
===================================================================
---
trunk/com.sun.javafx.eclipse.core/src/com/sun/javafx/eclipse/core/build
er/JavaFXBuilder.java        (revision 8)
+++
trunk/com.sun.javafx.eclipse.core/src/com/sun/javafx/eclipse/core/build
er/JavaFXBuilder.java        (revision 9)
@@ -218,11 +218,6 @@
                        List<String> options = new ArrayList<String>();
                        //options.add("-Xjcov"); //NOI18N, Make the
compiler store end positions
                        options.add("-XDdisableStringFolding");
//NOI18N
-                       options.add("-encoding"); //NOI18N
-                       String charset = file.getCharset();
-                       if (charset == null)
-                               charset = "UTF-8"; //NOI18N
-                       options.add(charset);
                        File f = new File(srcDir, file.getName());
                            JavafxcTask task = tool.getTask(null, fm,
dl, options, Collections.singleton(jfo));
                        task.parse();