1.1 --- a/visualweb.designer.jsf/src/org/netbeans/modules/visualweb/designer/jsf/JsfForm.java Fri Feb 02 23:53:57 2007 +0000
1.2 +++ b/visualweb.designer.jsf/src/org/netbeans/modules/visualweb/designer/jsf/JsfForm.java Fri Feb 02 23:55:48 2007 +0000
1.3 @@ -32,7 +32,7 @@
1.4 import com.sun.rave.designtime.markup.MarkupDesignBean;
1.5 import com.sun.rave.designtime.markup.MarkupMouseRegion;
1.6 import org.netbeans.modules.visualweb.insync.FacesDnDSupport;
1.7 -import org.netbeans.modules.visualweb.insync.faces.refactoring.MdrInSyncSynchronizer;
1.8 +//NB60 import org.netbeans.modules.visualweb.insync.faces.refactoring.MdrInSyncSynchronizer;
1.9 import org.netbeans.modules.visualweb.insync.live.LiveUnit;
1.10 import org.netbeans.modules.visualweb.insync.markup.MarkupUnit;
1.11 import org.netbeans.modules.visualweb.insync.models.FacesModel;
1.12 @@ -1147,6 +1147,7 @@
1.13 // getPane().getPaneUI().setPageBox(null);
1.14 // }
1.15
1.16 +/*//NB6.0
1.17 // Reconfigure the data object: throw away the old model
1.18 // and find the new model associated with the new file object.
1.19 // InSyncServiceProvider.get().doOutsideOfRefactoringSession(new Runnable() {
1.20 @@ -1160,6 +1161,7 @@
1.21 });
1.22 }
1.23 });
1.24 +//*/
1.25 }
1.26 }
1.27 } // End of DataObjectPropertyChangeListener.
2.1 --- a/visualweb.errorhandler.client/library/nbproject/project.properties Fri Feb 02 23:53:57 2007 +0000
2.2 +++ b/visualweb.errorhandler.client/library/nbproject/project.properties Fri Feb 02 23:55:48 2007 +0000
2.3 @@ -16,7 +16,7 @@
2.4 dist.dir=dist
2.5 dist.jar=${dist.dir}/errorhandler.jar
2.6 dist.javadoc.dir=${dist.dir}/javadoc
2.7 -file.reference.servlet-jsp-api.jar=../../../ravebuild/rave/enterprise3/modules/ext/servlet2.5-jsp2.1-api.jar
2.8 +file.reference.servlet-jsp-api.jar=../../../ravebuild/rave/enterprise4/modules/ext/servlet2.5-jsp2.1-api.jar
2.9 jar.compress=false
2.10 javac.classpath=\
2.11 ${file.reference.servlet-jsp-api.jar}
3.1 --- a/visualweb.insync/nbproject/project.properties Fri Feb 02 23:53:57 2007 +0000
3.2 +++ b/visualweb.insync/nbproject/project.properties Fri Feb 02 23:55:48 2007 +0000
3.3 @@ -20,7 +20,7 @@
3.4 #${mdr/jmi.dir}/${nb.modules.dir}/ext/jmi.jar:\
3.5 #${mdr/module.dir}/${nb.modules.dir}/ext/mdr.jar
3.6 # Why doesn't the Xerces libs reference in project.xml achieve this?
3.7 -
3.8 +build.compiler.deprecation=false
3.9 javadoc.arch=${basedir}/arch/arch-insync.xml
3.10
3.11 # XXX release55 hack only - to get around the build check on modules with no public packages.
4.1 --- a/visualweb.insync/nbproject/project.xml Fri Feb 02 23:53:57 2007 +0000
4.2 +++ b/visualweb.insync/nbproject/project.xml Fri Feb 02 23:55:48 2007 +0000
4.3 @@ -17,7 +17,6 @@
4.4 Software is Sun Microsystems, Inc. Portions Copyright 1997-2007 Sun
4.5 Microsystems, Inc. All Rights Reserved.
4.6 -->
4.7 -
4.8 <project xmlns="http://www.netbeans.org/ns/project/1">
4.9 <type>org.netbeans.modules.apisupport.project</type>
4.10 <configuration>
4.11 @@ -26,6 +25,111 @@
4.12 <suite-component/>
4.13 <module-dependencies>
4.14 <dependency>
4.15 + <code-name-base>com.sun.rave.propertyeditors</code-name-base>
4.16 + <build-prerequisite/>
4.17 + <compile-dependency/>
4.18 + <run-dependency>
4.19 + <release-version>1</release-version>
4.20 + <specification-version>1.0.0</specification-version>
4.21 + </run-dependency>
4.22 + </dependency>
4.23 + <dependency>
4.24 + <code-name-base>org.netbeans.api.java</code-name-base>
4.25 + <build-prerequisite/>
4.26 + <compile-dependency/>
4.27 + <run-dependency>
4.28 + <release-version>1</release-version>
4.29 + <specification-version>1.10</specification-version>
4.30 + </run-dependency>
4.31 + </dependency>
4.32 + <dependency>
4.33 + <code-name-base>org.netbeans.api.xml</code-name-base>
4.34 + <build-prerequisite/>
4.35 + <compile-dependency/>
4.36 + <run-dependency>
4.37 + <release-version>1</release-version>
4.38 + <specification-version>1.12</specification-version>
4.39 + </run-dependency>
4.40 + </dependency>
4.41 + <dependency>
4.42 + <code-name-base>org.netbeans.libs.javacapi</code-name-base>
4.43 + <build-prerequisite/>
4.44 + <compile-dependency/>
4.45 + <run-dependency>
4.46 + <specification-version>0.5.1</specification-version>
4.47 + </run-dependency>
4.48 + </dependency>
4.49 + <dependency>
4.50 + <code-name-base>org.netbeans.libs.xerces</code-name-base>
4.51 + <build-prerequisite/>
4.52 + <compile-dependency/>
4.53 + <run-dependency>
4.54 + <release-version>1</release-version>
4.55 + <specification-version>1.8</specification-version>
4.56 + </run-dependency>
4.57 + </dependency>
4.58 + <dependency>
4.59 + <code-name-base>org.netbeans.modules.j2eeserver</code-name-base>
4.60 + <build-prerequisite/>
4.61 + <compile-dependency/>
4.62 + <run-dependency>
4.63 + <release-version>4</release-version>
4.64 + <specification-version>1.19.10.1</specification-version>
4.65 + </run-dependency>
4.66 + </dependency>
4.67 + <dependency>
4.68 + <code-name-base>org.netbeans.modules.java.project</code-name-base>
4.69 + <build-prerequisite/>
4.70 + <compile-dependency/>
4.71 + <run-dependency>
4.72 + <release-version>1</release-version>
4.73 + <specification-version>1.8</specification-version>
4.74 + </run-dependency>
4.75 + </dependency>
4.76 + <dependency>
4.77 + <code-name-base>org.netbeans.modules.java.source</code-name-base>
4.78 + <build-prerequisite/>
4.79 + <compile-dependency/>
4.80 + <run-dependency>
4.81 + <specification-version>0.4.0.1.3</specification-version>
4.82 + </run-dependency>
4.83 + </dependency>
4.84 + <dependency>
4.85 + <code-name-base>org.netbeans.modules.project.libraries</code-name-base>
4.86 + <build-prerequisite/>
4.87 + <compile-dependency/>
4.88 + <run-dependency>
4.89 + <release-version>1</release-version>
4.90 + </run-dependency>
4.91 + </dependency>
4.92 + <dependency>
4.93 + <code-name-base>org.netbeans.modules.projectapi</code-name-base>
4.94 + <build-prerequisite/>
4.95 + <compile-dependency/>
4.96 + <run-dependency>
4.97 + <release-version>1</release-version>
4.98 + <specification-version>1.9</specification-version>
4.99 + </run-dependency>
4.100 + </dependency>
4.101 + <dependency>
4.102 + <code-name-base>org.netbeans.modules.projectuiapi</code-name-base>
4.103 + <build-prerequisite/>
4.104 + <compile-dependency/>
4.105 + <run-dependency>
4.106 + <release-version>1</release-version>
4.107 + <specification-version>1.13.0.5</specification-version>
4.108 + </run-dependency>
4.109 + </dependency>
4.110 + <dependency>
4.111 + <code-name-base>org.netbeans.modules.queries</code-name-base>
4.112 + <build-prerequisite/>
4.113 + <compile-dependency/>
4.114 + <run-dependency>
4.115 + <release-version>1</release-version>
4.116 + <specification-version>1.7.22</specification-version>
4.117 + </run-dependency>
4.118 + </dependency>
4.119 + <dependency>
4.120 <code-name-base>org.netbeans.modules.visualweb.api.designer</code-name-base>
4.121 <build-prerequisite/>
4.122 <compile-dependency/>
4.123 @@ -162,15 +266,6 @@
4.124 </run-dependency>
4.125 </dependency>
4.126 <dependency>
4.127 - <code-name-base>com.sun.rave.propertyeditors</code-name-base>
4.128 - <build-prerequisite/>
4.129 - <compile-dependency/>
4.130 - <run-dependency>
4.131 - <release-version>1</release-version>
4.132 - <specification-version>1.0.0</specification-version>
4.133 - </run-dependency>
4.134 - </dependency>
4.135 - <dependency>
4.136 <code-name-base>org.netbeans.modules.visualweb.webui</code-name-base>
4.137 <build-prerequisite/>
4.138 <compile-dependency/>
4.139 @@ -189,14 +284,6 @@
4.140 </run-dependency>
4.141 </dependency>
4.142 <dependency>
4.143 - <code-name-base>org.netbeans.modules.visualweb.xhtml</code-name-base>
4.144 - <build-prerequisite/>
4.145 - <compile-dependency/>
4.146 - <run-dependency>
4.147 - <specification-version>1.0</specification-version>
4.148 - </run-dependency>
4.149 - </dependency>
4.150 - <dependency>
4.151 <code-name-base>org.netbeans.modules.visualweb.woodstock.webui.jsf</code-name-base>
4.152 <build-prerequisite/>
4.153 <compile-dependency/>
4.154 @@ -205,154 +292,11 @@
4.155 </run-dependency>
4.156 </dependency>
4.157 <dependency>
4.158 - <code-name-base>javax.jmi.reflect</code-name-base>
4.159 + <code-name-base>org.netbeans.modules.visualweb.xhtml</code-name-base>
4.160 <build-prerequisite/>
4.161 <compile-dependency/>
4.162 <run-dependency>
4.163 - <release-version>1</release-version>
4.164 - <specification-version>1.7</specification-version>
4.165 - </run-dependency>
4.166 - </dependency>
4.167 - <dependency>
4.168 - <code-name-base>org.netbeans.api.java</code-name-base>
4.169 - <build-prerequisite/>
4.170 - <compile-dependency/>
4.171 - <run-dependency>
4.172 - <release-version>1</release-version>
4.173 - <specification-version>1.10</specification-version>
4.174 - </run-dependency>
4.175 - </dependency>
4.176 - <dependency>
4.177 - <code-name-base>org.netbeans.api.mdr</code-name-base>
4.178 - <build-prerequisite/>
4.179 - <compile-dependency/>
4.180 - <run-dependency>
4.181 - <release-version>1</release-version>
4.182 - <specification-version>1.4</specification-version>
4.183 - </run-dependency>
4.184 - </dependency>
4.185 - <dependency>
4.186 - <code-name-base>org.netbeans.api.xml</code-name-base>
4.187 - <build-prerequisite/>
4.188 - <compile-dependency/>
4.189 - <run-dependency>
4.190 - <release-version>1</release-version>
4.191 - <specification-version>1.12</specification-version>
4.192 - </run-dependency>
4.193 - </dependency>
4.194 - <dependency>
4.195 - <code-name-base>org.netbeans.jmi.javamodel</code-name-base>
4.196 - <build-prerequisite/>
4.197 - <compile-dependency/>
4.198 - <run-dependency>
4.199 - <release-version>2</release-version>
4.200 - <specification-version>1.21.0</specification-version>
4.201 - </run-dependency>
4.202 - </dependency>
4.203 - <dependency>
4.204 - <code-name-base>org.netbeans.libs.xerces</code-name-base>
4.205 - <build-prerequisite/>
4.206 - <compile-dependency/>
4.207 - <run-dependency>
4.208 - <release-version>1</release-version>
4.209 - <specification-version>1.8</specification-version>
4.210 - </run-dependency>
4.211 - </dependency>
4.212 - <dependency>
4.213 - <code-name-base>org.netbeans.modules.j2eeserver</code-name-base>
4.214 - <build-prerequisite/>
4.215 - <compile-dependency/>
4.216 - <run-dependency>
4.217 - <release-version>4</release-version>
4.218 - <specification-version>1.19.10.1</specification-version>
4.219 - </run-dependency>
4.220 - </dependency>
4.221 - <dependency>
4.222 - <code-name-base>org.netbeans.modules.java</code-name-base>
4.223 - <build-prerequisite/>
4.224 - <compile-dependency/>
4.225 - <run-dependency>
4.226 - <release-version>1</release-version>
4.227 - <specification-version>1.25.0.2.2.2</specification-version>
4.228 - </run-dependency>
4.229 - </dependency>
4.230 - <dependency>
4.231 - <code-name-base>org.netbeans.modules.java.project</code-name-base>
4.232 - <build-prerequisite/>
4.233 - <compile-dependency/>
4.234 - <run-dependency>
4.235 - <release-version>1</release-version>
4.236 - <specification-version>1.8</specification-version>
4.237 - </run-dependency>
4.238 - </dependency>
4.239 - <dependency>
4.240 - <code-name-base>org.netbeans.modules.javacore</code-name-base>
4.241 - <build-prerequisite/>
4.242 - <compile-dependency/>
4.243 - <run-dependency>
4.244 - <release-version>1</release-version>
4.245 - <specification-version>1.18.0.2.2</specification-version>
4.246 - </run-dependency>
4.247 - </dependency>
4.248 - <dependency>
4.249 - <code-name-base>org.netbeans.modules.jmiutils</code-name-base>
4.250 - <build-prerequisite/>
4.251 - <compile-dependency/>
4.252 - <run-dependency>
4.253 - <release-version>1</release-version>
4.254 - <specification-version>1.5.0.2</specification-version>
4.255 - </run-dependency>
4.256 - </dependency>
4.257 - <dependency>
4.258 - <code-name-base>org.netbeans.modules.mdr</code-name-base>
4.259 - <build-prerequisite/>
4.260 - <compile-dependency/>
4.261 - <run-dependency>
4.262 - <release-version>1</release-version>
4.263 - </run-dependency>
4.264 - </dependency>
4.265 - <dependency>
4.266 - <code-name-base>org.netbeans.modules.project.libraries</code-name-base>
4.267 - <build-prerequisite/>
4.268 - <compile-dependency/>
4.269 - <run-dependency>
4.270 - <release-version>1</release-version>
4.271 - </run-dependency>
4.272 - </dependency>
4.273 - <dependency>
4.274 - <code-name-base>org.netbeans.modules.projectapi</code-name-base>
4.275 - <build-prerequisite/>
4.276 - <compile-dependency/>
4.277 - <run-dependency>
4.278 - <release-version>1</release-version>
4.279 - <specification-version>1.9</specification-version>
4.280 - </run-dependency>
4.281 - </dependency>
4.282 - <dependency>
4.283 - <code-name-base>org.netbeans.modules.projectuiapi</code-name-base>
4.284 - <build-prerequisite/>
4.285 - <compile-dependency/>
4.286 - <run-dependency>
4.287 - <release-version>1</release-version>
4.288 - <specification-version>1.13.0.5</specification-version>
4.289 - </run-dependency>
4.290 - </dependency>
4.291 - <dependency>
4.292 - <code-name-base>org.netbeans.modules.queries</code-name-base>
4.293 - <build-prerequisite/>
4.294 - <compile-dependency/>
4.295 - <run-dependency>
4.296 - <release-version>1</release-version>
4.297 - <specification-version>1.7.22</specification-version>
4.298 - </run-dependency>
4.299 - </dependency>
4.300 - <dependency>
4.301 - <code-name-base>org.netbeans.modules.refactoring</code-name-base>
4.302 - <build-prerequisite/>
4.303 - <compile-dependency/>
4.304 - <run-dependency>
4.305 - <release-version>1</release-version>
4.306 - <specification-version>1.19.1</specification-version>
4.307 + <specification-version>1.0</specification-version>
4.308 </run-dependency>
4.309 </dependency>
4.310 <dependency>
5.1 --- a/visualweb.insync/src/org/netbeans/modules/visualweb/insync/InSyncServiceProvider.java Fri Feb 02 23:53:57 2007 +0000
5.2 +++ b/visualweb.insync/src/org/netbeans/modules/visualweb/insync/InSyncServiceProvider.java Fri Feb 02 23:55:48 2007 +0000
5.3 @@ -51,7 +51,7 @@
5.4 import com.sun.rave.designtime.DesignProject;
5.5 import com.sun.rave.designtime.markup.MarkupDesignBean;
5.6 import org.netbeans.modules.visualweb.insync.faces.ElAttrUpdater;
5.7 -import org.netbeans.modules.visualweb.insync.faces.refactoring.MdrInSyncSynchronizer;
5.8 +//NB6.0 import org.netbeans.modules.visualweb.insync.faces.refactoring.MdrInSyncSynchronizer;
5.9 import org.netbeans.modules.visualweb.insync.jsf.SourceMonitor;
5.10 import org.netbeans.modules.visualweb.insync.markup.MarkupUnit;
5.11 import org.netbeans.modules.visualweb.insync.markup.MarkupVisitor;
5.12 @@ -133,7 +133,7 @@
5.13 }
5.14
5.15 public void doOutsideOfRefactoringSession(Runnable runnable) {
5.16 - MdrInSyncSynchronizer.get().doOutsideOfRefactoringSession(runnable);
5.17 + //NB6.0 MdrInSyncSynchronizer.get().doOutsideOfRefactoringSession(runnable);
5.18 }
5.19
5.20 public String getBeanNameForJsp(FileObject fileObject) {
6.1 --- a/visualweb.insync/src/org/netbeans/modules/visualweb/insync/Model.java Fri Feb 02 23:53:57 2007 +0000
6.2 +++ b/visualweb.insync/src/org/netbeans/modules/visualweb/insync/Model.java Fri Feb 02 23:55:48 2007 +0000
6.3 @@ -19,11 +19,10 @@
6.4 package org.netbeans.modules.visualweb.insync;
6.5
6.6 import org.netbeans.api.project.Project;
6.7 -import org.netbeans.modules.javacore.JMManager;
6.8 import org.openide.filesystems.FileObject;
6.9
6.10 import org.netbeans.modules.visualweb.project.jsf.api.JsfProjectUtils;
6.11 -import org.netbeans.modules.visualweb.insync.faces.refactoring.MdrInSyncSynchronizer;
6.12 +//NB60 import org.netbeans.modules.visualweb.insync.faces.refactoring.MdrInSyncSynchronizer;
6.13
6.14 /**
6.15 * General Model abstraction. A Model is a wrapper for one or more Units and serves to bootstrap the
6.16 @@ -185,16 +184,9 @@
6.17 public abstract boolean isWriteLocked();
6.18
6.19 protected void beginMdrTransation() {
6.20 - // !EAT TODO
6.21 - // The MDR transaction setup is done in order to guarantee that while a sync is being performed
6.22 - // no updates are being made to my likely Java source documents
6.23 - // This does beg the question however of how we should really be working with concurrent modifications
6.24 - // what happens when a sync() is done, then documents get modified underneath me.
6.25 - JMManager.getDefaultRepository().beginTrans(false);
6.26 }
6.27
6.28 protected void endMdrTransaction() {
6.29 - JMManager.getDefaultRepository().endTrans();
6.30 }
6.31
6.32 /**
6.33 @@ -278,13 +270,13 @@
6.34 }
6.35
6.36 public void sourceUnitModelDirtied(SourceUnit unit) {
6.37 - MdrInSyncSynchronizer.get().addModelDirtied(this);
6.38 +//NB60 MdrInSyncSynchronizer.get().addModelDirtied(this);
6.39 }
6.40
6.41 protected boolean needSyncing = true;
6.42
6.43 public void sourceUnitSourceDirtied(SourceUnit unit) {
6.44 - MdrInSyncSynchronizer.get().addModelDirtied(this);
6.45 +//NB60 MdrInSyncSynchronizer.get().addModelDirtied(this);
6.46 needSyncing = true;
6.47 getOwner().addToModelsToSync(this);
6.48 }
7.1 --- a/visualweb.insync/src/org/netbeans/modules/visualweb/insync/ModelSet.java Fri Feb 02 23:53:57 2007 +0000
7.2 +++ b/visualweb.insync/src/org/netbeans/modules/visualweb/insync/ModelSet.java Fri Feb 02 23:55:48 2007 +0000
7.3 @@ -77,7 +77,7 @@
7.4 import org.openide.windows.TopComponent;
7.5 import org.openide.windows.WindowManager;
7.6
7.7 -import org.netbeans.modules.visualweb.insync.faces.refactoring.MdrInSyncSynchronizer;
7.8 +//NB60 import org.netbeans.modules.visualweb.insync.faces.refactoring.MdrInSyncSynchronizer;
7.9 import org.netbeans.modules.visualweb.insync.models.ConfigModel;
7.10
7.11 /**
7.12 @@ -982,7 +982,7 @@
7.13 // Do this outside of refactoring session, as we cannot guarantee when the Java or the JSP file will be
7.14 // "added", this way we wait until everything is done and we have all the files already moved prior
7.15 // to building the models
7.16 -
7.17 +/*//NB6.0
7.18 MdrInSyncSynchronizer.get().doOutsideOfRefactoringSession(new Runnable() {
7.19 public void run() {
7.20 ModelCreateVisitor visitor = new ModelCreateVisitor();
7.21 @@ -1005,6 +1005,7 @@
7.22 }
7.23 }
7.24 });
7.25 +//*/
7.26 }
7.27
7.28 public void fileDeleted (final FileEvent event) {
7.29 @@ -1022,6 +1023,7 @@
7.30 models.remove(model.getFile());
7.31 }
7.32 final Model finalModel = model;
7.33 +/*//NB6.0
7.34 MdrInSyncSynchronizer.get().doOutsideOfRefactoringSession(new Runnable() {
7.35 public void run() {
7.36 // There are some elements that get refreshed that assume they are on UI thread
7.37 @@ -1032,6 +1034,7 @@
7.38 });
7.39 }
7.40 });
7.41 + //*/
7.42 }
7.43
7.44 public void fileRenamed(final FileRenameEvent event) {
7.45 @@ -1044,6 +1047,7 @@
7.46 final boolean needToRemove = getLocalFileObject(fileObject) == null ? true : false;
7.47 final Model[] models = getModels();
7.48 final Model[] configModels = getConfigModels();
7.49 +/*//NB6.0
7.50 MdrInSyncSynchronizer.get().doOutsideOfRefactoringSession(new Runnable() {
7.51 public void run() {
7.52 for (int i=0; i < models.length; i++) {
7.53 @@ -1056,6 +1060,7 @@
7.54 }
7.55 }
7.56 });
7.57 +//*/
7.58 }
7.59
7.60 private /*static*/ class ModelSetOperationListener implements OperationListener {
8.1 --- a/visualweb.insync/src/org/netbeans/modules/visualweb/insync/SourceUnit.java Fri Feb 02 23:53:57 2007 +0000
8.2 +++ b/visualweb.insync/src/org/netbeans/modules/visualweb/insync/SourceUnit.java Fri Feb 02 23:55:48 2007 +0000
8.3 @@ -48,7 +48,7 @@
8.4
8.5 import org.netbeans.modules.visualweb.extension.openide.util.Trace;
8.6 import org.netbeans.modules.visualweb.insync.Unit.State;
8.7 -import org.netbeans.modules.visualweb.insync.faces.refactoring.MdrInSyncSynchronizer;
8.8 +//NB60 import org.netbeans.modules.visualweb.insync.faces.refactoring.MdrInSyncSynchronizer;
8.9
8.10 import org.openide.filesystems.FileAttributeEvent;
8.11 import org.openide.filesystems.FileEvent;
8.12 @@ -167,6 +167,7 @@
8.13 public void propertyChange(PropertyChangeEvent event) {
8.14 if (EditorCookie.Observable.PROP_DOCUMENT.equals(event.getPropertyName())) {
8.15 if (event.getNewValue() == null) {
8.16 +/*//NB6.0
8.17 // Bug Fix # 6473201 llegalStateException, When renaming a page
8.18 // When a document (e.g. managed-beans.xml) is reloaded during refactoring
8.19 // do not set the source dirty. The changes to the model will be flushed
8.20 @@ -174,6 +175,7 @@
8.21 if (!MdrInSyncSynchronizer.get().isRefactoringSessionInProgress()) {
8.22 setSourceDirty();
8.23 }
8.24 + //*/
8.25 releaseDocument();
8.26 }
8.27 if ((event.getNewValue() != null) && (event.getOldValue() == null)){
9.1 --- a/visualweb.insync/src/org/netbeans/modules/visualweb/insync/Util.java Fri Feb 02 23:53:57 2007 +0000
9.2 +++ b/visualweb.insync/src/org/netbeans/modules/visualweb/insync/Util.java Fri Feb 02 23:55:48 2007 +0000
9.3 @@ -211,7 +211,7 @@
9.4 try {
9.5 BufferedInputStream inputStream = new BufferedInputStream(fileObject.getInputStream());
9.6 if (fileObject.getExt().equals(JAVA_EXT)){
9.7 - encoding = org.netbeans.modules.java.Util.getFileEncoding(fileObject);
9.8 +//NB60 encoding = org.netbeans.modules.java.Util.getFileEncoding(fileObject); // Talk to Wiston or Java folks
9.9 } if (fileExt.equals(JSP_EXT) || fileExt.equals(JSPF_EXT) || fileExt.equals(XML_EXT)){
9.10 encoding = EncodingHelper.detectEncoding(inputStream);
9.11 }else{
10.1 --- a/visualweb.insync/src/org/netbeans/modules/visualweb/insync/beans/Bean.java Fri Feb 02 23:53:57 2007 +0000
10.2 +++ b/visualweb.insync/src/org/netbeans/modules/visualweb/insync/beans/Bean.java Fri Feb 02 23:55:48 2007 +0000
10.3 @@ -29,7 +29,6 @@
10.4 import java.util.ArrayList;
10.5 import java.util.Iterator;
10.6 import java.util.List;
10.7 -import org.netbeans.jmi.javamodel.Statement;
10.8 import org.openide.util.NbBundle;
10.9
10.10 import org.netbeans.modules.visualweb.extension.openide.util.Trace;
10.11 @@ -42,8 +41,7 @@
10.12 import org.netbeans.modules.visualweb.insync.models.FacesModel;
10.13 import org.netbeans.modules.visualweb.insync.models.FacesModelSet;
10.14 import org.netbeans.modules.visualweb.insync.live.LiveUnit;
10.15 -import org.netbeans.jmi.javamodel.Field;
10.16 -import org.netbeans.jmi.javamodel.Method;
10.17 +
10.18
10.19 /**
10.20 * Representation of a JavaBean instance field within our outer host BeansUnit being built. Initial
10.21 @@ -64,9 +62,9 @@
10.22 protected final ArrayList eventSets = new ArrayList();
10.23
10.24 private String name;
10.25 - private Field field;
10.26 - private Method getter;
10.27 - private Method setter;
10.28 + private Object/*VariableElement*/ field;
10.29 + private Object/*ExecutableElement*/ getter;
10.30 + private Object/*ExecutableElement*/ setter;
10.31
10.32 //--------------------------------------------------------------------------------- Construction
10.33
10.34 @@ -93,7 +91,7 @@
10.35 * @param setter
10.36 */
10.37 protected Bean(BeansUnit unit, BeanInfo beanInfo, String name,
10.38 - Field field, Method getter, Method setter) {
10.39 + Object/*VariableElement*/ field, Object/*ExecutableElement*/ getter, Object/*ExecutableElement*/ setter) {
10.40 this(unit, beanInfo, name);
10.41 this.field = field;
10.42 this.getter = getter;
10.43 @@ -107,6 +105,7 @@
10.44 * @param after existing bean that this bean's entries will be added after
10.45 */
10.46 public void insertEntry(Bean after) {
10.47 +/*//NB6.0
10.48 Class typec = beanInfo.getBeanDescriptor().getBeanClass();
10.49 JMIUtils.beginTrans(true);
10.50 boolean rollback = true;
10.51 @@ -133,6 +132,7 @@
10.52 }finally {
10.53 JMIUtils.endTrans(rollback);
10.54 }
10.55 + //*/
10.56 }
10.57
10.58 /**
10.59 @@ -142,6 +142,7 @@
10.60 * @return true iff the source entry for this bean was actually removed.
10.61 */
10.62 protected boolean removeEntry() {
10.63 +/*//NB6.0
10.64 assert Trace.trace("insync.beans", "B.removeEntry: " + this);
10.65 boolean removed = false;
10.66 for (Iterator i = properties.iterator(); i.hasNext(); ) {
10.67 @@ -177,6 +178,8 @@
10.68 getter = setter = null;
10.69
10.70 return removed;
10.71 + //*/
10.72 + return false;
10.73 }
10.74
10.75 /**
10.76 @@ -284,7 +287,7 @@
10.77 /**
10.78 * @return the underlying field for this bean, null if dead.
10.79 */
10.80 - public Field getField() {
10.81 + public Object/*VariableElement*/ getField() {
10.82 return field;
10.83 }
10.84
11.1 --- a/visualweb.insync/src/org/netbeans/modules/visualweb/insync/beans/BeanStructureScanner.java Fri Feb 02 23:53:57 2007 +0000
11.2 +++ b/visualweb.insync/src/org/netbeans/modules/visualweb/insync/beans/BeanStructureScanner.java Fri Feb 02 23:55:48 2007 +0000
11.3 @@ -26,19 +26,12 @@
11.4 import java.io.File;
11.5 import java.util.List;
11.6 import java.util.ListIterator;
11.7 -import org.netbeans.jmi.javamodel.CallableFeature;
11.8 -import org.netbeans.jmi.javamodel.Method;
11.9 -import org.netbeans.jmi.javamodel.Statement;
11.10 -import org.netbeans.jmi.javamodel.StatementBlock;
11.11 -import org.netbeans.jmi.javamodel.TryStatement;
11.12 -import org.netbeans.jmi.javamodel.TypeReference;
11.13
11.14 import org.openide.util.NbBundle;
11.15
11.16 import org.netbeans.modules.visualweb.extension.openide.util.Trace;
11.17 import org.netbeans.modules.visualweb.insync.java.JMIUtils;
11.18 import java.lang.reflect.Modifier;
11.19 -import org.netbeans.jmi.javamodel.Field;
11.20
11.21 /**
11.22 * Manage the methods, fields and such that should be defined for the bean described by my model.
11.23 @@ -80,7 +73,8 @@
11.24 /**
11.25 *
11.26 */
11.27 - protected StatementBlock ensureInitBlock(MethodInfo mi) {
11.28 + protected Object/*BlockTree*/ ensureInitBlock(MethodInfo mi) {
11.29 +/*//NB6.0
11.30 UndoEvent event = null;
11.31 try {
11.32 String eventName = NbBundle.getMessage(BeanStructureScanner.class, "EnsureInitBlock"); //NOI18N
11.33 @@ -119,6 +113,8 @@
11.34 beansUnit.getModel().writeUnlock(event);
11.35 }
11.36 }
11.37 + //*/
11.38 + return null;
11.39 }
11.40
11.41 /**
11.42 @@ -134,9 +130,10 @@
11.43 * @param requiredImports An array of classes to be imported, or null to import nothing
11.44 * @return The existing or newly created method.
11.45 */
11.46 - public Method ensureEventMethod(MethodDescriptor md, String name,
11.47 + public Object/*ExecutableElement*/ ensureEventMethod(MethodDescriptor md, String name,
11.48 String defaultBody, String[] parameterNames,
11.49 String[] requiredImports) {
11.50 +/*// NB6.0
11.51 Class retType = md.getMethod().getReturnType();
11.52 String body = defaultBody;
11.53 if(defaultBody == null) {
11.54 @@ -181,6 +178,8 @@
11.55 beansUnit.getModel().writeUnlock(event);
11.56 }
11.57 }
11.58 + //*/
11.59 + return null;
11.60 }
11.61
11.62 /**
11.63 @@ -199,19 +198,22 @@
11.64 }
11.65 }
11.66
11.67 - protected StatementBlock ensureBlock(MethodInfo mi) {
11.68 - return mi.getMethod().getBody();
11.69 + protected Object/*BlockTree*/ ensureBlock(MethodInfo mi) {
11.70 +//NB60 return mi.getMethod().getBody();
11.71 + return null;
11.72 }
11.73
11.74 /**
11.75 *
11.76 */
11.77 - protected StatementBlock ensurePropertiesInitBlock() {
11.78 - return getPropertiesInitMethod().getBody();
11.79 + protected Object/*BlockTree*/ ensurePropertiesInitBlock() {
11.80 +//NB60 return getPropertiesInitMethod().getBody();
11.81 + return null;
11.82 }
11.83
11.84
11.85 - protected CallableFeature ensureMethod(Object location, MethodInfo mi) {
11.86 + protected Object/*ExecutableElement*/ ensureMethod(Object location, MethodInfo mi) {
11.87 +/*//NB6.0
11.88 org.netbeans.modules.visualweb.insync.java.MethodInfo info =
11.89 new org.netbeans.modules.visualweb.insync.java.MethodInfo(mi.getName(),
11.90 mi.getReturnType(), mi.getModifiers(), null, null,
11.91 @@ -235,6 +237,8 @@
11.92 }
11.93 }
11.94 return cf;
11.95 + //*/
11.96 + return null;
11.97 }
11.98
11.99 /**
11.100 @@ -242,7 +246,8 @@
11.101 *
11.102 * @return
11.103 */
11.104 - protected CallableFeature ensureMethods() {
11.105 + protected Object/*ExecutableElement*/ ensureMethods() {
11.106 +/*//NB6.0
11.107 CallableFeature m = null;
11.108 MethodInfo[] methodInfos = getMethodInfos();
11.109 for(int i = 0;i < methodInfos.length; i++) {
11.110 @@ -259,12 +264,15 @@
11.111 }
11.112
11.113 return m;
11.114 + //*/
11.115 + return null;
11.116 }
11.117
11.118 /**
11.119 * TODO: We need to change how this region is created.
11.120 */
11.121 - protected Field ensurePropertyRegion() {
11.122 + protected Object/*VariableElement*/ ensurePropertyRegion() {
11.123 +/*//NB6.0
11.124 JavaClassAdapter javaClass = beansUnit.getThisClass();
11.125 UndoEvent event = null;
11.126 try {
11.127 @@ -292,6 +300,8 @@
11.128 beansUnit.getModel().writeUnlock(event);
11.129 }
11.130 }
11.131 + //*/
11.132 + return null;
11.133 }
11.134
11.135
11.136 @@ -376,6 +386,7 @@
11.137 try {
11.138 String eventName = NbBundle.getMessage(BeanStructureScanner.class, "EnsureXrefAccessor"); //NOI18N
11.139 event = beansUnit.getModel().writeLock(eventName);
11.140 +/*//NB6.0
11.141 boolean rollback = true;
11.142 try {
11.143 JMIUtils.beginTrans(true);
11.144 @@ -392,6 +403,7 @@
11.145 }finally {
11.146 JMIUtils.endTrans(rollback);
11.147 }
11.148 + //*/
11.149 }finally {
11.150 if(event != null) {
11.151 beansUnit.getModel().writeUnlock(event);
11.152 @@ -402,43 +414,50 @@
11.153 /**
11.154 * Finds a possibly existing cross-reference accessor to a sibling bean
11.155 */
11.156 - protected Method findXRefAccessor(String name) {
11.157 - return beansUnit.getThisClass().getMethod("get" + name, new Class[] {}); //NOI18N
11.158 + protected Object/*ExecutableElement*/ findXRefAccessor(String name) {
11.159 +//NB60 return beansUnit.getThisClass().getMethod("get" + name, new Class[] {}); //NOI18N
11.160 + return null;
11.161 }
11.162
11.163 - public StatementBlock getPropertiesInitBlock() {
11.164 - return propertiesInitInfo.getBlock();
11.165 + public Object/*BlockTree*/ getPropertiesInitBlock() {
11.166 +//NB60 return propertiesInitInfo.getBlock();
11.167 + return null;
11.168 }
11.169
11.170 public String getComment(String id) {
11.171 return NbBundle.getMessage(BeanStructureScanner.class, id);
11.172 }
11.173
11.174 - public CallableFeature getConstructorMethod() {
11.175 - return ctorInfo.getMethod();
11.176 + public Object/*ExecutableElement*/ getConstructorMethod() {
11.177 +//NB60 return ctorInfo.getMethod();
11.178 + return null;
11.179 }
11.180
11.181 - public CallableFeature getPropertiesInitMethod() {
11.182 - return propertiesInitInfo.getMethod();
11.183 + public Object/*ExecutableElement*/ getPropertiesInitMethod() {
11.184 +//NB60 return propertiesInitInfo.getMethod();
11.185 + return null;
11.186 }
11.187
11.188 /**
11.189 * @return
11.190 */
11.191 - public StatementBlock getDestroyBlock() {
11.192 - return destroyInfo.getBlock();
11.193 + public Object/*BlockTree*/ getDestroyBlock() {
11.194 +//NB60 return destroyInfo.getBlock();
11.195 + return null;
11.196 }
11.197
11.198 /**
11.199 * @return
11.200 */
11.201 - public Method getDestroyMethod() {
11.202 - return beansUnit.getThisClass().getMethod(destroyInfo.getName(), new Class[]{});
11.203 + public Object/*ExecutableElement*/ getDestroyMethod() {
11.204 +//NB60 return beansUnit.getThisClass().getMethod(destroyInfo.getName(), new Class[]{});
11.205 + return null;
11.206 }
11.207
11.208
11.209 - public StatementBlock[] getPropertiesInitBlocks() {
11.210 - return new StatementBlock[]{propertiesInitInfo.getBlock()};
11.211 + public Object/*BlockTree*/[] getPropertiesInitBlocks() {
11.212 +//NB60 return new StatementBlock[]{propertiesInitInfo.getBlock()};
11.213 + return null;
11.214 }
11.215
11.216 public JavaUnit getJavaUnit() {
11.217 @@ -460,9 +479,11 @@
11.218 * @param name
11.219 */
11.220 public void removeXRefAccessor(String name) {
11.221 +/*//NB6.0
11.222 Method m = findXRefAccessor(name);
11.223 if (m != null)
11.224 beansUnit.getThisClass().removeMethod(m);
11.225 + //*/
11.226 }
11.227
11.228 public void scan() {
11.229 @@ -488,8 +509,8 @@
11.230 String name, comment, ensureMethodName, exception;
11.231 Class retType;
11.232 int modifiers;
11.233 - CallableFeature method;
11.234 - StatementBlock block;
11.235 + Object/*ExecutableElement*/ method;
11.236 + Object/*BlockTree*/ block;
11.237
11.238 public MethodInfo(String name, int modifiers, Class retType, String comment, String ensureMethodName, String exception) {
11.239 this.retType = retType;
11.240 @@ -528,15 +549,17 @@
11.241 return exception;
11.242 }
11.243
11.244 - public StatementBlock getBlock() {
11.245 - return method.getBody();
11.246 + public Object/*BlockTree*/ getBlock() {
11.247 +//NB60 return method.getBody();
11.248 + return null;
11.249 }
11.250
11.251 - public CallableFeature getMethod() {
11.252 - return method;
11.253 + public Object/*ExecutableElement*/ getMethod() {
11.254 +//NB60 return method;
11.255 + return null;
11.256 }
11.257
11.258 - public void setMethod(CallableFeature method) {
11.259 + public void setMethod(Object/*ExecutableElement*/ method) {
11.260 this.method = method;
11.261 }
11.262
12.1 --- a/visualweb.insync/src/org/netbeans/modules/visualweb/insync/beans/BeansUnit.java Fri Feb 02 23:53:57 2007 +0000
12.2 +++ b/visualweb.insync/src/org/netbeans/modules/visualweb/insync/beans/BeansUnit.java Fri Feb 02 23:55:48 2007 +0000
12.3 @@ -34,7 +34,6 @@
12.4 import java.util.List;
12.5 import java.util.ListIterator;
12.6 import java.util.Map;
12.7 -import org.netbeans.jmi.javamodel.StatementBlock;
12.8
12.9 import org.openide.ErrorManager;
12.10 import org.openide.util.Lookup;
12.11 @@ -47,12 +46,6 @@
12.12 import org.netbeans.modules.visualweb.insync.Unit;
12.13 import org.netbeans.modules.visualweb.insync.java.JavaUnit;
12.14 import org.netbeans.modules.visualweb.insync.java.ClassUtil;
12.15 -import org.netbeans.jmi.javamodel.CallableFeature;
12.16 -import org.netbeans.jmi.javamodel.Field;
12.17 -import org.netbeans.jmi.javamodel.Method;
12.18 -import org.netbeans.jmi.javamodel.Statement;
12.19 -import org.netbeans.jmi.javamodel.Type;
12.20 -import org.netbeans.jmi.javamodel.JavaClass;
12.21
12.22 /**
12.23 * An abstract compilation Unit that represents a single outer (or 'this' or 'root') JavaBean class
12.24 @@ -262,6 +255,7 @@
12.25 * Bind beans & their properties, events and parents
12.26 */
12.27 protected void bind() {
12.28 +/*//NB6.0
12.29 bindBeans();
12.30 StatementBlock[] blocks = getInitBlocks();
12.31 for(int i = 0; i < blocks.length; i++) {
12.32 @@ -269,6 +263,7 @@
12.33 bindEventSets(blocks[i]);
12.34 }
12.35 bindBeanParents();
12.36 +//*/
12.37 }
12.38
12.39 //---------------------------------------------------------------------------------- Unit Output
12.40 @@ -420,8 +415,8 @@
12.41 /**
12.42 * Return a new Bean instance bound to an existing field, getter & setter
12.43 */
12.44 - protected Bean newBoundBean(BeanInfo beanInfo, String name, Field field,
12.45 - Method getter, Method setter) {
12.46 + protected Bean newBoundBean(BeanInfo beanInfo, String name, Object/*VariableElement*/ field,
12.47 + Object/*ExecutableElement*/ getter, Object/*ExecutableElement*/ setter) {
12.48 return new Bean(this, beanInfo, name, field, getter, setter);
12.49 }
12.50
12.51 @@ -463,6 +458,7 @@
12.52 * Run a second parent-child wiring pass
12.53 */
12.54 protected void bindBeans() {
12.55 +/*//NB6.0
12.56 beans.clear();
12.57 try {
12.58 JMIUtils.beginTrans(false);
12.59 @@ -476,6 +472,7 @@
12.60 }finally {
12.61 JMIUtils.endTrans();
12.62 }
12.63 + //*/
12.64 }
12.65
12.66 /**
12.67 @@ -496,7 +493,8 @@
12.68 * @param field
12.69 * @return the new bound bean if bindable, else null
12.70 */
12.71 - protected Bean bindBean(Method getter) {
12.72 + protected Bean bindBean(Object/*ExecutableElement*/ getter) {
12.73 +/*//NB6.0
12.74 // can't be abstract or static, and must be public
12.75 long modifiers = getter.getModifiers();
12.76 if ((modifiers & (Modifier.ABSTRACT | Modifier.STATIC)) != 0
12.77 @@ -517,7 +515,7 @@
12.78 String type = getter.getResultType().getSymbol().getFullNameWithDims();
12.79 if (type == null || type.equals("void")) //NOI18N
12.80 return null;
12.81 - **/
12.82 + ** /
12.83
12.84 // must have a getXxx style name (or isXxx for boolean)
12.85 String name = Naming.propertyName(getter.getName(), type.getName().equals("boolean"));
12.86 @@ -576,20 +574,23 @@
12.87 }
12.88
12.89 return null;
12.90 + //*/
12.91 + return null;
12.92 }
12.93
12.94 /**
12.95 * @param s
12.96 * @return
12.97 */
12.98 - protected Property newBoundProperty(Statement s) {
12.99 + protected Property newBoundProperty(Object/*StatementTree*/ s) {
12.100 return Property.newBoundInstance(this, s);
12.101 }
12.102
12.103 /**
12.104 *
12.105 */
12.106 - protected void bindProperties(StatementBlock block) {
12.107 + protected void bindProperties(Object/*BlockTree*/ block) {
12.108 +/*//NB6.0
12.109 if (block != null) {
12.110 List statements = block.getStatements();
12.111 ListIterator listIter = statements.listIterator();
12.112 @@ -605,6 +606,7 @@
12.113 }
12.114 }
12.115 }
12.116 + //*/
12.117 }
12.118
12.119 /**
12.120 @@ -614,14 +616,15 @@
12.121 * @param s
12.122 * @return
12.123 */
12.124 - protected EventSet newBoundEventSet(Statement s) {
12.125 + protected EventSet newBoundEventSet(Object/*StatementTree*/ s) {
12.126 return EventSet.newBoundInstance(this, s);
12.127 }
12.128
12.129 /**
12.130 * Scan the init block statements and create matching EventSets and register with their beans
12.131 */
12.132 - protected void bindEventSets(StatementBlock block) {
12.133 + protected void bindEventSets(Object/*BlockTree*/ block) {
12.134 +/*//NB6.0
12.135 if (block != null) {
12.136 List statements = block.getStatements();
12.137 ListIterator listIter = statements.listIterator();
12.138 @@ -636,6 +639,7 @@
12.139 }
12.140 }
12.141 }
12.142 + //*/
12.143 }
12.144
12.145 //------------------------------------------------------------------------------------ Accessors
12.146 @@ -704,21 +708,21 @@
12.147 /**
12.148 * @return
12.149 */
12.150 - public StatementBlock[] getInitBlocks() {
12.151 + public Object/*BlockTree*/[] getInitBlocks() {
12.152 return getBeanStructureScanner().getPropertiesInitBlocks();
12.153 }
12.154
12.155 /**
12.156 * @return
12.157 */
12.158 - public StatementBlock getPropertiesInitBlock() {
12.159 + public Object/*BlockTree*/ getPropertiesInitBlock() {
12.160 return getBeanStructureScanner().getPropertiesInitBlock();
12.161 }
12.162
12.163 /**
12.164 * @return
12.165 */
12.166 - public CallableFeature getPropertiesInitMethod() {
12.167 + public Object/*ExecutableElement*/ getPropertiesInitMethod() {
12.168 return getBeanStructureScanner().getPropertiesInitMethod();
12.169 }
12.170
12.171 @@ -726,14 +730,14 @@
12.172 /**
12.173 * @return
12.174 */
12.175 - public StatementBlock getCleanupBlock() {
12.176 + public Object/*BlockTree*/ getCleanupBlock() {
12.177 return getBeanStructureScanner().getDestroyBlock();
12.178 }
12.179
12.180 /**
12.181 * @return
12.182 */
12.183 - public Method getCleanupMethod() {
12.184 + public Object/*ExecutableElement*/ getCleanupMethod() {
12.185 return getBeanStructureScanner().getDestroyMethod();
12.186 }
12.187
12.188 @@ -873,11 +877,14 @@
12.189 * @param name
12.190 * @return
12.191 */
12.192 - public Method getEventMethod(String name, MethodDescriptor md) {
12.193 + public Object/*ExecutableElement*/ getEventMethod(String name, MethodDescriptor md) {
12.194 +/*//NB6.0
12.195 Class[] pts = md.getMethod().getParameterTypes();
12.196 Method m = javaClass.getMethod(name, pts);
12.197 assert Trace.trace("insync.beans", "BU.getEventMethod name:" + name + " null"); //NOI18N
12.198 return m;
12.199 +//*/
12.200 + return null;
12.201 }
12.202
12.203 /**
12.204 @@ -886,7 +893,7 @@
12.205 * @param name
12.206 * @return
12.207 */
12.208 - public Method getInitializerMethod() {
12.209 + public Object/*ExecutableElement*/ getInitializerMethod() {
12.210 return javaClass.getMethod("init", new Class[0]);
12.211 }
12.212
12.213 @@ -910,7 +917,7 @@
12.214 * @param name The name of the metod to find or create.
12.215 * @return The existing or newly created method.
12.216 */
12.217 - public Method ensureEventMethod(MethodDescriptor md, String name, String defaultBody,
12.218 + public Object/*ExecutableElement*/ ensureEventMethod(MethodDescriptor md, String name, String defaultBody,
12.219 String[] parameterNames, String[] requiredImports) {
12.220 return getBeanStructureScanner().ensureEventMethod(md, name, defaultBody,
12.221 parameterNames, requiredImports);
13.1 --- a/visualweb.insync/src/org/netbeans/modules/visualweb/insync/beans/Event.java Fri Feb 02 23:53:57 2007 +0000
13.2 +++ b/visualweb.insync/src/org/netbeans/modules/visualweb/insync/beans/Event.java Fri Feb 02 23:55:48 2007 +0000
13.3 @@ -26,12 +26,6 @@
13.4
13.5 import org.netbeans.modules.visualweb.extension.openide.util.Trace;
13.6 import java.util.List;
13.7 -import org.netbeans.jmi.javamodel.Expression;
13.8 -import org.netbeans.jmi.javamodel.ExpressionStatement;
13.9 -import org.netbeans.jmi.javamodel.Method;
13.10 -import org.netbeans.jmi.javamodel.MethodInvocation;
13.11 -import org.netbeans.jmi.javamodel.ReturnStatement;
13.12 -import org.netbeans.jmi.javamodel.Statement;
13.13
13.14 /**
13.15 * Representation of a wiring for a single event handler within an EventSet's listener adapter in
13.16 @@ -51,9 +45,9 @@
13.17 protected String[] requiredImports;
13.18
13.19 // Java source-based event fields
13.20 - protected Method delegator;
13.21 - protected Method handler;
13.22 - protected MethodInvocation mExpr;
13.23 + protected Object/*ExecutableElement*/ delegator;
13.24 + protected Object/*ExecutableElement*/ handler;
13.25 + protected Object/*MethodInvocationTree*/ mExpr;
13.26
13.27 //--------------------------------------------------------------------------------- Construction
13.28
13.29 @@ -79,7 +73,7 @@
13.30 * @param handler Our handler method that is populated by the user.
13.31 */
13.32 private Event(EventSet set, MethodDescriptor descriptor,
13.33 - Method delegator, MethodInvocation call, Method handler) {
13.34 + Object/*ExecutableElement*/ delegator, Object/*MethodInvocationTree*/ call, Object/*ExecutableElement*/ handler) {
13.35 this(set, descriptor);
13.36 this.delegator = delegator;
13.37 this.mExpr = call;
13.38 @@ -102,7 +96,8 @@
13.39 * @param am The adapter
13.40 * @return the new bound property if bindable, else null
13.41 */
13.42 - static Event newBoundInstance(EventSet set, MethodDescriptor md, Method am) {
13.43 + static Event newBoundInstance(EventSet set, MethodDescriptor md, Object/*ExecutableElement*/ am) {
13.44 +/*//NB6.0
13.45 JMIUtils.beginTrans(false);
13.46 try {
13.47 List stmts = am.getBody().getStatements();
13.48 @@ -136,6 +131,8 @@
13.49 }finally {
13.50 JMIUtils.endTrans();
13.51 }
13.52 + //*/
13.53 + return null;
13.54 }
13.55
13.56 /**
13.57 @@ -192,6 +189,7 @@
13.58 // now add arg(s)
13.59 Class[] pts = descriptor.getMethod().getParameterTypes();
13.60 String[] pns = Naming.paramNames(pts, descriptor.getParameterDescriptors());
13.61 +/*//NB6.0
13.62 JMIUtils.beginTrans(true);
13.63 boolean rollback = true;
13.64 try {
13.65 @@ -210,6 +208,7 @@
13.66 }finally {
13.67 JMIUtils.endTrans(rollback);
13.68 }
13.69 + //*/
13.70 }
13.71
13.72 /**
13.73 @@ -264,6 +263,7 @@
13.74 * @param name The new handler method name.
13.75 */
13.76 public void setHandler(String name) {
13.77 +/*//NB6.0
13.78 JMIUtils.beginTrans(true);
13.79 boolean rollback = true;
13.80 try {
13.81 @@ -280,14 +280,14 @@
13.82 /*
13.83 if(!mExpr.isValid())
13.84 initializeCall();
13.85 - **/
13.86 + ** /
13.87 mExpr.setName(name);
13.88 }
13.89 rollback = false;
13.90 }finally {
13.91 JMIUtils.endTrans(rollback);
13.92 }
13.93 -
13.94 +//*/
13.95 }
13.96
13.97 /**
13.98 @@ -295,18 +295,21 @@
13.99 * @return The handler method name.
13.100 */
13.101 public String getHandlerName() {
13.102 +/*//NB6.0
13.103 // should match handler.getName() too, but handler may be null (temporarily lost)
13.104 //return ((Identifier)call.getMethod()).getFullname();
13.105 if(handler != null)
13.106 return handler.getName();
13.107 - /*
13.108 + /NB6.0*
13.109 else {
13.110 if(!mExpr.isValid()) {
13.111 initializeCall();
13.112 }
13.113 }
13.114 - **/
13.115 + **NB6.0/
13.116 return mExpr.getName();
13.117 + //*/
13.118 + return null;
13.119 }
13.120
13.121 /*
13.122 @@ -329,7 +332,7 @@
13.123 *
13.124 * @return The handler method itself.
13.125 */
13.126 - public Method getHandlerMethod() {
13.127 + public Object/*ExecutableElement*/ getHandlerMethod() {
13.128 return handler;
13.129 }
13.130
14.1 --- a/visualweb.insync/src/org/netbeans/modules/visualweb/insync/beans/EventSet.java Fri Feb 02 23:53:57 2007 +0000
14.2 +++ b/visualweb.insync/src/org/netbeans/modules/visualweb/insync/beans/EventSet.java Fri Feb 02 23:55:48 2007 +0000
14.3 @@ -31,17 +31,6 @@
14.4 import java.util.Iterator;
14.5
14.6 import org.netbeans.modules.visualweb.extension.openide.util.Trace;
14.7 -import org.netbeans.jmi.javamodel.CallableFeature;
14.8 -import org.netbeans.jmi.javamodel.ClassDefinition;
14.9 -import org.netbeans.jmi.javamodel.Expression;
14.10 -import org.netbeans.jmi.javamodel.Method;
14.11 -import org.netbeans.jmi.javamodel.MethodInvocation;
14.12 -import org.netbeans.jmi.javamodel.MultipartId;
14.13 -import org.netbeans.jmi.javamodel.NewClassExpression;
14.14 -import org.netbeans.jmi.javamodel.PrimaryExpression;
14.15 -import org.netbeans.jmi.javamodel.Statement;
14.16 -import org.netbeans.jmi.javamodel.StatementBlock;
14.17 -import org.netbeans.jmi.javamodel.VariableAccess;
14.18
14.19 /**
14.20 * Representation of a wiring for a single event listener, which maps to a single add*Listener
14.21 @@ -59,7 +48,7 @@
14.22 final protected ArrayList events = new ArrayList();
14.23
14.24 // Java source-based event set fields
14.25 - Statement stmt;
14.26 + Object/*StatementTree*/ stmt;
14.27 JavaClassAdapter adapterClass;
14.28
14.29 //--------------------------------------------------------------------------------- Construction
14.30 @@ -82,8 +71,8 @@
14.31 *
14.32 * @param beansUnit
14.33 */
14.34 - protected EventSet(Bean bean, EventSetDescriptor descriptor, Statement stmnt,
14.35 - ClassDefinition adapter) {
14.36 + protected EventSet(Bean bean, EventSetDescriptor descriptor, Object/*StatementTree*/ stmnt,
14.37 + Object/*TypeElement*/ adapter) {
14.38 this(bean, descriptor);
14.39 this.stmt = stmnt;
14.40 this.adapterClass = new JavaClassAdapter(unit.getJavaUnit(), adapter);
14.41 @@ -106,7 +95,8 @@
14.42 * @param s
14.43 * @return the new bound event set if bindable, else null
14.44 */
14.45 - static EventSet newBoundInstance(BeansUnit unit, Statement s) {
14.46 + static EventSet newBoundInstance(BeansUnit unit, Object/*StatementTree*/ s) {
14.47 +/*//NB6.0
14.48 // statement must be an exec (execute expression)
14.49 JMIUtils.beginTrans(false);
14.50 try {
14.51 @@ -136,6 +126,8 @@
14.52 }finally {
14.53 JMIUtils.endTrans();
14.54 }
14.55 + //*/
14.56 + return null;
14.57 }
14.58
14.59 /**
14.60 @@ -155,7 +147,7 @@
14.61 * @param m
14.62 * @return
14.63 */
14.64 - protected Event newBoundEvent(MethodDescriptor md, Method m) {
14.65 + protected Event newBoundEvent(MethodDescriptor md, Object/*ExecutableElement*/ m) {
14.66 return Event.newBoundInstance(this, md, m);
14.67 }
14.68
14.69 @@ -163,6 +155,7 @@
14.70 * Scan our descriptor's methods and create individual events that match
14.71 */
14.72 protected void bindEvents() {
14.73 +/*//NB6.0
14.74 MethodDescriptor[] lmds = descriptor.getListenerMethodDescriptors();
14.75 for (int i = 0; i < lmds.length; i++) {
14.76 Method m = adapterClass.getMethod(lmds[i].getName(),
14.77 @@ -173,9 +166,11 @@
14.78 events.add(e);
14.79 }
14.80 }
14.81 + //*/
14.82 }
14.83
14.84 - protected Method stubDelegatorMethod(MethodDescriptor mdescr) {
14.85 + protected Object/*ExecutableElement*/ stubDelegatorMethod(MethodDescriptor mdescr) {
14.86 +/*//NB6.0
14.87 Class retType = mdescr.getMethod().getReturnType();
14.88
14.89 // now add parameter(s)
14.90 @@ -191,26 +186,33 @@
14.91 new org.netbeans.modules.visualweb.insync.java.MethodInfo(mdescr.getName(), retType, Modifier.PUBLIC,
14.92 pns, pts, body, null);
14.93 return (Method)adapterClass.addMethod(info);
14.94 + //*/
14.95 + return null;
14.96 }
14.97
14.98 - private void stubBody(Method method) {
14.99 + private void stubBody(Object/*ExecutableElement*/ method) {
14.100 +/*//NB6.0
14.101 String body = null;
14.102 if (!method.getType().equals("void")) {
14.103 body = "return null;";
14.104 }
14.105
14.106 JMIMethodUtils.replaceMethodBody(method, body);
14.107 + //*/
14.108 }
14.109
14.110 - protected Method getDelegatorMethod(MethodDescriptor mdescr) {
14.111 + protected Object/*ExecutableElement*/ getDelegatorMethod(MethodDescriptor mdescr) {
14.112 +/*//NB6.0
14.113 Method delegate = adapterClass.getMethod(mdescr.getMethod().getName(),
14.114 mdescr.getMethod().getParameterTypes());
14.115 if (delegate == null)
14.116 delegate = stubDelegatorMethod(mdescr);
14.117 return delegate;
14.118 + //*/
14.119 + return null;
14.120 }
14.121
14.122 - protected void removeDelegatorMethod(Method delegator) {
14.123 + protected void removeDelegatorMethod(Object/*ExecutableElement*/ delegator) {
14.124 Class atype = getAdapterType();
14.125 if (atype != null) {
14.126 adapterClass.removeMethod(delegator);
14.127 @@ -224,6 +226,7 @@
14.128 * Insert the stub source entry for this EventSet
14.129 */
14.130 protected void insertEntry() {
14.131 +/*//NB6.0
14.132 JMIUtils.beginTrans(true);
14.133 boolean rollback = true;
14.134 try {
14.135 @@ -254,6 +257,7 @@
14.136 }finally {
14.137 JMIUtils.endTrans(rollback);
14.138 }
14.139 + //*/
14.140 }
14.141
14.142 /**
14.143 @@ -276,6 +280,7 @@
14.144 assert Trace.trace("insync.beans", "ES.removeEntry: " + this);
14.145 events.clear();
14.146 boolean retVal = false;
14.147 +/*//NB6.0
14.148 JMIUtils.beginTrans(true);
14.149 boolean rollback = true;
14.150 try {
14.151 @@ -296,7 +301,7 @@
14.152 }finally {
14.153 JMIUtils.endTrans(rollback);
14.154 }
14.155 -
14.156 +//*/
14.157 return retVal;
14.158 }
14.159
15.1 --- a/visualweb.insync/src/org/netbeans/modules/visualweb/insync/beans/Property.java Fri Feb 02 23:53:57 2007 +0000
15.2 +++ b/visualweb.insync/src/org/netbeans/modules/visualweb/insync/beans/Property.java Fri Feb 02 23:55:48 2007 +0000
15.3 @@ -26,17 +26,6 @@
15.4 import org.netbeans.modules.visualweb.extension.openide.util.Trace;
15.5 import java.util.ArrayList;
15.6 import java.util.List;
15.7 -import org.netbeans.jmi.javamodel.CallableFeature;
15.8 -import org.netbeans.jmi.javamodel.Element;
15.9 -import org.netbeans.jmi.javamodel.Expression;
15.10 -import org.netbeans.jmi.javamodel.ExpressionStatement;
15.11 -import org.netbeans.jmi.javamodel.JavaClass;
15.12 -import org.netbeans.jmi.javamodel.MethodInvocation;
15.13 -import org.netbeans.jmi.javamodel.MultipartId;
15.14 -import org.netbeans.jmi.javamodel.PrimaryExpression;
15.15 -import org.netbeans.jmi.javamodel.Statement;
15.16 -import org.netbeans.jmi.javamodel.StatementBlock;
15.17 -import org.netbeans.jmi.javamodel.VariableAccess;
15.18
15.19 /**
15.20 * Representation of a single property setting on our parent bean, which maps to a single property
15.21 @@ -51,8 +40,8 @@
15.22 final PropertyDescriptor descriptor;
15.23
15.24 // Java source-based property fields
15.25 - Statement stmt;
15.26 - Expression valueExpr;
15.27 + Object/*StatementTree*/ stmt;
15.28 + Object/*ExpressionTree*/ valueExpr;
15.29
15.30 //--------------------------------------------------------------------------------- Construction
15.31
15.32 @@ -75,7 +64,7 @@
15.33 * @param beansUnit
15.34 */
15.35 private Property(Bean bean, PropertyDescriptor descriptor,
15.36 - Statement stmnt, Expression valueExpr
15.37 + Object/*StatementTree*/ stmnt, Object/*ExpressionTree*/ valueExpr
15.38 ) {
15.39 this(bean, descriptor, false);
15.40 this.stmt = stmnt;
15.41 @@ -84,23 +73,26 @@
15.42 }
15.43
15.44
15.45 - static protected MethodInvocation getExpression
15.46 - (BeansUnit unit, Statement s) {
15.47 + static protected Object/*MethodInvocationTree*/ getExpression
15.48 + (BeansUnit unit, Object/*StatementTree*/ s) {
15.49 +/*//NB6.0
15.50 if(!(s instanceof ExpressionStatement))
15.51 return null;
15.52 ExpressionStatement exStmt = (ExpressionStatement)s;
15.53 -
15.54 +
15.55 if(!(exStmt.getExpression() instanceof MethodInvocation))
15.56 return null;
15.57 MethodInvocation mExpr = (MethodInvocation)exStmt.getExpression();
15.58 -
15.59 +
15.60 if(mExpr.getParameters().size() > 1)
15.61 return null;
15.62 -
15.63 +
15.64 PrimaryExpression pExpr = mExpr.getParentClass();
15.65 if(pExpr == null && !(pExpr instanceof VariableAccess))
15.66 return null;
15.67 - return mExpr;
15.68 + return mExpr;
15.69 +//*/
15.70 + return null;
15.71 }
15.72
15.73 /**
15.74 @@ -109,7 +101,8 @@
15.75 * @param s
15.76 * @return the new bound property if bindable, else null
15.77 */
15.78 - static protected Property newBoundInstance(BeansUnit unit, Statement s) {
15.79 + static protected Property newBoundInstance(BeansUnit unit, Object/*StatementTree*/ s) {
15.80 +/*//NB6.0
15.81 JMIUtils.beginTrans(false);
15.82 try {
15.83 MethodInvocation mExpr = getExpression(unit, s);
15.84 @@ -129,12 +122,14 @@
15.85 PropertyDescriptor pd = bean.getPropertyDescriptorForSetter(mname);
15.86 if (pd == null)
15.87 return null;
15.88 -
15.89 +
15.90 return new Property(bean, pd, s,
15.91 (Expression) mExpr.getParameters().get(0));
15.92 }finally {
15.93 JMIUtils.endTrans();
15.94 - }
15.95 + }
15.96 +//*/
15.97 + return null;
15.98 }
15.99
15.100 /**
15.101 @@ -152,6 +147,7 @@
15.102 * Insert this property's statement into the init method.
15.103 */
15.104 protected void insertEntry() {
15.105 +/*//NB6.0
15.106 JMIUtils.beginTrans(true);
15.107 boolean rollback = true;
15.108 try {
15.109 @@ -162,8 +158,9 @@
15.110 }finally {
15.111 JMIUtils.endTrans(rollback);
15.112 }
15.113 -
15.114 +
15.115 // Args are added in setValue()
15.116 +//*/
15.117 }
15.118
15.119 /**
15.120 @@ -172,7 +169,8 @@
15.121 *
15.122 * @return true iff the source entry for this property was actually removed.
15.123 */
15.124 - protected boolean removeEntry() {
15.125 + protected boolean removeEntry() {
15.126 +/*//NB6.0
15.127 boolean retVal = false;
15.128 JMIUtils.beginTrans(true);
15.129 boolean rollback = true;
15.130 @@ -194,10 +192,12 @@
15.131 }finally {
15.132 JMIUtils.endTrans(rollback);
15.133 }
15.134 -
15.135 +
15.136 if(retVal)
15.137 stmt = null;
15.138 - return retVal;
15.139 + return retVal;
15.140 +//*/
15.141 + return false;
15.142 }
15.143
15.144 //------------------------------------------------------------------------------------ Accessors
15.145 @@ -248,24 +248,28 @@
15.146 * default, but may be returned in other forms by subclasses.
15.147 */
15.148 public String getValueSource() {
15.149 +/*//NB6.0
15.150 JMIUtils.beginTrans(false);
15.151 try {
15.152 if(unit.getJavaUnit() != null) {
15.153 valueExpr = getValueExpression();
15.154 JavaClass jCls = unit.getJavaUnit().getJavaClass();
15.155 - return valueExpr != null ? JMIExpressionUtils.getArgumentSource(
15.156 + return valueExpr != null ? JMIExpressionUtils.getArgumentSource(
15.157 valueExpr) : null;
15.158 }
15.159 return null;
15.160 }finally {
15.161 JMIUtils.endTrans();
15.162 - }
15.163 + }
15.164 +//*/
15.165 + return null;
15.166 }
15.167
15.168 /**
15.169 * Set the value of this property, creating the call arg expression of the appropriate type
15.170 */
15.171 public void setValue(Object value, String valueSource) {
15.172 +/*//NB6.0
15.173 CallableFeature method = unit.getPropertiesInitMethod();
15.174 JMIUtils.beginTrans(true);
15.175 boolean rollback = true;
15.176 @@ -273,7 +277,7 @@
15.177 int startPos = -1;
15.178 int endPos = -1;
15.179 MethodInvocation mExpr = getMethodInvocation();
15.180 -
15.181 +
15.182 if(mExpr != null) {
15.183 List l = mExpr.getParameters();
15.184 if(l.size() == 0) {
15.185 @@ -285,7 +289,7 @@
15.186 endPos = mExpr.getEndOffset()-1;
15.187 }
15.188 }
15.189 -
15.190 +
15.191 int methStartPos = method.getBody().getStartOffset()+1;
15.192 String bodyText = method.getBodyText();
15.193 String body = bodyText.substring(1, startPos-methStartPos);
15.194 @@ -296,10 +300,12 @@
15.195 }finally {
15.196 JMIUtils.endTrans(rollback);
15.197 }
15.198 +//*/
15.199 }
15.200
15.201 - MethodInvocation getMethodInvocation() {
15.202 - JMIUtils.beginTrans(false);
15.203 + Object/*MethodInvocationTree*/ getMethodInvocation() {
15.204 +/*//NB6.0
15.205 + JMIUtils.beginTrans(false);
15.206 try {
15.207 StatementBlock[] blocks = unit.getInitBlocks();
15.208 for (int i = 0; i < blocks.length; i++) {
15.209 @@ -307,22 +313,25 @@
15.210 blocks[i],
15.211 descriptor.getWriteMethod().getName(), bean.getName());
15.212 if (stmt != null) {
15.213 - ExpressionStatement exStmt =
15.214 + ExpressionStatement exStmt =
15.215 (ExpressionStatement)stmt;
15.216 -
15.217 +
15.218 MethodInvocation mExpr =
15.219 (MethodInvocation)exStmt.getExpression();
15.220 return mExpr;
15.221 }
15.222 - }
15.223 + }
15.224 } finally {
15.225 JMIUtils.endTrans();
15.226 }
15.227 -
15.228 +
15.229 + return null;
15.230 +//*/
15.231 return null;
15.232 }
15.233
15.234 - Expression getValueExpression() {
15.235 + Object/*ExpressionTree*/ getValueExpression() {
15.236 +/*//NB6.0
15.237 MethodInvocation mExpr = getMethodInvocation();
15.238 if (mExpr == null) {
15.239 return null;
15.240 @@ -332,6 +341,8 @@
15.241 return (Expression)params.get(0);
15.242 else
15.243 return null;
15.244 +//*/
15.245 + return null;
15.246 }
15.247
15.248 /**
16.1 --- a/visualweb.insync/src/org/netbeans/modules/visualweb/insync/faces/FacesBean.java Fri Feb 02 23:53:57 2007 +0000
16.2 +++ b/visualweb.insync/src/org/netbeans/modules/visualweb/insync/faces/FacesBean.java Fri Feb 02 23:55:48 2007 +0000
16.3 @@ -37,8 +37,6 @@
16.4 import org.netbeans.modules.visualweb.insync.beans.Bean;
16.5 import org.netbeans.modules.visualweb.insync.beans.EventSet;
16.6 import org.netbeans.modules.visualweb.insync.beans.Property;
16.7 -import org.netbeans.jmi.javamodel.Field;
16.8 -import org.netbeans.jmi.javamodel.Method;
16.9
16.10 /**
16.11 * A MarkupBean for a JSF component that lives in a FacesPageUnit.
16.12 @@ -63,8 +61,8 @@
16.13 * @param setter
16.14 * @param element
16.15 */
16.16 - FacesBean(FacesPageUnit unit, BeanInfo beanInfo, String name, Field field, Method getter,
16.17 - Method setter, Element element) {
16.18 + FacesBean(FacesPageUnit unit, BeanInfo beanInfo, String name, Object/*VariableElement*/ field, Object/*ExecutableElement*/ getter,
16.19 + Object/*ExecutableElement*/ setter, Element element) {
16.20 super(unit, beanInfo, name, field, getter, setter, element);
16.21 }
16.22
17.1 --- a/visualweb.insync/src/org/netbeans/modules/visualweb/insync/faces/FacesPageUnit.java Fri Feb 02 23:53:57 2007 +0000
17.2 +++ b/visualweb.insync/src/org/netbeans/modules/visualweb/insync/faces/FacesPageUnit.java Fri Feb 02 23:55:48 2007 +0000
17.3 @@ -37,10 +37,6 @@
17.4 import javax.faces.component.UIForm;
17.5 import javax.faces.component.UIViewRoot;
17.6 import javax.faces.context.FacesContext;
17.7 -import org.netbeans.jmi.javamodel.Field;
17.8 -import org.netbeans.jmi.javamodel.Method;
17.9 -import org.netbeans.jmi.javamodel.Statement;
17.10 -import org.netbeans.jmi.javamodel.StatementBlock;
17.11 import org.openide.ErrorManager;
17.12 import org.openide.loaders.DataObject;
17.13
17.14 @@ -495,7 +491,7 @@
17.15 * @see org.netbeans.modules.visualweb.insync.beans.BeansUnit#newBoundBean(java.beans.BeanInfo, java.lang.String, org.netbeans.modules.visualweb.insync.java.Field, org.netbeans.modules.visualweb.insync.java.Method, org.netbeans.modules.visualweb.insync.java.Method)
17.16 */
17.17 protected Bean newBoundBean(BeanInfo bi, String name,
17.18 - Field field, Method getter, Method setter) {
17.19 + Object/*VariableElement*/ field, Object/*ExecutableElement*/ getter, Object/*ExecutableElement*/ setter) {
17.20 // Determine the source tag for this bean and thus if it is faces
17.21 String tag = getBeanTagName(bi);
17.22 String tlUri = getBeanTaglibUri(bi);
17.23 @@ -750,14 +746,14 @@
17.24 /*
17.25 * @see org.netbeans.modules.visualweb.insync.beans.BeansUnit#newBoundProperty(org.netbeans.modules.visualweb.insync.java.Statement)
17.26 */
17.27 - protected Property newBoundProperty(Statement s) {
17.28 + protected Property newBoundProperty(Object/*StatementTree*/ s) {
17.29 return MarkupProperty.newBoundInstance(this, s);
17.30 }
17.31
17.32 /*
17.33 * @see org.netbeans.modules.visualweb.insync.beans.BeansUnit#bindEventSets()
17.34 */
17.35 - protected void bindEventSets(StatementBlock b) {
17.36 + protected void bindEventSets(Object/*BlockTree*/ b) {
17.37 // bind statement-based event wiring
17.38 super.bindEventSets(b);
17.39
18.1 --- a/visualweb.insync/src/org/netbeans/modules/visualweb/insync/faces/MarkupBean.java Fri Feb 02 23:53:57 2007 +0000
18.2 +++ b/visualweb.insync/src/org/netbeans/modules/visualweb/insync/faces/MarkupBean.java Fri Feb 02 23:55:48 2007 +0000
18.3 @@ -35,8 +35,6 @@
18.4 import com.sun.rave.designtime.markup.MarkupPosition;
18.5 import org.netbeans.modules.visualweb.insync.beans.Bean;
18.6 import org.netbeans.modules.visualweb.insync.beans.Property;
18.7 -import org.netbeans.jmi.javamodel.Field;
18.8 -import org.netbeans.jmi.javamodel.Method;
18.9
18.10 /**
18.11 * Abstract superclass for a Bean that may have entries in markup source as well as Java source
18.12 @@ -62,8 +60,8 @@
18.13 * @param getter
18.14 * @param setter
18.15 */
18.16 - public MarkupBean(FacesPageUnit unit, BeanInfo beanInfo, String name, Field field, Method getter,
18.17 - Method setter, Element element) {
18.18 + public MarkupBean(FacesPageUnit unit, BeanInfo beanInfo, String name, Object/*VariableElement*/ field, Object/*ExecutableElement*/ getter,
18.19 + Object/*ExecutableElement*/ setter, Element element) {
18.20 super(unit, beanInfo, name, field, getter, setter);
18.21 this.element = element;
18.22 children = isParentCapableBean(beanInfo) ? new ArrayList() : null;
19.1 --- a/visualweb.insync/src/org/netbeans/modules/visualweb/insync/faces/MarkupProperty.java Fri Feb 02 23:53:57 2007 +0000
19.2 +++ b/visualweb.insync/src/org/netbeans/modules/visualweb/insync/faces/MarkupProperty.java Fri Feb 02 23:55:48 2007 +0000
19.3 @@ -28,7 +28,6 @@
19.4 import com.sun.rave.designtime.Constants;
19.5 import com.sun.rave.designtime.markup.AttributeDescriptor;
19.6 import org.netbeans.modules.visualweb.extension.openide.util.Trace;
19.7 -import org.netbeans.jmi.javamodel.Statement;
19.8 import org.w3c.dom.Attr;
19.9 import org.w3c.dom.Element;
19.10
19.11 @@ -74,7 +73,7 @@
19.12 * @param s
19.13 * @return the new bound property if bindable, else null
19.14 */
19.15 - static Property newBoundInstance(FacesPageUnit unit, Statement s) {
19.16 + static Property newBoundInstance(FacesPageUnit unit, Object/*StatementTree*/ s) {
19.17 return Property.newBoundInstance(unit, s);
19.18 }
19.19
20.1 --- a/visualweb.insync/src/org/netbeans/modules/visualweb/insync/faces/ThresherFacesBeanStructureScanner.java Fri Feb 02 23:53:57 2007 +0000
20.2 +++ b/visualweb.insync/src/org/netbeans/modules/visualweb/insync/faces/ThresherFacesBeanStructureScanner.java Fri Feb 02 23:55:48 2007 +0000
20.3 @@ -27,12 +27,8 @@
20.4 import java.lang.reflect.Modifier;
20.5 import java.util.List;
20.6 import java.util.ListIterator;
20.7 -import org.netbeans.jmi.javamodel.Statement;
20.8 -import org.netbeans.jmi.javamodel.StatementBlock;
20.9 -import org.netbeans.jmi.javamodel.TryStatement;
20.10 import org.openide.util.NbBundle;
20.11
20.12 -
20.13 public class ThresherFacesBeanStructureScanner extends FacesBeanStructureScanner {
20.14 public static String PROP_INITMETHOD = "_init";
20.15 public static String INITMETHOD = "init";
20.16 @@ -50,9 +46,10 @@
20.17 getComment("COMMENT_PropInitMethodComment"), ENSURE_EMPTYBLOCK, "Exception");
20.18 }
20.19
20.20 - public StatementBlock[] getPropertiesInitBlocks() {
20.21 + public Object/*BlockTree*/[] getPropertiesInitBlocks() {
20.22 +/*//NB6.0
20.23 StatementBlock b = ctorInfo.getBlock();
20.24 -
20.25 +
20.26 //Look for property initializers in the first try catch block, this is
20.27 //to support the code generated in constructor prior to FCS
20.28 List stats = b.getStatements();
20.29 @@ -66,16 +63,19 @@
20.30 tryBlock = tryStmt.getBody();
20.31 }
20.32 }
20.33 -
20.34 +
20.35 if(tryBlock != null)
20.36 return new StatementBlock[]{tryBlock, propertiesInitInfo.getBlock()};
20.37 else
20.38 return super.getPropertiesInitBlocks();
20.39 +//*/
20.40 + return null;
20.41 }
20.42
20.43 - protected StatementBlock ensureInitBlock(MethodInfo mi) {
20.44 + protected Object/*BlockTree*/ ensureInitBlock(MethodInfo mi) {
20.45 +/*//NB6.0
20.46 StatementBlock body = mi.getMethod().getBody();
20.47 -
20.48 +
20.49 List stats = body.getStatements();
20.50 ListIterator iter = stats.listIterator();
20.51 while(iter.hasNext()) {
20.52 @@ -83,7 +83,7 @@
20.53 if(s instanceof TryStatement)
20.54 return null;
20.55 }
20.56 -
20.57 +
20.58 String bodyText = "// " + getComment("COMMENT_InitSuperCall") + "\n" +
20.59 "super.init();\n" +
20.60 "// " + getComment("COMMENT_UserPreInit") + "\n\n" +
20.61 @@ -107,8 +107,10 @@
20.62 }finally {
20.63 JMIUtils.endTrans(rollback);
20.64 }
20.65 -
20.66 +
20.67 return body;
20.68 +//*/
20.69 + return null;
20.70 }
20.71
20.72 public String getConstructorComment() {
21.1 --- a/visualweb.insync/src/org/netbeans/modules/visualweb/insync/java/JavaUnit.java Fri Feb 02 23:53:57 2007 +0000
21.2 +++ b/visualweb.insync/src/org/netbeans/modules/visualweb/insync/java/JavaUnit.java Fri Feb 02 23:55:48 2007 +0000
21.3 @@ -38,14 +38,6 @@
21.4 import org.netbeans.modules.visualweb.insync.SourceUnit;
21.5 import org.netbeans.modules.visualweb.insync.UndoManager;
21.6 import org.netbeans.modules.visualweb.insync.Util;
21.7 -import org.netbeans.jmi.javamodel.ErrorInfo;
21.8 -import org.netbeans.jmi.javamodel.ErrorTypeEnum;
21.9 -import org.netbeans.jmi.javamodel.Import;
21.10 -import org.netbeans.jmi.javamodel.JavaClass;
21.11 -import org.netbeans.jmi.javamodel.Resource;
21.12 -
21.13 -import org.netbeans.modules.javacore.api.JavaModel;
21.14 -
21.15
21.16 /**
21.17 * <p>A SourceUnit that manages a Java source file.</p>
21.18 @@ -107,17 +99,18 @@
21.19 * Read the errors in source
21.20 */
21.21 protected void readErrors() {
21.22 +/*//NB6.0
21.23 JMIUtils.beginTrans(true);
21.24 try {
21.25 Resource res = JavaModel.getResource(fobj);
21.26 List errorsList = res.getErrors();
21.27 int size = errorsList.size();
21.28 -
21.29 +
21.30 if (size == 0) {
21.31 errors = ParserAnnotation.EMPTY_ARRAY;
21.32 return;
21.33 }
21.34 -
21.35 +
21.36 List parserAnnotationsList = new ArrayList();
21.37 for (int i = 0; i < size; i++) {
21.38 ErrorInfo info = (ErrorInfo)errorsList.get(i);
21.39 @@ -128,18 +121,19 @@
21.40 parserAnnotationsList.add(annotation);
21.41 }
21.42 }
21.43 -
21.44 - // no errors found
21.45 +
21.46 + // no errors found
21.47 if (parserAnnotationsList.size() == 0) {
21.48 errors = ParserAnnotation.EMPTY_ARRAY;
21.49 return;
21.50 }
21.51 -
21.52 +
21.53 errors = new ParserAnnotation[parserAnnotationsList.size()];
21.54 parserAnnotationsList.toArray(errors);
21.55 }finally {
21.56 JMIUtils.endTrans();
21.57 }
21.58 +//*/
21.59 }
21.60
21.61 /**
21.62 @@ -193,12 +187,13 @@
21.63 /*
21.64 * Returns the public class in the file JavaUnit represents
21.65 */
21.66 - public JavaClass getJavaClass() {
21.67 + public Object/*TypeElement or ClassType*/ getJavaClass() {
21.68 +/*//NB6.0
21.69 // get the resource corresponding to a given file
21.70 JMIUtils.beginTrans(false);
21.71 try {
21.72 Resource res = JavaModel.getResource(fobj);
21.73 -
21.74 +
21.75 // get the public class from the resource
21.76 ListIterator iter = res.getClassifiers().listIterator();
21.77 while(iter.hasNext()) {
21.78 @@ -209,12 +204,15 @@
21.79 }finally {
21.80 JMIUtils.endTrans();
21.81 }
21.82 -
21.83 +
21.84 + return null;
21.85 +//*/
21.86 return null;
21.87 }
21.88
21.89
21.90 public String getPackageName() {
21.91 +/*//NB6.0
21.92 JMIUtils.beginTrans(false);
21.93 try {
21.94 Resource resource = getJavaClass().getResource();
21.95 @@ -229,6 +227,8 @@
21.96 }finally {
21.97 JMIUtils.endTrans();
21.98 }
21.99 +//*/
21.100 + return null;
21.101 }
21.102
21.103
21.104 @@ -248,7 +248,7 @@
21.105 * @param ident
21.106 * @return
21.107 */
21.108 - public Import addImport(String ident) {
21.109 + public Object/*ImportTree*/ addImport(String ident) {
21.110 return null;
21.111 }
21.112
21.113 @@ -257,7 +257,7 @@
21.114 * @param ident
21.115 * @return The existing or added import
21.116 */
21.117 - public Import ensureImport(String ident) {
21.118 + public Object/*ImportTree*/ ensureImport(String ident) {
21.119 return null;
21.120 }
21.121
22.1 --- a/visualweb.insync/src/org/netbeans/modules/visualweb/insync/live/BeansDesignEvent.java Fri Feb 02 23:53:57 2007 +0000
22.2 +++ b/visualweb.insync/src/org/netbeans/modules/visualweb/insync/live/BeansDesignEvent.java Fri Feb 02 23:55:48 2007 +0000
22.3 @@ -21,11 +21,6 @@
22.4 import org.netbeans.modules.visualweb.insync.java.JMIUtils;
22.5 import org.netbeans.modules.visualweb.insync.java.JMIRefactor;
22.6 import java.util.List;
22.7 -import org.netbeans.jmi.javamodel.JavaModelPackage;
22.8 -import org.netbeans.jmi.javamodel.NullLiteral;
22.9 -import org.netbeans.jmi.javamodel.ReturnStatement;
22.10 -import org.netbeans.jmi.javamodel.StatementBlock;
22.11 -import org.netbeans.jmi.javamodel.StringLiteral;
22.12
22.13 import org.openide.util.NbBundle;
22.14 import org.netbeans.modules.visualweb.extension.openide.util.Trace;
22.15 @@ -34,9 +29,6 @@
22.16 import org.netbeans.modules.visualweb.insync.UndoEvent;
22.17 import org.netbeans.modules.visualweb.insync.beans.Event;
22.18 import org.netbeans.modules.visualweb.insync.beans.EventSet;
22.19 -import org.netbeans.jmi.javamodel.Expression;
22.20 -import org.netbeans.jmi.javamodel.Method;
22.21 -import org.netbeans.jmi.javamodel.Statement;
22.22
22.23 /**
22.24 * DesignEvent implementation based on delegation to beans.Event and subclasses, using Java and/or
22.25 @@ -168,12 +160,14 @@
22.26 try {
22.27 String description = NbBundle.getMessage(BeansDesignEvent.class, "SetHandlerMethodSource", methodBody != null ? methodBody : ""); //NOI18N
22.28 undoEvent = liveBean.unit.model.writeLock(description);
22.29 +/*//NB6.0
22.30 JMIUtils.beginTrans(true);
22.31 try {
22.32 event.getHandlerMethod().setBodyText(methodBody);
22.33 }finally {
22.34 JMIUtils.endTrans();
22.35 }
22.36 +//*/
22.37 }
22.38 finally {
22.39 liveBean.unit.model.writeUnlock(undoEvent);
22.40 @@ -184,16 +178,20 @@
22.41 * @see com.sun.rave.designtime.DesignEvent#getHandlerMethodSource()
22.42 */
22.43 public String getHandlerMethodSource() {
22.44 +/*//NB6.0
22.45 return (event != null && event.getHandlerMethod() != null)
22.46 ? event.getHandlerMethod().getBodyText()
22.47 : null;
22.48 +//*/
22.49 + return null;
22.50 }
22.51
22.52
22.53 /**
22.54 * @return
22.55 */
22.56 - protected ReturnStatement getHandlerMethodReturnStatement() {
22.57 + protected Object/*ReturnTree*/ getHandlerMethodReturnStatement() {
22.58 +/*//NB6.0
22.59 if (event != null && event.getHandlerMethod() != null) {
22.60 StatementBlock stmtBlk = event.getHandlerMethod().getBody();
22.61 List stmts = stmtBlk.getStatements();
22.62 @@ -204,12 +202,15 @@
22.63 }
22.64 }
22.65 return null;
22.66 +//*/
22.67 + return null;
22.68 }
22.69
22.70 /**
22.71 * @return
22.72 */
22.73 public Object getHandlerMethodReturn() {
22.74 +/*//NB6.0
22.75 ReturnStatement ret = getHandlerMethodReturnStatement();
22.76 if (ret != null) {
22.77 Expression expr = ret.getExpression();
22.78 @@ -217,12 +218,14 @@
22.79 return ((StringLiteral)expr).getValue();
22.80 }
22.81 return null;
22.82 +//*/ return null;
22.83 }
22.84
22.85
22.86 /*
22.87 */
22.88 public void updateReturnStrings(String oldStr, String newStr) {
22.89 +/*//NB6.0
22.90 if(event != null) {
22.91 Method method = event.getHandlerMethod();
22.92 if(method != null) {
22.93 @@ -255,5 +258,6 @@
22.94 }
22.95 }
22.96 }
22.97 +//*/
22.98 }
22.99 }
23.1 --- a/visualweb.insync/src/org/netbeans/modules/visualweb/insync/live/BeansDesignProperty.java Fri Feb 02 23:53:57 2007 +0000
23.2 +++ b/visualweb.insync/src/org/netbeans/modules/visualweb/insync/live/BeansDesignProperty.java Fri Feb 02 23:55:48 2007 +0000
23.3 @@ -140,7 +140,7 @@
23.4 * @param value
23.5 * @return
23.6 */
23.7 - protected String toSource(Object value) {
23.8 + protected String toSource(Object value) {
23.9 boolean isMarkup = isMarkupSource();
23.10 //System.err.println("JLP.toSource: " + liveBean.getInstanceName() + "." + descriptor.getName() + " to:" + value);
23.11 //System.err.println("JLP.toSource: isMarkup:" + isMarkup);
23.12 @@ -151,13 +151,15 @@
23.13 // Look locally first as an optimization
23.14 DesignBean lb = liveBean.unit.getBeanForInstance(value);
23.15
23.16 - //VB expressions cannot be used to refer the properties in the same bean
23.17 +/*//NB6.0
23.18 + //VB expressions cannot be used to refer the properties in the same bean
23.19 //when the initializers are added into the constructor
23.20 //This is required for migrated reef projects
23.21 if((liveBean.unit.getBeansUnit().getPropertiesInitMethod().getName() == null) &&
23.22 lb != null) {
23.23 return lb.getInstanceName();
23.24 }
23.25 +//*/
23.26
23.27 if(lb == null) {
23.28 // Now look through all contexts and see if we can find it
24.1 --- a/visualweb.insync/src/org/netbeans/modules/visualweb/insync/live/ContextMethodHelper.java Fri Feb 02 23:53:57 2007 +0000
24.2 +++ b/visualweb.insync/src/org/netbeans/modules/visualweb/insync/live/ContextMethodHelper.java Fri Feb 02 23:55:48 2007 +0000
24.3 @@ -24,9 +24,6 @@
24.4 import java.util.ArrayList;
24.5 import java.util.Iterator;
24.6 import java.util.List;
24.7 -import org.netbeans.jmi.javamodel.CallableFeature;
24.8 -import org.netbeans.jmi.javamodel.Method;
24.9 -import org.netbeans.jmi.javamodel.Parameter;
24.10 import org.openide.util.NbBundle;
24.11 import com.sun.rave.designtime.ContextMethod;
24.12
24.13 @@ -52,11 +49,12 @@
24.14 * this DesignContext (source file)
24.15 */
24.16 public ContextMethod[] getContextMethods() {
24.17 +/*//NB6.0
24.18 JMIUtils.beginTrans(false);
24.19 try {
24.20 JavaClassAdapter javaClass = lu.getSourceUnit().getThisClass();
24.21 ArrayList contextMethods = new ArrayList();
24.22 -
24.23 +
24.24 //Go through all the available methods
24.25 Method[] methods = javaClass.getMethods();
24.26 for(int i = 0; i < methods.length; i++) {
24.27 @@ -69,6 +67,8 @@
24.28 }finally {
24.29 JMIUtils.endTrans();
24.30 }
24.31 +//*/
24.32 + return null;
24.33 }
24.34
24.35 /**
24.36 @@ -81,11 +81,12 @@
24.37 * @return A ContextMethod object describing the requested method, or <code>null</code> if no
24.38 * method exists with the specified name and parameter types
24.39 */
24.40 - public ContextMethod getContextMethod(Method m) {
24.41 + public ContextMethod getContextMethod(Object/*ExecutableElement*/ m) {
24.42 +/*//NB6.0
24.43 JMIUtils.beginTrans(false);
24.44 try {
24.45 - if(m != null /*&& m.getAccessModifiers() == Modifier.PUBLIC*/) {
24.46 -
24.47 + if(m != null /NB6.0*&& m.getAccessModifiers() == Modifier.PUBLIC* /) {
24.48 +
24.49 List params = m.getParameters();
24.50 Class[] paramTypes = new Class[params.size()];
24.51 String[] paramNames = new String[params.size()];
24.52 @@ -100,16 +101,18 @@
24.53 i++;
24.54 }
24.55 Class retType = ClassUtil.getClass(m.getType().getName(), cl);
24.56 -
24.57 +
24.58 return new ContextMethod(lu, m.getName(), m.getModifiers(), retType,
24.59 - paramTypes, paramNames, m.getBodyText(), m.getJavadocText());
24.60 + paramTypes, paramNames, m.getBodyText(), m.getJavadocText());
24.61 }catch(ClassNotFoundException cnfe) {
24.62 //Ignore the exception and return null
24.63 }
24.64 }
24.65 - }finally {
24.66 - JMIUtils.endTrans();
24.67 - }
24.68 + }finally {
24.69 + JMIUtils.endTrans();
24.70 + }
24.71 + return null;
24.72 +//*/
24.73 return null;
24.74 }
24.75
24.76 @@ -138,6 +141,7 @@
24.77 * method exists with the specified name and parameter types
24.78 */
24.79 public ContextMethod getContextMethod(String methodName, Class[] parameterTypes) {
24.80 +/*//NB6.0
24.81 JMIUtils.beginTrans(false);
24.82 try {
24.83 JavaClassAdapter javaClass = lu.getSourceUnit().getThisClass();
24.84 @@ -148,6 +152,8 @@
24.85 }finally {
24.86 JMIUtils.endTrans();
24.87 }
24.88 +//*/
24.89 + return null;
24.90 }
24.91
24.92
24.93 @@ -191,6 +197,7 @@
24.94 public boolean createContextMethod(ContextMethod method) throws IllegalArgumentException {
24.95 if(method == null || method.getDesignContext() != lu)
24.96 return false;
24.97 +/*//NB6.0
24.98 JMIUtils.beginTrans(true);
24.99 boolean rollback = true;
24.100 try {
24.101 @@ -202,7 +209,7 @@
24.102 if(m != null)
24.103 throw new IllegalArgumentException(
24.104 NbBundle.getMessage(LiveUnit.class, "IllegalMethod")); //NOI18N;
24.105 -
24.106 +
24.107 //Add the new method at the end
24.108 CallableFeature cf = javaClass.addMethod(method);
24.109 if(cf != null) {
24.110 @@ -216,6 +223,7 @@
24.111 }finally {
24.112 JMIUtils.endTrans(rollback);
24.113 }
24.114 +//*/
24.115
24.116 return false;
24.117 }
24.118 @@ -263,6 +271,7 @@
24.119 return null;
24.120
24.121 JavaClassAdapter javaClass = lu.getSourceUnit().getThisClass();
24.122 +/*//NB6.0
24.123 JMIUtils.beginTrans(true);
24.124 boolean rollback = true;
24.125 try {
24.126 @@ -270,24 +279,26 @@
24.127 if(paramTypes == null)
24.128 paramTypes = new Class[0];
24.129 Method m = javaClass.getMethod(method.getName(), paramTypes);
24.130 - if(m != null /*&& m.getAccessModifiers() == Modifier.PUBLIC*/) {
24.131 + if(m != null /NB6.0*&& m.getAccessModifiers() == Modifier.PUBLIC*NB6.0/) {
24.132 javaClass.updateMethod(method);
24.133 //Check if there are errors because of updating method
24.134 - /*
24.135 + /NB6.0*
24.136 if(lu.getSourceUnit().getJavaUnit().getErrors().length > 0)
24.137 throw new IllegalArgumentException(
24.138 NbBundle.getMessage(LiveUnit.class, "IllegalSource")); //NOI18N;
24.139 - */
24.140 + *NB6.0/
24.141 ContextMethod retVal = getContextMethod(m);
24.142 rollback = false;
24.143 return retVal;
24.144 }else {
24.145 - throw new IllegalArgumentException(
24.146 - NbBundle.getMessage(LiveUnit.class, "IllegalMethod")); //NOI18N;
24.147 + throw new IllegalArgumentException(
24.148 + NbBundle.getMessage(LiveUnit.class, "IllegalMethod")); //NOI18N;
24.149 }
24.150 - }finally {
24.151 - JMIUtils.endTrans(rollback);
24.152 - }
24.153 + }finally {
24.154 + JMIUtils.endTrans(rollback);
24.155 + }
24.156 +//*/
24.157 + return null;
24.158 }
24.159
24.160 /**
24.161 @@ -319,6 +330,7 @@
24.162 public boolean removeContextMethod(ContextMethod method) {
24.163 if(method == null || method.getDesignContext() != lu)
24.164 return false;
24.165 +/*//NB6.0
24.166 JMIUtils.beginTrans(true);
24.167 boolean rollback = true;
24.168 try {
24.169 @@ -327,7 +339,7 @@
24.170 if(paramTypes == null)
24.171 paramTypes = new Class[0];
24.172 Method m = javaClass.getMethod(method.getName(), paramTypes);
24.173 - if(m != null /*&& m.getAccessModifiers() == Modifier.PUBLIC*/) {
24.174 + if(m != null /NB6.0*&& m.getAccessModifiers() == Modifier.PUBLIC*NB6.0/) {
24.175 javaClass.removeMethod(m);
24.176 } else {
24.177 throw new IllegalArgumentException(
24.178 @@ -337,7 +349,7 @@
24.179 } finally {
24.180 JMIUtils.endTrans(rollback);
24.181 }
24.182 -
24.183 - return !rollback;
24.184 +//*/
24.185 + return false;
24.186 }
24.187 }
25.1 --- a/visualweb.insync/src/org/netbeans/modules/visualweb/insync/live/EventPropertyEditor.java Fri Feb 02 23:53:57 2007 +0000
25.2 +++ b/visualweb.insync/src/org/netbeans/modules/visualweb/insync/live/EventPropertyEditor.java Fri Feb 02 23:55:48 2007 +0000
25.3 @@ -24,7 +24,6 @@
25.4 import org.netbeans.modules.visualweb.extension.openide.util.Trace;
25.5
25.6 import com.sun.rave.designtime.EventDescriptor;
25.7 -import org.netbeans.jmi.javamodel.Method;
25.8
25.9 /**
25.10 *
25.11 @@ -51,10 +50,12 @@
25.12 EventDescriptor ed = event.getEventDescriptor();
25.13 java.lang.reflect.Method m = ed.getListenerMethodDescriptor().getMethod();
25.14
25.15 +/*//NB6.0
25.16 Method[] ms = unit.sourceUnit.getThisClass().getMethods(m.getParameterTypes(), m.getReturnType());
25.17 methods = new String[ms.length];
25.18 for (int i = 0; i < ms.length; i++)
25.19 methods[i] = ms[i].getName();
25.20 +//*/
25.21 }
25.22
25.23 void update() {
26.1 --- a/visualweb.insync/src/org/netbeans/modules/visualweb/insync/models/FacesModel.java Fri Feb 02 23:53:57 2007 +0000
26.2 +++ b/visualweb.insync/src/org/netbeans/modules/visualweb/insync/models/FacesModel.java Fri Feb 02 23:55:48 2007 +0000
26.3 @@ -38,10 +38,6 @@
26.4 import org.netbeans.api.project.ProjectUtils;
26.5 import org.netbeans.api.project.SourceGroup;
26.6 import org.netbeans.api.project.Sources;
26.7 -import org.netbeans.jmi.javamodel.JavaClass;
26.8 -import org.netbeans.jmi.javamodel.Method;
26.9 -import org.netbeans.jmi.javamodel.Statement;
26.10 -import org.netbeans.modules.javacore.JMManager;
26.11 import org.openide.ErrorManager;
26.12 import org.openide.cookies.CloseCookie;
26.13 import org.openide.cookies.EditorCookie;
26.14 @@ -768,7 +764,7 @@
26.15
26.16 //In case we are reacting to .java file creation but before the file is
26.17 //well formed, we may not be able to get the public class
26.18 - JavaClass javaClass = javaUnit.getJavaClass();
26.19 + Object/*TypeElement or ClassType*/ javaClass = javaUnit.getJavaClass();
26.20 if(javaClass == null) {
26.21 javaUnit.setBusted();
26.22 return;
26.23 @@ -1250,7 +1246,7 @@
26.24 * double clicks on the document itself, not on any of the components on the page.
26.25 **/
26.26 public void openDefaultHandler() {
26.27 - Method m = facesUnit.getInitializerMethod();
26.28 + Object/*ExecutableElement*/ m = facesUnit.getInitializerMethod();
26.29 positionTheCursor(m, false);
26.30 }
26.31
26.32 @@ -1278,7 +1274,7 @@
26.33 String handlerName = event.getHandlerName();
26.34
26.35 // now navigate the editor to the body of the newly created method
26.36 - Method m =
26.37 + Object/*ExecutableElement*/ m =
26.38 beansUnit.getEventMethod(handlerName, event.getEventDescriptor().getListenerMethodDescriptor());
26.39 positionTheCursor(m, inserted);
26.40 }
26.41 @@ -1347,7 +1343,8 @@
26.42 * @param Method
26.43 * @param boolean indicates if the method is newly added
26.44 */
26.45 - void positionTheCursor(Method m, boolean inserted) {
26.46 + void positionTheCursor(Object/*ExecutableElement*/ m, boolean inserted) {
26.47 +/*//NB6.0
26.48 try {
26.49 int indent = 0;
26.50
26.51 @@ -1402,6 +1399,7 @@
26.52 catch (Exception e) {
26.53 ErrorManager.getDefault().notify(ErrorManager.INFORMATIONAL, e);
26.54 }
26.55 +//*/
26.56 }
26.57
26.58 //--------------------------------------------------------------------------- ModelSet Utilities
27.1 --- a/visualweb.libs.jtidy/library/nbproject/project.properties Fri Feb 02 23:53:57 2007 +0000
27.2 +++ b/visualweb.libs.jtidy/library/nbproject/project.properties Fri Feb 02 23:55:48 2007 +0000
27.3 @@ -16,7 +16,7 @@
27.4 dist.dir=dist
27.5 dist.jar=${dist.dir}/tidy-mod.jar
27.6 dist.javadoc.dir=${dist.dir}/javadoc
27.7 -file.reference.xerces-2.6.2.jar=../../../ravebuild/netbeans/ide7/modules/ext/xerces-2.8.0.jar
27.8 +file.reference.xerces-2.6.2.jar=../../../ravebuild/netbeans/ide8/modules/ext/xerces-2.8.0.jar
27.9 jar.compress=false
27.10 javac.classpath=\
27.11 ${file.reference.xerces-2.6.2.jar}
28.1 --- a/visualweb.libs.jtidy/library/src/org/w3c/tidy/Tidy.java Fri Feb 02 23:53:57 2007 +0000
28.2 +++ b/visualweb.libs.jtidy/library/src/org/w3c/tidy/Tidy.java Fri Feb 02 23:55:48 2007 +0000
28.3 @@ -1794,7 +1794,9 @@
28.4 continue;
28.5 }
28.6 String entity = unexpanded.substring(begin, end);
28.7 - int e = org.apache.xml.serialize.HTMLdtd.charFromName(entity);
28.8 +
28.9 + //NB60 Talk to Peter Zavadsky
28.10 + int e = com.sun.org.apache.xml.internal.serialize.HTMLdtd.charFromName(entity);
28.11 if (e == -1) {
28.12 sb.append('&'); // browsers show the &
28.13 continue;
29.1 --- a/visualweb.project.jsf/nbproject/project.xml Fri Feb 02 23:53:57 2007 +0000
29.2 +++ b/visualweb.project.jsf/nbproject/project.xml Fri Feb 02 23:55:48 2007 +0000
29.3 @@ -44,31 +44,6 @@
29.4 </run-dependency>
29.5 </dependency>
29.6 <dependency>
29.7 - <code-name-base>javax.jmi.reflect</code-name-base>
29.8 - <build-prerequisite/>
29.9 - <compile-dependency/>
29.10 - <run-dependency>
29.11 - <release-version>1</release-version>
29.12 - </run-dependency>
29.13 - </dependency>
29.14 - <dependency>
29.15 - <code-name-base>org.netbeans.api.mdr</code-name-base>
29.16 - <build-prerequisite/>
29.17 - <compile-dependency/>
29.18 - <run-dependency>
29.19 - <release-version>1</release-version>
29.20 - </run-dependency>
29.21 - </dependency>
29.22 - <dependency>
29.23 - <code-name-base>org.netbeans.modules.javacore</code-name-base>
29.24 - <build-prerequisite/>
29.25 - <compile-dependency/>
29.26 - <run-dependency>
29.27 - <release-version>1</release-version>
29.28 - <specification-version>1.5</specification-version>
29.29 - </run-dependency>
29.30 - </dependency>
29.31 - <dependency>
29.32 <code-name-base>org.netbeans.modules.j2eeserver</code-name-base>
29.33 <build-prerequisite/>
29.34 <compile-dependency/>
29.35 @@ -313,23 +288,6 @@
29.36 </run-dependency>
29.37 </dependency>
29.38 <dependency>
29.39 - <code-name-base>org.netbeans.jmi.javamodel</code-name-base>
29.40 - <build-prerequisite/>
29.41 - <compile-dependency/>
29.42 - <run-dependency>
29.43 - <release-version>2</release-version>
29.44 - <specification-version>1.11</specification-version>
29.45 - </run-dependency>
29.46 - </dependency>
29.47 - <dependency>
29.48 - <code-name-base>org.netbeans.modules.java.editor</code-name-base>
29.49 - <build-prerequisite/>
29.50 - <compile-dependency/>
29.51 - <run-dependency>
29.52 - <release-version>1</release-version>
29.53 - </run-dependency>
29.54 - </dependency>
29.55 - <dependency>
29.56 <code-name-base>org.netbeans.modules.java.editor.lib</code-name-base>
29.57 <build-prerequisite/>
29.58 <compile-dependency/>
30.1 --- a/visualweb.project.jsf/src/org/netbeans/modules/visualweb/project/jsf/ui/BrowseFolders.java Fri Feb 02 23:53:57 2007 +0000
30.2 +++ b/visualweb.project.jsf/src/org/netbeans/modules/visualweb/project/jsf/ui/BrowseFolders.java Fri Feb 02 23:55:48 2007 +0000
30.3 @@ -29,6 +29,7 @@
30.4 import java.util.Arrays;
30.5 import java.util.Collection;
30.6 import java.util.Collections;
30.7 +import java.util.Enumeration;
30.8 import java.util.StringTokenizer;
30.9 import javax.swing.JButton;
30.10 import javax.swing.JScrollPane;
30.11 @@ -194,7 +195,7 @@
30.12 // Try to find the node
30.13 for ( int i = 0; i < nodes.length; i++ ) {
30.14 try {
30.15 - sel = NodeOp.findPath( nodes[i], new StringTokenizer( preselectedFileName, "/" ) );
30.16 + sel = NodeOp.findPath( nodes[i], (Enumeration) new StringTokenizer( preselectedFileName, "/" ) );
30.17 break;
30.18 }
30.19 catch ( NodeNotFoundException e ) {
31.1 --- a/visualweb.project.jsfloader/nbproject/project.xml Fri Feb 02 23:53:57 2007 +0000
31.2 +++ b/visualweb.project.jsfloader/nbproject/project.xml Fri Feb 02 23:55:48 2007 +0000
31.3 @@ -17,7 +17,6 @@
31.4 Software is Sun Microsystems, Inc. Portions Copyright 1997-2007 Sun
31.5 Microsystems, Inc. All Rights Reserved.
31.6 -->
31.7 -
31.8 <project xmlns="http://www.netbeans.org/ns/project/1">
31.9 <type>org.netbeans.modules.apisupport.project</type>
31.10 <configuration>
31.11 @@ -26,6 +25,41 @@
31.12 <suite-component/>
31.13 <module-dependencies>
31.14 <dependency>
31.15 + <code-name-base>org.netbeans.core.multiview</code-name-base>
31.16 + <build-prerequisite/>
31.17 + <compile-dependency/>
31.18 + <run-dependency>
31.19 + <release-version>1</release-version>
31.20 + <specification-version>1.8</specification-version>
31.21 + </run-dependency>
31.22 + </dependency>
31.23 + <dependency>
31.24 + <code-name-base>org.netbeans.modules.editor.lib</code-name-base>
31.25 + <build-prerequisite/>
31.26 + <compile-dependency/>
31.27 + <run-dependency>
31.28 + <release-version>1</release-version>
31.29 + <specification-version>1.9.2.1</specification-version>
31.30 + </run-dependency>
31.31 + </dependency>
31.32 + <dependency>
31.33 + <code-name-base>org.netbeans.modules.java.source</code-name-base>
31.34 + <build-prerequisite/>
31.35 + <compile-dependency/>
31.36 + <run-dependency>
31.37 + <specification-version>0.4.0.1.3</specification-version>
31.38 + </run-dependency>
31.39 + </dependency>
31.40 + <dependency>
31.41 + <code-name-base>org.netbeans.modules.projectapi</code-name-base>
31.42 + <build-prerequisite/>
31.43 + <compile-dependency/>
31.44 + <run-dependency>
31.45 + <release-version>1</release-version>
31.46 + <specification-version>1.9</specification-version>
31.47 + </run-dependency>
31.48 + </dependency>
31.49 + <dependency>
31.50 <code-name-base>org.netbeans.modules.visualweb.api.insync</code-name-base>
31.51 <build-prerequisite/>
31.52 <compile-dependency/>
31.53 @@ -69,42 +103,6 @@
31.54 </run-dependency>
31.55 </dependency>
31.56 <dependency>
31.57 - <code-name-base>org.netbeans.core.multiview</code-name-base>
31.58 - <build-prerequisite/>
31.59 - <compile-dependency/>
31.60 - <run-dependency>
31.61 - <release-version>1</release-version>
31.62 - <specification-version>1.8</specification-version>
31.63 - </run-dependency>
31.64 - </dependency>
31.65 - <dependency>
31.66 - <code-name-base>org.netbeans.modules.editor.lib</code-name-base>
31.67 - <build-prerequisite/>
31.68 - <compile-dependency/>
31.69 - <run-dependency>
31.70 - <release-version>1</release-version>
31.71 - <specification-version>1.9.2.1</specification-version>
31.72 - </run-dependency>
31.73 - </dependency>
31.74 - <dependency>
31.75 - <code-name-base>org.netbeans.modules.java.source</code-name-base>
31.76 - <build-prerequisite/>
31.77 - <compile-dependency/>
31.78 - <run-dependency>
31.79 - <release-version>1</release-version>
31.80 - <specification-version>0.4.0.1.3</specification-version>
31.81 - </run-dependency>
31.82 - </dependency>
31.83 - <dependency>
31.84 - <code-name-base>org.netbeans.modules.projectapi</code-name-base>
31.85 - <build-prerequisite/>
31.86 - <compile-dependency/>
31.87 - <run-dependency>
31.88 - <release-version>1</release-version>
31.89 - <specification-version>1.9</specification-version>
31.90 - </run-dependency>
31.91 - </dependency>
31.92 - <dependency>
31.93 <code-name-base>org.netbeans.modules.web.core</code-name-base>
31.94 <build-prerequisite/>
31.95 <compile-dependency/>
32.1 --- a/visualweb.xhtml/build.xml Fri Feb 02 23:53:57 2007 +0000
32.2 +++ b/visualweb.xhtml/build.xml Fri Feb 02 23:55:48 2007 +0000
32.3 @@ -25,7 +25,7 @@
32.4 </path>
32.5
32.6 <path id="jsf.jars">
32.7 - <pathelement location="${netbeans.dest.dir}/ide7/modules/ext/commons-logging-1.0.4.jar"/>
32.8 + <pathelement location="${netbeans.dest.dir}/ide8/modules/ext/commons-logging-1.0.4.jar"/>
32.9 <pathelement location="${cluster}/modules/ext/commons-collections.jar"/>
32.10 <pathelement location="${netbeans.dest.dir}/enterprise2/modules/ext/servlet-api-2.4.jar"/>
32.11 <pathelement location="${cluster}/modules/ext/jsp-api.jar"/>