Menu
▾
▴
[Rubyeclipse-commit] SF.net SVN: rubyeclipse: [2976] trunk/org.rubypeople.rdt.core/src/org/ rubypeople/rdt
|
From: <caw...@us...> - 2007-08-15 14:03:04
|
Revision: 2976
http://rubyeclipse.svn.sourceforge.net/rubyeclipse/?rev=2976&view=rev
Author: cawilliams
Date: 2007-08-15 07:02:58 -0700 (Wed, 15 Aug 2007)
Log Message:
-----------
move Util class out to externally visible package so we can use it's static methods to read files.
Modified Paths:
--------------
trunk/org.rubypeople.rdt.core/src/org/rubypeople/rdt/core/RubyCore.java
trunk/org.rubypeople.rdt.core/src/org/rubypeople/rdt/internal/core/ExternalRubyScript.java
trunk/org.rubypeople.rdt.core/src/org/rubypeople/rdt/internal/core/RubyModelManager.java
trunk/org.rubypeople.rdt.core/src/org/rubypeople/rdt/internal/core/RubyProject.java
trunk/org.rubypeople.rdt.core/src/org/rubypeople/rdt/internal/core/search/indexing/IndexManager.java
trunk/org.rubypeople.rdt.core/src/org/rubypeople/rdt/internal/core/util/Util.java
Added Paths:
-----------
trunk/org.rubypeople.rdt.core/src/org/rubypeople/rdt/core/util/Util.java
Removed Paths:
-------------
trunk/org.rubypeople.rdt.core/src/org/rubypeople/rdt/internal/compiler/util/Util.java
Modified: trunk/org.rubypeople.rdt.core/src/org/rubypeople/rdt/core/RubyCore.java
===================================================================
--- trunk/org.rubypeople.rdt.core/src/org/rubypeople/rdt/core/RubyCore.java 2007-08-15 13:22:17 UTC (rev 2975)
+++ trunk/org.rubypeople.rdt.core/src/org/rubypeople/rdt/core/RubyCore.java 2007-08-15 14:02:58 UTC (rev 2976)
@@ -1066,15 +1066,15 @@
"CPContainer SET - setting container\n" + //$NON-NLS-1$
" container path: " + containerPath + '\n' + //$NON-NLS-1$
" projects: {" +//$NON-NLS-1$
- org.rubypeople.rdt.internal.compiler.util.Util.toString(
+ org.rubypeople.rdt.core.util.Util.toString(
affectedProjects,
- new org.rubypeople.rdt.internal.compiler.util.Util.Displayable(){
+ new org.rubypeople.rdt.core.util.Util.Displayable(){
public String displayString(Object o) { return ((IRubyProject) o).getElementName(); }
}) +
"}\n values: {\n" +//$NON-NLS-1$
- org.rubypeople.rdt.internal.compiler.util.Util.toString(
+ org.rubypeople.rdt.core.util.Util.toString(
respectiveContainers,
- new org.rubypeople.rdt.internal.compiler.util.Util.Displayable(){
+ new org.rubypeople.rdt.core.util.Util.Displayable(){
public String displayString(Object o) {
StringBuffer buffer = new StringBuffer(" "); //$NON-NLS-1$
if (o == null) {
Copied: trunk/org.rubypeople.rdt.core/src/org/rubypeople/rdt/core/util/Util.java (from rev 2724, trunk/org.rubypeople.rdt.core/src/org/rubypeople/rdt/internal/compiler/util/Util.java)
===================================================================
--- trunk/org.rubypeople.rdt.core/src/org/rubypeople/rdt/core/util/Util.java (rev 0)
+++ trunk/org.rubypeople.rdt.core/src/org/rubypeople/rdt/core/util/Util.java 2007-08-15 14:02:58 UTC (rev 2976)
@@ -0,0 +1,209 @@
+package org.rubypeople.rdt.core.util;
+
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.io.UnsupportedEncodingException;
+
+import org.rubypeople.rdt.internal.core.util.CharOperation;
+
+public class Util {
+
+ public interface Displayable {
+ public String displayString(Object o);
+ }
+
+ private static final int DEFAULT_READING_SIZE = 8192;
+ public final static String UTF_8 = "UTF-8"; //$NON-NLS-1$
+ public static String LINE_SEPARATOR = System.getProperty("line.separator"); //$NON-NLS-1$
+
+ public static byte[] getFileByteContent(File file) throws IOException {
+ InputStream stream = null;
+ try {
+ stream = new FileInputStream(file);
+ return getInputStreamAsByteArray(stream, (int) file.length());
+ } finally {
+ if (stream != null) {
+ try {
+ stream.close();
+ } catch (IOException e) {
+ // ignore
+ }
+ }
+ }
+ }
+
+ /**
+ * Converts an array of Objects into String.
+ */
+ public static String toString(Object[] objects, Displayable renderer) {
+ if (objects == null) return ""; //$NON-NLS-1$
+ StringBuffer buffer = new StringBuffer(10);
+ for (int i = 0; i < objects.length; i++){
+ if (i > 0) buffer.append(", "); //$NON-NLS-1$
+ buffer.append(renderer.displayString(objects[i]));
+ }
+ return buffer.toString();
+ }
+
+ /**
+ * Returns the given input stream's contents as a byte array. If a length is
+ * specified (ie. if length != -1), only length bytes are returned.
+ * Otherwise all bytes in the stream are returned. Note this doesn't close
+ * the stream.
+ *
+ * @throws IOException
+ * if a problem occured reading the stream.
+ */
+ public static byte[] getInputStreamAsByteArray(InputStream stream,
+ int length) throws IOException {
+ byte[] contents;
+ if (length == -1) {
+ contents = new byte[0];
+ int contentsLength = 0;
+ int amountRead = -1;
+ do {
+ int amountRequested = Math.max(stream.available(),
+ DEFAULT_READING_SIZE); // read at least 8K
+
+ // resize contents if needed
+ if (contentsLength + amountRequested > contents.length) {
+ System.arraycopy(contents, 0,
+ contents = new byte[contentsLength
+ + amountRequested], 0, contentsLength);
+ }
+
+ // read as many bytes as possible
+ amountRead = stream.read(contents, contentsLength,
+ amountRequested);
+
+ if (amountRead > 0) {
+ // remember length of contents
+ contentsLength += amountRead;
+ }
+ } while (amountRead != -1);
+
+ // resize contents if necessary
+ if (contentsLength < contents.length) {
+ System.arraycopy(contents, 0,
+ contents = new byte[contentsLength], 0, contentsLength);
+ }
+ } else {
+ contents = new byte[length];
+ int len = 0;
+ int readSize = 0;
+ while ((readSize != -1) && (len != length)) {
+ // See PR 1FMS89U
+ // We record first the read size. In this case len is the actual
+ // read size.
+ len += readSize;
+ readSize = stream.read(contents, len, length - len);
+ }
+ }
+
+ return contents;
+ }
+
+ /**
+ * Converts an array of Objects into String.
+ */
+ public static String toString(Object[] objects) {
+ return toString(objects,
+ new Displayable(){
+ public String displayString(Object o) {
+ if (o == null) return "null"; //$NON-NLS-1$
+ return o.toString();
+ }
+ });
+ }
+
+ /**
+ * Returns the contents of the given file as a char array.
+ * When encoding is null, then the platform default one is used
+ * @throws IOException if a problem occured reading the file.
+ */
+ public static char[] getFileCharContent(File file, String encoding) throws IOException {
+ InputStream stream = null;
+ try {
+ stream = new FileInputStream(file);
+ return getInputStreamAsCharArray(stream, (int) file.length(), encoding);
+ } finally {
+ if (stream != null) {
+ try {
+ stream.close();
+ } catch (IOException e) {
+ // ignore
+ }
+ }
+ }
+ }
+
+ /**
+ * Returns the given input stream's contents as a character array.
+ * If a length is specified (ie. if length != -1), this represents the number of bytes in the stream.
+ * Note this doesn't close the stream.
+ * @throws IOException if a problem occured reading the stream.
+ */
+ public static char[] getInputStreamAsCharArray(InputStream stream, int length, String encoding)
+ throws IOException {
+ InputStreamReader reader = null;
+ try {
+ reader = encoding == null
+ ? new InputStreamReader(stream)
+ : new InputStreamReader(stream, encoding);
+ } catch (UnsupportedEncodingException e) {
+ // encoding is not supported
+ reader = new InputStreamReader(stream);
+ }
+ char[] contents;
+ int totalRead = 0;
+ if (length == -1) {
+ contents = CharOperation.NO_CHAR;
+ } else {
+ // length is a good guess when the encoding produces less or the same amount of characters than the file length
+ contents = new char[length]; // best guess
+ }
+
+ while (true) {
+ int amountRequested;
+ if (totalRead < length) {
+ // until known length is met, reuse same array sized eagerly
+ amountRequested = length - totalRead;
+ } else {
+ // reading beyond known length
+ int current = reader.read();
+ if (current < 0) break;
+
+ amountRequested = Math.max(stream.available(), DEFAULT_READING_SIZE); // read at least 8K
+
+ // resize contents if needed
+ if (totalRead + 1 + amountRequested > contents.length)
+ System.arraycopy(contents, 0, contents = new char[totalRead + 1 + amountRequested], 0, totalRead);
+
+ // add current character
+ contents[totalRead++] = (char) current; // coming from totalRead==length
+ }
+ // read as many chars as possible
+ int amountRead = reader.read(contents, totalRead, amountRequested);
+ if (amountRead < 0) break;
+ totalRead += amountRead;
+ }
+
+ // Do not keep first character for UTF-8 BOM encoding
+ int start = 0;
+ if (totalRead > 0 && UTF_8.equals(encoding)) {
+ if (contents[0] == 0xFEFF) { // if BOM char then skip
+ totalRead--;
+ start = 1;
+ }
+ }
+
+ // resize contents if necessary
+ if (totalRead < contents.length)
+ System.arraycopy(contents, start, contents = new char[totalRead], 0, totalRead);
+
+ return contents;
+ }
+}
Deleted: trunk/org.rubypeople.rdt.core/src/org/rubypeople/rdt/internal/compiler/util/Util.java
===================================================================
--- trunk/org.rubypeople.rdt.core/src/org/rubypeople/rdt/internal/compiler/util/Util.java 2007-08-15 13:22:17 UTC (rev 2975)
+++ trunk/org.rubypeople.rdt.core/src/org/rubypeople/rdt/internal/compiler/util/Util.java 2007-08-15 14:02:58 UTC (rev 2976)
@@ -1,209 +0,0 @@
-package org.rubypeople.rdt.internal.compiler.util;
-
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.io.UnsupportedEncodingException;
-
-import org.rubypeople.rdt.internal.core.util.CharOperation;
-
-public class Util {
-
- public interface Displayable {
- public String displayString(Object o);
- }
-
- private static final int DEFAULT_READING_SIZE = 8192;
- public final static String UTF_8 = "UTF-8"; //$NON-NLS-1$
- public static String LINE_SEPARATOR = System.getProperty("line.separator"); //$NON-NLS-1$
-
- public static byte[] getFileByteContent(File file) throws IOException {
- InputStream stream = null;
- try {
- stream = new FileInputStream(file);
- return getInputStreamAsByteArray(stream, (int) file.length());
- } finally {
- if (stream != null) {
- try {
- stream.close();
- } catch (IOException e) {
- // ignore
- }
- }
- }
- }
-
- /**
- * Converts an array of Objects into String.
- */
- public static String toString(Object[] objects, Displayable renderer) {
- if (objects == null) return ""; //$NON-NLS-1$
- StringBuffer buffer = new StringBuffer(10);
- for (int i = 0; i < objects.length; i++){
- if (i > 0) buffer.append(", "); //$NON-NLS-1$
- buffer.append(renderer.displayString(objects[i]));
- }
- return buffer.toString();
- }
-
- /**
- * Returns the given input stream's contents as a byte array. If a length is
- * specified (ie. if length != -1), only length bytes are returned.
- * Otherwise all bytes in the stream are returned. Note this doesn't close
- * the stream.
- *
- * @throws IOException
- * if a problem occured reading the stream.
- */
- public static byte[] getInputStreamAsByteArray(InputStream stream,
- int length) throws IOException {
- byte[] contents;
- if (length == -1) {
- contents = new byte[0];
- int contentsLength = 0;
- int amountRead = -1;
- do {
- int amountRequested = Math.max(stream.available(),
- DEFAULT_READING_SIZE); // read at least 8K
-
- // resize contents if needed
- if (contentsLength + amountRequested > contents.length) {
- System.arraycopy(contents, 0,
- contents = new byte[contentsLength
- + amountRequested], 0, contentsLength);
- }
-
- // read as many bytes as possible
- amountRead = stream.read(contents, contentsLength,
- amountRequested);
-
- if (amountRead > 0) {
- // remember length of contents
- contentsLength += amountRead;
- }
- } while (amountRead != -1);
-
- // resize contents if necessary
- if (contentsLength < contents.length) {
- System.arraycopy(contents, 0,
- contents = new byte[contentsLength], 0, contentsLength);
- }
- } else {
- contents = new byte[length];
- int len = 0;
- int readSize = 0;
- while ((readSize != -1) && (len != length)) {
- // See PR 1FMS89U
- // We record first the read size. In this case len is the actual
- // read size.
- len += readSize;
- readSize = stream.read(contents, len, length - len);
- }
- }
-
- return contents;
- }
-
- /**
- * Converts an array of Objects into String.
- */
- public static String toString(Object[] objects) {
- return toString(objects,
- new Displayable(){
- public String displayString(Object o) {
- if (o == null) return "null"; //$NON-NLS-1$
- return o.toString();
- }
- });
- }
-
- /**
- * Returns the contents of the given file as a char array.
- * When encoding is null, then the platform default one is used
- * @throws IOException if a problem occured reading the file.
- */
- public static char[] getFileCharContent(File file, String encoding) throws IOException {
- InputStream stream = null;
- try {
- stream = new FileInputStream(file);
- return getInputStreamAsCharArray(stream, (int) file.length(), encoding);
- } finally {
- if (stream != null) {
- try {
- stream.close();
- } catch (IOException e) {
- // ignore
- }
- }
- }
- }
-
- /**
- * Returns the given input stream's contents as a character array.
- * If a length is specified (ie. if length != -1), this represents the number of bytes in the stream.
- * Note this doesn't close the stream.
- * @throws IOException if a problem occured reading the stream.
- */
- public static char[] getInputStreamAsCharArray(InputStream stream, int length, String encoding)
- throws IOException {
- InputStreamReader reader = null;
- try {
- reader = encoding == null
- ? new InputStreamReader(stream)
- : new InputStreamReader(stream, encoding);
- } catch (UnsupportedEncodingException e) {
- // encoding is not supported
- reader = new InputStreamReader(stream);
- }
- char[] contents;
- int totalRead = 0;
- if (length == -1) {
- contents = CharOperation.NO_CHAR;
- } else {
- // length is a good guess when the encoding produces less or the same amount of characters than the file length
- contents = new char[length]; // best guess
- }
-
- while (true) {
- int amountRequested;
- if (totalRead < length) {
- // until known length is met, reuse same array sized eagerly
- amountRequested = length - totalRead;
- } else {
- // reading beyond known length
- int current = reader.read();
- if (current < 0) break;
-
- amountRequested = Math.max(stream.available(), DEFAULT_READING_SIZE); // read at least 8K
-
- // resize contents if needed
- if (totalRead + 1 + amountRequested > contents.length)
- System.arraycopy(contents, 0, contents = new char[totalRead + 1 + amountRequested], 0, totalRead);
-
- // add current character
- contents[totalRead++] = (char) current; // coming from totalRead==length
- }
- // read as many chars as possible
- int amountRead = reader.read(contents, totalRead, amountRequested);
- if (amountRead < 0) break;
- totalRead += amountRead;
- }
-
- // Do not keep first character for UTF-8 BOM encoding
- int start = 0;
- if (totalRead > 0 && UTF_8.equals(encoding)) {
- if (contents[0] == 0xFEFF) { // if BOM char then skip
- totalRead--;
- start = 1;
- }
- }
-
- // resize contents if necessary
- if (totalRead < contents.length)
- System.arraycopy(contents, start, contents = new char[totalRead], 0, totalRead);
-
- return contents;
- }
-}
Modified: trunk/org.rubypeople.rdt.core/src/org/rubypeople/rdt/internal/core/ExternalRubyScript.java
===================================================================
--- trunk/org.rubypeople.rdt.core/src/org/rubypeople/rdt/internal/core/ExternalRubyScript.java 2007-08-15 13:22:17 UTC (rev 2975)
+++ trunk/org.rubypeople.rdt.core/src/org/rubypeople/rdt/internal/core/ExternalRubyScript.java 2007-08-15 14:02:58 UTC (rev 2976)
@@ -14,7 +14,7 @@
import org.rubypeople.rdt.core.RubyCore;
import org.rubypeople.rdt.core.RubyModelException;
import org.rubypeople.rdt.core.WorkingCopyOwner;
-import org.rubypeople.rdt.internal.compiler.util.Util;
+import org.rubypeople.rdt.core.util.Util;
import org.rubypeople.rdt.internal.core.buffer.BufferManager;
import org.rubypeople.rdt.internal.core.parser.RubyParser;
Modified: trunk/org.rubypeople.rdt.core/src/org/rubypeople/rdt/internal/core/RubyModelManager.java
===================================================================
--- trunk/org.rubypeople.rdt.core/src/org/rubypeople/rdt/internal/core/RubyModelManager.java 2007-08-15 13:22:17 UTC (rev 2975)
+++ trunk/org.rubypeople.rdt.core/src/org/rubypeople/rdt/internal/core/RubyModelManager.java 2007-08-15 14:02:58 UTC (rev 2976)
@@ -2139,15 +2139,15 @@
"CPContainer SET - missbehaving container\n" + //$NON-NLS-1$
" container path: " + containerPath + '\n' + //$NON-NLS-1$
" projects: {" +//$NON-NLS-1$
- org.rubypeople.rdt.internal.compiler.util.Util.toString(
+ org.rubypeople.rdt.core.util.Util.toString(
projects,
- new org.rubypeople.rdt.internal.compiler.util.Util.Displayable(){
+ new org.rubypeople.rdt.core.util.Util.Displayable(){
public String displayString(Object o) { return ((IRubyProject) o).getElementName(); }
}) +
"}\n values on previous session: {\n" +//$NON-NLS-1$
- org.rubypeople.rdt.internal.compiler.util.Util.toString(
+ org.rubypeople.rdt.core.util.Util.toString(
respectiveContainers,
- new org.rubypeople.rdt.internal.compiler.util.Util.Displayable(){
+ new org.rubypeople.rdt.core.util.Util.Displayable(){
public String displayString(Object o) {
StringBuffer buffer = new StringBuffer(" "); //$NON-NLS-1$
if (o == null) {
@@ -2166,9 +2166,9 @@
}
}) +
"}\n new values: {\n" +//$NON-NLS-1$
- org.rubypeople.rdt.internal.compiler.util.Util.toString(
+ org.rubypeople.rdt.core.util.Util.toString(
respectiveContainers,
- new org.rubypeople.rdt.internal.compiler.util.Util.Displayable(){
+ new org.rubypeople.rdt.core.util.Util.Displayable(){
public String displayString(Object o) {
StringBuffer buffer = new StringBuffer(" "); //$NON-NLS-1$
if (o == null) {
@@ -2209,8 +2209,8 @@
if (CP_RESOLVE_VERBOSE){
Util.verbose(
"CPVariable SET - setting variables\n" + //$NON-NLS-1$
- " variables: " + org.rubypeople.rdt.internal.compiler.util.Util.toString(variableNames) + '\n' +//$NON-NLS-1$
- " values: " + org.rubypeople.rdt.internal.compiler.util.Util.toString(variablePaths)); //$NON-NLS-1$
+ " variables: " + org.rubypeople.rdt.core.util.Util.toString(variableNames) + '\n' +//$NON-NLS-1$
+ " values: " + org.rubypeople.rdt.core.util.Util.toString(variablePaths)); //$NON-NLS-1$
}
if (variablePutIfInitializingWithSameValue(variableNames, variablePaths))
@@ -2315,7 +2315,7 @@
Util.verbose(
"CPVariable SET - updating affected project due to setting variables\n" + //$NON-NLS-1$
" project: " + affectedProject.getElementName() + '\n' + //$NON-NLS-1$
- " variables: " + org.rubypeople.rdt.internal.compiler.util.Util.toString(dbgVariableNames)); //$NON-NLS-1$
+ " variables: " + org.rubypeople.rdt.core.util.Util.toString(dbgVariableNames)); //$NON-NLS-1$
}
affectedProject
@@ -2336,7 +2336,7 @@
if (CP_RESOLVE_VERBOSE){
Util.verbose(
"CPVariable SET - FAILED DUE TO EXCEPTION\n" + //$NON-NLS-1$
- " variables: " + org.rubypeople.rdt.internal.compiler.util.Util.toString(dbgVariableNames), //$NON-NLS-1$
+ " variables: " + org.rubypeople.rdt.core.util.Util.toString(dbgVariableNames), //$NON-NLS-1$
System.err);
e.printStackTrace();
}
Modified: trunk/org.rubypeople.rdt.core/src/org/rubypeople/rdt/internal/core/RubyProject.java
===================================================================
--- trunk/org.rubypeople.rdt.core/src/org/rubypeople/rdt/internal/core/RubyProject.java 2007-08-15 13:22:17 UTC (rev 2975)
+++ trunk/org.rubypeople.rdt.core/src/org/rubypeople/rdt/internal/core/RubyProject.java 2007-08-15 14:02:58 UTC (rev 2976)
@@ -1099,7 +1099,7 @@
if (rscFile.exists()) {
byte[] bytes = Util.getResourceContentsAsByteArray(rscFile);
try {
- property = new String(bytes, org.rubypeople.rdt.internal.compiler.util.Util.UTF_8); // .classpath
+ property = new String(bytes, org.rubypeople.rdt.core.util.Util.UTF_8); // .classpath
// always
// encoded
// with
@@ -1123,12 +1123,12 @@
if (file != null && file.exists()) {
byte[] bytes;
try {
- bytes = org.rubypeople.rdt.internal.compiler.util.Util.getFileByteContent(file);
+ bytes = org.rubypeople.rdt.core.util.Util.getFileByteContent(file);
} catch (IOException e) {
return null;
}
try {
- property = new String(bytes, org.rubypeople.rdt.internal.compiler.util.Util.UTF_8); // .classpath
+ property = new String(bytes, org.rubypeople.rdt.core.util.Util.UTF_8); // .classpath
// always
// encoded
// with
@@ -2092,7 +2092,7 @@
IFile rscFile = this.project.getFile(key);
byte[] bytes = null;
try {
- bytes = value.getBytes(org.rubypeople.rdt.internal.compiler.util.Util.UTF_8); // .loadpath
+ bytes = value.getBytes(org.rubypeople.rdt.core.util.Util.UTF_8); // .loadpath
// always
// encoded
// with
Modified: trunk/org.rubypeople.rdt.core/src/org/rubypeople/rdt/internal/core/search/indexing/IndexManager.java
===================================================================
--- trunk/org.rubypeople.rdt.core/src/org/rubypeople/rdt/internal/core/search/indexing/IndexManager.java 2007-08-15 13:22:17 UTC (rev 2975)
+++ trunk/org.rubypeople.rdt.core/src/org/rubypeople/rdt/internal/core/search/indexing/IndexManager.java 2007-08-15 14:02:58 UTC (rev 2976)
@@ -199,7 +199,7 @@
private char[][] readIndexState(String dirOSString) {
try {
- char[] savedIndexNames = org.rubypeople.rdt.internal.compiler.util.Util.getFileCharContent(savedIndexNamesFile, null);
+ char[] savedIndexNames = org.rubypeople.rdt.core.util.Util.getFileCharContent(savedIndexNamesFile, null);
if (savedIndexNames.length > 0) {
char[][] names = CharOperation.splitOn('\n', savedIndexNames);
if (names.length > 1) {
Modified: trunk/org.rubypeople.rdt.core/src/org/rubypeople/rdt/internal/core/util/Util.java
===================================================================
--- trunk/org.rubypeople.rdt.core/src/org/rubypeople/rdt/internal/core/util/Util.java 2007-08-15 13:22:17 UTC (rev 2975)
+++ trunk/org.rubypeople.rdt.core/src/org/rubypeople/rdt/internal/core/util/Util.java 2007-08-15 14:02:58 UTC (rev 2976)
@@ -612,7 +612,7 @@
throw new RubyModelException(e);
}
try {
- return org.rubypeople.rdt.internal.compiler.util.Util.getInputStreamAsByteArray(stream, -1);
+ return org.rubypeople.rdt.core.util.Util.getInputStreamAsByteArray(stream, -1);
} catch (IOException e) {
throw new RubyModelException(e, IRubyModelStatusConstants.IO_EXCEPTION);
} finally {
@@ -694,7 +694,7 @@
return lineSeparator;
// system line delimiter
- return org.rubypeople.rdt.internal.compiler.util.Util.LINE_SEPARATOR;
+ return org.rubypeople.rdt.core.util.Util.LINE_SEPARATOR;
}
/**
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
