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: Markus B. <mba...@us...> - 2005-07-13 14:30:09
|
Update of /cvsroot/rubyeclipse/org.rubypeople.rdt.debug.ui.tests/src/org/rubypeople/rdt/internal/debug/ui/tests In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4482/src/org/rubypeople/rdt/internal/debug/ui/tests Modified Files: TC_RubyConsoleTracker.java TC_RubySourceLocator.java Log Message: updates for 3.1 Index: TC_RubySourceLocator.java =================================================================== RCS file: /cvsroot/rubyeclipse/org.rubypeople.rdt.debug.ui.tests/src/org/rubypeople/rdt/internal/debug/ui/tests/TC_RubySourceLocator.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** TC_RubySourceLocator.java 14 Nov 2004 09:33:41 -0000 1.2 --- TC_RubySourceLocator.java 13 Jul 2005 14:29:55 -0000 1.3 *************** *** 202,205 **** --- 202,210 ---- return null; } + + public ILaunch launch(String mode, IProgressMonitor monitor, boolean build, boolean register) throws CoreException { + // TODO Auto-generated method stub + return null; + } } } Index: TC_RubyConsoleTracker.java =================================================================== RCS file: /cvsroot/rubyeclipse/org.rubypeople.rdt.debug.ui.tests/src/org/rubypeople/rdt/internal/debug/ui/tests/TC_RubyConsoleTracker.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** TC_RubyConsoleTracker.java 28 Mar 2005 23:23:02 -0000 1.2 --- TC_RubyConsoleTracker.java 13 Jul 2005 14:29:55 -0000 1.3 *************** *** 9,19 **** import org.eclipse.debug.core.model.IStreamMonitor; import org.eclipse.debug.core.model.IStreamsProxy; - import org.eclipse.debug.internal.ui.views.console.ConsoleOutputTextStore; import org.eclipse.debug.ui.console.IConsole; import org.eclipse.debug.ui.console.IConsoleHyperlink; import org.eclipse.jface.text.AbstractDocument; import org.eclipse.jface.text.DefaultLineTracker; import org.eclipse.jface.text.IDocument; import org.eclipse.jface.text.IRegion; import org.rubypeople.rdt.internal.debug.ui.console.RubyConsoleTracker; import org.rubypeople.rdt.internal.debug.ui.console.RubyStackTraceHyperlink; --- 9,22 ---- import org.eclipse.debug.core.model.IStreamMonitor; import org.eclipse.debug.core.model.IStreamsProxy; import org.eclipse.debug.ui.console.IConsole; import org.eclipse.debug.ui.console.IConsoleHyperlink; import org.eclipse.jface.text.AbstractDocument; import org.eclipse.jface.text.DefaultLineTracker; + import org.eclipse.jface.text.GapTextStore; import org.eclipse.jface.text.IDocument; import org.eclipse.jface.text.IRegion; + import org.eclipse.jface.text.hyperlink.IHyperlink; + import org.eclipse.ui.console.IOConsoleOutputStream; + import org.eclipse.ui.console.IPatternMatchListener; import org.rubypeople.rdt.internal.debug.ui.console.RubyConsoleTracker; import org.rubypeople.rdt.internal.debug.ui.console.RubyStackTraceHyperlink; *************** *** 115,119 **** } ! public void addLink(IConsoleHyperlink pLink, int pOffset, int pLength) { MetaLink metaLink = new MetaLink(); metaLink.link = (RubyStackTraceHyperlink) pLink ; --- 118,125 ---- } ! public void addLink(IConsoleHyperlink pLink, int pOffset, int pLength) { ! } ! ! public void addLink(org.eclipse.ui.console.IHyperlink pLink, int pOffset, int pLength) { MetaLink metaLink = new MetaLink(); metaLink.link = (RubyStackTraceHyperlink) pLink ; *************** *** 135,139 **** throw new RuntimeException("Not Implemented Exception"); } ! public IRegion getRegion(IConsoleHyperlink link) { throw new RuntimeException("Not Implemented Exception"); } --- 141,145 ---- throw new RuntimeException("Not Implemented Exception"); } ! public IRegion getRegion(IConsole link) { throw new RuntimeException("Not Implemented Exception"); } *************** *** 143,151 **** tracker.lineAppended(doc.getLineInformationOfOffset(1)) ; } } public class SimpleDocument extends AbstractDocument { public SimpleDocument() { ! this.setTextStore(new ConsoleOutputTextStore(1000)) ; setLineTracker(new DefaultLineTracker()); completeInitialization(); --- 149,183 ---- tracker.lineAppended(doc.getLineInformationOfOffset(1)) ; } + + public IRegion getRegion(IConsoleHyperlink link) { + // TODO Auto-generated method stub + return null; + } + + public IRegion getRegion(org.eclipse.ui.console.IHyperlink link) { + // TODO Auto-generated method stub + return null; + } + + public void addPatternMatchListener(IPatternMatchListener matchListener) { + // TODO Auto-generated method stub + + } + + public void removePatternMatchListener(IPatternMatchListener matchListener) { + // TODO Auto-generated method stub + + } + + public IOConsoleOutputStream getStream(String streamIdentifier) { + // TODO Auto-generated method stub + return null; + } } public class SimpleDocument extends AbstractDocument { public SimpleDocument() { ! // The text store is not really necessary, but there is a not null assert in AbstractDocument ! this.setTextStore(new GapTextStore(1,2)) ; setLineTracker(new DefaultLineTracker()); completeInitialization(); |
|
From: Markus B. <mba...@us...> - 2005-07-13 14:30:08
|
Update of /cvsroot/rubyeclipse/org.rubypeople.rdt.debug.ui.tests In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4482 Modified Files: plugin.xml Log Message: updates for 3.1 Index: plugin.xml =================================================================== RCS file: /cvsroot/rubyeclipse/org.rubypeople.rdt.debug.ui.tests/plugin.xml,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** plugin.xml 12 Mar 2005 15:41:00 -0000 1.12 --- plugin.xml 13 Jul 2005 14:29:54 -0000 1.13 *************** *** 33,36 **** --- 33,37 ---- <import plugin="org.rubypeople.rdt.debug.core"/> <import plugin="org.eclipse.core.runtime"/> + <import plugin="org.eclipse.ui.console"/> </requires> |
|
From: Markus B. <mba...@us...> - 2005-07-13 14:29:54
|
Update of /cvsroot/rubyeclipse/org.rubypeople.eclipse.shams/src/org/rubypeople/eclipse/shams/debug/core In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4336/src/org/rubypeople/eclipse/shams/debug/core Modified Files: ShamLaunchManager.java Log Message: updates for 3.1 Index: ShamLaunchManager.java =================================================================== RCS file: /cvsroot/rubyeclipse/org.rubypeople.eclipse.shams/src/org/rubypeople/eclipse/shams/debug/core/ShamLaunchManager.java,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** ShamLaunchManager.java 2 Mar 2005 00:52:41 -0000 1.9 --- ShamLaunchManager.java 13 Jul 2005 14:29:45 -0000 1.10 *************** *** 200,202 **** --- 200,207 ---- } + public Map getNativeEnvironmentCasePreserved() { + // TODO Auto-generated method stub + return null; + } + } |
|
From: Markus B. <mba...@us...> - 2005-07-13 14:29:54
|
Update of /cvsroot/rubyeclipse/org.rubypeople.eclipse.shams/src/org/rubypeople/eclipse/shams/resources In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4336/src/org/rubypeople/eclipse/shams/resources Modified Files: ShamFile.java ShamResource.java ShamProject.java Log Message: updates for 3.1 Index: ShamFile.java =================================================================== RCS file: /cvsroot/rubyeclipse/org.rubypeople.eclipse.shams/src/org/rubypeople/eclipse/shams/resources/ShamFile.java,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** ShamFile.java 27 Jun 2004 11:43:13 -0000 1.11 --- ShamFile.java 13 Jul 2005 14:29:45 -0000 1.12 *************** *** 5,8 **** --- 5,9 ---- import java.io.FileNotFoundException; import java.io.InputStream; + import java.io.Reader; import org.eclipse.core.resources.IContainer; *************** *** 14,17 **** --- 15,19 ---- import org.eclipse.core.resources.IResourceVisitor; import org.eclipse.core.resources.IWorkspace; + import org.eclipse.core.resources.ResourceAttributes; import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.IPath; *************** *** 302,304 **** --- 304,326 ---- return null; } + + public String getCharsetFor(Reader reader) throws CoreException { + // TODO Auto-generated method stub + return null; + } + + public ResourceAttributes getResourceAttributes() { + // TODO Auto-generated method stub + return null; + } + + public void revertModificationStamp(long value) throws CoreException { + // TODO Auto-generated method stub + + } + + public void setResourceAttributes(ResourceAttributes attributes) throws CoreException { + // TODO Auto-generated method stub + + } } Index: ShamProject.java =================================================================== RCS file: /cvsroot/rubyeclipse/org.rubypeople.eclipse.shams/src/org/rubypeople/eclipse/shams/resources/ShamProject.java,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** ShamProject.java 12 Mar 2005 15:41:42 -0000 1.9 --- ShamProject.java 13 Jul 2005 14:29:45 -0000 1.10 *************** *** 15,18 **** --- 15,19 ---- import org.eclipse.core.resources.IResourceVisitor; import org.eclipse.core.resources.IWorkspace; + import org.eclipse.core.resources.ResourceAttributes; import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.IPath; *************** *** 21,24 **** --- 22,26 ---- import org.eclipse.core.runtime.Path; import org.eclipse.core.runtime.QualifiedName; + import org.eclipse.core.runtime.content.IContentTypeMatcher; public class ShamProject extends ShamResource implements IProject { *************** *** 319,322 **** --- 321,344 ---- } + public IContentTypeMatcher getContentTypeMatcher() throws CoreException { + // TODO Auto-generated method stub + return null; + } + + public ResourceAttributes getResourceAttributes() { + // TODO Auto-generated method stub + return null; + } + + public void revertModificationStamp(long value) throws CoreException { + // TODO Auto-generated method stub + + } + + public void setResourceAttributes(ResourceAttributes attributes) throws CoreException { + // TODO Auto-generated method stub + + } + } Index: ShamResource.java =================================================================== RCS file: /cvsroot/rubyeclipse/org.rubypeople.eclipse.shams/src/org/rubypeople/eclipse/shams/resources/ShamResource.java,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** ShamResource.java 5 Mar 2005 15:19:23 -0000 1.6 --- ShamResource.java 13 Jul 2005 14:29:45 -0000 1.7 *************** *** 9,12 **** --- 9,13 ---- import org.eclipse.core.resources.IResourceVisitor; import org.eclipse.core.resources.IWorkspace; + import org.eclipse.core.resources.ResourceAttributes; import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.IPath; *************** *** 245,247 **** --- 246,263 ---- } + public ResourceAttributes getResourceAttributes() { + // TODO Auto-generated method stub + return null; + } + + public void revertModificationStamp(long value) throws CoreException { + // TODO Auto-generated method stub + + } + + public void setResourceAttributes(ResourceAttributes attributes) throws CoreException { + // TODO Auto-generated method stub + + } + } |
|
From: Markus B. <mba...@us...> - 2005-07-13 14:29:36
|
Update of /cvsroot/rubyeclipse/org.rubypeople.rdt.debug.core/src/org/rubypeople/rdt/internal/debug/core/parsing In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4253/src/org/rubypeople/rdt/internal/debug/core/parsing Modified Files: MultiReaderStrategy.java Log Message: updates for 3.1 Index: MultiReaderStrategy.java =================================================================== RCS file: /cvsroot/rubyeclipse/org.rubypeople.rdt.debug.core/src/org/rubypeople/rdt/internal/debug/core/parsing/MultiReaderStrategy.java,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** MultiReaderStrategy.java 9 Jan 2005 09:21:21 -0000 1.6 --- MultiReaderStrategy.java 13 Jul 2005 14:29:25 -0000 1.7 *************** *** 103,107 **** protected synchronized void removeReader(XmlStreamReader streamReader) { ! ((Thread) threads.get(streamReader)).interrupt(); threads.remove(streamReader); streamReaders.remove(streamReader); --- 103,113 ---- protected synchronized void removeReader(XmlStreamReader streamReader) { ! ! try { ! ((Thread) threads.get(streamReader)).interrupt(); ! } catch (RuntimeException e) { ! // TODO Auto-generated catch block ! e.printStackTrace(); ! } threads.remove(streamReader); streamReaders.remove(streamReader); |
|
From: Markus B. <mba...@us...> - 2005-07-13 14:28:21
|
Update of /cvsroot/rubyeclipse/org.rubypeople.rdt.debug.ui/src/org/rubypeople/rdt/internal/debug/ui/launcher In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3304/src/org/rubypeople/rdt/internal/debug/ui/launcher Modified Files: RubyApplicationShortcut.java Log Message: adaptable class moved from RubyElement to IRubyElement Index: RubyApplicationShortcut.java =================================================================== RCS file: /cvsroot/rubyeclipse/org.rubypeople.rdt.debug.ui/src/org/rubypeople/rdt/internal/debug/ui/launcher/RubyApplicationShortcut.java,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** RubyApplicationShortcut.java 5 Mar 2005 15:17:54 -0000 1.14 --- RubyApplicationShortcut.java 13 Jul 2005 14:27:48 -0000 1.15 *************** *** 69,73 **** return; } ! RubyElement rubyElement = (RubyElement) input.getAdapter(RubyElement.class); if (rubyElement == null) { log("Editor input is not a ruby file or external ruby file."); --- 69,73 ---- return; } ! RubyElement rubyElement = (RubyElement) input.getAdapter(IRubyElement.class); if (rubyElement == null) { log("Editor input is not a ruby file or external ruby file."); |
|
From: Markus B. <mba...@us...> - 2005-07-13 14:26:40
|
Update of /cvsroot/rubyeclipse/org.rubypeople.rdt.debug.core.tests/src/org/rubypeople/rdt/debug/core/tests In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2464/src/org/rubypeople/rdt/debug/core/tests Modified Files: TC_DebuggerCommunicationTest.java Log Message: correction to testException Index: TC_DebuggerCommunicationTest.java =================================================================== RCS file: /cvsroot/rubyeclipse/org.rubypeople.rdt.debug.core.tests/src/org/rubypeople/rdt/debug/core/tests/TC_DebuggerCommunicationTest.java,v retrieving revision 1.30 retrieving revision 1.31 diff -C2 -d -r1.30 -r1.31 *** TC_DebuggerCommunicationTest.java 12 Mar 2005 15:41:45 -0000 1.30 --- TC_DebuggerCommunicationTest.java 13 Jul 2005 14:26:28 -0000 1.31 *************** *** 257,261 **** assertEquals(getOSIndependent(getTmpDir() + "test.rb"), hit.getFile()); assertTrue(hit.isException()); ! assertEquals("message \\dir\\file: <xml/>", ((ExceptionSuspensionPoint) hit).getExceptionMessage()); assertEquals("RuntimeError", ((ExceptionSuspensionPoint) hit).getExceptionType()); out.println("cont"); --- 257,261 ---- assertEquals(getOSIndependent(getTmpDir() + "test.rb"), hit.getFile()); assertTrue(hit.isException()); ! assertEquals("message \\dir\\file: <xml/> <8>", ((ExceptionSuspensionPoint) hit).getExceptionMessage()); assertEquals("RuntimeError", ((ExceptionSuspensionPoint) hit).getExceptionType()); out.println("cont"); |
|
From: Markus B. <mba...@us...> - 2005-07-12 22:12:10
|
Update of /cvsroot/rubyeclipse/org.rubypeople.rdt.debug.ui/src/org/rubypeople/rdt/internal/debug/ui/console In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2665/src/org/rubypeople/rdt/internal/debug/ui/console Modified Files: RubyStackTraceHyperlink.java RubyConsoleTracker.java Log Message: update for 3.1 concerning IConsole Index: RubyStackTraceHyperlink.java =================================================================== RCS file: /cvsroot/rubyeclipse/org.rubypeople.rdt.debug.ui/src/org/rubypeople/rdt/internal/debug/ui/console/RubyStackTraceHyperlink.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** RubyStackTraceHyperlink.java 28 Mar 2005 23:22:40 -0000 1.4 --- RubyStackTraceHyperlink.java 12 Jul 2005 22:11:59 -0000 1.5 *************** *** 27,31 **** import org.eclipse.debug.core.model.ISourceLocator; import org.eclipse.debug.ui.console.IConsole; - import org.eclipse.debug.ui.console.IConsoleHyperlink; import org.eclipse.jface.text.BadLocationException; import org.eclipse.jface.text.IDocument; --- 27,30 ---- *************** *** 34,37 **** --- 33,37 ---- import org.eclipse.ui.IEditorPart; import org.eclipse.ui.PlatformUI; + import org.eclipse.ui.console.IHyperlink; import org.eclipse.ui.texteditor.IDocumentProvider; import org.eclipse.ui.texteditor.ITextEditor; *************** *** 43,47 **** * A hyperlink from a stack trace line of the form "*:*:" */ ! public class RubyStackTraceHyperlink implements IConsoleHyperlink { private IConsole fConsole; --- 43,47 ---- * A hyperlink from a stack trace line of the form "*:*:" */ ! public class RubyStackTraceHyperlink implements IHyperlink { private IConsole fConsole; *************** *** 54,63 **** /** ! * @see org.eclipse.debug.ui.console.IConsoleHyperlink#linkEntered() */ public void linkEntered() {} /** ! * @see org.eclipse.debug.ui.console.IConsoleHyperlink#linkExited() */ public void linkExited() {} --- 54,63 ---- /** ! * @see org.eclipse.debug.ui.console.IHyperlink#linkEntered() */ public void linkEntered() {} /** ! * @see org.eclipse.debug.ui.console.IHyperlink#linkExited() */ public void linkExited() {} *************** *** 87,91 **** /** ! * @see org.eclipse.debug.ui.console.IConsoleHyperlink#linkActivated() */ public void linkActivated() { --- 87,91 ---- /** ! * @see org.eclipse.debug.ui.console.IHyperlink#linkActivated() */ public void linkActivated() { Index: RubyConsoleTracker.java =================================================================== RCS file: /cvsroot/rubyeclipse/org.rubypeople.rdt.debug.ui/src/org/rubypeople/rdt/internal/debug/ui/console/RubyConsoleTracker.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** RubyConsoleTracker.java 28 Mar 2005 23:22:40 -0000 1.4 --- RubyConsoleTracker.java 12 Jul 2005 22:12:00 -0000 1.5 *************** *** 24,31 **** import org.eclipse.debug.ui.console.IConsole; - import org.eclipse.debug.ui.console.IConsoleHyperlink; import org.eclipse.debug.ui.console.IConsoleLineTracker; import org.eclipse.jface.text.BadLocationException; import org.eclipse.jface.text.IRegion; import org.rubypeople.rdt.internal.ui.util.StackTraceLine; --- 24,31 ---- import org.eclipse.debug.ui.console.IConsole; import org.eclipse.debug.ui.console.IConsoleLineTracker; import org.eclipse.jface.text.BadLocationException; import org.eclipse.jface.text.IRegion; + import org.eclipse.ui.console.IHyperlink; import org.rubypeople.rdt.internal.ui.util.StackTraceLine; *************** *** 93,97 **** if (! existanceChecker.fileExists(stackTraceLine.getFilename())) return; ! IConsoleHyperlink link = new RubyStackTraceHyperlink(fConsole, stackTraceLine); fConsole.addLink(link, line.getOffset() + prefix + stackTraceLine.offset() , stackTraceLine.length()); --- 93,97 ---- if (! existanceChecker.fileExists(stackTraceLine.getFilename())) return; ! IHyperlink link = new RubyStackTraceHyperlink(fConsole, stackTraceLine); fConsole.addLink(link, line.getOffset() + prefix + stackTraceLine.offset() , stackTraceLine.length()); |
|
From: Markus B. <mba...@us...> - 2005-07-12 22:12:09
|
Update of /cvsroot/rubyeclipse/org.rubypeople.rdt.debug.ui In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2665 Modified Files: plugin.xml Log Message: update for 3.1 concerning IConsole Index: plugin.xml =================================================================== RCS file: /cvsroot/rubyeclipse/org.rubypeople.rdt.debug.ui/plugin.xml,v retrieving revision 1.41 retrieving revision 1.42 diff -C2 -d -r1.41 -r1.42 *** plugin.xml 28 Mar 2005 23:22:39 -0000 1.41 --- plugin.xml 12 Jul 2005 22:11:59 -0000 1.42 *************** *** 30,33 **** --- 30,34 ---- <import plugin="org.eclipse.ui.cheatsheets"/> <import plugin="org.eclipse.core.runtime"/> + <import plugin="org.eclipse.ui.console"/> </requires> *************** *** 146,163 **** </extension> <extension - point="org.eclipse.debug.ui.debugActionGroups"> - <debugActionGroup - name="%RubyDebugActionGroup.name" - visible="true" - id="org.rubypeople.rdt.debug.ui.rubyDebugActionGroup"> - <action - id="org.rubypeople.rdt.ui.variableViewActions.ShowStatic"> - </action> - <action - id="org.rubypeople.rdt.ui.variableViewActions.ShowConstants"> - </action> - </debugActionGroup> - </extension> - <extension point="org.eclipse.ui.contexts"> <context --- 147,150 ---- |
|
From: Markus B. <mba...@us...> - 2005-07-12 22:11:05
|
Update of /cvsroot/rubyeclipse/org.rubypeople.rdt.debug.ui/src/org/rubypeople/rdt/internal/debug/ui/launcher In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2110/src/org/rubypeople/rdt/internal/debug/ui/launcher Modified Files: RubyEnvironmentTab.java Log Message: Update for 3.1: replaced ListContentProvider with ArrayContentProvider Index: RubyEnvironmentTab.java =================================================================== RCS file: /cvsroot/rubyeclipse/org.rubypeople.rdt.debug.ui/src/org/rubypeople/rdt/internal/debug/ui/launcher/RubyEnvironmentTab.java,v retrieving revision 1.20 retrieving revision 1.21 diff -C2 -d -r1.20 -r1.21 *** RubyEnvironmentTab.java 5 Mar 2005 16:02:45 -0000 1.20 --- RubyEnvironmentTab.java 12 Jul 2005 22:10:56 -0000 1.21 *************** *** 9,12 **** --- 9,13 ---- import org.eclipse.debug.core.ILaunchConfigurationWorkingCopy; import org.eclipse.debug.ui.AbstractLaunchConfigurationTab; + import org.eclipse.jface.viewers.ArrayContentProvider; import org.eclipse.jface.viewers.ListViewer; import org.eclipse.swt.SWT; *************** *** 25,29 **** import org.eclipse.swt.widgets.TabFolder; import org.eclipse.swt.widgets.TabItem; - import org.eclipse.ui.internal.dialogs.ListContentProvider; import org.rubypeople.rdt.core.RubyCore; import org.rubypeople.rdt.internal.core.LoadPathEntry; --- 26,29 ---- *************** *** 63,67 **** loadPathListViewer = new ListViewer(loadPathComposite, SWT.BORDER | SWT.MULTI | SWT.V_SCROLL | SWT.H_SCROLL); ! loadPathListViewer.setContentProvider(new ListContentProvider()); loadPathListViewer.setLabelProvider(new LoadPathEntryLabelProvider()); loadPathListViewer.getList().setLayoutData(new GridData(GridData.FILL_BOTH)); --- 63,67 ---- loadPathListViewer = new ListViewer(loadPathComposite, SWT.BORDER | SWT.MULTI | SWT.V_SCROLL | SWT.H_SCROLL); ! loadPathListViewer.setContentProvider(new ArrayContentProvider()); loadPathListViewer.setLabelProvider(new LoadPathEntryLabelProvider()); loadPathListViewer.getList().setLayoutData(new GridData(GridData.FILL_BOTH)); |
|
From: Markus B. <mba...@us...> - 2005-07-12 22:09:56
|
Update of /cvsroot/rubyeclipse/org.rubypeople.rdt.ui/src/org/rubypeople/rdt/internal/ui/rubyeditor In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1272/src/org/rubypeople/rdt/internal/ui/rubyeditor Modified Files: RubyDocumentProvider.java Log Message: removed computeSchedulingRule Index: RubyDocumentProvider.java =================================================================== RCS file: /cvsroot/rubyeclipse/org.rubypeople.rdt.ui/src/org/rubypeople/rdt/internal/ui/rubyeditor/RubyDocumentProvider.java,v retrieving revision 1.18 retrieving revision 1.19 diff -C2 -d -r1.18 -r1.19 *** RubyDocumentProvider.java 1 Apr 2005 01:59:20 -0000 1.18 --- RubyDocumentProvider.java 12 Jul 2005 22:09:40 -0000 1.19 *************** *** 319,323 **** * @return the minimal scheduling rule needed to modify or create a resource */ ! private ISchedulingRule computeSchedulingRule(IResource toCreateOrModify) { IResourceRuleFactory factory= ResourcesPlugin.getWorkspace().getRuleFactory(); if (toCreateOrModify.exists()) { --- 319,324 ---- * @return the minimal scheduling rule needed to modify or create a resource */ ! /* should call the inherited computeSchedulingRule now ! protected ISchedulingRule computeSchedulingRule(IResource toCreateOrModify) { IResourceRuleFactory factory= ResourcesPlugin.getWorkspace().getRuleFactory(); if (toCreateOrModify.exists()) { *************** *** 332,336 **** return factory.createRule(toCreateOrModify); } ! /** * @param element --- 333,338 ---- return factory.createRule(toCreateOrModify); } ! */ ! /** * @param element |
|
From: Zach D. <zd...@us...> - 2005-07-12 00:05:12
|
Update of /cvsroot/rubyeclipse/org.rubypeople.rdt.ui/src/org/rubypeople/rdt/internal/ui In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12456/src/org/rubypeople/rdt/internal/ui Modified Files: RubyPluginImages.java Log Message: Changes to fix rdt bug 959808. Index: RubyPluginImages.java =================================================================== RCS file: /cvsroot/rubyeclipse/org.rubypeople.rdt.ui/src/org/rubypeople/rdt/internal/ui/RubyPluginImages.java,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** RubyPluginImages.java 12 Mar 2005 15:32:31 -0000 1.8 --- RubyPluginImages.java 12 Jul 2005 00:05:03 -0000 1.9 *************** *** 45,48 **** --- 45,51 ---- public static final String IMG_CTOOLS_RUBYMETHOD_PRO = NAME_PREFIX + "ruby_method_pro.gif"; public static final String IMG_CTOOLS_RUBYMETHOD_PUB = NAME_PREFIX + "ruby_method_pub.gif"; + public static final String IMG_CTOOLS_RUBY_SINGLETONMETHOD = NAME_PREFIX + "ruby_singletonmethod.gif"; + public static final String IMG_CTOOLS_RUBY_SINGLETONMETHOD_PUB = NAME_PREFIX + "ruby_singletonmethod_pub.gif"; + public static final String IMG_CTOOLS_RUBY_SINGLETONMETHOD_PRO = NAME_PREFIX + "ruby_singletonmethod_pro.gif"; public static final String IMG_CTOOLS_RUBY_CLASS_VAR = NAME_PREFIX + "ruby_class_var.gif"; public static final String IMG_CTOOLS_RUBY_INSTANCE_VAR = NAME_PREFIX + "ruby_instance_var.gif"; *************** *** 79,82 **** --- 82,88 ---- createManaged(T_CTOOL, IMG_CTOOLS_RUBYMETHOD_PRO); createManaged(T_CTOOL, IMG_CTOOLS_RUBYMETHOD_PUB); + createManaged(T_CTOOL, IMG_CTOOLS_RUBY_SINGLETONMETHOD ); + createManaged(T_CTOOL, IMG_CTOOLS_RUBY_SINGLETONMETHOD_PUB ); + createManaged(T_CTOOL, IMG_CTOOLS_RUBY_SINGLETONMETHOD_PRO ); createManaged(T_CTOOL, IMG_CTOOLS_RUBY_CLASS_VAR); createManaged(T_CTOOL, IMG_CTOOLS_RUBY_CONSTANT); |
|
From: Zach D. <zd...@us...> - 2005-07-12 00:05:12
|
Update of /cvsroot/rubyeclipse/org.rubypeople.rdt.ui/src/org/rubypeople/rdt/ui In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12456/src/org/rubypeople/rdt/ui Modified Files: RubyElementLabelProvider.java Log Message: Changes to fix rdt bug 959808. Index: RubyElementLabelProvider.java =================================================================== RCS file: /cvsroot/rubyeclipse/org.rubypeople.rdt.ui/src/org/rubypeople/rdt/ui/RubyElementLabelProvider.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** RubyElementLabelProvider.java 12 Mar 2005 15:32:34 -0000 1.4 --- RubyElementLabelProvider.java 12 Jul 2005 00:05:03 -0000 1.5 *************** *** 30,33 **** --- 30,44 ---- if (rubyElement.isType(IRubyElement.LOCAL_VAR)) return RubyPluginImages.get(RubyPluginImages.IMG_CTOOLS_RUBY_LOCAL_VAR); if (rubyElement.isType(IRubyElement.IMPORT)) return RubyPluginImages.get(RubyPluginImages.IMG_CTOOLS_RUBY_IMPORT); + if (rubyElement.isType(IRubyElement.SINGLETON_METHOD)) { + IMethod method = (IMethod) rubyElement; + try { + if (method.getVisibility() == IMethod.PUBLIC) { return RubyPluginImages.get(RubyPluginImages.IMG_CTOOLS_RUBY_SINGLETONMETHOD_PUB); } + if (method.getVisibility() == IMethod.PROTECTED) { return RubyPluginImages.get(RubyPluginImages.IMG_CTOOLS_RUBY_SINGLETONMETHOD_PRO); } + } catch (RubyModelException e) { + RubyPlugin.log(e); + } + // assume it's private + return RubyPluginImages.get(RubyPluginImages.IMG_CTOOLS_RUBY_SINGLETONMETHOD); + } if (rubyElement.isType(IRubyElement.METHOD)) { IMethod method = (IMethod) rubyElement; |
|
From: Zach D. <zd...@us...> - 2005-07-12 00:05:11
|
Update of /cvsroot/rubyeclipse/org.rubypeople.rdt.ui/icons/full/ctool16 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12456/icons/full/ctool16 Added Files: ruby_singletonmethod_pub.gif ruby_singletonmethod.gif ruby_singletonmethod_pro.gif Log Message: Changes to fix rdt bug 959808. --- NEW FILE: ruby_singletonmethod_pro.gif --- (This appears to be a binary file; contents omitted.) --- NEW FILE: ruby_singletonmethod_pub.gif --- (This appears to be a binary file; contents omitted.) --- NEW FILE: ruby_singletonmethod.gif --- (This appears to be a binary file; contents omitted.) |
|
From: Zach D. <zd...@us...> - 2005-07-12 00:03:50
|
Update of /cvsroot/rubyeclipse/org.rubypeople.rdt.core/src/org/rubypeople/rdt/internal/core In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11409/src/org/rubypeople/rdt/internal/core Modified Files: RubyScriptStructureBuilder.java Added Files: RubySingletonMethod.java Log Message: Changes to fix rdt bug 959808. --- NEW FILE: RubySingletonMethod.java --- /* * Created on Jul 10, 2005 * * TODO To change the template for this generated file go to * Window - Preferences - Java - Code Style - Code Templates */ package org.rubypeople.rdt.internal.core; /** * RubySingletonMethod represents a singleton method in ruby. Example: * [code] * class A * def self.method1 * end * * def A.method2 * end * * class << self * def method3 * end * end * end * [/code] * * @author zdennis */ public class RubySingletonMethod extends RubyMethod { /** * @param parent * @param name */ public RubySingletonMethod(RubyElement parent, String name) { super(parent, name); // TODO Auto-generated constructor stub } /* * (non-Javadoc) * @see org.rubypeople.rdt.core.IRubyElement#getElementType() */ public int getElementType(){ return RubyElement.SINGLETON_METHOD; } } Index: RubyScriptStructureBuilder.java =================================================================== RCS file: /cvsroot/rubyeclipse/org.rubypeople.rdt.core/src/org/rubypeople/rdt/internal/core/RubyScriptStructureBuilder.java,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** RubyScriptStructureBuilder.java 12 Mar 2005 15:30:03 -0000 1.7 --- RubyScriptStructureBuilder.java 12 Jul 2005 00:03:06 -0000 1.8 *************** *** 679,709 **** } - /* - * (non-Javadoc) - * - * @see org.jruby.ast.visitor.NodeVisitor#visitDefsNode(org.jruby.ast.DefsNode) - */ - public void visitDefsNode(DefsNode iVisited) { - handleNode(iVisited); - RubyElement type = getCurrentType(); - RubyMethod method = new RubyMethod(type, iVisited.getName()); - modelStack.push(method); ! RubyMethodElementInfo info = new RubyMethodElementInfo(); ! info.setArgumentNames(getArgs(iVisited.getArgsNode())); ! // TODO Set more info! ! infoStack.push(info); ! newElements.put(method, info); ! // FIXME Evaluate the receiver! ! visitNode(iVisited.getReceiverNode()); ! visitNode(iVisited.getArgsNode()); ! visitNode(iVisited.getBodyNode()); ! modelStack.pop(); ! infoStack.pop(); ! } /* * (non-Javadoc) --- 679,746 ---- } ! /* ! * (non-Javadoc) ! * ! * @see org.jruby.ast.visitor.NodeVisitor#visitDefsNode(org.jruby.ast.DefsNode) ! */ ! public void visitDefsNode(DefsNode iVisited) { ! handleNode(iVisited); ! ! // Get the information no the current parent of this method ! RubyElementInfo parentInfo = infoStack.peek(); ! ! /* Get the name of the current static method and add the name of the ! * class or module to the beginning of it. This avoids instance method ! * naming conflicts. e.g.: ! * class A ! * def self.method; end ! * def method; end ! * end ! * will give us: ! * A.method ! * method ! * in the Outline View. ! */ ! String name; ! if( parentInfo instanceof RubyTypeElementInfo ){ ! name = new String(((RubyTypeElementInfo)parentInfo).getName()) ! + "." + iVisited.getName(); } ! else{ ! name = iVisited.getName(); } ! ! // Get the visibility of the current static method ! Visibility visibility = currentVisibility; ! ! // Get the type of the current parent element ! RubyElement type = getCurrentType(); ! RubyMethod method = new RubySingletonMethod(type, name); ! modelStack.push(method); ! ! parentInfo.addChild( method ); ! ! RubyMethodElementInfo info = new RubyMethodElementInfo(); ! ! // TODO Set more info! ! infoStack.push(info); ! ISourcePosition pos = iVisited.getPosition(); ! setKeywordRange("def", pos, info, name); ! ! info.setArgumentNames(getArgs(iVisited.getArgsNode())); ! info.setVisibility(convertVisibility(visibility)); ! newElements.put(method, info); ! // FIXME Evaluate the receiver! ! visitNode(iVisited.getReceiverNode()); ! visitNode(iVisited.getArgsNode()); ! visitNode(iVisited.getBodyNode()); ! ! modelStack.pop(); ! infoStack.pop(); ! } + /* * (non-Javadoc) |
|
From: Zach D. <zd...@us...> - 2005-07-12 00:03:27
|
Update of /cvsroot/rubyeclipse/org.rubypeople.rdt.core/src/org/rubypeople/rdt/core In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11409/src/org/rubypeople/rdt/core Modified Files: IRubyElement.java Log Message: Changes to fix rdt bug 959808. Index: IRubyElement.java =================================================================== RCS file: /cvsroot/rubyeclipse/org.rubypeople.rdt.core/src/org/rubypeople/rdt/core/IRubyElement.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** IRubyElement.java 11 Mar 2005 01:59:05 -0000 1.4 --- IRubyElement.java 12 Jul 2005 00:03:09 -0000 1.5 *************** *** 47,50 **** --- 47,51 ---- public static final int FIELD = 13; public static final int IMPORT_CONTAINER = 14; + public static final int SINGLETON_METHOD = 15; /** |
|
From: David C. <dc...@ma...> - 2005-07-09 20:35:22
|
If configured correctly, you shouldn't be able to post to this list. This list is emailed with a diff of every commit made. On Saturday 09 July 2005 04:02 pm, Zach Dennis wrote: > Whats the difference between this and the dev list? > > Zach > > > ------------------------------------------------------- > This SF.Net email is sponsored by the 'Do More With Dual!' webinar > happening July 14 at 8am PDT/11am EDT. We invite you to explore the latest > in dual core and dual graphics technology at this free one hour event > hosted by HP, AMD, and NVIDIA. To register visit > http://www.hp.com/go/dualwebinar > _______________________________________________ > Rubyeclipse-commit mailing list > Rub...@li... > https://lists.sourceforge.net/lists/listinfo/rubyeclipse-commit |
|
From: Zach D. <zd...@mk...> - 2005-07-09 20:01:44
|
Whats the difference between this and the dev list? Zach |
|
From: Christopher W. <caw...@us...> - 2005-04-02 20:39:26
|
Update of /cvsroot/rubyeclipse/org.rubypeople.rdt In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32078 Modified Files: Changelog.txt Log Message: Index: Changelog.txt =================================================================== RCS file: /cvsroot/rubyeclipse/org.rubypeople.rdt/Changelog.txt,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** Changelog.txt 7 Mar 2005 21:09:05 -0000 1.3 --- Changelog.txt 2 Apr 2005 20:39:13 -0000 1.4 *************** *** 24,26 **** * Tab jumps to correct position * Fixed bug [1098315]: Incorrect formatting if semicolon are used directly attached to keywords, i.e. no separating spaces ! * Test::Unit tests can be launched in debug mode \ No newline at end of file --- 24,27 ---- * Tab jumps to correct position * Fixed bug [1098315]: Incorrect formatting if semicolon are used directly attached to keywords, i.e. no separating spaces ! * Test::Unit tests can be launched in debug mode ! * Syntax highlighting (and customization) of regular expressions and commands |
|
From: Christopher W. <caw...@us...> - 2005-04-01 02:12:17
|
Update of /cvsroot/rubyeclipse/org.rubypeople.rdt.ui/src/org/rubypeople/rdt/internal/ui/preferences In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23324/src/org/rubypeople/rdt/internal/ui/preferences Modified Files: TextEditorPreferencePage2.java Log Message: highlight and partition shell commands separately from code. Index: TextEditorPreferencePage2.java =================================================================== RCS file: /cvsroot/rubyeclipse/org.rubypeople.rdt.ui/src/org/rubypeople/rdt/internal/ui/preferences/TextEditorPreferencePage2.java,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** TextEditorPreferencePage2.java 1 Apr 2005 01:59:20 -0000 1.14 --- TextEditorPreferencePage2.java 1 Apr 2005 02:11:34 -0000 1.15 *************** *** 69,73 **** protected TextPropertyWidget[] textPropertyWidgets; protected Text indentationWidget; ! protected final String[] colorProperties = { IRubyColorConstants.RUBY_KEYWORD, IRubyColorConstants.RUBY_MULTI_LINE_COMMENT, IRubyColorConstants.RUBY_SINGLE_LINE_COMMENT, IRubyColorConstants.RUBY_STRING, IRubyColorConstants.TASK_TAG, IRubyColorConstants.RUBY_REGEXP, IRubyColorConstants.RUBY_DEFAULT}; //private final String[][] fAnnotationColorListModel; --- 69,73 ---- protected TextPropertyWidget[] textPropertyWidgets; protected Text indentationWidget; ! protected final String[] colorProperties = { IRubyColorConstants.RUBY_KEYWORD, IRubyColorConstants.RUBY_MULTI_LINE_COMMENT, IRubyColorConstants.RUBY_SINGLE_LINE_COMMENT, IRubyColorConstants.RUBY_STRING, IRubyColorConstants.TASK_TAG, IRubyColorConstants.RUBY_REGEXP, IRubyColorConstants.RUBY_COMMAND, IRubyColorConstants.RUBY_DEFAULT}; //private final String[][] fAnnotationColorListModel; |
|
From: Christopher W. <caw...@us...> - 2005-04-01 02:11:52
|
Update of /cvsroot/rubyeclipse/org.rubypeople.rdt.ui/src/org/rubypeople/rdt/internal/ui/text In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23324/src/org/rubypeople/rdt/internal/ui/text Modified Files: RubySourceViewerConfiguration.java IRubyColorConstants.java RubyPartitionScanner.java RubyTextTools.java Log Message: highlight and partition shell commands separately from code. Index: RubyPartitionScanner.java =================================================================== RCS file: /cvsroot/rubyeclipse/org.rubypeople.rdt.ui/src/org/rubypeople/rdt/internal/ui/text/RubyPartitionScanner.java,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** RubyPartitionScanner.java 1 Apr 2005 01:59:20 -0000 1.7 --- RubyPartitionScanner.java 1 Apr 2005 02:11:42 -0000 1.8 *************** *** 19,24 **** public static final String SINGLE_LINE_COMMENT = "partition_scanner_ruby_singleline_comment"; public static final String REGULAR_EXPRESSION = "partition_scanner_ruby_regular_expression"; ! public static final String[] LEGAL_CONTENT_TYPES = {STRING, MULTI_LINE_COMMENT, SINGLE_LINE_COMMENT, REGULAR_EXPRESSION}; public RubyPartitionScanner() { --- 19,25 ---- public static final String SINGLE_LINE_COMMENT = "partition_scanner_ruby_singleline_comment"; public static final String REGULAR_EXPRESSION = "partition_scanner_ruby_regular_expression"; + public static final String COMMAND = "partition_scanner_ruby_command"; ! public static final String[] LEGAL_CONTENT_TYPES = {STRING, MULTI_LINE_COMMENT, SINGLE_LINE_COMMENT, REGULAR_EXPRESSION, COMMAND}; public RubyPartitionScanner() { *************** *** 32,35 **** --- 33,37 ---- IToken singleLineComment = new Token(SINGLE_LINE_COMMENT); IToken regexp = new Token(REGULAR_EXPRESSION); + IToken command = new Token(COMMAND); List rules = new ArrayList(); *************** *** 50,53 **** --- 52,59 ---- createGeneralDelimitedRules(rules, "%r", regexp, '\\'); + // Commands + rules.add(new SingleLineRule("`", "`", command, '\\')); + createGeneralDelimitedRules(rules, "%x", command, '\\'); + // Single line comments rules.add(new EndOfLineRule("#", singleLineComment)); Index: RubyTextTools.java =================================================================== RCS file: /cvsroot/rubyeclipse/org.rubypeople.rdt.ui/src/org/rubypeople/rdt/internal/ui/text/RubyTextTools.java,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** RubyTextTools.java 1 Apr 2005 01:59:20 -0000 1.9 --- RubyTextTools.java 1 Apr 2005 02:11:42 -0000 1.10 *************** *** 47,50 **** --- 47,51 ---- private PreferenceListener fPreferenceListener = new PreferenceListener(); private SingleTokenRubyCodeScanner fRegexpScanner; + private SingleTokenRubyCodeScanner fCommandScanner; /** *************** *** 105,109 **** stringScanner = new SingleTokenRubyCodeScanner(fColorManager, store, IRubyColorConstants.RUBY_STRING); fRegexpScanner = new SingleTokenRubyCodeScanner(fColorManager, store, IRubyColorConstants.RUBY_REGEXP); ! fPreferenceStore = store; fPreferenceStore.addPropertyChangeListener(fPreferenceListener); --- 106,111 ---- stringScanner = new SingleTokenRubyCodeScanner(fColorManager, store, IRubyColorConstants.RUBY_STRING); fRegexpScanner = new SingleTokenRubyCodeScanner(fColorManager, store, IRubyColorConstants.RUBY_REGEXP); ! fCommandScanner = new SingleTokenRubyCodeScanner(fColorManager, store, IRubyColorConstants.RUBY_COMMAND); ! fPreferenceStore = store; fPreferenceStore.addPropertyChangeListener(fPreferenceListener); *************** *** 131,134 **** --- 133,137 ---- if (stringScanner.affectsBehavior(event)) stringScanner.adaptToPreferenceChange(event); if (fRegexpScanner.affectsBehavior(event)) fRegexpScanner.adaptToPreferenceChange(event); + if (fCommandScanner.affectsBehavior(event)) fCommandScanner.adaptToPreferenceChange(event); // if (fJavaDocScanner.affectsBehavior(event)) // fJavaDocScanner.adaptToPreferenceChange(event); *************** *** 184,188 **** || fSinglelineCommentScanner.affectsBehavior(event) || stringScanner.affectsBehavior(event) ! || fRegexpScanner.affectsBehavior(event); } --- 187,192 ---- || fSinglelineCommentScanner.affectsBehavior(event) || stringScanner.affectsBehavior(event) ! || fRegexpScanner.affectsBehavior(event) ! || fCommandScanner.affectsBehavior(event); } *************** *** 218,221 **** --- 222,226 ---- stringScanner = null; fRegexpScanner = null; + fCommandScanner = null; // fJavaDocScanner= null; partitionScanner = null; *************** *** 243,245 **** --- 248,254 ---- } + public ITokenScanner getCommandScanner() { + return fCommandScanner; + } + } Index: RubySourceViewerConfiguration.java =================================================================== RCS file: /cvsroot/rubyeclipse/org.rubypeople.rdt.ui/src/org/rubypeople/rdt/internal/ui/text/RubySourceViewerConfiguration.java,v retrieving revision 1.19 retrieving revision 1.20 diff -C2 -d -r1.19 -r1.20 *** RubySourceViewerConfiguration.java 1 Apr 2005 01:59:20 -0000 1.19 --- RubySourceViewerConfiguration.java 1 Apr 2005 02:11:38 -0000 1.20 *************** *** 60,66 **** --- 60,75 ---- reconciler.setRepairer(dr, RubyPartitionScanner.REGULAR_EXPRESSION); + dr = new DefaultDamagerRepairer(getCommandScanner()); + reconciler.setDamager(dr, RubyPartitionScanner.COMMAND); + reconciler.setRepairer(dr, RubyPartitionScanner.COMMAND); + + return reconciler; } + private ITokenScanner getCommandScanner() { + return textTools.getCommandScanner(); + } + protected ITokenScanner getCodeScanner() { return textTools.getCodeScanner(); Index: IRubyColorConstants.java =================================================================== RCS file: /cvsroot/rubyeclipse/org.rubypeople.rdt.ui/src/org/rubypeople/rdt/internal/ui/text/IRubyColorConstants.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** IRubyColorConstants.java 1 Apr 2005 01:59:20 -0000 1.3 --- IRubyColorConstants.java 1 Apr 2005 02:11:42 -0000 1.4 *************** *** 7,10 **** --- 7,11 ---- public static final String RUBY_STRING = RUBY_COLOR_PREFIX + "string"; public static final String RUBY_REGEXP = RUBY_COLOR_PREFIX + "regexp"; + public static final String RUBY_COMMAND = RUBY_COLOR_PREFIX + "command"; public static final String RUBY_MULTI_LINE_COMMENT = RUBY_COLOR_PREFIX + "multiline_comment"; |
|
From: Christopher W. <caw...@us...> - 2005-04-01 02:11:51
|
Update of /cvsroot/rubyeclipse/org.rubypeople.rdt.ui/src/org/rubypeople/rdt/internal/ui In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23324/src/org/rubypeople/rdt/internal/ui Modified Files: RubyUIMessages.properties RubyPlugin.java Log Message: highlight and partition shell commands separately from code. Index: RubyPlugin.java =================================================================== RCS file: /cvsroot/rubyeclipse/org.rubypeople.rdt.ui/src/org/rubypeople/rdt/internal/ui/RubyPlugin.java,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** RubyPlugin.java 1 Apr 2005 01:59:20 -0000 1.8 --- RubyPlugin.java 1 Apr 2005 02:11:43 -0000 1.9 *************** *** 205,208 **** --- 205,211 ---- store.setDefault(RUBY_REGEXP + PreferenceConstants.EDITOR_BOLD_SUFFIX, false); store.setDefault(RUBY_REGEXP + PreferenceConstants.EDITOR_ITALIC_SUFFIX, false); + PreferenceConverter.setDefault(store, RUBY_COMMAND, new RGB(0, 128, 128)); + store.setDefault(RUBY_COMMAND + PreferenceConstants.EDITOR_BOLD_SUFFIX, false); + store.setDefault(RUBY_COMMAND + PreferenceConstants.EDITOR_ITALIC_SUFFIX, false); PreferenceConverter.setDefault(store, RUBY_MULTI_LINE_COMMENT, new RGB(63, 127, 95)); store.setDefault(RUBY_MULTI_LINE_COMMENT + PreferenceConstants.EDITOR_BOLD_SUFFIX, false); Index: RubyUIMessages.properties =================================================================== RCS file: /cvsroot/rubyeclipse/org.rubypeople.rdt.ui/src/org/rubypeople/rdt/internal/ui/RubyUIMessages.properties,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** RubyUIMessages.properties 1 Apr 2005 01:59:20 -0000 1.4 --- RubyUIMessages.properties 1 Apr 2005 02:11:42 -0000 1.5 *************** *** 59,62 **** --- 59,63 ---- RubyEditorPropertyPage.color_ruby_task=Task Tags RubyEditorPropertyPage.color_ruby_regexp=Regular Expressions + RubyEditorPropertyPage.color_ruby_command=Shell Commands RubyEditorPropertyPage.indentation=Characters per indentation level: RubyEditorPropertyPage.useTab=Use tab (if disabled, typed tabs are also converted to spaces) |
|
From: Christopher W. <caw...@us...> - 2005-04-01 01:59:32
|
Update of /cvsroot/rubyeclipse/org.rubypeople.rdt.ui/src/org/rubypeople/rdt/internal/ui/text In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16048/src/org/rubypeople/rdt/internal/ui/text Modified Files: RubySourceViewerConfiguration.java IRubyColorConstants.java RubyPartitionScanner.java RubyTextTools.java Log Message: highlight and partition regular expressions separately from code. Handle more ways of defining strings and regexps (like %r, %q, %Q, etc) for syntax highlighting Index: RubyPartitionScanner.java =================================================================== RCS file: /cvsroot/rubyeclipse/org.rubypeople.rdt.ui/src/org/rubypeople/rdt/internal/ui/text/RubyPartitionScanner.java,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** RubyPartitionScanner.java 2 Mar 2005 00:56:49 -0000 1.6 --- RubyPartitionScanner.java 1 Apr 2005 01:59:20 -0000 1.7 *************** *** 15,25 **** - public final static String SKIP = "partition_scanner_ruby_skip"; public final static String STRING = "partition_scanner_ruby_string"; public final static String MULTI_LINE_COMMENT = "partition_scanner_ruby_multiline_comment"; public static final String SINGLE_LINE_COMMENT = "partition_scanner_ruby_singleline_comment"; ! public static final String[] LEGAL_CONTENT_TYPES = {STRING, MULTI_LINE_COMMENT, SINGLE_LINE_COMMENT}; ! ! public RubyPartitionScanner() { super(); --- 15,25 ---- public final static String STRING = "partition_scanner_ruby_string"; public final static String MULTI_LINE_COMMENT = "partition_scanner_ruby_multiline_comment"; public static final String SINGLE_LINE_COMMENT = "partition_scanner_ruby_singleline_comment"; ! public static final String REGULAR_EXPRESSION = "partition_scanner_ruby_regular_expression"; ! ! public static final String[] LEGAL_CONTENT_TYPES = {STRING, MULTI_LINE_COMMENT, SINGLE_LINE_COMMENT, REGULAR_EXPRESSION}; ! public RubyPartitionScanner() { super(); *************** *** 28,35 **** protected void initialize() { - IToken skip = new Token(SKIP); IToken string = new Token(STRING); IToken multiLineComment = new Token(MULTI_LINE_COMMENT); IToken singleLineComment = new Token(SINGLE_LINE_COMMENT); List rules = new ArrayList(); --- 28,35 ---- protected void initialize() { IToken string = new Token(STRING); IToken multiLineComment = new Token(MULTI_LINE_COMMENT); IToken singleLineComment = new Token(SINGLE_LINE_COMMENT); + IToken regexp = new Token(REGULAR_EXPRESSION); List rules = new ArrayList(); *************** *** 38,52 **** // strings (and therefore have quotes inside them which don't end the // partition) rules.add(new SingleLineRule("\"", "\"", string, '\\')); ! // Add rule for single line comments. rules.add(new EndOfLineRule("#", singleLineComment)); ! ! rules.add(new SingleLineRule("'", "'", skip, '\\')); rules.add(new MultiLineRule("=begin", "=end", multiLineComment)); IPredicateRule[] result = new IPredicateRule[rules.size()]; rules.toArray(result); setPredicateRules(result); } } \ No newline at end of file --- 38,76 ---- // strings (and therefore have quotes inside them which don't end the // partition) + + // Strings rules.add(new SingleLineRule("\"", "\"", string, '\\')); + rules.add(new SingleLineRule("'", "'", string, '\\')); + createGeneralDelimitedRules(rules, "%q", string, '\\'); + createGeneralDelimitedRules(rules, "%Q", string, '\\'); + createGeneralDelimitedRules(rules, "%", string, '\\'); + // Regular expressions + createRuleWithOptionalEndChars(rules, "/", "/", new char[] {'s', 'u', 'e', 'n', 'x', 'm', 'o', 'i'}, regexp, '\\'); + rules.add(new SingleLineRule("/", "/", regexp, '\\')); + createGeneralDelimitedRules(rules, "%r", regexp, '\\'); ! // Single line comments rules.add(new EndOfLineRule("#", singleLineComment)); ! // Multiline comments rules.add(new MultiLineRule("=begin", "=end", multiLineComment)); + // TODO Handle Heredocs! + IPredicateRule[] result = new IPredicateRule[rules.size()]; rules.toArray(result); setPredicateRules(result); } + + private void createRuleWithOptionalEndChars(List rules, String prefix, String endString, char[] options, IToken token, char escapeChar) { + for (int i = 0; i < options.length; i++) { + rules.add(new SingleLineRule(prefix, endString + options[i], token, escapeChar)); + } + } + + private void createGeneralDelimitedRules(List rules, String prefix, IToken token, char escapeChar) { + rules.add(new MultiLineRule(prefix + "[", "]", token, escapeChar)); + rules.add(new MultiLineRule(prefix + "{", "}", token, escapeChar)); + rules.add(new MultiLineRule(prefix + "(", ")", token, escapeChar)); + rules.add(new MultiLineRule(prefix + "<", ">", token, escapeChar)); + } } \ No newline at end of file Index: RubyTextTools.java =================================================================== RCS file: /cvsroot/rubyeclipse/org.rubypeople.rdt.ui/src/org/rubypeople/rdt/internal/ui/text/RubyTextTools.java,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** RubyTextTools.java 2 Mar 2005 00:56:49 -0000 1.8 --- RubyTextTools.java 1 Apr 2005 01:59:20 -0000 1.9 *************** *** 46,49 **** --- 46,50 ---- /** The preference change listener */ private PreferenceListener fPreferenceListener = new PreferenceListener(); + private SingleTokenRubyCodeScanner fRegexpScanner; /** *************** *** 103,107 **** fSinglelineCommentScanner = new RubyCommentScanner(fColorManager, store, coreStore, IRubyColorConstants.RUBY_SINGLE_LINE_COMMENT); stringScanner = new SingleTokenRubyCodeScanner(fColorManager, store, IRubyColorConstants.RUBY_STRING); ! fPreferenceStore = store; fPreferenceStore.addPropertyChangeListener(fPreferenceListener); --- 104,109 ---- fSinglelineCommentScanner = new RubyCommentScanner(fColorManager, store, coreStore, IRubyColorConstants.RUBY_SINGLE_LINE_COMMENT); stringScanner = new SingleTokenRubyCodeScanner(fColorManager, store, IRubyColorConstants.RUBY_STRING); ! fRegexpScanner = new SingleTokenRubyCodeScanner(fColorManager, store, IRubyColorConstants.RUBY_REGEXP); ! fPreferenceStore = store; fPreferenceStore.addPropertyChangeListener(fPreferenceListener); *************** *** 128,131 **** --- 130,134 ---- if (fSinglelineCommentScanner.affectsBehavior(event)) fSinglelineCommentScanner.adaptToPreferenceChange(event); if (stringScanner.affectsBehavior(event)) stringScanner.adaptToPreferenceChange(event); + if (fRegexpScanner.affectsBehavior(event)) fRegexpScanner.adaptToPreferenceChange(event); // if (fJavaDocScanner.affectsBehavior(event)) // fJavaDocScanner.adaptToPreferenceChange(event); *************** *** 180,184 **** || fMultilineCommentScanner.affectsBehavior(event) || fSinglelineCommentScanner.affectsBehavior(event) ! || stringScanner.affectsBehavior(event); } --- 183,188 ---- || fMultilineCommentScanner.affectsBehavior(event) || fSinglelineCommentScanner.affectsBehavior(event) ! || stringScanner.affectsBehavior(event) ! || fRegexpScanner.affectsBehavior(event); } *************** *** 213,216 **** --- 217,221 ---- fSinglelineCommentScanner = null; stringScanner = null; + fRegexpScanner = null; // fJavaDocScanner= null; partitionScanner = null; *************** *** 234,236 **** --- 239,245 ---- } + public ITokenScanner getRegexpScanner() { + return fRegexpScanner; + } + } Index: RubySourceViewerConfiguration.java =================================================================== RCS file: /cvsroot/rubyeclipse/org.rubypeople.rdt.ui/src/org/rubypeople/rdt/internal/ui/text/RubySourceViewerConfiguration.java,v retrieving revision 1.18 retrieving revision 1.19 diff -C2 -d -r1.18 -r1.19 *** RubySourceViewerConfiguration.java 5 Mar 2005 19:38:08 -0000 1.18 --- RubySourceViewerConfiguration.java 1 Apr 2005 01:59:20 -0000 1.19 *************** *** 56,59 **** --- 56,63 ---- reconciler.setRepairer(dr, RubyPartitionScanner.STRING); + dr = new DefaultDamagerRepairer(getRegexpScanner()); + reconciler.setDamager(dr, RubyPartitionScanner.REGULAR_EXPRESSION); + reconciler.setRepairer(dr, RubyPartitionScanner.REGULAR_EXPRESSION); + return reconciler; } *************** *** 74,77 **** --- 78,85 ---- return textTools.getStringScanner(); } + + protected ITokenScanner getRegexpScanner() { + return textTools.getRegexpScanner(); + } public String[] getConfiguredContentTypes(ISourceViewer sourceViewer) { Index: IRubyColorConstants.java =================================================================== RCS file: /cvsroot/rubyeclipse/org.rubypeople.rdt.ui/src/org/rubypeople/rdt/internal/ui/text/IRubyColorConstants.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** IRubyColorConstants.java 2 Mar 2005 00:56:49 -0000 1.2 --- IRubyColorConstants.java 1 Apr 2005 01:59:20 -0000 1.3 *************** *** 6,9 **** --- 6,10 ---- public static final String RUBY_KEYWORD = RUBY_COLOR_PREFIX + "keyword"; public static final String RUBY_STRING = RUBY_COLOR_PREFIX + "string"; + public static final String RUBY_REGEXP = RUBY_COLOR_PREFIX + "regexp"; public static final String RUBY_MULTI_LINE_COMMENT = RUBY_COLOR_PREFIX + "multiline_comment"; |
|
From: Christopher W. <caw...@us...> - 2005-04-01 01:59:32
|
Update of /cvsroot/rubyeclipse/org.rubypeople.rdt.ui/src/org/rubypeople/rdt/internal/ui/text/ruby In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16048/src/org/rubypeople/rdt/internal/ui/text/ruby Modified Files: RubyCodeScanner.java RubyCompletionProcessor.java Log Message: highlight and partition regular expressions separately from code. Handle more ways of defining strings and regexps (like %r, %q, %Q, etc) for syntax highlighting Index: RubyCompletionProcessor.java =================================================================== RCS file: /cvsroot/rubyeclipse/org.rubypeople.rdt.ui/src/org/rubypeople/rdt/internal/ui/text/ruby/RubyCompletionProcessor.java,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** RubyCompletionProcessor.java 5 Mar 2005 16:02:37 -0000 1.12 --- RubyCompletionProcessor.java 1 Apr 2005 01:59:21 -0000 1.13 *************** *** 203,210 **** suggestions.add(child.getElementName()); if(child instanceof IParent) ! suggestions.addAll(getElements((IParent)child)); } } catch (RubyModelException e) { - // TODO Auto-generated catch block e.printStackTrace(); } --- 203,209 ---- suggestions.add(child.getElementName()); if(child instanceof IParent) ! suggestions.addAll(getElements((IParent)child)); } } catch (RubyModelException e) { e.printStackTrace(); } Index: RubyCodeScanner.java =================================================================== RCS file: /cvsroot/rubyeclipse/org.rubypeople.rdt.ui/src/org/rubypeople/rdt/internal/ui/text/ruby/RubyCodeScanner.java,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** RubyCodeScanner.java 2 Mar 2005 00:56:52 -0000 1.6 --- RubyCodeScanner.java 1 Apr 2005 01:59:21 -0000 1.7 *************** *** 6,10 **** import org.eclipse.jface.preference.IPreferenceStore; import org.eclipse.jface.text.rules.IToken; - import org.eclipse.jface.text.rules.SingleLineRule; import org.eclipse.jface.text.rules.WordRule; import org.rubypeople.rdt.internal.ui.text.IRubyColorConstants; --- 6,9 ---- *************** *** 17,21 **** protected String[] keywords; ! private static String[] fgTokenProperties = { IRubyColorConstants.RUBY_KEYWORD, IRubyColorConstants.RUBY_STRING, IRubyColorConstants.RUBY_DEFAULT // TODO Add Ability to set colors for return and operators // IRubyColorConstants.RUBY_METHOD_NAME, --- 16,20 ---- protected String[] keywords; ! private static String[] fgTokenProperties = { IRubyColorConstants.RUBY_KEYWORD, IRubyColorConstants.RUBY_DEFAULT // TODO Add Ability to set colors for return and operators // IRubyColorConstants.RUBY_METHOD_NAME, *************** *** 47,54 **** List rules = new ArrayList(); - IToken token = getToken(IRubyColorConstants.RUBY_STRING); - rules.add(new SingleLineRule("'", "'", token, '\\')); - rules.add(new SingleLineRule("/", "/", token, '\\')); - IToken defToken = getToken(IRubyColorConstants.RUBY_DEFAULT); setDefaultReturnToken(defToken); --- 46,49 ---- *************** *** 56,60 **** rules.add(wordRule); ! token = getToken(IRubyColorConstants.RUBY_KEYWORD); String[] keywords = RubyTextTools.getKeyWords(); for (int keyWordIndex = 0; keyWordIndex < keywords.length; keyWordIndex++) --- 51,55 ---- rules.add(wordRule); ! IToken token = getToken(IRubyColorConstants.RUBY_KEYWORD); String[] keywords = RubyTextTools.getKeyWords(); for (int keyWordIndex = 0; keyWordIndex < keywords.length; keyWordIndex++) |
|
From: Christopher W. <caw...@us...> - 2005-04-01 01:59:32
|
Update of /cvsroot/rubyeclipse/org.rubypeople.rdt.ui/src/org/rubypeople/rdt/internal/ui/rubyeditor In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16048/src/org/rubypeople/rdt/internal/ui/rubyeditor Modified Files: RubyDocumentProvider.java Log Message: highlight and partition regular expressions separately from code. Handle more ways of defining strings and regexps (like %r, %q, %Q, etc) for syntax highlighting Index: RubyDocumentProvider.java =================================================================== RCS file: /cvsroot/rubyeclipse/org.rubypeople.rdt.ui/src/org/rubypeople/rdt/internal/ui/rubyeditor/RubyDocumentProvider.java,v retrieving revision 1.17 retrieving revision 1.18 diff -C2 -d -r1.17 -r1.18 *** RubyDocumentProvider.java 11 Mar 2005 03:10:33 -0000 1.17 --- RubyDocumentProvider.java 1 Apr 2005 01:59:20 -0000 1.18 *************** *** 656,660 **** public RubyScriptAnnotationModel(IResource resource) { super(resource); - System.out.println("create RubyScriptAnnotationModel on: " + resource); } --- 656,659 ---- |
