# This patch file was generated by NetBeans IDE
# Following Index: paths are relative to: C:\cvs\trunk\mobility\project\src\org\netbeans\modules\mobility\project\queries
# This patch can be applied using context Tools: Patch action on respective folder.
# It uses platform neutral UTF-8 encoding and \n newlines.
# Above lines and this line are ignored by the patching process.
Index: CompiledSourceForBinaryQuery.java
*** C:\cvs\trunk\mobility\project\src\org\netbeans\modules\mobility\project\queries\CompiledSourceForBinaryQuery.java Base (1.2)
--- C:\cvs\trunk\mobility\project\src\org\netbeans\modules\mobility\project\queries\CompiledSourceForBinaryQuery.java Locally Modified (Based On 1.2)
***************
*** 43,48 ****
--- 43,49 ----
  
  import javax.swing.event.ChangeListener;
  import javax.swing.event.ChangeEvent;
+ import org.openide.util.RequestProcessor;
  
  public class CompiledSourceForBinaryQuery implements SourceForBinaryQueryImplementation {
      
***************
*** 71,77 ****
                  helper.addAntProjectListener(antProjectListener);
              }
              
!             public synchronized FileObject[] getRoots() {
                  FileObject[] fo = cache;
                  if (fo == null) {
                      cache = new FileObject[0];
--- 72,78 ----
                  helper.addAntProjectListener(antProjectListener);
              }
              
!             public FileObject[] getRoots() {
                  FileObject[] fo = cache;
                  if (fo == null) {
                      cache = new FileObject[0];
***************
*** 137,142 ****
--- 138,145 ----
              }
              
              private void fireChanged() {
+                 RequestProcessor.getDefault().post(new Runnable() {
+                     public void run() {
                          synchronized (listeners) {
                              final ChangeEvent event=new ChangeEvent(this);
                              for (int i = 0; i < listeners.size(); i++) {
***************
*** 145,150 ****
--- 148,155 ----
                              }
                          }
                      }
+                 });
+             }
              
              public void configurationXmlChanged(@SuppressWarnings("unused") AntProjectEvent event) {
              }
Index: FileBuiltQueryImpl.java
*** C:\cvs\trunk\mobility\project\src\org\netbeans\modules\mobility\project\queries\FileBuiltQueryImpl.java Base (1.2)
--- C:\cvs\trunk\mobility\project\src\org\netbeans\modules\mobility\project\queries\FileBuiltQueryImpl.java Locally Modified (Based On 1.2)
***************
*** 69,76 ****
          return srcRoot;
      }
      
!     public synchronized FileBuiltQuery.Status getStatus(final FileObject file) {
!         final Object o = statuses.get(file);
          if (o == NONE) {
              return null;
          }
--- 69,79 ----
          return srcRoot;
      }
      
!     public FileBuiltQuery.Status getStatus(final FileObject file) {
!         Object o;
!         synchronized (statuses) {
!             o = statuses.get(file);
!         }
          if (o == NONE) {
              return null;
          }
***************
*** 78,89 ****
--- 81,94 ----
          StatusImpl status = (r != null) ? (StatusImpl)r.get() : null;
          if (status == null) {
              status = createStatus(file);
+             synchronized (statuses) {
                  if (status != null) {
                      statuses.put(file, new WeakReference<StatusImpl>(status));
                  } else {
                      statuses.put(file, NONE);
                  }
              }
+         }
          return status;
      }
      
***************
*** 94,100 ****
      
      public void run() {
          FileObject files[];
!         synchronized (this) {
              files = statuses.keySet().toArray(new FileObject[statuses.size()]);
          }
          for (int i=0; i<files.length; i++) {
--- 99,105 ----
      
      public void run() {
          FileObject files[];
!         synchronized (statuses) {
              files = statuses.keySet().toArray(new FileObject[statuses.size()]);
          }
          for (int i=0; i<files.length; i++) {
***************
*** 154,160 ****
          public boolean isBuilt() {
              boolean doFire = false;
              boolean b;
!             synchronized (FileBuiltQueryImpl.this) {
                  b = isReallyBuilt();
                  if (built != null && built.booleanValue() != b) {
                      doFire = true;
--- 159,165 ----
          public boolean isBuilt() {
              boolean doFire = false;
              boolean b;
!             synchronized (StatusImpl.this) {
                  b = isReallyBuilt();
                  if (built != null && built.booleanValue() != b) {
                      doFire = true;
Index: FileEncodingQueryImpl.java
*** C:\cvs\trunk\mobility\project\src\org\netbeans\modules\mobility\project\queries\FileEncodingQueryImpl.java Base (1.1)
--- C:\cvs\trunk\mobility\project\src\org\netbeans\modules\mobility\project\queries\FileEncodingQueryImpl.java Locally Modified (Based On 1.1)
***************
*** 45,64 ****
          hlp.addAntProjectListener(this);
      }
      
!     public synchronized Charset getEncoding(FileObject file) {
!         if (ch == null) try {
              String enc = J2MEProjectUtils.evaluateProperty(hlp, DefaultPropertiesDescriptor.JAVAC_ENCODING);
!             ch = enc == null ? FileEncodingQuery.getDefaultEncoding() : Charset.forName(enc);
          } catch (IllegalCharsetNameException exception) {
              return null;
          }
!         return ch;
      }
  
      public void configurationXmlChanged(AntProjectEvent ev) {
      }
  
!     public synchronized void propertiesChanged(AntProjectEvent ev) {
          ch = null;
      }
      
--- 45,65 ----
          hlp.addAntProjectListener(this);
      }
      
!     public Charset getEncoding(FileObject file) {
!         Charset c = ch;
!         if (c == null) try {
              String enc = J2MEProjectUtils.evaluateProperty(hlp, DefaultPropertiesDescriptor.JAVAC_ENCODING);
!             ch = c = enc == null ? FileEncodingQuery.getDefaultEncoding() : Charset.forName(enc);
          } catch (IllegalCharsetNameException exception) {
              return null;
          }
!         return c;
      }
  
      public void configurationXmlChanged(AntProjectEvent ev) {
      }
  
!     public void propertiesChanged(AntProjectEvent ev) {
          ch = null;
      }
      
Index: JavadocForBinaryQueryImpl.java
*** C:\cvs\trunk\mobility\project\src\org\netbeans\modules\mobility\project\queries\JavadocForBinaryQueryImpl.java Base (1.2)
--- C:\cvs\trunk\mobility\project\src\org\netbeans\modules\mobility\project\queries\JavadocForBinaryQueryImpl.java Locally Modified (Based On 1.2)
***************
*** 71,80 ****
                  helper.addAntProjectListener(antProjectListener);
              }
              
!             public synchronized URL[] getRoots() {
                  URL [] urls = cache;
                  if (urls == null) {
-                     cache = new URL[0];
                      urls = createRoots();
                      synchronized (lock) {
                          if (cache != null) cache = urls;
--- 71,82 ----
                  helper.addAntProjectListener(antProjectListener);
              }
              
!             public URL[] getRoots() {
                  URL [] urls = cache;
                  if (urls == null) {
                      urls = createRoots();
                      synchronized (lock) {