Menu
▾
▴
[Rubyeclipse-commit] SF.net SVN: rubyeclipse: [1920] trunk/org.rubypeople.rdt.refactoring
|
From: <caw...@us...> - 2007-02-06 20:45:03
|
Revision: 1920
http://svn.sourceforge.net/rubyeclipse/?rev=1920&view=rev
Author: cawilliams
Date: 2007-02-06 12:44:08 -0800 (Tue, 06 Feb 2007)
Log Message:
-----------
move FileHelper over to tests plugin. Use core.util.Util to grab a file's content - that way we avoid the off by one per line offset issues in refactoring stuff we do. (on some systems they use more than \n as end of line delimeter, so many offsets that rely on that will be off by one character per line that precedes it)
Modified Paths:
--------------
trunk/org.rubypeople.rdt.refactoring/src/org/rubypeople/rdt/refactoring/documentprovider/WorkspaceDocumentProvider.java
trunk/org.rubypeople.rdt.refactoring.tests/src/org/rubypeople/rdt/refactoring/tests/FilePropertyData.java
trunk/org.rubypeople.rdt.refactoring.tests/src/org/rubypeople/rdt/refactoring/tests/FileTestCase.java
trunk/org.rubypeople.rdt.refactoring.tests/src/org/rubypeople/rdt/refactoring/tests/FileTestData.java
trunk/org.rubypeople.rdt.refactoring.tests/src/org/rubypeople/rdt/refactoring/tests/MultiFileTestData.java
Removed Paths:
-------------
trunk/org.rubypeople.rdt.refactoring/src/org/rubypeople/rdt/refactoring/util/FileHelper.java
Modified: trunk/org.rubypeople.rdt.refactoring/src/org/rubypeople/rdt/refactoring/documentprovider/WorkspaceDocumentProvider.java
===================================================================
--- trunk/org.rubypeople.rdt.refactoring/src/org/rubypeople/rdt/refactoring/documentprovider/WorkspaceDocumentProvider.java 2007-02-06 20:21:30 UTC (rev 1919)
+++ trunk/org.rubypeople.rdt.refactoring/src/org/rubypeople/rdt/refactoring/documentprovider/WorkspaceDocumentProvider.java 2007-02-06 20:44:08 UTC (rev 1920)
@@ -40,7 +40,7 @@
import org.eclipse.core.resources.IWorkspaceRoot;
import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.Path;
-import org.rubypeople.rdt.refactoring.util.FileHelper;
+import org.rubypeople.rdt.internal.core.util.Util;
public class WorkspaceDocumentProvider extends DocumentProvider {
@@ -105,7 +105,7 @@
public String getFileContent(String fileName) {
IFile currentFile = getIFile(fileName);
try {
- return FileHelper.getStreamContent(currentFile.getContents());
+ return new String(Util.getResourceContentsAsCharArray(currentFile));
} catch (CoreException e) {
e.printStackTrace();
}
Deleted: trunk/org.rubypeople.rdt.refactoring/src/org/rubypeople/rdt/refactoring/util/FileHelper.java
===================================================================
--- trunk/org.rubypeople.rdt.refactoring/src/org/rubypeople/rdt/refactoring/util/FileHelper.java 2007-02-06 20:21:30 UTC (rev 1919)
+++ trunk/org.rubypeople.rdt.refactoring/src/org/rubypeople/rdt/refactoring/util/FileHelper.java 2007-02-06 20:44:08 UTC (rev 1920)
@@ -1,92 +0,0 @@
-/***** BEGIN LICENSE BLOCK *****
- * Version: CPL 1.0/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Common Public
- * License Version 1.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.eclipse.org/legal/cpl-v10.html
- *
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- *
- * Copyright (C) 2006 Lukas Felber <lf...@hs...>
- * Copyright (C) 2006 Mirko Stocker <me...@mi...>
- * Copyright (C) 2006 Thomas Corbat <tc...@hs...>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either of the GNU General Public License Version 2 or later (the "GPL"),
- * or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the CPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the CPL, the GPL or the LGPL.
- ***** END LICENSE BLOCK *****/
-
-package org.rubypeople.rdt.refactoring.util;
-
-import java.io.BufferedReader;
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
-import java.io.FileReader;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.io.Reader;
-import java.util.Properties;
-
-
-public class FileHelper {
-
- public static String getFileContent(String fileName, Class resourceProvider) {
- try {
- return getReaderContent(new FileReader(getRealFileName(fileName, resourceProvider)));
- } catch (FileNotFoundException e) {
- e.printStackTrace();
- }
- return null;
- }
-
- private static String getRealFileName(String fileName, Class resourceProvider) {
- assert resourceProvider.getResource(fileName) != null : fileName + " not found." ;
- return resourceProvider.getResource(fileName).getFile();
- }
-
- public static Properties initProperties(String propertyFileName, Class resourceProvider) throws FileNotFoundException, IOException {
- Properties properties = new Properties();
- FileInputStream fileInputStream = null;
- try {
- fileInputStream = new FileInputStream(getRealFileName(propertyFileName, resourceProvider));
- properties.load(fileInputStream);
- } finally {
- if(fileInputStream != null) fileInputStream.close();
- }
- return properties;
- }
-
- public static String getStreamContent(InputStream stream ) {
-
- return getReaderContent(new InputStreamReader(stream));
- }
-
- private static String getReaderContent(Reader reader) {
- try {
- StringBuilder contentBuilder = new StringBuilder();
- BufferedReader bufferedReader = new BufferedReader(reader);
-
- String line;
- while ((line = bufferedReader.readLine()) != null) {
- contentBuilder.append(line).append(Constants.NL);
- }
- return contentBuilder.toString();
- } catch (IOException e) {
- e.printStackTrace();
- }
- return null;
- }
-}
Modified: trunk/org.rubypeople.rdt.refactoring.tests/src/org/rubypeople/rdt/refactoring/tests/FilePropertyData.java
===================================================================
--- trunk/org.rubypeople.rdt.refactoring.tests/src/org/rubypeople/rdt/refactoring/tests/FilePropertyData.java 2007-02-06 20:21:30 UTC (rev 1919)
+++ trunk/org.rubypeople.rdt.refactoring.tests/src/org/rubypeople/rdt/refactoring/tests/FilePropertyData.java 2007-02-06 20:44:08 UTC (rev 1920)
@@ -37,7 +37,7 @@
import java.util.Properties;
import org.rubypeople.rdt.refactoring.documentprovider.DocumentProvider;
-import org.rubypeople.rdt.refactoring.util.FileHelper;
+import org.rubypeople.rdt.refactoring.tests.util.FileHelper;
public abstract class FilePropertyData extends DocumentProvider {
Modified: trunk/org.rubypeople.rdt.refactoring.tests/src/org/rubypeople/rdt/refactoring/tests/FileTestCase.java
===================================================================
--- trunk/org.rubypeople.rdt.refactoring.tests/src/org/rubypeople/rdt/refactoring/tests/FileTestCase.java 2007-02-06 20:21:30 UTC (rev 1919)
+++ trunk/org.rubypeople.rdt.refactoring.tests/src/org/rubypeople/rdt/refactoring/tests/FileTestCase.java 2007-02-06 20:44:08 UTC (rev 1920)
@@ -30,7 +30,7 @@
import org.jruby.ast.RootNode;
import org.rubypeople.rdt.refactoring.core.NodeProvider;
-import org.rubypeople.rdt.refactoring.util.FileHelper;
+import org.rubypeople.rdt.refactoring.tests.util.FileHelper;
public abstract class FileTestCase extends RefactoringTestCase
{
Modified: trunk/org.rubypeople.rdt.refactoring.tests/src/org/rubypeople/rdt/refactoring/tests/FileTestData.java
===================================================================
--- trunk/org.rubypeople.rdt.refactoring.tests/src/org/rubypeople/rdt/refactoring/tests/FileTestData.java 2007-02-06 20:21:30 UTC (rev 1919)
+++ trunk/org.rubypeople.rdt.refactoring.tests/src/org/rubypeople/rdt/refactoring/tests/FileTestData.java 2007-02-06 20:44:08 UTC (rev 1920)
@@ -35,7 +35,7 @@
import java.util.ArrayList;
import java.util.Collection;
-import org.rubypeople.rdt.refactoring.util.FileHelper;
+import org.rubypeople.rdt.refactoring.tests.util.FileHelper;
public class FileTestData extends FilePropertyData {
Modified: trunk/org.rubypeople.rdt.refactoring.tests/src/org/rubypeople/rdt/refactoring/tests/MultiFileTestData.java
===================================================================
--- trunk/org.rubypeople.rdt.refactoring.tests/src/org/rubypeople/rdt/refactoring/tests/MultiFileTestData.java 2007-02-06 20:21:30 UTC (rev 1919)
+++ trunk/org.rubypeople.rdt.refactoring.tests/src/org/rubypeople/rdt/refactoring/tests/MultiFileTestData.java 2007-02-06 20:44:08 UTC (rev 1920)
@@ -38,7 +38,7 @@
import java.util.StringTokenizer;
import org.jruby.ast.Node;
-import org.rubypeople.rdt.refactoring.util.FileHelper;
+import org.rubypeople.rdt.refactoring.tests.util.FileHelper;
public class MultiFileTestData extends FilePropertyData {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
