This Bugzilla instance is a read-only archive of historic NetBeans bug reports. To report a bug in NetBeans please follow the project's instructions for reporting issues.

View | Details | Raw Unified | Return to bug 231604
Collapse All | Expand All

(-)a/j2ee.core.utilities/manifest.mf (-1 / +1 lines)
Lines 1-4 Link Here
1
Manifest-Version: 1.0
1
Manifest-Version: 1.0
2
OpenIDE-Module: org.netbeans.modules.j2ee.core.utilities/0
2
OpenIDE-Module: org.netbeans.modules.j2ee.core.utilities/0
3
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/j2ee/core/utilities/Bundle.properties
3
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/j2ee/core/utilities/Bundle.properties
4
OpenIDE-Module-Specification-Version: 1.24
4
OpenIDE-Module-Specification-Version: 1.25
(-)a/j2ee.core.utilities/nbproject/project.xml (+20 lines)
Lines 67-72 Link Here
67
                    </run-dependency>
67
                    </run-dependency>
68
                </dependency>
68
                </dependency>
69
                <dependency>
69
                <dependency>
70
                    <code-name-base>org.netbeans.modules.java.sourceui</code-name-base>
71
                    <build-prerequisite/>
72
                    <compile-dependency/>
73
                    <run-dependency>
74
                        <release-version>1</release-version>
75
                        <specification-version>1.33</specification-version>
76
                    </run-dependency>
77
                </dependency>
78
                <dependency>
70
                    <code-name-base>org.netbeans.modules.projectapi</code-name-base>
79
                    <code-name-base>org.netbeans.modules.projectapi</code-name-base>
71
                    <build-prerequisite/>
80
                    <build-prerequisite/>
72
                    <compile-dependency/>
81
                    <compile-dependency/>
Lines 93-98 Link Here
93
                    </run-dependency>
102
                    </run-dependency>
94
                </dependency>
103
                </dependency>
95
                <dependency>
104
                <dependency>
105
                    <code-name-base>org.openide.awt</code-name-base>
106
                    <build-prerequisite/>
107
                    <compile-dependency/>
108
                    <run-dependency>
109
                        <specification-version>7.59</specification-version>
110
                    </run-dependency>
111
                </dependency>
112
                <dependency>
96
                    <code-name-base>org.openide.dialogs</code-name-base>
113
                    <code-name-base>org.openide.dialogs</code-name-base>
97
                    <build-prerequisite/>
114
                    <build-prerequisite/>
98
                    <compile-dependency/>
115
                    <compile-dependency/>
Lines 202-212 Link Here
202
                <friend>org.netbeans.modules.web.project</friend>
219
                <friend>org.netbeans.modules.web.project</friend>
203
                <friend>org.netbeans.modules.web.refactoring</friend>
220
                <friend>org.netbeans.modules.web.refactoring</friend>
204
                <friend>org.netbeans.modules.websocket</friend>
221
                <friend>org.netbeans.modules.websocket</friend>
222
                <friend>org.netbeans.modules.websvc.core</friend>
223
                <friend>org.netbeans.modules.websvc.jaxrpc</friend>
205
                <friend>org.netbeans.modules.websvc.rest</friend>
224
                <friend>org.netbeans.modules.websvc.rest</friend>
206
                <friend>org.netbeans.modules.websvc.wsitconf</friend>
225
                <friend>org.netbeans.modules.websvc.wsitconf</friend>
207
                <package>org.netbeans.modules.j2ee.core.api.support</package>
226
                <package>org.netbeans.modules.j2ee.core.api.support</package>
208
                <package>org.netbeans.modules.j2ee.core.api.support.classpath</package>
227
                <package>org.netbeans.modules.j2ee.core.api.support.classpath</package>
209
                <package>org.netbeans.modules.j2ee.core.api.support.java</package>
228
                <package>org.netbeans.modules.j2ee.core.api.support.java</package>
229
                <package>org.netbeans.modules.j2ee.core.api.support.java.method</package>
210
                <package>org.netbeans.modules.j2ee.core.api.support.progress</package>
230
                <package>org.netbeans.modules.j2ee.core.api.support.progress</package>
211
                <package>org.netbeans.modules.j2ee.core.api.support.wizard</package>
231
                <package>org.netbeans.modules.j2ee.core.api.support.wizard</package>
212
            </friend-packages>
232
            </friend-packages>
(-)a/j2ee.ejbcore/manifest.mf (-1 / +1 lines)
Lines 3-7 Link Here
3
OpenIDE-Module-Layer: org/netbeans/modules/j2ee/ejbcore/resources/layer.xml
3
OpenIDE-Module-Layer: org/netbeans/modules/j2ee/ejbcore/resources/layer.xml
4
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/j2ee/ejbcore/Bundle.properties
4
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/j2ee/ejbcore/Bundle.properties
5
OpenIDE-Module-Needs: javax.script.ScriptEngine.freemarker
5
OpenIDE-Module-Needs: javax.script.ScriptEngine.freemarker
6
OpenIDE-Module-Specification-Version: 1.41
6
OpenIDE-Module-Specification-Version: 1.42
7
AutoUpdate-Show-In-Client: false
7
AutoUpdate-Show-In-Client: false
(-)a/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/Utils.java (-2 / +2 lines)
Lines 55-62 Link Here
55
import org.netbeans.api.project.ui.OpenProjects;
55
import org.netbeans.api.project.ui.OpenProjects;
56
import org.netbeans.modules.j2ee.api.ejbjar.EjbJar;
56
import org.netbeans.modules.j2ee.api.ejbjar.EjbJar;
57
import org.netbeans.modules.j2ee.api.ejbjar.EjbReference;
57
import org.netbeans.modules.j2ee.api.ejbjar.EjbReference;
58
import org.netbeans.modules.j2ee.common.method.MethodModel;
58
import org.netbeans.modules.j2ee.core.api.support.java.method.MethodModel;
59
import org.netbeans.modules.j2ee.common.method.MethodModelSupport;
59
import org.netbeans.modules.j2ee.core.api.support.java.method.MethodModelSupport;
60
import org.netbeans.modules.j2ee.dd.api.ejb.Session;
60
import org.netbeans.modules.j2ee.dd.api.ejb.Session;
61
import org.netbeans.modules.j2ee.deployment.devmodules.api.J2eeModule;
61
import org.netbeans.modules.j2ee.deployment.devmodules.api.J2eeModule;
62
import org.netbeans.modules.j2ee.deployment.devmodules.api.J2eeModule.Type;
62
import org.netbeans.modules.j2ee.deployment.devmodules.api.J2eeModule.Type;
(-)a/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/action/AbstractMethodGenerator.java (-2 / +2 lines)
Lines 59-66 Link Here
59
import org.netbeans.api.java.source.JavaSource;
59
import org.netbeans.api.java.source.JavaSource;
60
import org.netbeans.api.java.source.Task;
60
import org.netbeans.api.java.source.Task;
61
import org.netbeans.api.java.source.WorkingCopy;
61
import org.netbeans.api.java.source.WorkingCopy;
62
import org.netbeans.modules.j2ee.common.method.MethodModel;
62
import org.netbeans.modules.j2ee.core.api.support.java.method.MethodModel;
63
import org.netbeans.modules.j2ee.common.method.MethodModelSupport;
63
import org.netbeans.modules.j2ee.core.api.support.java.method.MethodModelSupport;
64
import org.netbeans.modules.j2ee.dd.api.ejb.DDProvider;
64
import org.netbeans.modules.j2ee.dd.api.ejb.DDProvider;
65
import org.netbeans.modules.j2ee.dd.api.ejb.EjbJar;
65
import org.netbeans.modules.j2ee.dd.api.ejb.EjbJar;
66
import org.netbeans.modules.j2ee.dd.api.ejb.EjbJarMetadata;
66
import org.netbeans.modules.j2ee.dd.api.ejb.EjbJarMetadata;
(-)a/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/action/BusinessMethodGenerator.java (-1 / +1 lines)
Lines 58-64 Link Here
58
import org.netbeans.api.java.source.JavaSource;
58
import org.netbeans.api.java.source.JavaSource;
59
import org.netbeans.api.java.source.Task;
59
import org.netbeans.api.java.source.Task;
60
import org.netbeans.modules.j2ee.api.ejbjar.EjbJar;
60
import org.netbeans.modules.j2ee.api.ejbjar.EjbJar;
61
import org.netbeans.modules.j2ee.common.method.MethodModel;
61
import org.netbeans.modules.j2ee.core.api.support.java.method.MethodModel;
62
import org.netbeans.modules.j2ee.dd.api.ejb.EjbJarMetadata;
62
import org.netbeans.modules.j2ee.dd.api.ejb.EjbJarMetadata;
63
import org.netbeans.modules.j2ee.dd.api.ejb.EntityAndSession;
63
import org.netbeans.modules.j2ee.dd.api.ejb.EntityAndSession;
64
import org.netbeans.modules.j2ee.metadata.model.api.MetadataModel;
64
import org.netbeans.modules.j2ee.metadata.model.api.MetadataModel;
(-)a/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/action/CmFieldGenerator.java (-2 / +2 lines)
Lines 60-67 Link Here
60
import org.netbeans.api.java.source.JavaSource;
60
import org.netbeans.api.java.source.JavaSource;
61
import org.netbeans.api.java.source.Task;
61
import org.netbeans.api.java.source.Task;
62
import org.netbeans.api.java.source.WorkingCopy;
62
import org.netbeans.api.java.source.WorkingCopy;
63
import org.netbeans.modules.j2ee.common.method.MethodModel;
63
import org.netbeans.modules.j2ee.core.api.support.java.method.MethodModel;
64
import org.netbeans.modules.j2ee.common.method.MethodModelSupport;
64
import org.netbeans.modules.j2ee.core.api.support.java.method.MethodModelSupport;
65
import org.netbeans.modules.j2ee.dd.api.ejb.CmpField;
65
import org.netbeans.modules.j2ee.dd.api.ejb.CmpField;
66
import org.netbeans.modules.j2ee.dd.api.ejb.DDProvider;
66
import org.netbeans.modules.j2ee.dd.api.ejb.DDProvider;
67
import org.netbeans.modules.j2ee.dd.api.ejb.EjbJar;
67
import org.netbeans.modules.j2ee.dd.api.ejb.EjbJar;
(-)a/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/action/CreateMethodGenerator.java (-1 / +1 lines)
Lines 51-57 Link Here
51
import java.util.List;
51
import java.util.List;
52
import java.util.Map;
52
import java.util.Map;
53
import javax.lang.model.element.Modifier;
53
import javax.lang.model.element.Modifier;
54
import org.netbeans.modules.j2ee.common.method.MethodModel;
54
import org.netbeans.modules.j2ee.core.api.support.java.method.MethodModel;
55
import org.netbeans.modules.j2ee.dd.api.ejb.Ejb;
55
import org.netbeans.modules.j2ee.dd.api.ejb.Ejb;
56
import org.netbeans.modules.j2ee.dd.api.ejb.EjbJarMetadata;
56
import org.netbeans.modules.j2ee.dd.api.ejb.EjbJarMetadata;
57
import org.netbeans.modules.j2ee.dd.api.ejb.EnterpriseBeans;
57
import org.netbeans.modules.j2ee.dd.api.ejb.EnterpriseBeans;
(-)a/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/action/FinderMethodGenerator.java (-1 / +1 lines)
Lines 50-56 Link Here
50
import java.util.List;
50
import java.util.List;
51
import java.util.Map;
51
import java.util.Map;
52
import javax.lang.model.element.Modifier;
52
import javax.lang.model.element.Modifier;
53
import org.netbeans.modules.j2ee.common.method.MethodModel;
53
import org.netbeans.modules.j2ee.core.api.support.java.method.MethodModel;
54
import org.netbeans.modules.j2ee.dd.api.ejb.DDProvider;
54
import org.netbeans.modules.j2ee.dd.api.ejb.DDProvider;
55
import org.netbeans.modules.j2ee.dd.api.ejb.EjbJar;
55
import org.netbeans.modules.j2ee.dd.api.ejb.EjbJar;
56
import org.netbeans.modules.j2ee.dd.api.ejb.EjbJarMetadata;
56
import org.netbeans.modules.j2ee.dd.api.ejb.EjbJarMetadata;
(-)a/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/action/HomeMethodGenerator.java (-1 / +1 lines)
Lines 50-56 Link Here
50
import java.util.List;
50
import java.util.List;
51
import java.util.Map;
51
import java.util.Map;
52
import javax.lang.model.element.Modifier;
52
import javax.lang.model.element.Modifier;
53
import org.netbeans.modules.j2ee.common.method.MethodModel;
53
import org.netbeans.modules.j2ee.core.api.support.java.method.MethodModel;
54
import org.netbeans.modules.j2ee.dd.api.ejb.EntityAndSession;
54
import org.netbeans.modules.j2ee.dd.api.ejb.EntityAndSession;
55
import org.netbeans.modules.j2ee.ejbcore.util._RetoucheUtil;
55
import org.netbeans.modules.j2ee.ejbcore.util._RetoucheUtil;
56
import org.openide.filesystems.FileObject;
56
import org.openide.filesystems.FileObject;
(-)a/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/action/SelectMethodGenerator.java (-1 / +1 lines)
Lines 50-56 Link Here
50
import java.util.List;
50
import java.util.List;
51
import java.util.Set;
51
import java.util.Set;
52
import javax.lang.model.element.Modifier;
52
import javax.lang.model.element.Modifier;
53
import org.netbeans.modules.j2ee.common.method.MethodModel;
53
import org.netbeans.modules.j2ee.core.api.support.java.method.MethodModel;
54
import org.netbeans.modules.j2ee.dd.api.ejb.DDProvider;
54
import org.netbeans.modules.j2ee.dd.api.ejb.DDProvider;
55
import org.netbeans.modules.j2ee.dd.api.ejb.EjbJar;
55
import org.netbeans.modules.j2ee.dd.api.ejb.EjbJar;
56
import org.netbeans.modules.j2ee.dd.api.ejb.EnterpriseBeans;
56
import org.netbeans.modules.j2ee.dd.api.ejb.EnterpriseBeans;
(-)a/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/action/SendJMSGenerator.java (-2 / +2 lines)
Lines 74-81 Link Here
74
import org.netbeans.modules.j2ee.api.ejbjar.MessageDestinationReference;
74
import org.netbeans.modules.j2ee.api.ejbjar.MessageDestinationReference;
75
import org.netbeans.modules.j2ee.api.ejbjar.ResourceReference;
75
import org.netbeans.modules.j2ee.api.ejbjar.ResourceReference;
76
import org.netbeans.modules.j2ee.common.J2eeProjectCapabilities;
76
import org.netbeans.modules.j2ee.common.J2eeProjectCapabilities;
77
import org.netbeans.modules.j2ee.common.method.MethodModel;
77
import org.netbeans.modules.j2ee.core.api.support.java.method.MethodModel;
78
import org.netbeans.modules.j2ee.common.method.MethodModelSupport;
78
import org.netbeans.modules.j2ee.core.api.support.java.method.MethodModelSupport;
79
import org.netbeans.modules.javaee.injection.api.InjectionTargetQuery;
79
import org.netbeans.modules.javaee.injection.api.InjectionTargetQuery;
80
import org.netbeans.modules.j2ee.core.api.support.classpath.ContainerClassPathModifier;
80
import org.netbeans.modules.j2ee.core.api.support.classpath.ContainerClassPathModifier;
81
import org.netbeans.modules.j2ee.core.api.support.java.GenerationUtils;
81
import org.netbeans.modules.j2ee.core.api.support.java.GenerationUtils;
(-)a/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/action/UseDatabaseGenerator.java (-2 / +2 lines)
Lines 63-70 Link Here
63
import org.netbeans.modules.j2ee.api.ejbjar.EnterpriseReferenceContainer;
63
import org.netbeans.modules.j2ee.api.ejbjar.EnterpriseReferenceContainer;
64
import org.netbeans.modules.j2ee.api.ejbjar.ResourceReference;
64
import org.netbeans.modules.j2ee.api.ejbjar.ResourceReference;
65
import org.netbeans.modules.j2ee.common.Util;
65
import org.netbeans.modules.j2ee.common.Util;
66
import org.netbeans.modules.j2ee.common.method.MethodModel;
66
import org.netbeans.modules.j2ee.core.api.support.java.method.MethodModel;
67
import org.netbeans.modules.j2ee.common.method.MethodModelSupport;
67
import org.netbeans.modules.j2ee.core.api.support.java.method.MethodModelSupport;
68
import org.netbeans.modules.javaee.injection.api.InjectionTargetQuery;
68
import org.netbeans.modules.javaee.injection.api.InjectionTargetQuery;
69
import org.netbeans.modules.j2ee.dd.api.common.ResourceRef;
69
import org.netbeans.modules.j2ee.dd.api.common.ResourceRef;
70
import org.netbeans.modules.j2ee.dd.api.ejb.EnterpriseBeans;
70
import org.netbeans.modules.j2ee.dd.api.ejb.EnterpriseBeans;
(-)a/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/api/codegeneration/CallEjbGenerator.java (-2 / +2 lines)
Lines 72-79 Link Here
72
import org.netbeans.modules.j2ee.api.ejbjar.EnterpriseReferenceContainer;
72
import org.netbeans.modules.j2ee.api.ejbjar.EnterpriseReferenceContainer;
73
import org.netbeans.modules.j2ee.common.J2eeProjectCapabilities;
73
import org.netbeans.modules.j2ee.common.J2eeProjectCapabilities;
74
import org.netbeans.modules.j2ee.common.Util;
74
import org.netbeans.modules.j2ee.common.Util;
75
import org.netbeans.modules.j2ee.common.method.MethodModel;
75
import org.netbeans.modules.j2ee.core.api.support.java.method.MethodModel;
76
import org.netbeans.modules.j2ee.common.method.MethodModelSupport;
76
import org.netbeans.modules.j2ee.core.api.support.java.method.MethodModelSupport;
77
import org.netbeans.modules.javaee.injection.api.InjectionTargetQuery;
77
import org.netbeans.modules.javaee.injection.api.InjectionTargetQuery;
78
import org.netbeans.modules.j2ee.core.api.support.classpath.ContainerClassPathModifier;
78
import org.netbeans.modules.j2ee.core.api.support.classpath.ContainerClassPathModifier;
79
import org.netbeans.modules.j2ee.core.api.support.java.GenerationUtils;
79
import org.netbeans.modules.j2ee.core.api.support.java.GenerationUtils;
(-)a/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/api/codegeneration/SessionGenerator.java (-1 / +1 lines)
Lines 67-73 Link Here
67
import org.netbeans.api.project.libraries.Library;
67
import org.netbeans.api.project.libraries.Library;
68
import org.netbeans.api.project.libraries.LibraryManager;
68
import org.netbeans.api.project.libraries.LibraryManager;
69
import org.netbeans.modules.j2ee.common.J2eeProjectCapabilities;
69
import org.netbeans.modules.j2ee.common.J2eeProjectCapabilities;
70
import org.netbeans.modules.j2ee.common.method.MethodModel;
70
import org.netbeans.modules.j2ee.core.api.support.java.method.MethodModel;
71
import org.netbeans.modules.j2ee.dd.api.ejb.AssemblyDescriptor;
71
import org.netbeans.modules.j2ee.dd.api.ejb.AssemblyDescriptor;
72
import org.netbeans.modules.j2ee.dd.api.ejb.ContainerTransaction;
72
import org.netbeans.modules.j2ee.dd.api.ejb.ContainerTransaction;
73
import org.netbeans.modules.j2ee.ejbcore.action.BusinessMethodGenerator;
73
import org.netbeans.modules.j2ee.ejbcore.action.BusinessMethodGenerator;
(-)a/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/api/methodcontroller/AbstractMethodController.java (-2 / +2 lines)
Lines 44-51 Link Here
44
package org.netbeans.modules.j2ee.ejbcore.api.methodcontroller;
44
package org.netbeans.modules.j2ee.ejbcore.api.methodcontroller;
45
45
46
import javax.lang.model.type.DeclaredType;
46
import javax.lang.model.type.DeclaredType;
47
import org.netbeans.modules.j2ee.common.method.MethodModelSupport;
47
import org.netbeans.modules.j2ee.core.api.support.java.method.MethodModelSupport;
48
import org.netbeans.modules.j2ee.common.method.MethodModel;
48
import org.netbeans.modules.j2ee.core.api.support.java.method.MethodModel;
49
import com.sun.source.tree.ClassTree;
49
import com.sun.source.tree.ClassTree;
50
import com.sun.source.tree.MethodTree;
50
import com.sun.source.tree.MethodTree;
51
import com.sun.source.util.Trees;
51
import com.sun.source.util.Trees;
(-)a/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/api/methodcontroller/EjbMethodController.java (-1 / +1 lines)
Lines 50-56 Link Here
50
import org.netbeans.api.project.FileOwnerQuery;
50
import org.netbeans.api.project.FileOwnerQuery;
51
import org.netbeans.api.project.Project;
51
import org.netbeans.api.project.Project;
52
import org.netbeans.modules.j2ee.common.J2eeProjectCapabilities;
52
import org.netbeans.modules.j2ee.common.J2eeProjectCapabilities;
53
import org.netbeans.modules.j2ee.common.method.MethodModel;
53
import org.netbeans.modules.j2ee.core.api.support.java.method.MethodModel;
54
import org.netbeans.modules.j2ee.dd.api.ejb.Ejb;
54
import org.netbeans.modules.j2ee.dd.api.ejb.Ejb;
55
import org.netbeans.modules.j2ee.dd.api.ejb.EjbJarMetadata;
55
import org.netbeans.modules.j2ee.dd.api.ejb.EjbJarMetadata;
56
import org.netbeans.modules.j2ee.dd.api.ejb.Entity;
56
import org.netbeans.modules.j2ee.dd.api.ejb.Entity;
(-)a/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/api/methodcontroller/EntityGenerateFromImplVisitor.java (-1 / +1 lines)
Lines 45-51 Link Here
45
45
46
import java.util.Collection;
46
import java.util.Collection;
47
import java.util.Set;
47
import java.util.Set;
48
import org.netbeans.modules.j2ee.common.method.MethodModel;
48
import org.netbeans.modules.j2ee.core.api.support.java.method.MethodModel;
49
import org.netbeans.modules.j2ee.ejbcore.api.methodcontroller.MethodType.BusinessMethodType;
49
import org.netbeans.modules.j2ee.ejbcore.api.methodcontroller.MethodType.BusinessMethodType;
50
import org.netbeans.modules.j2ee.ejbcore.api.methodcontroller.MethodType.CreateMethodType;
50
import org.netbeans.modules.j2ee.ejbcore.api.methodcontroller.MethodType.CreateMethodType;
51
import org.netbeans.modules.j2ee.ejbcore.api.methodcontroller.MethodType.FinderMethodType;
51
import org.netbeans.modules.j2ee.ejbcore.api.methodcontroller.MethodType.FinderMethodType;
(-)a/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/api/methodcontroller/EntityGenerateFromIntfVisitor.java (-1 / +1 lines)
Lines 51-57 Link Here
51
import org.netbeans.api.java.source.JavaSource;
51
import org.netbeans.api.java.source.JavaSource;
52
import org.netbeans.api.java.source.JavaSource.Phase;
52
import org.netbeans.api.java.source.JavaSource.Phase;
53
import org.netbeans.api.java.source.Task;
53
import org.netbeans.api.java.source.Task;
54
import org.netbeans.modules.j2ee.common.method.MethodModel;
54
import org.netbeans.modules.j2ee.core.api.support.java.method.MethodModel;
55
import org.netbeans.modules.j2ee.dd.api.ejb.EjbJarMetadata;
55
import org.netbeans.modules.j2ee.dd.api.ejb.EjbJarMetadata;
56
import org.netbeans.modules.j2ee.dd.api.ejb.Entity;
56
import org.netbeans.modules.j2ee.dd.api.ejb.Entity;
57
import org.netbeans.modules.j2ee.ejbcore.Utils;
57
import org.netbeans.modules.j2ee.ejbcore.Utils;
(-)a/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/api/methodcontroller/EntityMethodController.java (-1 / +1 lines)
Lines 44-50 Link Here
44
44
45
package org.netbeans.modules.j2ee.ejbcore.api.methodcontroller;
45
package org.netbeans.modules.j2ee.ejbcore.api.methodcontroller;
46
46
47
import org.netbeans.modules.j2ee.common.method.MethodModel;
47
import org.netbeans.modules.j2ee.core.api.support.java.method.MethodModel;
48
import java.io.IOException;
48
import java.io.IOException;
49
import java.rmi.RemoteException;
49
import java.rmi.RemoteException;
50
import java.util.Collections;
50
import java.util.Collections;
(-)a/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/api/methodcontroller/MethodType.java (-1 / +1 lines)
Lines 44-50 Link Here
44
44
45
package org.netbeans.modules.j2ee.ejbcore.api.methodcontroller;
45
package org.netbeans.modules.j2ee.ejbcore.api.methodcontroller;
46
46
47
import org.netbeans.modules.j2ee.common.method.MethodModel;
47
import org.netbeans.modules.j2ee.core.api.support.java.method.MethodModel;
48
48
49
/**
49
/**
50
 * Provide simple instance of the visitor pattern to use for code generation.
50
 * Provide simple instance of the visitor pattern to use for code generation.
(-)a/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/api/methodcontroller/SessionGenerateFromImplVisitor.java (-1 / +1 lines)
Lines 45-51 Link Here
45
45
46
import java.util.Collections;
46
import java.util.Collections;
47
import javax.lang.model.element.Modifier;
47
import javax.lang.model.element.Modifier;
48
import org.netbeans.modules.j2ee.common.method.MethodModel;
48
import org.netbeans.modules.j2ee.core.api.support.java.method.MethodModel;
49
import org.netbeans.modules.j2ee.ejbcore.api.methodcontroller.MethodType.BusinessMethodType;
49
import org.netbeans.modules.j2ee.ejbcore.api.methodcontroller.MethodType.BusinessMethodType;
50
import org.netbeans.modules.j2ee.ejbcore.api.methodcontroller.MethodType.CreateMethodType;
50
import org.netbeans.modules.j2ee.ejbcore.api.methodcontroller.MethodType.CreateMethodType;
51
import org.netbeans.modules.j2ee.ejbcore.api.methodcontroller.MethodType.FinderMethodType;
51
import org.netbeans.modules.j2ee.ejbcore.api.methodcontroller.MethodType.FinderMethodType;
(-)a/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/api/methodcontroller/SessionGenerateFromIntfVisitor.java (-1 / +1 lines)
Lines 45-51 Link Here
45
45
46
import java.util.Collections;
46
import java.util.Collections;
47
import javax.lang.model.element.Modifier;
47
import javax.lang.model.element.Modifier;
48
import org.netbeans.modules.j2ee.common.method.MethodModel;
48
import org.netbeans.modules.j2ee.core.api.support.java.method.MethodModel;
49
import org.netbeans.modules.j2ee.ejbcore.api.methodcontroller.MethodType.BusinessMethodType;
49
import org.netbeans.modules.j2ee.ejbcore.api.methodcontroller.MethodType.BusinessMethodType;
50
import org.netbeans.modules.j2ee.ejbcore.api.methodcontroller.MethodType.CreateMethodType;
50
import org.netbeans.modules.j2ee.ejbcore.api.methodcontroller.MethodType.CreateMethodType;
51
import org.netbeans.modules.j2ee.ejbcore.api.methodcontroller.MethodType.FinderMethodType;
51
import org.netbeans.modules.j2ee.ejbcore.api.methodcontroller.MethodType.FinderMethodType;
(-)a/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/api/methodcontroller/SessionMethodController.java (-1 / +1 lines)
Lines 45-51 Link Here
45
package org.netbeans.modules.j2ee.ejbcore.api.methodcontroller;
45
package org.netbeans.modules.j2ee.ejbcore.api.methodcontroller;
46
46
47
import java.io.IOException;
47
import java.io.IOException;
48
import org.netbeans.modules.j2ee.common.method.MethodModel;
48
import org.netbeans.modules.j2ee.core.api.support.java.method.MethodModel;
49
import org.netbeans.modules.j2ee.dd.api.ejb.EjbJarMetadata;
49
import org.netbeans.modules.j2ee.dd.api.ejb.EjbJarMetadata;
50
import org.netbeans.modules.j2ee.dd.api.ejb.Session;
50
import org.netbeans.modules.j2ee.dd.api.ejb.Session;
51
import org.netbeans.modules.j2ee.metadata.model.api.MetadataModel;
51
import org.netbeans.modules.j2ee.metadata.model.api.MetadataModel;
(-)a/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/api/ui/CallEjb.java (-5 lines)
Lines 45-51 Link Here
45
package org.netbeans.modules.j2ee.ejbcore.api.ui;
45
package org.netbeans.modules.j2ee.ejbcore.api.ui;
46
46
47
import java.io.IOException;
47
import java.io.IOException;
48
import org.netbeans.modules.j2ee.ejbcore.ui.logicalview.ejb.action.AddCmpFieldAction;
49
import org.netbeans.modules.j2ee.ejbcore.ui.logicalview.ejb.action.AddFinderMethodStrategy;
48
import org.netbeans.modules.j2ee.ejbcore.ui.logicalview.ejb.action.AddFinderMethodStrategy;
50
import org.netbeans.modules.j2ee.ejbcore.ui.logicalview.ejb.action.AddSelectMethodStrategy;
49
import org.netbeans.modules.j2ee.ejbcore.ui.logicalview.ejb.action.AddSelectMethodStrategy;
51
import org.netbeans.modules.j2ee.ejbcore.ui.logicalview.entries.CallEjbDialog;
50
import org.netbeans.modules.j2ee.ejbcore.ui.logicalview.entries.CallEjbDialog;
Lines 67-76 Link Here
67
        }
66
        }
68
    }
67
    }
69
    
68
    
70
    public static boolean addCmpField(FileObject fileObject, String className, FileObject ddFile) {
71
        return AddCmpFieldAction.addCmpField(fileObject, className, ddFile);
72
    }
73
    
74
    public static void addFinderMethod(FileObject fileObject, String beanClass) throws IOException {
69
    public static void addFinderMethod(FileObject fileObject, String beanClass) throws IOException {
75
        new AddFinderMethodStrategy().addMethod(fileObject, beanClass);
70
        new AddFinderMethodStrategy().addMethod(fileObject, beanClass);
76
    }
71
    }
(-)a/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ejb/wizard/cmp/CmpFromDbGenerator.java (-1 / +1 lines)
Lines 60-66 Link Here
60
import java.util.List;
60
import java.util.List;
61
import javax.lang.model.element.Modifier;
61
import javax.lang.model.element.Modifier;
62
import org.netbeans.api.db.explorer.DatabaseConnection;
62
import org.netbeans.api.db.explorer.DatabaseConnection;
63
import org.netbeans.modules.j2ee.common.method.MethodModel;
63
import org.netbeans.modules.j2ee.core.api.support.java.method.MethodModel;
64
import org.netbeans.modules.j2ee.dd.api.ejb.CmrField;
64
import org.netbeans.modules.j2ee.dd.api.ejb.CmrField;
65
import org.netbeans.modules.j2ee.dd.api.ejb.EjbRelation;
65
import org.netbeans.modules.j2ee.dd.api.ejb.EjbRelation;
66
import org.netbeans.modules.j2ee.dd.api.ejb.EjbRelationshipRole;
66
import org.netbeans.modules.j2ee.dd.api.ejb.EjbRelationshipRole;
(-)a/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ui/logicalview/ejb/action/AbstractAddMethodStrategy.java (-6 / +2 lines)
Lines 45-66 Link Here
45
package org.netbeans.modules.j2ee.ejbcore.ui.logicalview.ejb.action;
45
package org.netbeans.modules.j2ee.ejbcore.ui.logicalview.ejb.action;
46
46
47
import java.io.IOException;
47
import java.io.IOException;
48
import java.security.Policy;
49
import java.util.List;
50
import javax.lang.model.element.TypeElement;
48
import javax.lang.model.element.TypeElement;
51
import javax.lang.model.type.TypeMirror;
52
import org.netbeans.api.java.source.CompilationController;
49
import org.netbeans.api.java.source.CompilationController;
53
import org.netbeans.api.java.source.ui.ScanDialog;
50
import org.netbeans.api.java.source.ui.ScanDialog;
54
import org.netbeans.modules.j2ee.api.ejbjar.EjbJar;
51
import org.netbeans.modules.j2ee.api.ejbjar.EjbJar;
55
import org.netbeans.modules.j2ee.common.method.MethodCustomizer;
52
import org.netbeans.modules.j2ee.core.api.support.java.method.MethodCustomizer;
56
import org.netbeans.modules.j2ee.common.method.MethodModel;
53
import org.netbeans.modules.j2ee.core.api.support.java.method.MethodModel;
57
import org.netbeans.modules.j2ee.ejbcore.api.methodcontroller.MethodType;
54
import org.netbeans.modules.j2ee.ejbcore.api.methodcontroller.MethodType;
58
import org.netbeans.modules.j2ee.ejbcore.ui.logicalview.ejb.shared.MethodsNode;
55
import org.netbeans.modules.j2ee.ejbcore.ui.logicalview.ejb.shared.MethodsNode;
59
import org.openide.filesystems.FileObject;
56
import org.openide.filesystems.FileObject;
60
import org.openide.nodes.Node;
57
import org.openide.nodes.Node;
61
import org.openide.util.Exceptions;
58
import org.openide.util.Exceptions;
62
import org.openide.util.Lookup;
59
import org.openide.util.Lookup;
63
import org.openide.util.NbBundle;
64
import org.openide.util.Parameters;
60
import org.openide.util.Parameters;
65
import org.openide.util.Utilities;
61
import org.openide.util.Utilities;
66
62
(-)a/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ui/logicalview/ejb/action/AddActionGroup.java (-2 / +1 lines)
Lines 66-73 Link Here
66
            new AddCreateMethodAction(NbBundle.getMessage(AddActionGroup.class, "LBL_CreateMethodAction")),
66
            new AddCreateMethodAction(NbBundle.getMessage(AddActionGroup.class, "LBL_CreateMethodAction")),
67
            new AddFinderMethodAction(NbBundle.getMessage(AddActionGroup.class, "LBL_FinderMethodAction")),
67
            new AddFinderMethodAction(NbBundle.getMessage(AddActionGroup.class, "LBL_FinderMethodAction")),
68
            new AddHomeMethodAction(NbBundle.getMessage(AddActionGroup.class, "LBL_HomeMethodAction")),
68
            new AddHomeMethodAction(NbBundle.getMessage(AddActionGroup.class, "LBL_HomeMethodAction")),
69
            new AddSelectMethodAction(NbBundle.getMessage(AddActionGroup.class, "LBL_SelectMethodAction")),
69
            new AddSelectMethodAction(NbBundle.getMessage(AddActionGroup.class, "LBL_SelectMethodAction"))
70
            SystemAction.get(AddCmpFieldAction.class)
71
        };
70
        };
72
    }
71
    }
73
    
72
    
(-)a/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ui/logicalview/ejb/action/AddBusinessMethodStrategy.java (-3 / +3 lines)
Lines 59-67 Link Here
59
import org.netbeans.api.java.source.JavaSource;
59
import org.netbeans.api.java.source.JavaSource;
60
import org.netbeans.api.java.source.Task;
60
import org.netbeans.api.java.source.Task;
61
import org.netbeans.modules.j2ee.api.ejbjar.EjbJar;
61
import org.netbeans.modules.j2ee.api.ejbjar.EjbJar;
62
import org.netbeans.modules.j2ee.common.method.MethodCustomizerFactory;
62
import org.netbeans.modules.j2ee.core.api.support.java.method.MethodCustomizerFactory;
63
import org.netbeans.modules.j2ee.common.method.MethodCustomizer;
63
import org.netbeans.modules.j2ee.core.api.support.java.method.MethodCustomizer;
64
import org.netbeans.modules.j2ee.common.method.MethodModel;
64
import org.netbeans.modules.j2ee.core.api.support.java.method.MethodModel;
65
import org.netbeans.modules.j2ee.dd.api.ejb.Ejb;
65
import org.netbeans.modules.j2ee.dd.api.ejb.Ejb;
66
import org.netbeans.modules.j2ee.dd.api.ejb.EjbJarMetadata;
66
import org.netbeans.modules.j2ee.dd.api.ejb.EjbJarMetadata;
67
import org.netbeans.modules.j2ee.dd.api.ejb.Entity;
67
import org.netbeans.modules.j2ee.dd.api.ejb.Entity;
(-)a/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ui/logicalview/ejb/action/AddCmpFieldAction.java (-193 lines)
Lines 1-193 Link Here
1
/*
2
 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
3
 *
4
 * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
5
 *
6
 * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
7
 * Other names may be trademarks of their respective owners.
8
 *
9
 * The contents of this file are subject to the terms of either the GNU
10
 * General Public License Version 2 only ("GPL") or the Common
11
 * Development and Distribution License("CDDL") (collectively, the
12
 * "License"). You may not use this file except in compliance with the
13
 * License. You can obtain a copy of the License at
14
 * http://www.netbeans.org/cddl-gplv2.html
15
 * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
16
 * specific language governing permissions and limitations under the
17
 * License.  When distributing the software, include this License Header
18
 * Notice in each file and include the License file at
19
 * nbbuild/licenses/CDDL-GPL-2-CP.  Oracle designates this
20
 * particular file as subject to the "Classpath" exception as provided
21
 * by Oracle in the GPL Version 2 section of the License file that
22
 * accompanied this code. If applicable, add the following below the
23
 * License Header, with the fields enclosed by brackets [] replaced by
24
 * your own identifying information:
25
 * "Portions Copyrighted [year] [name of copyright owner]"
26
 *
27
 * Contributor(s):
28
 *
29
 * The Original Software is NetBeans. The Initial Developer of the Original
30
 * Software is Sun Microsystems, Inc. Portions Copyright 1997-2006 Sun
31
 * Microsystems, Inc. All Rights Reserved.
32
 *
33
 * If you wish your version of this file to be governed by only the CDDL
34
 * or only the GPL Version 2, indicate your decision by adding
35
 * "[Contributor] elects to include this software in this distribution
36
 * under the [CDDL or GPL Version 2] license." If you do not indicate a
37
 * single choice of license, a recipient has the option to distribute
38
 * your version of this file under either the CDDL, the GPL Version 2 or
39
 * to extend the choice of license to its licensees as provided above.
40
 * However, if you add GPL Version 2 code and therefore, elected the GPL
41
 * Version 2 license, then the option applies only if the new code is
42
 * made subject to such option by the copyright holder.
43
 */
44
45
package org.netbeans.modules.j2ee.ejbcore.ui.logicalview.ejb.action;
46
47
48
import java.io.IOException;
49
import java.util.logging.Level;
50
import java.util.logging.Logger;
51
import javax.lang.model.element.TypeElement;
52
import org.netbeans.api.java.source.ElementHandle;
53
import org.netbeans.modules.j2ee.api.ejbjar.EjbJar;
54
import org.netbeans.modules.j2ee.common.Util;
55
import org.netbeans.modules.j2ee.common.method.FieldCustomizer;
56
import org.netbeans.modules.j2ee.common.method.MethodModel;
57
import org.netbeans.modules.j2ee.dd.api.ejb.EjbJarMetadata;
58
import org.netbeans.modules.j2ee.dd.api.ejb.Entity;
59
import org.netbeans.modules.j2ee.ejbcore.Utils;
60
import org.netbeans.modules.j2ee.ejbcore.api.methodcontroller.EjbMethodController;
61
import org.netbeans.modules.j2ee.ejbcore.util._RetoucheUtil;
62
import org.netbeans.modules.j2ee.ejbcore.action.CmFieldGenerator;
63
import org.netbeans.modules.j2ee.ejbcore.api.methodcontroller.EntityMethodController;
64
import org.netbeans.modules.j2ee.metadata.model.api.MetadataModel;
65
import org.netbeans.modules.j2ee.metadata.model.api.MetadataModelAction;
66
import org.omg.CORBA.Request;
67
import org.openide.filesystems.FileObject;
68
import org.openide.nodes.Node;
69
import org.openide.util.Exceptions;
70
import org.openide.util.HelpCtx;
71
import org.openide.util.Lookup;
72
import org.openide.util.NbBundle;
73
import org.openide.util.RequestProcessor;
74
import org.openide.util.actions.NodeAction;
75
import sun.print.RasterPrinterJob;
76
77
/**
78
 * Action that can always be invoked and work procedurally.
79
 * @author Chris Webster
80
 */
81
public class AddCmpFieldAction extends NodeAction {
82
83
    private final String NAME = NbBundle.getMessage(AddCmpFieldAction.class, "LBL_AddCmpFieldAction");
84
85
    public String getName() {
86
        return NAME;
87
    }
88
89
    public HelpCtx getHelpCtx() {
90
        return HelpCtx.DEFAULT_HELP;
91
    }
92
93
    protected boolean asynchronous() {
94
        return false;
95
    }
96
97
    protected boolean enable(org.openide.nodes.Node[] activatedNodes) {
98
        if (activatedNodes == null || activatedNodes.length < 1) {
99
            return false;
100
        }
101
        EjbMethodController ejbMethodController;
102
        ElementHandle<TypeElement> elementHandle = null;
103
        try {
104
             elementHandle = _RetoucheUtil.getJavaClassFromNode(activatedNodes[0]);
105
            if (elementHandle == null) {
106
                return false;
107
            }
108
        } catch (IOException ioe) {
109
            Exceptions.printStackTrace(ioe);
110
            return false;
111
        }
112
        FileObject fileObject = activatedNodes[0].getLookup().lookup(FileObject.class);
113
        if (fileObject == null) {
114
            return false;
115
        }
116
        return activatedNodes.length == 1 &&
117
               (ejbMethodController = EjbMethodController.createFromClass(fileObject, elementHandle.getQualifiedName())) != null &&
118
               ejbMethodController instanceof EntityMethodController &&
119
               ((EntityMethodController) ejbMethodController).isCMP();
120
    }
121
122
    protected void performAction(org.openide.nodes.Node[] activatedNodes) {
123
        if (activatedNodes == null || activatedNodes.length < 1) {
124
            return;
125
        }
126
        try {
127
            ElementHandle<TypeElement> elementHandle = _RetoucheUtil.getJavaClassFromNode(activatedNodes[0]);
128
            if (elementHandle != null) {
129
                FileObject fileObject = activatedNodes[0].getLookup().lookup(FileObject.class);
130
                FileObject ddFile = EjbJar.getEjbJar(fileObject).getDeploymentDescriptor();
131
                EntityMethodController emc = (EntityMethodController) EjbMethodController.createFromClass(fileObject, elementHandle.getQualifiedName());
132
                MethodModel.Variable field = MethodModel.Variable.create("java.lang.String", "cmpField");
133
                addCmpField(emc, ddFile, field);
134
            }
135
        } catch (IOException ioe) {
136
            Exceptions.printStackTrace(ioe);
137
        }
138
    }
139
140
    public static boolean addCmpField(FileObject fileObject, String className, FileObject ddFile) {
141
        MethodModel.Variable field = MethodModel.Variable.create("java.lang.String", "cmpField");
142
        EntityMethodController emc = (EntityMethodController) EntityMethodController.createFromClass(fileObject, className);
143
        try {
144
            return addCmpField(emc, ddFile, field);
145
        } catch (IOException ioe) {
146
            Exceptions.printStackTrace(ioe);
147
        }
148
        return false;
149
    }
150
151
    private static boolean addCmpField(EntityMethodController emc, FileObject ddFile, MethodModel.Variable field) throws IOException {
152
153
        final String ejbClass = emc.getBeanClass();
154
        final Entity[] entity = new Entity[1];
155
        final FileObject[] ejbClassFO = new FileObject[1];
156
157
        MetadataModel<EjbJarMetadata> metadataModel = EjbJar.getEjbJar(ddFile).getMetadataModel();
158
        metadataModel.runReadAction(new MetadataModelAction<EjbJarMetadata, Void>() {
159
            public Void run(EjbJarMetadata metadata) {
160
                entity[0] = (Entity) metadata.findByEjbClass(ejbClass);
161
                ejbClassFO[0] = metadata.findResource(Utils.toResourceName(ejbClass));
162
                return null;
163
            }
164
        });
165
166
        final FieldCustomizer customizer = new FieldCustomizer(entity[0], field, "",
167
                emc.getLocal() != null, emc.getRemote() != null, true, true, false, false);
168
        if (customizer.customizeField()) {
169
            final MethodModel.Variable customizedField = customizer.getField();
170
            final CmFieldGenerator generator = CmFieldGenerator.create(emc.getBeanClass(), ejbClassFO[0]);
171
172
            RequestProcessor.getDefault().post(new Runnable() {
173
                public void run() {
174
                    try {
175
                        generator.addCmpField(customizedField, customizer.isLocalGetter(), customizer.isLocalSetter(),
176
                            customizer.isRemoteGetter(), customizer.isRemoteSetter(), customizer.getDescription());
177
                    } catch (IOException ioe) {
178
                        Logger.getLogger(AddCmpFieldAction.class.getName()).log(Level.WARNING, null, ioe);
179
                    }
180
                }
181
            });
182
183
            return true;
184
        }
185
        return false;
186
    }
187
188
    public javax.swing.Action createContextAwareInstance(org.openide.util.Lookup actionContext) {
189
        boolean enable = enable(actionContext.lookup(new Lookup.Template<Node>(Node.class)).allInstances().toArray(new Node[0]));
190
        return enable ? super.createContextAwareInstance(actionContext) : null;
191
    }
192
193
}
(-)a/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ui/logicalview/ejb/action/AddCreateMethodStrategy.java (-3 / +3 lines)
Lines 56-64 Link Here
56
import org.netbeans.api.java.source.JavaSource;
56
import org.netbeans.api.java.source.JavaSource;
57
import org.netbeans.api.java.source.Task;
57
import org.netbeans.api.java.source.Task;
58
import org.netbeans.modules.j2ee.api.ejbjar.EjbJar;
58
import org.netbeans.modules.j2ee.api.ejbjar.EjbJar;
59
import org.netbeans.modules.j2ee.common.method.MethodCustomizerFactory;
59
import org.netbeans.modules.j2ee.core.api.support.java.method.MethodCustomizerFactory;
60
import org.netbeans.modules.j2ee.common.method.MethodCustomizer;
60
import org.netbeans.modules.j2ee.core.api.support.java.method.MethodCustomizer;
61
import org.netbeans.modules.j2ee.common.method.MethodModel;
61
import org.netbeans.modules.j2ee.core.api.support.java.method.MethodModel;
62
import org.netbeans.modules.j2ee.dd.api.ejb.Ejb;
62
import org.netbeans.modules.j2ee.dd.api.ejb.Ejb;
63
import org.netbeans.modules.j2ee.dd.api.ejb.EjbJarMetadata;
63
import org.netbeans.modules.j2ee.dd.api.ejb.EjbJarMetadata;
64
import org.netbeans.modules.j2ee.dd.api.ejb.Entity;
64
import org.netbeans.modules.j2ee.dd.api.ejb.Entity;
(-)a/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ui/logicalview/ejb/action/AddFinderMethodStrategy.java (-3 / +3 lines)
Lines 57-65 Link Here
57
import org.netbeans.api.java.source.JavaSource;
57
import org.netbeans.api.java.source.JavaSource;
58
import org.netbeans.api.java.source.Task;
58
import org.netbeans.api.java.source.Task;
59
import org.netbeans.modules.j2ee.api.ejbjar.EjbJar;
59
import org.netbeans.modules.j2ee.api.ejbjar.EjbJar;
60
import org.netbeans.modules.j2ee.common.method.MethodCustomizerFactory;
60
import org.netbeans.modules.j2ee.core.api.support.java.method.MethodCustomizerFactory;
61
import org.netbeans.modules.j2ee.common.method.MethodCustomizer;
61
import org.netbeans.modules.j2ee.core.api.support.java.method.MethodCustomizer;
62
import org.netbeans.modules.j2ee.common.method.MethodModel;
62
import org.netbeans.modules.j2ee.core.api.support.java.method.MethodModel;
63
import org.netbeans.modules.j2ee.dd.api.ejb.Ejb;
63
import org.netbeans.modules.j2ee.dd.api.ejb.Ejb;
64
import org.netbeans.modules.j2ee.dd.api.ejb.EjbJarMetadata;
64
import org.netbeans.modules.j2ee.dd.api.ejb.EjbJarMetadata;
65
import org.netbeans.modules.j2ee.dd.api.ejb.Entity;
65
import org.netbeans.modules.j2ee.dd.api.ejb.Entity;
(-)a/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ui/logicalview/ejb/action/AddHomeMethodStrategy.java (-3 / +3 lines)
Lines 57-65 Link Here
57
import org.netbeans.api.java.source.JavaSource;
57
import org.netbeans.api.java.source.JavaSource;
58
import org.netbeans.api.java.source.Task;
58
import org.netbeans.api.java.source.Task;
59
import org.netbeans.modules.j2ee.api.ejbjar.EjbJar;
59
import org.netbeans.modules.j2ee.api.ejbjar.EjbJar;
60
import org.netbeans.modules.j2ee.common.method.MethodCustomizerFactory;
60
import org.netbeans.modules.j2ee.core.api.support.java.method.MethodCustomizerFactory;
61
import org.netbeans.modules.j2ee.common.method.MethodCustomizer;
61
import org.netbeans.modules.j2ee.core.api.support.java.method.MethodCustomizer;
62
import org.netbeans.modules.j2ee.common.method.MethodModel;
62
import org.netbeans.modules.j2ee.core.api.support.java.method.MethodModel;
63
import org.netbeans.modules.j2ee.dd.api.ejb.Ejb;
63
import org.netbeans.modules.j2ee.dd.api.ejb.Ejb;
64
import org.netbeans.modules.j2ee.dd.api.ejb.EjbJarMetadata;
64
import org.netbeans.modules.j2ee.dd.api.ejb.EjbJarMetadata;
65
import org.netbeans.modules.j2ee.dd.api.ejb.Entity;
65
import org.netbeans.modules.j2ee.dd.api.ejb.Entity;
(-)a/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ui/logicalview/ejb/action/AddSelectMethodStrategy.java (-3 / +3 lines)
Lines 59-67 Link Here
59
import org.netbeans.api.java.source.JavaSource;
59
import org.netbeans.api.java.source.JavaSource;
60
import org.netbeans.api.java.source.Task;
60
import org.netbeans.api.java.source.Task;
61
import org.netbeans.modules.j2ee.api.ejbjar.EjbJar;
61
import org.netbeans.modules.j2ee.api.ejbjar.EjbJar;
62
import org.netbeans.modules.j2ee.common.method.MethodCustomizerFactory;
62
import org.netbeans.modules.j2ee.core.api.support.java.method.MethodCustomizerFactory;
63
import org.netbeans.modules.j2ee.common.method.MethodCustomizer;
63
import org.netbeans.modules.j2ee.core.api.support.java.method.MethodCustomizer;
64
import org.netbeans.modules.j2ee.common.method.MethodModel;
64
import org.netbeans.modules.j2ee.core.api.support.java.method.MethodModel;
65
import org.netbeans.modules.j2ee.dd.api.ejb.Ejb;
65
import org.netbeans.modules.j2ee.dd.api.ejb.Ejb;
66
import org.netbeans.modules.j2ee.dd.api.ejb.EjbJarMetadata;
66
import org.netbeans.modules.j2ee.dd.api.ejb.EjbJarMetadata;
67
import org.netbeans.modules.j2ee.dd.api.ejb.Entity;
67
import org.netbeans.modules.j2ee.dd.api.ejb.Entity;
(-)a/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ui/logicalview/ejb/action/EJBActionGroup.java (-2 / +1 lines)
Lines 91-98 Link Here
91
            new AddCreateMethodAction(),
91
            new AddCreateMethodAction(),
92
            new AddFinderMethodAction(),
92
            new AddFinderMethodAction(),
93
            new AddHomeMethodAction(),
93
            new AddHomeMethodAction(),
94
            new AddSelectMethodAction(),
94
            new AddSelectMethodAction()
95
            SystemAction.get(AddCmpFieldAction.class)
96
        };
95
        };
97
    }
96
    }
98
    
97
    
(-)a/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ui/logicalview/ejb/entity/CMPFieldsNode.java (-4 / +1 lines)
Lines 50-56 Link Here
50
import org.openide.loaders.DataObject;
50
import org.openide.loaders.DataObject;
51
import org.openide.util.actions.SystemAction;
51
import org.openide.util.actions.SystemAction;
52
import org.netbeans.modules.j2ee.dd.api.ejb.Entity;
52
import org.netbeans.modules.j2ee.dd.api.ejb.Entity;
53
import org.netbeans.modules.j2ee.ejbcore.ui.logicalview.ejb.action.AddCmpFieldAction;
54
import org.netbeans.modules.j2ee.ejbcore.api.methodcontroller.EntityMethodController;
53
import org.netbeans.modules.j2ee.ejbcore.api.methodcontroller.EntityMethodController;
55
import org.netbeans.modules.j2ee.dd.api.common.DDEditorNavigator;
54
import org.netbeans.modules.j2ee.dd.api.common.DDEditorNavigator;
56
import org.openide.actions.OpenAction;
55
import org.openide.actions.OpenAction;
Lines 87-95 Link Here
87
    }
86
    }
88
    
87
    
89
    public Action[] getActions(boolean context) {
88
    public Action[] getActions(boolean context) {
90
        return new SystemAction[] {
89
        return new SystemAction[] {};
91
            SystemAction.get(AddCmpFieldAction.class)
92
        };
93
    }
90
    }
94
    
91
    
95
    public Action getPreferredAction() {
92
    public Action getPreferredAction() {
(-)a/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ui/logicalview/ejb/entity/MethodChildren.java (-3 / +2 lines)
Lines 59-67 Link Here
59
import org.netbeans.api.java.source.Task;
59
import org.netbeans.api.java.source.Task;
60
import org.netbeans.api.java.source.ui.ElementOpen;
60
import org.netbeans.api.java.source.ui.ElementOpen;
61
import org.netbeans.modules.j2ee.api.ejbjar.EjbJar;
61
import org.netbeans.modules.j2ee.api.ejbjar.EjbJar;
62
import org.netbeans.modules.j2ee.core.api.support.java.method.MethodModel;
63
import org.netbeans.modules.j2ee.core.api.support.java.method.MethodModelSupport;
62
import org.netbeans.modules.j2ee.dd.api.common.DDEditorNavigator;
64
import org.netbeans.modules.j2ee.dd.api.common.DDEditorNavigator;
63
import org.netbeans.modules.j2ee.common.method.MethodModel;
64
import org.netbeans.modules.j2ee.common.method.MethodModelSupport;
65
import org.netbeans.modules.j2ee.dd.api.ejb.Entity;
65
import org.netbeans.modules.j2ee.dd.api.ejb.Entity;
66
import org.netbeans.modules.j2ee.dd.api.ejb.Query;
66
import org.netbeans.modules.j2ee.dd.api.ejb.Query;
67
import org.netbeans.modules.j2ee.ejbcore.api.methodcontroller.EntityMethodController;
67
import org.netbeans.modules.j2ee.ejbcore.api.methodcontroller.EntityMethodController;
Lines 74-80 Link Here
74
import org.openide.loaders.DataObjectNotFoundException;
74
import org.openide.loaders.DataObjectNotFoundException;
75
import org.openide.util.Exceptions;
75
import org.openide.util.Exceptions;
76
import org.openide.util.ImageUtilities;
76
import org.openide.util.ImageUtilities;
77
import org.openide.util.Utilities;
78
77
79
/**
78
/**
80
 *
79
 *
(-)a/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ui/logicalview/ejb/session/MethodChildren.java (-2 / +2 lines)
Lines 62-69 Link Here
62
import org.netbeans.api.java.source.Task;
62
import org.netbeans.api.java.source.Task;
63
import org.netbeans.api.java.source.ui.ElementOpen;
63
import org.netbeans.api.java.source.ui.ElementOpen;
64
import org.netbeans.modules.j2ee.api.ejbjar.EjbJar;
64
import org.netbeans.modules.j2ee.api.ejbjar.EjbJar;
65
import org.netbeans.modules.j2ee.common.method.MethodModel;
65
import org.netbeans.modules.j2ee.core.api.support.java.method.MethodModel;
66
import org.netbeans.modules.j2ee.common.method.MethodModelSupport;
66
import org.netbeans.modules.j2ee.core.api.support.java.method.MethodModelSupport;
67
import org.netbeans.modules.j2ee.ejbcore.api.methodcontroller.SessionMethodController;
67
import org.netbeans.modules.j2ee.ejbcore.api.methodcontroller.SessionMethodController;
68
import org.netbeans.modules.j2ee.ejbcore.ui.logicalview.ejb.shared.ComponentMethodModel;
68
import org.netbeans.modules.j2ee.ejbcore.ui.logicalview.ejb.shared.ComponentMethodModel;
69
import org.netbeans.modules.j2ee.ejbcore.ui.logicalview.ejb.shared.ComponentMethodViewStrategy;
69
import org.netbeans.modules.j2ee.ejbcore.ui.logicalview.ejb.shared.ComponentMethodViewStrategy;
(-)a/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ui/logicalview/ejb/shared/ComponentMethodModel.java (-2 / +2 lines)
Lines 70-77 Link Here
70
import org.netbeans.api.java.source.ElementUtilities.ElementAcceptor;
70
import org.netbeans.api.java.source.ElementUtilities.ElementAcceptor;
71
import org.netbeans.api.java.source.JavaSource;
71
import org.netbeans.api.java.source.JavaSource;
72
import org.netbeans.modules.j2ee.api.ejbjar.EjbJar;
72
import org.netbeans.modules.j2ee.api.ejbjar.EjbJar;
73
import org.netbeans.modules.j2ee.common.method.MethodModel;
73
import org.netbeans.modules.j2ee.core.api.support.java.method.MethodModel;
74
import org.netbeans.modules.j2ee.common.method.MethodModelSupport;
74
import org.netbeans.modules.j2ee.core.api.support.java.method.MethodModelSupport;
75
import org.netbeans.modules.j2ee.dd.api.ejb.EjbJarMetadata;
75
import org.netbeans.modules.j2ee.dd.api.ejb.EjbJarMetadata;
76
import org.netbeans.modules.j2ee.dd.api.ejb.Session;
76
import org.netbeans.modules.j2ee.dd.api.ejb.Session;
77
import org.netbeans.modules.j2ee.metadata.model.api.MetadataModelAction;
77
import org.netbeans.modules.j2ee.metadata.model.api.MetadataModelAction;
(-)a/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ui/logicalview/ejb/shared/ComponentMethodViewStrategy.java (-1 / +1 lines)
Lines 47-53 Link Here
47
import java.awt.Image;
47
import java.awt.Image;
48
import java.io.IOException;
48
import java.io.IOException;
49
import java.util.Collection;
49
import java.util.Collection;
50
import org.netbeans.modules.j2ee.common.method.MethodModel;
50
import org.netbeans.modules.j2ee.core.api.support.java.method.MethodModel;
51
import org.openide.filesystems.FileObject;
51
import org.openide.filesystems.FileObject;
52
52
53
/**
53
/**
(-)a/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ui/logicalview/ejb/shared/MethodNode.java (-1 / +1 lines)
Lines 62-68 Link Here
62
import org.netbeans.api.java.source.JavaSource;
62
import org.netbeans.api.java.source.JavaSource;
63
import org.netbeans.api.java.source.SourceUtils;
63
import org.netbeans.api.java.source.SourceUtils;
64
import org.netbeans.api.java.source.Task;
64
import org.netbeans.api.java.source.Task;
65
import org.netbeans.modules.j2ee.common.method.MethodModel;
65
import org.netbeans.modules.j2ee.core.api.support.java.method.MethodModel;
66
import org.openide.filesystems.FileObject;
66
import org.openide.filesystems.FileObject;
67
import org.openide.nodes.AbstractNode;
67
import org.openide.nodes.AbstractNode;
68
import org.openide.nodes.Children;
68
import org.openide.nodes.Children;
(-)a/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ui/logicalview/entries/SendEmailCodeGenerator.java (-2 / +2 lines)
Lines 66-73 Link Here
66
import org.netbeans.modules.j2ee.api.ejbjar.EnterpriseReferenceContainer;
66
import org.netbeans.modules.j2ee.api.ejbjar.EnterpriseReferenceContainer;
67
import org.netbeans.modules.j2ee.api.ejbjar.ResourceReference;
67
import org.netbeans.modules.j2ee.api.ejbjar.ResourceReference;
68
import org.netbeans.modules.j2ee.common.Util;
68
import org.netbeans.modules.j2ee.common.Util;
69
import org.netbeans.modules.j2ee.common.method.MethodModel;
69
import org.netbeans.modules.j2ee.core.api.support.java.method.MethodModel;
70
import org.netbeans.modules.j2ee.common.method.MethodModelSupport;
70
import org.netbeans.modules.j2ee.core.api.support.java.method.MethodModelSupport;
71
import org.netbeans.modules.javaee.injection.api.InjectionTargetQuery;
71
import org.netbeans.modules.javaee.injection.api.InjectionTargetQuery;
72
import org.netbeans.modules.j2ee.dd.api.common.ResourceRef;
72
import org.netbeans.modules.j2ee.dd.api.common.ResourceRef;
73
import org.netbeans.modules.j2ee.deployment.devmodules.api.Deployment;
73
import org.netbeans.modules.j2ee.deployment.devmodules.api.Deployment;
(-)a/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ui/logicalview/entries/ServiceLocatorStrategy.java (-2 / +2 lines)
Lines 66-73 Link Here
66
import org.netbeans.api.project.ProjectUtils;
66
import org.netbeans.api.project.ProjectUtils;
67
import org.netbeans.api.project.SourceGroup;
67
import org.netbeans.api.project.SourceGroup;
68
import org.netbeans.api.project.Sources;
68
import org.netbeans.api.project.Sources;
69
import org.netbeans.modules.j2ee.common.method.MethodModel;
69
import org.netbeans.modules.j2ee.core.api.support.java.method.MethodModel;
70
import org.netbeans.modules.j2ee.common.method.MethodModelSupport;
70
import org.netbeans.modules.j2ee.core.api.support.java.method.MethodModelSupport;
71
import org.netbeans.spi.java.classpath.ClassPathProvider;
71
import org.netbeans.spi.java.classpath.ClassPathProvider;
72
import org.netbeans.spi.java.classpath.PathResourceImplementation;
72
import org.netbeans.spi.java.classpath.PathResourceImplementation;
73
import org.netbeans.spi.java.classpath.support.ClassPathSupport;
73
import org.netbeans.spi.java.classpath.support.ClassPathSupport;
(-)a/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/util/_RetoucheUtil.java (-2 / +2 lines)
Lines 69-76 Link Here
69
import org.netbeans.api.java.source.Task;
69
import org.netbeans.api.java.source.Task;
70
import org.netbeans.api.java.source.TreeMaker;
70
import org.netbeans.api.java.source.TreeMaker;
71
import org.netbeans.api.java.source.WorkingCopy;
71
import org.netbeans.api.java.source.WorkingCopy;
72
import org.netbeans.modules.j2ee.common.method.MethodModel;
72
import org.netbeans.modules.j2ee.core.api.support.java.method.MethodModel;
73
import org.netbeans.modules.j2ee.common.method.MethodModelSupport;
73
import org.netbeans.modules.j2ee.core.api.support.java.method.MethodModelSupport;
74
import org.netbeans.modules.j2ee.core.api.support.java.GenerationUtils;
74
import org.netbeans.modules.j2ee.core.api.support.java.GenerationUtils;
75
import org.netbeans.modules.j2ee.core.api.support.java.SourceUtils;
75
import org.netbeans.modules.j2ee.core.api.support.java.SourceUtils;
76
import org.openide.filesystems.FileObject;
76
import org.openide.filesystems.FileObject;
(-)a/j2ee.ejbcore/test/unit/src/org/netbeans/modules/j2ee/ejbcore/action/BusinessMethodGeneratorTest.java (-2 / +2 lines)
Lines 55-62 Link Here
55
import org.netbeans.api.java.source.JavaSource;
55
import org.netbeans.api.java.source.JavaSource;
56
import org.netbeans.api.java.source.WorkingCopy;
56
import org.netbeans.api.java.source.WorkingCopy;
57
import org.netbeans.api.java.source.Task;
57
import org.netbeans.api.java.source.Task;
58
import org.netbeans.modules.j2ee.common.method.MethodModel;
58
import org.netbeans.modules.j2ee.core.api.support.java.method.MethodModel;
59
import org.netbeans.modules.j2ee.common.method.MethodModelSupport;
59
import org.netbeans.modules.j2ee.core.api.support.java.method.MethodModelSupport;
60
import org.netbeans.modules.j2ee.dd.api.ejb.DDProvider;
60
import org.netbeans.modules.j2ee.dd.api.ejb.DDProvider;
61
import org.netbeans.modules.j2ee.dd.api.ejb.EjbJar;
61
import org.netbeans.modules.j2ee.dd.api.ejb.EjbJar;
62
import org.netbeans.modules.j2ee.ejbcore.test.TestBase;
62
import org.netbeans.modules.j2ee.ejbcore.test.TestBase;
(-)a/j2ee.ejbcore/test/unit/src/org/netbeans/modules/j2ee/ejbcore/action/CmFieldGeneratorTest.java (-1 / +1 lines)
Lines 54-60 Link Here
54
import org.netbeans.api.java.source.JavaSource;
54
import org.netbeans.api.java.source.JavaSource;
55
import org.netbeans.api.java.source.Task;
55
import org.netbeans.api.java.source.Task;
56
import org.netbeans.modules.j2ee.api.ejbjar.EjbJar;
56
import org.netbeans.modules.j2ee.api.ejbjar.EjbJar;
57
import org.netbeans.modules.j2ee.common.method.MethodModel;
57
import org.netbeans.modules.j2ee.core.api.support.java.method.MethodModel;
58
import org.netbeans.modules.j2ee.dd.api.ejb.CmpField;
58
import org.netbeans.modules.j2ee.dd.api.ejb.CmpField;
59
import org.netbeans.modules.j2ee.dd.api.ejb.EjbJarMetadata;
59
import org.netbeans.modules.j2ee.dd.api.ejb.EjbJarMetadata;
60
import org.netbeans.modules.j2ee.dd.api.ejb.Entity;
60
import org.netbeans.modules.j2ee.dd.api.ejb.Entity;
(-)a/j2ee.ejbcore/test/unit/src/org/netbeans/modules/j2ee/ejbcore/action/CreateMethodGeneratorTest.java (-1 / +1 lines)
Lines 56-62 Link Here
56
import org.netbeans.api.java.source.JavaSource;
56
import org.netbeans.api.java.source.JavaSource;
57
import org.netbeans.api.java.source.Task;
57
import org.netbeans.api.java.source.Task;
58
import org.netbeans.api.java.source.WorkingCopy;
58
import org.netbeans.api.java.source.WorkingCopy;
59
import org.netbeans.modules.j2ee.common.method.MethodModel;
59
import org.netbeans.modules.j2ee.core.api.support.java.method.MethodModel;
60
import org.netbeans.modules.j2ee.dd.api.ejb.DDProvider;
60
import org.netbeans.modules.j2ee.dd.api.ejb.DDProvider;
61
import org.netbeans.modules.j2ee.dd.api.ejb.EjbJar;
61
import org.netbeans.modules.j2ee.dd.api.ejb.EjbJar;
62
import org.netbeans.modules.j2ee.ejbcore.test.TestBase;
62
import org.netbeans.modules.j2ee.ejbcore.test.TestBase;
(-)a/j2ee.ejbcore/test/unit/src/org/netbeans/modules/j2ee/ejbcore/action/FinderMethodGeneratorTest.java (-1 / +1 lines)
Lines 55-61 Link Here
55
import org.netbeans.api.java.source.JavaSource;
55
import org.netbeans.api.java.source.JavaSource;
56
import org.netbeans.api.java.source.Task;
56
import org.netbeans.api.java.source.Task;
57
import org.netbeans.api.java.source.WorkingCopy;
57
import org.netbeans.api.java.source.WorkingCopy;
58
import org.netbeans.modules.j2ee.common.method.MethodModel;
58
import org.netbeans.modules.j2ee.core.api.support.java.method.MethodModel;
59
import org.netbeans.modules.j2ee.dd.api.ejb.DDProvider;
59
import org.netbeans.modules.j2ee.dd.api.ejb.DDProvider;
60
import org.netbeans.modules.j2ee.dd.api.ejb.EjbJar;
60
import org.netbeans.modules.j2ee.dd.api.ejb.EjbJar;
61
import org.netbeans.modules.j2ee.dd.api.ejb.EnterpriseBeans;
61
import org.netbeans.modules.j2ee.dd.api.ejb.EnterpriseBeans;
(-)a/j2ee.ejbcore/test/unit/src/org/netbeans/modules/j2ee/ejbcore/action/HomeMethodGenerstorTest.java (-1 / +1 lines)
Lines 56-62 Link Here
56
import org.netbeans.api.java.source.JavaSource;
56
import org.netbeans.api.java.source.JavaSource;
57
import org.netbeans.api.java.source.Task;
57
import org.netbeans.api.java.source.Task;
58
import org.netbeans.api.java.source.WorkingCopy;
58
import org.netbeans.api.java.source.WorkingCopy;
59
import org.netbeans.modules.j2ee.common.method.MethodModel;
59
import org.netbeans.modules.j2ee.core.api.support.java.method.MethodModel;
60
import org.netbeans.modules.j2ee.dd.api.ejb.DDProvider;
60
import org.netbeans.modules.j2ee.dd.api.ejb.DDProvider;
61
import org.netbeans.modules.j2ee.dd.api.ejb.EjbJar;
61
import org.netbeans.modules.j2ee.dd.api.ejb.EjbJar;
62
import org.netbeans.modules.j2ee.ejbcore.test.TestBase;
62
import org.netbeans.modules.j2ee.ejbcore.test.TestBase;
(-)a/j2ee.ejbcore/test/unit/src/org/netbeans/modules/j2ee/ejbcore/action/SelectMethodGeneratorTest.java (-1 / +1 lines)
Lines 56-62 Link Here
56
import org.netbeans.api.java.source.JavaSource;
56
import org.netbeans.api.java.source.JavaSource;
57
import org.netbeans.api.java.source.Task;
57
import org.netbeans.api.java.source.Task;
58
import org.netbeans.api.java.source.WorkingCopy;
58
import org.netbeans.api.java.source.WorkingCopy;
59
import org.netbeans.modules.j2ee.common.method.MethodModel;
59
import org.netbeans.modules.j2ee.core.api.support.java.method.MethodModel;
60
import org.netbeans.modules.j2ee.dd.api.ejb.DDProvider;
60
import org.netbeans.modules.j2ee.dd.api.ejb.DDProvider;
61
import org.netbeans.modules.j2ee.dd.api.ejb.EjbJar;
61
import org.netbeans.modules.j2ee.dd.api.ejb.EjbJar;
62
import org.netbeans.modules.j2ee.dd.api.ejb.EnterpriseBeans;
62
import org.netbeans.modules.j2ee.dd.api.ejb.EnterpriseBeans;
(-)a/j2ee.ejbcore/test/unit/src/org/netbeans/modules/j2ee/ejbcore/action/UseDatabaseGeneratorTest.java (-1 / +1 lines)
Lines 60-66 Link Here
60
import org.netbeans.api.java.source.JavaSource;
60
import org.netbeans.api.java.source.JavaSource;
61
import org.netbeans.api.java.source.Task;
61
import org.netbeans.api.java.source.Task;
62
import org.netbeans.api.java.source.WorkingCopy;
62
import org.netbeans.api.java.source.WorkingCopy;
63
import org.netbeans.modules.j2ee.common.method.MethodModel;
63
import org.netbeans.modules.j2ee.core.api.support.java.method.MethodModel;
64
import org.netbeans.modules.j2ee.deployment.common.api.ConfigurationException;
64
import org.netbeans.modules.j2ee.deployment.common.api.ConfigurationException;
65
import org.netbeans.modules.j2ee.deployment.common.api.Datasource;
65
import org.netbeans.modules.j2ee.deployment.common.api.Datasource;
66
import org.netbeans.modules.j2ee.deployment.devmodules.spi.J2eeModuleProvider;
66
import org.netbeans.modules.j2ee.deployment.devmodules.spi.J2eeModuleProvider;
(-)a/j2ee.ejbcore/test/unit/src/org/netbeans/modules/j2ee/ejbcore/api/codegeneration/Util.java (-2 / +2 lines)
Lines 58-65 Link Here
58
import org.netbeans.api.java.source.CancellableTask;
58
import org.netbeans.api.java.source.CancellableTask;
59
import org.netbeans.api.java.source.CompilationController;
59
import org.netbeans.api.java.source.CompilationController;
60
import org.netbeans.api.java.source.JavaSource;
60
import org.netbeans.api.java.source.JavaSource;
61
import org.netbeans.modules.j2ee.common.method.MethodModel;
61
import org.netbeans.modules.j2ee.core.api.support.java.method.MethodModel;
62
import org.netbeans.modules.j2ee.common.method.MethodModelSupport;
62
import org.netbeans.modules.j2ee.core.api.support.java.method.MethodModelSupport;
63
import org.openide.filesystems.FileObject;
63
import org.openide.filesystems.FileObject;
64
64
65
/**
65
/**
(-)a/j2ee.ejbcore/test/unit/src/org/netbeans/modules/j2ee/ejbcore/test/TestBase.java (-2 / +2 lines)
Lines 62-69 Link Here
62
import org.netbeans.api.project.Project;
62
import org.netbeans.api.project.Project;
63
import org.netbeans.junit.NbTestCase;
63
import org.netbeans.junit.NbTestCase;
64
import org.netbeans.modules.j2ee.api.ejbjar.EjbJar;
64
import org.netbeans.modules.j2ee.api.ejbjar.EjbJar;
65
import org.netbeans.modules.j2ee.common.method.MethodModel;
65
import org.netbeans.modules.j2ee.core.api.support.java.method.MethodModel;
66
import org.netbeans.modules.j2ee.common.method.MethodModelSupport;
66
import org.netbeans.modules.j2ee.core.api.support.java.method.MethodModelSupport;
67
import org.netbeans.modules.java.source.usages.IndexUtil;
67
import org.netbeans.modules.java.source.usages.IndexUtil;
68
import org.netbeans.modules.parsing.api.indexing.IndexingManager;
68
import org.netbeans.modules.parsing.api.indexing.IndexingManager;
69
import org.netbeans.spi.java.queries.SourceLevelQueryImplementation;
69
import org.netbeans.spi.java.queries.SourceLevelQueryImplementation;
(-)a/maven.jaxws/manifest.mf (-1 / +1 lines)
Lines 1-4 Link Here
1
Manifest-Version: 1.0
1
Manifest-Version: 1.0
2
OpenIDE-Module: org.netbeans.modules.maven.jaxws
2
OpenIDE-Module: org.netbeans.modules.maven.jaxws
3
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/maven/jaxws/Bundle.properties
3
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/maven/jaxws/Bundle.properties
4
OpenIDE-Module-Specification-Version: 1.22
4
OpenIDE-Module-Specification-Version: 1.23
(-)a/maven.jaxws/src/org/netbeans/modules/maven/jaxws/actions/AddWsOperationHelper.java (-4 / +4 lines)
Lines 85-91 Link Here
85
import org.netbeans.api.java.source.CompilationController;
85
import org.netbeans.api.java.source.CompilationController;
86
import org.netbeans.api.java.source.JavaSource;
86
import org.netbeans.api.java.source.JavaSource;
87
import org.netbeans.api.java.source.TreeMaker;
87
import org.netbeans.api.java.source.TreeMaker;
88
import org.netbeans.modules.j2ee.common.method.MethodModelSupport;
89
import org.netbeans.modules.websvc.api.support.java.GenerationUtils;
88
import org.netbeans.modules.websvc.api.support.java.GenerationUtils;
90
import org.netbeans.modules.websvc.api.support.java.SourceUtils;
89
import org.netbeans.modules.websvc.api.support.java.SourceUtils;
91
import org.netbeans.spi.java.classpath.support.ClassPathSupport;
90
import org.netbeans.spi.java.classpath.support.ClassPathSupport;
Lines 97-106 Link Here
97
import org.netbeans.api.java.source.WorkingCopy;
96
import org.netbeans.api.java.source.WorkingCopy;
98
import org.netbeans.api.progress.ProgressHandle;
97
import org.netbeans.api.progress.ProgressHandle;
99
import org.netbeans.api.progress.ProgressHandleFactory;
98
import org.netbeans.api.progress.ProgressHandleFactory;
99
import org.netbeans.modules.j2ee.core.api.support.java.method.MethodCustomizer;
100
import org.netbeans.modules.j2ee.core.api.support.java.method.MethodCustomizerFactory;
100
//import org.netbeans.modules.j2ee.api.ejbjar.EjbJar;
101
//import org.netbeans.modules.j2ee.api.ejbjar.EjbJar;
101
import org.netbeans.modules.j2ee.common.method.MethodCustomizer;
102
import org.netbeans.modules.j2ee.core.api.support.java.method.MethodModel;
102
import org.netbeans.modules.j2ee.common.method.MethodCustomizerFactory;
103
import org.netbeans.modules.j2ee.core.api.support.java.method.MethodModelSupport;
103
import org.netbeans.modules.j2ee.common.method.MethodModel;
104
import org.openide.ErrorManager;
104
import org.openide.ErrorManager;
105
import org.openide.filesystems.FileObject;
105
import org.openide.filesystems.FileObject;
106
106
(-)a/web.jsf/nbproject/project.properties (-1 / +1 lines)
Lines 41-47 Link Here
41
# made subject to such option by the copyright holder.
41
# made subject to such option by the copyright holder.
42
42
43
javac.source=1.6
43
javac.source=1.6
44
spec.version.base=1.55.0
44
spec.version.base=1.56
45
45
46
test.config.stable.includes=\
46
test.config.stable.includes=\
47
**/JSFSupportSuite.class
47
**/JSFSupportSuite.class
(-)a/web.jsf/src/org/netbeans/modules/web/jsf/wizards/JSFClientGenerator.java (-2 / +2 lines)
Lines 88-95 Link Here
88
import org.netbeans.api.project.Sources;
88
import org.netbeans.api.project.Sources;
89
import org.netbeans.editor.BaseDocument;
89
import org.netbeans.editor.BaseDocument;
90
import org.netbeans.modules.editor.indent.api.Reformat;
90
import org.netbeans.modules.editor.indent.api.Reformat;
91
import org.netbeans.modules.j2ee.common.method.MethodModel;
91
import org.netbeans.modules.j2ee.core.api.support.java.method.MethodModel;
92
import org.netbeans.modules.j2ee.common.method.MethodModelSupport;
92
import org.netbeans.modules.j2ee.core.api.support.java.method.MethodModelSupport;
93
import org.netbeans.modules.j2ee.core.api.support.java.GenerationUtils;
93
import org.netbeans.modules.j2ee.core.api.support.java.GenerationUtils;
94
import org.netbeans.modules.j2ee.core.api.support.java.SourceUtils;
94
import org.netbeans.modules.j2ee.core.api.support.java.SourceUtils;
95
import org.netbeans.modules.j2ee.dd.api.common.InitParam;
95
import org.netbeans.modules.j2ee.dd.api.common.InitParam;
(-)a/websvc.core/nbproject/project.properties (-1 / +1 lines)
Lines 42-48 Link Here
42
42
43
javac.compilerargs=-Xlint:unchecked
43
javac.compilerargs=-Xlint:unchecked
44
javac.source=1.6
44
javac.source=1.6
45
spec.version.base=1.34.0
45
spec.version.base=1.35
46
46
47
javadoc.arch=${basedir}/arch.xml
47
javadoc.arch=${basedir}/arch.xml
48
48
(-)a/websvc.core/nbproject/project.xml (-8 / +17 lines)
Lines 171-176 Link Here
171
                    </run-dependency>
171
                    </run-dependency>
172
                </dependency>
172
                </dependency>
173
                <dependency>
173
                <dependency>
174
                    <code-name-base>org.netbeans.modules.j2ee.core.utilities</code-name-base>
175
                    <build-prerequisite/>
176
                    <compile-dependency/>
177
                    <run-dependency>
178
                        <release-version>0</release-version>
179
                        <specification-version>1.24</specification-version>
180
                    </run-dependency>
181
                </dependency>
182
                <dependency>
174
                    <code-name-base>org.netbeans.modules.j2ee.dd</code-name-base>
183
                    <code-name-base>org.netbeans.modules.j2ee.dd</code-name-base>
175
                    <build-prerequisite/>
184
                    <build-prerequisite/>
176
                    <compile-dependency/>
185
                    <compile-dependency/>
Lines 188-201 Link Here
188
                    </run-dependency>
197
                    </run-dependency>
189
                </dependency>
198
                </dependency>
190
                <dependency>
199
                <dependency>
191
                    <code-name-base>org.netbeans.modules.javaee.injection</code-name-base>
192
                    <build-prerequisite/>
193
                    <compile-dependency/>
194
                    <run-dependency>
195
                        <specification-version>1.0</specification-version>
196
                    </run-dependency>
197
                </dependency>
198
                <dependency>
199
                    <code-name-base>org.netbeans.modules.j2ee.metadata</code-name-base>
200
                    <code-name-base>org.netbeans.modules.j2ee.metadata</code-name-base>
200
                    <build-prerequisite/>
201
                    <build-prerequisite/>
201
                    <compile-dependency/>
202
                    <compile-dependency/>
Lines 266-271 Link Here
266
                    </run-dependency>
267
                    </run-dependency>
267
                </dependency>
268
                </dependency>
268
                <dependency>
269
                <dependency>
270
                    <code-name-base>org.netbeans.modules.javaee.injection</code-name-base>
271
                    <build-prerequisite/>
272
                    <compile-dependency/>
273
                    <run-dependency>
274
                        <specification-version>1.0</specification-version>
275
                    </run-dependency>
276
                </dependency>
277
                <dependency>
269
                    <code-name-base>org.netbeans.modules.javaee.specs.support</code-name-base>
278
                    <code-name-base>org.netbeans.modules.javaee.specs.support</code-name-base>
270
                    <build-prerequisite/>
279
                    <build-prerequisite/>
271
                    <compile-dependency/>
280
                    <compile-dependency/>
(-)a/websvc.core/src/org/netbeans/modules/websvc/core/AddWsOperationHelper.java (-5 / +4 lines)
Lines 84-92 Link Here
84
import org.netbeans.api.java.source.CompilationController;
84
import org.netbeans.api.java.source.CompilationController;
85
import org.netbeans.api.java.source.JavaSource;
85
import org.netbeans.api.java.source.JavaSource;
86
import org.netbeans.api.java.source.ModificationResult;
86
import org.netbeans.api.java.source.ModificationResult;
87
import org.netbeans.api.java.source.Task;
88
import org.netbeans.api.java.source.TreeMaker;
87
import org.netbeans.api.java.source.TreeMaker;
89
import org.netbeans.modules.j2ee.common.method.MethodModelSupport;
90
import org.netbeans.modules.websvc.api.support.java.GenerationUtils;
88
import org.netbeans.modules.websvc.api.support.java.GenerationUtils;
91
import org.netbeans.modules.websvc.api.support.java.SourceUtils;
89
import org.netbeans.modules.websvc.api.support.java.SourceUtils;
92
import org.netbeans.spi.java.classpath.support.ClassPathSupport;
90
import org.netbeans.spi.java.classpath.support.ClassPathSupport;
Lines 100-108 Link Here
100
import org.netbeans.api.progress.ProgressHandle;
98
import org.netbeans.api.progress.ProgressHandle;
101
import org.netbeans.api.progress.ProgressHandleFactory;
99
import org.netbeans.api.progress.ProgressHandleFactory;
102
import org.netbeans.modules.j2ee.api.ejbjar.EjbJar;
100
import org.netbeans.modules.j2ee.api.ejbjar.EjbJar;
103
import org.netbeans.modules.j2ee.common.method.MethodCustomizer;
101
import org.netbeans.modules.j2ee.core.api.support.java.method.MethodCustomizer;
104
import org.netbeans.modules.j2ee.common.method.MethodCustomizerFactory;
102
import org.netbeans.modules.j2ee.core.api.support.java.method.MethodCustomizerFactory;
105
import org.netbeans.modules.j2ee.common.method.MethodModel;
103
import org.netbeans.modules.j2ee.core.api.support.java.method.MethodModel;
104
import org.netbeans.modules.j2ee.core.api.support.java.method.MethodModelSupport;
106
import org.openide.ErrorManager;
105
import org.openide.ErrorManager;
107
import org.openide.filesystems.FileObject;
106
import org.openide.filesystems.FileObject;
108
107
(-)a/websvc.jaxrpc/manifest.mf (-1 / +1 lines)
Lines 3-7 Link Here
3
OpenIDE-Module-Install: org/netbeans/modules/websvc/jaxrpc/Installer.class
3
OpenIDE-Module-Install: org/netbeans/modules/websvc/jaxrpc/Installer.class
4
OpenIDE-Module-Layer: org/netbeans/modules/websvc/jaxrpc/layer.xml
4
OpenIDE-Module-Layer: org/netbeans/modules/websvc/jaxrpc/layer.xml
5
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/websvc/jaxrpc/Bundle.properties
5
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/websvc/jaxrpc/Bundle.properties
6
OpenIDE-Module-Specification-Version: 1.1
6
OpenIDE-Module-Specification-Version: 1.2
7
AutoUpdate-Show-In-Client: false
7
AutoUpdate-Show-In-Client: false
(-)a/websvc.jaxrpc/nbproject/project.xml (+9 lines)
Lines 127-132 Link Here
127
                    </run-dependency>
127
                    </run-dependency>
128
                </dependency>
128
                </dependency>
129
                <dependency>
129
                <dependency>
130
                    <code-name-base>org.netbeans.modules.j2ee.core.utilities</code-name-base>
131
                    <build-prerequisite/>
132
                    <compile-dependency/>
133
                    <run-dependency>
134
                        <release-version>0</release-version>
135
                        <specification-version>1.24</specification-version>
136
                    </run-dependency>
137
                </dependency>
138
                <dependency>
130
                    <code-name-base>org.netbeans.modules.j2ee.dd</code-name-base>
139
                    <code-name-base>org.netbeans.modules.j2ee.dd</code-name-base>
131
                    <build-prerequisite/>
140
                    <build-prerequisite/>
132
                    <compile-dependency/>
141
                    <compile-dependency/>
(-)a/websvc.jaxrpc/src/org/netbeans/modules/websvc/jaxrpc/actions/JaxRpcAddOperation.java (-3 / +2 lines)
Lines 46-52 Link Here
46
46
47
import com.sun.source.tree.ClassTree;
47
import com.sun.source.tree.ClassTree;
48
import com.sun.source.tree.MethodTree;
48
import com.sun.source.tree.MethodTree;
49
import org.netbeans.modules.websvc.api.support.java.SourceUtils;
50
import org.netbeans.modules.websvc.core.AddWsOperationHelper;
49
import org.netbeans.modules.websvc.core.AddWsOperationHelper;
51
import org.netbeans.modules.websvc.api.support.AddOperationCookie;
50
import org.netbeans.modules.websvc.api.support.AddOperationCookie;
52
import java.io.IOException;
51
import java.io.IOException;
Lines 67-74 Link Here
67
import org.netbeans.api.project.Project;
66
import org.netbeans.api.project.Project;
68
import org.netbeans.api.project.ProjectUtils;
67
import org.netbeans.api.project.ProjectUtils;
69
import org.netbeans.api.project.SourceGroup;
68
import org.netbeans.api.project.SourceGroup;
70
import org.netbeans.modules.j2ee.common.method.MethodModel;
71
import org.netbeans.modules.j2ee.common.method.MethodModelSupport;
72
import org.netbeans.modules.j2ee.dd.api.webservices.PortComponent;
69
import org.netbeans.modules.j2ee.dd.api.webservices.PortComponent;
73
import org.netbeans.modules.j2ee.dd.api.webservices.DDProvider;
70
import org.netbeans.modules.j2ee.dd.api.webservices.DDProvider;
74
import org.netbeans.modules.j2ee.dd.api.webservices.Webservices;
71
import org.netbeans.modules.j2ee.dd.api.webservices.Webservices;
Lines 78-83 Link Here
78
import org.netbeans.modules.websvc.api.support.java.SourceUtils;
75
import org.netbeans.modules.websvc.api.support.java.SourceUtils;
79
import org.openide.util.Lookup;
76
import org.openide.util.Lookup;
80
import static org.netbeans.api.java.source.JavaSource.Phase;
77
import static org.netbeans.api.java.source.JavaSource.Phase;
78
import org.netbeans.modules.j2ee.core.api.support.java.method.MethodModel;
79
import org.netbeans.modules.j2ee.core.api.support.java.method.MethodModelSupport;
81
import org.openide.ErrorManager;
80
import org.openide.ErrorManager;
82
import org.openide.cookies.SaveCookie;
81
import org.openide.cookies.SaveCookie;
83
import org.openide.filesystems.FileObject;
82
import org.openide.filesystems.FileObject;

Return to bug 231604