Modified: ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/ui/editors/IvySettingsContentDescriber.java URL: http://svn.apache.org/viewvc/ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/ui/editors/IvySettingsContentDescriber.java?rev=1508149&r1=1508148&r2=1508149&view=diff ============================================================================== --- ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/ui/editors/IvySettingsContentDescriber.java (original) +++ ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/ui/editors/IvySettingsContentDescriber.java Mon Jul 29 17:39:25 2013 @@ -23,7 +23,7 @@ import java.io.Reader; import javax.xml.parsers.ParserConfigurationException; -import org.apache.ivyde.eclipse.XMLHelper; +import org.apache.ivyde.eclipse.internal.XMLHelper; import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.IConfigurationElement; import org.eclipse.core.runtime.IExecutableExtension;
Modified: ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/ui/editors/IvySettingsEditor.java URL: http://svn.apache.org/viewvc/ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/ui/editors/IvySettingsEditor.java?rev=1508149&r1=1508148&r2=1508149&view=diff ============================================================================== --- ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/ui/editors/IvySettingsEditor.java (original) +++ ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/ui/editors/IvySettingsEditor.java Mon Jul 29 17:39:25 2013 @@ -22,8 +22,8 @@ import java.util.List; import org.apache.ivyde.common.ivysettings.IvySettingsModel; import org.apache.ivyde.common.model.IvyModel; -import org.apache.ivyde.eclipse.cpcontainer.IvyClasspathContainer; -import org.apache.ivyde.eclipse.cpcontainer.IvyClasspathUtil; +import org.apache.ivyde.eclipse.cp.IvyClasspathContainerHelper; +import org.apache.ivyde.eclipse.cpcontainer.IvyClasspathContainerImpl; import org.apache.ivyde.eclipse.ui.core.IvyFileEditorInput; import org.apache.ivyde.eclipse.ui.editors.xml.EclipseIvyModelSettings; import org.apache.ivyde.eclipse.ui.editors.xml.IvyContentAssistProcessor; @@ -120,11 +120,11 @@ public class IvySettingsEditor extends F public void doSave(IProgressMonitor monitor) { xmlEditor.doSave(monitor); IFile file = ((IvyFileEditorInput) getEditorInput()).getFile(); - List/* <IvyClasspathContainer> */containers = IvyClasspathUtil - .getIvySettingsClasspathContainers(file); + List/* <IvyClasspathContainer> */containers = IvyClasspathContainerHelper + .getContainersFromIvySettings(file); Iterator/* <IvyClasspathContainer> */itContainers = containers.iterator(); while (itContainers.hasNext()) { - IvyClasspathContainer ivycp = (IvyClasspathContainer) itContainers.next(); + IvyClasspathContainerImpl ivycp = (IvyClasspathContainerImpl) itContainers.next(); ivycp.launchResolve(false, null); } } Copied: ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/ui/editors/ModuleDescriptorExtensionDescriptor.java (from r1507856, ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/extension/ModuleDescriptorExtensionDescriptor.java) URL: http://svn.apache.org/viewvc/ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/ui/editors/ModuleDescriptorExtensionDescriptor.java?p2=ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/ui/editors/ModuleDescriptorExtensionDescriptor.java&p1=ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/extension/ModuleDescriptorExtensionDescriptor.java&r1=1507856&r2=1508149&rev=1508149&view=diff ============================================================================== --- ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/extension/ModuleDescriptorExtensionDescriptor.java (original) +++ ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/ui/editors/ModuleDescriptorExtensionDescriptor.java Mon Jul 29 17:39:25 2013 @@ -15,9 +15,10 @@ * limitations under the License. * */ -package org.apache.ivyde.eclipse.extension; +package org.apache.ivyde.eclipse.ui.editors; -import org.apache.ivyde.eclipse.IvyPlugin; +import org.apache.ivyde.eclipse.extension.ModuleDescriptorExtension; +import org.apache.ivyde.eclipse.internal.IvyPlugin; import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.IConfigurationElement; import org.eclipse.core.runtime.IStatus; 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=1508149&r1=1508148&r2=1508149&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 Mon Jul 29 17:39:25 2013 @@ -21,30 +21,30 @@ import java.util.List; import org.apache.ivy.Ivy; import org.apache.ivyde.common.model.IvyModelSettings; -import org.apache.ivyde.eclipse.IvyPlugin; -import org.apache.ivyde.eclipse.cpcontainer.IvyClasspathContainer; -import org.apache.ivyde.eclipse.cpcontainer.IvyClasspathUtil; +import org.apache.ivyde.eclipse.cp.IvyClasspathContainerHelper; +import org.apache.ivyde.eclipse.cpcontainer.IvyClasspathContainerImpl; +import org.apache.ivyde.eclipse.internal.IvyPlugin; import org.apache.ivyde.eclipse.ui.preferences.PreferenceConstants; import org.eclipse.core.resources.IFile; import org.eclipse.jdt.core.IJavaProject; public class EclipseIvyModelSettings implements IvyModelSettings { - private final IvyClasspathContainer ivycp; + private final IvyClasspathContainerImpl ivycp; public EclipseIvyModelSettings(IJavaProject javaProject) { - this(IvyClasspathUtil.getIvyClasspathContainers(javaProject)); + this(IvyClasspathContainerHelper.getContainers(javaProject)); } public EclipseIvyModelSettings(IFile ivyfile) { - this(IvyClasspathUtil.getIvyFileClasspathContainers(ivyfile)); + this(IvyClasspathContainerHelper.getContainersFromIvyFile(ivyfile)); } private EclipseIvyModelSettings(List/* <IvyClasspathContainer> */containers) { - this(containers.isEmpty() ? null : (IvyClasspathContainer) containers.iterator().next()); + this(containers.isEmpty() ? null : (IvyClasspathContainerImpl) containers.iterator().next()); } - private EclipseIvyModelSettings(IvyClasspathContainer ivycp) { + private EclipseIvyModelSettings(IvyClasspathContainerImpl ivycp) { this.ivycp = ivycp; } 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=1508149&r1=1508148&r2=1508149&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 Mon Jul 29 17:39:25 2013 @@ -21,7 +21,7 @@ import org.apache.ivyde.common.completio import org.apache.ivyde.common.completion.IvyCodeCompletionProcessor; import org.apache.ivyde.common.model.IvyFile; import org.apache.ivyde.common.model.IvyModel; -import org.apache.ivyde.eclipse.IvyPlugin; +import org.apache.ivyde.eclipse.internal.IvyPlugin; import org.eclipse.core.resources.IFile; import org.eclipse.core.resources.IProject; import org.eclipse.jdt.core.IJavaProject; 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=1508149&r1=1508148&r2=1508149&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 Mon Jul 29 17:39:25 2013 @@ -17,7 +17,7 @@ */ package org.apache.ivyde.eclipse.ui.editors.xml; -import org.apache.ivyde.eclipse.IvyPlugin; +import org.apache.ivyde.eclipse.internal.IvyPlugin; import org.eclipse.core.runtime.Assert; import org.eclipse.jface.text.BadLocationException; import org.eclipse.jface.text.DocumentEvent; 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=1508149&r1=1508148&r2=1508149&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 Mon Jul 29 17:39:25 2013 @@ -17,7 +17,7 @@ */ package org.apache.ivyde.eclipse.ui.editors.xml; -import org.apache.ivyde.eclipse.IvyPlugin; +import org.apache.ivyde.eclipse.internal.IvyPlugin; import org.eclipse.jface.text.BadLocationException; import org.eclipse.jface.text.IDocument; import org.eclipse.jface.text.ITextDoubleClickStrategy; Modified: ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/ui/editors/xml/XMLEditor.java URL: http://svn.apache.org/viewvc/ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/ui/editors/xml/XMLEditor.java?rev=1508149&r1=1508148&r2=1508149&view=diff ============================================================================== --- ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/ui/editors/xml/XMLEditor.java (original) +++ ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/ui/editors/xml/XMLEditor.java Mon Jul 29 17:39:25 2013 @@ -17,7 +17,7 @@ */ package org.apache.ivyde.eclipse.ui.editors.xml; -import org.apache.ivyde.eclipse.IvyPlugin; +import org.apache.ivyde.eclipse.internal.IvyPlugin; import org.eclipse.core.resources.IFile; import org.eclipse.jface.action.IAction; import org.eclipse.jface.text.source.ISourceViewer; Modified: ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/ui/menu/CleanCacheAction.java URL: http://svn.apache.org/viewvc/ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/ui/menu/CleanCacheAction.java?rev=1508149&r1=1508148&r2=1508149&view=diff ============================================================================== --- ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/ui/menu/CleanCacheAction.java (original) +++ ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/ui/menu/CleanCacheAction.java Mon Jul 29 17:39:25 2013 @@ -23,8 +23,8 @@ import java.util.Locale; import org.apache.ivy.core.cache.RepositoryCacheManager; import org.apache.ivy.core.cache.ResolutionCacheManager; -import org.apache.ivyde.eclipse.IvyDEMessage; -import org.apache.ivyde.eclipse.IvyPlugin; +import org.apache.ivyde.eclipse.internal.IvyDEMessage; +import org.apache.ivyde.eclipse.internal.IvyPlugin; import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.Status; 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=1508149&r1=1508148&r2=1508149&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 Mon Jul 29 17:39:25 2013 @@ -32,9 +32,9 @@ import java.util.Set; import org.apache.ivy.Ivy; import org.apache.ivy.core.cache.RepositoryCacheManager; import org.apache.ivy.core.cache.ResolutionCacheManager; -import org.apache.ivyde.eclipse.IvyNature; -import org.apache.ivyde.eclipse.IvyPlugin; -import org.apache.ivyde.eclipse.cpcontainer.IvyClasspathContainer; +import org.apache.ivyde.eclipse.IvyNatureHelper; +import org.apache.ivyde.eclipse.cp.IvyClasspathContainerHelper; +import org.apache.ivyde.eclipse.cpcontainer.IvyClasspathContainerImpl; import org.apache.ivyde.eclipse.cpcontainer.IvyClasspathUtil; import org.apache.ivyde.eclipse.handlers.OpenIvyFileHandler; import org.apache.ivyde.eclipse.handlers.RefreshHandler; @@ -42,6 +42,7 @@ import org.apache.ivyde.eclipse.handlers import org.apache.ivyde.eclipse.handlers.RemoveIvyNatureHandler; import org.apache.ivyde.eclipse.handlers.ResolveHandler; import org.apache.ivyde.eclipse.handlers.ViewReverseDependenciesHandler; +import org.apache.ivyde.eclipse.internal.IvyPlugin; import org.apache.ivyde.eclipse.retrieve.RetrieveSetupManager; import org.apache.ivyde.eclipse.retrieve.StandaloneRetrieveSetup; import org.apache.ivyde.eclipse.ui.menu.CleanCacheAction.Cleanable; @@ -165,7 +166,7 @@ public class IvyMenuContributionItem ext if (totalSelected == 1 && containers.size() == 1 && ((Set) containers.values().iterator().next()).size() == 1) { // only one container - IvyClasspathContainer ivycp = (IvyClasspathContainer) ((Set) containers.values() + IvyClasspathContainerImpl ivycp = (IvyClasspathContainerImpl) ((Set) containers.values() .iterator().next()).iterator().next(); Ivy ivy = ivycp.getState().getCachedIvy(); if (ivy != null) { @@ -208,7 +209,7 @@ public class IvyMenuContributionItem ext private boolean collectProject(Map/* <IProject, Set<IvyClasspathContainer>> */containers, Map/* <IProject, Set<StandaloneRetrieveSetup>> */retrieveSetups, Object element) { IProject project = (IProject) IvyPlugin.adapt(element, IProject.class); - if (project != null && project.isOpen() && IvyNature.hasNature(project)) { + if (project != null && project.isOpen() && IvyNatureHelper.hasNature(project)) { doCollectProject(containers, retrieveSetups, project); return true; } @@ -217,7 +218,7 @@ public class IvyMenuContributionItem ext private void doCollectProject(Map/* <IProject, Set<IvyClasspathContainer>> */containers, Map/* <IProject, Set<StandaloneRetrieveSetup>> */retrieveSetups, IProject project) { - List ivycps = IvyClasspathUtil.getIvyClasspathContainers(project); + List ivycps = IvyClasspathContainerHelper.getContainers(project); if (!ivycps.isEmpty()) { containers.put(project, new HashSet(ivycps)); } @@ -237,7 +238,7 @@ public class IvyMenuContributionItem ext private boolean collectContainer(Map/* <IProject, Set<IvyClasspathContainer>> */containers, ClassPathContainer element) { - IvyClasspathContainer ivycp = IvyClasspathUtil.jdt2IvyCPC(element); + IvyClasspathContainerImpl ivycp = IvyClasspathUtil.jdt2IvyCPC(element); if (ivycp == null) { return false; } @@ -246,7 +247,7 @@ public class IvyMenuContributionItem ext } private void doCollectContainer(Map/* <IProject, Set<IvyClasspathContainer>> */containers, - IvyClasspathContainer ivycp) { + IvyClasspathContainerImpl ivycp) { IJavaProject javaProject = ivycp.getConf().getJavaProject(); if (javaProject == null) { return; @@ -295,7 +296,7 @@ public class IvyMenuContributionItem ext Set set = (Set) itSet.next(); Iterator itContainer = set.iterator(); while (itContainer.hasNext()) { - IvyClasspathContainer ivycp = (IvyClasspathContainer) itContainer.next(); + IvyClasspathContainerImpl ivycp = (IvyClasspathContainerImpl) itContainer.next(); Ivy ivy = ivycp.getState().getCachedIvy(); if (ivy != null) { addResolutionCleanable(allCleanables, ivy); Modified: ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/ui/menu/RetrieveAction.java URL: http://svn.apache.org/viewvc/ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/ui/menu/RetrieveAction.java?rev=1508149&r1=1508148&r2=1508149&view=diff ============================================================================== --- ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/ui/menu/RetrieveAction.java (original) +++ ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/ui/menu/RetrieveAction.java Mon Jul 29 17:39:25 2013 @@ -19,12 +19,12 @@ package org.apache.ivyde.eclipse.ui.menu import java.util.List; -import org.apache.ivyde.eclipse.IvyPlugin; +import org.apache.ivyde.eclipse.cp.RetrieveSetup; import org.apache.ivyde.eclipse.cpcontainer.IvyClasspathUtil; +import org.apache.ivyde.eclipse.internal.IvyPlugin; import org.apache.ivyde.eclipse.resolve.IvyResolveJob; import org.apache.ivyde.eclipse.resolve.IvyResolver; import org.apache.ivyde.eclipse.resolve.ResolveRequest; -import org.apache.ivyde.eclipse.retrieve.RetrieveSetup; import org.apache.ivyde.eclipse.retrieve.StandaloneRetrieveSetup; import org.eclipse.jface.action.Action; Modified: ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/ui/preferences/AdvancedSetupPreferencePage.java URL: http://svn.apache.org/viewvc/ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/ui/preferences/AdvancedSetupPreferencePage.java?rev=1508149&r1=1508148&r2=1508149&view=diff ============================================================================== --- ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/ui/preferences/AdvancedSetupPreferencePage.java (original) +++ ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/ui/preferences/AdvancedSetupPreferencePage.java Mon Jul 29 17:39:25 2013 @@ -17,7 +17,7 @@ */ package org.apache.ivyde.eclipse.ui.preferences; -import org.apache.ivyde.eclipse.IvyPlugin; +import org.apache.ivyde.eclipse.internal.IvyPlugin; import org.apache.ivyde.eclipse.ui.AdvancedSetupEditor; import org.eclipse.jface.preference.PreferencePage; import org.eclipse.swt.SWT; Modified: ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/ui/preferences/ClasspathSetupPreferencePage.java URL: http://svn.apache.org/viewvc/ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/ui/preferences/ClasspathSetupPreferencePage.java?rev=1508149&r1=1508148&r2=1508149&view=diff ============================================================================== --- ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/ui/preferences/ClasspathSetupPreferencePage.java (original) +++ ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/ui/preferences/ClasspathSetupPreferencePage.java Mon Jul 29 17:39:25 2013 @@ -17,7 +17,7 @@ */ package org.apache.ivyde.eclipse.ui.preferences; -import org.apache.ivyde.eclipse.IvyPlugin; +import org.apache.ivyde.eclipse.internal.IvyPlugin; import org.apache.ivyde.eclipse.ui.ClasspathSetupEditor; import org.eclipse.jface.preference.PreferencePage; import org.eclipse.swt.SWT; Modified: ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/ui/preferences/IvyDEPreferenceStoreHelper.java URL: http://svn.apache.org/viewvc/ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/ui/preferences/IvyDEPreferenceStoreHelper.java?rev=1508149&r1=1508148&r2=1508149&view=diff ============================================================================== --- ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/ui/preferences/IvyDEPreferenceStoreHelper.java (original) +++ ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/ui/preferences/IvyDEPreferenceStoreHelper.java Mon Jul 29 17:39:25 2013 @@ -17,12 +17,12 @@ */ package org.apache.ivyde.eclipse.ui.preferences; -import org.apache.ivyde.eclipse.cpcontainer.AdvancedSetup; -import org.apache.ivyde.eclipse.cpcontainer.ClasspathSetup; +import org.apache.ivyde.eclipse.cp.AdvancedSetup; +import org.apache.ivyde.eclipse.cp.ClasspathSetup; +import org.apache.ivyde.eclipse.cp.MappingSetup; +import org.apache.ivyde.eclipse.cp.RetrieveSetup; +import org.apache.ivyde.eclipse.cp.SettingsSetup; import org.apache.ivyde.eclipse.cpcontainer.IvyClasspathUtil; -import org.apache.ivyde.eclipse.cpcontainer.MappingSetup; -import org.apache.ivyde.eclipse.cpcontainer.SettingsSetup; -import org.apache.ivyde.eclipse.retrieve.RetrieveSetup; import org.eclipse.jface.preference.IPreferenceStore; import org.eclipse.jface.preference.PreferenceConverter; import org.eclipse.swt.graphics.RGB; 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=1508149&r1=1508148&r2=1508149&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 Mon Jul 29 17:39:25 2013 @@ -21,7 +21,7 @@ import java.io.IOException; import java.util.Iterator; import java.util.List; -import org.apache.ivyde.eclipse.IvyPlugin; +import org.apache.ivyde.eclipse.internal.IvyPlugin; import org.apache.ivyde.eclipse.retrieve.RetrieveSetupManager; import org.apache.ivyde.eclipse.retrieve.StandaloneRetrieveSetup; import org.eclipse.core.resources.IProject; 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=1508149&r1=1508148&r2=1508149&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 Mon Jul 29 17:39:25 2013 @@ -18,8 +18,8 @@ package org.apache.ivyde.eclipse.ui.preferences; import org.apache.ivy.Ivy; -import org.apache.ivyde.eclipse.IvyPlugin; import org.apache.ivyde.eclipse.cpcontainer.IvyClasspathInitializer; +import org.apache.ivyde.eclipse.internal.IvyPlugin; import org.eclipse.jface.preference.PreferencePage; import org.eclipse.swt.SWT; import org.eclipse.swt.layout.GridData; Modified: ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/ui/preferences/MappingSetupPreferencePage.java URL: http://svn.apache.org/viewvc/ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/ui/preferences/MappingSetupPreferencePage.java?rev=1508149&r1=1508148&r2=1508149&view=diff ============================================================================== --- ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/ui/preferences/MappingSetupPreferencePage.java (original) +++ ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/ui/preferences/MappingSetupPreferencePage.java Mon Jul 29 17:39:25 2013 @@ -17,7 +17,7 @@ */ package org.apache.ivyde.eclipse.ui.preferences; -import org.apache.ivyde.eclipse.IvyPlugin; +import org.apache.ivyde.eclipse.internal.IvyPlugin; import org.apache.ivyde.eclipse.ui.MappingSetupEditor; import org.eclipse.jface.preference.PreferencePage; import org.eclipse.swt.SWT; Modified: ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/ui/preferences/PreferenceInitializer.java URL: http://svn.apache.org/viewvc/ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/ui/preferences/PreferenceInitializer.java?rev=1508149&r1=1508148&r2=1508149&view=diff ============================================================================== --- ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/ui/preferences/PreferenceInitializer.java (original) +++ ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/ui/preferences/PreferenceInitializer.java Mon Jul 29 17:39:25 2013 @@ -18,14 +18,14 @@ package org.apache.ivyde.eclipse.ui.preferences; import org.apache.ivy.util.Message; -import org.apache.ivyde.eclipse.IvyPlugin; -import org.apache.ivyde.eclipse.cpcontainer.AdvancedSetup; -import org.apache.ivyde.eclipse.cpcontainer.ClasspathSetup; +import org.apache.ivyde.eclipse.cp.AdvancedSetup; +import org.apache.ivyde.eclipse.cp.ClasspathSetup; +import org.apache.ivyde.eclipse.cp.MappingSetup; +import org.apache.ivyde.eclipse.cp.RetrieveSetup; +import org.apache.ivyde.eclipse.cp.SettingsSetup; import org.apache.ivyde.eclipse.cpcontainer.IvyClasspathInitializer; import org.apache.ivyde.eclipse.cpcontainer.IvyClasspathUtil; -import org.apache.ivyde.eclipse.cpcontainer.MappingSetup; -import org.apache.ivyde.eclipse.cpcontainer.SettingsSetup; -import org.apache.ivyde.eclipse.retrieve.RetrieveSetup; +import org.apache.ivyde.eclipse.internal.IvyPlugin; import org.apache.ivyde.eclipse.ui.editors.xml.IXMLColorConstants; import org.eclipse.core.runtime.preferences.AbstractPreferenceInitializer; import org.eclipse.jface.preference.IPreferenceStore; Modified: ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/ui/preferences/SettingsSetupPreferencePage.java URL: http://svn.apache.org/viewvc/ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/ui/preferences/SettingsSetupPreferencePage.java?rev=1508149&r1=1508148&r2=1508149&view=diff ============================================================================== --- ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/ui/preferences/SettingsSetupPreferencePage.java (original) +++ ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/ui/preferences/SettingsSetupPreferencePage.java Mon Jul 29 17:39:25 2013 @@ -17,7 +17,7 @@ */ package org.apache.ivyde.eclipse.ui.preferences; -import org.apache.ivyde.eclipse.IvyPlugin; +import org.apache.ivyde.eclipse.internal.IvyPlugin; import org.apache.ivyde.eclipse.ui.SettingsSetupEditor; import org.eclipse.jface.preference.PreferencePage; import org.eclipse.swt.SWT; Modified: ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/ui/preferences/WorkspaceResolverPreferencePage.java URL: http://svn.apache.org/viewvc/ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/ui/preferences/WorkspaceResolverPreferencePage.java?rev=1508149&r1=1508148&r2=1508149&view=diff ============================================================================== --- ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/ui/preferences/WorkspaceResolverPreferencePage.java (original) +++ ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/ui/preferences/WorkspaceResolverPreferencePage.java Mon Jul 29 17:39:25 2013 @@ -17,7 +17,7 @@ */ package org.apache.ivyde.eclipse.ui.preferences; -import org.apache.ivyde.eclipse.IvyPlugin; +import org.apache.ivyde.eclipse.internal.IvyPlugin; import org.eclipse.jface.preference.BooleanFieldEditor; import org.eclipse.jface.preference.FieldEditorPreferencePage; import org.eclipse.swt.SWT; Modified: ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/ui/preferences/XMLEditorPreferencesPage.java URL: http://svn.apache.org/viewvc/ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/ui/preferences/XMLEditorPreferencesPage.java?rev=1508149&r1=1508148&r2=1508149&view=diff ============================================================================== --- ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/ui/preferences/XMLEditorPreferencesPage.java (original) +++ ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/ui/preferences/XMLEditorPreferencesPage.java Mon Jul 29 17:39:25 2013 @@ -17,7 +17,7 @@ */ package org.apache.ivyde.eclipse.ui.preferences; -import org.apache.ivyde.eclipse.IvyPlugin; +import org.apache.ivyde.eclipse.internal.IvyPlugin; import org.apache.ivyde.eclipse.ui.editors.xml.ColorManager; import org.eclipse.jface.preference.ColorFieldEditor; import org.eclipse.jface.preference.FieldEditorPreferencePage; Modified: ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/ui/views/ReportView.java URL: http://svn.apache.org/viewvc/ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/ui/views/ReportView.java?rev=1508149&r1=1508148&r2=1508149&view=diff ============================================================================== --- ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/ui/views/ReportView.java (original) +++ ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/ui/views/ReportView.java Mon Jul 29 17:39:25 2013 @@ -19,9 +19,9 @@ package org.apache.ivyde.eclipse.ui.view import java.net.URL; -import org.apache.ivyde.eclipse.IvyDEMessage; -import org.apache.ivyde.eclipse.cpcontainer.IvyClasspathContainer; -import org.apache.ivyde.eclipse.cpcontainer.IvyClasspathUtil; +import org.apache.ivyde.eclipse.cp.IvyClasspathContainer; +import org.apache.ivyde.eclipse.cp.IvyClasspathContainerHelper; +import org.apache.ivyde.eclipse.internal.IvyDEMessage; import org.eclipse.jface.viewers.ISelection; import org.eclipse.jface.viewers.IStructuredSelection; import org.eclipse.swt.SWT; @@ -55,8 +55,8 @@ public class ReportView extends ViewPart public void selectionChanged(IWorkbenchPart part, ISelection sel) { if (sel instanceof IStructuredSelection) { - IvyClasspathContainer ivycp = IvyClasspathUtil - .getIvyClasspathContainer((IStructuredSelection) sel); + IvyClasspathContainer ivycp = IvyClasspathContainerHelper + .getContainer((IStructuredSelection) sel); if (ivycp != null) { browser.setText("<html></html>"); URL report = ivycp.getReportUrl(); Modified: ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/ui/views/ReverseDependencyExplorerView.java URL: http://svn.apache.org/viewvc/ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/ui/views/ReverseDependencyExplorerView.java?rev=1508149&r1=1508148&r2=1508149&view=diff ============================================================================== --- ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/ui/views/ReverseDependencyExplorerView.java (original) +++ ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/ui/views/ReverseDependencyExplorerView.java Mon Jul 29 17:39:25 2013 @@ -17,9 +17,9 @@ */ package org.apache.ivyde.eclipse.ui.views; -import org.apache.ivyde.eclipse.IvyPlugin; -import org.apache.ivyde.eclipse.cpcontainer.IvyClasspathContainer; +import org.apache.ivyde.eclipse.cpcontainer.IvyClasspathContainerImpl; import org.apache.ivyde.eclipse.handlers.OpenIvyFileHandler; +import org.apache.ivyde.eclipse.internal.IvyPlugin; import org.apache.ivyde.eclipse.revdepexplorer.IvyUtil; import org.apache.ivyde.eclipse.revdepexplorer.MultiRevDependencyDescriptor; import org.apache.ivyde.eclipse.revdepexplorer.SyncIvyFilesJob; @@ -154,7 +154,7 @@ public class ReverseDependencyExplorerVi IStructuredSelection selection = (IStructuredSelection) viewer.getSelection(); Object element = selection.getFirstElement(); if (element instanceof CPDependencyDescriptor) { - IvyClasspathContainer cp = ((CPDependencyDescriptor) element).container; + IvyClasspathContainerImpl cp = ((CPDependencyDescriptor) element).container; OpenIvyFileHandler.open(cp); } } @@ -328,7 +328,7 @@ public class ReverseDependencyExplorerVi public Object[] getChildren(Object parent) { if (parent instanceof MultiRevDependencyDescriptor) { MultiRevDependencyDescriptor mrdd = (MultiRevDependencyDescriptor) parent; - IvyClasspathContainer[] containers = mrdd.getIvyClasspathContainers(); + IvyClasspathContainerImpl[] containers = mrdd.getIvyClasspathContainers(); Object[] wrappedProjects = new Object[containers.length]; for (int i = 0; i < containers.length; i++) { @@ -359,11 +359,11 @@ public class ReverseDependencyExplorerVi } class CPDependencyDescriptor { - private IvyClasspathContainer container; + private IvyClasspathContainerImpl container; private MultiRevDependencyDescriptor multiRevisionDescriptor; - public CPDependencyDescriptor(IvyClasspathContainer container, + public CPDependencyDescriptor(IvyClasspathContainerImpl container, MultiRevDependencyDescriptor multiRevisionDescriptor) { this.container = container; this.multiRevisionDescriptor = multiRevisionDescriptor; @@ -376,7 +376,7 @@ public class ReverseDependencyExplorerVi return multiRevisionDescriptor.getRevisions(container); } - public IvyClasspathContainer getIvyClasspathContainer() { + public IvyClasspathContainerImpl getIvyClasspathContainer() { return container; } 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=1508149&r1=1508148&r2=1508149&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 Mon Jul 29 17:39:25 2013 @@ -24,7 +24,7 @@ import java.io.InputStream; import java.io.InputStreamReader; import java.lang.reflect.InvocationTargetException; -import org.apache.ivyde.eclipse.IvyPlugin; +import org.apache.ivyde.eclipse.internal.IvyPlugin; import org.apache.ivyde.eclipse.ui.core.IvyFileEditorInput; import org.apache.ivyde.eclipse.ui.editors.IvyModuleDescriptorEditor; import org.eclipse.core.resources.IContainer; Modified: ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/ui/wizards/IvyNewWizardPage.java URL: http://svn.apache.org/viewvc/ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/ui/wizards/IvyNewWizardPage.java?rev=1508149&r1=1508148&r2=1508149&view=diff ============================================================================== --- ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/ui/wizards/IvyNewWizardPage.java (original) +++ ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/ui/wizards/IvyNewWizardPage.java Mon Jul 29 17:39:25 2013 @@ -17,7 +17,7 @@ */ package org.apache.ivyde.eclipse.ui.wizards; -import org.apache.ivyde.eclipse.IvyPlugin; +import org.apache.ivyde.eclipse.internal.IvyPlugin; import org.apache.ivyde.eclipse.ui.preferences.PreferenceConstants; import org.eclipse.core.resources.IContainer; import org.eclipse.core.resources.IResource; 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=1508149&r1=1508148&r2=1508149&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 Mon Jul 29 17:39:25 2013 @@ -52,10 +52,10 @@ import org.apache.ivy.plugins.resolver.A import org.apache.ivy.plugins.resolver.util.ResolvedResource; import org.apache.ivy.plugins.version.VersionMatcher; import org.apache.ivy.util.Message; -import org.apache.ivyde.eclipse.IvyDEMessage; -import org.apache.ivyde.eclipse.IvyPlugin; -import org.apache.ivyde.eclipse.cpcontainer.IvyClasspathContainer; -import org.apache.ivyde.eclipse.cpcontainer.IvyClasspathUtil; +import org.apache.ivyde.eclipse.cp.IvyClasspathContainerHelper; +import org.apache.ivyde.eclipse.cpcontainer.IvyClasspathContainerImpl; +import org.apache.ivyde.eclipse.internal.IvyDEMessage; +import org.apache.ivyde.eclipse.internal.IvyPlugin; import org.eclipse.core.resources.IProject; import org.eclipse.core.resources.ResourcesPlugin; @@ -192,11 +192,11 @@ public class WorkspaceResolver extends A if (!p.exists()) { continue; } - List/* <IvyClasspathContainer> */containers = IvyClasspathUtil - .getIvyClasspathContainers(p); + List/* <IvyClasspathContainer> */containers = IvyClasspathContainerHelper + .getContainers(p); Iterator/* <IvyClasspathContainer> */itContainer = containers.iterator(); while (itContainer.hasNext()) { - IvyClasspathContainer ivycp = (IvyClasspathContainer) itContainer.next(); + IvyClasspathContainerImpl ivycp = (IvyClasspathContainerImpl) itContainer.next(); ModuleDescriptor md = ivycp.getState().getCachedModuleDescriptor(); if (md == null) { continue; Modified: ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/workspaceresolver/WorkspaceResourceChangeListener.java URL: http://svn.apache.org/viewvc/ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/workspaceresolver/WorkspaceResourceChangeListener.java?rev=1508149&r1=1508148&r2=1508149&view=diff ============================================================================== --- ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/workspaceresolver/WorkspaceResourceChangeListener.java (original) +++ ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/workspaceresolver/WorkspaceResourceChangeListener.java Mon Jul 29 17:39:25 2013 @@ -23,10 +23,10 @@ import java.util.Iterator; import java.util.LinkedHashSet; import java.util.List; -import org.apache.ivyde.eclipse.IvyNature; -import org.apache.ivyde.eclipse.IvyPlugin; -import org.apache.ivyde.eclipse.cpcontainer.IvyClasspathContainer; -import org.apache.ivyde.eclipse.cpcontainer.IvyClasspathUtil; +import org.apache.ivyde.eclipse.IvyNatureHelper; +import org.apache.ivyde.eclipse.cp.IvyClasspathContainerHelper; +import org.apache.ivyde.eclipse.cpcontainer.IvyClasspathContainerImpl; +import org.apache.ivyde.eclipse.internal.IvyPlugin; import org.eclipse.core.resources.IFile; import org.eclipse.core.resources.IFolder; import org.eclipse.core.resources.IProject; @@ -76,7 +76,7 @@ public class WorkspaceResourceChangeList return; } try { - if (project.hasNature(IvyNature.IVY_NATURE)) { + if (IvyNatureHelper.hasNature(project)) { projectClosed(project); } } catch (CoreException e) { @@ -97,7 +97,7 @@ public class WorkspaceResourceChangeList private void projectClosed(final IProject project) throws JavaModelException { // Check if one of Ivy projects is being removed - List containers = IvyClasspathUtil.getIvyClasspathContainers(project); + List containers = IvyClasspathContainerHelper.getContainers(project); if (containers.isEmpty()) { return; } @@ -109,7 +109,7 @@ public class WorkspaceResourceChangeList Iterator it = affectedContainers.iterator(); while (it.hasNext()) { - IvyClasspathContainer ivycp = (IvyClasspathContainer) it.next(); + IvyClasspathContainerImpl ivycp = (IvyClasspathContainerImpl) it.next(); ivycp.launchResolve(false, null); } } @@ -133,12 +133,8 @@ public class WorkspaceResourceChangeList if (!(resource instanceof IProject)) { continue; } - try { - if (((IProject) resource).hasNature(IvyNature.IVY_NATURE)) { - projects.add(resource); - } - } catch (CoreException e) { - IvyPlugin.log(e); + if (IvyNatureHelper.hasNature((IProject) resource)) { + projects.add(resource); } } @@ -152,7 +148,7 @@ public class WorkspaceResourceChangeList Iterator it = allContainers.iterator(); while (it.hasNext()) { - IvyClasspathContainer ivycp = (IvyClasspathContainer) it.next(); + IvyClasspathContainerImpl ivycp = (IvyClasspathContainerImpl) it.next(); ivycp.launchResolve(false, null); } } @@ -175,11 +171,11 @@ public class WorkspaceResourceChangeList for (int i = 0; i < projects.length; i++) { IJavaProject javaProject = projects[i]; - List/* <IvyClasspathContainer> */containers = IvyClasspathUtil - .getIvyClasspathContainers(javaProject); + List/* <IvyClasspathContainer> */containers = IvyClasspathContainerHelper + .getContainers(javaProject); Iterator/* <IvyClasspathContainer> */itContainer = containers.iterator(); while (itContainer.hasNext()) { - IvyClasspathContainer ivycp = (IvyClasspathContainer) itContainer.next(); + IvyClasspathContainerImpl ivycp = (IvyClasspathContainerImpl) itContainer.next(); IClasspathEntry[] containerEntries = ivycp.getClasspathEntries(); for (int j = 0; j < containerEntries.length; j++) { IClasspathEntry containerEntry = containerEntries[j]; @@ -212,7 +208,7 @@ public class WorkspaceResourceChangeList for (int i = 0; i < projects.length; i++) { if (!openedProjects.contains(projects[i].getProject())) { - allContainers.addAll(IvyClasspathUtil.getIvyClasspathContainers(projects[i])); + allContainers.addAll(IvyClasspathContainerHelper.getContainers(projects[i])); } }
