Return-Path: Delivered-To: apmail-ant-notifications-archive@locus.apache.org Received: (qmail 28464 invoked from network); 11 May 2008 15:47:27 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 11 May 2008 15:47:27 -0000 Received: (qmail 13250 invoked by uid 500); 11 May 2008 15:47:29 -0000 Delivered-To: apmail-ant-notifications-archive@ant.apache.org Received: (qmail 13228 invoked by uid 500); 11 May 2008 15:47:29 -0000 Mailing-List: contact notifications-help@ant.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@ant.apache.org Delivered-To: mailing list notifications@ant.apache.org Received: (qmail 13217 invoked by uid 99); 11 May 2008 15:47:28 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 11 May 2008 08:47:28 -0700 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 11 May 2008 15:46:51 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 34E50238896F; Sun, 11 May 2008 08:47:06 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r655327 - in /ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse: cpcontainer/IvyClasspathContainerConfiguration.java ui/editors/IvyEditor.java Date: Sun, 11 May 2008 15:47:06 -0000 To: notifications@ant.apache.org From: hibou@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20080511154706.34E50238896F@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: hibou Date: Sun May 11 08:47:05 2008 New Revision: 655327 URL: http://svn.apache.org/viewvc?rev=655327&view=rev Log: Also support no Ivy classpath container when saving a ivy.xml file (IVYDE-83) Modified: ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/cpcontainer/IvyClasspathContainerConfiguration.java ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/ui/editors/IvyEditor.java Modified: ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/cpcontainer/IvyClasspathContainerConfiguration.java URL: http://svn.apache.org/viewvc/ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/cpcontainer/IvyClasspathContainerConfiguration.java?rev=655327&r1=655326&r2=655327&view=diff ============================================================================== --- ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/cpcontainer/IvyClasspathContainerConfiguration.java (original) +++ ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/cpcontainer/IvyClasspathContainerConfiguration.java Sun May 11 08:47:05 2008 @@ -44,23 +44,23 @@ */ public class IvyClasspathContainerConfiguration { - public IJavaProject javaProject; + IJavaProject javaProject; - public String ivyXmlPath; + String ivyXmlPath; - public List/* */confs = Arrays.asList(new String[] {"default"}); + List/* */confs = Arrays.asList(new String[] {"default"}); - public String ivySettingsPath; + String ivySettingsPath; - public List/* */acceptedTypes; + List/* */acceptedTypes; - public List/* */sourceTypes; + List/* */sourceTypes; - public List/* */javadocTypes; + List/* */javadocTypes; - public List/* */sourceSuffixes; + List/* */sourceSuffixes; - public List/* */javadocSuffixes; + List/* */javadocSuffixes; boolean doRetrieve; @@ -68,7 +68,7 @@ boolean alphaOrder; - public ModuleDescriptor md; + ModuleDescriptor md; public IvyClasspathContainerConfiguration(IJavaProject javaProject, String ivyXmlPath, List confs) { @@ -228,6 +228,10 @@ return new Path(IvyClasspathContainer.IVY_CLASSPATH_CONTAINER_ID).append(path.toString()); } + public String getIvyXmlPath() { + return ivyXmlPath; + } + public String getInheritedIvySettingsPath() { if (ivySettingsPath == null) { return IvyPlugin.getPreferenceStoreHelper().getIvySettingsPath(); @@ -299,51 +303,6 @@ return alphaOrder; } - // - // public List getAcceptedTypes() { - // return acceptedTypes; - // } - // - // public List getConfs() { - // return confs; - // } - // - // public boolean getDoRetrieve() { - // return doRetrieve; - // } - // - // public String getIvySettingsPath() { - // return ivySettingsPath; - // } - // - // public String getIvyXmlPath() { - // return ivyXmlPath; - // } - // - // public List getJavadocSuffixes() { - // return javadocSuffixes; - // } - // - // public List getJavadocTypes() { - // return javadocTypes; - // } - // - // public boolean isAlphaOrder() { - // return alphaOrder; - // } - // - // public String getRetrievePattern() { - // return retrievePattern; - // } - // - // public List getSourceSuffixes() { - // return sourceSuffixes; - // } - // - // public List getSourceTypes() { - // return sourceTypes; - // } - public boolean isProjectSpecific() { return ivySettingsPath != null; } Modified: ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/ui/editors/IvyEditor.java URL: http://svn.apache.org/viewvc/ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/ui/editors/IvyEditor.java?rev=655327&r1=655326&r2=655327&view=diff ============================================================================== --- ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/ui/editors/IvyEditor.java (original) +++ ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/ui/editors/IvyEditor.java Sun May 11 08:47:05 2008 @@ -135,7 +135,7 @@ IFile file = ((IvyFileEditorInput) getEditorInput()).getFile(); IJavaProject project = JavaCore.create(file.getProject()); IvyClasspathContainer cp = IvyClasspathUtil.getIvyClasspathContainer(project); - if (cp.getConf().ivyXmlPath.equals(file.getProjectRelativePath().toString())) { + if (cp != null && cp.getConf().getIvyXmlPath().equals(file.getProjectRelativePath().toString())) { cp.scheduleResolve(); } }