Author: xavier
Date: Sat Oct 27 00:16:19 2007
New Revision: 589054
URL: http://svn.apache.org/viewvc?rev=589054&view=rev
Log:
ivyconf renamed in ivysettings
Modified:
incubator/ivy/ivyde/trunk/src/java/org/apache/ivyde/eclipse/IvyPlugin.java
incubator/ivy/ivyde/trunk/src/java/org/apache/ivyde/eclipse/ui/properties/IvyProjectPropertyPage.java
Modified:
incubator/ivy/ivyde/trunk/src/java/org/apache/ivyde/eclipse/IvyPlugin.java
URL:
http://svn.apache.org/viewvc/incubator/ivy/ivyde/trunk/src/java/org/apache/ivyde/eclipse/IvyPlugin.java?rev=589054&r1=589053&r2=589054&view=diff
==============================================================================
--- incubator/ivy/ivyde/trunk/src/java/org/apache/ivyde/eclipse/IvyPlugin.java
(original)
+++ incubator/ivy/ivyde/trunk/src/java/org/apache/ivyde/eclipse/IvyPlugin.java
Sat Oct 27 00:16:19 2007
@@ -269,7 +269,7 @@
IProject project = javaProject.getProject();
File loc = project.getLocation().toFile();
file = new File(loc,url.getPath());
- Message.info("\n\nIVYDE: ivyconf from relative path:
"+file.getAbsolutePath());
+ Message.info("\n\nIVYDE: ivysettings from relative
path: "+file.getAbsolutePath());
}
// END - JIRA: IVYDE-25
@@ -284,7 +284,7 @@
if (ic.configTime == -1) {
Message.info("\n\n");
} else {
- Message.info("\n\nIVYDE: ivyconf has changed,
configuring ivy again\n");
+ Message.info("\n\nIVYDE: ivysettings has
changed, configuring ivy again\n");
}
ic.ivy.configure(file);
ic.configTime = file.lastModified();
@@ -324,9 +324,9 @@
_ivysByProject.put(javaProject, ivyConfig);
_ivysByConf.put("default", ivyConfig);
} catch (Exception ex) {
-
MessageDialog.openWarning(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(),
"Impossible to configure Ivy", "Problem occured while configuring Ivy with its
default configuration.\nPlease set an ivy conf url properly in the preference
or in the project properties to be able to use IvyDE.\nException message:
"+ex.getMessage());
- log(IStatus.WARNING, "Problem occured while configuring Ivy
with its default configuration.", ex);
- Message.warn("IVYDE: Problem occured while configuring Ivy
with its default configuration.. See error log for details");
+
MessageDialog.openWarning(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(),
"Impossible to configure Ivy", "Problem occured while configuring Ivy with its
default settings.\nPlease set an ivy settings url properly in the preference or
in the project properties to be able to use IvyDE.\nException message:
"+ex.getMessage());
+ log(IStatus.WARNING, "Problem occured while configuring Ivy
with its default settings.", ex);
+ Message.warn("IVYDE: Problem occured while configuring Ivy
with its default settings. See error log for details");
}
}
return ivy;
Modified:
incubator/ivy/ivyde/trunk/src/java/org/apache/ivyde/eclipse/ui/properties/IvyProjectPropertyPage.java
URL:
http://svn.apache.org/viewvc/incubator/ivy/ivyde/trunk/src/java/org/apache/ivyde/eclipse/ui/properties/IvyProjectPropertyPage.java?rev=589054&r1=589053&r2=589054&view=diff
==============================================================================
---
incubator/ivy/ivyde/trunk/src/java/org/apache/ivyde/eclipse/ui/properties/IvyProjectPropertyPage.java
(original)
+++
incubator/ivy/ivyde/trunk/src/java/org/apache/ivyde/eclipse/ui/properties/IvyProjectPropertyPage.java
Sat Oct 27 00:16:19 2007
@@ -25,7 +25,7 @@
public class IvyProjectPropertyPage extends PropertyPage {
- private static final String PATH_TITLE = "Ivy conf url:";
+ private static final String PATH_TITLE = "Ivy settings url:";
private static final String ACCEPTED_TYPES_TITLE = "Accepted types:";
private static final String SOURCES_TYPES_TITLE = "Sources types:";
private static final String JAVADOC_TYPES_TITLE = "Javadoc types:";
@@ -76,7 +76,7 @@
new Label(composite, SWT.NONE); // space
Label explanation = new Label(composite, SWT.NONE);
explanation.setLayoutData(new GridData(GridData.FILL,
GridData.BEGINNING, false, false, 3, 1));
- explanation.setText("The url where your ivyconf file can be found.
\nUse default to reference the default ivy configuration. \nUse [inherited] to
use your general eclipse setting.");
+ explanation.setText("The url where your ivysettings file can be found.
\nUse 'default' to reference the default ivy settings. \nUse '[inherited]' to
use your general eclipse setting.\nRelative paths are handled relative to the
project. Example: 'file://./ivysettings.xml'.");
new Label(composite, SWT.NONE).setLayoutData(new
GridData(GridData.FILL, GridData.BEGINNING, false, false, 4, 1)); // space
