From: Bananeweizen <ban...@us...> - 2006-04-23 14:39:36
|
Update of /cvsroot/phpeclipse/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/phpeditor/php In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29852/src/net/sourceforge/phpeclipse/phpeditor/php Modified Files: PHPCompletionProcessor.java Log Message: bug 1469012, exception in CompletionProposal Index: PHPCompletionProcessor.java =================================================================== RCS file: /cvsroot/phpeclipse/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/phpeditor/php/PHPCompletionProcessor.java,v retrieving revision 1.44 retrieving revision 1.45 diff -C2 -d -r1.44 -r1.45 *** PHPCompletionProcessor.java 17 Jan 2006 21:49:46 -0000 1.44 --- PHPCompletionProcessor.java 23 Apr 2006 14:39:29 -0000 1.45 *************** *** 69,72 **** --- 69,73 ---- import org.eclipse.swt.graphics.Image; import org.eclipse.swt.graphics.Point; + import org.eclipse.ui.IEditorInput; import org.eclipse.ui.IEditorPart; import org.eclipse.ui.IFileEditorInput; *************** *** 485,490 **** if (fEditor != null && (fEditor instanceof PHPEditor)) { editor = (PHPEditor) fEditor; ! file = ((IFileEditorInput) editor.getEditorInput()).getFile(); ! project = file.getProject(); } } --- 486,497 ---- if (fEditor != null && (fEditor instanceof PHPEditor)) { editor = (PHPEditor) fEditor; ! IEditorInput editorInput=editor.getEditorInput(); ! if (editorInput instanceof IFileEditorInput) { ! file = ((IFileEditorInput) editorInput).getFile(); ! project = file.getProject(); ! } ! else { ! return new ICompletionProposal[0]; ! } } } |