svn commit: r1038862 - in /ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse: retrieve/RetrieveSetup.java retrieve/StandaloneRetrieveSetup.java ui/preferences/EditStandaloneRetrieveDialog.java

[hibou]

Author: hibou
Date: Wed Nov 24 23:01:42 2010
New Revision: 1038862

URL: http://svn.apache.org/viewvc?rev=1038862&view=rev
Log:
Fix the edition of the standalone retrieve setup:
 - make the ivy file field actually editable
 - put default values which probably work in most cases

Modified:
    
ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/retrieve/RetrieveSetup.java
    
ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/retrieve/StandaloneRetrieveSetup.java
    
ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/ui/preferences/EditStandaloneRetrieveDialog.java

Modified: 
ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/retrieve/RetrieveSetup.java
URL: 
http://svn.apache.org/viewvc/ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/retrieve/RetrieveSetup.java?rev=1038862&r1=1038861&r2=1038862&view=diff
==============================================================================
--- 
ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/retrieve/RetrieveSetup.java
 (original)
+++ 
ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/retrieve/RetrieveSetup.java
 Wed Nov 24 23:01:42 2010
@@ -23,7 +23,7 @@ package org.apache.ivyde.eclipse.retriev
  */
 public class RetrieveSetup {
 
-    private String retrievePattern = "lib/[artifact]-[revision].[ext]";
+    private String retrievePattern = "lib/[type]s/[artifact]-[revision].[ext]";
 
     private boolean retrieveSync = false;
 

Modified: 
ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/retrieve/StandaloneRetrieveSetup.java
URL: 
http://svn.apache.org/viewvc/ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/retrieve/StandaloneRetrieveSetup.java?rev=1038862&r1=1038861&r2=1038862&view=diff
==============================================================================
--- 
ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/retrieve/StandaloneRetrieveSetup.java
 (original)
+++ 
ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/retrieve/StandaloneRetrieveSetup.java
 Wed Nov 24 23:01:42 2010
@@ -30,7 +30,7 @@ public class StandaloneRetrieveSetup {
 
     private IvySettingsSetup ivySettingsSetup = new IvySettingsSetup();
 
-    private String ivyXmlPath = "";
+    private String ivyXmlPath = "ivy.xml";
 
     private RetrieveSetup retrieveSetup = new RetrieveSetup();
 

Modified: 
ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/ui/preferences/EditStandaloneRetrieveDialog.java
URL: 
http://svn.apache.org/viewvc/ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/ui/preferences/EditStandaloneRetrieveDialog.java?rev=1038862&r1=1038861&r2=1038862&view=diff
==============================================================================
--- 
ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/ui/preferences/EditStandaloneRetrieveDialog.java
 (original)
+++ 
ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/ui/preferences/EditStandaloneRetrieveDialog.java
 Wed Nov 24 23:01:42 2010
@@ -94,7 +94,15 @@ public class EditStandaloneRetrieveDialo
         nameText = new Text(nameComposite, SWT.BORDER);
         nameText.setLayoutData(new GridData(GridData.FILL, GridData.FILL, 
true, false));
 
-        ivyFilePathText = new IvyFilePathText(parent, SWT.NONE, project);
+        Composite ivyFileComposite = new Composite(body, SWT.NONE);
+        ivyFileComposite.setLayoutData(new GridData(GridData.FILL, 
GridData.FILL, true, false));
+        ivyFileComposite.setLayout(new GridLayout(2, false));
+
+        Label ivyFileLabel = new Label(ivyFileComposite, SWT.NONE);
+        ivyFileLabel.setText("Ivy file: ");
+        ivyFileLabel.setLayoutData(new GridData(GridData.FILL, 
GridData.CENTER, false, false));
+
+        ivyFilePathText = new IvyFilePathText(ivyFileComposite, SWT.NONE, 
project);
         ivyFilePathText.setLayoutData(new GridData(GridData.FILL, 
GridData.FILL, true, false));
 
         retrieveComposite = new RetrieveComposite(body, SWT.NONE, true);