Author: xavier
Date: Mon Dec 3 05:51:07 2007
New Revision: 600535
URL: http://svn.apache.org/viewvc?rev=600535&view=rev
Log:
organize imports + slight code format
Modified:
ant/ivy/core/trunk/src/java/org/apache/ivy/core/publish/PublishOptions.java
ant/ivy/core/trunk/src/java/org/apache/ivy/core/resolve/DefaultModuleRevision.java
ant/ivy/core/trunk/src/java/org/apache/ivy/core/resolve/DownloadOptions.java
ant/ivy/core/trunk/src/java/org/apache/ivy/core/resolve/IvyNode.java
ant/ivy/core/trunk/src/java/org/apache/ivy/core/resolve/ResolveEngine.java
ant/ivy/core/trunk/src/java/org/apache/ivy/core/resolve/ResolvedModuleRevision.java
ant/ivy/core/trunk/src/java/org/apache/ivy/core/settings/IvySettings.java
Modified:
ant/ivy/core/trunk/src/java/org/apache/ivy/core/publish/PublishOptions.java
URL:
http://svn.apache.org/viewvc/ant/ivy/core/trunk/src/java/org/apache/ivy/core/publish/PublishOptions.java?rev=600535&r1=600534&r2=600535&view=diff
==============================================================================
--- ant/ivy/core/trunk/src/java/org/apache/ivy/core/publish/PublishOptions.java
(original)
+++ ant/ivy/core/trunk/src/java/org/apache/ivy/core/publish/PublishOptions.java
Mon Dec 3 05:51:07 2007
@@ -19,7 +19,6 @@
import java.util.Date;
-import org.apache.ivy.core.cache.CacheManager;
import org.apache.ivy.core.cache.ResolutionCacheManager;
import org.apache.ivy.core.module.descriptor.Artifact;
Modified:
ant/ivy/core/trunk/src/java/org/apache/ivy/core/resolve/DefaultModuleRevision.java
URL:
http://svn.apache.org/viewvc/ant/ivy/core/trunk/src/java/org/apache/ivy/core/resolve/DefaultModuleRevision.java?rev=600535&r1=600534&r2=600535&view=diff
==============================================================================
---
ant/ivy/core/trunk/src/java/org/apache/ivy/core/resolve/DefaultModuleRevision.java
(original)
+++
ant/ivy/core/trunk/src/java/org/apache/ivy/core/resolve/DefaultModuleRevision.java
Mon Dec 3 05:51:07 2007
@@ -17,7 +17,6 @@
*/
package org.apache.ivy.core.resolve;
-import java.net.URL;
import java.util.Date;
import org.apache.ivy.core.module.descriptor.ModuleDescriptor;
Modified:
ant/ivy/core/trunk/src/java/org/apache/ivy/core/resolve/DownloadOptions.java
URL:
http://svn.apache.org/viewvc/ant/ivy/core/trunk/src/java/org/apache/ivy/core/resolve/DownloadOptions.java?rev=600535&r1=600534&r2=600535&view=diff
==============================================================================
---
ant/ivy/core/trunk/src/java/org/apache/ivy/core/resolve/DownloadOptions.java
(original)
+++
ant/ivy/core/trunk/src/java/org/apache/ivy/core/resolve/DownloadOptions.java
Mon Dec 3 05:51:07 2007
@@ -21,7 +21,6 @@
import org.apache.ivy.core.cache.CacheManager;
import org.apache.ivy.core.cache.RepositoryCacheManager;
-import org.apache.ivy.core.event.EventManager;
import org.apache.ivy.core.settings.IvySettings;
public class DownloadOptions {
Modified: ant/ivy/core/trunk/src/java/org/apache/ivy/core/resolve/IvyNode.java
URL:
http://svn.apache.org/viewvc/ant/ivy/core/trunk/src/java/org/apache/ivy/core/resolve/IvyNode.java?rev=600535&r1=600534&r2=600535&view=diff
==============================================================================
--- ant/ivy/core/trunk/src/java/org/apache/ivy/core/resolve/IvyNode.java
(original)
+++ ant/ivy/core/trunk/src/java/org/apache/ivy/core/resolve/IvyNode.java Mon
Dec 3 05:51:07 2007
@@ -49,7 +49,6 @@
import org.apache.ivy.core.resolve.IvyNodeCallers.Caller;
import org.apache.ivy.core.resolve.IvyNodeEviction.EvictionData;
import org.apache.ivy.plugins.conflict.ConflictManager;
-import org.apache.ivy.plugins.conflict.LatestCompatibleConflictManager;
import org.apache.ivy.plugins.matcher.MatcherHelper;
import org.apache.ivy.plugins.resolver.DependencyResolver;
import org.apache.ivy.util.Message;
Modified:
ant/ivy/core/trunk/src/java/org/apache/ivy/core/resolve/ResolveEngine.java
URL:
http://svn.apache.org/viewvc/ant/ivy/core/trunk/src/java/org/apache/ivy/core/resolve/ResolveEngine.java?rev=600535&r1=600534&r2=600535&view=diff
==============================================================================
--- ant/ivy/core/trunk/src/java/org/apache/ivy/core/resolve/ResolveEngine.java
(original)
+++ ant/ivy/core/trunk/src/java/org/apache/ivy/core/resolve/ResolveEngine.java
Mon Dec 3 05:51:07 2007
@@ -22,7 +22,6 @@
import java.io.IOException;
import java.net.URL;
import java.text.ParseException;
-import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collection;
import java.util.Collections;
@@ -58,12 +57,10 @@
import org.apache.ivy.core.report.DownloadStatus;
import org.apache.ivy.core.report.ResolveReport;
import org.apache.ivy.core.resolve.IvyNodeEviction.EvictionData;
-import org.apache.ivy.core.settings.IvySettings;
import org.apache.ivy.core.sort.SortEngine;
import org.apache.ivy.plugins.conflict.ConflictManager;
import org.apache.ivy.plugins.parser.ModuleDescriptorParser;
import org.apache.ivy.plugins.parser.ModuleDescriptorParserRegistry;
-import org.apache.ivy.plugins.report.XmlReportOutputter;
import org.apache.ivy.plugins.repository.url.URLResource;
import org.apache.ivy.plugins.resolver.CacheResolver;
import org.apache.ivy.plugins.resolver.DependencyResolver;
Modified:
ant/ivy/core/trunk/src/java/org/apache/ivy/core/resolve/ResolvedModuleRevision.java
URL:
http://svn.apache.org/viewvc/ant/ivy/core/trunk/src/java/org/apache/ivy/core/resolve/ResolvedModuleRevision.java?rev=600535&r1=600534&r2=600535&view=diff
==============================================================================
---
ant/ivy/core/trunk/src/java/org/apache/ivy/core/resolve/ResolvedModuleRevision.java
(original)
+++
ant/ivy/core/trunk/src/java/org/apache/ivy/core/resolve/ResolvedModuleRevision.java
Mon Dec 3 05:51:07 2007
@@ -17,7 +17,6 @@
*/
package org.apache.ivy.core.resolve;
-import java.net.URL;
import java.util.Date;
import org.apache.ivy.core.module.descriptor.ModuleDescriptor;
Modified:
ant/ivy/core/trunk/src/java/org/apache/ivy/core/settings/IvySettings.java
URL:
http://svn.apache.org/viewvc/ant/ivy/core/trunk/src/java/org/apache/ivy/core/settings/IvySettings.java?rev=600535&r1=600534&r2=600535&view=diff
==============================================================================
--- ant/ivy/core/trunk/src/java/org/apache/ivy/core/settings/IvySettings.java
(original)
+++ ant/ivy/core/trunk/src/java/org/apache/ivy/core/settings/IvySettings.java
Mon Dec 3 05:51:07 2007
@@ -1174,7 +1174,7 @@
private void init(Object obj) {
if (obj instanceof IvySettingsAware) {
((IvySettingsAware) obj).setSettings(this);
- } else if (obj instanceof DependencyResolver){
+ } else if (obj instanceof DependencyResolver) {
((DependencyResolver) obj).setSettings(this);
}
if (obj instanceof IvyAware) {
