Index: I18nManager.java
===================================================================
RCS file: /cvs/i18n/src/org/netbeans/modules/i18n/I18nManager.java,v
retrieving revision 1.21
diff -c -r1.21 I18nManager.java
*** I18nManager.java	28 Feb 2003 01:21:58 -0000	1.21
--- I18nManager.java	26 Aug 2003 08:21:26 -0000
***************
*** 218,224 ****
          // Replace hardcoded string.
          support.getReplacer().replace(hcString, i18nString);
  
!         skip();
      }
      
      /** Skips foudn hard coded string and conitnue to search for next one. */
--- 218,228 ----
          // Replace hardcoded string.
          support.getReplacer().replace(hcString, i18nString);
  
!         SwingUtilities.invokeLater(new Runnable() {
!             public void run() {
!                 skip();
!             }
!         });
      }
      
      /** Skips foudn hard coded string and conitnue to search for next one. */
Index: form/FormI18nSupport.java
===================================================================
RCS file: /cvs/i18n/src/org/netbeans/modules/i18n/form/FormI18nSupport.java,v
retrieving revision 1.16.2.1
diff -c -r1.16.2.1 FormI18nSupport.java
*** form/FormI18nSupport.java	10 Mar 2003 17:33:37 -0000	1.16.2.1
--- form/FormI18nSupport.java	26 Aug 2003 08:21:26 -0000
***************
*** 928,948 ****
                 // Decrement last found skip.
                 finder.decrementLastFoundSkip();
                 
!                StyledDocument document = javaI18nString.getSupport().getDocument();
!                
!                // Little trick to reset the last position in finder after guarded block was regenerated.
!                if(document instanceof AbstractDocument)
!                    ((AbstractDocument)document).readLock();
!                try {
!                    lastPos += replaceString.length() - formHcString.getText().length() - 2; // 2 for quotes
!                    ((FormI18nFinder)finder).setLastPosition(document.createPosition(lastPos));
!                } catch (BadLocationException ble) {
!                    if(Boolean.getBoolean(DEBUG))
!                        System.err.println("I18N: Form support: Position reset in guarded block not successful."); // NOI18N
!                } finally {
!                    if(document instanceof AbstractDocument)
!                        ((AbstractDocument)document).readUnlock();
!                }
              } catch (IllegalAccessException iae) {
                  if(Boolean.getBoolean(DEBUG))
                      iae.printStackTrace();
--- 928,952 ----
                 // Decrement last found skip.
                 finder.decrementLastFoundSkip();
                 
!                final StyledDocument document = javaI18nString.getSupport().getDocument();
! 
!                final int lastP = lastPos + replaceString.length() - formHcString.getText().length() - 2; // 2 for quotes
!                SwingUtilities.invokeLater(new Runnable() {
!                     public void run() {
!                        // Little trick to reset the last position in finder after guarded block was regenerated.
!                        if(document instanceof AbstractDocument)
!                            ((AbstractDocument)document).readLock();
!                        try {
!                            ((FormI18nFinder)finder).setLastPosition(document.createPosition(lastP));                   
!                        } catch (BadLocationException ble) {
!                            if(Boolean.getBoolean(DEBUG))
!                                System.err.println("I18N: Form support: Position reset in guarded block not successful."); // NOI18N
!                        } finally {
!                            if(document instanceof AbstractDocument)
!                                ((AbstractDocument)document).readUnlock();
!                        }
!                     }
!                });
              } catch (IllegalAccessException iae) {
                  if(Boolean.getBoolean(DEBUG))
                      iae.printStackTrace();