1.1 --- a/visualweb.insync/nbproject/project.xml	Fri Feb 16 22:20:02 2007 +0000
     1.2 +++ b/visualweb.insync/nbproject/project.xml	Fri Feb 16 22:23:33 2007 +0000
     1.3 @@ -78,15 +78,6 @@
     1.4                      </run-dependency>
     1.5                  </dependency>
     1.6                  <dependency>
     1.7 -                    <code-name-base>org.netbeans.modules.java.project</code-name-base>
     1.8 -                    <build-prerequisite/>
     1.9 -                    <compile-dependency/>
    1.10 -                    <run-dependency>
    1.11 -                        <release-version>1</release-version>
    1.12 -                        <specification-version>1.8</specification-version>
    1.13 -                    </run-dependency>
    1.14 -                </dependency>
    1.15 -                <dependency>
    1.16                      <code-name-base>org.netbeans.modules.java.source</code-name-base>
    1.17                      <build-prerequisite/>
    1.18                      <compile-dependency/>
    1.19 @@ -148,15 +139,6 @@
    1.20                      </run-dependency>
    1.21                  </dependency>
    1.22                  <dependency>
    1.23 -                    <code-name-base>org.netbeans.modules.visualweb.api.portlet.dd</code-name-base>
    1.24 -                    <build-prerequisite/>
    1.25 -                    <compile-dependency/>
    1.26 -                    <run-dependency>
    1.27 -                        <release-version>1</release-version>
    1.28 -                        <specification-version>1.0</specification-version>
    1.29 -                    </run-dependency>
    1.30 -                </dependency>
    1.31 -                <dependency>
    1.32                      <code-name-base>org.netbeans.modules.visualweb.classloaderprovider</code-name-base>
    1.33                      <build-prerequisite/>
    1.34                      <compile-dependency/>
    1.35 @@ -233,14 +215,6 @@
    1.36                      </run-dependency>
    1.37                  </dependency>
    1.38                  <dependency>
    1.39 -                    <code-name-base>org.netbeans.modules.visualweb.libs.el.ri12</code-name-base>
    1.40 -                    <build-prerequisite/>
    1.41 -                    <compile-dependency/>
    1.42 -                    <run-dependency>
    1.43 -                        <specification-version>1.0</specification-version>
    1.44 -                    </run-dependency>
    1.45 -                </dependency>
    1.46 -                <dependency>
    1.47                      <code-name-base>org.netbeans.modules.visualweb.libs.javaee5</code-name-base>
    1.48                      <build-prerequisite/>
    1.49                      <compile-dependency/>

     2.1 --- a/visualweb.insync/src/org/netbeans/modules/visualweb/insync/ModelSet.java	Fri Feb 16 22:20:02 2007 +0000
     2.2 +++ b/visualweb.insync/src/org/netbeans/modules/visualweb/insync/ModelSet.java	Fri Feb 16 22:23:33 2007 +0000
     2.3 @@ -982,6 +982,7 @@
     2.4  /*//NB6.0
     2.5          MdrInSyncSynchronizer.get().doOutsideOfRefactoringSession(new Runnable() {
     2.6              public void run() {
     2.7 + */
     2.8                  ModelCreateVisitor visitor = new ModelCreateVisitor();
     2.9                  visitor.visit(fileObject);
    2.10                  Collection modelsAdded = visitor.getModelsAdded();
    2.11 @@ -1000,6 +1001,7 @@
    2.12                          model = null;
    2.13                      }
    2.14                  }
    2.15 +/*
    2.16              }
    2.17          });
    2.18  //*/
    2.19 @@ -1023,12 +1025,14 @@
    2.20  /*//NB6.0
    2.21          MdrInSyncSynchronizer.get().doOutsideOfRefactoringSession(new Runnable() {
    2.22              public void run() {
    2.23 +*/
    2.24                  // There are some elements that get refreshed that assume they are on UI thread
    2.25                  SwingUtilities.invokeLater(new Runnable() {
    2.26                      public void run() {
    2.27                          removeModel(finalModel);
    2.28                      }
    2.29                  });
    2.30 +/*
    2.31              }
    2.32          });
    2.33   //*/
    2.34 @@ -1047,6 +1051,7 @@
    2.35  /*//NB6.0
    2.36          MdrInSyncSynchronizer.get().doOutsideOfRefactoringSession(new Runnable() {
    2.37              public void run() {
    2.38 +*/ 
    2.39                  for (int i=0; i < models.length; i++) {
    2.40                      Model model = models[i];
    2.41                      model.fileRenamed(oldName, newName, extension, fileObject, needToRemove);
    2.42 @@ -1055,6 +1060,7 @@
    2.43                      Model model = configModels[i];
    2.44                      model.fileRenamed(oldName, newName, extension, fileObject, needToRemove);
    2.45                  }
    2.46 +/*
    2.47              }
    2.48          });
    2.49  //*/

     3.1 --- a/visualweb.insync/src/org/netbeans/modules/visualweb/insync/SourceUnit.java	Fri Feb 16 22:20:02 2007 +0000
     3.2 +++ b/visualweb.insync/src/org/netbeans/modules/visualweb/insync/SourceUnit.java	Fri Feb 16 22:23:33 2007 +0000
     3.3 @@ -173,9 +173,11 @@
     3.4              	// do not set the source dirty. The changes to the model will be flushed
     3.5              	// at the end of refactoring.
     3.6              	if (!MdrInSyncSynchronizer.get().isRefactoringSessionInProgress()) {
     3.7 -            		setSourceDirty();
     3.8 -            	}
     3.9 - //*/
    3.10 +*/
    3.11 +                setSourceDirty();
    3.12 +/*
    3.13 +                }
    3.14 +//*/
    3.15                  releaseDocument();
    3.16              }
    3.17              if ((event.getNewValue() != null) && (event.getOldValue() == null)){

     4.1 --- a/visualweb.insync/src/org/netbeans/modules/visualweb/insync/java/ReadTaskWrapper.java	Fri Feb 16 22:20:02 2007 +0000
     4.2 +++ b/visualweb.insync/src/org/netbeans/modules/visualweb/insync/java/ReadTaskWrapper.java	Fri Feb 16 22:23:33 2007 +0000
     4.3 @@ -55,7 +55,9 @@
     4.4          ReadTaskWrapper taskWrapper = new ReadTaskWrapper(task);
     4.5          JavaSource js = JavaSource.forFileObject(fObj);
     4.6          try {
     4.7 -            js.runUserActionTask(taskWrapper, true);
     4.8 +			// Temporarily do not share the Javac. This is to get around the issue of cached
     4.9 +			// source text in JavaSource
    4.10 +            js.runUserActionTask(taskWrapper, false);
    4.11          } catch (IOException ex) {
    4.12              ex.printStackTrace();
    4.13          }