Bug 335276 - compile errors with near M5 platform

3 files changed, 17 insertions, 7 deletions

diff --git a/jsf/tests/org.eclipse.jst.jsf.test.util/src/org/eclipse/jst/jsf/test/util/mock/MockMarker.java b/jsf/tests/org.eclipse.jst.jsf.test.util/src/org/eclipse/jst/jsf/test/util/mock/MockMarker.java
index 005b6d8..c591011 100644
--- a/jsf/tests/org.eclipse.jst.jsf.test.util/src/org/eclipse/jst/jsf/test/util/mock/MockMarker.java
+++ b/jsf/tests/org.eclipse.jst.jsf.test.util/src/org/eclipse/jst/jsf/test/util/mock/MockMarker.java
@@ -70,7 +70,7 @@ public class MockMarker implements IMarker
         return defaultValue;
     }
 
-    public Map<?, ?> getAttributes() throws CoreException
+    public Map<String, Object> getAttributes() throws CoreException
     {
         return Collections.unmodifiableMap(_attributes);
     }
diff --git a/jsf/tests/org.eclipse.jst.jsf.test.util/src/org/eclipse/jst/jsf/test/util/mock/MockResource.java b/jsf/tests/org.eclipse.jst.jsf.test.util/src/org/eclipse/jst/jsf/test/util/mock/MockResource.java
index cafd39e..b743c23 100644
--- a/jsf/tests/org.eclipse.jst.jsf.test.util/src/org/eclipse/jst/jsf/test/util/mock/MockResource.java
+++ b/jsf/tests/org.eclipse.jst.jsf.test.util/src/org/eclipse/jst/jsf/test/util/mock/MockResource.java
@@ -288,7 +288,7 @@ public class MockResource implements IResource
         return _project.getFolder(getProjectRelativePath().removeLastSegments(1));
     }
 
-    public Map<?, ?> getPersistentProperties() throws CoreException
+    public Map<QualifiedName, String> getPersistentProperties() throws CoreException
     {
         throw new UnsupportedOperationException();
     }
@@ -335,7 +335,7 @@ public class MockResource implements IResource
         throw new UnsupportedOperationException();
     }
 
-    public Map<?, ?> getSessionProperties() throws CoreException
+    public Map<QualifiedName, Object> getSessionProperties() throws CoreException
     {
     	return getSessionPropsMap();
     }
diff --git a/jsf/tests/org.eclipse.jst.jsf.test.util/src/org/eclipse/jst/jsf/test/util/mock/osgi/MockFrameworkAdaptor.java b/jsf/tests/org.eclipse.jst.jsf.test.util/src/org/eclipse/jst/jsf/test/util/mock/osgi/MockFrameworkAdaptor.java
index 9e4cd59..aaa2540 100644
--- a/jsf/tests/org.eclipse.jst.jsf.test.util/src/org/eclipse/jst/jsf/test/util/mock/osgi/MockFrameworkAdaptor.java
+++ b/jsf/tests/org.eclipse.jst.jsf.test.util/src/org/eclipse/jst/jsf/test/util/mock/osgi/MockFrameworkAdaptor.java
@@ -278,8 +278,7 @@ public class MockFrameworkAdaptor implements FrameworkAdaptor
                 return 0;
             }
 
-            @SuppressWarnings("rawtypes")
-            public Dictionary getManifest() throws BundleException
+            public Dictionary<String, String> getManifest() throws BundleException
             {
                 // TODO Auto-generated method stub
                 return null;
@@ -303,8 +302,7 @@ public class MockFrameworkAdaptor implements FrameworkAdaptor
                 return null;
             }
 
-            @SuppressWarnings("rawtypes")
-            public Enumeration getEntryPaths(final String path)
+            public Enumeration<String> getEntryPaths(final String path)
             {
                 // TODO Auto-generated method stub
                 return null;
@@ -366,6 +364,18 @@ public class MockFrameworkAdaptor implements FrameworkAdaptor
                 // TODO Auto-generated method stub
 
             }
+
+            public Bundle getBundle()
+            {
+                // TODO Auto-generated method stub
+                return null;
+            }
+
+            public Enumeration<URL> findLocalResources(String path)
+            {
+                // TODO Auto-generated method stub
+                return null;
+            }
         };
     }