Author: scabanovich Date: 2011-04-28 21:30:52 -0400 (Thu, 28 Apr 2011) New Revision: 30958 Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/IDefinitionContext.java trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/extension/AbstractDefinitionContextExtension.java trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/definition/AbstractTypeDefinition.java trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/definition/DefinitionContext.java Log: JBIDE-3120 https://issues.jboss.org/browse/JBIDE-3120 Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/IDefinitionContext.java =================================================================== --- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/IDefinitionContext.java 2011-04-28 23:57:26 UTC (rev 30957) +++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/IDefinitionContext.java 2011-04-29 01:30:52 UTC (rev 30958) @@ -10,7 +10,10 @@ ******************************************************************************/ package org.jboss.tools.cdi.core; +import java.util.List; + import org.eclipse.core.runtime.IPath; +import org.jboss.tools.cdi.internal.core.impl.definition.TypeDefinition; /** * @@ -57,4 +60,11 @@ */ public void clean(String typeName); + /** + * Returns list of TypeDefinition defined and stored inside this context. + * + * @return list of TypeDefinition defined and stored inside this context + */ + public List<TypeDefinition> getTypeDefinitions(); + } Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/extension/AbstractDefinitionContextExtension.java =================================================================== --- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/extension/AbstractDefinitionContextExtension.java 2011-04-28 23:57:26 UTC (rev 30957) +++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/extension/AbstractDefinitionContextExtension.java 2011-04-29 01:30:52 UTC (rev 30958) @@ -1,11 +1,29 @@ +/******************************************************************************* + * Copyright (c) 2011 Red Hat, Inc. + * Distributed under license by Red Hat, Inc. All rights reserved. + * This program is made available under the terms of the + * Eclipse Public License v1.0 which accompanies this distribution, + * and is available at http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Red Hat, Inc. - initial API and implementation + ******************************************************************************/ package org.jboss.tools.cdi.core.extension; +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; + import org.eclipse.core.runtime.IPath; -import org.eclipse.jdt.core.IType; -import org.jboss.tools.cdi.core.CDIConstants; import org.jboss.tools.cdi.core.IRootDefinitionContext; import org.jboss.tools.cdi.internal.core.impl.definition.AnnotationDefinition; +import org.jboss.tools.cdi.internal.core.impl.definition.TypeDefinition; +/** + * + * @author Viacheslav Kabanovich + * + */ public abstract class AbstractDefinitionContextExtension implements IDefinitionContextExtension { protected IRootDefinitionContext root; @@ -69,4 +87,10 @@ } + private static List<TypeDefinition> EMPTY_LIST = Collections.unmodifiableList(new ArrayList<TypeDefinition>()); + + public List<TypeDefinition> getTypeDefinitions() { + return EMPTY_LIST; + } + } Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/definition/AbstractTypeDefinition.java =================================================================== --- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/definition/AbstractTypeDefinition.java 2011-04-28 23:57:26 UTC (rev 30957) +++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/definition/AbstractTypeDefinition.java 2011-04-29 01:30:52 UTC (rev 30958) @@ -45,6 +45,10 @@ isVetoed = true; } + public void unveto() { + isVetoed = false; + } + public boolean isVetoed() { return isVetoed; } Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/definition/DefinitionContext.java =================================================================== --- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/definition/DefinitionContext.java 2011-04-28 23:57:26 UTC (rev 30957) +++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/definition/DefinitionContext.java 2011-04-29 01:30:52 UTC (rev 30958) @@ -418,6 +418,10 @@ synchronized (typeDefinitions) { result.addAll(typeDefinitions.values()); } + for (IDefinitionContextExtension e: extensions) { + List<TypeDefinition> ds = e.getTypeDefinitions(); + if(ds != null && !ds.isEmpty()) result.addAll(ds); + } return result; }