[Phpeclipse-commits] net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/phpeditor PHPEditor.java,1.25,1.26 PHPContentOutlinePage.java,1.16,1.17 PHPTextHover.java,1.10,1.11

[<kha...@us...>]

Update of /cvsroot/phpeclipse/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/phpeditor
In directory sc8-pr-cvs1:/tmp/cvs-serv21327/src/net/sourceforge/phpeclipse/phpeditor

Modified Files:
	PHPEditor.java PHPContentOutlinePage.java PHPTextHover.java 
Log Message:
Defined a limit for code completion list entries PHPeclipsePlugin.MAX_PROPOSALS
Code completion shows available phpdoc in completion context
new icon for "define" integrated

Index: PHPEditor.java
===================================================================
RCS file: /cvsroot/phpeclipse/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/phpeditor/PHPEditor.java,v
retrieving revision 1.25
retrieving revision 1.26
diff -C2 -d -r1.25 -r1.26
*** PHPEditor.java	9 Aug 2003 17:32:27 -0000	1.25
--- PHPEditor.java	20 Sep 2003 14:59:01 -0000	1.26
***************
*** 33,37 ****
  import org.eclipse.jface.action.Action;
  import org.eclipse.jface.action.GroupMarker;
- import org.eclipse.jface.action.IAction;
  import org.eclipse.jface.action.MenuManager;
  import org.eclipse.jface.action.Separator;
--- 33,36 ----

Index: PHPContentOutlinePage.java
===================================================================
RCS file: /cvsroot/phpeclipse/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/phpeditor/PHPContentOutlinePage.java,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** PHPContentOutlinePage.java	9 Sep 2003 19:15:37 -0000	1.16
--- PHPContentOutlinePage.java	20 Sep 2003 14:59:01 -0000	1.17
***************
*** 22,32 ****
  import net.sourceforge.phpdt.internal.compiler.parser.OutlineableWithChildren;
  import net.sourceforge.phpdt.internal.compiler.parser.PHPOutlineInfo;
- import net.sourceforge.phpdt.internal.compiler.parser.PHPSegment;
- import net.sourceforge.phpdt.internal.compiler.parser.PHPSegmentWithChildren;
  import net.sourceforge.phpdt.internal.ui.viewsupport.ImageDescriptorRegistry;
  import net.sourceforge.phpeclipse.PHPeclipsePlugin;
  
  import org.eclipse.jface.resource.ImageDescriptor;
! import org.eclipse.jface.text.*;
  import org.eclipse.jface.viewers.ISelection;
  import org.eclipse.jface.viewers.IStructuredSelection;
--- 22,33 ----
  import net.sourceforge.phpdt.internal.compiler.parser.OutlineableWithChildren;
  import net.sourceforge.phpdt.internal.compiler.parser.PHPOutlineInfo;
  import net.sourceforge.phpdt.internal.ui.viewsupport.ImageDescriptorRegistry;
  import net.sourceforge.phpeclipse.PHPeclipsePlugin;
  
  import org.eclipse.jface.resource.ImageDescriptor;
! import org.eclipse.jface.text.BadPositionCategoryException;
! import org.eclipse.jface.text.DefaultPositionUpdater;
! import org.eclipse.jface.text.IDocument;
! import org.eclipse.jface.text.IPositionUpdater;
  import org.eclipse.jface.viewers.ISelection;
  import org.eclipse.jface.viewers.IStructuredSelection;

Index: PHPTextHover.java
===================================================================
RCS file: /cvsroot/phpeclipse/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/phpeditor/PHPTextHover.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** PHPTextHover.java	13 Sep 2003 17:33:50 -0000	1.10
--- PHPTextHover.java	20 Sep 2003 14:59:01 -0000	1.11
***************
*** 17,21 ****
  import java.util.Vector;
  
! import net.sourceforge.phpdt.internal.corext.phpdoc.PHPDocCharArrayCommentReader;
  import net.sourceforge.phpeclipse.PHPeclipsePlugin;
  import net.sourceforge.phpeclipse.builder.IdentifierIndexManager;
--- 17,21 ----
  import java.util.Vector;
  
! import net.sourceforge.phpdt.internal.corext.phpdoc.PHPDocUtil;
  import net.sourceforge.phpeclipse.PHPeclipsePlugin;
  import net.sourceforge.phpeclipse.builder.IdentifierIndexManager;
***************
*** 84,88 ****
                  String filename;
                  FileReader phpdocFileReader;
!                 PHPDocCharArrayCommentReader phpdocConverter;
                  StringBuffer hoverInfoBuffer = new StringBuffer();
                  String workspaceLocation = PHPeclipsePlugin.getWorkspace().getRoot().getLocation().toString();
--- 84,88 ----
                  String filename;
                  FileReader phpdocFileReader;
!         //        PHPDocCharArrayCommentReader phpdocConverter;
                  StringBuffer hoverInfoBuffer = new StringBuffer();
                  String workspaceLocation = PHPeclipsePlugin.getWorkspace().getRoot().getLocation().toString();
***************
*** 91,106 ****
                    location = (PHPIdentifierLocation) list.get(i);
  									filename = workspaceLocation + location.getFilename();
! 									hoverInfoBuffer.append(location.toString());
! 									hoverInfoBuffer.append('\n');
!                   if (location.getPHPDocOffset() >= 0) {
!                     //                    foundPHPdoc = true;
!                     phpdocFileReader = new FileReader(filename);
!                     char[] charArray = new char[location.getPHPDocLength()];
!                     phpdocFileReader.skip(location.getPHPDocOffset());
!                     phpdocFileReader.read(charArray, 0, location.getPHPDocLength());
!                     phpdocConverter = new PHPDocCharArrayCommentReader(charArray);
!                     hoverInfoBuffer.append(phpdocConverter.getString());
!                     hoverInfoBuffer.append('\n');
!                   }
                  }
                  //                if (foundPHPdoc) {
--- 91,108 ----
                    location = (PHPIdentifierLocation) list.get(i);
  									filename = workspaceLocation + location.getFilename();
!                   PHPDocUtil.appendPHPDoc(hoverInfoBuffer, filename, location);
! //									
! //									hoverInfoBuffer.append(location.toString());
! //									hoverInfoBuffer.append('\n');
! //                  if (location.getPHPDocOffset() >= 0) {
! //                    //                    foundPHPdoc = true;
! //                    phpdocFileReader = new FileReader(filename);
! //                    char[] charArray = new char[location.getPHPDocLength()];
! //                    phpdocFileReader.skip(location.getPHPDocOffset());
! //                    phpdocFileReader.read(charArray, 0, location.getPHPDocLength());
! //                    phpdocConverter = new PHPDocCharArrayCommentReader(charArray);
! //                    hoverInfoBuffer.append(phpdocConverter.getString());
! //                    hoverInfoBuffer.append('\n');
! //                  }
                  }
                  //                if (foundPHPdoc) {