[Pydev-cvs] org.python.pydev.debug/src_console/org/python/pydev/debug/newconsole PydevConsole.java, 1.8, 1.9

[Fabio Z. <fa...@us...>]

Update of /cvsroot/pydev/org.python.pydev.debug/src_console/org/python/pydev/debug/newconsole
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7013/src_console/org/python/pydev/debug/newconsole

Modified Files:
	PydevConsole.java 
Log Message:
<li><strong>Pydev debugger</strong>Workaround for python bug when filenames don't have absolute paths correctly generated</li>
<li><strong>Pydev code-completion</strong>Wild import will only show tokens defined in __all__ (if it's available)</li>
<li><strong>Interactive console</strong>: Fixed problem when more attempts to connect were needed</li>
<li><strong>Interactive console</strong>Fixed console integration problem with other plugins because of interfaces not properly implemented</li>
<li><strong>Code Formatter</strong>: Exponentials handled correctly</li>
<li><strong>Launching</strong>: Unit-test and code-coverage may launch multiple folders/files at once</li>
<li><strong>Code coverage</strong>: Number format exception no longer given when trying to show lines not executed in the editor and all lines are executed</li>


Index: PydevConsole.java
===================================================================
RCS file: /cvsroot/pydev/org.python.pydev.debug/src_console/org/python/pydev/debug/newconsole/PydevConsole.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** PydevConsole.java	28 Jun 2008 12:35:43 -0000	1.8
--- PydevConsole.java	17 Aug 2008 00:26:56 -0000	1.9
***************
*** 12,15 ****
--- 12,16 ----
  import org.eclipse.jface.preference.IPreferenceStore;
  import org.eclipse.jface.text.BadLocationException;
+ import org.eclipse.jface.text.IDocument;
  import org.eclipse.jface.text.IRegion;
  import org.eclipse.jface.text.ITextHover;
***************
*** 18,21 ****
--- 19,23 ----
  import org.eclipse.ui.console.IHyperlink;
  import org.eclipse.ui.console.IOConsoleOutputStream;
+ import org.eclipse.ui.console.IPatternMatchListener;
  import org.python.pydev.debug.core.PydevDebugPlugin;
  import org.python.pydev.debug.newconsole.prefs.ColorManager;
***************
*** 34,38 ****
   * @author Fabio
   */
! public class PydevConsole extends ScriptConsole implements IConsole {
  
      public static final String CONSOLE_NAME = "Pydev Console";
--- 36,40 ----
   * @author Fabio
   */
! public class PydevConsole extends ScriptConsole  {
  
      public static final String CONSOLE_NAME = "Pydev Console";
***************
*** 138,142 ****
          List<IConsoleLineTracker> lineTrackers = new ArrayList<IConsoleLineTracker>();
          PythonConsoleLineTracker lineTracker = new PythonConsoleLineTracker();
!         lineTracker.init(this);
          lineTrackers.add(lineTracker);
          return lineTrackers;
--- 140,181 ----
          List<IConsoleLineTracker> lineTrackers = new ArrayList<IConsoleLineTracker>();
          PythonConsoleLineTracker lineTracker = new PythonConsoleLineTracker();
! 
!         //The IConsole we implement in this class is not the same IConsole that's needed in the
!         //lineTracker, so, let's create a wrapper for this with the interfaces requested.
!         lineTracker.init(new IConsole(){
! 
!         	//IMPLEMENTATIONS FORWARDED TO OUTER CLASS
! 			public void addLink(IConsoleHyperlink link, int offset, int length) {
! 				PydevConsole.this.addLink(link, offset, length);
! 			}
! 			public void addLink(IHyperlink link, int offset, int length) {
! 				PydevConsole.this.addLink(link, offset, length);
! 			}
! 			public void addPatternMatchListener(
! 					IPatternMatchListener matchListener) {
! 				PydevConsole.this.addPatternMatchListener(matchListener);
! 			}
! 			public IDocument getDocument() {
! 				return PydevConsole.this.getDocument();
! 			}
! 			public IRegion getRegion(IConsoleHyperlink link) {
! 				return PydevConsole.this.getRegion(link);
! 			}
! 			public IRegion getRegion(IHyperlink link) {
! 				return PydevConsole.this.getRegion(link);
! 			}
! 			public void removePatternMatchListener(
! 					IPatternMatchListener matchListener) {
! 				PydevConsole.this.removePatternMatchListener(matchListener);
! 			}
! 			
! 			//IMPLEMENTATIONS THAT AREN'T REALLY AVAILABLE IN THE PYDEV CONSOLE
! 			public void connect(IStreamsProxy streamsProxy) {/**EMPTY**/}
! 			public void connect(IStreamMonitor streamMonitor, String streamIdentifer) {/**EMPTY**/}
! 			public IProcess getProcess() {return null;/**EMPTY**/}
! 			public IOConsoleOutputStream getStream(String streamIdentifier) {return null;/**EMPTY**/}
!         });
!         
!         
          lineTrackers.add(lineTracker);
          return lineTrackers;
***************
*** 170,197 ****
      }
  
-     
-     //required by the IConsole interface -- because of hyperlinks (but not actually used)
-     public void connect(IStreamsProxy streamsProxy) {
-         throw new RuntimeException("Not implemented");
-     }
  
-     //required by the IConsole interface -- because of hyperlinks (but not actually used)
-     public void connect(IStreamMonitor streamMonitor, String streamIdentifer) {
-         throw new RuntimeException("Not implemented");
-     }
- 
-     //required by the IConsole interface -- because of hyperlinks (but not actually used)
-     public IProcess getProcess() {
-         throw new RuntimeException("Not implemented");
-     }
- 
-     //required by the IConsole interface -- because of hyperlinks (but not actually used)
-     public IRegion getRegion(IConsoleHyperlink link) {
-         throw new RuntimeException("Not implemented");
-     }
- 
-     //required by the IConsole interface -- because of hyperlinks (but not actually used)
-     public IOConsoleOutputStream getStream(String streamIdentifier) {
-         throw new RuntimeException("Not implemented");
-     }
  }
--- 209,212 ----