Author: hibou
Date: Sun Aug 10 09:26:48 2008
New Revision: 684547
URL: http://svn.apache.org/viewvc?rev=684547&view=rev
Log:
IVYDE-103 : every occurence of 'ivyconf' has been replaced by 'ivysettings'
Modified:
ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/CHANGES.txt
ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/IvyPlugin.java
ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/ui/preferences/IvyPreferencePage.java
Modified: ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/CHANGES.txt
URL:
http://svn.apache.org/viewvc/ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/CHANGES.txt?rev=684547&r1=684546&r2=684547&view=diff
==============================================================================
--- ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/CHANGES.txt (original)
+++ ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/CHANGES.txt Sun Aug 10
09:26:48 2008
@@ -9,6 +9,7 @@
- IMPROVE: Retrieve after resolve feature does not clean target directory
first (IVYDE-105)
- FIX: IvyDE crashes during resolve due to an incompatibility with Eclipse 3.2
(IVYDE-108)
+- FIX: Ivy preferences page mentions ivyconf not ivysettings (IVYDE-103)
version 2.0.0 alpha1
===========================
Modified:
ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/IvyPlugin.java
URL:
http://svn.apache.org/viewvc/ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/IvyPlugin.java?rev=684547&r1=684546&r2=684547&view=diff
==============================================================================
---
ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/IvyPlugin.java
(original)
+++
ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/IvyPlugin.java
Sun Aug 10 09:26:48 2008
@@ -337,9 +337,9 @@
MessageDialog
.openWarning(
getActiveWorkbenchShell(),
- "No ivyConf found",
+ "No ivy settings found",
ivySettingsPath
- + " ivyconf cannot be found.\nPlease
set your ivy conf url in the preference or in your project properties to be
able to use IvyDE");
+ + " ivy settings cannot be
found.\nPlease set your ivy conf url in the preference or in your project
properties to be able to use IvyDE");
return null;
}
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=684547&r1=684546&r2=684547&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
Sun Aug 10 09:26:48 2008
@@ -112,8 +112,8 @@
Label explanation = new Label(fieldParent, SWT.NONE);
explanation.setLayoutData(new GridData(GridData.FILL,
GridData.BEGINNING, false, false, 2,
1));
- explanation.setText("The url where your ivyconf file can be found. \n"
- + "Leave empty to reference the default ivy configuration.");
+ explanation.setText("The url where your ivysettings file can be found.
\n"
+ + "Leave empty to reference the default ivy settings.");
new Label(fieldParent, SWT.NONE).setLayoutData(new
GridData(GridData.FILL,
GridData.BEGINNING, false, false, 3, 1)); // space