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

[hibou]

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/* <String> */confs = Arrays.asList(new String[] {"default"});
+    List/* <String> */confs = Arrays.asList(new String[] {"default"});
 
-    public String ivySettingsPath;
+    String ivySettingsPath;
 
-    public List/* <String> */acceptedTypes;
+    List/* <String> */acceptedTypes;
 
-    public List/* <String> */sourceTypes;
+    List/* <String> */sourceTypes;
 
-    public List/* <String> */javadocTypes;
+    List/* <String> */javadocTypes;
 
-    public List/* <String> */sourceSuffixes;
+    List/* <String> */sourceSuffixes;
 
-    public List/* <String> */javadocSuffixes;
+    List/* <String> */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();
         }
     }