Index: visualweb/dataconnectivity/src/org/netbeans/modules/visualweb/dataconnectivity/actions/HideSchemaAction.java =================================================================== RCS file: /cvs/visualweb/dataconnectivity/src/org/netbeans/modules/visualweb/dataconnectivity/actions/HideSchemaAction.java,v retrieving revision 1.1 diff -u -u -r1.1 HideSchemaAction.java --- visualweb/dataconnectivity/src/org/netbeans/modules/visualweb/dataconnectivity/actions/HideSchemaAction.java 28 Jan 2007 18:47:30 -0000 1.1 +++ visualweb/dataconnectivity/src/org/netbeans/modules/visualweb/dataconnectivity/actions/HideSchemaAction.java 2 Feb 2007 22:44:57 -0000 @@ -66,7 +66,7 @@ for(int i=0; i< nodes.length && ! badNode; i++){ Node node = null; if(nodes[i] instanceof FilterNode){ - node = (Node)nodes[i].getCookie(DataSourceSchemaNode.class); +//NB60 node = (Node)nodes[i].getCookie(DataSourceSchemaNode.class); // Talk to Jim Davidson }else{ node = nodes[i]; } Index: visualweb/designer/jsf/src/org/netbeans/modules/visualweb/designer/jsf/JsfForm.java =================================================================== RCS file: /cvs/visualweb/designer/jsf/src/org/netbeans/modules/visualweb/designer/jsf/JsfForm.java,v retrieving revision 1.1 diff -u -u -r1.1 JsfForm.java --- visualweb/designer/jsf/src/org/netbeans/modules/visualweb/designer/jsf/JsfForm.java 28 Jan 2007 18:48:51 -0000 1.1 +++ visualweb/designer/jsf/src/org/netbeans/modules/visualweb/designer/jsf/JsfForm.java 2 Feb 2007 22:44:59 -0000 @@ -32,7 +32,7 @@ import com.sun.rave.designtime.markup.MarkupDesignBean; import com.sun.rave.designtime.markup.MarkupMouseRegion; import org.netbeans.modules.visualweb.insync.FacesDnDSupport; -import org.netbeans.modules.visualweb.insync.faces.refactoring.MdrInSyncSynchronizer; +//NB60 import org.netbeans.modules.visualweb.insync.faces.refactoring.MdrInSyncSynchronizer; import org.netbeans.modules.visualweb.insync.live.LiveUnit; import org.netbeans.modules.visualweb.insync.markup.MarkupUnit; import org.netbeans.modules.visualweb.insync.models.FacesModel; @@ -1147,6 +1147,7 @@ // getPane().getPaneUI().setPageBox(null); // } +/*//NB6.0 // Reconfigure the data object: throw away the old model // and find the new model associated with the new file object. // InSyncServiceProvider.get().doOutsideOfRefactoringSession(new Runnable() { @@ -1160,6 +1161,7 @@ }); } }); +//*/ } } } // End of DataObjectPropertyChangeListener. Index: visualweb/designtime/nbproject/build-impl.xml =================================================================== RCS file: /cvs/visualweb/designtime/nbproject/build-impl.xml,v retrieving revision 1.1 diff -u -u -r1.1 build-impl.xml --- visualweb/designtime/nbproject/build-impl.xml 28 Jan 2007 18:49:41 -0000 1.1 +++ visualweb/designtime/nbproject/build-impl.xml 2 Feb 2007 22:45:01 -0000 @@ -3,7 +3,7 @@ *** GENERATED FROM project.xml - DO NOT EDIT *** *** EDIT ../build.xml INSTEAD *** --> - + You must set 'suite.dir' to point to your containing module suite @@ -17,8 +17,8 @@ - - + + Index: visualweb/designtime/nbproject/genfiles.properties =================================================================== RCS file: /cvs/visualweb/designtime/nbproject/genfiles.properties,v retrieving revision 1.1 diff -u -u -r1.1 genfiles.properties --- visualweb/designtime/nbproject/genfiles.properties 28 Jan 2007 18:49:41 -0000 1.1 +++ visualweb/designtime/nbproject/genfiles.properties 2 Feb 2007 22:45:01 -0000 @@ -3,6 +3,6 @@ build.xml.stylesheet.CRC32=1101b4cf # This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml. # Do not edit this file. You may delete it but then the IDE will never regenerate such files for you. -nbproject/build-impl.xml.data.CRC32=c4a319b0 -nbproject/build-impl.xml.script.CRC32=507ed605 -nbproject/build-impl.xml.stylesheet.CRC32=2607fe5f +nbproject/build-impl.xml.data.CRC32=1d391347 +nbproject/build-impl.xml.script.CRC32=146964e0 +nbproject/build-impl.xml.stylesheet.CRC32=3f8b4615 Index: visualweb/designtime/rave/nbproject/build-impl.xml =================================================================== RCS file: /cvs/visualweb/designtime/rave/nbproject/build-impl.xml,v retrieving revision 1.1 diff -u -u -r1.1 build-impl.xml --- visualweb/designtime/rave/nbproject/build-impl.xml 28 Jan 2007 18:49:44 -0000 1.1 +++ visualweb/designtime/rave/nbproject/build-impl.xml 2 Feb 2007 22:45:01 -0000 @@ -3,7 +3,7 @@ *** GENERATED FROM project.xml - DO NOT EDIT *** *** EDIT ../build.xml INSTEAD *** --> - + You must set 'suite.dir' to point to your containing module suite @@ -17,8 +17,8 @@ - - + + Index: visualweb/designtime/rave/nbproject/genfiles.properties =================================================================== RCS file: /cvs/visualweb/designtime/rave/nbproject/genfiles.properties,v retrieving revision 1.1 diff -u -u -r1.1 genfiles.properties --- visualweb/designtime/rave/nbproject/genfiles.properties 28 Jan 2007 18:49:44 -0000 1.1 +++ visualweb/designtime/rave/nbproject/genfiles.properties 2 Feb 2007 22:45:02 -0000 @@ -3,6 +3,6 @@ build.xml.stylesheet.CRC32=1101b4cf # This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml. # Do not edit this file. You may delete it but then the IDE will never regenerate such files for you. -nbproject/build-impl.xml.data.CRC32=d023b95f -nbproject/build-impl.xml.script.CRC32=f3251c50 -nbproject/build-impl.xml.stylesheet.CRC32=2607fe5f +nbproject/build-impl.xml.data.CRC32=b7907c29 +nbproject/build-impl.xml.script.CRC32=dd065f5c +nbproject/build-impl.xml.stylesheet.CRC32=3f8b4615 Index: visualweb/errorhandler/client/library/nbproject/build-impl.xml =================================================================== RCS file: /cvs/visualweb/errorhandler/client/library/nbproject/build-impl.xml,v retrieving revision 1.1 diff -u -u -r1.1 build-impl.xml --- visualweb/errorhandler/client/library/nbproject/build-impl.xml 28 Jan 2007 18:50:12 -0000 1.1 +++ visualweb/errorhandler/client/library/nbproject/build-impl.xml 2 Feb 2007 22:45:03 -0000 @@ -19,7 +19,7 @@ - cleanup --> - + + + @@ -41,6 +43,7 @@ + @@ -54,6 +57,12 @@ + + + + + + @@ -81,6 +90,9 @@ + + + @@ -115,6 +127,11 @@ + + + + + @@ -280,7 +297,7 @@ - + @@ -293,13 +310,38 @@ - java -cp ${run.classpath.with.dist.jar} ${main.class} + java -cp "${run.classpath.with.dist.jar}" ${main.class} + + + + + + + + + + + + + + + + + + + + + + + To run this application from the command line without Ant, try: + + java -jar "${dist.jar.resolved}" - + - org.netbeans.modules.apisupport.project @@ -26,152 +25,112 @@ - org.netbeans.modules.visualweb.api.designer + com.sun.rave.propertyeditors 1 - 1.0 + 1.0.0 - org.netbeans.modules.visualweb.api.insync + org.netbeans.api.java 1 - 1.0 + 1.10 - org.netbeans.modules.visualweb.api.portlet.dd + org.netbeans.api.xml 1 - 1.0 - - - - org.netbeans.modules.visualweb.classloaderprovider - - - - 1.0 - - - - org.netbeans.modules.visualweb.designer.cssengine - - - - 1.0 - - - - org.netbeans.modules.visualweb.designer.html - - - - 1.0 + 1.12 - org.netbeans.modules.visualweb.designer.markup + org.netbeans.libs.javacapi - 1 - 1.0 + 0.5.1 - org.netbeans.modules.visualweb.designtime + org.netbeans.libs.xerces 1 - 1.0.0 + 1.8 - org.netbeans.modules.visualweb.designtime.idebridge + org.netbeans.modules.j2eeserver - 1.0 + 4 + 1.19.10.1 - org.netbeans.modules.visualweb.extension.openide + org.netbeans.modules.java.project 1 - 1.0 + 1.8 - org.netbeans.modules.visualweb.extension.openide.loaders + org.netbeans.modules.java.source - 1.0 + 0.4.0.1.3 - org.netbeans.modules.visualweb.jsfsupport + org.netbeans.modules.project.libraries 1 - 1.0.5 - - - - org.netbeans.modules.visualweb.libs.el.ri12 - - - - 1.0 - - - - org.netbeans.modules.visualweb.libs.javaee5 - - - - 1.0 - org.netbeans.modules.visualweb.libs.jsf.ri12 + org.netbeans.modules.projectapi - 1.0 + 1 + 1.9 - org.netbeans.modules.visualweb.project.jsf + org.netbeans.modules.projectuiapi 1 - 2.0 + 1.13.0.5 - com.sun.rave.propertyeditors + org.netbeans.modules.queries 1 - 1.0.0 + 1.7.22 - org.netbeans.modules.visualweb.webui + org.netbeans.modules.visualweb.api.designer @@ -180,7 +139,7 @@ - org.netbeans.modules.visualweb.webui.designtime + org.netbeans.modules.visualweb.api.insync @@ -189,15 +148,16 @@ - org.netbeans.modules.visualweb.xhtml + org.netbeans.modules.visualweb.api.portlet.dd + 1 1.0 - org.netbeans.modules.visualweb.woodstock.webui.jsf + org.netbeans.modules.visualweb.classloaderprovider @@ -205,154 +165,138 @@ - javax.jmi.reflect + org.netbeans.modules.visualweb.designer.cssengine - 1 - 1.7 + 1.0 - org.netbeans.api.java + org.netbeans.modules.visualweb.designer.html - 1 - 1.10 + 1.0 - org.netbeans.api.mdr + org.netbeans.modules.visualweb.designer.markup 1 - 1.4 + 1.0 - org.netbeans.api.xml + org.netbeans.modules.visualweb.designtime 1 - 1.12 + 1.0.0 - org.netbeans.jmi.javamodel + org.netbeans.modules.visualweb.designtime.idebridge - 2 - 1.21.0 + 1.0 - org.netbeans.libs.xerces + org.netbeans.modules.visualweb.extension.openide 1 - 1.8 - - - - org.netbeans.modules.j2eeserver - - - - 4 - 1.19.10.1 + 1.0 - org.netbeans.modules.java + org.netbeans.modules.visualweb.extension.openide.loaders - 1 - 1.25.0.2.2.2 + 1.0 - org.netbeans.modules.java.project + org.netbeans.modules.visualweb.jsfsupport 1 - 1.8 + 1.0.5 - org.netbeans.modules.javacore + org.netbeans.modules.visualweb.libs.el.ri12 - 1 - 1.18.0.2.2 + 1.0 - org.netbeans.modules.jmiutils + org.netbeans.modules.visualweb.libs.javaee5 - 1 - 1.5.0.2 + 1.0 - org.netbeans.modules.mdr + org.netbeans.modules.visualweb.libs.jsf.ri12 - 1 + 1.0 - org.netbeans.modules.project.libraries + org.netbeans.modules.visualweb.project.jsf 1 + 2.0 - org.netbeans.modules.projectapi + org.netbeans.modules.visualweb.webui 1 - 1.9 + 1.0 - org.netbeans.modules.projectuiapi + org.netbeans.modules.visualweb.webui.designtime 1 - 1.13.0.5 + 1.0 - org.netbeans.modules.queries + org.netbeans.modules.visualweb.woodstock.webui.jsf - 1 - 1.7.22 + 1.0 - org.netbeans.modules.refactoring + org.netbeans.modules.visualweb.xhtml - 1 - 1.19.1 + 1.0 Index: visualweb/insync/src/org/netbeans/modules/visualweb/insync/InSyncServiceProvider.java =================================================================== RCS file: /cvs/visualweb/insync/src/org/netbeans/modules/visualweb/insync/InSyncServiceProvider.java,v retrieving revision 1.1 diff -u -u -r1.1 InSyncServiceProvider.java --- visualweb/insync/src/org/netbeans/modules/visualweb/insync/InSyncServiceProvider.java 28 Jan 2007 18:50:41 -0000 1.1 +++ visualweb/insync/src/org/netbeans/modules/visualweb/insync/InSyncServiceProvider.java 2 Feb 2007 22:45:04 -0000 @@ -51,7 +51,7 @@ import com.sun.rave.designtime.DesignProject; import com.sun.rave.designtime.markup.MarkupDesignBean; import org.netbeans.modules.visualweb.insync.faces.ElAttrUpdater; -import org.netbeans.modules.visualweb.insync.faces.refactoring.MdrInSyncSynchronizer; +//NB6.0 import org.netbeans.modules.visualweb.insync.faces.refactoring.MdrInSyncSynchronizer; import org.netbeans.modules.visualweb.insync.jsf.SourceMonitor; import org.netbeans.modules.visualweb.insync.markup.MarkupUnit; import org.netbeans.modules.visualweb.insync.markup.MarkupVisitor; @@ -133,7 +133,7 @@ } public void doOutsideOfRefactoringSession(Runnable runnable) { - MdrInSyncSynchronizer.get().doOutsideOfRefactoringSession(runnable); + //NB6.0 MdrInSyncSynchronizer.get().doOutsideOfRefactoringSession(runnable); } public String getBeanNameForJsp(FileObject fileObject) { Index: visualweb/insync/src/org/netbeans/modules/visualweb/insync/Model.java =================================================================== RCS file: /cvs/visualweb/insync/src/org/netbeans/modules/visualweb/insync/Model.java,v retrieving revision 1.1 diff -u -u -r1.1 Model.java --- visualweb/insync/src/org/netbeans/modules/visualweb/insync/Model.java 28 Jan 2007 18:50:42 -0000 1.1 +++ visualweb/insync/src/org/netbeans/modules/visualweb/insync/Model.java 2 Feb 2007 22:45:04 -0000 @@ -19,11 +19,10 @@ package org.netbeans.modules.visualweb.insync; import org.netbeans.api.project.Project; -import org.netbeans.modules.javacore.JMManager; import org.openide.filesystems.FileObject; import org.netbeans.modules.visualweb.project.jsf.api.JsfProjectUtils; -import org.netbeans.modules.visualweb.insync.faces.refactoring.MdrInSyncSynchronizer; +//NB60 import org.netbeans.modules.visualweb.insync.faces.refactoring.MdrInSyncSynchronizer; /** * General Model abstraction. A Model is a wrapper for one or more Units and serves to bootstrap the @@ -185,16 +184,9 @@ public abstract boolean isWriteLocked(); protected void beginMdrTransation() { - // !EAT TODO - // The MDR transaction setup is done in order to guarantee that while a sync is being performed - // no updates are being made to my likely Java source documents - // This does beg the question however of how we should really be working with concurrent modifications - // what happens when a sync() is done, then documents get modified underneath me. - JMManager.getDefaultRepository().beginTrans(false); } protected void endMdrTransaction() { - JMManager.getDefaultRepository().endTrans(); } /** @@ -278,13 +270,13 @@ } public void sourceUnitModelDirtied(SourceUnit unit) { - MdrInSyncSynchronizer.get().addModelDirtied(this); +//NB60 MdrInSyncSynchronizer.get().addModelDirtied(this); } protected boolean needSyncing = true; public void sourceUnitSourceDirtied(SourceUnit unit) { - MdrInSyncSynchronizer.get().addModelDirtied(this); +//NB60 MdrInSyncSynchronizer.get().addModelDirtied(this); needSyncing = true; getOwner().addToModelsToSync(this); } Index: visualweb/insync/src/org/netbeans/modules/visualweb/insync/ModelSet.java =================================================================== RCS file: /cvs/visualweb/insync/src/org/netbeans/modules/visualweb/insync/ModelSet.java,v retrieving revision 1.1 diff -u -u -r1.1 ModelSet.java --- visualweb/insync/src/org/netbeans/modules/visualweb/insync/ModelSet.java 28 Jan 2007 18:50:42 -0000 1.1 +++ visualweb/insync/src/org/netbeans/modules/visualweb/insync/ModelSet.java 2 Feb 2007 22:45:04 -0000 @@ -77,7 +77,7 @@ import org.openide.windows.TopComponent; import org.openide.windows.WindowManager; -import org.netbeans.modules.visualweb.insync.faces.refactoring.MdrInSyncSynchronizer; +//NB60 import org.netbeans.modules.visualweb.insync.faces.refactoring.MdrInSyncSynchronizer; import org.netbeans.modules.visualweb.insync.models.ConfigModel; /** @@ -982,7 +982,7 @@ // Do this outside of refactoring session, as we cannot guarantee when the Java or the JSP file will be // "added", this way we wait until everything is done and we have all the files already moved prior // to building the models - +/*//NB6.0 MdrInSyncSynchronizer.get().doOutsideOfRefactoringSession(new Runnable() { public void run() { ModelCreateVisitor visitor = new ModelCreateVisitor(); @@ -1005,6 +1005,7 @@ } } }); +//*/ } public void fileDeleted (final FileEvent event) { @@ -1022,6 +1023,7 @@ models.remove(model.getFile()); } final Model finalModel = model; +/*//NB6.0 MdrInSyncSynchronizer.get().doOutsideOfRefactoringSession(new Runnable() { public void run() { // There are some elements that get refreshed that assume they are on UI thread @@ -1032,6 +1034,7 @@ }); } }); + //*/ } public void fileRenamed(final FileRenameEvent event) { @@ -1044,6 +1047,7 @@ final boolean needToRemove = getLocalFileObject(fileObject) == null ? true : false; final Model[] models = getModels(); final Model[] configModels = getConfigModels(); +/*//NB6.0 MdrInSyncSynchronizer.get().doOutsideOfRefactoringSession(new Runnable() { public void run() { for (int i=0; i < models.length; i++) { @@ -1056,6 +1060,7 @@ } } }); +//*/ } private /*static*/ class ModelSetOperationListener implements OperationListener { Index: visualweb/insync/src/org/netbeans/modules/visualweb/insync/SourceUnit.java =================================================================== RCS file: /cvs/visualweb/insync/src/org/netbeans/modules/visualweb/insync/SourceUnit.java,v retrieving revision 1.1 diff -u -u -r1.1 SourceUnit.java --- visualweb/insync/src/org/netbeans/modules/visualweb/insync/SourceUnit.java 28 Jan 2007 18:50:43 -0000 1.1 +++ visualweb/insync/src/org/netbeans/modules/visualweb/insync/SourceUnit.java 2 Feb 2007 22:45:04 -0000 @@ -48,7 +48,7 @@ import org.netbeans.modules.visualweb.extension.openide.util.Trace; import org.netbeans.modules.visualweb.insync.Unit.State; -import org.netbeans.modules.visualweb.insync.faces.refactoring.MdrInSyncSynchronizer; +//NB60 import org.netbeans.modules.visualweb.insync.faces.refactoring.MdrInSyncSynchronizer; import org.openide.filesystems.FileAttributeEvent; import org.openide.filesystems.FileEvent; @@ -167,6 +167,7 @@ public void propertyChange(PropertyChangeEvent event) { if (EditorCookie.Observable.PROP_DOCUMENT.equals(event.getPropertyName())) { if (event.getNewValue() == null) { +/*//NB6.0 // Bug Fix # 6473201 llegalStateException, When renaming a page // When a document (e.g. managed-beans.xml) is reloaded during refactoring // do not set the source dirty. The changes to the model will be flushed @@ -174,6 +175,7 @@ if (!MdrInSyncSynchronizer.get().isRefactoringSessionInProgress()) { setSourceDirty(); } + //*/ releaseDocument(); } if ((event.getNewValue() != null) && (event.getOldValue() == null)){ Index: visualweb/insync/src/org/netbeans/modules/visualweb/insync/Util.java =================================================================== RCS file: /cvs/visualweb/insync/src/org/netbeans/modules/visualweb/insync/Util.java,v retrieving revision 1.1 diff -u -u -r1.1 Util.java --- visualweb/insync/src/org/netbeans/modules/visualweb/insync/Util.java 28 Jan 2007 18:50:44 -0000 1.1 +++ visualweb/insync/src/org/netbeans/modules/visualweb/insync/Util.java 2 Feb 2007 22:45:04 -0000 @@ -211,7 +211,7 @@ try { BufferedInputStream inputStream = new BufferedInputStream(fileObject.getInputStream()); if (fileObject.getExt().equals(JAVA_EXT)){ - encoding = org.netbeans.modules.java.Util.getFileEncoding(fileObject); +//NB60 encoding = org.netbeans.modules.java.Util.getFileEncoding(fileObject); // Talk to Wiston or Java folks } if (fileExt.equals(JSP_EXT) || fileExt.equals(JSPF_EXT) || fileExt.equals(XML_EXT)){ encoding = EncodingHelper.detectEncoding(inputStream); }else{ Index: visualweb/insync/src/org/netbeans/modules/visualweb/insync/beans/Bean.java =================================================================== RCS file: /cvs/visualweb/insync/src/org/netbeans/modules/visualweb/insync/beans/Bean.java,v retrieving revision 1.1 diff -u -u -r1.1 Bean.java --- visualweb/insync/src/org/netbeans/modules/visualweb/insync/beans/Bean.java 28 Jan 2007 18:50:47 -0000 1.1 +++ visualweb/insync/src/org/netbeans/modules/visualweb/insync/beans/Bean.java 2 Feb 2007 22:45:04 -0000 @@ -29,7 +29,6 @@ import java.util.ArrayList; import java.util.Iterator; import java.util.List; -import org.netbeans.jmi.javamodel.Statement; import org.openide.util.NbBundle; import org.netbeans.modules.visualweb.extension.openide.util.Trace; @@ -42,8 +41,7 @@ import org.netbeans.modules.visualweb.insync.models.FacesModel; import org.netbeans.modules.visualweb.insync.models.FacesModelSet; import org.netbeans.modules.visualweb.insync.live.LiveUnit; -import org.netbeans.jmi.javamodel.Field; -import org.netbeans.jmi.javamodel.Method; + /** * Representation of a JavaBean instance field within our outer host BeansUnit being built. Initial @@ -64,9 +62,9 @@ protected final ArrayList eventSets = new ArrayList(); private String name; - private Field field; - private Method getter; - private Method setter; + private Object/*VariableElement*/ field; + private Object/*ExecutableElement*/ getter; + private Object/*ExecutableElement*/ setter; //--------------------------------------------------------------------------------- Construction @@ -93,7 +91,7 @@ * @param setter */ protected Bean(BeansUnit unit, BeanInfo beanInfo, String name, - Field field, Method getter, Method setter) { + Object/*VariableElement*/ field, Object/*ExecutableElement*/ getter, Object/*ExecutableElement*/ setter) { this(unit, beanInfo, name); this.field = field; this.getter = getter; @@ -107,6 +105,7 @@ * @param after existing bean that this bean's entries will be added after */ public void insertEntry(Bean after) { +/*//NB6.0 Class typec = beanInfo.getBeanDescriptor().getBeanClass(); JMIUtils.beginTrans(true); boolean rollback = true; @@ -133,6 +132,7 @@ }finally { JMIUtils.endTrans(rollback); } + //*/ } /** @@ -142,6 +142,7 @@ * @return true iff the source entry for this bean was actually removed. */ protected boolean removeEntry() { +/*//NB6.0 assert Trace.trace("insync.beans", "B.removeEntry: " + this); boolean removed = false; for (Iterator i = properties.iterator(); i.hasNext(); ) { @@ -177,6 +178,8 @@ getter = setter = null; return removed; + //*/ + return false; } /** @@ -284,7 +287,7 @@ /** * @return the underlying field for this bean, null if dead. */ - public Field getField() { + public Object/*VariableElement*/ getField() { return field; } Index: visualweb/insync/src/org/netbeans/modules/visualweb/insync/beans/BeanStructureScanner.java =================================================================== RCS file: /cvs/visualweb/insync/src/org/netbeans/modules/visualweb/insync/beans/BeanStructureScanner.java,v retrieving revision 1.1 diff -u -u -r1.1 BeanStructureScanner.java --- visualweb/insync/src/org/netbeans/modules/visualweb/insync/beans/BeanStructureScanner.java 28 Jan 2007 18:50:47 -0000 1.1 +++ visualweb/insync/src/org/netbeans/modules/visualweb/insync/beans/BeanStructureScanner.java 2 Feb 2007 22:45:04 -0000 @@ -26,19 +26,12 @@ import java.io.File; import java.util.List; import java.util.ListIterator; -import org.netbeans.jmi.javamodel.CallableFeature; -import org.netbeans.jmi.javamodel.Method; -import org.netbeans.jmi.javamodel.Statement; -import org.netbeans.jmi.javamodel.StatementBlock; -import org.netbeans.jmi.javamodel.TryStatement; -import org.netbeans.jmi.javamodel.TypeReference; import org.openide.util.NbBundle; import org.netbeans.modules.visualweb.extension.openide.util.Trace; import org.netbeans.modules.visualweb.insync.java.JMIUtils; import java.lang.reflect.Modifier; -import org.netbeans.jmi.javamodel.Field; /** * Manage the methods, fields and such that should be defined for the bean described by my model. @@ -80,7 +73,8 @@ /** * */ - protected StatementBlock ensureInitBlock(MethodInfo mi) { + protected Object/*BlockTree*/ ensureInitBlock(MethodInfo mi) { +/*//NB6.0 UndoEvent event = null; try { String eventName = NbBundle.getMessage(BeanStructureScanner.class, "EnsureInitBlock"); //NOI18N @@ -119,6 +113,8 @@ beansUnit.getModel().writeUnlock(event); } } + //*/ + return null; } /** @@ -134,9 +130,10 @@ * @param requiredImports An array of classes to be imported, or null to import nothing * @return The existing or newly created method. */ - public Method ensureEventMethod(MethodDescriptor md, String name, + public Object/*ExecutableElement*/ ensureEventMethod(MethodDescriptor md, String name, String defaultBody, String[] parameterNames, String[] requiredImports) { +/*// NB6.0 Class retType = md.getMethod().getReturnType(); String body = defaultBody; if(defaultBody == null) { @@ -181,6 +178,8 @@ beansUnit.getModel().writeUnlock(event); } } + //*/ + return null; } /** @@ -199,19 +198,22 @@ } } - protected StatementBlock ensureBlock(MethodInfo mi) { - return mi.getMethod().getBody(); + protected Object/*BlockTree*/ ensureBlock(MethodInfo mi) { +//NB60 return mi.getMethod().getBody(); + return null; } /** * */ - protected StatementBlock ensurePropertiesInitBlock() { - return getPropertiesInitMethod().getBody(); + protected Object/*BlockTree*/ ensurePropertiesInitBlock() { +//NB60 return getPropertiesInitMethod().getBody(); + return null; } - protected CallableFeature ensureMethod(Object location, MethodInfo mi) { + protected Object/*ExecutableElement*/ ensureMethod(Object location, MethodInfo mi) { +/*//NB6.0 org.netbeans.modules.visualweb.insync.java.MethodInfo info = new org.netbeans.modules.visualweb.insync.java.MethodInfo(mi.getName(), mi.getReturnType(), mi.getModifiers(), null, null, @@ -235,6 +237,8 @@ } } return cf; + //*/ + return null; } /** @@ -242,7 +246,8 @@ * * @return */ - protected CallableFeature ensureMethods() { + protected Object/*ExecutableElement*/ ensureMethods() { +/*//NB6.0 CallableFeature m = null; MethodInfo[] methodInfos = getMethodInfos(); for(int i = 0;i < methodInfos.length; i++) { @@ -259,12 +264,15 @@ } return m; + //*/ + return null; } /** * TODO: We need to change how this region is created. */ - protected Field ensurePropertyRegion() { + protected Object/*VariableElement*/ ensurePropertyRegion() { +/*//NB6.0 JavaClassAdapter javaClass = beansUnit.getThisClass(); UndoEvent event = null; try { @@ -292,6 +300,8 @@ beansUnit.getModel().writeUnlock(event); } } + //*/ + return null; } @@ -376,6 +386,7 @@ try { String eventName = NbBundle.getMessage(BeanStructureScanner.class, "EnsureXrefAccessor"); //NOI18N event = beansUnit.getModel().writeLock(eventName); +/*//NB6.0 boolean rollback = true; try { JMIUtils.beginTrans(true); @@ -392,6 +403,7 @@ }finally { JMIUtils.endTrans(rollback); } + //*/ }finally { if(event != null) { beansUnit.getModel().writeUnlock(event); @@ -402,43 +414,50 @@ /** * Finds a possibly existing cross-reference accessor to a sibling bean */ - protected Method findXRefAccessor(String name) { - return beansUnit.getThisClass().getMethod("get" + name, new Class[] {}); //NOI18N + protected Object/*ExecutableElement*/ findXRefAccessor(String name) { +//NB60 return beansUnit.getThisClass().getMethod("get" + name, new Class[] {}); //NOI18N + return null; } - public StatementBlock getPropertiesInitBlock() { - return propertiesInitInfo.getBlock(); + public Object/*BlockTree*/ getPropertiesInitBlock() { +//NB60 return propertiesInitInfo.getBlock(); + return null; } public String getComment(String id) { return NbBundle.getMessage(BeanStructureScanner.class, id); } - public CallableFeature getConstructorMethod() { - return ctorInfo.getMethod(); + public Object/*ExecutableElement*/ getConstructorMethod() { +//NB60 return ctorInfo.getMethod(); + return null; } - public CallableFeature getPropertiesInitMethod() { - return propertiesInitInfo.getMethod(); + public Object/*ExecutableElement*/ getPropertiesInitMethod() { +//NB60 return propertiesInitInfo.getMethod(); + return null; } /** * @return */ - public StatementBlock getDestroyBlock() { - return destroyInfo.getBlock(); + public Object/*BlockTree*/ getDestroyBlock() { +//NB60 return destroyInfo.getBlock(); + return null; } /** * @return */ - public Method getDestroyMethod() { - return beansUnit.getThisClass().getMethod(destroyInfo.getName(), new Class[]{}); + public Object/*ExecutableElement*/ getDestroyMethod() { +//NB60 return beansUnit.getThisClass().getMethod(destroyInfo.getName(), new Class[]{}); + return null; } - public StatementBlock[] getPropertiesInitBlocks() { - return new StatementBlock[]{propertiesInitInfo.getBlock()}; + public Object/*BlockTree*/[] getPropertiesInitBlocks() { +//NB60 return new StatementBlock[]{propertiesInitInfo.getBlock()}; + return null; } public JavaUnit getJavaUnit() { @@ -460,9 +479,11 @@ * @param name */ public void removeXRefAccessor(String name) { +/*//NB6.0 Method m = findXRefAccessor(name); if (m != null) beansUnit.getThisClass().removeMethod(m); + //*/ } public void scan() { @@ -488,8 +509,8 @@ String name, comment, ensureMethodName, exception; Class retType; int modifiers; - CallableFeature method; - StatementBlock block; + Object/*ExecutableElement*/ method; + Object/*BlockTree*/ block; public MethodInfo(String name, int modifiers, Class retType, String comment, String ensureMethodName, String exception) { this.retType = retType; @@ -528,15 +549,17 @@ return exception; } - public StatementBlock getBlock() { - return method.getBody(); + public Object/*BlockTree*/ getBlock() { +//NB60 return method.getBody(); + return null; } - public CallableFeature getMethod() { - return method; + public Object/*ExecutableElement*/ getMethod() { +//NB60 return method; + return null; } - public void setMethod(CallableFeature method) { + public void setMethod(Object/*ExecutableElement*/ method) { this.method = method; } Index: visualweb/insync/src/org/netbeans/modules/visualweb/insync/beans/BeansUnit.java =================================================================== RCS file: /cvs/visualweb/insync/src/org/netbeans/modules/visualweb/insync/beans/BeansUnit.java,v retrieving revision 1.1 diff -u -u -r1.1 BeansUnit.java --- visualweb/insync/src/org/netbeans/modules/visualweb/insync/beans/BeansUnit.java 28 Jan 2007 18:50:47 -0000 1.1 +++ visualweb/insync/src/org/netbeans/modules/visualweb/insync/beans/BeansUnit.java 2 Feb 2007 22:45:04 -0000 @@ -34,7 +34,6 @@ import java.util.List; import java.util.ListIterator; import java.util.Map; -import org.netbeans.jmi.javamodel.StatementBlock; import org.openide.ErrorManager; import org.openide.util.Lookup; @@ -47,12 +46,6 @@ import org.netbeans.modules.visualweb.insync.Unit; import org.netbeans.modules.visualweb.insync.java.JavaUnit; import org.netbeans.modules.visualweb.insync.java.ClassUtil; -import org.netbeans.jmi.javamodel.CallableFeature; -import org.netbeans.jmi.javamodel.Field; -import org.netbeans.jmi.javamodel.Method; -import org.netbeans.jmi.javamodel.Statement; -import org.netbeans.jmi.javamodel.Type; -import org.netbeans.jmi.javamodel.JavaClass; /** * An abstract compilation Unit that represents a single outer (or 'this' or 'root') JavaBean class @@ -262,6 +255,7 @@ * Bind beans & their properties, events and parents */ protected void bind() { +/*//NB6.0 bindBeans(); StatementBlock[] blocks = getInitBlocks(); for(int i = 0; i < blocks.length; i++) { @@ -269,6 +263,7 @@ bindEventSets(blocks[i]); } bindBeanParents(); +//*/ } //---------------------------------------------------------------------------------- Unit Output @@ -420,8 +415,8 @@ /** * Return a new Bean instance bound to an existing field, getter & setter */ - protected Bean newBoundBean(BeanInfo beanInfo, String name, Field field, - Method getter, Method setter) { + protected Bean newBoundBean(BeanInfo beanInfo, String name, Object/*VariableElement*/ field, + Object/*ExecutableElement*/ getter, Object/*ExecutableElement*/ setter) { return new Bean(this, beanInfo, name, field, getter, setter); } @@ -463,6 +458,7 @@ * Run a second parent-child wiring pass */ protected void bindBeans() { +/*//NB6.0 beans.clear(); try { JMIUtils.beginTrans(false); @@ -476,6 +472,7 @@ }finally { JMIUtils.endTrans(); } + //*/ } /** @@ -496,7 +493,8 @@ * @param field * @return the new bound bean if bindable, else null */ - protected Bean bindBean(Method getter) { + protected Bean bindBean(Object/*ExecutableElement*/ getter) { +/*//NB6.0 // can't be abstract or static, and must be public long modifiers = getter.getModifiers(); if ((modifiers & (Modifier.ABSTRACT | Modifier.STATIC)) != 0 @@ -517,7 +515,7 @@ String type = getter.getResultType().getSymbol().getFullNameWithDims(); if (type == null || type.equals("void")) //NOI18N return null; - **/ + ** / // must have a getXxx style name (or isXxx for boolean) String name = Naming.propertyName(getter.getName(), type.getName().equals("boolean")); @@ -576,20 +574,23 @@ } return null; + //*/ + return null; } /** * @param s * @return */ - protected Property newBoundProperty(Statement s) { + protected Property newBoundProperty(Object/*StatementTree*/ s) { return Property.newBoundInstance(this, s); } /** * */ - protected void bindProperties(StatementBlock block) { + protected void bindProperties(Object/*BlockTree*/ block) { +/*//NB6.0 if (block != null) { List statements = block.getStatements(); ListIterator listIter = statements.listIterator(); @@ -605,6 +606,7 @@ } } } + //*/ } /** @@ -614,14 +616,15 @@ * @param s * @return */ - protected EventSet newBoundEventSet(Statement s) { + protected EventSet newBoundEventSet(Object/*StatementTree*/ s) { return EventSet.newBoundInstance(this, s); } /** * Scan the init block statements and create matching EventSets and register with their beans */ - protected void bindEventSets(StatementBlock block) { + protected void bindEventSets(Object/*BlockTree*/ block) { +/*//NB6.0 if (block != null) { List statements = block.getStatements(); ListIterator listIter = statements.listIterator(); @@ -636,6 +639,7 @@ } } } + //*/ } //------------------------------------------------------------------------------------ Accessors @@ -704,21 +708,21 @@ /** * @return */ - public StatementBlock[] getInitBlocks() { + public Object/*BlockTree*/[] getInitBlocks() { return getBeanStructureScanner().getPropertiesInitBlocks(); } /** * @return */ - public StatementBlock getPropertiesInitBlock() { + public Object/*BlockTree*/ getPropertiesInitBlock() { return getBeanStructureScanner().getPropertiesInitBlock(); } /** * @return */ - public CallableFeature getPropertiesInitMethod() { + public Object/*ExecutableElement*/ getPropertiesInitMethod() { return getBeanStructureScanner().getPropertiesInitMethod(); } @@ -726,14 +730,14 @@ /** * @return */ - public StatementBlock getCleanupBlock() { + public Object/*BlockTree*/ getCleanupBlock() { return getBeanStructureScanner().getDestroyBlock(); } /** * @return */ - public Method getCleanupMethod() { + public Object/*ExecutableElement*/ getCleanupMethod() { return getBeanStructureScanner().getDestroyMethod(); } @@ -873,11 +877,14 @@ * @param name * @return */ - public Method getEventMethod(String name, MethodDescriptor md) { + public Object/*ExecutableElement*/ getEventMethod(String name, MethodDescriptor md) { +/*//NB6.0 Class[] pts = md.getMethod().getParameterTypes(); Method m = javaClass.getMethod(name, pts); assert Trace.trace("insync.beans", "BU.getEventMethod name:" + name + " null"); //NOI18N return m; +//*/ + return null; } /** @@ -886,7 +893,7 @@ * @param name * @return */ - public Method getInitializerMethod() { + public Object/*ExecutableElement*/ getInitializerMethod() { return javaClass.getMethod("init", new Class[0]); } @@ -910,7 +917,7 @@ * @param name The name of the metod to find or create. * @return The existing or newly created method. */ - public Method ensureEventMethod(MethodDescriptor md, String name, String defaultBody, + public Object/*ExecutableElement*/ ensureEventMethod(MethodDescriptor md, String name, String defaultBody, String[] parameterNames, String[] requiredImports) { return getBeanStructureScanner().ensureEventMethod(md, name, defaultBody, parameterNames, requiredImports); Index: visualweb/insync/src/org/netbeans/modules/visualweb/insync/beans/Event.java =================================================================== RCS file: /cvs/visualweb/insync/src/org/netbeans/modules/visualweb/insync/beans/Event.java,v retrieving revision 1.1 diff -u -u -r1.1 Event.java --- visualweb/insync/src/org/netbeans/modules/visualweb/insync/beans/Event.java 28 Jan 2007 18:50:48 -0000 1.1 +++ visualweb/insync/src/org/netbeans/modules/visualweb/insync/beans/Event.java 2 Feb 2007 22:45:04 -0000 @@ -26,12 +26,6 @@ import org.netbeans.modules.visualweb.extension.openide.util.Trace; import java.util.List; -import org.netbeans.jmi.javamodel.Expression; -import org.netbeans.jmi.javamodel.ExpressionStatement; -import org.netbeans.jmi.javamodel.Method; -import org.netbeans.jmi.javamodel.MethodInvocation; -import org.netbeans.jmi.javamodel.ReturnStatement; -import org.netbeans.jmi.javamodel.Statement; /** * Representation of a wiring for a single event handler within an EventSet's listener adapter in @@ -51,9 +45,9 @@ protected String[] requiredImports; // Java source-based event fields - protected Method delegator; - protected Method handler; - protected MethodInvocation mExpr; + protected Object/*ExecutableElement*/ delegator; + protected Object/*ExecutableElement*/ handler; + protected Object/*MethodInvocationTree*/ mExpr; //--------------------------------------------------------------------------------- Construction @@ -79,7 +73,7 @@ * @param handler Our handler method that is populated by the user. */ private Event(EventSet set, MethodDescriptor descriptor, - Method delegator, MethodInvocation call, Method handler) { + Object/*ExecutableElement*/ delegator, Object/*MethodInvocationTree*/ call, Object/*ExecutableElement*/ handler) { this(set, descriptor); this.delegator = delegator; this.mExpr = call; @@ -102,7 +96,8 @@ * @param am The adapter * @return the new bound property if bindable, else null */ - static Event newBoundInstance(EventSet set, MethodDescriptor md, Method am) { + static Event newBoundInstance(EventSet set, MethodDescriptor md, Object/*ExecutableElement*/ am) { +/*//NB6.0 JMIUtils.beginTrans(false); try { List stmts = am.getBody().getStatements(); @@ -136,6 +131,8 @@ }finally { JMIUtils.endTrans(); } + //*/ + return null; } /** @@ -192,6 +189,7 @@ // now add arg(s) Class[] pts = descriptor.getMethod().getParameterTypes(); String[] pns = Naming.paramNames(pts, descriptor.getParameterDescriptors()); +/*//NB6.0 JMIUtils.beginTrans(true); boolean rollback = true; try { @@ -210,6 +208,7 @@ }finally { JMIUtils.endTrans(rollback); } + //*/ } /** @@ -264,6 +263,7 @@ * @param name The new handler method name. */ public void setHandler(String name) { +/*//NB6.0 JMIUtils.beginTrans(true); boolean rollback = true; try { @@ -280,14 +280,14 @@ /* if(!mExpr.isValid()) initializeCall(); - **/ + ** / mExpr.setName(name); } rollback = false; }finally { JMIUtils.endTrans(rollback); } - +//*/ } /** @@ -295,18 +295,21 @@ * @return The handler method name. */ public String getHandlerName() { +/*//NB6.0 // should match handler.getName() too, but handler may be null (temporarily lost) //return ((Identifier)call.getMethod()).getFullname(); if(handler != null) return handler.getName(); - /* + /NB6.0* else { if(!mExpr.isValid()) { initializeCall(); } } - **/ + **NB6.0/ return mExpr.getName(); + //*/ + return null; } /* @@ -329,7 +332,7 @@ * * @return The handler method itself. */ - public Method getHandlerMethod() { + public Object/*ExecutableElement*/ getHandlerMethod() { return handler; } Index: visualweb/insync/src/org/netbeans/modules/visualweb/insync/beans/EventSet.java =================================================================== RCS file: /cvs/visualweb/insync/src/org/netbeans/modules/visualweb/insync/beans/EventSet.java,v retrieving revision 1.1 diff -u -u -r1.1 EventSet.java --- visualweb/insync/src/org/netbeans/modules/visualweb/insync/beans/EventSet.java 28 Jan 2007 18:50:48 -0000 1.1 +++ visualweb/insync/src/org/netbeans/modules/visualweb/insync/beans/EventSet.java 2 Feb 2007 22:45:04 -0000 @@ -31,17 +31,6 @@ import java.util.Iterator; import org.netbeans.modules.visualweb.extension.openide.util.Trace; -import org.netbeans.jmi.javamodel.CallableFeature; -import org.netbeans.jmi.javamodel.ClassDefinition; -import org.netbeans.jmi.javamodel.Expression; -import org.netbeans.jmi.javamodel.Method; -import org.netbeans.jmi.javamodel.MethodInvocation; -import org.netbeans.jmi.javamodel.MultipartId; -import org.netbeans.jmi.javamodel.NewClassExpression; -import org.netbeans.jmi.javamodel.PrimaryExpression; -import org.netbeans.jmi.javamodel.Statement; -import org.netbeans.jmi.javamodel.StatementBlock; -import org.netbeans.jmi.javamodel.VariableAccess; /** * Representation of a wiring for a single event listener, which maps to a single add*Listener @@ -59,7 +48,7 @@ final protected ArrayList events = new ArrayList(); // Java source-based event set fields - Statement stmt; + Object/*StatementTree*/ stmt; JavaClassAdapter adapterClass; //--------------------------------------------------------------------------------- Construction @@ -82,8 +71,8 @@ * * @param beansUnit */ - protected EventSet(Bean bean, EventSetDescriptor descriptor, Statement stmnt, - ClassDefinition adapter) { + protected EventSet(Bean bean, EventSetDescriptor descriptor, Object/*StatementTree*/ stmnt, + Object/*TypeElement*/ adapter) { this(bean, descriptor); this.stmt = stmnt; this.adapterClass = new JavaClassAdapter(unit.getJavaUnit(), adapter); @@ -106,7 +95,8 @@ * @param s * @return the new bound event set if bindable, else null */ - static EventSet newBoundInstance(BeansUnit unit, Statement s) { + static EventSet newBoundInstance(BeansUnit unit, Object/*StatementTree*/ s) { +/*//NB6.0 // statement must be an exec (execute expression) JMIUtils.beginTrans(false); try { @@ -136,6 +126,8 @@ }finally { JMIUtils.endTrans(); } + //*/ + return null; } /** @@ -155,7 +147,7 @@ * @param m * @return */ - protected Event newBoundEvent(MethodDescriptor md, Method m) { + protected Event newBoundEvent(MethodDescriptor md, Object/*ExecutableElement*/ m) { return Event.newBoundInstance(this, md, m); } @@ -163,6 +155,7 @@ * Scan our descriptor's methods and create individual events that match */ protected void bindEvents() { +/*//NB6.0 MethodDescriptor[] lmds = descriptor.getListenerMethodDescriptors(); for (int i = 0; i < lmds.length; i++) { Method m = adapterClass.getMethod(lmds[i].getName(), @@ -173,9 +166,11 @@ events.add(e); } } + //*/ } - protected Method stubDelegatorMethod(MethodDescriptor mdescr) { + protected Object/*ExecutableElement*/ stubDelegatorMethod(MethodDescriptor mdescr) { +/*//NB6.0 Class retType = mdescr.getMethod().getReturnType(); // now add parameter(s) @@ -191,26 +186,33 @@ new org.netbeans.modules.visualweb.insync.java.MethodInfo(mdescr.getName(), retType, Modifier.PUBLIC, pns, pts, body, null); return (Method)adapterClass.addMethod(info); + //*/ + return null; } - private void stubBody(Method method) { + private void stubBody(Object/*ExecutableElement*/ method) { +/*//NB6.0 String body = null; if (!method.getType().equals("void")) { body = "return null;"; } JMIMethodUtils.replaceMethodBody(method, body); + //*/ } - protected Method getDelegatorMethod(MethodDescriptor mdescr) { + protected Object/*ExecutableElement*/ getDelegatorMethod(MethodDescriptor mdescr) { +/*//NB6.0 Method delegate = adapterClass.getMethod(mdescr.getMethod().getName(), mdescr.getMethod().getParameterTypes()); if (delegate == null) delegate = stubDelegatorMethod(mdescr); return delegate; + //*/ + return null; } - protected void removeDelegatorMethod(Method delegator) { + protected void removeDelegatorMethod(Object/*ExecutableElement*/ delegator) { Class atype = getAdapterType(); if (atype != null) { adapterClass.removeMethod(delegator); @@ -224,6 +226,7 @@ * Insert the stub source entry for this EventSet */ protected void insertEntry() { +/*//NB6.0 JMIUtils.beginTrans(true); boolean rollback = true; try { @@ -254,6 +257,7 @@ }finally { JMIUtils.endTrans(rollback); } + //*/ } /** @@ -276,6 +280,7 @@ assert Trace.trace("insync.beans", "ES.removeEntry: " + this); events.clear(); boolean retVal = false; +/*//NB6.0 JMIUtils.beginTrans(true); boolean rollback = true; try { @@ -296,7 +301,7 @@ }finally { JMIUtils.endTrans(rollback); } - +//*/ return retVal; } Index: visualweb/insync/src/org/netbeans/modules/visualweb/insync/beans/Property.java =================================================================== RCS file: /cvs/visualweb/insync/src/org/netbeans/modules/visualweb/insync/beans/Property.java,v retrieving revision 1.1 diff -u -u -r1.1 Property.java --- visualweb/insync/src/org/netbeans/modules/visualweb/insync/beans/Property.java 28 Jan 2007 18:50:48 -0000 1.1 +++ visualweb/insync/src/org/netbeans/modules/visualweb/insync/beans/Property.java 2 Feb 2007 22:45:04 -0000 @@ -26,17 +26,6 @@ import org.netbeans.modules.visualweb.extension.openide.util.Trace; import java.util.ArrayList; import java.util.List; -import org.netbeans.jmi.javamodel.CallableFeature; -import org.netbeans.jmi.javamodel.Element; -import org.netbeans.jmi.javamodel.Expression; -import org.netbeans.jmi.javamodel.ExpressionStatement; -import org.netbeans.jmi.javamodel.JavaClass; -import org.netbeans.jmi.javamodel.MethodInvocation; -import org.netbeans.jmi.javamodel.MultipartId; -import org.netbeans.jmi.javamodel.PrimaryExpression; -import org.netbeans.jmi.javamodel.Statement; -import org.netbeans.jmi.javamodel.StatementBlock; -import org.netbeans.jmi.javamodel.VariableAccess; /** * Representation of a single property setting on our parent bean, which maps to a single property @@ -51,8 +40,8 @@ final PropertyDescriptor descriptor; // Java source-based property fields - Statement stmt; - Expression valueExpr; + Object/*StatementTree*/ stmt; + Object/*ExpressionTree*/ valueExpr; //--------------------------------------------------------------------------------- Construction @@ -75,7 +64,7 @@ * @param beansUnit */ private Property(Bean bean, PropertyDescriptor descriptor, - Statement stmnt, Expression valueExpr + Object/*StatementTree*/ stmnt, Object/*ExpressionTree*/ valueExpr ) { this(bean, descriptor, false); this.stmt = stmnt; @@ -84,23 +73,26 @@ } - static protected MethodInvocation getExpression - (BeansUnit unit, Statement s) { + static protected Object/*MethodInvocationTree*/ getExpression + (BeansUnit unit, Object/*StatementTree*/ s) { +/*//NB6.0 if(!(s instanceof ExpressionStatement)) return null; ExpressionStatement exStmt = (ExpressionStatement)s; - + if(!(exStmt.getExpression() instanceof MethodInvocation)) return null; MethodInvocation mExpr = (MethodInvocation)exStmt.getExpression(); - + if(mExpr.getParameters().size() > 1) return null; - + PrimaryExpression pExpr = mExpr.getParentClass(); if(pExpr == null && !(pExpr instanceof VariableAccess)) return null; - return mExpr; + return mExpr; +//*/ + return null; } /** @@ -109,7 +101,8 @@ * @param s * @return the new bound property if bindable, else null */ - static protected Property newBoundInstance(BeansUnit unit, Statement s) { + static protected Property newBoundInstance(BeansUnit unit, Object/*StatementTree*/ s) { +/*//NB6.0 JMIUtils.beginTrans(false); try { MethodInvocation mExpr = getExpression(unit, s); @@ -129,12 +122,14 @@ PropertyDescriptor pd = bean.getPropertyDescriptorForSetter(mname); if (pd == null) return null; - + return new Property(bean, pd, s, (Expression) mExpr.getParameters().get(0)); }finally { JMIUtils.endTrans(); - } + } +//*/ + return null; } /** @@ -152,6 +147,7 @@ * Insert this property's statement into the init method. */ protected void insertEntry() { +/*//NB6.0 JMIUtils.beginTrans(true); boolean rollback = true; try { @@ -162,8 +158,9 @@ }finally { JMIUtils.endTrans(rollback); } - + // Args are added in setValue() +//*/ } /** @@ -172,7 +169,8 @@ * * @return true iff the source entry for this property was actually removed. */ - protected boolean removeEntry() { + protected boolean removeEntry() { +/*//NB6.0 boolean retVal = false; JMIUtils.beginTrans(true); boolean rollback = true; @@ -194,10 +192,12 @@ }finally { JMIUtils.endTrans(rollback); } - + if(retVal) stmt = null; - return retVal; + return retVal; +//*/ + return false; } //------------------------------------------------------------------------------------ Accessors @@ -248,24 +248,28 @@ * default, but may be returned in other forms by subclasses. */ public String getValueSource() { +/*//NB6.0 JMIUtils.beginTrans(false); try { if(unit.getJavaUnit() != null) { valueExpr = getValueExpression(); JavaClass jCls = unit.getJavaUnit().getJavaClass(); - return valueExpr != null ? JMIExpressionUtils.getArgumentSource( + return valueExpr != null ? JMIExpressionUtils.getArgumentSource( valueExpr) : null; } return null; }finally { JMIUtils.endTrans(); - } + } +//*/ + return null; } /** * Set the value of this property, creating the call arg expression of the appropriate type */ public void setValue(Object value, String valueSource) { +/*//NB6.0 CallableFeature method = unit.getPropertiesInitMethod(); JMIUtils.beginTrans(true); boolean rollback = true; @@ -273,7 +277,7 @@ int startPos = -1; int endPos = -1; MethodInvocation mExpr = getMethodInvocation(); - + if(mExpr != null) { List l = mExpr.getParameters(); if(l.size() == 0) { @@ -285,7 +289,7 @@ endPos = mExpr.getEndOffset()-1; } } - + int methStartPos = method.getBody().getStartOffset()+1; String bodyText = method.getBodyText(); String body = bodyText.substring(1, startPos-methStartPos); @@ -296,10 +300,12 @@ }finally { JMIUtils.endTrans(rollback); } +//*/ } - MethodInvocation getMethodInvocation() { - JMIUtils.beginTrans(false); + Object/*MethodInvocationTree*/ getMethodInvocation() { +/*//NB6.0 + JMIUtils.beginTrans(false); try { StatementBlock[] blocks = unit.getInitBlocks(); for (int i = 0; i < blocks.length; i++) { @@ -307,22 +313,25 @@ blocks[i], descriptor.getWriteMethod().getName(), bean.getName()); if (stmt != null) { - ExpressionStatement exStmt = + ExpressionStatement exStmt = (ExpressionStatement)stmt; - + MethodInvocation mExpr = (MethodInvocation)exStmt.getExpression(); return mExpr; } - } + } } finally { JMIUtils.endTrans(); } - + + return null; +//*/ return null; } - Expression getValueExpression() { + Object/*ExpressionTree*/ getValueExpression() { +/*//NB6.0 MethodInvocation mExpr = getMethodInvocation(); if (mExpr == null) { return null; @@ -332,6 +341,8 @@ return (Expression)params.get(0); else return null; +//*/ + return null; } /** Index: visualweb/insync/src/org/netbeans/modules/visualweb/insync/faces/FacesBean.java =================================================================== RCS file: /cvs/visualweb/insync/src/org/netbeans/modules/visualweb/insync/faces/FacesBean.java,v retrieving revision 1.1 diff -u -u -r1.1 FacesBean.java --- visualweb/insync/src/org/netbeans/modules/visualweb/insync/faces/FacesBean.java 28 Jan 2007 18:50:49 -0000 1.1 +++ visualweb/insync/src/org/netbeans/modules/visualweb/insync/faces/FacesBean.java 2 Feb 2007 22:45:04 -0000 @@ -37,8 +37,6 @@ import org.netbeans.modules.visualweb.insync.beans.Bean; import org.netbeans.modules.visualweb.insync.beans.EventSet; import org.netbeans.modules.visualweb.insync.beans.Property; -import org.netbeans.jmi.javamodel.Field; -import org.netbeans.jmi.javamodel.Method; /** * A MarkupBean for a JSF component that lives in a FacesPageUnit. @@ -63,8 +61,8 @@ * @param setter * @param element */ - FacesBean(FacesPageUnit unit, BeanInfo beanInfo, String name, Field field, Method getter, - Method setter, Element element) { + FacesBean(FacesPageUnit unit, BeanInfo beanInfo, String name, Object/*VariableElement*/ field, Object/*ExecutableElement*/ getter, + Object/*ExecutableElement*/ setter, Element element) { super(unit, beanInfo, name, field, getter, setter, element); } Index: visualweb/insync/src/org/netbeans/modules/visualweb/insync/faces/FacesPageUnit.java =================================================================== RCS file: /cvs/visualweb/insync/src/org/netbeans/modules/visualweb/insync/faces/FacesPageUnit.java,v retrieving revision 1.1 diff -u -u -r1.1 FacesPageUnit.java --- visualweb/insync/src/org/netbeans/modules/visualweb/insync/faces/FacesPageUnit.java 28 Jan 2007 18:50:49 -0000 1.1 +++ visualweb/insync/src/org/netbeans/modules/visualweb/insync/faces/FacesPageUnit.java 2 Feb 2007 22:45:04 -0000 @@ -37,10 +37,6 @@ import javax.faces.component.UIForm; import javax.faces.component.UIViewRoot; import javax.faces.context.FacesContext; -import org.netbeans.jmi.javamodel.Field; -import org.netbeans.jmi.javamodel.Method; -import org.netbeans.jmi.javamodel.Statement; -import org.netbeans.jmi.javamodel.StatementBlock; import org.openide.ErrorManager; import org.openide.loaders.DataObject; @@ -495,7 +491,7 @@ * @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) */ protected Bean newBoundBean(BeanInfo bi, String name, - Field field, Method getter, Method setter) { + Object/*VariableElement*/ field, Object/*ExecutableElement*/ getter, Object/*ExecutableElement*/ setter) { // Determine the source tag for this bean and thus if it is faces String tag = getBeanTagName(bi); String tlUri = getBeanTaglibUri(bi); @@ -750,14 +746,14 @@ /* * @see org.netbeans.modules.visualweb.insync.beans.BeansUnit#newBoundProperty(org.netbeans.modules.visualweb.insync.java.Statement) */ - protected Property newBoundProperty(Statement s) { + protected Property newBoundProperty(Object/*StatementTree*/ s) { return MarkupProperty.newBoundInstance(this, s); } /* * @see org.netbeans.modules.visualweb.insync.beans.BeansUnit#bindEventSets() */ - protected void bindEventSets(StatementBlock b) { + protected void bindEventSets(Object/*BlockTree*/ b) { // bind statement-based event wiring super.bindEventSets(b); Index: visualweb/insync/src/org/netbeans/modules/visualweb/insync/faces/MarkupBean.java =================================================================== RCS file: /cvs/visualweb/insync/src/org/netbeans/modules/visualweb/insync/faces/MarkupBean.java,v retrieving revision 1.1 diff -u -u -r1.1 MarkupBean.java --- visualweb/insync/src/org/netbeans/modules/visualweb/insync/faces/MarkupBean.java 28 Jan 2007 18:50:50 -0000 1.1 +++ visualweb/insync/src/org/netbeans/modules/visualweb/insync/faces/MarkupBean.java 2 Feb 2007 22:45:04 -0000 @@ -35,8 +35,6 @@ import com.sun.rave.designtime.markup.MarkupPosition; import org.netbeans.modules.visualweb.insync.beans.Bean; import org.netbeans.modules.visualweb.insync.beans.Property; -import org.netbeans.jmi.javamodel.Field; -import org.netbeans.jmi.javamodel.Method; /** * Abstract superclass for a Bean that may have entries in markup source as well as Java source @@ -62,8 +60,8 @@ * @param getter * @param setter */ - public MarkupBean(FacesPageUnit unit, BeanInfo beanInfo, String name, Field field, Method getter, - Method setter, Element element) { + public MarkupBean(FacesPageUnit unit, BeanInfo beanInfo, String name, Object/*VariableElement*/ field, Object/*ExecutableElement*/ getter, + Object/*ExecutableElement*/ setter, Element element) { super(unit, beanInfo, name, field, getter, setter); this.element = element; children = isParentCapableBean(beanInfo) ? new ArrayList() : null; Index: visualweb/insync/src/org/netbeans/modules/visualweb/insync/faces/MarkupProperty.java =================================================================== RCS file: /cvs/visualweb/insync/src/org/netbeans/modules/visualweb/insync/faces/MarkupProperty.java,v retrieving revision 1.1 diff -u -u -r1.1 MarkupProperty.java --- visualweb/insync/src/org/netbeans/modules/visualweb/insync/faces/MarkupProperty.java 28 Jan 2007 18:50:50 -0000 1.1 +++ visualweb/insync/src/org/netbeans/modules/visualweb/insync/faces/MarkupProperty.java 2 Feb 2007 22:45:04 -0000 @@ -28,7 +28,6 @@ import com.sun.rave.designtime.Constants; import com.sun.rave.designtime.markup.AttributeDescriptor; import org.netbeans.modules.visualweb.extension.openide.util.Trace; -import org.netbeans.jmi.javamodel.Statement; import org.w3c.dom.Attr; import org.w3c.dom.Element; @@ -74,7 +73,7 @@ * @param s * @return the new bound property if bindable, else null */ - static Property newBoundInstance(FacesPageUnit unit, Statement s) { + static Property newBoundInstance(FacesPageUnit unit, Object/*StatementTree*/ s) { return Property.newBoundInstance(unit, s); } Index: visualweb/insync/src/org/netbeans/modules/visualweb/insync/faces/ThresherFacesBeanStructureScanner.java =================================================================== RCS file: /cvs/visualweb/insync/src/org/netbeans/modules/visualweb/insync/faces/ThresherFacesBeanStructureScanner.java,v retrieving revision 1.1 diff -u -u -r1.1 ThresherFacesBeanStructureScanner.java --- visualweb/insync/src/org/netbeans/modules/visualweb/insync/faces/ThresherFacesBeanStructureScanner.java 28 Jan 2007 18:50:51 -0000 1.1 +++ visualweb/insync/src/org/netbeans/modules/visualweb/insync/faces/ThresherFacesBeanStructureScanner.java 2 Feb 2007 22:45:04 -0000 @@ -27,12 +27,8 @@ import java.lang.reflect.Modifier; import java.util.List; import java.util.ListIterator; -import org.netbeans.jmi.javamodel.Statement; -import org.netbeans.jmi.javamodel.StatementBlock; -import org.netbeans.jmi.javamodel.TryStatement; import org.openide.util.NbBundle; - public class ThresherFacesBeanStructureScanner extends FacesBeanStructureScanner { public static String PROP_INITMETHOD = "_init"; public static String INITMETHOD = "init"; @@ -50,9 +46,10 @@ getComment("COMMENT_PropInitMethodComment"), ENSURE_EMPTYBLOCK, "Exception"); } - public StatementBlock[] getPropertiesInitBlocks() { + public Object/*BlockTree*/[] getPropertiesInitBlocks() { +/*//NB6.0 StatementBlock b = ctorInfo.getBlock(); - + //Look for property initializers in the first try catch block, this is //to support the code generated in constructor prior to FCS List stats = b.getStatements(); @@ -66,16 +63,19 @@ tryBlock = tryStmt.getBody(); } } - + if(tryBlock != null) return new StatementBlock[]{tryBlock, propertiesInitInfo.getBlock()}; else return super.getPropertiesInitBlocks(); +//*/ + return null; } - protected StatementBlock ensureInitBlock(MethodInfo mi) { + protected Object/*BlockTree*/ ensureInitBlock(MethodInfo mi) { +/*//NB6.0 StatementBlock body = mi.getMethod().getBody(); - + List stats = body.getStatements(); ListIterator iter = stats.listIterator(); while(iter.hasNext()) { @@ -83,7 +83,7 @@ if(s instanceof TryStatement) return null; } - + String bodyText = "// " + getComment("COMMENT_InitSuperCall") + "\n" + "super.init();\n" + "// " + getComment("COMMENT_UserPreInit") + "\n\n" + @@ -107,8 +107,10 @@ }finally { JMIUtils.endTrans(rollback); } - + return body; +//*/ + return null; } public String getConstructorComment() { Index: visualweb/insync/src/org/netbeans/modules/visualweb/insync/java/JMIExpressionUtils.java =================================================================== RCS file: /cvs/visualweb/insync/src/org/netbeans/modules/visualweb/insync/java/JMIExpressionUtils.java,v retrieving revision 1.1 diff -u -u -r1.1 JMIExpressionUtils.java --- visualweb/insync/src/org/netbeans/modules/visualweb/insync/java/JMIExpressionUtils.java 28 Jan 2007 18:50:59 -0000 1.1 +++ visualweb/insync/src/org/netbeans/modules/visualweb/insync/java/JMIExpressionUtils.java 2 Feb 2007 22:45:04 -0000 @@ -21,31 +21,6 @@ import java.lang.reflect.Array; import java.util.List; -import org.netbeans.jmi.javamodel.ArrayInitialization; -import org.netbeans.jmi.javamodel.Assignment; -import org.netbeans.jmi.javamodel.BooleanLiteral; -import org.netbeans.jmi.javamodel.CharLiteral; -import org.netbeans.jmi.javamodel.Constructor; -import org.netbeans.jmi.javamodel.DoubleLiteral; -import org.netbeans.jmi.javamodel.Element; -import org.netbeans.jmi.javamodel.JavaClass; -import org.netbeans.jmi.javamodel.JavaModelPackage; -import org.netbeans.jmi.javamodel.Method; -import org.netbeans.jmi.javamodel.MethodInvocation; -import org.netbeans.jmi.javamodel.MultipartId; -import org.netbeans.jmi.javamodel.NewArrayExpression; -import org.netbeans.jmi.javamodel.NewClassExpression; -import org.netbeans.jmi.javamodel.NullLiteral; -import org.netbeans.jmi.javamodel.Parameter; -import org.netbeans.jmi.javamodel.PrimaryExpression; -import org.netbeans.jmi.javamodel.StringLiteral; -import org.netbeans.jmi.javamodel.TypeCast; -import org.netbeans.jmi.javamodel.TypeReference; -import org.netbeans.jmi.javamodel.VariableAccess; -import org.netbeans.jmi.javamodel.FloatLiteral; -import org.netbeans.jmi.javamodel.IntLiteral; -import org.netbeans.jmi.javamodel.LongLiteral; -import org.netbeans.jmi.javamodel.Expression; /** * MDR utility methods dealing with expressions @@ -54,8 +29,9 @@ */ public class JMIExpressionUtils { - public static MethodInvocation getMethodInvocation(Element elem, + public static Object/*MethodInvocationTree*/ getMethodInvocation(Object/*Element*/ elem, String beanName, String methodName, List args) { +/*//NB6.0 assert JMIUtils.isInsideTrans(); JavaModelPackage jmodel = (JavaModelPackage)elem.refImmediatePackage(); @@ -67,9 +43,12 @@ MethodInvocation mInvoke = jmodel.getMethodInvocation().createMethodInvocation( methodName, args, varAccess, false); return mInvoke; +//*/ + return null; } - public static NewClassExpression getNewClassExpression(JavaClass jCls, String name) { + public static Object/*NewClassTree*/ getNewClassExpression(Object/*TypeElement or ClassType*/ jCls, String name) { +/*//NB6.0 assert JMIUtils.isInsideTrans(); JavaModelPackage jmodel = (JavaModelPackage)jCls.refImmediatePackage(); @@ -78,16 +57,22 @@ newClsExpr.setClassName((MultipartId)typeRef); newClsExpr.setClassDefinition(jmodel.getClassDefinition().createClassDefinition()); return newClsExpr; +//*/ + return null; } - public static String getArgumentSource(Expression expr) { + public static String getArgumentSource(Object/*ExpressionTree*/ expr) { +/*//NB6.0 assert JMIUtils.isInsideTrans(); String source = expr.getResource().getSourceText(); String stmtSource = source.substring(expr.getStartOffset(), expr.getEndOffset()); return stmtSource; +//*/ + return null; } - public static Object getValue(Expression valueExpr, JavaUnit javaUnit) { + public static Object getValue(Object/*ExpressionTree*/ valueExpr, JavaUnit javaUnit) { +/*//NB6.0 assert JMIUtils.isInsideTrans(); Object value = null; try { @@ -120,7 +105,7 @@ if(!(expr instanceof MultipartId)) { return null; } - + List params = mInvoke.getParameters(); int count = params.size(); Object[] argv = new Object[count]; @@ -128,7 +113,7 @@ Class cls = null; java.lang.reflect.Method m = null; String cname = null; - + Element elem = mInvoke.getElement(); if(elem instanceof Method) { cname = ((MultipartId)expr).getType().getName(); @@ -156,7 +141,7 @@ Expression arg = (Expression) params.get(i); argv[i] = getValue(arg, javaUnit); argvt[i] = getValueType(arg, javaUnit); - + } m = getMethod(cls, mname, argvt); } @@ -177,7 +162,7 @@ Object[] argv = new Object[count]; Class[] argvt = new Class[count]; java.lang.reflect.Constructor ctor = null; - + if(elem instanceof Constructor) { Constructor ctorElem = (Constructor)elem; List actualParams = ctorElem.getParameters(); @@ -195,11 +180,11 @@ Expression arg = (Expression) params.get(i); argv[i] = getValue(arg, javaUnit); argvt[i] = getValueType(arg, javaUnit); - + } ctor = getConstructor(cls, argvt); } - + if(ctor != null) { value = ctor.newInstance(argv); } @@ -215,7 +200,7 @@ array[i] = getValue(elem, javaUnit); } value = array; - + }else if(valueExpr instanceof TypeCast) { value = getValue(((TypeCast)valueExpr).getExpression(), javaUnit); }else if(valueExpr instanceof Assignment) { @@ -225,8 +210,10 @@ //System.out.println("ExpressinUtils.getValue() " + valueExpr); //Ignore exception and return null } - + return value; +//*/ + return null; } /* @@ -319,7 +306,8 @@ * Returns java type given a MDR Expression * */ - public static Class getValueType(Expression valueExpr, JavaUnit javaUnit) { + public static Class getValueType(Object/*ExpressionTree*/ valueExpr, JavaUnit javaUnit) { +/*//NB6.0 assert JMIUtils.isInsideTrans(); Class valueType = null; try { @@ -345,8 +333,10 @@ //System.out.println("ExpressinUtils.getValueType() " + valueExpr); //Ignore exception and return null } - + return valueType; +//*/ + return null; } } Index: visualweb/insync/src/org/netbeans/modules/visualweb/insync/java/JMIMethodUtils.java =================================================================== RCS file: /cvs/visualweb/insync/src/org/netbeans/modules/visualweb/insync/java/JMIMethodUtils.java,v retrieving revision 1.1 diff -u -u -r1.1 JMIMethodUtils.java --- visualweb/insync/src/org/netbeans/modules/visualweb/insync/java/JMIMethodUtils.java 28 Jan 2007 18:50:59 -0000 1.1 +++ visualweb/insync/src/org/netbeans/modules/visualweb/insync/java/JMIMethodUtils.java 2 Feb 2007 22:45:04 -0000 @@ -21,17 +21,6 @@ import java.util.List; import java.util.ListIterator; -import org.netbeans.jmi.javamodel.CallableFeature; -import org.netbeans.jmi.javamodel.ExpressionStatement; -import org.netbeans.jmi.javamodel.JavaModelPackage; -import org.netbeans.jmi.javamodel.MethodInvocation; -import org.netbeans.jmi.javamodel.MultipartId; -import org.netbeans.jmi.javamodel.PrimaryExpression; -import org.netbeans.jmi.javamodel.ReturnStatement; -import org.netbeans.jmi.javamodel.VariableAccess; -import org.netbeans.jmi.javamodel.Statement; -import org.netbeans.jmi.javamodel.Expression; -import org.netbeans.jmi.javamodel.StatementBlock; /** * @@ -39,7 +28,8 @@ */ public class JMIMethodUtils { - public static Statement findStatement(StatementBlock block, String mName, String bName) { + public static Object/*StatementTree*/ findStatement(Object/*StatementTree*/ block, String mName, String bName) { +/*//NB6.0 assert JMIUtils.isInsideTrans(); Statement s = null; List stmts = block.getStatements(); @@ -64,10 +54,13 @@ } } return null; +//*/ + return null; } - public static Statement addMethodInvocationStatement(CallableFeature method, + public static Object/*StatementTree*/ addMethodInvocationStatement(Object/*ExecutableElement*/ method, String beanName, String methodName, List args) { +/*//NB6.0 assert JMIUtils.isInsideTrans(); ExpressionStatement exStmt = null; JavaModelPackage jmodel = (JavaModelPackage)method.refImmediatePackage(); @@ -76,9 +69,12 @@ exStmt.setExpression(mInvoke); method.getBody().getStatements().add(exStmt); return exStmt; +//*/ + return null; } - public static Statement addMethodInvocationStatement(CallableFeature method, Expression expr) { + public static Object/*StatementTree*/ addMethodInvocationStatement(Object/*ExecutableElement*/ method, Object/*ExpressionTree*/ expr) { +/*//NB6.0 assert JMIUtils.isInsideTrans(); ExpressionStatement exStmt = null; JavaModelPackage jmodel = (JavaModelPackage)method.refImmediatePackage(); @@ -86,32 +82,47 @@ exStmt.setExpression(expr); method.getBody().getStatements().add(exStmt); return exStmt; +//*/ + return null; } - public static Statement addReturnStatement(CallableFeature method, Expression expr) { + public static Object/*StatementTree*/ addReturnStatement(Object/*ExecutableElement*/ method, Object/*ExpressionTree*/ expr) { +/*//NB6.0 assert JMIUtils.isInsideTrans(); ReturnStatement exStmt = null; JavaModelPackage jmodel = (JavaModelPackage)method.refImmediatePackage(); exStmt = jmodel.getReturnStatement().createReturnStatement(expr); method.getBody().getStatements().add(exStmt); return exStmt; +//*/ + return null; } - public static void replaceMethodBody(CallableFeature callableFeature, String bodyText) { + public static void replaceMethodBody(Object/*ExecutableElement*/ callableFeature, String bodyText) { +/*//NB6.0 assert JMIUtils.isInsideTrans(); callableFeature.setBodyText(bodyText); + +//*/ } - public static boolean removeStatement(CallableFeature callableFeature, Statement stmt) { + public static boolean removeStatement(Object/*ExecutableElement*/ callableFeature, Object/*StatementTree*/ stmt) { +/*//NB6.0 assert JMIUtils.isInsideTrans(); List stmts = callableFeature.getBody().getStatements(); return stmts.remove(stmt); +//*/ + return false; } - public static boolean removeStatement(StatementBlock sb, Statement stmt) { + // NB6.0 Changed name because of ambiguous overload + public static boolean removeStatementOL(Object/*BlockTree*/ sb, Object/*StatementTree*/ stmt) { +/*//NB6.0 assert JMIUtils.isInsideTrans(); List stmts = sb.getStatements(); return stmts.remove(stmt); +//*/ + return false; } } Index: visualweb/insync/src/org/netbeans/modules/visualweb/insync/java/JMIRefactor.java =================================================================== RCS file: /cvs/visualweb/insync/src/org/netbeans/modules/visualweb/insync/java/JMIRefactor.java,v retrieving revision 1.1 diff -u -u -r1.1 JMIRefactor.java --- visualweb/insync/src/org/netbeans/modules/visualweb/insync/java/JMIRefactor.java 28 Jan 2007 18:51:00 -0000 1.1 +++ visualweb/insync/src/org/netbeans/modules/visualweb/insync/java/JMIRefactor.java 2 Feb 2007 22:45:04 -0000 @@ -21,14 +21,6 @@ import java.util.Iterator; import java.util.List; -import org.netbeans.jmi.javamodel.Element; -import org.netbeans.jmi.javamodel.Expression; -import org.netbeans.jmi.javamodel.JavaModelPackage; -import org.netbeans.jmi.javamodel.MethodInvocation; -import org.netbeans.jmi.javamodel.NamedElement; -import org.netbeans.jmi.javamodel.PrimaryExpression; -import org.netbeans.jmi.javamodel.ReturnStatement; -import org.netbeans.jmi.javamodel.StringLiteral; /** * Classes to rename identifiers and literals @@ -45,7 +37,8 @@ this.oldname = oldname; this.newname = newname; } - public boolean apply(Element elem) { + public boolean apply(Object/*Tree*/ elem) { +/*//NB6.0 List elementList = elem.getChildren(); for (Iterator iter = elementList.iterator(); iter.hasNext();) { Element childElement = (Element) iter.next(); @@ -59,6 +52,8 @@ apply(childElement); } return true; +//*/ + return true; } } @@ -74,7 +69,8 @@ this.newname = newname; } - public boolean apply(Element elem) { + public boolean apply(Object/*Tree*/ elem) { +/*//NB6.0 List elementList = elem.getChildren(); for (Iterator iter = elementList.iterator(); iter.hasNext();) { Element childElement = (Element) iter.next(); @@ -95,6 +91,8 @@ apply(childElement); } return true; +//*/ + return true; } } @@ -106,7 +104,8 @@ this.oldname = oldname; this.newname = newname; } - public boolean apply(Element elem) { + public boolean apply(Object/*Tree*/ elem) { +/*//NB6.0 List elementList = elem.getChildren(); for (Iterator iter = elementList.iterator(); iter.hasNext();) { Element childElement = (Element) iter.next(); @@ -120,6 +119,8 @@ apply(childElement); } return true; +//*/ + return true; } } @@ -131,7 +132,8 @@ this.oldname = oldname; this.newname = newname; } - public boolean apply(Element elem) { + public boolean apply(Object/*Tree*/ elem) { +/*//NB6.0 List elementList = elem.getChildren(); for (Iterator iter = elementList.iterator(); iter.hasNext();) { Element childElement = (Element) iter.next(); @@ -145,7 +147,7 @@ if(newname != null) { lit.setValue(newname); } else{ - JavaModelPackage jmodel = + JavaModelPackage jmodel = (JavaModelPackage)retStmt.refImmediatePackage(); retStmt.setExpression(jmodel.getNullLiteral().createNullLiteral()); } @@ -154,6 +156,8 @@ } apply(childElement); } + return true; +//*/ return true; } } Index: visualweb/insync/src/org/netbeans/modules/visualweb/insync/java/JMIUtils.java =================================================================== RCS file: /cvs/visualweb/insync/src/org/netbeans/modules/visualweb/insync/java/JMIUtils.java,v retrieving revision 1.1 diff -u -u -r1.1 JMIUtils.java --- visualweb/insync/src/org/netbeans/modules/visualweb/insync/java/JMIUtils.java 28 Jan 2007 18:51:00 -0000 1.1 +++ visualweb/insync/src/org/netbeans/modules/visualweb/insync/java/JMIUtils.java 2 Feb 2007 22:45:04 -0000 @@ -21,15 +21,6 @@ import java.util.ArrayList; import java.util.List; -import org.netbeans.jmi.javamodel.ClassDefinition; -import org.netbeans.jmi.javamodel.JavaClass; -import org.netbeans.jmi.javamodel.MultipartId; -import org.netbeans.jmi.javamodel.Type; -import org.netbeans.jmi.javamodel.TypeClass; -import org.netbeans.jmi.javamodel.TypeReference; -import org.netbeans.modules.javacore.api.JavaModel; -import org.netbeans.modules.javacore.internalapi.JavaModelUtil; -import org.netbeans.jmi.javamodel.JavaModelPackage; /** * MDR Utility methods @@ -39,7 +30,8 @@ public class JMIUtils { //Adds import to the resource containing the java class - public static TypeReference addImport(JavaClass jCls, String typeName) { + public static Object/*TypeReference?*/ addImport(Object/*TypeElement or ClassType*/ jCls, String typeName) { +/*//NB6.0 assert isInsideTrans(); if(typeName != null && jCls != null) { JavaModelPackage jmodel = (JavaModelPackage)jCls.refImmediatePackage(); @@ -48,10 +40,13 @@ return typeRef; } return null; +//*/ + return null; } // Converts array of strings to a list of multipart id - public static List getParameters(JavaClass jCls, Class[] pts, String[] pns) { + public static List getParameters(Object/*TypeElement or ClassType*/ jCls, Class[] pts, String[] pns) { +/*//NB6.0 assert isInsideTrans(); JavaModelPackage jmodel = (JavaModelPackage)jCls.refImmediatePackage(); ArrayList l = new ArrayList(); @@ -61,10 +56,13 @@ l.add(id); } return l; +//*/ + return null; } // Check if java class is a sub type of a given type - static public boolean isSubTypeOf(JavaClass javaClass, String typeName) { + static public boolean isSubTypeOf(Object/*TypeElement or ClassType*/ javaClass, String typeName) { +/*//NB6.0 //assert isInsideTrans(); if(javaClass == null || typeName == null) return false; @@ -72,7 +70,7 @@ try { JavaModelPackage jmodel = (JavaModelPackage)javaClass.refImmediatePackage(); TypeClass tCls = jmodel.getType(); - + Type type = tCls.resolve(typeName); if(type instanceof ClassDefinition) { if(javaClass.isSubTypeOf((ClassDefinition)type)) @@ -82,17 +80,22 @@ JMIUtils.endTrans(); } return false; +//*/ + return false; } //Calculates FQN for a given multipard id. - static public String getFullName(MultipartId mid) { + static public String getFullName(Object/*IdentifierTree*/ mid) { +/*//NB6.0 if(mid == null) return null; String fullName = mid.getName(); if(mid.getParent() != null) return getFullName(mid.getParent()) + "." + fullName; return fullName; +//*/ + return null; } @@ -127,20 +130,24 @@ * @see org.netbeans.api.mdr.MDRepository#beginTrans(boolean) */ public static void beginTrans(boolean writeAccess) { +/*//NB6.0 JavaModel.getJavaRepository().beginTrans(writeAccess); transMonitor++; +//*/ } /** * @see org.netbeans.api.mdr.MDRepository#endTrans(boolean) */ public static void endTrans(boolean rollback) { +/*//NB6.0 try { assert transMonitor > 0; JavaModel.getJavaRepository().endTrans(rollback); } finally { transMonitor--; } +//*/ } /** Index: visualweb/insync/src/org/netbeans/modules/visualweb/insync/java/JavaClassAdapter.java =================================================================== RCS file: /cvs/visualweb/insync/src/org/netbeans/modules/visualweb/insync/java/JavaClassAdapter.java,v retrieving revision 1.1 diff -u -u -r1.1 JavaClassAdapter.java --- visualweb/insync/src/org/netbeans/modules/visualweb/insync/java/JavaClassAdapter.java 28 Jan 2007 18:51:00 -0000 1.1 +++ visualweb/insync/src/org/netbeans/modules/visualweb/insync/java/JavaClassAdapter.java 2 Feb 2007 22:45:04 -0000 @@ -25,20 +25,6 @@ import java.util.ArrayList; import java.util.Iterator; import java.util.List; -import org.netbeans.jmi.javamodel.CallableFeature; -import org.netbeans.jmi.javamodel.ClassDefinition; -import org.netbeans.jmi.javamodel.Constructor; -import org.netbeans.jmi.javamodel.Feature; -import org.netbeans.jmi.javamodel.JavaModelPackage; -import org.netbeans.jmi.javamodel.Method; -import org.netbeans.jmi.javamodel.Field; -import org.netbeans.jmi.javamodel.MultipartId; -import org.netbeans.jmi.javamodel.NewClassExpression; -import org.netbeans.jmi.javamodel.Parameter; -import org.netbeans.jmi.javamodel.Type; -import org.netbeans.jmi.javamodel.TypeClass; -import org.netbeans.jmi.javamodel.TypeReference; -import org.netbeans.modules.javacore.internalapi.JavaModelUtil; /** * @@ -46,14 +32,14 @@ */ public class JavaClassAdapter { - ClassDefinition javaClass; + Object/*TypeElement or ClassType*/ javaClass; JavaUnit javaUnit; private boolean debug = false; /** * Creates a new instance of JavaClassAdapter */ - public JavaClassAdapter(JavaUnit javaUnit, ClassDefinition javaClass) { + public JavaClassAdapter(JavaUnit javaUnit, Object/*TypeElement or ClassType*/ javaClass) { this.javaClass = javaClass; this.javaUnit = javaUnit; } @@ -61,23 +47,30 @@ /** * Creates a new instance of JavaClassAdapter */ - public JavaClassAdapter(ClassDefinition javaClass) { + public JavaClassAdapter(Object/*TypeElement or ClassType*/ javaClass) { this.javaClass = javaClass; } - private Type resolve(String name) { + private Object/*TypeElement or ClassType*/ resolve(String name) { +/*//NB6.0 JavaModelPackage jmodel = (JavaModelPackage)javaClass.refImmediatePackage(); TypeClass tCls = jmodel.getType(); return tCls.resolve(name); +//*/ + return null; } - public TypeReference resolveImportsForType(String typeName){ + public Object/*TypeElement?*/ resolveImportsForType(String typeName){ +/*//NB6.0 return JavaModelUtil.resolveImportsForType(javaClass, resolve(typeName)); +//*/ + return null; } public String getShortName() { +/*//NB6.0 JMIUtils.beginTrans(false); try { String typeName = javaClass.getName(); @@ -86,26 +79,39 @@ }finally { JMIUtils.endTrans(); } +//*/ + return null; } public String getName() { +/*//NB6.0 return javaClass.getName(); +//*/ + return null; } - public Method getMethod(String name, Class[] params) { + public Object/*ExecutableElement*/ getMethod(String name, Class[] params) { +/*//NB6.0 JMIUtils.beginTrans(false); try { return (Method)getCallableFeature(name, params); }finally { JMIUtils.endTrans(); } +//*/ + return null; } - public Field getField(String name) { + public Object/*VariableElement*/ getField(String name) { +/*//NB6.0 return javaClass.getField(name, false); + +//*/ + return null; } - private Method[] getMethods(String name, Class[] params, Class retType) { + private Object/*ExecutableElement*/[] getMethods(String name, Class[] params, Class retType) { +/*//NB6.0 JMIUtils.beginTrans(false); try { List methods = new ArrayList(); @@ -125,21 +131,24 @@ }finally { JMIUtils.endTrans(); } +//*/ + return null; } - public Method[] getMethods() { + public Object/*ExecutableElement*/[] getMethods() { return getMethods(null, null, null); } - public Method[] getMethods(String name) { + public Object/*ExecutableElement*/[] getMethods(String name) { return getMethods(name, null, null); } - public Method[] getMethods(Class[] params, Class retType) { + public Object/*ExecutableElement*/[] getMethods(Class[] params, Class retType) { return getMethods(null, params, retType); } - private CallableFeature getCallableFeature(String name, Class[] params) { + private Object/*ExecutableElement*/ getCallableFeature(String name, Class[] params) { +/*//NB6.0 assert JMIUtils.isInsideTrans(); List paramsList = new ArrayList(); for(int i = 0; params != null && i < params.length; i++) { @@ -150,9 +159,12 @@ return javaClass.getConstructor(paramsList, false); else return javaClass.getMethod(name, paramsList, false); +//*/ + return null; } - private CallableFeature getConstructor(Class[] params) { + private Object/*ExecutableElement ElementKind.CONSTRUCTOR*/ getConstructor(Class[] params) { +/*//NB6.0 assert JMIUtils.isInsideTrans(); List paramsList = new ArrayList(); for(int i = 0; params != null && i < params.length; i++) { @@ -160,18 +172,24 @@ paramsList.add(type); } return javaClass.getConstructor(paramsList, false); +//*/ + return null; } - private boolean matchType(Type type, Class cls) { + private boolean matchType(Object/*TypeElement or ClassType*/ type, Class cls) { +/*//NB6.0 assert JMIUtils.isInsideTrans(); if(cls.getName().equals(type.getName())) return true; - + + return false; +//*/ return false; } private boolean matchTypes(List list, Class[] params) { +/*//NB6.0 assert JMIUtils.isInsideTrans(); if(list.size() == params.length) { for(int i = 0; i < params.length; i++) { @@ -183,9 +201,12 @@ } else { return false; } +//*/ + return false; } public boolean isSubTypeOf(String typeName) { +/*//NB6.0 JMIUtils.beginTrans(false); try { Type type = resolve(typeName); @@ -197,24 +218,27 @@ }finally { JMIUtils.endTrans(); } +//*/ + return false; } - public Field addField(String name, Class beanClass) { + public Object/*VariableElement*/ addField(String name, Class beanClass) { return addField(name, beanClass, getConstructor(new Class[]{}), true); } - public Field addField(String name, Class beanClass, Feature f, boolean before) { + public Object/*VariableElement*/ addField(String name, Class beanClass, Object/*Element*/ f, boolean before) { +/*//NB6.0 assert JMIUtils.isInsideTrans(); String typeName = beanClass.getName(); String paramName = Naming.paramNames(new Class[] { beanClass }, null)[0]; - JavaModelPackage jmodel = + JavaModelPackage jmodel = (JavaModelPackage)javaClass.refImmediatePackage(); Field newField = jmodel.getField().createField(); - + TypeClass tCls = jmodel.getType(); Type type = tCls.resolve(typeName); TypeReference typeRef = resolveImportsForType(typeName); - + newField.setName(name); newField.setTypeName(typeRef); newField.setModifiers(Modifier.PRIVATE); @@ -223,49 +247,55 @@ newField.setInitialValue(newClsExpr); addFeature(newField, f, before); return newField; +//*/ + return null; } - public Method addGetter(String name, Class beanClass) { + public Object/*ExecutableElement ElementKind.METHOD*/ addGetter(String name, Class beanClass) { return addGetter(name, beanClass, getConstructor(new Class[]{}), true); } - public Method addGetter(String name, Class beanClass, Feature f, boolean before) { + public Object/*ExecutableElement ElementKind.METHOD*/ addGetter(String name, Class beanClass, Object/*Element*/ f, boolean before) { +/*//NB6.0 assert JMIUtils.isInsideTrans(); String typeName = beanClass.getName(); JavaModelPackage jmodel = (JavaModelPackage)javaClass.refImmediatePackage(); TypeClass tCls = jmodel.getType(); - + Type type = tCls.resolve(typeName); TypeReference typeRef = resolveImportsForType(typeName); - + Method newGetter = jmodel.getMethod().createMethod(); newGetter.setName(Naming.getterName(name)); newGetter.setTypeName(typeRef); newGetter.setModifiers( Modifier.PUBLIC ); newGetter.setBodyText( "return " + name + ";"); - + addFeature(newGetter, f, before); - + return newGetter; +//*/ + return null; } - public Method addSetter(String name, Class beanClass) { + public Object/*ExecutableElement ElementKind.METHOD*/ addSetter(String name, Class beanClass) { return addSetter(name, beanClass, getConstructor(new Class[]{}), true); } - public Method addSetter(String name, Class beanClass, Feature f, boolean before) { + public Object/*ExecutableElement ElementKind.METHOD*/ addSetter(String name, Class beanClass, Object/*Element*/ f, boolean before) { +/*//NB6.0 assert JMIUtils.isInsideTrans(); String typeName = beanClass.getName(); String paramName = Naming.paramNames(new Class[] { beanClass }, null)[0]; - - JavaModelPackage jmodel = + + JavaModelPackage jmodel = (JavaModelPackage)javaClass.refImmediatePackage(); TypeClass tCls = jmodel.getType(); - + Type type = tCls.resolve(typeName); TypeReference typeRef = resolveImportsForType(typeName); - + Method newSetter = jmodel.getMethod().createMethod(); newSetter.setName( Naming.setterName(name) ); newSetter.setType( tCls.resolve("void") ); @@ -275,12 +305,15 @@ param.setTypeName(typeRef); newSetter.getParameters().add(param); newSetter.setBodyText( "this." + name + " = " + paramName + ";"); - + addFeature(newSetter, f, before); return newSetter; +//*/ + return null; } - private void addFeature(Feature f, Feature pos, boolean before) { + private void addFeature(Object/*Element*/ f, Object/*Element*/ pos, boolean before) { +/*//NB6.0 if(pos != null) { int index = findFeatureIndex(pos); if(!before) @@ -292,9 +325,10 @@ else javaClass.getFeatures().add(0, f); } +//*/ } - public CallableFeature addMethod(ContextMethod cm) { + public Object/*ExecutableElement*/ addMethod(ContextMethod cm) { String retTypeName = "void"; if(cm.getReturnType() != null) { retTypeName = cm.getReturnType().getCanonicalName(); @@ -302,21 +336,22 @@ return addMethod(cm, retTypeName); } - public CallableFeature addMethod(MethodInfo mInfo) { + public Object/*ExecutableElement*/ addMethod(MethodInfo mInfo) { return addMethod(mInfo, mInfo.getReturnTypeName()); } - private CallableFeature addMethod(ContextMethod mInfo, String retTypeName) { + private Object/*ExecutableElement*/ addMethod(ContextMethod mInfo, String retTypeName) { +/*//NB6.0 assert JMIUtils.isInsideTrans(); log("Adding Method: " + mInfo.getName()); CallableFeature handler = null; handler = getCallableFeature(mInfo.getName(), mInfo.getParameterTypes()); if(handler != null)return handler; - + JavaModelPackage jmodel = (JavaModelPackage)javaClass.refImmediatePackage(); TypeClass tCls = jmodel.getType(); - + if(mInfo.getName().equals("")) { handler = jmodel.getConstructor().createConstructor(); } else { @@ -325,36 +360,39 @@ ((Method)handler).setTypeName(typeRef); handler.setName(mInfo.getName()); } - + List params = handler.getParameters(); Class pTypes[] = mInfo.getParameterTypes(); String pNames[] = mInfo.getParameterNames(); for (int i = 0 ; pTypes != null && i < pTypes.length; i++) { Type type = tCls.resolve(pTypes[i].getName()); - TypeReference typeRef = + TypeReference typeRef = JavaModelUtil.resolveImportsForType(javaClass, type); Parameter param = jmodel.getParameter().createParameter(); param.setName(pNames[i]);