ant-notifications mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hi...@apache.org
Subject svn commit: r1406380 - in /ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse: ./ cpcontainer/ handlers/ resolve/ retrieve/ ui/ ui/editors/ ui/editors/xml/ ui/menu/ ui/preferences/ ui/wizards/ workspaceresolver/
Date Tue, 06 Nov 2012 22:25:10 GMT
Author: hibou
Date: Tue Nov  6 22:25:09 2012
New Revision: 1406380

URL: http://svn.apache.org/viewvc?rev=1406380&view=rev
Log:
Make IvyDE more verbose in the logs

Modified:
    ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/CachedIvy.java
    ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/IvyDEException.java
    ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/IvyMarkerManager.java
    ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/IvyNature.java
    ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/IvyPlugin.java
    ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/cpcontainer/IvyAttachementManager.java
    ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/cpcontainer/IvyClasspathContainer.java
    ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/cpcontainer/IvyClasspathContainerConfAdapter.java
    ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/cpcontainer/IvyClasspathContainerMapper.java
    ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/cpcontainer/IvyClasspathContainerSerializer.java
    ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/cpcontainer/IvyClasspathInitializer.java
    ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/cpcontainer/IvyClasspathUtil.java
    ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/handlers/ViewReverseDependenciesHandler.java
    ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/resolve/IvyResolveJob.java
    ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/resolve/IvyResolver.java
    ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/resolve/ResolveResult.java
    ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/retrieve/RetrieveSetupManager.java
    ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/ui/IvyFilePathText.java
    ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/ui/SettingsSetupEditor.java
    ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/ui/editors/IvyModuleDescriptorEditor.java
    ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/ui/editors/xml/EclipseIvyModelSettings.java
    ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/ui/editors/xml/IvyContentAssistProcessor.java
    ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/ui/editors/xml/NonRuleBasedDamagerRepairer.java
    ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/ui/editors/xml/XMLDoubleClickStrategy.java
    ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/ui/menu/IvyMenuContributionItem.java
    ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/ui/preferences/IvyDEProjectPreferences.java
    ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/ui/preferences/IvyPreferencePage.java
    ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/ui/wizards/IvyNewWizard.java
    ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/workspaceresolver/WorkspaceResolver.java

Modified: ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/CachedIvy.java
URL: http://svn.apache.org/viewvc/ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/CachedIvy.java?rev=1406380&r1=1406379&r2=1406380&view=diff
==============================================================================
--- ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/CachedIvy.java (original)
+++ ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/CachedIvy.java Tue Nov  6 22:25:09 2012
@@ -133,7 +133,7 @@ public abstract class CachedIvy {
                             + settingsPath.getError().getMessage(), settingsPath.getError());
         }
         if (!settingsPath.isSet()) {
-            // no settings specified, so take the default one
+            Message.debug("[IvyDE] No settings specified, so take the default one");
             if (ivy == null) {
                 IvySettings ivySettings = createIvySettings();
                 ivy = Ivy.newInstance(ivySettings);
@@ -184,6 +184,7 @@ public abstract class CachedIvy {
 
     private Ivy getIvyFromFile(ResolvedPath ivySettingsPath) throws IvyDEException {
         File file = ivySettingsPath.getFile();
+        Message.debug("[IvyDE] Loading settings from local file " + file);
         if (!file.exists()) {
             throw new IvyDEException("Ivy settings file not found", "The Ivy settings file '"
                     + ivySettingsPath.getResolvedPath() + "' cannot be found", null);
@@ -191,10 +192,8 @@ public abstract class CachedIvy {
 
         if (file.lastModified() != ivySettingsLastModified || !isLoadSettingsOnDemandPath()) {
             IvySettings ivySettings = createIvySettings();
-            if (ivySettingsLastModified == -1) {
-                Message.info("\n\n");
-            } else {
-                Message.info("\n\nIVYDE: ivysettings has changed, configuring ivy again\n");
+            if (ivySettingsLastModified != -1) {
+                Message.info("[IvyDE] Settings has changed, configuring Ivy again");
             }
             ivy = Ivy.newInstance(ivySettings);
             try {
@@ -211,6 +210,8 @@ public abstract class CachedIvy {
                                 + "' could not be read: " + e.getMessage(), e);
             }
             ivySettingsLastModified = file.lastModified();
+        } else {
+            Message.verbose("[IvyDE] No change detected: using cached version of the settings");
         }
         return ivy;
     }
@@ -218,6 +219,7 @@ public abstract class CachedIvy {
     private IvySettings createIvySettings() throws IvyDEException {
         IvySettings ivySettings;
         if (isResolveInWorkspace()) {
+            Message.verbose("[IvyDE] Adding the workspace resolver to the settings");
             ivySettings = new WorkspaceIvySettings(getProject());
             DefaultRepositoryCacheManager cacheManager = new DefaultRepositoryCacheManager();
             BundleContext bundleContext = IvyPlugin.getDefault().getBundleContext();
@@ -246,11 +248,13 @@ public abstract class CachedIvy {
         }
         Collection propFiles = getPropertyFiles();
         if (propFiles != null) {
+            Message.verbose("[IvyDE] Loading property files");
             Iterator iter = propFiles.iterator();
             while (iter.hasNext()) {
                 String file = (String) iter.next();
                 InputStream is;
                 Path p = new Path(file);
+                Message.debug("[IvyDE] Loading property file " + p);
                 if (getProject() != null && !p.isAbsolute()) {
                     try {
                         is = new FileInputStream(getProject().getLocation().append(file).toFile());

Modified: ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/IvyDEException.java
URL: http://svn.apache.org/viewvc/ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/IvyDEException.java?rev=1406380&r1=1406379&r2=1406380&view=diff
==============================================================================
--- ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/IvyDEException.java (original)
+++ ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/IvyDEException.java Tue Nov  6 22:25:09 2012
@@ -89,8 +89,7 @@ public class IvyDEException extends Exce
                             msg);
                         return;
                     default:
-                        IvyPlugin.log(IStatus.WARNING, "Unsupported IvyDE error status: " + status,
-                            null);
+                        IvyPlugin.logWarn("Unsupported IvyDE error status: " + status);
                 }
             }
         });
@@ -135,16 +134,18 @@ public class IvyDEException extends Exce
         String msg = (preMsg == null ? "" : preMsg) + getMessage();
         switch (status) {
             case IStatus.ERROR:
-                Message.error("IVYDE: " + msg);
+                Message.error("[IvyDE] " + msg);
                 return;
+            case IStatus.CANCEL:
             case IStatus.WARNING:
-                Message.warn("IVYDE: " + msg);
+                Message.warn("[IvyDE] " + msg);
                 return;
+            case IStatus.OK:
             case IStatus.INFO:
-                Message.info("IVYDE: " + msg);
+                Message.info("[IvyDE] " + msg);
                 return;
             default:
-                IvyPlugin.log(IStatus.WARNING, "Unsupported IvyDE error status: " + status, null);
+                IvyPlugin.logWarn("Unsupported IvyDE error status: " + status);
         }
     }
 }

Modified: ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/IvyMarkerManager.java
URL: http://svn.apache.org/viewvc/ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/IvyMarkerManager.java?rev=1406380&r1=1406379&r2=1406380&view=diff
==============================================================================
--- ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/IvyMarkerManager.java (original)
+++ ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/IvyMarkerManager.java Tue Nov  6 22:25:09 2012
@@ -91,8 +91,7 @@ public class IvyMarkerManager {
                 marker.setAttribute(IMarker.SEVERITY, IMarker.SEVERITY_INFO);
                 break;
             default:
-                IvyPlugin.log(IStatus.WARNING,
-                    "Unsupported resolve status: " + status.getSeverity(), null);
+                IvyPlugin.logWarn("Unsupported resolve status: " + status.getSeverity());
         }
     }
 

Modified: ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/IvyNature.java
URL: http://svn.apache.org/viewvc/ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/IvyNature.java?rev=1406380&r1=1406379&r2=1406380&view=diff
==============================================================================
--- ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/IvyNature.java (original)
+++ ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/IvyNature.java Tue Nov  6 22:25:09 2012
@@ -77,8 +77,8 @@ public class IvyNature implements IProje
         try {
             return project.hasNature(IVY_NATURE);
         } catch (CoreException e) {
-            IvyPlugin.log(IStatus.ERROR,
-                "Unable to get the Ivy nature of the project " + project.getName(), e);
+            IvyPlugin.logError("Unable to get the Ivy nature of the project " + project.getName(),
+                e);
             return false;
         }
     }
@@ -92,8 +92,7 @@ public class IvyNature implements IProje
         try {
             description = project.getDescription();
         } catch (CoreException e) {
-            IvyPlugin.log(IStatus.ERROR,
-                "Failed to add Ivy dependency management on " + project.getName(), e);
+            IvyPlugin.logError("Failed to add Ivy dependency management on " + project.getName(), e);
             return;
         }
         final String[] ids = description.getNatureIds();
@@ -110,8 +109,8 @@ public class IvyNature implements IProje
                 try {
                     project.setDescription(description, null);
                 } catch (CoreException e) {
-                    IvyPlugin.log(IStatus.ERROR, "Failed to add Ivy dependency management on "
-                            + project.getName(), e);
+                    IvyPlugin.logError(
+                        "Failed to add Ivy dependency management on " + project.getName(), e);
                 }
             }
         });
@@ -152,7 +151,7 @@ public class IvyNature implements IProje
             description.setNatureIds(newIds);
             project.setDescription(description, null);
         } catch (Exception e) {
-            IvyPlugin.log(IStatus.ERROR,
+            IvyPlugin.logError(
                 "Failed to remove Ivy dependency management on " + project.getName(), e);
         }
     }

Modified: ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/IvyPlugin.java
URL: http://svn.apache.org/viewvc/ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/IvyPlugin.java?rev=1406380&r1=1406379&r2=1406380&view=diff
==============================================================================
--- ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/IvyPlugin.java (original)
+++ ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/IvyPlugin.java Tue Nov  6 22:25:09 2012
@@ -25,6 +25,7 @@ import java.util.List;
 import java.util.MissingResourceException;
 import java.util.ResourceBundle;
 
+import org.apache.ivy.util.Message;
 import org.apache.ivyde.common.ivyfile.IvyFileResourceListener;
 import org.apache.ivyde.eclipse.cpcontainer.IvyAttachementManager;
 import org.apache.ivyde.eclipse.cpcontainer.IvyClasspathContainer;
@@ -118,7 +119,7 @@ public class IvyPlugin extends AbstractU
     public void start(BundleContext context) throws Exception {
         super.start(context);
         this.bundleContext = context;
-        log(IStatus.INFO, "starting IvyDE plugin", null);
+        logInfo("starting IvyDE plugin");
         ivyResolveJob = new IvyResolveJob();
 
         retrieveSetupManager = new RetrieveSetupManager();
@@ -155,7 +156,7 @@ public class IvyPlugin extends AbstractU
             console = new IvyConsole();
         } catch (RuntimeException e) {
             // Don't let the console bring down the IvyDE UI
-            log(IStatus.ERROR, "Errors occurred starting the Ivy console", e);
+            logError("Errors occurred starting the Ivy console", e);
         }
 
         // Listen for project open/close events to auto-update inter-project dependencies
@@ -176,14 +177,14 @@ public class IvyPlugin extends AbstractU
         ivyCpcSerializer = new IvyClasspathContainerSerializer(containersStateDir,
                 ivyAttachementManager);
 
-        log(IStatus.INFO, "IvyDE plugin started", null);
-
         try {
             Class.forName("org.apache.ivy.osgi.core.ManifestParser");
             osgiAvailable = true;
         } catch (Exception e) {
             osgiAvailable = false;
         }
+
+        logInfo("IvyDE plugin started");
     }
 
     /**
@@ -239,6 +240,19 @@ public class IvyPlugin extends AbstractU
      */
     public static void log(IStatus status) {
         getDefault().getLog().log(status);
+        switch (status.getCode()) {
+            case IStatus.ERROR:
+                Message.error("[IvyDE] " + status.getMessage());
+                break;
+            case IStatus.CANCEL:
+            case IStatus.WARNING:
+                Message.warn("[IvyDE] "  + status.getMessage());
+                break;
+            case IStatus.OK:
+            case IStatus.INFO:
+                Message.info("[IvyDE] "  + status.getMessage());
+                break;
+        }
     }
 
     public static void log(CoreException e) {
@@ -252,6 +266,26 @@ public class IvyPlugin extends AbstractU
         log(new Status(severity, ID, 0, message, e));
     }
 
+    public static void logInfo(String message) {
+        log(new Status(IStatus.INFO, ID, 0, message, null));
+    }
+
+    public static void logWarn(String message) {
+        logWarn(message, null);
+    }
+
+    public static void logWarn(String message, Throwable e) {
+        log(new Status(IStatus.WARNING, ID, 0, message, e));
+    }
+
+    public static void logError(String message) {
+        logError(message, null);
+    }
+
+    public static void logError(String message, Throwable e) {
+        log(new Status(IStatus.ERROR, ID, 0, message, e));
+    }
+
     /**
      * Returns the shared instance.
      * 

Modified: ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/cpcontainer/IvyAttachementManager.java
URL: http://svn.apache.org/viewvc/ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/cpcontainer/IvyAttachementManager.java?rev=1406380&r1=1406379&r2=1406380&view=diff
==============================================================================
--- ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/cpcontainer/IvyAttachementManager.java (original)
+++ ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/cpcontainer/IvyAttachementManager.java Tue Nov  6 22:25:09 2012
@@ -25,9 +25,9 @@ import java.net.MalformedURLException;
 import java.net.URL;
 import java.util.Properties;
 
+import org.apache.ivy.util.Message;
 import org.apache.ivyde.eclipse.IvyPlugin;
 import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IStatus;
 import org.eclipse.core.runtime.Path;
 import org.eclipse.jdt.core.IClasspathAttribute;
 import org.eclipse.jdt.core.IClasspathContainer;
@@ -48,6 +48,11 @@ public class IvyAttachementManager {
 
     public IvyAttachementManager(File containersAttachementFile) {
         this.containersAttachementFile = containersAttachementFile;
+        if (!containersAttachementFile.exists()) {
+            Message.verbose("[IvyDE] Attachement properties file not found: nothing to load");
+            return;
+        }
+        Message.verbose("[IvyDE] Reading attachement properties");
         try {
             FileInputStream in = new FileInputStream(containersAttachementFile);
             try {
@@ -60,12 +65,14 @@ public class IvyAttachementManager {
                 }
             }
         } catch (IOException ioe) {
-            IvyPlugin.log(IStatus.WARNING, "IvyDE attachement properties could not be loaded", ioe);
+            IvyPlugin.logWarn("IvyDE attachement properties could not be loaded", ioe);
         }
     }
 
     public void updateAttchements(IJavaProject project, IPath containerPath,
             IClasspathContainer containerSuggestion) {
+        Message.verbose("[IvyDE] Updating attachements on the container " + containerPath);
+        
         Properties newProps = new Properties();
 
         IClasspathEntry[] newEntries = containerSuggestion.getClasspathEntries();
@@ -91,6 +98,7 @@ public class IvyAttachementManager {
         IvyClasspathContainer ivycp = IvyClasspathUtil.getIvyClasspathContainer(containerPath,
             project);
         if (ivycp == null) {
+            Message.error("[IvyDE] The IvyDE container could not be found. Aborting updating attachements.");
             // something wrong happened, give up
             return;
         }
@@ -119,6 +127,7 @@ public class IvyAttachementManager {
         ivycp.updateClasspathEntries(newEntries);
 
         // store the global result
+        Message.verbose("[IvyDE] Saving attachement properties");
         try {
             FileOutputStream out = new FileOutputStream(containersAttachementFile);
             try {
@@ -131,7 +140,7 @@ public class IvyAttachementManager {
                 }
             }
         } catch (IOException ioe) {
-            IvyPlugin.log(IStatus.WARNING, "IvyDE attachement properties could not be saved", ioe);
+            IvyPlugin.logWarn("IvyDE attachement properties could not be saved", ioe);
         }
     }
 
@@ -157,8 +166,7 @@ public class IvyAttachementManager {
             try {
                 return new URL(srcPath);
             } catch (MalformedURLException e) {
-                IvyPlugin.log(IStatus.WARNING,
-                    "The path for the doc attachement is not a valid URL", e);
+                IvyPlugin.logWarn("The path for the doc attachement is not a valid URL", e);
                 return null;
             }
         }

Modified: ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/cpcontainer/IvyClasspathContainer.java
URL: http://svn.apache.org/viewvc/ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/cpcontainer/IvyClasspathContainer.java?rev=1406380&r1=1406379&r2=1406380&view=diff
==============================================================================
--- ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/cpcontainer/IvyClasspathContainer.java (original)
+++ ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/cpcontainer/IvyClasspathContainer.java Tue Nov  6 22:25:09 2012
@@ -25,6 +25,7 @@ import java.util.Comparator;
 import org.apache.ivy.Ivy;
 import org.apache.ivy.core.module.descriptor.ModuleDescriptor;
 import org.apache.ivy.core.report.ResolveReport;
+import org.apache.ivy.util.Message;
 import org.apache.ivyde.eclipse.IvyPlugin;
 import org.apache.ivyde.eclipse.resolve.IvyResolveJob;
 import org.apache.ivyde.eclipse.resolve.ResolveRequest;
@@ -132,6 +133,7 @@ public class IvyClasspathContainer imple
     }
 
     void updateClasspathEntries(final IClasspathEntry[] newEntries) {
+        Message.verbose("[IvyDE] Updating the classpath container " + toString());
         IClasspathEntry[] entries;
         if (newEntries != null) {
             entries = newEntries;
@@ -152,6 +154,7 @@ public class IvyClasspathContainer imple
                         }
                     });
                 }
+                Message.debug("[IvyDE] Setting the classpath container " + toString() + " with " + Arrays.toString(entries));
                 classpathEntries = entries;
                 notifyUpdateClasspathEntries();
             }

Modified: ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/cpcontainer/IvyClasspathContainerConfAdapter.java
URL: http://svn.apache.org/viewvc/ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/cpcontainer/IvyClasspathContainerConfAdapter.java?rev=1406380&r1=1406379&r2=1406380&view=diff
==============================================================================
--- ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/cpcontainer/IvyClasspathContainerConfAdapter.java (original)
+++ ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/cpcontainer/IvyClasspathContainerConfAdapter.java Tue Nov  6 22:25:09 2012
@@ -123,7 +123,7 @@ public final class IvyClasspathContainer
                 value = parameter.length > 1 ? URLDecoder.decode(parameter[1], "UTF-8") : "";
             } catch (UnsupportedEncodingException e) {
                 // this should never never happen
-                IvyPlugin.log(IStatus.ERROR, UTF8_ERROR, e);
+                IvyPlugin.logError(UTF8_ERROR, e);
                 throw new RuntimeException(UTF8_ERROR, e);
             }
             if (parameter[0].equals("project")) {
@@ -411,7 +411,7 @@ public final class IvyClasspathContainer
                 append(path, "useExtendedResolveId", setup.isUseExtendedResolveId());
             }
         } catch (UnsupportedEncodingException e) {
-            IvyPlugin.log(IStatus.ERROR, UTF8_ERROR, e);
+            IvyPlugin.logError(UTF8_ERROR, e);
             throw new RuntimeException(UTF8_ERROR, e);
         }
         return new Path(IvyClasspathContainer.CONTAINER_ID).append(path.toString());

Modified: ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/cpcontainer/IvyClasspathContainerMapper.java
URL: http://svn.apache.org/viewvc/ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/cpcontainer/IvyClasspathContainerMapper.java?rev=1406380&r1=1406379&r2=1406380&view=diff
==============================================================================
--- ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/cpcontainer/IvyClasspathContainerMapper.java (original)
+++ ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/cpcontainer/IvyClasspathContainerMapper.java Tue Nov  6 22:25:09 2012
@@ -103,10 +103,13 @@ public class IvyClasspathContainerMapper
         IClasspathEntry[] classpathEntries;
         Collection paths = new LinkedHashSet();
 
+        Message.verbose("[IvyDE] Building classpath...");
+
         for (Iterator iter = all.iterator(); iter.hasNext();) {
             ArtifactDownloadReport artifact = (ArtifactDownloadReport) iter.next();
 
             if (artifact.getType().equals(WorkspaceResolver.ECLIPSE_PROJECT_TYPE)) {
+                Message.verbose("[IvyDE] Found an workspace dependency on project " + artifact.getName());
                 // This is a java project in the workspace, add project path
                 // but only add it if it is not a self dependency
                 if (javaProject == null
@@ -114,8 +117,12 @@ public class IvyClasspathContainerMapper
                     IAccessRule[] rules = getAccessRules(javaProject);
                     paths.add(JavaCore.newProjectEntry(new Path(artifact.getName()), rules, true,
                         null, true));
+                } else {
+                    Message.verbose("[IvyDE] Skipping self dependency on project " + artifact.getName());
                 }
             } else if (artifact.getLocalFile() != null && accept(artifact.getArtifact())) {
+                Message.verbose("[IvyDE] Adding " + artifact.getName() + " to the classpath");
+
                 IPath classpathArtifact = getArtifactPath(artifact);
                 IPath sourcesArtifact = getArtifactPath(artifact, sourceArtifactMatcher,
                     mapping.isMapIfOnlyOneSource());
@@ -128,6 +135,15 @@ public class IvyClasspathContainerMapper
                     sourcesArtifact);
                 IClasspathAttribute[] att = getExtraAttribute(classpathArtifact, javadocArtifact);
 
+                if (sources != null) {
+                    Message.debug("[IvyDE] Attaching sources " + sources + " to " + classpathArtifact);
+                }
+                if (javadocArtifact != null) {
+                    Message.debug("[IvyDE] Attaching javadoc " + javadocArtifact + " to " + classpathArtifact);
+                }
+                if (rules != null) {
+                    Message.debug("[IvyDE] Setting OSGi access rules on  " + classpathArtifact);
+                }
                 paths.add(JavaCore.newLibraryEntry(classpathArtifact, sources, sourcesRoot, rules,
                     att, false));
             }
@@ -322,12 +338,12 @@ public class IvyClasspathContainerMapper
                         url = new URL(u);
                     } catch (MalformedURLException e) {
                         // this should not happen
-                        IvyPlugin.log(IStatus.ERROR,
-                            "The jar URL for the javadoc is not formed correctly " + u, e);
+                        IvyPlugin.logError("The jar URL for the javadoc is not formed correctly "
+                                + u, e);
                     }
                 } catch (MalformedURLException e) {
                     // this should not happen
-                    IvyPlugin.log(IStatus.ERROR, "The path has not a correct URL: " + path, e);
+                    IvyPlugin.logError("The path has not a correct URL: " + path, e);
                 }
             }
         }

Modified: ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/cpcontainer/IvyClasspathContainerSerializer.java
URL: http://svn.apache.org/viewvc/ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/cpcontainer/IvyClasspathContainerSerializer.java?rev=1406380&r1=1406379&r2=1406380&view=diff
==============================================================================
--- ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/cpcontainer/IvyClasspathContainerSerializer.java (original)
+++ ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/cpcontainer/IvyClasspathContainerSerializer.java Tue Nov  6 22:25:09 2012
@@ -39,6 +39,7 @@ import javax.xml.transform.TransformerFa
 import javax.xml.transform.dom.DOMSource;
 import javax.xml.transform.stream.StreamResult;
 
+import org.apache.ivy.util.Message;
 import org.apache.ivyde.eclipse.IvyPlugin;
 import org.eclipse.core.resources.IProject;
 import org.eclipse.core.resources.ResourcesPlugin;
@@ -94,12 +95,14 @@ public class IvyClasspathContainerSerial
 
     private IvyAttachementManager ivyAttachementManager;
 
-    public IvyClasspathContainerSerializer(File containersStateDir, IvyAttachementManager ivyAttachementManager) {
+    public IvyClasspathContainerSerializer(File containersStateDir,
+            IvyAttachementManager ivyAttachementManager) {
         this.containersStateDir = containersStateDir;
         this.ivyAttachementManager = ivyAttachementManager;
     }
 
     public void save(IJavaProject project) {
+        Message.verbose("[IvyDE] Saving the state of the containers of the project " + project);
         List/* <IvyClasspathContainer> */ivycps = IvyClasspathUtil
                 .getIvyClasspathContainers(project);
         try {
@@ -115,15 +118,21 @@ public class IvyClasspathContainerSerial
                 }
             }
         } catch (Exception ioe) {
-            IvyPlugin.log(IStatus.WARNING, "IvyDE container states of the project "
+            IvyPlugin.logWarn("IvyDE container states of the project "
                     + project.getProject().getName() + " cound not be saved", ioe);
         }
     }
 
     public Map/* <IPath, IvyClasspathContainer> */read(IJavaProject project) {
+        Message.verbose("[IvyDE] Loading the state of the containers of the project " + project);
+        File file = new File(containersStateDir, project.getProject().getName() + ".xml");
+        if (!file.exists()) {
+            IvyPlugin.logWarn("IvyDE container states of the project "
+                    + project.getProject().getName() + " doesn't exist.");
+            return null;
+        }
         try {
-            FileInputStream in = new FileInputStream(new File(containersStateDir, project
-                    .getProject().getName() + ".xml"));
+            FileInputStream in = new FileInputStream(file);
             try {
                 return read(in);
             } finally {
@@ -134,7 +143,7 @@ public class IvyClasspathContainerSerial
                 }
             }
         } catch (Exception ioe) {
-            IvyPlugin.log(IStatus.WARNING, "IvyDE container states of the project "
+            IvyPlugin.logWarn("IvyDE container states of the project "
                     + project.getProject().getName() + " cound not be read", ioe);
             return null;
         }

Modified: ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/cpcontainer/IvyClasspathInitializer.java
URL: http://svn.apache.org/viewvc/ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/cpcontainer/IvyClasspathInitializer.java?rev=1406380&r1=1406379&r2=1406380&view=diff
==============================================================================
--- ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/cpcontainer/IvyClasspathInitializer.java (original)
+++ ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/cpcontainer/IvyClasspathInitializer.java Tue Nov  6 22:25:09 2012
@@ -22,6 +22,7 @@ import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
 
+import org.apache.ivy.util.Message;
 import org.apache.ivyde.eclipse.IvyPlugin;
 import org.eclipse.core.runtime.CoreException;
 import org.eclipse.core.runtime.IPath;
@@ -57,14 +58,15 @@ public class IvyClasspathInitializer ext
     public void initialize(IPath containerPath, IJavaProject project) throws CoreException {
         if (IvyClasspathUtil.isIvyClasspathContainer(containerPath)) {
 
+            Message.info("[IvyDE] Initializing container " + containerPath);
+
             // try to get an existing one
             IClasspathContainer container = null;
             try {
                 container = JavaCore.getClasspathContainer(containerPath, project);
             } catch (JavaModelException ex) {
                 // unless there are issues with the JDT, this should never happen
-                IvyPlugin.log(IStatus.ERROR,
-                    "Unable to get container for " + containerPath.toString(), ex);
+                IvyPlugin.logError("Unable to get container for " + containerPath.toString(), ex);
                 return;
             }
 
@@ -84,17 +86,21 @@ public class IvyClasspathInitializer ext
                 }
 
                 if (container instanceof IvyClasspathContainer) {
+                    Message.debug("[IvyDE] Container already configured");
                     ivycp = (IvyClasspathContainer) container;
                 } else {
                     if (container == null) {
+                        Message.debug("[IvyDE] No saved container");
                         // try what the IvyDE plugin saved
                         IvyClasspathContainerSerializer serializer = IvyPlugin.getDefault()
                                 .getIvyClasspathContainerSerializer();
                         Map ivycps = serializer.read(project);
                         if (ivycps != null) {
+                            Message.debug("[IvyDE] Found serialized containers");
                             ivycp = (IvyClasspathContainer) ivycps.get(containerPath);
                         }
                         if (ivycp == null) {
+                            Message.debug("[IvyDE] No serialized containers match the expected container path");
                             // still bad luck or just a new classpath container
                             ivycp = new IvyClasspathContainer(project, containerPath,
                                     new IClasspathEntry[0], attributes);
@@ -102,6 +108,7 @@ public class IvyClasspathInitializer ext
                             refresh = true;
                         }
                     } else {
+                        Message.debug("[IvyDE] Loading from a saved container");
                         // this might be the persisted one : reuse the persisted entries
                         ivycp = new IvyClasspathContainer(project, containerPath,
                                 container.getClasspathEntries(), attributes);
@@ -111,16 +118,20 @@ public class IvyClasspathInitializer ext
                 // recompute the path as it may have been "upgraded"
                 IPath updatedPath = IvyClasspathContainerConfAdapter.getPath(ivycp.getConf());
                 if (!updatedPath.equals(containerPath)) {
+                    Message.verbose("[IvyDE] Upgrading container path from " + containerPath + " to " + updatedPath);
                     updateIvyDEContainerPath(project, entry, attributes, exported, updatedPath);
                     return;
                 }
 
+                Message.verbose("[IvyDE] Setting container in JDT model");
+
                 JavaCore.setClasspathContainer(containerPath, new IJavaProject[] {project},
                     new IClasspathContainer[] {ivycp}, null);
 
                 int startupMode = IvyPlugin.getPreferenceStoreHelper().getResolveOnStartup();
                 if (startupMode == ON_STARTUP_NOTHING) {
                     if (!refresh) {
+                        Message.verbose("[IvyDE] Doing nothing on startup");
                         // unless we force a refresh, actually do nothing
                         return;
                     }
@@ -128,6 +139,11 @@ public class IvyClasspathInitializer ext
                     refresh = startupMode == ON_STARTUP_REFRESH;
                 }
 
+                if (refresh) {
+                    Message.info("[IvyDE] Scheduling a refresh of the container");
+                } else {
+                    Message.info("[IvyDE] Scheduling a resolve of the container");       
+                }
                 // now refresh the container to be synchronized with the ivy.xml
                 ivycp.launchResolve(refresh, null);
             } catch (Exception ex) {
@@ -160,7 +176,7 @@ public class IvyClasspathInitializer ext
                             .size()]);
                     project.setRawClasspath(entries, project.getOutputLocation(), null);
                 } catch (JavaModelException e) {
-                    IvyPlugin.log(IStatus.ERROR, "Unale to update the container path", e);
+                    IvyPlugin.logError("Unable to update the container path", e);
                 }
             }
         });

Modified: ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/cpcontainer/IvyClasspathUtil.java
URL: http://svn.apache.org/viewvc/ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/cpcontainer/IvyClasspathUtil.java?rev=1406380&r1=1406379&r2=1406380&view=diff
==============================================================================
--- ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/cpcontainer/IvyClasspathUtil.java (original)
+++ ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/cpcontainer/IvyClasspathUtil.java Tue Nov  6 22:25:09 2012
@@ -289,8 +289,8 @@ public final class IvyClasspathUtil {
             return null;
         }
         if (!(cp instanceof IvyClasspathContainer)) {
-            IvyPlugin.log(IStatus.ERROR, "Expected an Ivy container but was "
-                    + cp.getClass().getName() + " for path " + containerPath, null);
+            IvyPlugin.logError("Expected an Ivy container but was " + cp.getClass().getName()
+                    + " for path " + containerPath);
             return null;
         }
         return (IvyClasspathContainer) cp;

Modified: ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/handlers/ViewReverseDependenciesHandler.java
URL: http://svn.apache.org/viewvc/ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/handlers/ViewReverseDependenciesHandler.java?rev=1406380&r1=1406379&r2=1406380&view=diff
==============================================================================
--- ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/handlers/ViewReverseDependenciesHandler.java (original)
+++ ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/handlers/ViewReverseDependenciesHandler.java Tue Nov  6 22:25:09 2012
@@ -22,7 +22,6 @@ import java.util.Map;
 import org.apache.ivyde.eclipse.IvyPlugin;
 import org.apache.ivyde.eclipse.ui.views.ReverseDependencyExplorerView;
 import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.IStatus;
 import org.eclipse.ui.IWorkbenchPage;
 import org.eclipse.ui.PartInitException;
 
@@ -38,7 +37,7 @@ public class ViewReverseDependenciesHand
             page.showView("org.apache.ivyde.eclipse.ui.views.ReverseDependencyExplorer");
             ReverseDependencyExplorerView.refresh(true);
         } catch (PartInitException e) {
-            IvyPlugin.log(IStatus.ERROR, "Error creating Reverse Dependency Explorer", e);
+            IvyPlugin.logError("Error creating Reverse Dependency Explorer", e);
         }
     }
 }

Modified: ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/resolve/IvyResolveJob.java
URL: http://svn.apache.org/viewvc/ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/resolve/IvyResolveJob.java?rev=1406380&r1=1406379&r2=1406380&view=diff
==============================================================================
--- ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/resolve/IvyResolveJob.java (original)
+++ ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/resolve/IvyResolveJob.java Tue Nov  6 22:25:09 2012
@@ -264,7 +264,7 @@ public class IvyResolveJob extends Job {
                 errorsStatus.add(status[0]);
                 break;
             default:
-                IvyPlugin.log(IStatus.WARNING, "Unknown IStatus: " + status[0].getCode(), null);
+                IvyPlugin.logWarn("Unknown IStatus: " + status[0].getCode());
         }
 
         return false;

Modified: ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/resolve/IvyResolver.java
URL: http://svn.apache.org/viewvc/ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/resolve/IvyResolver.java?rev=1406380&r1=1406379&r2=1406380&view=diff
==============================================================================
--- ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/resolve/IvyResolver.java (original)
+++ ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/resolve/IvyResolver.java Tue Nov  6 22:25:09 2012
@@ -116,6 +116,9 @@ public class IvyResolver {
         computeConfs(confInput, md);
         try {
             ivy.pushContext();
+
+            Message.info("[IvyDE] Resolving " + toString());
+
             IvyResolveJobListener ivyResolveJobListener = new IvyResolveJobListener(monitor, step);
             ivy.getEventManager().addIvyListener(ivyResolveJobListener);
 
@@ -192,10 +195,14 @@ public class IvyResolver {
 
     private ResolveResult resolveWithPrevious(Ivy ivy, ModuleDescriptor md) throws ParseException,
             IOException {
+        Message.verbose("[IvyDE] Trying to read previous resolve report");
+
         ResolveResult result = new ResolveResult();
 
         // we check if all required configurations have been resolved
         for (int i = 0; i < confs.length; i++) {
+            Message.verbose("[IvyDE] Fetching the resolve report for configuration " + confs[i]);
+
             File report = ivy.getResolutionCacheManager().getConfigurationResolveReportInCache(
                 IvyClasspathUtil.buildResolveId(useExtendedResolveId, md), confs[i]);
             if (report.exists()) {
@@ -206,7 +213,7 @@ public class IvyResolver {
                     result.addArtifactReports(parser.getArtifactReports());
                     findAllArtifactOnRefresh(ivy, parser, result);
                 } catch (ParseException e) {
-                    Message.info("\n\nIVYDE: Error while parsing the report " + report
+                    Message.info("[IvyDE] Error while parsing the report " + report
                             + ". Falling back by doing a resolve again.");
                     // it fails, so let's try resolving for all configuration
                     return doResolve(ivy, md);
@@ -294,6 +301,9 @@ public class IvyResolver {
         }
 
         String pattern = project.getLocation().toPortableString() + "/" + retrievePattern;
+
+        Message.info("[IvyDE] Retrieving files into " + pattern);
+
         monitor.setTaskName("retrieving dependencies in " + pattern);
         RetrieveOptions options = new RetrieveOptions();
         options.setSync(retrieveSync);

Modified: ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/resolve/ResolveResult.java
URL: http://svn.apache.org/viewvc/ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/resolve/ResolveResult.java?rev=1406380&r1=1406379&r2=1406380&view=diff
==============================================================================
--- ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/resolve/ResolveResult.java (original)
+++ ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/resolve/ResolveResult.java Tue Nov  6 22:25:09 2012
@@ -17,19 +17,16 @@
  */
 package org.apache.ivyde.eclipse.resolve;
 
-import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.LinkedHashSet;
-import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
 import org.apache.ivy.core.module.descriptor.Artifact;
 import org.apache.ivy.core.module.id.ModuleRevisionId;
 import org.apache.ivy.core.report.ArtifactDownloadReport;
-import org.apache.ivy.core.report.DownloadStatus;
 import org.apache.ivy.core.report.ResolveReport;
 import org.eclipse.core.runtime.MultiStatus;
 

Modified: ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/retrieve/RetrieveSetupManager.java
URL: http://svn.apache.org/viewvc/ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/retrieve/RetrieveSetupManager.java?rev=1406380&r1=1406379&r2=1406380&view=diff
==============================================================================
--- ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/retrieve/RetrieveSetupManager.java (original)
+++ ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/retrieve/RetrieveSetupManager.java Tue Nov  6 22:25:09 2012
@@ -117,7 +117,7 @@ public class RetrieveSetupManager implem
             try {
                 ((IEclipsePreferences) entry.getValue()).flush();
             } catch (BackingStoreException e) {
-                IvyPlugin.log(IStatus.ERROR, "Failed to save the state of the Ivy preferences of "
+                IvyPlugin.logError("Failed to save the state of the Ivy preferences of "
                         + ((IProject) entry.getKey()).getName(), e);
             }
         }

Modified: ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/ui/IvyFilePathText.java
URL: http://svn.apache.org/viewvc/ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/ui/IvyFilePathText.java?rev=1406380&r1=1406379&r2=1406380&view=diff
==============================================================================
--- ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/ui/IvyFilePathText.java (original)
+++ ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/ui/IvyFilePathText.java Tue Nov  6 22:25:09 2012
@@ -95,8 +95,7 @@ public class IvyFilePathText extends Pat
             textUpdated();
         } catch (MalformedURLException ex) {
             // this cannot happen
-            IvyPlugin.log(IStatus.ERROR, "The file got from the file browser has not a valid URL",
-                ex);
+            IvyPlugin.logError("The file got from the file browser has not a valid URL", ex);
         }
     }
 

Modified: ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/ui/SettingsSetupEditor.java
URL: http://svn.apache.org/viewvc/ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/ui/SettingsSetupEditor.java?rev=1406380&r1=1406379&r2=1406380&view=diff
==============================================================================
--- ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/ui/SettingsSetupEditor.java (original)
+++ ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/ui/SettingsSetupEditor.java Tue Nov  6 22:25:09 2012
@@ -136,8 +136,8 @@ public class SettingsSetupEditor extends
                     textUpdated();
                 } catch (MalformedURLException ex) {
                     // this cannot happen
-                    IvyPlugin.log(IStatus.ERROR,
-                        "The file got from the file browser has not a valid URL", ex);
+                    IvyPlugin
+                            .logError("The file got from the file browser has not a valid URL", ex);
                 }
             }
 

Modified: ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/ui/editors/IvyModuleDescriptorEditor.java
URL: http://svn.apache.org/viewvc/ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/ui/editors/IvyModuleDescriptorEditor.java?rev=1406380&r1=1406379&r2=1406380&view=diff
==============================================================================
--- ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/ui/editors/IvyModuleDescriptorEditor.java (original)
+++ ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/ui/editors/IvyModuleDescriptorEditor.java Tue Nov  6 22:25:09 2012
@@ -105,7 +105,7 @@ public class IvyModuleDescriptorEditor e
             setPageText(index, "Information");
         } catch (PartInitException e) {
             // Should not happen
-            IvyPlugin.log(IStatus.ERROR, "The overview page could not be created", e);
+            IvyPlugin.logError("The overview page could not be created", e);
         }
 
     }
@@ -121,8 +121,7 @@ public class IvyModuleDescriptorEditor e
             MessageDialog.openError(IvyPlugin.getActiveWorkbenchShell(),
                 "Fail to create the preview", "The page preview could not be created :"
                         + e.getMessage());
-            IvyPlugin.log(IStatus.ERROR,
-                "The preview page in the ivy.xml editor could not be created", e);
+            IvyPlugin.logError("The preview page in the ivy.xml editor could not be created", e);
         }
     }
 

Modified: ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/ui/editors/xml/EclipseIvyModelSettings.java
URL: http://svn.apache.org/viewvc/ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/ui/editors/xml/EclipseIvyModelSettings.java?rev=1406380&r1=1406379&r2=1406380&view=diff
==============================================================================
--- ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/ui/editors/xml/EclipseIvyModelSettings.java (original)
+++ ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/ui/editors/xml/EclipseIvyModelSettings.java Tue Nov  6 22:25:09 2012
@@ -67,7 +67,7 @@ public class EclipseIvyModelSettings imp
     }
 
     public void logError(String message, Exception e) {
-        IvyPlugin.log(IStatus.ERROR, message, e);
+        IvyPlugin.logError(message, e);
     }
 
 }

Modified: ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/ui/editors/xml/IvyContentAssistProcessor.java
URL: http://svn.apache.org/viewvc/ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/ui/editors/xml/IvyContentAssistProcessor.java?rev=1406380&r1=1406379&r2=1406380&view=diff
==============================================================================
--- ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/ui/editors/xml/IvyContentAssistProcessor.java (original)
+++ ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/ui/editors/xml/IvyContentAssistProcessor.java Tue Nov  6 22:25:09 2012
@@ -61,8 +61,8 @@ public abstract class IvyContentAssistPr
             ivyFileString = doc.get(0, doc.getLength());
         } catch (BadLocationException e) {
             // Unless there is a bug in JFace, this should never never happen
-            IvyPlugin.log(IStatus.ERROR, "Getting the content of the document " + doc.toString()
-                    + " failed", e);
+            IvyPlugin.logError("Getting the content of the document " + doc.toString() + " failed",
+                e);
             return null;
         }
         IProject project = getProject();

Modified: ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/ui/editors/xml/NonRuleBasedDamagerRepairer.java
URL: http://svn.apache.org/viewvc/ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/ui/editors/xml/NonRuleBasedDamagerRepairer.java?rev=1406380&r1=1406379&r2=1406380&view=diff
==============================================================================
--- ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/ui/editors/xml/NonRuleBasedDamagerRepairer.java (original)
+++ ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/ui/editors/xml/NonRuleBasedDamagerRepairer.java Tue Nov  6 22:25:09 2012
@@ -108,7 +108,7 @@ public class NonRuleBasedDamagerRepairer
 
             } catch (BadLocationException x) {
                 // FIXME hu ? needs some comment
-                IvyPlugin.log(IStatus.WARNING, "Something bad happened", x);
+                IvyPlugin.logWarn("Something bad happened", x);
             }
         }
 

Modified: ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/ui/editors/xml/XMLDoubleClickStrategy.java
URL: http://svn.apache.org/viewvc/ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/ui/editors/xml/XMLDoubleClickStrategy.java?rev=1406380&r1=1406379&r2=1406380&view=diff
==============================================================================
--- ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/ui/editors/xml/XMLDoubleClickStrategy.java (original)
+++ ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/ui/editors/xml/XMLDoubleClickStrategy.java Tue Nov  6 22:25:09 2012
@@ -90,7 +90,7 @@ public class XMLDoubleClickStrategy impl
             return true;
         } catch (BadLocationException x) {
             // FIXME hu ? needs some comment
-            IvyPlugin.log(IStatus.WARNING, "Something bad happened", x);
+            IvyPlugin.logWarn("Something bad happened", x);
         }
 
         return false;
@@ -133,7 +133,7 @@ public class XMLDoubleClickStrategy impl
 
         } catch (BadLocationException x) {
             // FIXME hu ? needs some comment
-            IvyPlugin.log(IStatus.WARNING, "Something bad happened", x);
+            IvyPlugin.logWarn("Something bad happened", x);
         }
 
         return false;

Modified: ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/ui/menu/IvyMenuContributionItem.java
URL: http://svn.apache.org/viewvc/ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/ui/menu/IvyMenuContributionItem.java?rev=1406380&r1=1406379&r2=1406380&view=diff
==============================================================================
--- ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/ui/menu/IvyMenuContributionItem.java (original)
+++ ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/ui/menu/IvyMenuContributionItem.java Tue Nov  6 22:25:09 2012
@@ -227,8 +227,8 @@ public class IvyMenuContributionItem ext
         try {
             setupList = manager.getSetup(project);
         } catch (IOException e) {
-            IvyPlugin.log(IStatus.WARNING, "Unable to get the retrieve setup for project "
-                    + project.getName(), e);
+            IvyPlugin.logWarn("Unable to get the retrieve setup for project " + project.getName(),
+                e);
             return;
         }
         if (!setupList.isEmpty()) {

Modified: ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/ui/preferences/IvyDEProjectPreferences.java
URL: http://svn.apache.org/viewvc/ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/ui/preferences/IvyDEProjectPreferences.java?rev=1406380&r1=1406379&r2=1406380&view=diff
==============================================================================
--- ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/ui/preferences/IvyDEProjectPreferences.java (original)
+++ ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/ui/preferences/IvyDEProjectPreferences.java Tue Nov  6 22:25:09 2012
@@ -209,9 +209,8 @@ public class IvyDEProjectPreferences ext
         try {
             retrieveSetupManager.save(project, retrieveSetups);
         } catch (Exception e) {
-            IvyPlugin.log(IStatus.ERROR,
-                "Enable to write the retrieve setup into the project preference of "
-                        + project.getName(), e);
+            IvyPlugin.logError("Enable to write the retrieve setup into the project preference of "
+                    + project.getName(), e);
             return false;
         }
 

Modified: ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/ui/preferences/IvyPreferencePage.java
URL: http://svn.apache.org/viewvc/ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/ui/preferences/IvyPreferencePage.java?rev=1406380&r1=1406379&r2=1406380&view=diff
==============================================================================
--- ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/ui/preferences/IvyPreferencePage.java (original)
+++ ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/ui/preferences/IvyPreferencePage.java Tue Nov  6 22:25:09 2012
@@ -171,8 +171,8 @@ public class IvyPreferencePage extends P
                 resolveOnStartupButton.setSelection(true);
                 break;
             default:
-                IvyPlugin.log(IStatus.WARNING, "Unkwnon resolve-on-startup mode: "
-                        + helper.getResolveOnStartup(), null);
+                IvyPlugin.logWarn("Unkwnon resolve-on-startup mode: "
+                        + helper.getResolveOnStartup());
         }
 
         if (helper.getAutoResolveOnChange()) {
@@ -225,8 +225,8 @@ public class IvyPreferencePage extends P
                 resolveOnStartupButton.setSelection(true);
                 break;
             default:
-                IvyPlugin.log(IStatus.WARNING, "Unkwnon resolve-on-startup mode: "
-                        + PreferenceInitializer.DEFAULT_RESOLVE_ON_STARTUP, null);
+                IvyPlugin.logWarn("Unkwnon resolve-on-startup mode: "
+                        + PreferenceInitializer.DEFAULT_RESOLVE_ON_STARTUP);
         }
 
         if (PreferenceInitializer.DEFAULT_AUTO_RESOLVE_ON_CHANGE) {

Modified: ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/ui/wizards/IvyNewWizard.java
URL: http://svn.apache.org/viewvc/ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/ui/wizards/IvyNewWizard.java?rev=1406380&r1=1406379&r2=1406380&view=diff
==============================================================================
--- ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/ui/wizards/IvyNewWizard.java (original)
+++ ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/ui/wizards/IvyNewWizard.java Tue Nov  6 22:25:09 2012
@@ -161,7 +161,7 @@ public class IvyNewWizard extends Wizard
                     // IDE.openEditor(page, file, IvyEditor.ID, true);
                 } catch (PartInitException e) {
                     // this should not happen
-                    IvyPlugin.log(IStatus.ERROR, "The editor could not be opened", e);
+                    IvyPlugin.logError("The editor could not be opened", e);
                 }
             }
         });

Modified: ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/workspaceresolver/WorkspaceResolver.java
URL: http://svn.apache.org/viewvc/ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/workspaceresolver/WorkspaceResolver.java?rev=1406380&r1=1406379&r2=1406380&view=diff
==============================================================================
--- ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/workspaceresolver/WorkspaceResolver.java (original)
+++ ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/workspaceresolver/WorkspaceResolver.java Tue Nov  6 22:25:09 2012
@@ -208,6 +208,9 @@ public class WorkspaceResolver extends A
                     continue;
                 }
 
+                Message.verbose("[IvyDE] Workspace resolver found potential matching project " + p
+                        + " with module " + candidateMrid + " for module " + dependencyMrid);
+
                 if (!ignoreBranchOnWorkspaceProjects) {
                     ModuleId mid = dependencyMrid.getModuleId();
                     String defaultBranch = getSettings().getDefaultBranch(mid);
@@ -222,11 +225,11 @@ public class WorkspaceResolver extends A
                     if (dependencyBranch != candidateBranch) {
                         // Both cannot be null
                         if (dependencyBranch == null || candidateBranch == null) {
-                            // One set, the other isn't, so no match
+                            Message.verbose("[IvyDE] \t\trejected since branches doesn't match (one is set, the other isn't)");
                             continue;
                         }
                         if (!dependencyBranch.equals(candidateBranch)) {
-                            // Both set but to different branches, so no match
+                            Message.verbose("[IvyDE] \t\trejected since branches doesn't match");
                             continue;
                         }
                     }
@@ -237,6 +240,12 @@ public class WorkspaceResolver extends A
                         || md.getModuleRevisionId().getRevision().equals(Ivy.getWorkingRevision())
                         || versionMatcher.accept(dd.getDependencyRevisionId(), md)) {
 
+                    if (ignoreVersionOnWorkspaceProjects) {
+                        Message.verbose("[IvyDE] \t\tmatched (version are ignored)");
+                    } else {
+                        Message.verbose("[IvyDE] \t\tversion matched");
+                    }
+
                     Artifact af = new DefaultArtifact(md.getModuleRevisionId(),
                             md.getPublicationDate(), p.getFullPath().toString(),
                             ECLIPSE_PROJECT_TYPE, ECLIPSE_PROJECT_EXTENSION);
@@ -277,6 +286,8 @@ public class WorkspaceResolver extends A
                     madr.setSearched(true);
 
                     return new ResolvedModuleRevision(this, this, workspaceMd, madr);
+                } else {
+                    Message.verbose("[IvyDE] \t\treject as version didn't match");
                 }
             }
         }



Mime
View raw message