[Pydev-cvs] org.python.pydev/src/org/python/pydev/editor/codecompletion PyTemplateCompletion.java,1.2,1.3 PythonShell.java,1.13,1.14 PyCodeCompletion.java,1.12,1.13

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

Update of /cvsroot/pydev/org.python.pydev/src/org/python/pydev/editor/codecompletion
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11038/src/org/python/pydev/editor/codecompletion

Modified Files:
	PyTemplateCompletion.java PythonShell.java 
	PyCodeCompletion.java 
Log Message:


Index: PythonShell.java
===================================================================
RCS file: /cvsroot/pydev/org.python.pydev/src/org/python/pydev/editor/codecompletion/PythonShell.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** PythonShell.java	5 Oct 2004 16:54:17 -0000	1.13
--- PythonShell.java	8 Oct 2004 16:38:41 -0000	1.14
***************
*** 100,104 ****
       */
      public PythonShell() throws IOException, CoreException {
!         this(PyCodeCompletion.getScriptWithinPySrc("pycompletionserver.py"));
      }
  
--- 100,104 ----
       */
      public PythonShell() throws IOException, CoreException {
!         this(PydevPlugin.getScriptWithinPySrc("pycompletionserver.py"));
      }
  

Index: PyCodeCompletion.java
===================================================================
RCS file: /cvsroot/pydev/org.python.pydev/src/org/python/pydev/editor/codecompletion/PyCodeCompletion.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** PyCodeCompletion.java	28 Sep 2004 18:19:17 -0000	1.12
--- PyCodeCompletion.java	8 Oct 2004 16:38:42 -0000	1.13
***************
*** 7,24 ****
  
  import java.io.File;
- import java.io.IOException;
- import java.net.URL;
  import java.util.ArrayList;
  import java.util.List;
  
  import org.eclipse.core.runtime.CoreException;
- import org.eclipse.core.runtime.IPath;
- import org.eclipse.core.runtime.IStatus;
- import org.eclipse.core.runtime.Path;
- import org.eclipse.core.runtime.Platform;
  import org.eclipse.jface.text.BadLocationException;
  import org.eclipse.jface.text.IDocument;
  import org.eclipse.jface.text.IRegion;
- import org.osgi.framework.Bundle;
  import org.python.pydev.editor.PyEdit;
  import org.python.pydev.editor.model.AbstractNode;
--- 7,17 ----
***************
*** 232,282 ****
       */
      public static File getAutoCompleteScript() throws CoreException {
!         return getScriptWithinPySrc("simpleTipper.py");
!     }
! 
!     /**
!      * 
!      * @return the script to get the variables.
!      * 
!      * @throws CoreException
!      */
!     public static File getScriptWithinPySrc(String targetExec)
!             throws CoreException {
! 
!         IPath relative = new Path("PySrc").addTrailingSeparator().append(
!                 targetExec);
! 
!         Bundle bundle = PydevPlugin.getDefault().getBundle();
! 
!         URL bundleURL = Platform.find(bundle, relative);
!         URL fileURL;
!         try {
!             fileURL = Platform.asLocalURL(bundleURL);
!             File f = new File(fileURL.getPath());
! 
!             return f;
!         } catch (IOException e) {
!             throw new CoreException(PydevPlugin.makeStatus(IStatus.ERROR,
!                     "Can't find python debug script", null));
!         }
!     }
! 
!     public static File getImageWithinIcons(String icon) throws CoreException {
! 
!         IPath relative = new Path("icons").addTrailingSeparator().append(icon);
! 
!         Bundle bundle = PydevPlugin.getDefault().getBundle();
! 
!         URL bundleURL = Platform.find(bundle, relative);
!         URL fileURL;
!         try {
!             fileURL = Platform.asLocalURL(bundleURL);
!             File f = new File(fileURL.getPath());
! 
!             return f;
!         } catch (IOException e) {
!             throw new CoreException(PydevPlugin.makeStatus(IStatus.ERROR,
!                     "Can't find image", null));
!         }
      }
  
--- 225,229 ----
       */
      public static File getAutoCompleteScript() throws CoreException {
!         return PydevPlugin.getScriptWithinPySrc("simpleTipper.py");
      }
  

Index: PyTemplateCompletion.java
===================================================================
RCS file: /cvsroot/pydev/org.python.pydev/src/org/python/pydev/editor/codecompletion/PyTemplateCompletion.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** PyTemplateCompletion.java	13 Sep 2004 17:11:49 -0000	1.2
--- PyTemplateCompletion.java	8 Oct 2004 16:38:41 -0000	1.3
***************
*** 54,58 ****
      protected Image getImage(Template template) {
          try {
!             File file = PyCodeCompletion.getImageWithinIcons("template.gif");
              return new Image(null, file.getAbsolutePath());
          } catch (CoreException e) {
--- 54,58 ----
      protected Image getImage(Template template) {
          try {
!             File file = PydevPlugin.getImageWithinIcons("template.gif");
              return new Image(null, file.getAbsolutePath());
          } catch (CoreException e) {