# This patch file was generated by NetBeans IDE
# Following Index: paths are relative to: /space/cvs/release55_dev/j2ee/clientproject/src/org/netbeans/modules/j2ee/clientproject
# This patch can be applied using context Tools: Patch action on respective folder.
# It uses platform neutral UTF-8 encoding and \n newlines.
# Above lines and this line are ignored by the patching process.
Index: AppClientInjectionTargetQueryImplementation.java
*** /space/cvs/release55_dev/j2ee/clientproject/src/org/netbeans/modules/j2ee/clientproject/AppClientInjectionTargetQueryImplementation.java Base (1.1.2.2.16.1)
--- /space/cvs/release55_dev/j2ee/clientproject/src/org/netbeans/modules/j2ee/clientproject/AppClientInjectionTargetQueryImplementation.java Locally Modified (Based On 1.1.2.2.16.1)
***************
*** 32,41 ****
--- 32,44 ----
   */
  public class AppClientInjectionTargetQueryImplementation implements InjectionTargetQueryImplementation {
      
+     static boolean canUseInjection;
+     
      public AppClientInjectionTargetQueryImplementation() {
      }
      
      public boolean isInjectionTarget(JavaClass jc) {
+         canUseInjection = false;
          if (jc == null) {
              throw new NullPointerException("Passed null to EjbInjectionTargetQueryImplementation.isInjectionTarget(JavaClass)"); // NOI18N
          }
***************
*** 45,56 ****
                  !apiCar.getJ2eePlatformVersion().equals("1.4")) {
              JavaModel.getJavaRepository().beginTrans(false);
              try {
!                 return jc.getResource().getMain().contains(jc);
              } finally {
                  JavaModel.getJavaRepository().endTrans();
              }
          }
!         return false;
      }
  
      public boolean isStaticReferenceRequired(JavaClass jc) {
--- 48,59 ----
                  !apiCar.getJ2eePlatformVersion().equals("1.4")) {
              JavaModel.getJavaRepository().beginTrans(false);
              try {
!                 canUseInjection = jc.getResource().getMain().contains(jc);
              } finally {
                  JavaModel.getJavaRepository().endTrans();
              }
          }
!         return canUseInjection;
      }
  
      public boolean isStaticReferenceRequired(JavaClass jc) {
Index: JarContainerImpl.java
*** /space/cvs/release55_dev/j2ee/clientproject/src/org/netbeans/modules/j2ee/clientproject/JarContainerImpl.java Base (1.1.4.8.6.1)
--- /space/cvs/release55_dev/j2ee/clientproject/src/org/netbeans/modules/j2ee/clientproject/JarContainerImpl.java Locally Modified (Based On 1.1.4.8.6.1)
***************
*** 216,222 ****
      
      private void writeDD() throws IOException {
          CarImplementation jp = (CarImplementation) webProject.getLookup().lookup(CarImplementation.class);
!         if (isDescriptorMandatory(jp.getJ2eePlatformVersion())) {
              FileObject fo = jp.getDeploymentDescriptor();
              getAppClient().write(fo);
          }
--- 216,222 ----
      
      private void writeDD() throws IOException {
          CarImplementation jp = (CarImplementation) webProject.getLookup().lookup(CarImplementation.class);
!         if (isEntryInDescriptorMandatory(jp.getJ2eePlatformVersion())) {
              FileObject fo = jp.getDeploymentDescriptor();
              getAppClient().write(fo);
          }
***************
*** 286,296 ****
          return refName;
      }
  
!     private static boolean isDescriptorMandatory(String j2eeVersion) {
          if ("1.3".equals(j2eeVersion) || "1.4".equals(j2eeVersion)) {
              return true;
          }
!         return false;
      }
      
      /**
--- 286,296 ----
          return refName;
      }
  
!     private static boolean isEntryInDescriptorMandatory(String j2eeVersion) {
          if ("1.3".equals(j2eeVersion) || "1.4".equals(j2eeVersion)) {
              return true;
          }
!         return !AppClientInjectionTargetQueryImplementation.canUseInjection;
      }
      
      /**