diff options
author | Michael Valenta | 2007-10-26 15:09:37 +0000 |
---|---|---|
committer | Michael Valenta | 2007-10-26 15:09:37 +0000 |
commit | 77b621c93f350b03ffcb080f9fcacc2dc4f63337 (patch) | |
tree | 22cc8eab6840a0bad25632ce14714bb18438f14d /examples | |
parent | c4b139fb55027873defe99ce0fc422a41c381b94 (diff) | |
download | eclipse.platform.team-77b621c93f350b03ffcb080f9fcacc2dc4f63337.tar.gz eclipse.platform.team-77b621c93f350b03ffcb080f9fcacc2dc4f63337.tar.xz eclipse.platform.team-77b621c93f350b03ffcb080f9fcacc2dc4f63337.zip |
Bug 195494 [Examples] org.eclipse.team.examples.filesystem logs bad messages for closed projects
Diffstat (limited to 'examples')
12 files changed, 23 insertions, 17 deletions
diff --git a/examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/filesystem/FileSystemPlugin.java b/examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/filesystem/FileSystemPlugin.java index 3922f5f1e..cb99a407e 100644 --- a/examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/filesystem/FileSystemPlugin.java +++ b/examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/filesystem/FileSystemPlugin.java @@ -135,5 +135,9 @@ public class FileSystemPlugin extends AbstractUIPlugin { tracker.dispose(); tracker = null; } + + public static void log(CoreException e) { + log (new Status(e.getStatus().getSeverity(), FileSystemPlugin.ID, 0, e.getMessage(), e)); + } } diff --git a/examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/filesystem/FileSystemProvider.java b/examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/filesystem/FileSystemProvider.java index 967b92e3c..980b28d20 100644 --- a/examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/filesystem/FileSystemProvider.java +++ b/examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/filesystem/FileSystemProvider.java @@ -157,7 +157,7 @@ public class FileSystemProvider extends RepositoryProvider { root = new Path(location); } catch (CoreException e) { // log the problem and carry on - FileSystemPlugin.log(e.getStatus()); + FileSystemPlugin.log(e); return null; } } diff --git a/examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/filesystem/ui/FileSystemSynchronizeParticipant.java b/examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/filesystem/ui/FileSystemSynchronizeParticipant.java index ac8eafd39..11cc1640a 100644 --- a/examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/filesystem/ui/FileSystemSynchronizeParticipant.java +++ b/examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/filesystem/ui/FileSystemSynchronizeParticipant.java @@ -84,7 +84,7 @@ public class FileSystemSynchronizeParticipant extends ModelSynchronizeParticipan } } } catch (TeamException e) { - FileSystemPlugin.log(e.getStatus()); + FileSystemPlugin.log(e); } return null; } diff --git a/examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/filesystem/ui/NonSyncModelMergePage.java b/examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/filesystem/ui/NonSyncModelMergePage.java index 99e7fce90..4d02dc16c 100644 --- a/examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/filesystem/ui/NonSyncModelMergePage.java +++ b/examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/filesystem/ui/NonSyncModelMergePage.java @@ -161,7 +161,7 @@ public class NonSyncModelMergePage extends Page { this.mappings.addAll(Arrays.asList(mappings )); } } catch (CoreException e) { - FileSystemPlugin.log(e.getStatus()); + FileSystemPlugin.log(e); } } } @@ -270,7 +270,7 @@ public class NonSyncModelMergePage extends Page { result.addAll(Arrays.asList(context.getDiffTree().getDiffs(traversals))); } } catch (CoreException e) { - FileSystemPlugin.log(e.getStatus()); + FileSystemPlugin.log(e); } } return (IDiff[]) result.toArray(new IDiff[result.size()]); diff --git a/examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/model/ModelProject.java b/examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/model/ModelProject.java index a3f58a242..7585840a2 100644 --- a/examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/model/ModelProject.java +++ b/examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/model/ModelProject.java @@ -21,6 +21,8 @@ import org.eclipse.core.runtime.IProgressMonitor; public class ModelProject extends ModelContainer { public static boolean isModProject(IProject project) throws CoreException { + if (! project.isOpen()) + return false; IProjectDescription description = project.getDescription(); return description.hasNature(ModelNature.NATURE_ID); } diff --git a/examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/model/mapping/ExampleModelProvider.java b/examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/model/mapping/ExampleModelProvider.java index b244cec32..0bf68892c 100644 --- a/examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/model/mapping/ExampleModelProvider.java +++ b/examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/model/mapping/ExampleModelProvider.java @@ -70,7 +70,7 @@ public class ExampleModelProvider extends } }); } catch (CoreException e) { - FileSystemPlugin.log(e.getStatus()); + FileSystemPlugin.log(e); } if (problems.size() == 1) return (IStatus)problems.get(0); diff --git a/examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/model/mapping/ModResourceMapping.java b/examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/model/mapping/ModResourceMapping.java index e7f38c956..7feab8b3e 100644 --- a/examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/model/mapping/ModResourceMapping.java +++ b/examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/model/mapping/ModResourceMapping.java @@ -91,7 +91,7 @@ public class ModResourceMapping extends ModelResourceMapping { try { return getLocalResources().contains(resource); } catch (CoreException e) { - FileSystemPlugin.log(e.getStatus()); + FileSystemPlugin.log(e); } } } diff --git a/examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/model/mapping/ModelMerger.java b/examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/model/mapping/ModelMerger.java index 920a81662..f48430d6c 100644 --- a/examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/model/mapping/ModelMerger.java +++ b/examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/model/mapping/ModelMerger.java @@ -138,7 +138,7 @@ public class ModelMerger extends ResourceMappingMerger { modelProjects.add(project); } } catch (CoreException e) { - FileSystemPlugin.log(e.getStatus()); + FileSystemPlugin.log(e); } } if (modelProjects.isEmpty()) diff --git a/examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/model/ui/ModelNavigatorContentProvider.java b/examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/model/ui/ModelNavigatorContentProvider.java index 11cb1e093..229ed9d31 100644 --- a/examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/model/ui/ModelNavigatorContentProvider.java +++ b/examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/model/ui/ModelNavigatorContentProvider.java @@ -225,7 +225,7 @@ public class ModelNavigatorContentProvider extends BaseWorkbenchContentProvider try { return ModelProject.isModProject(resource.getProject()); } catch (CoreException e) { - FileSystemPlugin.log(e.getStatus()); + FileSystemPlugin.log(e); return false; } } @@ -258,7 +258,7 @@ public class ModelNavigatorContentProvider extends BaseWorkbenchContentProvider newProjects.add(ModelObject.create(project)); } } catch (CoreException e) { - FileSystemPlugin.log(e.getStatus()); + FileSystemPlugin.log(e); } } } @@ -288,7 +288,7 @@ public class ModelNavigatorContentProvider extends BaseWorkbenchContentProvider iter.remove(); } } catch (CoreException e) { - FileSystemPlugin.log(e.getStatus()); + FileSystemPlugin.log(e); } } } diff --git a/examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/model/ui/ModelWorkbenchAdapter.java b/examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/model/ui/ModelWorkbenchAdapter.java index f0d5ad39a..606f1015d 100644 --- a/examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/model/ui/ModelWorkbenchAdapter.java +++ b/examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/model/ui/ModelWorkbenchAdapter.java @@ -35,7 +35,7 @@ public class ModelWorkbenchAdapter implements IWorkbenchAdapter { try { return mo.getChildren(); } catch (CoreException e) { - FileSystemPlugin.log(e.getStatus()); + FileSystemPlugin.log(e); } } return new Object[0]; diff --git a/examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/model/ui/mapping/ModelSyncContentProvider.java b/examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/model/ui/mapping/ModelSyncContentProvider.java index 61bee3595..787c65454 100644 --- a/examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/model/ui/mapping/ModelSyncContentProvider.java +++ b/examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/model/ui/mapping/ModelSyncContentProvider.java @@ -95,7 +95,7 @@ public class ModelSyncContentProvider extends SynchronizationContentProvider imp // (i.e. we may end up hitting the server) but it will do for illustration purposes return mapping.getTraversals(rmc, new NullProgressMonitor()); } catch (CoreException e) { - FileSystemPlugin.log(e.getStatus()); + FileSystemPlugin.log(e); } } return new ResourceTraversal[0]; @@ -163,7 +163,7 @@ public class ModelSyncContentProvider extends SynchronizationContentProvider imp newProjects.add(ModelObject.create(project)); } } catch (CoreException e) { - FileSystemPlugin.log(e.getStatus()); + FileSystemPlugin.log(e); } } } @@ -198,7 +198,7 @@ public class ModelSyncContentProvider extends SynchronizationContentProvider imp iter.remove(); } } catch (CoreException e) { - FileSystemPlugin.log(e.getStatus()); + FileSystemPlugin.log(e); } } } @@ -327,7 +327,7 @@ public class ModelSyncContentProvider extends SynchronizationContentProvider imp try { return ModelProject.isModProject(project); } catch (CoreException e) { - FileSystemPlugin.log(e.getStatus()); + FileSystemPlugin.log(e); } return false; } diff --git a/examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/model/ui/mapping/ModelSyncLabelProvider.java b/examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/model/ui/mapping/ModelSyncLabelProvider.java index 04dbf6cfc..8194f21c5 100644 --- a/examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/model/ui/mapping/ModelSyncLabelProvider.java +++ b/examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/model/ui/mapping/ModelSyncLabelProvider.java @@ -94,7 +94,7 @@ public class ModelSyncLabelProvider extends SynchronizationLabelProvider { break; } } catch (CoreException e) { - FileSystemPlugin.log(e.getStatus()); + FileSystemPlugin.log(e); } } return busy; @@ -117,7 +117,7 @@ public class ModelSyncLabelProvider extends SynchronizationLabelProvider { break; } } catch (CoreException e) { - FileSystemPlugin.log(e.getStatus()); + FileSystemPlugin.log(e); } } return conflict; |