Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJean Michel-Lemieux2002-03-18 12:12:01 -0500
committerJean Michel-Lemieux2002-03-18 12:12:01 -0500
commitcd7c4cc6ca0d61a65bd86d8bea71ce90be958a5e (patch)
tree5463c2cdbb26fd28c7e930329cf87a7e00d049e1
parentc576c48b6639f7992878089c2a894a17afa14685 (diff)
downloadeclipse.platform.team-cd7c4cc6ca0d61a65bd86d8bea71ce90be958a5e.tar.gz
eclipse.platform.team-cd7c4cc6ca0d61a65bd86d8bea71ce90be958a5e.tar.xz
eclipse.platform.team-cd7c4cc6ca0d61a65bd86d8bea71ce90be958a5e.zip
- added ids to plugin.xml
- handling null provider
-rw-r--r--bundles/org.eclipse.team.core/plugin.xml6
-rw-r--r--bundles/org.eclipse.team.core/src/org/eclipse/team/core/internal/MoveDeleteManager.java3
2 files changed, 6 insertions, 3 deletions
diff --git a/bundles/org.eclipse.team.core/plugin.xml b/bundles/org.eclipse.team.core/plugin.xml
index c8145a623..e9990a374 100644
--- a/bundles/org.eclipse.team.core/plugin.xml
+++ b/bundles/org.eclipse.team.core/plugin.xml
@@ -31,12 +31,12 @@
<fileTypes extension="xml" type="text"/>
</extension>
-<extension point="org.eclipse.core.resources.fileModificationValidator">
+<extension point="org.eclipse.core.resources.fileModificationValidator" id="FileValidator">
<fileModificationValidator class="org.eclipse.team.core.internal.FileModificationValidator"/>
</extension>
-<extension point="org.eclipse.core.resources.moveDeleteHook">
- <fileModificationValidator class="org.eclipse.team.core.internal.MoveDeleteManager"/>
+<extension point="org.eclipse.core.resources.moveDeleteHook" id="MoveDeleteHook">
+ <moveDeleteHook class="org.eclipse.team.core.internal.MoveDeleteManager"/>
</extension>
</plugin>
diff --git a/bundles/org.eclipse.team.core/src/org/eclipse/team/core/internal/MoveDeleteManager.java b/bundles/org.eclipse.team.core/src/org/eclipse/team/core/internal/MoveDeleteManager.java
index 85ffaf12c..3079045a3 100644
--- a/bundles/org.eclipse.team.core/src/org/eclipse/team/core/internal/MoveDeleteManager.java
+++ b/bundles/org.eclipse.team.core/src/org/eclipse/team/core/internal/MoveDeleteManager.java
@@ -24,6 +24,9 @@ public class MoveDeleteManager implements IMoveDeleteHook {
private IMoveDeleteHook getHookFor(IResource resource) {
IProject project = resource.getProject();
RepositoryProvider provider = RepositoryProviderType.getProvider(project);
+ if(provider==null) {
+ return DEFAULT_HOOK;
+ }
IMoveDeleteHook hook = provider.getMoveDeleteHook();
if (hook == null) {
return DEFAULT_HOOK;

Back to the top