[Pydev-cvs] org.python.pydev/src/org/python/pydev/editor/codefolding CodeFoldingSetter.java,1.5,1.6

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

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

Modified Files:
	CodeFoldingSetter.java 
Log Message:
Modified position when it changes (was trying to add marker again).

Index: CodeFoldingSetter.java
===================================================================
RCS file: /cvsroot/pydev/org.python.pydev/src/org/python/pydev/editor/codefolding/CodeFoldingSetter.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** CodeFoldingSetter.java	16 Aug 2004 13:31:00 -0000	1.5
--- CodeFoldingSetter.java	19 Aug 2004 17:50:46 -0000	1.6
***************
*** 13,17 ****
  import org.eclipse.jface.text.IRegion;
  import org.eclipse.jface.text.Position;
! import org.eclipse.jface.text.source.IAnnotationModel;
  import org.eclipse.jface.text.source.projection.ProjectionAnnotation;
  import org.eclipse.jface.text.source.projection.ProjectionAnnotationModel;
--- 13,17 ----
  import org.eclipse.jface.text.IRegion;
  import org.eclipse.jface.text.Position;
! import org.eclipse.jface.text.source.Annotation;
  import org.eclipse.jface.text.source.projection.ProjectionAnnotation;
  import org.eclipse.jface.text.source.projection.ProjectionAnnotationModel;
***************
*** 44,48 ****
       */
      public synchronized void modelChanged(AbstractNode root) {
!         IAnnotationModel model = (IAnnotationModel) editor
                  .getAdapter(ProjectionAnnotationModel.class);
          
--- 44,48 ----
       */
      public synchronized void modelChanged(AbstractNode root) {
!         ProjectionAnnotationModel model = (ProjectionAnnotationModel) editor
                  .getAdapter(ProjectionAnnotationModel.class);
          
***************
*** 54,60 ****
              new Thread(){
                  public void run(){
!                     IAnnotationModel modelT = null;
                      for(int i=0 ; i < 10 && modelT == null; i++){
! 	                    modelT = (IAnnotationModel) editor
  	                    .getAdapter(ProjectionAnnotationModel.class);
  	                    try {
--- 54,60 ----
              new Thread(){
                  public void run(){
!                     ProjectionAnnotationModel modelT = null;
                      for(int i=0 ; i < 10 && modelT == null; i++){
! 	                    modelT = (ProjectionAnnotationModel) editor
  	                    .getAdapter(ProjectionAnnotationModel.class);
  	                    try {
***************
*** 79,83 ****
       * @param model
       */
!     private void addMarksToModel(AbstractNode root, IAnnotationModel model) {
          try{
  	        if (model != null) {
--- 79,83 ----
       * @param model
       */
!     private void addMarksToModel(AbstractNode root, ProjectionAnnotationModel model) {
          try{
  	        if (model != null) {
***************
*** 131,135 ****
       * @param model
       */
!     private void addMarks(ArrayList nodes, IAnnotationModel model, ArrayList collapsed) {
          int i=0;
          
--- 131,135 ----
       * @param model
       */
!     private void addMarks(ArrayList nodes, ProjectionAnnotationModel model, ArrayList collapsed) {
          int i=0;
          
***************
*** 215,219 ****
       * @throws BadLocationException
       */
!     private void addFoldingMark(AbstractNode node, int start, int end, IAnnotationModel model, ArrayList collapsed) throws BadLocationException {
  
          try {
--- 215,219 ----
       * @throws BadLocationException
       */
!     private void addFoldingMark(AbstractNode node, int start, int end, ProjectionAnnotationModel model, ArrayList collapsed) throws BadLocationException {
  
          try {
***************
*** 225,229 ****
              
              
!             model.addAnnotation(getAnnotationToAdd(position, node, model, collapsed), position);
              
              
--- 225,234 ----
              
              
!             Annotation anottation = getAnnotationToAdd(position, node, model, collapsed);
!             if(model.getPosition(anottation)!= null && model.getPosition(anottation).equals(position) == false){
!                 model.modifyAnnotationPosition(anottation, position);
!             }else{
!                 model.addAnnotation(anottation, position);
!             }
              
              
***************
*** 243,247 ****
       * @return
       */
!     private ProjectionAnnotation getAnnotationToAdd(Position position, AbstractNode node, IAnnotationModel model, ArrayList collapsed){
          for (Iterator iter = collapsed.iterator(); iter.hasNext();) {
              PyProjectionAnnotation element = (PyProjectionAnnotation) iter.next();
--- 248,252 ----
       * @return
       */
!     private ProjectionAnnotation getAnnotationToAdd(Position position, AbstractNode node, ProjectionAnnotationModel model, ArrayList collapsed){
          for (Iterator iter = collapsed.iterator(); iter.hasNext();) {
              PyProjectionAnnotation element = (PyProjectionAnnotation) iter.next();