commit b8c99c444a051c2f9581c7f3e47578ef07ee1de0
author Ian Trimble <ian.trimble@oracle.com> Thu Jan 23 10:17:27 2014 -0800
committer Ian Trimble <ian.trimble@oracle.com> Thu Jan 23 10:17:27 2014 -0800
tree f2eed2ef672d5f57338a8654722514bfc8a16b85
parent c740a851ea94f99619823feaf0cc73dbd2cf49a0

Bug 426471 - JSF Tests must stop using WorkspaceLock

jsf/tests/org.eclipse.jst.jsf.test.util/src/org/eclipse/jst/jsf/test/util/junit4/RealWorkspaceContext.java

diff --git a/jsf/tests/org.eclipse.jst.jsf.test.util/src/org/eclipse/jst/jsf/test/util/junit4/RealWorkspaceContext.java b/jsf/tests/org.eclipse.jst.jsf.test.util/src/org/eclipse/jst/jsf/test/util/junit4/RealWorkspaceContext.java
index 7228636..6bfb98b 100644
--- a/jsf/tests/org.eclipse.jst.jsf.test.util/src/org/eclipse/jst/jsf/test/util/junit4/RealWorkspaceContext.java
+++ b/jsf/tests/org.eclipse.jst.jsf.test.util/src/org/eclipse/jst/jsf/test/util/junit4/RealWorkspaceContext.java
@@ -56,7 +56,6 @@
 import org.eclipse.core.resources.IWorkspaceRoot;
 import org.eclipse.core.resources.IWorkspaceRunnable;
 import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.resources.WorkspaceLock;
 import org.eclipse.core.runtime.CoreException;
 import org.eclipse.core.runtime.IPath;
 import org.eclipse.core.runtime.IProgressMonitor;
@@ -829,12 +828,6 @@
         }
 
         @Override
-        public void setWorkspaceLock(final WorkspaceLock lock)
-        {
-            _ws.setWorkspaceLock(lock);
-        }
-
-        @Override
         public String[] sortNatureSet(final String[] natureIds)
         {
             return _ws.sortNatureSet(natureIds);

jsf/tests/org.eclipse.jst.jsf.test.util/src/org/eclipse/jst/jsf/test/util/mock/MockWorkspace.java

diff --git a/jsf/tests/org.eclipse.jst.jsf.test.util/src/org/eclipse/jst/jsf/test/util/mock/MockWorkspace.java b/jsf/tests/org.eclipse.jst.jsf.test.util/src/org/eclipse/jst/jsf/test/util/mock/MockWorkspace.java
index 434a8d1..7ef911c 100644
--- a/jsf/tests/org.eclipse.jst.jsf.test.util/src/org/eclipse/jst/jsf/test/util/mock/MockWorkspace.java
+++ b/jsf/tests/org.eclipse.jst.jsf.test.util/src/org/eclipse/jst/jsf/test/util/mock/MockWorkspace.java
@@ -26,7 +26,6 @@
 import org.eclipse.core.resources.IWorkspaceDescription;
 import org.eclipse.core.resources.IWorkspaceRoot;
 import org.eclipse.core.resources.IWorkspaceRunnable;
-import org.eclipse.core.resources.WorkspaceLock;
 import org.eclipse.core.runtime.CoreException;
 import org.eclipse.core.runtime.IPath;
 import org.eclipse.core.runtime.IProgressMonitor;
@@ -34,7 +33,6 @@
 import org.eclipse.core.runtime.Plugin;
 import org.eclipse.core.runtime.jobs.ISchedulingRule;
 
-@SuppressWarnings("deprecation")
 public class MockWorkspace implements IWorkspace
 {
     private final CopyOnWriteArrayList<IResourceChangeListener> _changeListeners = new CopyOnWriteArrayList<IResourceChangeListener>();
@@ -194,7 +192,7 @@
 
     }
 
-    @SuppressWarnings("rawtypes")
+    @SuppressWarnings({ "rawtypes", "unchecked" })
     public Map getDanglingReferences()
     {
         throw new UnsupportedOperationException();
@@ -313,12 +311,6 @@
 
     }
 
-    public void setWorkspaceLock(final WorkspaceLock lock)
-    {
-        throw new UnsupportedOperationException();
-
-    }
-
     public String[] sortNatureSet(final String[] natureIds)
     {
         throw new UnsupportedOperationException();