diff options
Diffstat (limited to 'plugins')
3 files changed, 21 insertions, 6 deletions
diff --git a/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/logical/EMFModelProvider.java b/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/logical/EMFModelProvider.java index 770fff707..bcde040fd 100644 --- a/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/logical/EMFModelProvider.java +++ b/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/logical/EMFModelProvider.java @@ -104,8 +104,8 @@ public class EMFModelProvider extends ModelProvider { @Override public ResourceMapping[] getMappings(IResource resource, ResourceMappingContext context, IProgressMonitor monitor) throws CoreException { - if (LOGGER.isDebugEnabled()) { - LOGGER.debug("getMappings() - START"); //$NON-NLS-1$ + if (LOGGER.isInfoEnabled()) { + LOGGER.info("getMappings() - START for " + resource); //$NON-NLS-1$ } if (resource instanceof IFile) { try { @@ -114,8 +114,8 @@ public class EMFModelProvider extends ModelProvider { if (syncModel != null) { final ResourceMapping mapping = new EMFResourceMapping(resource, context, syncModel, PROVIDER_ID); - if (LOGGER.isDebugEnabled()) { - LOGGER.debug("getMappings() - FINISH NORMALLY"); //$NON-NLS-1$ + if (LOGGER.isInfoEnabled()) { + LOGGER.info("getMappings() - FINISH NORMALLY"); //$NON-NLS-1$ } return new ResourceMapping[] {mapping, }; } else { @@ -126,8 +126,8 @@ public class EMFModelProvider extends ModelProvider { // fall back to super } } - if (LOGGER.isDebugEnabled()) { - LOGGER.debug("getMappings() - FINISH ABNORMALLY"); //$NON-NLS-1$ + if (LOGGER.isInfoEnabled()) { + LOGGER.info("getMappings() - fallback to super."); //$NON-NLS-1$ } return super.getMappings(resource, context, monitor); } diff --git a/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/logical/resolver/ResourceDependencyLocalResolver.java b/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/logical/resolver/ResourceDependencyLocalResolver.java index d6a716d26..4e4e9f122 100644 --- a/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/logical/resolver/ResourceDependencyLocalResolver.java +++ b/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/logical/resolver/ResourceDependencyLocalResolver.java @@ -26,6 +26,7 @@ import java.util.LinkedHashSet; import java.util.List; import java.util.Set; +import org.apache.log4j.Logger; import org.eclipse.core.resources.IFile; import org.eclipse.core.resources.IResource; import org.eclipse.core.resources.ResourcesPlugin; @@ -44,6 +45,9 @@ import org.eclipse.emf.ecore.resource.Resource; * @author <a href="mailto:laurent.delaigue@obeo.fr">Laurent Delaigue</a> */ public class ResourceDependencyLocalResolver implements IResourceDependencyLocalResolver { + /** The logger. */ + private static final Logger LOGGER = Logger.getLogger(ResourceDependencyLocalResolver.class); + /** The scheduler. */ private final ResourceComputationScheduler<URI> scheduler; @@ -235,6 +239,10 @@ public class ResourceDependencyLocalResolver implements IResourceDependencyLocal public void updateDependencies(IProgressMonitor monitor, final DiagnosticSupport diagnostic, IFile... files) throws InterruptedException { final ThreadSafeProgressMonitor tspm = new ThreadSafeProgressMonitor(monitor); + if (LOGGER.isDebugEnabled()) { + LOGGER.debug("INSTANTIATING SynchronizedResourceSet to update dependencies with " //$NON-NLS-1$ + + files.length + " files"); //$NON-NLS-1$ + } final SynchronizedResourceSet resourceSet = new SynchronizedResourceSet( new LocalMonitoredProxyCreationListener(tspm, eventBus, this, diagnostic)); Iterable<IFile> filesToResolve = Iterables.filter(Arrays.asList(files), new Predicate<IFile>() { diff --git a/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/logical/resolver/ResourceDependencyRemoteResolver.java b/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/logical/resolver/ResourceDependencyRemoteResolver.java index 8ae455993..60dabd8f1 100644 --- a/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/logical/resolver/ResourceDependencyRemoteResolver.java +++ b/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/logical/resolver/ResourceDependencyRemoteResolver.java @@ -13,6 +13,7 @@ package org.eclipse.emf.compare.ide.ui.internal.logical.resolver; import com.google.common.util.concurrent.FutureCallback; +import org.apache.log4j.Logger; import org.eclipse.emf.common.util.BasicDiagnostic; import org.eclipse.emf.common.util.URI; import org.eclipse.emf.compare.ide.ui.internal.util.ThreadSafeProgressMonitor; @@ -23,6 +24,9 @@ import org.eclipse.emf.compare.ide.ui.internal.util.ThreadSafeProgressMonitor; * @author <a href="mailto:laurent.delaigue@obeo.fr">Laurent Delaigue</a> */ public class ResourceDependencyRemoteResolver implements IResourceDependencyRemoteResolver { + /** The logger. */ + private static final Logger LOGGER = Logger.getLogger(ResourceDependencyLocalResolver.class); + /** The scheduler. */ protected final ResourceComputationScheduler<URI> scheduler; @@ -77,6 +81,9 @@ public class ResourceDependencyRemoteResolver implements IResourceDependencyRemo public SynchronizedResourceSet getResourceSetForRemoteResolution(DiagnosticSupport diagnostic, ThreadSafeProgressMonitor tspm) { + if (LOGGER.isDebugEnabled()) { + LOGGER.debug("INSTANTIATING SynchronizedResourceSet for remote resolution."); //$NON-NLS-1$ + } final SynchronizedResourceSet resourceSet = new SynchronizedResourceSet( new RemoteMonitoredProxyCreationListener(tspm, this, diagnostic)); return resourceSet; |