Added warning suppression for EMF generated variables that hide variables in enclosing types.

16 files changed, 69 insertions, 27 deletions

diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/internal/impl/IBeanInstanceSymbolImpl.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/internal/impl/IBeanInstanceSymbolImpl.java
index cff18148d..c143aff26 100644
--- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/internal/impl/IBeanInstanceSymbolImpl.java
+++ b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/internal/impl/IBeanInstanceSymbolImpl.java
@@ -45,6 +45,7 @@ public class IBeanInstanceSymbolImpl extends IInstanceSymbolImpl implements IBea
      * <!-- end-user-doc -->
      * @generated
      */
+    @SuppressWarnings("hiding")
     public static final String copyright = "Copyright 2006 Oracle";
 
 	/**
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/internal/impl/IBeanPropertySymbolImpl.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/internal/impl/IBeanPropertySymbolImpl.java
index 1ba71c515..cd611a315 100644
--- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/internal/impl/IBeanPropertySymbolImpl.java
+++ b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/internal/impl/IBeanPropertySymbolImpl.java
@@ -45,6 +45,7 @@ public class IBeanPropertySymbolImpl extends IPropertySymbolImpl implements IBea
      * <!-- end-user-doc -->
      * @generated
      */
+    @SuppressWarnings("hiding")
     public static final String copyright = "Copyright 2006 Oracle";
 
     /**
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/internal/impl/IBoundedJavaTypeDescriptorImpl.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/internal/impl/IBoundedJavaTypeDescriptorImpl.java
index d14cf13f4..ed338575c 100644
--- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/internal/impl/IBoundedJavaTypeDescriptorImpl.java
+++ b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/internal/impl/IBoundedJavaTypeDescriptorImpl.java
@@ -2,7 +2,7 @@
  * <copyright>
  * </copyright>
  *
- * $Id: IBoundedJavaTypeDescriptorImpl.java,v 1.5 2007/04/16 19:53:58 itrimble Exp $
+ * $Id: IBoundedJavaTypeDescriptorImpl.java,v 1.6 2007/04/26 00:08:52 cbateman Exp $
  */
 package org.eclipse.jst.jsf.context.symbol.internal.impl;
 
@@ -30,6 +30,7 @@ public class IBoundedJavaTypeDescriptorImpl extends IJavaTypeDescriptor2Impl imp
      * <!-- end-user-doc -->
      * @generated
      */
+    @SuppressWarnings("hiding")
     public static final String copyright = "Copyright 2006 Oracle";
 
     /**
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/internal/impl/IBoundedListTypeDescriptorImpl.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/internal/impl/IBoundedListTypeDescriptorImpl.java
index 7906e2969..f6fcc8dd8 100644
--- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/internal/impl/IBoundedListTypeDescriptorImpl.java
+++ b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/internal/impl/IBoundedListTypeDescriptorImpl.java
@@ -2,18 +2,17 @@
  * <copyright>
  * </copyright>
  *
- * $Id: IBoundedListTypeDescriptorImpl.java,v 1.2 2007/04/16 19:53:58 itrimble Exp $
+ * $Id: IBoundedListTypeDescriptorImpl.java,v 1.3 2007/04/26 00:08:52 cbateman Exp $
  */
 package org.eclipse.jst.jsf.context.symbol.internal.impl;
 
 import org.eclipse.emf.ecore.EClass;
-
 import org.eclipse.jdt.core.Signature;
 import org.eclipse.jst.jsf.common.internal.types.TypeConstants;
-import org.eclipse.jst.jsf.context.symbol.IBoundedJavaTypeDescriptor;
 import org.eclipse.jst.jsf.context.symbol.IBoundedListTypeDescriptor;
 import org.eclipse.jst.jsf.context.symbol.IPropertySymbol;
 import org.eclipse.jst.jsf.context.symbol.ISymbol;
+import org.eclipse.jst.jsf.context.symbol.ITypeDescriptor;
 import org.eclipse.jst.jsf.context.symbol.SymbolFactory;
 import org.eclipse.jst.jsf.context.symbol.SymbolPackage;
 
@@ -33,6 +32,7 @@ public class IBoundedListTypeDescriptorImpl extends IListTypeDescriptorImpl impl
      * <!-- end-user-doc -->
      * @generated
      */
+    @SuppressWarnings("hiding")
     public static final String copyright = "Copyright 2006 Oracle";
 
     /**
@@ -58,12 +58,12 @@ public class IBoundedListTypeDescriptorImpl extends IListTypeDescriptorImpl impl
      * <!-- end-user-doc -->
      * @generated NOT
      */
-    public boolean isUnboundedForType(String typeSignature) {
-        // TODO: for now, return true if the type is a resolved object
-        // need to add support for template checking (Java5) and
-        // decide what to do with unresolved (Q) type signatures
-        return typeSignature != null
-                && typeSignature.startsWith(Character.toString(Signature.C_RESOLVED));
+    public boolean isUnboundedForType(String typeSignature) 
+    {
+        // type signature must be a boxed integer
+        // TODO: at this level, do we need to deal with coercion to
+        // other integer types?  list.get() takes an integer...
+        return typeSignature != null && TypeConstants.TYPE_BOXED_INTEGER.equals(typeSignature);
     }
 
     /**
@@ -73,23 +73,23 @@ public class IBoundedListTypeDescriptorImpl extends IListTypeDescriptorImpl impl
      */
     public ISymbol getUnboundedProperty(Object name, String typeSignature) {
         ISymbol  retValue = null;
-        
-        if (isUnboundedForType(typeSignature))
+
+        if (isUnboundedForType(typeSignature)
+                && name instanceof Number)
         {
+            // get integer value
+            int offset = ((Number)name).intValue();
+
             // first see if we have it in our map source
             // TODO: retValue = getFromMap(name.toString());
-            
+
             if (retValue == null)
             {
                 IPropertySymbol  propSymbol = SymbolFactory.eINSTANCE.createIPropertySymbol();
                 // TODO: there is a possible problem here for non-string keyed maps
                 propSymbol.setName(name.toString());
                 propSymbol.setReadable(true);
-                IBoundedJavaTypeDescriptor typeDesc = 
-                    SymbolFactory.eINSTANCE.createIBoundedJavaTypeDescriptor();
-                
-                typeDesc.setTypeSignatureDelegate(TypeConstants.TYPE_JAVAOBJECT);
-                propSymbol.setTypeDescriptor(typeDesc);
+                propSymbol.setTypeDescriptor(getBoundsTypeDescriptor(offset));
                 retValue = propSymbol;
             }
         }
@@ -97,4 +97,31 @@ public class IBoundedListTypeDescriptorImpl extends IListTypeDescriptorImpl impl
         return retValue;
     }
 
+    /**
+     * @return the ITypeDescriptor for this List's element type (bound type).
+     * Defaults to java.lang.Object if no bounds or can't resolve bounds
+     * 
+     * @generated NOT 
+     */
+    private ITypeDescriptor getBoundsTypeDescriptor(int offset)
+    {
+        ITypeDescriptor  typeDesc = null;
+        
+        String[] bounds = Signature.getTypeArguments(getTypeSignature());
+        
+        // if no bounds at all, then default to bounded java object
+        if (bounds.length == 0)
+        {
+            typeDesc = 
+                SymbolFactory.eINSTANCE.createIBoundedJavaTypeDescriptor();
+            
+            typeDesc.setTypeSignatureDelegate(TypeConstants.TYPE_JAVAOBJECT);
+        }
+        else
+        {
+            // do nothing for now
+        }
+        
+        return typeDesc;
+    }
 } //IBoundedListTypeDescriptorImpl
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/internal/impl/IBoundedMapTypeDescriptorImpl.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/internal/impl/IBoundedMapTypeDescriptorImpl.java
index 441fb5888..3d14762ec 100644
--- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/internal/impl/IBoundedMapTypeDescriptorImpl.java
+++ b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/internal/impl/IBoundedMapTypeDescriptorImpl.java
@@ -2,7 +2,7 @@
  * <copyright>
  * </copyright>
  *
- * $Id: IBoundedMapTypeDescriptorImpl.java,v 1.4 2007/04/16 19:53:58 itrimble Exp $
+ * $Id: IBoundedMapTypeDescriptorImpl.java,v 1.5 2007/04/26 00:08:52 cbateman Exp $
  */
 package org.eclipse.jst.jsf.context.symbol.internal.impl;
 
@@ -33,6 +33,7 @@ public class IBoundedMapTypeDescriptorImpl extends IMapTypeDescriptorImpl implem
      * <!-- end-user-doc -->
      * @generated
      */
+    @SuppressWarnings("hiding")
     public static final String copyright = "Copyright 2006 Oracle";
 
     /**
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/internal/impl/IComponentSymbolImpl.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/internal/impl/IComponentSymbolImpl.java
index b95e631c8..9d1b24dea 100644
--- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/internal/impl/IComponentSymbolImpl.java
+++ b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/internal/impl/IComponentSymbolImpl.java
@@ -32,7 +32,8 @@ public class IComponentSymbolImpl extends IInstanceSymbolImpl implements ICompon
 	 * <!-- end-user-doc -->
      * @generated
      */
-	public static final String copyright = "Copyright 2006 Oracle";
+	@SuppressWarnings("hiding")
+    public static final String copyright = "Copyright 2006 Oracle";
 
     /**
      * A human readable description of this symbol
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/internal/impl/IJavaTypeDescriptor2Impl.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/internal/impl/IJavaTypeDescriptor2Impl.java
index ecc700bb7..707e4d43e 100644
--- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/internal/impl/IJavaTypeDescriptor2Impl.java
+++ b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/internal/impl/IJavaTypeDescriptor2Impl.java
@@ -66,6 +66,7 @@ public class IJavaTypeDescriptor2Impl extends ITypeDescriptorImpl implements IJa
      * <!-- end-user-doc -->
      * @generated
      */
+    @SuppressWarnings("hiding")
     public static final String copyright = "Copyright 2006 Oracle";
 
     /**
@@ -280,16 +281,16 @@ public class IJavaTypeDescriptor2Impl extends ITypeDescriptorImpl implements IJa
     }
 
     /**
-	 * 
+	 * @generated NOT
 	 */
 	public IObjectSymbol getArrayElement() 
 	{
 		if (isArray())
 		{
 			final String typeSignature = getTypeSignature();
-			final int arrayCount = Signature.getArrayCount(typeSignature);
+			final int arrayCount_ = Signature.getArrayCount(typeSignature);
 			final String baseType = Signature.getElementType(typeSignature);
-			final String elementTypeSignature = Signature.createArraySignature(baseType, arrayCount-1);
+			final String elementTypeSignature = Signature.createArraySignature(baseType, arrayCount_-1);
 
 			final IJavaTypeDescriptor2 elementTypeDesc = 
 				SymbolFactory.eINSTANCE.createIJavaTypeDescriptor2();
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/internal/impl/IMapTypeDescriptorImpl.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/internal/impl/IMapTypeDescriptorImpl.java
index c77fe41da..6e5c1908d 100644
--- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/internal/impl/IMapTypeDescriptorImpl.java
+++ b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/internal/impl/IMapTypeDescriptorImpl.java
@@ -53,6 +53,7 @@ public class IMapTypeDescriptorImpl extends ITypeDescriptorImpl implements IMapT
      * <!-- end-user-doc -->
      * @generated
      */
+    @SuppressWarnings("hiding")
     public static final String copyright = "Copyright 2006 Oracle";
 
     /**
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/internal/provider/IBeanInstanceSymbolItemProvider.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/internal/provider/IBeanInstanceSymbolItemProvider.java
index a9a28a02a..0d0e683ba 100644
--- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/internal/provider/IBeanInstanceSymbolItemProvider.java
+++ b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/internal/provider/IBeanInstanceSymbolItemProvider.java
@@ -49,6 +49,7 @@ public class IBeanInstanceSymbolItemProvider
      * <!-- end-user-doc -->
 	 * @generated
 	 */
+    @SuppressWarnings("hiding")
     public static final String copyright = "Copyright 2006 Oracle";
 
 	/**
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/internal/provider/IBeanPropertySymbolItemProvider.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/internal/provider/IBeanPropertySymbolItemProvider.java
index e0bb6658f..8f5a49217 100644
--- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/internal/provider/IBeanPropertySymbolItemProvider.java
+++ b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/internal/provider/IBeanPropertySymbolItemProvider.java
@@ -46,6 +46,7 @@ public class IBeanPropertySymbolItemProvider
      * <!-- end-user-doc -->
 	 * @generated
 	 */
+    @SuppressWarnings("hiding")
     public static final String copyright = "Copyright 2006 Oracle";
 
 	/**
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/internal/provider/IBoundedJavaTypeDescriptorItemProvider.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/internal/provider/IBoundedJavaTypeDescriptorItemProvider.java
index b1566f6a1..66e9e79e1 100644
--- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/internal/provider/IBoundedJavaTypeDescriptorItemProvider.java
+++ b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/internal/provider/IBoundedJavaTypeDescriptorItemProvider.java
@@ -2,7 +2,7 @@
  * <copyright>
  * </copyright>
  *
- * $Id: IBoundedJavaTypeDescriptorItemProvider.java,v 1.4 2007/04/16 19:54:00 itrimble Exp $
+ * $Id: IBoundedJavaTypeDescriptorItemProvider.java,v 1.5 2007/04/26 00:08:06 cbateman Exp $
  */
 package org.eclipse.jst.jsf.context.symbol.internal.provider;
 
@@ -40,6 +40,7 @@ public class IBoundedJavaTypeDescriptorItemProvider
      * <!-- end-user-doc -->
 	 * @generated
 	 */
+    @SuppressWarnings("hiding")
     public static final String copyright = "Copyright 2006 Oracle";
 
 	/**
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/internal/provider/IBoundedMapTypeDescriptorItemProvider.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/internal/provider/IBoundedMapTypeDescriptorItemProvider.java
index fdf9d238a..0b3e3bad0 100644
--- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/internal/provider/IBoundedMapTypeDescriptorItemProvider.java
+++ b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/internal/provider/IBoundedMapTypeDescriptorItemProvider.java
@@ -2,7 +2,7 @@
  * <copyright>
  * </copyright>
  *
- * $Id: IBoundedMapTypeDescriptorItemProvider.java,v 1.4 2007/04/16 19:54:00 itrimble Exp $
+ * $Id: IBoundedMapTypeDescriptorItemProvider.java,v 1.5 2007/04/26 00:08:06 cbateman Exp $
  */
 package org.eclipse.jst.jsf.context.symbol.internal.provider;
 
@@ -40,6 +40,7 @@ public class IBoundedMapTypeDescriptorItemProvider
      * <!-- end-user-doc -->
 	 * @generated
 	 */
+    @SuppressWarnings("hiding")
     public static final String copyright = "Copyright 2006 Oracle";
 
 	/**
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/internal/provider/IComponentSymbolItemProvider.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/internal/provider/IComponentSymbolItemProvider.java
index eb9be67ea..d06acf37c 100644
--- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/internal/provider/IComponentSymbolItemProvider.java
+++ b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/internal/provider/IComponentSymbolItemProvider.java
@@ -52,7 +52,8 @@ public class IComponentSymbolItemProvider
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public static final String copyright = "Copyright 2006 Oracle";
+	@SuppressWarnings("hiding")
+    public static final String copyright = "Copyright 2006 Oracle";
 
 	/**
 	 * This constructs an instance from a factory and a notifier.
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/internal/provider/IJavaTypeDescriptor2ItemProvider.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/internal/provider/IJavaTypeDescriptor2ItemProvider.java
index a120f706f..3ccbf2cdd 100644
--- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/internal/provider/IJavaTypeDescriptor2ItemProvider.java
+++ b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/internal/provider/IJavaTypeDescriptor2ItemProvider.java
@@ -51,7 +51,8 @@ public class IJavaTypeDescriptor2ItemProvider
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public static final String copyright = "Copyright 2006 Oracle";
+	@SuppressWarnings("hiding")
+    public static final String copyright = "Copyright 2006 Oracle";
 
 	/**
 	 * This constructs an instance from a factory and a notifier.
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/internal/provider/IMapTypeDescriptorItemProvider.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/internal/provider/IMapTypeDescriptorItemProvider.java
index 7aebf11cc..9fc6073a3 100644
--- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/internal/provider/IMapTypeDescriptorItemProvider.java
+++ b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/internal/provider/IMapTypeDescriptorItemProvider.java
@@ -51,6 +51,7 @@ public class IMapTypeDescriptorItemProvider
      * <!-- end-user-doc -->
 	 * @generated
 	 */
+    @SuppressWarnings("hiding")
     public static final String copyright = "Copyright 2006 Oracle";
 
 	/**
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/internal/provider/SymbolItemProviderAdapterFactory.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/internal/provider/SymbolItemProviderAdapterFactory.java
index 15e5d8bbc..79f1e0249 100644
--- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/internal/provider/SymbolItemProviderAdapterFactory.java
+++ b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/internal/provider/SymbolItemProviderAdapterFactory.java
@@ -46,6 +46,7 @@ public class SymbolItemProviderAdapterFactory extends SymbolAdapterFactory imple
      * <!-- end-user-doc -->
 	 * @generated
 	 */
+    @SuppressWarnings("hiding")
     public static final String copyright = "Copyright 2006 Oracle";
 
 	/**