# HG changeset patch
# User ffjre@netbeans.org
# Date 1344964074 0
# Node ID 89f814a402ebe9e30d071fbf9bf64ce241b4ba89
# Parent  a7126bfc918b6f3c15d502a02a6c61f0b455b264
# Parent  4dbc678db09774e5f75908967358edd557c20c22
Merge of http://hg.netbeans.org/web-main/

diff --git a/.hgmail-web-main b/.hgmail-web-main
--- a/.hgmail-web-main
+++ b/.hgmail-web-main
@@ -1,3 +1,4 @@
 [usersubs]
 commits@php.netbeans.org=php*/*,hudson.php/*,languages.ini/*,languages.neon/*,languages.apacheconf/*
 dkonecny@netbeans.org=web*/*,j2ee*/*,maven.j2ee/*,coherence/*,cloud.*/*,extbrowser,javaee*/*,core.browser*/*,netserver
+mentlicher@netbeans.org=web.webkit.debugging/*,web.javascript.debugger/*
diff --git a/j2ee.jpa.verification/src/org/netbeans/modules/j2ee/jpa/verification/rules/entity/JPQLValidation.java b/j2ee.jpa.verification/src/org/netbeans/modules/j2ee/jpa/verification/rules/entity/JPQLValidation.java
--- a/j2ee.jpa.verification/src/org/netbeans/modules/j2ee/jpa/verification/rules/entity/JPQLValidation.java
+++ b/j2ee.jpa.verification/src/org/netbeans/modules/j2ee/jpa/verification/rules/entity/JPQLValidation.java
@@ -84,7 +84,7 @@
 public class JPQLValidation extends JPAClassRule implements CancelListener{
     
     private ManagedTypeProvider mtp;//need to store as jpql validation may be too long and need to be cancelled if required
-    
+    private JPQLQueryHelper helper;
     /** Creates a new instance of NonFinalClass */
     public JPQLValidation() {
         setClassContraints(Arrays.asList(ClassConstraints.ENTITY,
@@ -132,10 +132,10 @@
                 }
             }
         }
-        JPQLQueryHelper helper = new JPQLQueryHelper();
+        helper = new JPQLQueryHelper();
         Project project = FileOwnerQuery.getOwner(ctx.getFileObject());
         List<JPQLQueryProblem> problems = new ArrayList<JPQLQueryProblem>();
-        mtp = new ManagedTypeProvider(project, jpaCtx.getMetaData());
+        mtp = new ManagedTypeProvider(project, jpaCtx.getMetaData(), jpaCtx.getCompilationInfo().getElements());
         for(int index=0;index<values.size() && !ctx.isCancelled();index++){
             String value = values.get(index);
             String qName = names.get(index);
@@ -178,6 +178,7 @@
         }
         jpaCtx.removeCancelListener(this);
         mtp = null;
+        helper = null;
         return ret;
     }
     
@@ -190,5 +191,6 @@
     @Override
     public void cancelled() {
         if(mtp != null)mtp.invalidate();
+        if(helper != null)helper.dispose();
     }
 }
diff --git a/j2ee.persistence/src/org/netbeans/modules/j2ee/persistence/editor/completion/ETCompletionContextResolver.java b/j2ee.persistence/src/org/netbeans/modules/j2ee/persistence/editor/completion/ETCompletionContextResolver.java
--- a/j2ee.persistence/src/org/netbeans/modules/j2ee/persistence/editor/completion/ETCompletionContextResolver.java
+++ b/j2ee.persistence/src/org/netbeans/modules/j2ee/persistence/editor/completion/ETCompletionContextResolver.java
@@ -138,7 +138,7 @@
             JPQLQueryHelper helper = new JPQLQueryHelper();
 
             Project project = FileOwnerQuery.getOwner(ctx.getFileObject());
-            helper.setQuery(new Query(null, completedValue, new ManagedTypeProvider(project, ctx.getEntityMappings())));
+            helper.setQuery(new Query(null, completedValue, new ManagedTypeProvider(project, ctx.getEntityMappings(), ctx.getController().getElements())));
             int offset = ctx.getCompletionOffset() - nnattr.getValueOffset() - (nnattr.isValueQuoted() ? 1 : 0);
             ContentAssistProposals buildContentAssistProposals = helper.buildContentAssistProposals(offset);
             
@@ -168,7 +168,7 @@
             completedValue = org.netbeans.modules.j2ee.persistence.editor.completion.Utils.unquote(completedValue);
 
             Project project = FileOwnerQuery.getOwner(ctx.getFileObject());
-            helper.setQuery(new Query(null, completedValue, new ManagedTypeProvider(project, ctx.getEntityMappings())));
+            helper.setQuery(new Query(null, completedValue, new ManagedTypeProvider(project, ctx.getEntityMappings(), ctx.getController().getElements())));
             int offset = ctx.getCompletionOffset() - method.getValueOffset() - (method.isWithQ() ? 1 : 0);
             ContentAssistProposals buildContentAssistProposals = helper.buildContentAssistProposals(offset);
 
diff --git a/j2ee.persistence/src/org/netbeans/modules/j2ee/persistence/spi/jpql/ManagedTypeProvider.java b/j2ee.persistence/src/org/netbeans/modules/j2ee/persistence/spi/jpql/ManagedTypeProvider.java
--- a/j2ee.persistence/src/org/netbeans/modules/j2ee/persistence/spi/jpql/ManagedTypeProvider.java
+++ b/j2ee.persistence/src/org/netbeans/modules/j2ee/persistence/spi/jpql/ManagedTypeProvider.java
@@ -45,6 +45,7 @@
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.Map;
+import javax.lang.model.util.Elements;
 import org.eclipse.persistence.jpa.jpql.spi.IEntity;
 import org.eclipse.persistence.jpa.jpql.spi.IJPAVersion;
 import org.eclipse.persistence.jpa.jpql.spi.IManagedType;
@@ -68,15 +69,18 @@
     private ITypeRepository typeRepository;
     private final EntityMappings mappings;
     private boolean valid = true;//used to conrol long tasks, if not valid long tasks should be either terminated or goes short way
+    private final Elements elements;
 
-    public ManagedTypeProvider(Project project, EntityMappingsMetadata metaData) {
+    public ManagedTypeProvider(Project project, EntityMappingsMetadata metaData, Elements elements) {
         this.project = project;
         this.mappings = metaData.getRoot();
+        this.elements = elements;
     }
     
-    public ManagedTypeProvider(Project project, EntityMappings mappings) {
+    public ManagedTypeProvider(Project project, EntityMappings mappings, Elements elements) {
         this.project = project;
         this.mappings = mappings;
+        this.elements = elements;
     }
     
     @Override
@@ -116,7 +120,7 @@
     @Override
     public ITypeRepository getTypeRepository() {
         if (typeRepository == null) {
-            typeRepository = new TypeRepository(project, this);
+            typeRepository = new TypeRepository(project, this, elements);
         }
         return typeRepository;
     }
@@ -145,6 +149,7 @@
     public void invalidate() {
         valid = false;
         //TODO: may have sense to clean stored data
+        ((TypeRepository)typeRepository).invalidate();
     }
 
     private void initializeManagedTypes() {
diff --git a/j2ee.persistence/src/org/netbeans/modules/j2ee/persistence/spi/jpql/TypeRepository.java b/j2ee.persistence/src/org/netbeans/modules/j2ee/persistence/spi/jpql/TypeRepository.java
--- a/j2ee.persistence/src/org/netbeans/modules/j2ee/persistence/spi/jpql/TypeRepository.java
+++ b/j2ee.persistence/src/org/netbeans/modules/j2ee/persistence/spi/jpql/TypeRepository.java
@@ -41,26 +41,17 @@
  */
 package org.netbeans.modules.j2ee.persistence.spi.jpql;
 
-import java.io.IOException;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import java.util.concurrent.Callable;
 import javax.lang.model.element.TypeElement;
+import javax.lang.model.util.Elements;
 import org.eclipse.persistence.jpa.jpql.TypeHelper;
 import org.eclipse.persistence.jpa.jpql.spi.IType;
 import org.eclipse.persistence.jpa.jpql.spi.ITypeRepository;
-import org.netbeans.api.java.project.JavaProjectConstants;
-import org.netbeans.api.java.source.ClasspathInfo;
 import org.netbeans.api.project.Project;
-import org.netbeans.api.project.ProjectUtils;
-import org.netbeans.api.project.SourceGroup;
-import org.netbeans.api.project.Sources;
-import org.netbeans.modules.j2ee.metadata.model.api.support.annotation.AnnotationModelHelper;
-import org.netbeans.modules.j2ee.metadata.model.api.support.annotation.PersistentObject;
 import org.netbeans.modules.j2ee.persistence.api.metadata.orm.EntityMappingsMetadata;
 import org.netbeans.modules.j2ee.persistence.util.MetadataModelReadHelper;
-import org.openide.filesystems.FileObject;
 
 /**
  *
@@ -69,15 +60,18 @@
 public class TypeRepository implements ITypeRepository {
     private final Project project;
     private final Map<String, IType[]> types;
+    private final Map<String, Boolean> packages;
     private MetadataModelReadHelper<EntityMappingsMetadata, List<org.netbeans.modules.j2ee.persistence.api.metadata.orm.Entity>> readHelper;
     private final ManagedTypeProvider mtp;
-    private AnnotationModelHelper amh;
+    private final Elements elements;
 
 
-    TypeRepository(Project project, ManagedTypeProvider mtp) {
+    TypeRepository(Project project, ManagedTypeProvider mtp, Elements elements) {
         this.project = project;
         this.mtp = mtp;
+        this.elements = elements;
         types = new HashMap<String, IType[]>();
+        packages = new HashMap<String, Boolean>();
     }
     
     @Override
@@ -90,7 +84,30 @@
             if(mainPart != null){
                 IType[] mainType = types.get(mainPart);
                 if(mainType == null){
-                    fillTypeElement(mainPart);
+                    //first check packages
+                    int mainFirstPoint = mainPart.indexOf('.');
+                    int mainLastPoint = mainPart.lastIndexOf('.');
+                    
+                    if(mainFirstPoint != mainLastPoint && mainFirstPoint>-1){
+                        //we have at least 2 points and at least one for package (we may have nested enums)
+                        for(int packagePartIndex = mainFirstPoint;packagePartIndex<mainLastPoint && packagePartIndex>-1;packagePartIndex = mainPart.indexOf('.', packagePartIndex+1)){
+                            String packageStr = mainPart.substring(0,packagePartIndex);
+                            Boolean exist = packages.get(packageStr);
+                            if(exist == null){
+                                packages.put(packageStr, elements.getPackageElement(packageStr)!=null);
+                                exist = packages.get(packageStr);
+                            }
+                            if(Boolean.FALSE.equals(exist)){
+                                mainType = new Type[]{null};
+                                types.put(mainPart, mainType);
+                                break;
+                            }
+                        }
+                    }
+                    //
+                    if(mainType == null){
+                        fillTypeElement(mainPart);
+                    }
                 }
                 mainType = types.get(mainPart);
                 if(mainType[0] != null){
@@ -137,7 +154,7 @@
             }
             ret = types.get(fqn);
         }
-        return ret[0];
+        return ret!=null ? ret[0] : null;
     }
 
     @Override
@@ -148,25 +165,10 @@
     private void fillTypeElement(final String fqn){
         types.put(fqn, new Type[]{null});
         if(isValid()){ 
-            getAnnotationModelHelper();
-            if(amh != null && isValid()) {
-                try {
-                    amh.runJavaSourceTask(new Callable<Void>() {
-
-                        @Override
-                        public Void call() throws Exception {
-                                if(isValid()) {//model will be filled with nulls  after provider invalidation and with values only if valid provider
-                                    TypeElement te = amh.getCompilationController().getElements().getTypeElement(fqn);
-                                    if(te!=null) {
-                                        PersistentObject po = new PersistentObject(amh, te) {};
-                                        types.put(fqn, new Type[]{new Type(TypeRepository.this, po)});
-                                    }
-                                }
-                                return null;
-                        }
-                    });
-                } catch (IOException ex) {
-                    //TODO: any logging?
+            if(isValid()) {
+                TypeElement te = elements.getTypeElement(fqn);
+                if(te!=null) {
+                    types.put(fqn, new Type[]{new Type(TypeRepository.this, te)});
                 }
             }
         }
@@ -174,22 +176,13 @@
     private void fillTypeElement(Class<?> type){
         types.put(type.getName(), new Type[]{new Type(TypeRepository.this, type)});
     }
-    
-    AnnotationModelHelper getAnnotationModelHelper() {
-        if(amh == null) {
-                Sources sources=ProjectUtils.getSources(project);
-                SourceGroup groups[]=sources.getSourceGroups(JavaProjectConstants.SOURCES_TYPE_JAVA);
-                if(groups != null && groups.length>0){
-                    SourceGroup firstGroup=groups[0];
-                    FileObject fo=firstGroup.getRootFolder();
-                    ClasspathInfo classpathInfo = ClasspathInfo.create(fo);
-                    amh = AnnotationModelHelper.create(classpathInfo);
-                }            
-        }
-        return amh;
-    }
+   
     
     boolean isValid(){
         return mtp.isValid();
     }
+
+    void invalidate() {
+        
+    }
 }