Menu
▾
▴
rubyeclipse-commit — Every CVS commit creates a post to this list.
You can subscribe to this list here.
| 2005 |
Jan
|
Feb
|
Mar
(41) |
Apr
(9) |
May
|
Jun
|
Jul
(39) |
Aug
(38) |
Sep
(135) |
Oct
(220) |
Nov
(75) |
Dec
(74) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2006 |
Jan
(44) |
Feb
(160) |
Mar
(49) |
Apr
(69) |
May
(40) |
Jun
(52) |
Jul
(47) |
Aug
(51) |
Sep
(19) |
Oct
(22) |
Nov
(36) |
Dec
(76) |
| 2007 |
Jan
(154) |
Feb
(165) |
Mar
(186) |
Apr
(143) |
May
(175) |
Jun
(133) |
Jul
(203) |
Aug
(177) |
Sep
(136) |
Oct
|
Nov
|
Dec
|
|
From: David C. <dc...@us...> - 2005-10-16 17:29:29
|
Update of /cvsroot/rubyeclipse/org.rubypeople.rdt.core/src/org/rubypeople/rdt/internal/core/parser In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12800/src/org/rubypeople/rdt/internal/core/parser Modified Files: RubyParser.java Log Message: Index all projects on plugin (eclipse) start. Index: RubyParser.java =================================================================== RCS file: /cvsroot/rubyeclipse/org.rubypeople.rdt.core/src/org/rubypeople/rdt/internal/core/parser/RubyParser.java,v retrieving revision 1.36 retrieving revision 1.37 diff -C2 -d -r1.36 -r1.37 *** RubyParser.java 1 Oct 2005 23:01:01 -0000 1.36 --- RubyParser.java 16 Oct 2005 17:29:21 -0000 1.37 *************** *** 1,10 **** /* ! * Created on Oct 6, 2004 */ package org.rubypeople.rdt.internal.core.parser; import java.io.Reader; import org.eclipse.core.resources.IFile; import org.jruby.ast.Node; import org.jruby.common.NullWarnings; --- 1,21 ---- /* ! * Author: Chris ! * ! * Copyright (c) 2005 RubyPeople. ! * ! * This file is part of the Ruby Development Tools (RDT) plugin for eclipse. ! * RDT is subject to the "Common Public License (CPL) v 1.0". You may not use ! * RDT except in compliance with the License. For further information see ! * org.rubypeople.rdt/rdt.license. */ + package org.rubypeople.rdt.internal.core.parser; + import java.io.InputStream; + import java.io.InputStreamReader; import java.io.Reader; import org.eclipse.core.resources.IFile; + import org.eclipse.core.runtime.CoreException; import org.jruby.ast.Node; import org.jruby.common.NullWarnings; *************** *** 15,18 **** --- 26,30 ---- import org.jruby.parser.RubyParserPool; import org.jruby.parser.RubyParserResult; + import org.rubypeople.rdt.internal.core.builder.IoUtils; /** *************** *** 30,37 **** public RubyParser(IRdtWarnings warnings) { ! this.warnings = warnings; ! this.pool = RubyParserPool.getInstance(); } ! public Node parse(IFile file, Reader content) { DefaultRubyParser parser = null; --- 42,49 ---- public RubyParser(IRdtWarnings warnings) { ! this.warnings = warnings; ! this.pool = RubyParserPool.getInstance(); } ! public Node parse(IFile file, Reader content) { DefaultRubyParser parser = null; *************** *** 39,43 **** try { warnings.setFile(file); ! parser = pool.borrowParser(); parser.setWarnings(warnings); parser.init(new RubyParserConfiguration()); --- 51,55 ---- try { warnings.setFile(file); ! parser = getDefaultRubyParser(); parser.setWarnings(warnings); parser.init(new RubyParserConfiguration()); *************** *** 52,55 **** --- 64,71 ---- } + protected DefaultRubyParser getDefaultRubyParser() { + return pool.borrowParser(); + } + public static void setDebugging(boolean b) { isDebug = b; *************** *** 60,68 **** } ! private static class NullRdtWarnings extends NullWarnings implements IRdtWarnings { public void setFile(IFile file) { } } } \ No newline at end of file --- 76,94 ---- } ! static class NullRdtWarnings extends NullWarnings implements IRdtWarnings { public void setFile(IFile file) { } } + public Node parse(IFile file) throws CoreException { + InputStream contents = null; + try { + contents = file.getContents(); + return parse(file, new InputStreamReader(contents)); + } finally { + IoUtils.closeQuietly(contents); + } + } + } \ No newline at end of file |
|
From: David C. <dc...@us...> - 2005-10-16 17:29:28
|
Update of /cvsroot/rubyeclipse/org.rubypeople.rdt.core.tests/src/org/rubypeople/rdt/internal/core/parser In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12765/src/org/rubypeople/rdt/internal/core/parser Added Files: ShamNode.java TC_RubyParser.java Log Message: Index all projects on plugin (eclipse) start. --- NEW FILE: ShamNode.java --- /* * Author: David Corbin * * Copyright (c) 2005 RubyPeople. * * This file is part of the Ruby Development Tools (RDT) plugin for eclipse. * RDT is subject to the "Common Public License (CPL) v 1.0". You may not use * RDT except in compliance with the License. For further information see * org.rubypeople.rdt/rdt.license. */ package org.rubypeople.rdt.internal.core.parser; import java.util.List; import org.jruby.ast.Node; import org.jruby.ast.visitor.NodeVisitor; public class ShamNode extends Node { public ShamNode() { super(null); } public void accept(NodeVisitor visitor) { } public List childNodes() { return null; } public String toString() { return "ShamNode[]"; } } --- NEW FILE: TC_RubyParser.java --- /* * Author: David Corbin * * Copyright (c) 2005 RubyPeople. * * This file is part of the Ruby Development Tools (RDT) plugin for eclipse. * RDT is subject to the "Common Public License (CPL) v 1.0". You may not use * RDT except in compliance with the License. For further information see * org.rubypeople.rdt/rdt.license. */ package org.rubypeople.rdt.internal.core.parser; import junit.framework.TestCase; import org.jruby.ast.Node; import org.jruby.lexer.yacc.LexerSource; import org.jruby.parser.DefaultRubyParser; import org.jruby.parser.RubyParserResult; import org.rubypeople.eclipse.shams.resources.ShamFile; public class TC_RubyParser extends TestCase { public void testParse() throws Exception { ShamDefaultRubyParser defaultRubyParser = new ShamDefaultRubyParser(); RubyParserResult rubyParserResult = new RubyParserResult(); Node rootNode = new ShamNode(); rubyParserResult.setAST(rootNode); defaultRubyParser.setParserResult(rubyParserResult); TestRubyParser parser = new TestRubyParser(); parser.setDefaultRubyParser(defaultRubyParser); ShamFile file = new ShamFile("testFile.rb"); file.setContents("foobar"); Node node = parser.parse(file); assertEquals(rootNode, node); file.assertContentStreamClosed(); } private static class TestRubyParser extends RubyParser { private DefaultRubyParser defaultRubyParser; protected DefaultRubyParser getDefaultRubyParser() { return defaultRubyParser; } public void setDefaultRubyParser(DefaultRubyParser defaultRubyParser) { this.defaultRubyParser = defaultRubyParser; } } private static class ShamDefaultRubyParser extends DefaultRubyParser { private RubyParserResult result; public RubyParserResult parse(LexerSource source) { return result; } public void setParserResult(RubyParserResult rubyParserResult) { result = rubyParserResult; } } } |
Update of /cvsroot/rubyeclipse/org.rubypeople.rdt.core.tests/src/org/rubypeople/rdt/internal/core/builder In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12765/src/org/rubypeople/rdt/internal/core/builder Modified Files: ShamRubyParser.java TC_IndexUpdater.java TS_CoreBuilder.java TC_RdtCompiler.java Added Files: TC_MassIndexUpdater.java Log Message: Index all projects on plugin (eclipse) start. Index: TS_CoreBuilder.java =================================================================== RCS file: /cvsroot/rubyeclipse/org.rubypeople.rdt.core.tests/src/org/rubypeople/rdt/internal/core/builder/TS_CoreBuilder.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** TS_CoreBuilder.java 1 Oct 2005 23:00:54 -0000 1.1 --- TS_CoreBuilder.java 16 Oct 2005 17:29:16 -0000 1.2 *************** *** 1,2 **** --- 1,12 ---- + /* + * Author: David Corbin + * + * Copyright (c) 2005 RubyPeople. + * + * This file is part of the Ruby Development Tools (RDT) plugin for eclipse. + * RDT is subject to the "Common Public License (CPL) v 1.0". You may not use + * RDT except in compliance with the License. For further information see + * org.rubypeople.rdt/rdt.license. + */ package org.rubypeople.rdt.internal.core.builder; *************** *** 11,14 **** --- 21,26 ---- suite.addTestSuite(TC_TaskCompiler.class); suite.addTestSuite(TC_RdtCompiler.class); + suite.addTestSuite(TC_MassIndexUpdater.class); + suite.addTestSuite(TC_IndexUpdater.class); return suite; Index: ShamRubyParser.java =================================================================== RCS file: /cvsroot/rubyeclipse/org.rubypeople.rdt.core.tests/src/org/rubypeople/rdt/internal/core/builder/ShamRubyParser.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** ShamRubyParser.java 1 Oct 2005 23:00:54 -0000 1.1 --- ShamRubyParser.java 16 Oct 2005 17:29:16 -0000 1.2 *************** *** 1,5 **** --- 1,19 ---- + /* + * Author: David Corbin + * + * Copyright (c) 2005 RubyPeople. + * + * This file is part of the Ruby Development Tools (RDT) plugin for eclipse. + * RDT is subject to the "Common Public License (CPL) v 1.0". You may not use + * RDT except in compliance with the License. For further information see + * org.rubypeople.rdt/rdt.license. + */ package org.rubypeople.rdt.internal.core.builder; import java.io.Reader; + import java.util.HashMap; + import java.util.HashSet; + import java.util.Map; + import java.util.Set; import junit.framework.Assert; *************** *** 12,31 **** public class ShamRubyParser extends RubyParser { ! private IFile fileArg; ! private String contentArg; private SyntaxException syntaxException; ! private Node parseResult; public Node parse(IFile file, Reader reader) { ! fileArg = file; ! contentArg = IoUtils.readAllQuietly(reader); if (syntaxException != null) throw syntaxException; ! return parseResult; } public void assertParsed(IFile expectedFile, String expectedContent) { ! Assert.assertEquals("File", expectedFile, fileArg); ! Assert.assertEquals("Content", expectedContent, contentArg); } --- 26,46 ---- public class ShamRubyParser extends RubyParser { ! private Map parsingsWithContent = new HashMap(); ! private Set parsingsWithoutContent = new HashSet(); private SyntaxException syntaxException; ! private Map parseResults = new HashMap(); public Node parse(IFile file, Reader reader) { ! parsingsWithContent.put(file, IoUtils.readAllQuietly(reader)); if (syntaxException != null) throw syntaxException; ! return (Node) parseResults.get(file); } public void assertParsed(IFile expectedFile, String expectedContent) { ! Assert.assertTrue("File " + expectedFile + " should have been parsed", ! parsingsWithContent.containsKey(expectedFile)); ! Assert.assertEquals("Content", expectedContent, ! parsingsWithContent.get(expectedFile)); } *************** *** 34,40 **** } ! public void setParseResult(Node parseResult) { ! this.parseResult = parseResult; ! } } --- 49,64 ---- } ! public Node parse(IFile file) { ! parsingsWithoutContent.add((file)); ! return (Node) parseResults.get(file); ! } ! ! public void assertParsed(IFile expectedFile) { ! Assert.assertTrue("expected to have parsed "+ expectedFile, ! parsingsWithoutContent.contains(expectedFile)); ! } ! ! public void addParseResult(IFile file, Node node) { ! parseResults.put(file,node); } } Index: TC_RdtCompiler.java =================================================================== RCS file: /cvsroot/rubyeclipse/org.rubypeople.rdt.core.tests/src/org/rubypeople/rdt/internal/core/builder/TC_RdtCompiler.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** TC_RdtCompiler.java 13 Oct 2005 01:00:30 -0000 1.4 --- TC_RdtCompiler.java 16 Oct 2005 17:29:16 -0000 1.5 *************** *** 1,2 **** --- 1,12 ---- + /* + * Author: David Corbin + * + * Copyright (c) 2005 RubyPeople. + * + * This file is part of the Ruby Development Tools (RDT) plugin for eclipse. + * RDT is subject to the "Common Public License (CPL) v 1.0". You may not use + * RDT except in compliance with the License. For further information see + * org.rubypeople.rdt/rdt.license. + */ package org.rubypeople.rdt.internal.core.builder; *************** *** 37,41 **** markerManager = new ShamMarkerManager(); parser = new ShamRubyParser(); ! parser.setParseResult(rootNode); indexUpdater = new MockIndexUpdater(); compiler = new RdtCompiler(markerManager, parser, indexUpdater); --- 47,51 ---- markerManager = new ShamMarkerManager(); parser = new ShamRubyParser(); ! parser.addParseResult(file, rootNode); indexUpdater = new MockIndexUpdater(); compiler = new RdtCompiler(markerManager, parser, indexUpdater); --- NEW FILE: TC_MassIndexUpdater.java --- /* * Author: David Corbin * * Copyright (c) 2005 RubyPeople. * * This file is part of the Ruby Development Tools (RDT) plugin for eclipse. * RDT is subject to the "Common Public License (CPL) v 1.0". You may not use * RDT except in compliance with the License. For further information see * org.rubypeople.rdt/rdt.license. */ package org.rubypeople.rdt.internal.core.builder; import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; import junit.framework.TestCase; import org.eclipse.core.resources.IFile; import org.jruby.ast.Node; import org.rubypeople.eclipse.shams.resources.ShamFile; import org.rubypeople.eclipse.shams.resources.ShamProject; import org.rubypeople.rdt.internal.core.parser.ShamNode; import org.rubypeople.rdt.internal.core.util.ListUtil; public class TC_MassIndexUpdater extends TestCase { public void testUpdateProjects() throws Exception { ShamRubyParser parser = new ShamRubyParser(); ShamIndexUpdater updater = new ShamIndexUpdater(); MassIndexUpdater massUpdater = new MassIndexUpdater(updater, parser); ShamProject project1 = new ShamProject("test1"); ShamProject project2 = new ShamProject("test2"); ShamFile file1 = new ShamFile("file1.rb"); ShamFile file2 = new ShamFile("file2.rb"); ShamFile file3 = new ShamFile("file3.rb"); ShamNode rootNode1 = new ShamNode(); ShamNode rootNode2 = new ShamNode(); ShamNode rootNode3 = new ShamNode(); parser.addParseResult(file1, rootNode1); parser.addParseResult(file2, rootNode2); parser.addParseResult(file3, rootNode3); project1.setResourcesToVisit(ListUtil.create(file1, file2)); project2.setResourcesToVisit(ListUtil.create(file3)); List projects = new ArrayList(); projects.add(project1); projects.add(project2); massUpdater.update(projects); RubySourceFileCollectingVisitor expectedVisitor = new RubySourceFileCollectingVisitor(new ArrayList()); project1.assertAcceptCalled(expectedVisitor, 0); project2.assertAcceptCalled(expectedVisitor, 0); parser.assertParsed(file1); parser.assertParsed(file2); parser.assertParsed(file3); updater.assertUpdated(file1, rootNode1); updater.assertUpdated(file2, rootNode2); updater.assertUpdated(file3, rootNode3); } private static class ShamIndexUpdater extends IndexUpdater { private Map updates = new HashMap(); public ShamIndexUpdater() { super(null); } public void assertUpdated(ShamFile expectedFile, ShamNode expectedNode) { assertTrue("Should have updated " + expectedFile, updates.containsKey(expectedFile)); assertEquals(expectedNode, updates.get(expectedFile)); } public void update(IFile file, Node rootNode) { updates.put(file, rootNode); } } } Index: TC_IndexUpdater.java =================================================================== RCS file: /cvsroot/rubyeclipse/org.rubypeople.rdt.core.tests/src/org/rubypeople/rdt/internal/core/builder/TC_IndexUpdater.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** TC_IndexUpdater.java 13 Oct 2005 01:00:30 -0000 1.1 --- TC_IndexUpdater.java 16 Oct 2005 17:29:16 -0000 1.2 *************** *** 1,2 **** --- 1,12 ---- + /* + * Author: David Corbin + * + * Copyright (c) 2005 RubyPeople. + * + * This file is part of the Ruby Development Tools (RDT) plugin for eclipse. + * RDT is subject to the "Common Public License (CPL) v 1.0". You may not use + * RDT except in compliance with the License. For further information see + * org.rubypeople.rdt/rdt.license. + */ package org.rubypeople.rdt.internal.core.builder; *************** *** 57,61 **** symbolIndex.assertFlushed(file.getFullPath()); ! symbolIndex.assertAdded(new ClassSymbol("Foo"), file, new RdtPosition(1, 2, 10, 18)); } --- 67,71 ---- symbolIndex.assertFlushed(file.getFullPath()); ! symbolIndex.assertAdded(new ClassSymbol("Foo"), file, new RdtPosition(1, 2, 14, 15)); } *************** *** 66,70 **** symbolIndex.assertFlushed(file.getFullPath()); ! symbolIndex.assertAdded(new ClassSymbol("Foo::Bar"), file, new RdtPosition(1, 2, 10, 23)); } --- 76,80 ---- symbolIndex.assertFlushed(file.getFullPath()); ! symbolIndex.assertAdded(new ClassSymbol("Foo::Bar"), file, new RdtPosition(1, 2, 16, 20)); } *************** *** 75,79 **** symbolIndex.assertFlushed(file.getFullPath()); ! symbolIndex.assertAdded(new ClassSymbol("X::Foo::Bar"), file, new RdtPosition(1, 2, 10, 26)); } --- 85,89 ---- symbolIndex.assertFlushed(file.getFullPath()); ! symbolIndex.assertAdded(new ClassSymbol("X::Foo::Bar"), file, new RdtPosition(1, 2, 19, 23)); } *************** *** 84,88 **** symbolIndex.assertFlushed(file.getFullPath()); ! symbolIndex.assertAdded(new ClassSymbol("Foo::Bar"), file, new RdtPosition(2, 3, 21, 29)); } --- 94,98 ---- symbolIndex.assertFlushed(file.getFullPath()); ! symbolIndex.assertAdded(new ClassSymbol("Foo::Bar"), file, new RdtPosition(2, 3, 25, 26)); } |
|
From: David C. <dc...@us...> - 2005-10-13 23:56:27
|
Update of /cvsroot/rubyeclipse/org.rubypeople.rdt.core/src/org/rubypeople/rdt/internal/core/symbols In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3445/src/org/rubypeople/rdt/internal/core/symbols Modified Files: Location.java SymbolIndex.java ClassSymbol.java Log Message: Added license comment to a number of files. Index: ClassSymbol.java =================================================================== RCS file: /cvsroot/rubyeclipse/org.rubypeople.rdt.core/src/org/rubypeople/rdt/internal/core/symbols/ClassSymbol.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** ClassSymbol.java 9 Oct 2005 22:14:06 -0000 1.2 --- ClassSymbol.java 13 Oct 2005 23:56:07 -0000 1.3 *************** *** 1,2 **** --- 1,13 ---- + /* + ?* Author: David Corbin + ?* + ?* Copyright (c) 2005 RubyPeople. + ?* + ?* This file is part of the Ruby Development Tools (RDT) plugin for eclipse. + * RDT is subject to the "Common Public License (CPL) v 1.0". You may not use + * RDT except in compliance with the License. For further information see + * org.rubypeople.rdt/rdt.license. + ?*/ + package org.rubypeople.rdt.internal.core.symbols; Index: Location.java =================================================================== RCS file: /cvsroot/rubyeclipse/org.rubypeople.rdt.core/src/org/rubypeople/rdt/internal/core/symbols/Location.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** Location.java 13 Oct 2005 01:00:35 -0000 1.2 --- Location.java 13 Oct 2005 23:56:07 -0000 1.3 *************** *** 1,2 **** --- 1,13 ---- + /* + ?* Author: David Corbin + ?* + ?* Copyright (c) 2005 RubyPeople. + ?* + ?* This file is part of the Ruby Development Tools (RDT) plugin for eclipse. + * RDT is subject to the "Common Public License (CPL) v 1.0". You may not use + * RDT except in compliance with the License. For further information see + * org.rubypeople.rdt/rdt.license. + ?*/ + package org.rubypeople.rdt.internal.core.symbols; Index: SymbolIndex.java =================================================================== RCS file: /cvsroot/rubyeclipse/org.rubypeople.rdt.core/src/org/rubypeople/rdt/internal/core/symbols/SymbolIndex.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** SymbolIndex.java 13 Oct 2005 01:00:35 -0000 1.2 --- SymbolIndex.java 13 Oct 2005 23:56:07 -0000 1.3 *************** *** 1,2 **** --- 1,13 ---- + /* + ?* Author: David Corbin + ?* + ?* Copyright (c) 2005 RubyPeople. + ?* + ?* This file is part of the Ruby Development Tools (RDT) plugin for eclipse. + * RDT is subject to the "Common Public License (CPL) v 1.0". You may not use + * RDT except in compliance with the License. For further information see + * org.rubypeople.rdt/rdt.license. + ?*/ + package org.rubypeople.rdt.internal.core.symbols; |
|
From: David C. <dc...@us...> - 2005-10-13 23:56:27
|
Update of /cvsroot/rubyeclipse/org.rubypeople.rdt.core/src/org/rubypeople/rdt/internal/core/builder In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3445/src/org/rubypeople/rdt/internal/core/builder Modified Files: RubyBuilder.java RubyCompiler.java RdtCompiler.java IndexUpdater.java SingleFileCompiler.java IFileFinder.java TaskCompiler.java MarkerManager.java ProjectFileFinder.java IoUtils.java IMarkerManager.java IncrementalFileFinder.java Log Message: Added license comment to a number of files. Index: IFileFinder.java =================================================================== RCS file: /cvsroot/rubyeclipse/org.rubypeople.rdt.core/src/org/rubypeople/rdt/internal/core/builder/IFileFinder.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** IFileFinder.java 1 Oct 2005 23:01:00 -0000 1.1 --- IFileFinder.java 13 Oct 2005 23:56:06 -0000 1.2 *************** *** 1,5 **** ! /** ! * ! */ package org.rubypeople.rdt.internal.core.builder; --- 1,13 ---- ! /* ! ?* Author: David Corbin ! ?* ! ?* Copyright (c) 2005 RubyPeople. ! ?* ! ?* This file is part of the Ruby Development Tools (RDT) plugin for eclipse. ! * RDT is subject to the "Common Public License (CPL) v 1.0". You may not use ! * RDT except in compliance with the License. For further information see ! * org.rubypeople.rdt/rdt.license. ! ?*/ ! package org.rubypeople.rdt.internal.core.builder; Index: RubyBuilder.java =================================================================== RCS file: /cvsroot/rubyeclipse/org.rubypeople.rdt.core/src/org/rubypeople/rdt/internal/core/builder/RubyBuilder.java,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** RubyBuilder.java 1 Oct 2005 23:01:00 -0000 1.13 --- RubyBuilder.java 13 Oct 2005 23:56:06 -0000 1.14 *************** *** 1,2 **** --- 1,13 ---- + /* + ?* Author: Chris, David Corbin + ?* + ?* Copyright (c) 2005 RubyPeople. + ?* + ?* This file is part of the Ruby Development Tools (RDT) plugin for eclipse. + * RDT is subject to the "Common Public License (CPL) v 1.0". You may not use + * RDT except in compliance with the License. For further information see + * org.rubypeople.rdt/rdt.license. + ?*/ + package org.rubypeople.rdt.internal.core.builder; *************** *** 11,18 **** import org.rubypeople.rdt.core.RubyCore; ! /** ! * @author Chris ! * ! */ public class RubyBuilder extends IncrementalProjectBuilder { --- 22,26 ---- import org.rubypeople.rdt.core.RubyCore; ! public class RubyBuilder extends IncrementalProjectBuilder { Index: SingleFileCompiler.java =================================================================== RCS file: /cvsroot/rubyeclipse/org.rubypeople.rdt.core/src/org/rubypeople/rdt/internal/core/builder/SingleFileCompiler.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** SingleFileCompiler.java 1 Oct 2005 23:01:00 -0000 1.1 --- SingleFileCompiler.java 13 Oct 2005 23:56:06 -0000 1.2 *************** *** 1,5 **** ! /** ! * ! */ package org.rubypeople.rdt.internal.core.builder; --- 1,14 ---- ! /* ! ?* Author: David Corbin ! ?* ! ?* Copyright (c) 2005 RubyPeople. ! ?* ! ?* This file is part of the Ruby Development Tools (RDT) plugin for eclipse. ! * RDT is subject to the "Common Public License (CPL) v 1.0". You may not use ! * RDT except in compliance with the License. For further information see ! * org.rubypeople.rdt/rdt.license. ! ?*/ ! ! package org.rubypeople.rdt.internal.core.builder; Index: MarkerManager.java =================================================================== RCS file: /cvsroot/rubyeclipse/org.rubypeople.rdt.core/src/org/rubypeople/rdt/internal/core/builder/MarkerManager.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** MarkerManager.java 1 Oct 2005 23:01:00 -0000 1.1 --- MarkerManager.java 13 Oct 2005 23:56:07 -0000 1.2 *************** *** 1,2 **** --- 1,13 ---- + /* + ?* Author: David Corbin + ?* + ?* Copyright (c) 2005 RubyPeople. + ?* + ?* This file is part of the Ruby Development Tools (RDT) plugin for eclipse. + * RDT is subject to the "Common Public License (CPL) v 1.0". You may not use + * RDT except in compliance with the License. For further information see + * org.rubypeople.rdt/rdt.license. + ?*/ + package org.rubypeople.rdt.internal.core.builder; Index: TaskCompiler.java =================================================================== RCS file: /cvsroot/rubyeclipse/org.rubypeople.rdt.core/src/org/rubypeople/rdt/internal/core/builder/TaskCompiler.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** TaskCompiler.java 1 Oct 2005 23:01:00 -0000 1.1 --- TaskCompiler.java 13 Oct 2005 23:56:06 -0000 1.2 *************** *** 1,5 **** ! /** ! * ! */ package org.rubypeople.rdt.internal.core.builder; --- 1,14 ---- ! /* ! ?* Author: David Corbin ! ?* ! ?* Copyright (c) 2005 RubyPeople. ! ?* ! ?* This file is part of the Ruby Development Tools (RDT) plugin for eclipse. ! * RDT is subject to the "Common Public License (CPL) v 1.0". You may not use ! * RDT except in compliance with the License. For further information see ! * org.rubypeople.rdt/rdt.license. ! ?*/ ! ! package org.rubypeople.rdt.internal.core.builder; Index: IMarkerManager.java =================================================================== RCS file: /cvsroot/rubyeclipse/org.rubypeople.rdt.core/src/org/rubypeople/rdt/internal/core/builder/IMarkerManager.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** IMarkerManager.java 1 Oct 2005 23:01:00 -0000 1.1 --- IMarkerManager.java 13 Oct 2005 23:56:07 -0000 1.2 *************** *** 1,2 **** --- 1,13 ---- + /* + ?* Author: David Corbin + ?* + ?* Copyright (c) 2005 RubyPeople. + ?* + ?* This file is part of the Ruby Development Tools (RDT) plugin for eclipse. + * RDT is subject to the "Common Public License (CPL) v 1.0". You may not use + * RDT except in compliance with the License. For further information see + * org.rubypeople.rdt/rdt.license. + ?*/ + package org.rubypeople.rdt.internal.core.builder; Index: ProjectFileFinder.java =================================================================== RCS file: /cvsroot/rubyeclipse/org.rubypeople.rdt.core/src/org/rubypeople/rdt/internal/core/builder/ProjectFileFinder.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** ProjectFileFinder.java 1 Oct 2005 23:01:00 -0000 1.1 --- ProjectFileFinder.java 13 Oct 2005 23:56:07 -0000 1.2 *************** *** 1,5 **** ! /** ! * ! */ package org.rubypeople.rdt.internal.core.builder; --- 1,14 ---- ! /* ! ?* Author: David Corbin ! ?* ! ?* Copyright (c) 2005 RubyPeople. ! ?* ! ?* This file is part of the Ruby Development Tools (RDT) plugin for eclipse. ! * RDT is subject to the "Common Public License (CPL) v 1.0". You may not use ! * RDT except in compliance with the License. For further information see ! * org.rubypeople.rdt/rdt.license. ! ?*/ ! ! package org.rubypeople.rdt.internal.core.builder; Index: RdtCompiler.java =================================================================== RCS file: /cvsroot/rubyeclipse/org.rubypeople.rdt.core/src/org/rubypeople/rdt/internal/core/builder/RdtCompiler.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** RdtCompiler.java 13 Oct 2005 01:00:35 -0000 1.2 --- RdtCompiler.java 13 Oct 2005 23:56:06 -0000 1.3 *************** *** 1,5 **** ! /** ! * ! */ package org.rubypeople.rdt.internal.core.builder; --- 1,14 ---- ! /* ! ?* Author: David Corbin ! ?* ! ?* Copyright (c) 2005 RubyPeople. ! ?* ! ?* This file is part of the Ruby Development Tools (RDT) plugin for eclipse. ! * RDT is subject to the "Common Public License (CPL) v 1.0". You may not use ! * RDT except in compliance with the License. For further information see ! * org.rubypeople.rdt/rdt.license. ! ?*/ ! ! package org.rubypeople.rdt.internal.core.builder; Index: RubyCompiler.java =================================================================== RCS file: /cvsroot/rubyeclipse/org.rubypeople.rdt.core/src/org/rubypeople/rdt/internal/core/builder/RubyCompiler.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** RubyCompiler.java 1 Oct 2005 23:01:00 -0000 1.1 --- RubyCompiler.java 13 Oct 2005 23:56:06 -0000 1.2 *************** *** 1,5 **** ! /** ! * ! */ package org.rubypeople.rdt.internal.core.builder; --- 1,13 ---- ! /* ! ?* Author: Chris, David Corbin ! ?* ! ?* Copyright (c) 2005 RubyPeople. ! ?* ! ?* This file is part of the Ruby Development Tools (RDT) plugin for eclipse. ! * RDT is subject to the "Common Public License (CPL) v 1.0". You may not use ! * RDT except in compliance with the License. For further information see ! * org.rubypeople.rdt/rdt.license. ! ?*/ ! package org.rubypeople.rdt.internal.core.builder; Index: IoUtils.java =================================================================== RCS file: /cvsroot/rubyeclipse/org.rubypeople.rdt.core/src/org/rubypeople/rdt/internal/core/builder/IoUtils.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** IoUtils.java 1 Oct 2005 23:01:00 -0000 1.1 --- IoUtils.java 13 Oct 2005 23:56:07 -0000 1.2 *************** *** 1,2 **** --- 1,13 ---- + /* + ?* Author: David Corbin + ?* + ?* Copyright (c) 2005 RubyPeople. + ?* + ?* This file is part of the Ruby Development Tools (RDT) plugin for eclipse. + * RDT is subject to the "Common Public License (CPL) v 1.0". You may not use + * RDT except in compliance with the License. For further information see + * org.rubypeople.rdt/rdt.license. + ?*/ + package org.rubypeople.rdt.internal.core.builder; Index: IndexUpdater.java =================================================================== RCS file: /cvsroot/rubyeclipse/org.rubypeople.rdt.core/src/org/rubypeople/rdt/internal/core/builder/IndexUpdater.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** IndexUpdater.java 13 Oct 2005 01:00:35 -0000 1.3 --- IndexUpdater.java 13 Oct 2005 23:56:06 -0000 1.4 *************** *** 1,2 **** --- 1,13 ---- + /* + ?* Author: David Corbin + ?* + ?* Copyright (c) 2005 RubyPeople. + ?* + ?* This file is part of the Ruby Development Tools (RDT) plugin for eclipse. + * RDT is subject to the "Common Public License (CPL) v 1.0". You may not use + * RDT except in compliance with the License. For further information see + * org.rubypeople.rdt/rdt.license. + ?*/ + package org.rubypeople.rdt.internal.core.builder; *************** *** 14,18 **** public class IndexUpdater { - // TODO Build Index on startup private final SymbolIndex index; private Stack scopeStack = new Stack(); --- 25,28 ---- Index: IncrementalFileFinder.java =================================================================== RCS file: /cvsroot/rubyeclipse/org.rubypeople.rdt.core/src/org/rubypeople/rdt/internal/core/builder/IncrementalFileFinder.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** IncrementalFileFinder.java 1 Oct 2005 23:01:00 -0000 1.1 --- IncrementalFileFinder.java 13 Oct 2005 23:56:07 -0000 1.2 *************** *** 1,5 **** ! /** ! * ! */ package org.rubypeople.rdt.internal.core.builder; --- 1,14 ---- ! /* ! ?* Author: David Corbin ! ?* ! ?* Copyright (c) 2005 RubyPeople. ! ?* ! ?* This file is part of the Ruby Development Tools (RDT) plugin for eclipse. ! * RDT is subject to the "Common Public License (CPL) v 1.0". You may not use ! * RDT except in compliance with the License. For further information see ! * org.rubypeople.rdt/rdt.license. ! ?*/ ! ! package org.rubypeople.rdt.internal.core.builder; |
|
From: David C. <dc...@us...> - 2005-10-13 23:56:10
|
Update of /cvsroot/rubyeclipse/org.rubypeople.rdt.core.tests/src/org/rubypeople/rdt/internal/core/symbols In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3419/src/org/rubypeople/rdt/internal/core/symbols Modified Files: TC_SymbolIndex.java TC_Location.java TS_CoreSymbols.java TC_ClassSymbol.java Log Message: Added license comment to a number of files. Index: TC_ClassSymbol.java =================================================================== RCS file: /cvsroot/rubyeclipse/org.rubypeople.rdt.core.tests/src/org/rubypeople/rdt/internal/core/symbols/TC_ClassSymbol.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** TC_ClassSymbol.java 1 Oct 2005 23:00:54 -0000 1.1 --- TC_ClassSymbol.java 13 Oct 2005 23:56:02 -0000 1.2 *************** *** 1,2 **** --- 1,13 ---- + /* + ?* Author: David Corbin + ?* + ?* Copyright (c) 2005 RubyPeople. + ?* + ?* This file is part of the Ruby Development Tools (RDT) plugin for eclipse. + * RDT is subject to the "Common Public License (CPL) v 1.0". You may not use + * RDT except in compliance with the License. For further information see + * org.rubypeople.rdt/rdt.license. + ?*/ + package org.rubypeople.rdt.internal.core.symbols; Index: TC_Location.java =================================================================== RCS file: /cvsroot/rubyeclipse/org.rubypeople.rdt.core.tests/src/org/rubypeople/rdt/internal/core/symbols/TC_Location.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** TC_Location.java 13 Oct 2005 01:00:30 -0000 1.2 --- TC_Location.java 13 Oct 2005 23:56:02 -0000 1.3 *************** *** 1,2 **** --- 1,13 ---- + /* + ?* Author: David Corbin + ?* + ?* Copyright (c) 2005 RubyPeople. + ?* + ?* This file is part of the Ruby Development Tools (RDT) plugin for eclipse. + * RDT is subject to the "Common Public License (CPL) v 1.0". You may not use + * RDT except in compliance with the License. For further information see + * org.rubypeople.rdt/rdt.license. + ?*/ + package org.rubypeople.rdt.internal.core.symbols; Index: TC_SymbolIndex.java =================================================================== RCS file: /cvsroot/rubyeclipse/org.rubypeople.rdt.core.tests/src/org/rubypeople/rdt/internal/core/symbols/TC_SymbolIndex.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** TC_SymbolIndex.java 13 Oct 2005 01:00:30 -0000 1.2 --- TC_SymbolIndex.java 13 Oct 2005 23:56:02 -0000 1.3 *************** *** 1,2 **** --- 1,13 ---- + /* + ?* Author: David Corbin + ?* + ?* Copyright (c) 2005 RubyPeople. + ?* + ?* This file is part of the Ruby Development Tools (RDT) plugin for eclipse. + * RDT is subject to the "Common Public License (CPL) v 1.0". You may not use + * RDT except in compliance with the License. For further information see + * org.rubypeople.rdt/rdt.license. + ?*/ + package org.rubypeople.rdt.internal.core.symbols; Index: TS_CoreSymbols.java =================================================================== RCS file: /cvsroot/rubyeclipse/org.rubypeople.rdt.core.tests/src/org/rubypeople/rdt/internal/core/symbols/TS_CoreSymbols.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** TS_CoreSymbols.java 1 Oct 2005 23:00:54 -0000 1.1 --- TS_CoreSymbols.java 13 Oct 2005 23:56:02 -0000 1.2 *************** *** 1,2 **** --- 1,13 ---- + /* + ?* Author: David Corbin + ?* + ?* Copyright (c) 2005 RubyPeople. + ?* + ?* This file is part of the Ruby Development Tools (RDT) plugin for eclipse. + * RDT is subject to the "Common Public License (CPL) v 1.0". You may not use + * RDT except in compliance with the License. For further information see + * org.rubypeople.rdt/rdt.license. + ?*/ + package org.rubypeople.rdt.internal.core.symbols; |
|
From: David C. <dc...@us...> - 2005-10-13 23:56:07
|
Update of /cvsroot/rubyeclipse/org.rubypeople.rdt.ui/src/org/rubypeople/rdt/internal/ui/util In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3402/src/org/rubypeople/rdt/internal/ui/util Modified Files: LineBasedEditorOpener.java EditorOpener.java PositionBasedEditorOpener.java Log Message: Added license comment to a number of files. Index: PositionBasedEditorOpener.java =================================================================== RCS file: /cvsroot/rubyeclipse/org.rubypeople.rdt.ui/src/org/rubypeople/rdt/internal/ui/util/PositionBasedEditorOpener.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** PositionBasedEditorOpener.java 13 Oct 2005 01:00:21 -0000 1.1 --- PositionBasedEditorOpener.java 13 Oct 2005 23:55:59 -0000 1.2 *************** *** 1,2 **** --- 1,13 ---- + /* + ?* Author: David Corbin + ?* + ?* Copyright (c) 2005 RubyPeople. + ?* + ?* This file is part of the Ruby Development Tools (RDT) plugin for eclipse. + * RDT is subject to the "Common Public License (CPL) v 1.0". You may not use + * RDT except in compliance with the License. For further information see + * org.rubypeople.rdt/rdt.license. + ?*/ + package org.rubypeople.rdt.internal.ui.util; Index: EditorOpener.java =================================================================== RCS file: /cvsroot/rubyeclipse/org.rubypeople.rdt.ui/src/org/rubypeople/rdt/internal/ui/util/EditorOpener.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** EditorOpener.java 13 Oct 2005 01:00:21 -0000 1.1 --- EditorOpener.java 13 Oct 2005 23:55:59 -0000 1.2 *************** *** 1,5 **** ! /** ! * ! */ package org.rubypeople.rdt.internal.ui.util; --- 1,12 ---- ! /* ! ?* Author: David Corbin ! ?* ! ?* Copyright (c) 2005 RubyPeople. ! ?* ! ?* This file is part of the Ruby Development Tools (RDT) plugin for eclipse. ! * RDT is subject to the "Common Public License (CPL) v 1.0". You may not use ! * RDT except in compliance with the License. For further information see ! * org.rubypeople.rdt/rdt.license. ! ?*/ package org.rubypeople.rdt.internal.ui.util; Index: LineBasedEditorOpener.java =================================================================== RCS file: /cvsroot/rubyeclipse/org.rubypeople.rdt.ui/src/org/rubypeople/rdt/internal/ui/util/LineBasedEditorOpener.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** LineBasedEditorOpener.java 13 Oct 2005 01:00:21 -0000 1.1 --- LineBasedEditorOpener.java 13 Oct 2005 23:55:59 -0000 1.2 *************** *** 1,2 **** --- 1,13 ---- + /* + ?* Author: David Corbin + ?* + ?* Copyright (c) 2005 RubyPeople. + ?* + ?* This file is part of the Ruby Development Tools (RDT) plugin for eclipse. + * RDT is subject to the "Common Public License (CPL) v 1.0". You may not use + * RDT except in compliance with the License. For further information see + * org.rubypeople.rdt/rdt.license. + ?*/ + package org.rubypeople.rdt.internal.ui.util; |
|
From: Markus B. <mba...@us...> - 2005-10-13 19:43:38
|
Update of /cvsroot/rubyeclipse/org.rubypeople.rdt.launching/ruby In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12202/ruby Modified Files: eclipseDebug.rb Log Message: replaced localhost with 127.0.0.1 in TCPServer.new due to bug in OSX 10.4 Index: eclipseDebug.rb =================================================================== RCS file: /cvsroot/rubyeclipse/org.rubypeople.rdt.launching/ruby/eclipseDebug.rb,v retrieving revision 1.16 retrieving revision 1.17 diff -C2 -d -r1.16 -r1.17 *** eclipseDebug.rb 9 Oct 2005 21:22:28 -0000 1.16 --- eclipseDebug.rb 13 Oct 2005 19:43:30 -0000 1.17 *************** *** 1151,1155 **** end ! server = TCPServer.new('localhost', ECLIPSE_LISTEN_PORT) puts "ruby #{RUBY_VERSION} debugger listens on port #{ECLIPSE_LISTEN_PORT}" $stdout.flush --- 1151,1156 ---- end ! # use 127.0.0.1 instead of localhost because OSX 10.4 ! server = TCPServer.new('127.0.0.1', ECLIPSE_LISTEN_PORT) puts "ruby #{RUBY_VERSION} debugger listens on port #{ECLIPSE_LISTEN_PORT}" $stdout.flush |
|
From: Markus B. <mba...@us...> - 2005-10-13 19:00:07
|
Update of /cvsroot/rubyeclipse/org.rubypeople.rdt.launching/src/org/rubypeople/rdt/internal/launching In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30517/src/org/rubypeople/rdt/internal/launching Modified Files: RdtLaunchingPlugin.java Log Message: removed quotation of paths (include and ruby file) on windows. seems to be unnecessary due to new exec() call Index: RdtLaunchingPlugin.java =================================================================== RCS file: /cvsroot/rubyeclipse/org.rubypeople.rdt.launching/src/org/rubypeople/rdt/internal/launching/RdtLaunchingPlugin.java,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** RdtLaunchingPlugin.java 2 Mar 2005 00:53:26 -0000 1.7 --- RdtLaunchingPlugin.java 13 Oct 2005 18:59:53 -0000 1.8 *************** *** 17,21 **** aPath = aPath.substring(1) ; } - aPath = "\"" + aPath + "\""; } --- 17,20 ---- |
|
From: Markus B. <mba...@us...> - 2005-10-13 19:00:04
|
Update of /cvsroot/rubyeclipse/org.rubypeople.rdt.launching.tests/src/org/rubypeople/rdt/internal/launching In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30498/src/org/rubypeople/rdt/internal/launching Modified Files: TC_RunnerLaunching.java Log Message: removed quotation of paths (include and ruby file) on windows. seems to be unnecessary due to new exec() call Index: TC_RunnerLaunching.java =================================================================== RCS file: /cvsroot/rubyeclipse/org.rubypeople.rdt.launching.tests/src/org/rubypeople/rdt/internal/launching/TC_RunnerLaunching.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** TC_RunnerLaunching.java 11 Oct 2005 21:13:08 -0000 1.3 --- TC_RunnerLaunching.java 13 Oct 2005 18:59:46 -0000 1.4 *************** *** 15,19 **** import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.core.runtime.Path; - import org.eclipse.core.runtime.Platform; import org.eclipse.debug.core.DebugPlugin; import org.eclipse.debug.core.ILaunch; --- 15,18 ---- *************** *** 47,52 **** commandLine.add("-reclipseDebug"); } ! // The include paths and the executed ruby file is quoted on windows ! String pathQuotation = Platform.getOS().equals(Platform.OS_WIN32) ? "\"" : "" ; if (debug) { String dirOfRubyDebuggerFile = DebuggerRunner.getDirectoryOfRubyDebuggerFile().replace('/', File.separatorChar) ; --- 46,50 ---- commandLine.add("-reclipseDebug"); } ! // The include paths and the executed ruby file is quoted on windows if (debug) { String dirOfRubyDebuggerFile = DebuggerRunner.getDirectoryOfRubyDebuggerFile().replace('/', File.separatorChar) ; *************** *** 55,68 **** } commandLine.add("-I"); ! commandLine.add(pathQuotation + dirOfRubyDebuggerFile + pathQuotation); } commandLine.add("-I"); ! commandLine.add( pathQuotation + project.getLocation().toOSString() + pathQuotation); commandLine.add("-I"); ! commandLine.add(pathQuotation + project.getLocation().toOSString() + File.separator + RUBY_LIB_DIR + pathQuotation) ; commandLine.addAll(Arrays.asList(INTERPRETER_ARGUMENTS.split("\\s+"))); commandLine.add("--"); // use always forward slashes for path relative to project dir ! commandLine.add(pathQuotation + project.getLocation().toOSString() + "/" + RUBY_LIB_DIR + "/" + RUBY_FILE_NAME + pathQuotation); commandLine.add(PROGRAM_ARGUMENTS); return commandLine; --- 53,66 ---- } commandLine.add("-I"); ! commandLine.add(dirOfRubyDebuggerFile); } commandLine.add("-I"); ! commandLine.add(project.getLocation().toOSString()); commandLine.add("-I"); ! commandLine.add(project.getLocation().toOSString() + File.separator + RUBY_LIB_DIR ) ; commandLine.addAll(Arrays.asList(INTERPRETER_ARGUMENTS.split("\\s+"))); commandLine.add("--"); // use always forward slashes for path relative to project dir ! commandLine.add(project.getLocation().toOSString() + "/" + RUBY_LIB_DIR + "/" + RUBY_FILE_NAME ); commandLine.add(PROGRAM_ARGUMENTS); return commandLine; |
|
From: David C. <dc...@us...> - 2005-10-13 01:00:45
|
Update of /cvsroot/rubyeclipse/org.rubypeople.rdt.core/src/org/rubypeople/rdt/internal/core/symbols In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3497/src/org/rubypeople/rdt/internal/core/symbols Modified Files: SymbolIndex.java Location.java Log Message: Partial support for opening classes from Test::Unit failure. Index: Location.java =================================================================== RCS file: /cvsroot/rubyeclipse/org.rubypeople.rdt.core/src/org/rubypeople/rdt/internal/core/symbols/Location.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** Location.java 1 Oct 2005 23:01:01 -0000 1.1 --- Location.java 13 Oct 2005 01:00:35 -0000 1.2 *************** *** 1,20 **** package org.rubypeople.rdt.internal.core.symbols; import org.eclipse.core.runtime.Path; public class Location { ! private final Path sourcePath; ! private final int line; ! private final int column; ! public Location(Path sourcePath, int line, int column) { this.sourcePath = sourcePath; ! this.line = line; ! this.column = column; } public String toString() { ! return sourcePath+": " + line + "("+column+")"; } --- 1,20 ---- package org.rubypeople.rdt.internal.core.symbols; + import org.eclipse.core.runtime.IPath; import org.eclipse.core.runtime.Path; + import org.jruby.lexer.yacc.ISourcePosition; public class Location { ! private final IPath sourcePath; ! private final ISourcePosition position; ! public Location(IPath sourcePath, ISourcePosition position) { this.sourcePath = sourcePath; ! this.position = position; } public String toString() { ! return sourcePath+": " + position; } *************** *** 22,24 **** --- 22,45 ---- return sourcePath.equals(path); } + + public boolean equals(Object obj) { + if (!(obj instanceof Location)) + return false; + Location that = (Location) obj; + + return this.sourcePath.equals(that.sourcePath) + && this.position.equals(that.position); + } + + public int hashCode() { + return sourcePath.hashCode() * position.hashCode(); + } + + public String getFilename() { + return sourcePath.toOSString(); + } + + public ISourcePosition getPosition() { + return position; + } } Index: SymbolIndex.java =================================================================== RCS file: /cvsroot/rubyeclipse/org.rubypeople.rdt.core/src/org/rubypeople/rdt/internal/core/symbols/SymbolIndex.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** SymbolIndex.java 1 Oct 2005 23:01:01 -0000 1.1 --- SymbolIndex.java 13 Oct 2005 01:00:35 -0000 1.2 *************** *** 24,27 **** --- 24,31 ---- } + public void add(ClassSymbol symbol, IFile file, ISourcePosition position) { + add(symbol, new Location(file.getFullPath(), position)); + } + public Set find(ClassSymbol symbol) { Set locations = (Set) index.get(symbol); *************** *** 47,55 **** } - // DSC DO - public void add(ClassSymbol symbol, IFile file, ISourcePosition position) { - // TODO Auto-generated method stub - - } } --- 51,54 ---- |
|
From: David C. <dc...@us...> - 2005-10-13 01:00:45
|
Update of /cvsroot/rubyeclipse/org.rubypeople.rdt.core/src/org/rubypeople/rdt/core In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3497/src/org/rubypeople/rdt/core Modified Files: RubyCore.java Log Message: Partial support for opening classes from Test::Unit failure. Index: RubyCore.java =================================================================== RCS file: /cvsroot/rubyeclipse/org.rubypeople.rdt.core/src/org/rubypeople/rdt/core/RubyCore.java,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 *** RubyCore.java 1 Oct 2005 23:01:01 -0000 1.15 --- RubyCore.java 13 Oct 2005 01:00:35 -0000 1.16 *************** *** 33,40 **** import org.rubypeople.rdt.internal.core.RubyScript; import org.rubypeople.rdt.internal.core.parser.RubyParser; public class RubyCore extends Plugin { ! private static Plugin RUBY_CORE_PLUGIN = null; public final static String PLUGIN_ID = "org.rubypeople.rdt.core"; --- 33,41 ---- import org.rubypeople.rdt.internal.core.RubyScript; import org.rubypeople.rdt.internal.core.parser.RubyParser; + import org.rubypeople.rdt.internal.core.symbols.SymbolIndex; public class RubyCore extends Plugin { ! private static RubyCore RUBY_CORE_PLUGIN = null; public final static String PLUGIN_ID = "org.rubypeople.rdt.core"; *************** *** 127,133 **** --- 128,137 ---- public static final String DISABLED = "disabled"; //$NON-NLS-1$ + private SymbolIndex symbolIndex; + public RubyCore() { super(); RUBY_CORE_PLUGIN = this; + symbolIndex = new SymbolIndex(); } *************** *** 137,141 **** * @return the single instance of the Ruby core plug-in runtime class */ ! public static Plugin getPlugin() { return RUBY_CORE_PLUGIN; } --- 141,145 ---- * @return the single instance of the Ruby core plug-in runtime class */ ! public static RubyCore getPlugin() { return RUBY_CORE_PLUGIN; } *************** *** 433,436 **** workspace.run(new BatchOperation(action), rule, IWorkspace.AVOID_UPDATE, monitor); } ! } } \ No newline at end of file --- 437,444 ---- workspace.run(new BatchOperation(action), rule, IWorkspace.AVOID_UPDATE, monitor); } ! } ! ! public SymbolIndex getSymbolIndex() { ! return symbolIndex; ! } } \ No newline at end of file |
|
From: David C. <dc...@us...> - 2005-10-13 01:00:45
|
Update of /cvsroot/rubyeclipse/org.rubypeople.rdt.core/src/org/rubypeople/rdt/internal/core/parser In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3497/src/org/rubypeople/rdt/internal/core/parser Modified Files: RdtPosition.java Log Message: Partial support for opening classes from Test::Unit failure. Index: RdtPosition.java =================================================================== RCS file: /cvsroot/rubyeclipse/org.rubypeople.rdt.core/src/org/rubypeople/rdt/internal/core/parser/RdtPosition.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** RdtPosition.java 9 Oct 2005 22:14:06 -0000 1.4 --- RdtPosition.java 13 Oct 2005 01:00:35 -0000 1.5 *************** *** 26,38 **** } - /** - * - */ public RdtPosition( int startLine, int endLine, int startOffset, ! int endOffset ){ this.startLine = startLine; this.endLine = endLine; this.startOffset = startOffset; ! this.endOffset = endOffset; } /* (non-Javadoc) --- 26,36 ---- } public RdtPosition( int startLine, int endLine, int startOffset, ! int endOffset ) { this.startLine = startLine; this.endLine = endLine; this.startOffset = startOffset; ! this.endOffset = endOffset; ! } /* (non-Javadoc) *************** *** 86,88 **** --- 84,90 ---- && that.endOffset== this.endOffset; } + + public int hashCode() { + return startLine * startOffset + endLine*endOffset; + } } |
|
From: David C. <dc...@us...> - 2005-10-13 01:00:45
|
Update of /cvsroot/rubyeclipse/org.rubypeople.rdt.core/src/org/rubypeople/rdt/internal/core/builder In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3497/src/org/rubypeople/rdt/internal/core/builder Modified Files: RdtCompiler.java IndexUpdater.java Log Message: Partial support for opening classes from Test::Unit failure. Index: RdtCompiler.java =================================================================== RCS file: /cvsroot/rubyeclipse/org.rubypeople.rdt.core/src/org/rubypeople/rdt/internal/core/builder/RdtCompiler.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** RdtCompiler.java 1 Oct 2005 23:01:00 -0000 1.1 --- RdtCompiler.java 13 Oct 2005 01:00:35 -0000 1.2 *************** *** 11,14 **** --- 11,15 ---- import org.jruby.ast.Node; import org.jruby.lexer.yacc.SyntaxException; + import org.rubypeople.rdt.core.RubyCore; import org.rubypeople.rdt.internal.core.parser.ImmediateWarnings; import org.rubypeople.rdt.internal.core.parser.RubyParser; *************** *** 20,24 **** public RdtCompiler(IMarkerManager markerManager) { ! this(markerManager, new RubyParser(new ImmediateWarnings(markerManager)), new IndexUpdater(null)); } --- 21,25 ---- public RdtCompiler(IMarkerManager markerManager) { ! this(markerManager, new RubyParser(new ImmediateWarnings(markerManager)), new IndexUpdater(((RubyCore) RubyCore.getPlugin()).getSymbolIndex())); } *************** *** 33,37 **** try { Node rootNode = parser.parse(file, reader); ! // indexUpdater.update(file, rootNode); } catch (SyntaxException e) { markerManager.createSyntaxError(file, e); --- 34,38 ---- try { Node rootNode = parser.parse(file, reader); ! indexUpdater.update(file, rootNode); } catch (SyntaxException e) { markerManager.createSyntaxError(file, e); Index: IndexUpdater.java =================================================================== RCS file: /cvsroot/rubyeclipse/org.rubypeople.rdt.core/src/org/rubypeople/rdt/internal/core/builder/IndexUpdater.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** IndexUpdater.java 9 Oct 2005 22:14:06 -0000 1.2 --- IndexUpdater.java 13 Oct 2005 01:00:35 -0000 1.3 *************** *** 14,18 **** public class IndexUpdater { ! private final SymbolIndex index; private Stack scopeStack = new Stack(); --- 14,18 ---- public class IndexUpdater { ! // TODO Build Index on startup private final SymbolIndex index; private Stack scopeStack = new Stack(); *************** *** 36,40 **** scopeStack.push(name); if (node instanceof ClassNode) ! index.add(new ClassSymbol(name), file, node.getPosition()); } --- 36,40 ---- scopeStack.push(name); if (node instanceof ClassNode) ! index.add(new ClassSymbol(name), file, classNode.getCPath().getPosition()); } |
|
From: David C. <dc...@us...> - 2005-10-13 01:00:44
|
Update of /cvsroot/rubyeclipse/org.rubypeople.rdt.core.tests/src/org/rubypeople/rdt/internal/core/builder In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3446/src/org/rubypeople/rdt/internal/core/builder Modified Files: TC_RdtCompiler.java Added Files: TC_IndexUpdater.java Removed Files: IndexUpdater_UT.java Log Message: Partial support for opening classes from Test::Unit failure. --- NEW FILE: TC_IndexUpdater.java --- package org.rubypeople.rdt.internal.core.builder; import java.io.InputStreamReader; import junit.framework.TestCase; import org.eclipse.core.resources.IFile; import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.IPath; import org.jruby.ast.ClassNode; import org.jruby.ast.Colon2Node; import org.jruby.ast.Node; import org.jruby.ast.TrueNode; import org.jruby.lexer.yacc.ISourcePosition; import org.rubypeople.eclipse.shams.resources.ShamFile; import org.rubypeople.rdt.internal.core.parser.RdtPosition; import org.rubypeople.rdt.internal.core.parser.RubyParser; import org.rubypeople.rdt.internal.core.symbols.ClassSymbol; import org.rubypeople.rdt.internal.core.symbols.SymbolIndex; public class TC_IndexUpdater extends TestCase { private static final RdtPosition POSITION_1 = new RdtPosition(1,2,3); private static final String TEST_CLASS_NAME = "TestClassName"; private IndexUpdater updater; private ShamFile file; private MockSymbolIndex symbolIndex; public void setUp() { file = new ShamFile("TestFile.rb"); symbolIndex = new MockSymbolIndex(); updater = new IndexUpdater(symbolIndex); } public void testIrrelevantNodes() { Node node = new TrueNode(POSITION_1); updater.update(file, node); symbolIndex.assertFlushed(file.getFullPath()); symbolIndex.assertAddNotCalled(); } public void testSimple() { Colon2Node nameNode = new Colon2Node(POSITION_1, null, TEST_CLASS_NAME); Node node = new ClassNode(POSITION_1, nameNode, null, null); updater.update(file, node); symbolIndex.assertFlushed(file.getFullPath()); symbolIndex.assertAdded(new ClassSymbol(TEST_CLASS_NAME), file, POSITION_1); } public void testWithTree() throws Exception { Node node = parseCode("if x\nclass Foo\nend\n end\n"); updater.update(file,node); symbolIndex.assertFlushed(file.getFullPath()); symbolIndex.assertAdded(new ClassSymbol("Foo"), file, new RdtPosition(1, 2, 10, 18)); } public void testTreeWithScopedClass() throws Exception { Node node = parseCode("if x\nclass Foo::Bar\nend\n end\n"); updater.update(file,node); symbolIndex.assertFlushed(file.getFullPath()); symbolIndex.assertAdded(new ClassSymbol("Foo::Bar"), file, new RdtPosition(1, 2, 10, 23)); } public void testTreeWithDeeplyScopedClass() throws Exception { Node node = parseCode("if x\nclass X::Foo::Bar\nend\n end\n"); updater.update(file,node); symbolIndex.assertFlushed(file.getFullPath()); symbolIndex.assertAdded(new ClassSymbol("X::Foo::Bar"), file, new RdtPosition(1, 2, 10, 26)); } public void testTreeWithNesting() throws Exception { Node node = parseCode("if x\nmodule Foo\nclass Bar\nend\n end\nend\n"); updater.update(file,node); symbolIndex.assertFlushed(file.getFullPath()); symbolIndex.assertAdded(new ClassSymbol("Foo::Bar"), file, new RdtPosition(2, 3, 21, 29)); } private Node parseCode(String code) throws CoreException { file.setContents(code); InputStreamReader reader = new InputStreamReader(file.getContents()); return new RubyParser().parse(file, reader); } private static class MockSymbolIndex extends SymbolIndex { private IFile fileArg; private ClassSymbol symbolArg; private ISourcePosition positionArg; private IPath flushedPathArg; public void flush(IPath path) { flushedPathArg = path; } public void assertFlushed(IPath expectedPath) { assertEquals("Flushed path", expectedPath, flushedPathArg); } public void assertAddNotCalled() { assertNull("Unexpected call to assertAddNotCalled()", fileArg); } public void assertAdded(ClassSymbol expectedSymbol, IFile expectedFile, ISourcePosition expectedPosition) { assertEquals("Symbol", expectedSymbol, symbolArg); assertEquals("File", expectedFile, fileArg); assertEquals("Position", expectedPosition, positionArg); } public void add(ClassSymbol symbol, IFile file, ISourcePosition position) { symbolArg = symbol; fileArg = file; positionArg = position; } } } Index: TC_RdtCompiler.java =================================================================== RCS file: /cvsroot/rubyeclipse/org.rubypeople.rdt.core.tests/src/org/rubypeople/rdt/internal/core/builder/TC_RdtCompiler.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** TC_RdtCompiler.java 9 Oct 2005 22:13:01 -0000 1.3 --- TC_RdtCompiler.java 13 Oct 2005 01:00:30 -0000 1.4 *************** *** 47,52 **** parser.assertParsed(file, FILE_CONTENTS); file.assertContentStreamClosed(); ! // DSC ! // indexUpdater.assertUpdated(file, rootNode); } --- 47,51 ---- parser.assertParsed(file, FILE_CONTENTS); file.assertContentStreamClosed(); ! indexUpdater.assertUpdated(file, rootNode); } --- IndexUpdater_UT.java DELETED --- |
|
From: David C. <dc...@us...> - 2005-10-13 01:00:39
|
Update of /cvsroot/rubyeclipse/org.rubypeople.rdt.core.tests/src/org/rubypeople/rdt/internal/core/symbols In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3446/src/org/rubypeople/rdt/internal/core/symbols Modified Files: TC_SymbolIndex.java TC_Location.java Log Message: Partial support for opening classes from Test::Unit failure. Index: TC_Location.java =================================================================== RCS file: /cvsroot/rubyeclipse/org.rubypeople.rdt.core.tests/src/org/rubypeople/rdt/internal/core/symbols/TC_Location.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** TC_Location.java 1 Oct 2005 23:00:54 -0000 1.1 --- TC_Location.java 13 Oct 2005 01:00:30 -0000 1.2 *************** *** 4,11 **** import org.eclipse.core.runtime.Path; public class TC_Location extends TestCase { public void testForSource() { ! Location location = new Location(new Path("foo"), 1, 2); assertEquals(true, location.forSource(new Path("foo"))); assertEquals(false, location.forSource(new Path("Foo"))); --- 4,12 ---- import org.eclipse.core.runtime.Path; + import org.rubypeople.rdt.internal.core.parser.RdtPosition; public class TC_Location extends TestCase { public void testForSource() { ! Location location = new Location(new Path("foo"), new RdtPosition(1, 2, 3)); assertEquals(true, location.forSource(new Path("foo"))); assertEquals(false, location.forSource(new Path("Foo"))); Index: TC_SymbolIndex.java =================================================================== RCS file: /cvsroot/rubyeclipse/org.rubypeople.rdt.core.tests/src/org/rubypeople/rdt/internal/core/symbols/TC_SymbolIndex.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** TC_SymbolIndex.java 1 Oct 2005 23:00:54 -0000 1.1 --- TC_SymbolIndex.java 13 Oct 2005 01:00:30 -0000 1.2 *************** *** 7,11 **** --- 7,15 ---- import junit.framework.TestCase; + import org.eclipse.core.resources.IFile; import org.eclipse.core.runtime.Path; + import org.jruby.lexer.yacc.ISourcePosition; + import org.rubypeople.eclipse.shams.resources.ShamFile; + import org.rubypeople.rdt.internal.core.parser.RdtPosition; public class TC_SymbolIndex extends TestCase { *************** *** 15,21 **** private static final Path OTHER_FOO_PATH = new Path("/utils/foo.rb"); ! private static final Location FOO_CLASS_LOCATION = new Location(FOO_PATH, 12, 15); ! private static final Location OTHER_FOO_CLASS_LOCATION = new Location(OTHER_FOO_PATH, 10, 13); ! private static final Set EMPTY_SET= Collections.EMPTY_SET; private SymbolIndex index; --- 19,28 ---- private static final Path OTHER_FOO_PATH = new Path("/utils/foo.rb"); ! private static final ISourcePosition FOO_POSITION = new RdtPosition(10, 3, 7); ! private static final ISourcePosition OTHER_FOO_POSITION = new RdtPosition(12, 13, 17); ! private static final Location FOO_CLASS_LOCATION = new Location(FOO_PATH, FOO_POSITION); ! private static final Location OTHER_FOO_CLASS_LOCATION = new Location(OTHER_FOO_PATH, OTHER_FOO_POSITION); ! private static final IFile OTHER_FOO_FILE = new ShamFile(OTHER_FOO_PATH); ! private static final Set EMPTY_SET = Collections.EMPTY_SET; private SymbolIndex index; *************** *** 40,47 **** public void testMultipleLocations() { index.add(FOO_CLASS_SYMBOL, OTHER_FOO_CLASS_LOCATION); assertEquals(createSet(OTHER_FOO_CLASS_LOCATION, FOO_CLASS_LOCATION), index.find(FOO_CLASS_SYMBOL)); } - private Set createSet(Object obj1) { Set set = new HashSet(); --- 47,60 ---- public void testMultipleLocations() { + index.add(FOO_CLASS_SYMBOL, OTHER_FOO_FILE, OTHER_FOO_POSITION); + Set expected = createSet(OTHER_FOO_CLASS_LOCATION, FOO_CLASS_LOCATION); + Set actual = index.find(FOO_CLASS_SYMBOL); + assertEquals(expected, actual); + } + + public void testAlternateAdd() { index.add(FOO_CLASS_SYMBOL, OTHER_FOO_CLASS_LOCATION); assertEquals(createSet(OTHER_FOO_CLASS_LOCATION, FOO_CLASS_LOCATION), index.find(FOO_CLASS_SYMBOL)); } private Set createSet(Object obj1) { Set set = new HashSet(); |
|
From: David C. <dc...@us...> - 2005-10-13 01:00:35
|
Update of /cvsroot/rubyeclipse/org.rubypeople.rdt.testunit/src/org/rubypeople/rdt/testunit/views In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3401/src/org/rubypeople/rdt/testunit/views Modified Files: FailureTab.java Added Files: OpenClassAction.java Log Message: Partial support for opening classes from Test::Unit failure. --- NEW FILE: OpenClassAction.java --- package org.rubypeople.rdt.testunit.views; import java.util.Set; import org.eclipse.jface.action.Action; import org.eclipse.jface.action.IAction; import org.rubypeople.rdt.internal.core.symbols.ClassSymbol; import org.rubypeople.rdt.internal.core.symbols.Location; import org.rubypeople.rdt.internal.core.symbols.SymbolIndex; import org.rubypeople.rdt.internal.ui.util.PositionBasedEditorOpener; public class OpenClassAction extends Action implements IAction { private final String className; private final SymbolIndex index; public OpenClassAction(String className, SymbolIndex index) { super(TestUnitMessages.getString("OpenEditor.action.label")); this.className = className; this.index = index; } public void run() { Set locations = index.find(new ClassSymbol(className)); if (locations.size() == 1) { Location location = (Location) locations.iterator().next(); new PositionBasedEditorOpener(location.getFilename(), location.getPosition()).open(); } else { System.out.println("Too many locations"); // DSC temporary } } } Index: FailureTab.java =================================================================== RCS file: /cvsroot/rubyeclipse/org.rubypeople.rdt.testunit/src/org/rubypeople/rdt/testunit/views/FailureTab.java,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** FailureTab.java 1 Oct 2005 23:10:52 -0000 1.5 --- FailureTab.java 13 Oct 2005 01:00:27 -0000 1.6 *************** *** 37,40 **** --- 37,42 ---- import org.eclipse.swt.widgets.Table; import org.eclipse.swt.widgets.TableItem; + import org.rubypeople.rdt.core.RubyCore; + import org.rubypeople.rdt.internal.core.symbols.SymbolIndex; import org.rubypeople.rdt.testunit.ITestRunListener; *************** *** 150,160 **** String methodName = getMethodName(); if (className != null) { ! // TODO Add back the actions! ! //manager.add(new OpenTestAction(fRunnerViewPart, className, ! // methodName)); manager.add(new Separator()); ! manager.add(new RerunAction(fRunnerViewPart, getSelectedTestId(), className, methodName, ILaunchManager.RUN_MODE)); ! manager.add(new RerunAction(fRunnerViewPart, getSelectedTestId(), className, methodName, ILaunchManager.DEBUG_MODE)); manager.add(new Separator()); //manager.add(new CopyFailureListAction(fRunnerViewPart, // FailureTab.this, fClipboard)); --- 152,163 ---- String methodName = getMethodName(); if (className != null) { ! manager.add(new OpenClassAction(className, getSymbolIndex())); manager.add(new Separator()); ! manager.add(new RerunAction(fRunnerViewPart, getSelectedTestId(), ! className, methodName, ILaunchManager.RUN_MODE)); ! manager.add(new RerunAction(fRunnerViewPart, getSelectedTestId(), ! className, methodName, ILaunchManager.DEBUG_MODE)); manager.add(new Separator()); + // TODO Add back the actions! //manager.add(new CopyFailureListAction(fRunnerViewPart, // FailureTab.this, fClipboard)); *************** *** 163,166 **** --- 166,173 ---- } + private SymbolIndex getSymbolIndex() { + return RubyCore.getPlugin().getSymbolIndex(); + } + private TableItem getSelectedItem() { int index = fTable.getSelectionIndex(); *************** *** 268,274 **** void handleDoubleClick(MouseEvent e) { ! // TODO create the OpenTestAction ! //if (fTable.getSelectionCount() > 0) new OpenTestAction(fRunnerViewPart, ! // getClassName(), getMethodName()).run(); } --- 275,280 ---- void handleDoubleClick(MouseEvent e) { ! if (fTable.getSelectionCount() > 0) ! new OpenClassAction(getClassName(), getSymbolIndex()).run(); } |
Update of /cvsroot/rubyeclipse/org.rubypeople.rdt.ui/src/org/rubypeople/rdt/internal/ui/util In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3334/src/org/rubypeople/rdt/internal/ui/util Modified Files: StackTraceLine.java Added Files: LineBasedEditorOpener.java EditorOpener.java PositionBasedEditorOpener.java Log Message: Partial support for opening classes from Test::Unit failure. --- NEW FILE: PositionBasedEditorOpener.java --- package org.rubypeople.rdt.internal.ui.util; import org.eclipse.jface.text.IDocument; import org.eclipse.ui.texteditor.ITextEditor; import org.jruby.lexer.yacc.ISourcePosition; public class PositionBasedEditorOpener extends EditorOpener { private final ISourcePosition position; public PositionBasedEditorOpener(String filename, ISourcePosition position) { super(filename); this.position = position; } protected void setEditorPosition(ITextEditor editor) { IDocument document = editor.getDocumentProvider().getDocument(editor.getEditorInput()); int start = position.getStartOffset(); int end = position.getEndOffset(); editor.selectAndReveal(start, end-start); } } --- NEW FILE: EditorOpener.java --- /** * */ package org.rubypeople.rdt.internal.ui.util; import org.eclipse.core.resources.IFile; import org.eclipse.core.resources.IWorkspace; import org.eclipse.core.resources.IWorkspaceRoot; import org.eclipse.core.resources.ResourcesPlugin; import org.eclipse.core.runtime.IPath; import org.eclipse.core.runtime.Path; import org.eclipse.ui.IEditorDescriptor; import org.eclipse.ui.IEditorInput; import org.eclipse.ui.IEditorRegistry; import org.eclipse.ui.IWorkbench; import org.eclipse.ui.IWorkbenchPage; import org.eclipse.ui.PartInitException; import org.eclipse.ui.PlatformUI; import org.eclipse.ui.part.FileEditorInput; import org.eclipse.ui.texteditor.ITextEditor; import org.rubypeople.rdt.internal.ui.RubyPlugin; import org.rubypeople.rdt.internal.ui.rubyeditor.ExternalRubyFileEditorInput; public abstract class EditorOpener { private final String filename; public EditorOpener(String filename) { this.filename = filename; } public void open() { try { IEditorInput fileEditorInput = createEditorInput(filename); IWorkbench workbench = PlatformUI.getWorkbench(); IEditorRegistry editorRegistry = workbench.getEditorRegistry(); IWorkbenchPage page = workbench.getActiveWorkbenchWindow().getActivePage(); IEditorDescriptor descriptor = editorRegistry.getDefaultEditor(filename); if (descriptor == null) return; ITextEditor editor = (ITextEditor) page.openEditor(fileEditorInput, editorId(descriptor)); setEditorPosition(editor); } catch (PartInitException e) { RubyPlugin.log(e); } } protected abstract void setEditorPosition(ITextEditor editor); private String editorId(IEditorDescriptor descriptor) { String editorId; if (descriptor == null) { editorId = "org.eclipse.ui.DefaultTextEditor"; //$NON-NLS-1$ } else { editorId = descriptor.getId(); } return editorId; } private IEditorInput createEditorInput(String filename) { IFile file = getWorkspaceFile(filename); if (file == null) return new ExternalRubyFileEditorInput(new java.io.File(filename)); return new FileEditorInput(file); } private IFile getWorkspaceFile(String filename) { IWorkspace workspace = ResourcesPlugin.getWorkspace(); IWorkspaceRoot root = workspace.getRoot(); IPath filepath = new Path(filename); IFile file = root.getFileForLocation(filepath); return file; } } Index: StackTraceLine.java =================================================================== RCS file: /cvsroot/rubyeclipse/org.rubypeople.rdt.ui/src/org/rubypeople/rdt/internal/ui/util/StackTraceLine.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** StackTraceLine.java 28 Mar 2005 23:22:44 -0000 1.1 --- StackTraceLine.java 13 Oct 2005 01:00:21 -0000 1.2 *************** *** 16,38 **** import java.util.regex.Pattern; - import org.eclipse.core.resources.IFile; - import org.eclipse.core.resources.IWorkspace; - import org.eclipse.core.resources.IWorkspaceRoot; - import org.eclipse.core.resources.ResourcesPlugin; - import org.eclipse.core.runtime.IPath; - import org.eclipse.core.runtime.Path; - import org.eclipse.jface.text.BadLocationException; - import org.eclipse.jface.text.IDocument; - import org.eclipse.ui.IEditorDescriptor; - import org.eclipse.ui.IEditorInput; - import org.eclipse.ui.IEditorRegistry; - import org.eclipse.ui.IWorkbench; - import org.eclipse.ui.IWorkbenchPage; - import org.eclipse.ui.PartInitException; - import org.eclipse.ui.PlatformUI; - import org.eclipse.ui.part.FileEditorInput; - import org.eclipse.ui.texteditor.ITextEditor; - import org.rubypeople.rdt.internal.ui.RubyPlugin; - import org.rubypeople.rdt.internal.ui.rubyeditor.ExternalRubyFileEditorInput; --- 16,19 ---- *************** *** 75,137 **** length = fFilename.length()+lineNumber.length()+1; } ! ! public void openEditor() { ! try { ! if (fFilename == null) ! return; ! IEditorInput fileEditorInput = createEditorInput(fFilename); ! IWorkbench workbench = PlatformUI.getWorkbench(); ! IEditorRegistry editorRegistry = workbench.getEditorRegistry(); ! IWorkbenchPage page = workbench.getActiveWorkbenchWindow().getActivePage(); ! IEditorDescriptor descriptor = editorRegistry.getDefaultEditor(fFilename); ! if (descriptor == null) ! return; ! ITextEditor editor = (ITextEditor) page.openEditor(fileEditorInput, editorId(descriptor)); ! setEditorPosition(fLineNumber, editor); ! } catch (PartInitException e) { ! RubyPlugin.log(e); ! } ! } ! ! private void setEditorPosition(int lineNumber, ITextEditor editor) { ! try { ! if (lineNumber > 0) { ! IDocument document= editor.getDocumentProvider().getDocument(editor.getEditorInput()); ! editor.selectAndReveal(document.getLineOffset(lineNumber-1), document.getLineLength(lineNumber-1)); ! } ! } catch (BadLocationException doNothing) { ! } ! } ! ! private IEditorInput createEditorInput(String filename) { ! IFile file = getWorkspaceFile(filename); ! if (file == null) ! return new ExternalRubyFileEditorInput(new java.io.File(filename)); ! return new FileEditorInput(file); ! } ! ! private IFile getWorkspaceFile(String filename) { ! IWorkspace workspace = ResourcesPlugin.getWorkspace(); ! IWorkspaceRoot root = workspace.getRoot(); ! IPath filepath = new Path(filename); ! IFile file = root.getFileForLocation(filepath); ! ! return file; } - private static String editorId(IEditorDescriptor descriptor) - { - String editorId; - if (descriptor == null) - { - editorId = "org.eclipse.ui.DefaultTextEditor"; //$NON-NLS-1$ - } - else - { - editorId = descriptor.getId(); - } - return editorId; - } - public int getLineNumber() { return fLineNumber; --- 56,66 ---- length = fFilename.length()+lineNumber.length()+1; } ! ! public void openEditor() { ! if (fFilename == null) ! return; ! new LineBasedEditorOpener(fFilename, fLineNumber).open(); } public int getLineNumber() { return fLineNumber; --- NEW FILE: LineBasedEditorOpener.java --- package org.rubypeople.rdt.internal.ui.util; import org.eclipse.jface.text.BadLocationException; import org.eclipse.jface.text.IDocument; import org.eclipse.ui.texteditor.ITextEditor; public class LineBasedEditorOpener extends EditorOpener { private final int lineNumber; public LineBasedEditorOpener(String filename, int lineNumber) { super(filename); this.lineNumber = lineNumber; } protected void setEditorPosition(ITextEditor editor) { try { if (lineNumber > 0) { IDocument document= editor.getDocumentProvider().getDocument(editor.getEditorInput()); int offset = document.getLineOffset(lineNumber-1); int length = document.getLineLength(lineNumber-1); editor.selectAndReveal(offset, length); } } catch (BadLocationException doNothing) { } } } |
|
From: Markus B. <mba...@us...> - 2005-10-11 21:13:16
|
Update of /cvsroot/rubyeclipse/org.rubypeople.rdt.launching.tests/src/org/rubypeople/rdt/internal/launching In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17748/src/org/rubypeople/rdt/internal/launching Modified Files: TC_RunnerLaunching.java Log Message: in debug mode the first argument is -r<temporaryParameteFile>, on windows paths are quoted Index: TC_RunnerLaunching.java =================================================================== RCS file: /cvsroot/rubyeclipse/org.rubypeople.rdt.launching.tests/src/org/rubypeople/rdt/internal/launching/TC_RunnerLaunching.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** TC_RunnerLaunching.java 1 Oct 2005 23:10:47 -0000 1.2 --- TC_RunnerLaunching.java 11 Oct 2005 21:13:08 -0000 1.3 *************** *** 15,18 **** --- 15,19 ---- import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.core.runtime.Path; + import org.eclipse.core.runtime.Platform; import org.eclipse.debug.core.DebugPlugin; import org.eclipse.debug.core.ILaunch; *************** *** 46,49 **** --- 47,52 ---- commandLine.add("-reclipseDebug"); } + // The include paths and the executed ruby file is quoted on windows + String pathQuotation = Platform.getOS().equals(Platform.OS_WIN32) ? "\"" : "" ; if (debug) { String dirOfRubyDebuggerFile = DebuggerRunner.getDirectoryOfRubyDebuggerFile().replace('/', File.separatorChar) ; *************** *** 52,65 **** } commandLine.add("-I"); ! commandLine.add(dirOfRubyDebuggerFile); } commandLine.add("-I"); ! commandLine.add( project.getLocation().toOSString()); commandLine.add("-I"); ! commandLine.add(project.getLocation().toOSString() + File.separator + RUBY_LIB_DIR) ; commandLine.addAll(Arrays.asList(INTERPRETER_ARGUMENTS.split("\\s+"))); commandLine.add("--"); // use always forward slashes for path relative to project dir ! commandLine.add(project.getLocation().toOSString() + "/" + RUBY_LIB_DIR + "/" + RUBY_FILE_NAME); commandLine.add(PROGRAM_ARGUMENTS); return commandLine; --- 55,68 ---- } commandLine.add("-I"); ! commandLine.add(pathQuotation + dirOfRubyDebuggerFile + pathQuotation); } commandLine.add("-I"); ! commandLine.add( pathQuotation + project.getLocation().toOSString() + pathQuotation); commandLine.add("-I"); ! commandLine.add(pathQuotation + project.getLocation().toOSString() + File.separator + RUBY_LIB_DIR + pathQuotation) ; commandLine.addAll(Arrays.asList(INTERPRETER_ARGUMENTS.split("\\s+"))); commandLine.add("--"); // use always forward slashes for path relative to project dir ! commandLine.add(pathQuotation + project.getLocation().toOSString() + "/" + RUBY_LIB_DIR + "/" + RUBY_FILE_NAME + pathQuotation); commandLine.add(PROGRAM_ARGUMENTS); return commandLine; *************** *** 91,95 **** getLaunchManager().getLaunchConfigurationType( RubyLaunchConfigurationAttribute.RUBY_LAUNCH_CONFIGURATION_TYPE); ! launchConfigurationType.getDelegate().launch( configuration, debug ? ILaunchManager.DEBUG_MODE : ILaunchManager.RUN_MODE, --- 94,98 ---- getLaunchManager().getLaunchConfigurationType( RubyLaunchConfigurationAttribute.RUBY_LAUNCH_CONFIGURATION_TYPE); ! launchConfigurationType.getDelegate(debug ? "debug" : "run").launch( configuration, debug ? ILaunchManager.DEBUG_MODE : ILaunchManager.RUN_MODE, *************** *** 100,103 **** --- 103,111 ---- List expected = getCommandLine(project, debug); List actual = interpreter.getArguments(); + if (debug) { + // we must cheat with the first argument, because it is a temporary file which + // contains is different for every call + expected.add(0, actual.get(0)) ; + } assertEquals("Assembled command line.", expected, actual); assertEquals( |
|
From: David C. <dc...@us...> - 2005-10-09 22:14:15
|
Update of /cvsroot/rubyeclipse/org.rubypeople.rdt.core/src/org/rubypeople/rdt/internal/core/parser In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21686/src/org/rubypeople/rdt/internal/core/parser Modified Files: RdtPosition.java Log Message: Upgraded to JRuby head. More work on Updating the Symbol Index for class names. Index: RdtPosition.java =================================================================== RCS file: /cvsroot/rubyeclipse/org.rubypeople.rdt.core/src/org/rubypeople/rdt/internal/core/parser/RdtPosition.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** RdtPosition.java 6 Aug 2005 02:46:18 -0000 1.3 --- RdtPosition.java 9 Oct 2005 22:14:06 -0000 1.4 *************** *** 68,79 **** public int getStartLine() { - // TODO Auto-generated method stub return startLine; } public int getEndLine() { - // TODO Auto-generated method stub return endLine; } ! } --- 68,88 ---- public int getStartLine() { return startLine; } public int getEndLine() { return endLine; } ! ! public boolean equals(Object obj) { ! if (! (obj instanceof RdtPosition)) ! return false; ! ! RdtPosition that = (RdtPosition) obj; ! return ! that.startLine == this.startLine ! && that.endLine == this.endLine ! && that.startOffset == this.startOffset ! && that.endOffset== this.endOffset; ! } } |
|
From: David C. <dc...@us...> - 2005-10-09 22:14:14
|
Update of /cvsroot/rubyeclipse/org.rubypeople.rdt.core/META-INF In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21686/META-INF Modified Files: MANIFEST.MF Log Message: Upgraded to JRuby head. More work on Updating the Symbol Index for class names. Index: MANIFEST.MF =================================================================== RCS file: /cvsroot/rubyeclipse/org.rubypeople.rdt.core/META-INF/MANIFEST.MF,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** MANIFEST.MF 1 Oct 2005 23:01:00 -0000 1.5 --- MANIFEST.MF 9 Oct 2005 22:14:06 -0000 1.6 *************** *** 11,15 **** Export-Package: ., builtin, - libraries, org.ablaf.ast, org.ablaf.internal.ast, --- 11,14 ---- *************** *** 23,27 **** org.jruby.exceptions, org.jruby.internal.runtime, - org.jruby.internal.runtime.load, org.jruby.internal.runtime.methods, org.jruby.javasupport, --- 22,25 ---- |
|
From: David C. <dc...@us...> - 2005-10-09 22:14:14
|
Update of /cvsroot/rubyeclipse/org.rubypeople.rdt.core/src/org/rubypeople/rdt/internal/core/symbols In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21686/src/org/rubypeople/rdt/internal/core/symbols Modified Files: ClassSymbol.java Log Message: Upgraded to JRuby head. More work on Updating the Symbol Index for class names. Index: ClassSymbol.java =================================================================== RCS file: /cvsroot/rubyeclipse/org.rubypeople.rdt.core/src/org/rubypeople/rdt/internal/core/symbols/ClassSymbol.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** ClassSymbol.java 1 Oct 2005 23:01:01 -0000 1.1 --- ClassSymbol.java 9 Oct 2005 22:14:06 -0000 1.2 *************** *** 20,22 **** --- 20,26 ---- return className.hashCode(); } + + public String toString() { + return "Class [" + className + "]"; + } } |
|
From: David C. <dc...@us...> - 2005-10-09 22:14:14
|
Update of /cvsroot/rubyeclipse/org.rubypeople.rdt.core/src/org/rubypeople/rdt/internal/core/builder In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21686/src/org/rubypeople/rdt/internal/core/builder Modified Files: IndexUpdater.java Log Message: Upgraded to JRuby head. More work on Updating the Symbol Index for class names. Index: IndexUpdater.java =================================================================== RCS file: /cvsroot/rubyeclipse/org.rubypeople.rdt.core/src/org/rubypeople/rdt/internal/core/builder/IndexUpdater.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** IndexUpdater.java 1 Oct 2005 23:01:00 -0000 1.1 --- IndexUpdater.java 9 Oct 2005 22:14:06 -0000 1.2 *************** *** 1,7 **** --- 1,13 ---- package org.rubypeople.rdt.internal.core.builder; + import java.util.Iterator; + import java.util.Stack; + import org.eclipse.core.resources.IFile; import org.jruby.ast.ClassNode; + import org.jruby.ast.Colon2Node; + import org.jruby.ast.IScopingNode; import org.jruby.ast.Node; + import org.jruby.ast.types.INameNode; import org.rubypeople.rdt.internal.core.symbols.ClassSymbol; import org.rubypeople.rdt.internal.core.symbols.SymbolIndex; *************** *** 10,15 **** private final SymbolIndex index; ! ! public IndexUpdater(SymbolIndex index) { this.index = index; --- 16,21 ---- private final SymbolIndex index; ! private Stack scopeStack = new Stack(); ! public IndexUpdater(SymbolIndex index) { this.index = index; *************** *** 19,26 **** public void update(IFile file, Node rootNode) { index.flush(file.getFullPath()); ! if (rootNode instanceof ClassNode) { ! ClassNode classNode = (ClassNode) rootNode; ! index.add(new ClassSymbol(classNode.getClassName()), file, classNode.getPosition()); } } --- 25,85 ---- public void update(IFile file, Node rootNode) { index.flush(file.getFullPath()); ! processNode(file, rootNode); ! } ! ! ! private void processNode(IFile file, Node node) { ! if (isScopingNode(node)) { ! IScopingNode classNode = (IScopingNode) node; ! String name = getFullyQualifiedName(classNode); ! ! scopeStack.push(name); ! if (node instanceof ClassNode) ! index.add(new ClassSymbol(name), file, node.getPosition()); } + + for (Iterator iter = node.childNodes().iterator(); iter.hasNext();) { + Node childNode = (Node) iter.next(); + processNode(file, childNode); + } + + if (isScopingNode(node)) { + scopeStack.pop(); + } + } + + + private boolean isScopingNode(Node node) { + return node instanceof IScopingNode; + } + + + private String getFullyQualifiedName(IScopingNode classNode) { + Colon2Node path = classNode.getCPath(); + return getContext() + assembleQualifiedName(path); + } + + + private String getContext() { + StringBuffer buffer = new StringBuffer(); + for (Iterator iter = scopeStack.iterator(); iter.hasNext();) { + String name = (String) iter.next(); + buffer.append(name); + buffer.append("::"); + } + return buffer.toString(); + } + + + private String assembleQualifiedName(INameNode path) { + String name = ""; + if (path instanceof Colon2Node) { + Colon2Node colon2Node = ((Colon2Node)path); + INameNode leftNode = (INameNode) colon2Node.getLeftNode(); + if (leftNode != null) + name += assembleQualifiedName(leftNode) + "::"; + } + + return name + path.getName(); } |
|
From: David C. <dc...@us...> - 2005-10-09 22:14:14
|
Update of /cvsroot/rubyeclipse/org.rubypeople.rdt.core/src/org/rubypeople/rdt/internal/core In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21686/src/org/rubypeople/rdt/internal/core Modified Files: RubyScriptStructureBuilder.java Log Message: Upgraded to JRuby head. More work on Updating the Symbol Index for class names. Index: RubyScriptStructureBuilder.java =================================================================== RCS file: /cvsroot/rubyeclipse/org.rubypeople.rdt.core/src/org/rubypeople/rdt/internal/core/RubyScriptStructureBuilder.java,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** RubyScriptStructureBuilder.java 6 Aug 2005 02:44:59 -0000 1.9 --- RubyScriptStructureBuilder.java 9 Oct 2005 22:14:06 -0000 1.10 *************** *** 35,39 **** import org.jruby.ast.ArgsNode; import org.jruby.ast.ArrayNode; - import org.jruby.ast.AttrSetNode; import org.jruby.ast.BackRefNode; import org.jruby.ast.BeginNode; --- 35,38 ---- *************** *** 127,132 **** import org.jruby.lexer.yacc.ISourcePosition; import org.jruby.runtime.Visibility; - import org.rubypeople.rdt.core.IRubyElement; import org.rubypeople.rdt.core.IMethod; import org.rubypeople.rdt.core.IRubyScript; import org.rubypeople.rdt.internal.core.parser.RubyParser; --- 126,131 ---- import org.jruby.lexer.yacc.ISourcePosition; import org.jruby.runtime.Visibility; import org.rubypeople.rdt.core.IMethod; + import org.rubypeople.rdt.core.IRubyElement; import org.rubypeople.rdt.core.IRubyScript; import org.rubypeople.rdt.internal.core.parser.RubyParser; *************** *** 233,245 **** * (non-Javadoc) * - * @see org.jruby.ast.visitor.NodeVisitor#visitAttrSetNode(org.jruby.ast.AttrSetNode) - */ - public void visitAttrSetNode(AttrSetNode iVisited) { - handleNode(iVisited); - } - - /* - * (non-Javadoc) - * * @see org.jruby.ast.visitor.NodeVisitor#visitBackRefNode(org.jruby.ast.BackRefNode) */ --- 232,235 ---- *************** *** 448,452 **** public void visitClassNode(ClassNode iVisited) { handleNode(iVisited); ! String name = iVisited.getClassName(); RubyType handle = new RubyType(modelStack.peek(), name); modelStack.push(handle); --- 438,442 ---- public void visitClassNode(ClassNode iVisited) { handleNode(iVisited); ! String name = iVisited.getCPath().getName(); RubyType handle = new RubyType(modelStack.peek(), name); modelStack.push(handle); *************** *** 1165,1169 **** public void visitModuleNode(ModuleNode iVisited) { handleNode(iVisited); ! String name = iVisited.getName(); RubyModule module = new RubyModule(modelStack.peek(), name); modelStack.push(module); --- 1155,1159 ---- public void visitModuleNode(ModuleNode iVisited) { handleNode(iVisited); ! String name = iVisited.getCPath().getName(); RubyModule module = new RubyModule(modelStack.peek(), name); modelStack.push(module); |
|
From: David C. <dc...@us...> - 2005-10-09 22:14:14
|
Update of /cvsroot/rubyeclipse/org.rubypeople.rdt.core/lib In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21686/lib Modified Files: jruby.jar Log Message: Upgraded to JRuby head. More work on Updating the Symbol Index for class names. Index: jruby.jar =================================================================== RCS file: /cvsroot/rubyeclipse/org.rubypeople.rdt.core/lib/jruby.jar,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 Binary files /tmp/cvsFlGt7F and /tmp/cvs8DDjnz differ |
