You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@ant.apache.org by gi...@apache.org on 2018/08/10 12:53:33 UTC
ant-ivyde git commit: Revise messages
Repository: ant-ivyde
Updated Branches:
refs/heads/master 905b27e26 -> cb1bb1437
Revise messages
Project: http://git-wip-us.apache.org/repos/asf/ant-ivyde/repo
Commit: http://git-wip-us.apache.org/repos/asf/ant-ivyde/commit/cb1bb143
Tree: http://git-wip-us.apache.org/repos/asf/ant-ivyde/tree/cb1bb143
Diff: http://git-wip-us.apache.org/repos/asf/ant-ivyde/diff/cb1bb143
Branch: refs/heads/master
Commit: cb1bb143712bc49858df501a85740ff2195977c4
Parents: 905b27e
Author: Gintas Grigelionis <gi...@apache.org>
Authored: Fri Aug 10 14:53:16 2018 +0200
Committer: Gintas Grigelionis <gi...@apache.org>
Committed: Fri Aug 10 14:53:16 2018 +0200
----------------------------------------------------------------------
.../ivyfile/IvyModuleDescriptorModel.java | 38 ++++++++++----------
.../ivyde/common/model/tagsdoc.properties | 2 +-
.../ivyde/eclipse/IvyDEsecurityHelper.java | 10 +++---
.../ivyde/internal/eclipse/CachedIvy.java | 20 +++++------
.../IvyClasspathContainerConfAdapter.java | 2 +-
.../IvyClasspathContainerMapper.java | 5 ++-
.../eclipse/cpcontainer/IvydeContainerPage.java | 6 ++--
.../internal/eclipse/resolve/IvyResolveJob.java | 4 +--
.../internal/eclipse/resolve/IvyResolver.java | 4 +--
.../eclipse/revdepexplorer/SyncIvyFilesJob.java | 2 +-
.../eclipse/ui/ClasspathSetupEditor.java | 2 +-
.../internal/eclipse/ui/IvyFilePathText.java | 2 +-
.../eclipse/ui/SettingsSetupEditor.java | 6 ++--
.../internal/eclipse/ui/console/IvyConsole.java | 2 +-
.../internal/eclipse/ui/views/ReportView.java | 2 +-
.../ui/views/ReverseDependencyExplorerView.java | 2 +-
.../eclipse/ui/wizards/IvyNewWizard.java | 2 +-
.../eclipse/ui/wizards/IvyNewWizardPage.java | 4 +--
.../eclipse/validator/BaseValidator.java | 2 +-
.../workspaceresolver/WorkspaceIvySettings.java | 2 +-
20 files changed, 59 insertions(+), 60 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ant-ivyde/blob/cb1bb143/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/common/ivyfile/IvyModuleDescriptorModel.java
----------------------------------------------------------------------
diff --git a/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/common/ivyfile/IvyModuleDescriptorModel.java b/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/common/ivyfile/IvyModuleDescriptorModel.java
index e9515ec..ab9732e 100644
--- a/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/common/ivyfile/IvyModuleDescriptorModel.java
+++ b/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/common/ivyfile/IvyModuleDescriptorModel.java
@@ -50,11 +50,11 @@ public class IvyModuleDescriptorModel extends IvyModel {
super(settings);
// ivy-module
- IvyTag ivyTag = new IvyTag("ivy-module", "root tag of ivy file");
- ivyTag.setDoc("Root tag of any ivy-file.");
+ IvyTag ivyTag = new IvyTag("ivy-module", "root tag of Ivy file");
+ ivyTag.setDoc("Root tag of any Ivy file.");
ivyTag.addAttribute(new IvyTagAttribute("version",
- "The version of the ivy file specification \n"
- + "should be '2.0' with current version of ivy", true));
+ "The version of the Ivy file specification \n"
+ + "should be '2.0' with current version of Ivy", true));
addTag(ivyTag);
IValueProvider defaultOrganizationProvider = new IValueProvider() {
@@ -84,7 +84,7 @@ public class IvyModuleDescriptorModel extends IvyModel {
}
});
IvyTagAttribute moduleTagAttribute = new IvyTagAttribute("module",
- "the name of the module described by this ivy file.", true);
+ "the name of the module described by this Ivy file.", true);
IValueProvider projectNameValueProvider = new IValueProvider() {
public String[] getValuesfor(IvyTagAttribute att, IvyFile ivyFile) {
return new String[] {ivyFile.getProjectName()};
@@ -136,16 +136,16 @@ public class IvyModuleDescriptorModel extends IvyModel {
+ "Try to respect spelling when using a classical license.", true,
new ListValueProvider(getDefault("license"))));
child
- .addAttribute(new IvyTagAttribute("url", "an url pointing to the license text.",
+ .addAttribute(new IvyTagAttribute("url", "an URL pointing to the license text.",
false));
addTag(child);
info.addChildIvyTag(child);
- child = new IvyTag("ivyauthor", "describes who has contributed to write the ivy file");
+ child = new IvyTag("ivyauthor", "describes who has contributed to write the Ivy file");
child.addAttribute(new IvyTagAttribute("name",
"the name of the author, as a person or a company.", true,
defaultOrganizationProvider));
child.addAttribute(new IvyTagAttribute("url",
- "an url pointing to where the author can be reached.", false,
+ "an URL pointing to where the author can be reached.", false,
defaultOrganizationURLProvider));
addTag(child);
info.addChildIvyTag(child);
@@ -158,7 +158,7 @@ public class IvyModuleDescriptorModel extends IvyModel {
return new String[] {"ibiblio", "ivyrep"};
}
}));
- child.addAttribute(new IvyTagAttribute("url", "an url pointing to the repository.", true,
+ child.addAttribute(new IvyTagAttribute("url", "an URL pointing to the repository.", true,
new IValueProvider() {
public String[] getValuesfor(IvyTagAttribute att, IvyFile ivyFile) {
Map<String, String> allAttsValues = ivyFile.getAllAttsValues();
@@ -175,7 +175,7 @@ public class IvyModuleDescriptorModel extends IvyModel {
}));
IvyTagAttribute reppatternTagAttribute = new IvyTagAttribute("pattern",
- "an ivy pattern to find modules on this repository", false);
+ "an Ivy pattern to find modules on this repository", false);
reppatternTagAttribute.setValueProvider(new IValueProvider() {
public String[] getValuesfor(IvyTagAttribute att, IvyFile ivyFile) {
Map<String, String> allAttsValues = ivyFile.getAllAttsValues();
@@ -192,13 +192,13 @@ public class IvyModuleDescriptorModel extends IvyModel {
});
child.addAttribute(reppatternTagAttribute);
child.addAttribute(new IvyBooleanTagAttribute("ivys",
- "true if ivy file can be found on this repository", false));
+ "true if Ivy file can be found on this repository", false));
child.addAttribute(new IvyBooleanTagAttribute("artifacts",
"true if module artifacts can be found on this repository", false));
addTag(child);
info.addChildIvyTag(child);
child = new IvyTag("description", "gives general description about the module");
- child.addAttribute(new IvyTagAttribute("homepage", "the url of the homepage of the module",
+ child.addAttribute(new IvyTagAttribute("homepage", "The URL of the homepage of the module",
false, defaultOrganizationURLProvider));
addTag(child);
info.addChildIvyTag(child);
@@ -277,7 +277,7 @@ public class IvyModuleDescriptorModel extends IvyModel {
projectNameValueProvider));
artifact.addAttribute(new IvyTagAttribute("type", "the type of the published artifact. \n"
+ "It's usually its extension, but not necessarily. \n"
- + "For instance, ivy files are of type 'ivy' but have 'xml' extension", true,
+ + "For instance, Ivy files are of type 'ivy' but have 'xml' extension", true,
new ListValueProvider(getDefault("type"))));
artifact.addAttribute(new IvyTagAttribute("ext", "the extension of the published artifact",
false, new ListValueProvider(getDefault("ext"))));
@@ -567,8 +567,8 @@ public class IvyModuleDescriptorModel extends IvyModel {
}
ListValueProvider matcherNamesProvider = new ListValueProvider(matcherNames.toArray(new String[matcherNames.size()]));
- IvyTag artifact2 = new IvyTag("artifact", "defines artifacts restriction \n"
- + "use only if you do not control dependency ivy file");
+ IvyTag artifact2 = new IvyTag("artifact", "defines artifact restriction \n"
+ + "use only if you do not control dependency Ivy file");
artifact2.addAttribute(new IvyTagAttribute("name", "the name of an artifact of the \n"
+ "dependency module to add to the include list, \n"
+ "or a regexp matching this name", false));
@@ -582,7 +582,7 @@ public class IvyModuleDescriptorModel extends IvyModel {
+ "or a regexp matching this name", false, new ListValueProvider(
getDefault("ext"))));
artifact2.addAttribute(new IvyTagAttribute("url",
- "an url where this artifact can be found \n"
+ "an URL where this artifact can be found \n"
+ "if it isn't present at the standard \n" + "location in the repository",
false));
artifact2.addAttribute(new IvyTagAttribute("conf",
@@ -598,8 +598,8 @@ public class IvyModuleDescriptorModel extends IvyModel {
allConf.add(conf4);
artifact2.addChildIvyTag(conf4);
addTag(artifact2);
- IvyTag include = new IvyTag("include", "defines artifacts restriction \n"
- + "use only if you do not control dependency ivy file");
+ IvyTag include = new IvyTag("include", "defines artifact restriction \n"
+ + "use only if you do not control dependency Ivy file");
include.addAttribute(new IvyTagAttribute("name", "the name of an artifact of the \n"
+ "dependency module to add to the include list, \n"
+ "or a regexp matching this name", false));
@@ -628,7 +628,7 @@ public class IvyModuleDescriptorModel extends IvyModel {
addTag(include);
allConf.add(conf5);
IvyTag exclude = new IvyTag("exclude", "defines artifacts restriction \n"
- + "use only if you do not control dependency ivy file");
+ + "use only if you do not control dependency Ivy file");
exclude.addAttribute(new IvyTagAttribute("org", "the organisation of the dependency \n"
+ "module or artifact to exclude, \n" + "or a pattern matching this organisation",
false));
http://git-wip-us.apache.org/repos/asf/ant-ivyde/blob/cb1bb143/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/common/model/tagsdoc.properties
----------------------------------------------------------------------
diff --git a/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/common/model/tagsdoc.properties b/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/common/model/tagsdoc.properties
index 77ff64f..6ae182a 100644
--- a/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/common/model/tagsdoc.properties
+++ b/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/common/model/tagsdoc.properties
@@ -134,7 +134,7 @@ ivysettings.caches.cache.TTL.@matcher = the matcher to use to match the modules
ivysettings.caches.cache.TTL.@duration = the TTL to apply (see above for format)
##### ivysettings.classpath
ivysettings.classpath = Includes a jar in the classpath used to load plugins.
-ivysettings.classpath.@url = the url of a jar to add to the classpath
+ivysettings.classpath.@url = the URL of a jar to add to the classpath
ivysettings.classpath.@file = a jar to add to the classpath
##### ivysettings.conflict-managers
ivysettings.conflict-managers = Defines a list of conflict managers usable in Ivy.
http://git-wip-us.apache.org/repos/asf/ant-ivyde/blob/cb1bb143/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/IvyDEsecurityHelper.java
----------------------------------------------------------------------
diff --git a/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/IvyDEsecurityHelper.java b/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/IvyDEsecurityHelper.java
index db683b1..8546549 100644
--- a/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/IvyDEsecurityHelper.java
+++ b/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/IvyDEsecurityHelper.java
@@ -48,14 +48,14 @@ public final class IvyDEsecurityHelper {
public static void addCredentialsToIvyCredentialStorage(SecuritySetup setup) {
CredentialsStore.INSTANCE.addCredentials(setup.getRealm(), setup.getHost(),
setup.getUserName(), setup.getPwd());
- IvyPlugin.logInfo("Credentials " + setup.toString() + " added to ivyDE credential store");
+ IvyPlugin.logInfo("Credentials " + setup.toString() + " added to IvyDE credential store");
}
public static void cpyCredentialsFromSecureToIvyStorage() {
for (SecuritySetup entry : getCredentialsFromSecureStore()) {
addCredentialsToIvyCredentialStorage(entry);
IvyPlugin.logInfo("Credentials " + entry.toString()
- + " from eclipse secure storage copied to ivyDE credential store");
+ + " from Eclipse secure storage copied to IvyDE credential store");
}
}
@@ -95,7 +95,7 @@ public final class IvyDEsecurityHelper {
childChildNode.get(PASSWORD_KEY, null));
setupValues.add(toAdd);
IvyPlugin.logInfo("Credentials " + toAdd.toString()
- + " loaded from eclipse secure storage");
+ + " loaded from Eclipse secure storage");
} catch (StorageException e1) {
IvyPlugin.logError(e1.getMessage(), e1);
}
@@ -135,7 +135,7 @@ public final class IvyDEsecurityHelper {
try {
node.flush();
IvyPlugin.logInfo("Credentials " + setup.toString()
- + "' removed from eclipse secure storage");
+ + "' removed from Eclipse secure storage");
} catch (IOException e) {
// TODO Auto-generated catch block
IvyPlugin.logError(e.getMessage(), e);
@@ -149,7 +149,7 @@ public final class IvyDEsecurityHelper {
// need to invalidate => on credentialStore just add-ops allowed
CredentialsStore.INSTANCE.addCredentials(setup.getHost(), setup.getRealm(), null, null);
IvyPlugin.logInfo("Credentials " + setup
- + " invalidated on ivyDE credential store: Removed on next eclipse startup.");
+ + " invalidated on IvyDE credential store: Removed on next Eclipse startup.");
}
public static boolean credentialsInSecureStorage() {
http://git-wip-us.apache.org/repos/asf/ant-ivyde/blob/cb1bb143/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/internal/eclipse/CachedIvy.java
----------------------------------------------------------------------
diff --git a/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/internal/eclipse/CachedIvy.java b/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/internal/eclipse/CachedIvy.java
index 7ce3646..800160f 100644
--- a/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/internal/eclipse/CachedIvy.java
+++ b/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/internal/eclipse/CachedIvy.java
@@ -122,7 +122,7 @@ public abstract class CachedIvy {
try {
return doGetIvy();
} catch (IvyDEException e) {
- e.contextualizeMessage("Error while resolving the ivy instance for " + this.toString());
+ e.contextualizeMessage("Error while resolving the Ivy instance for " + this.toString());
throw e;
}
}
@@ -171,12 +171,12 @@ public abstract class CachedIvy {
} catch (ParseException e) {
ivy = null;
throw new IvyDEException("Parsing error of the Ivy settings",
- "The ivy settings file '" + settingsPath.getResolvedPath()
+ "The Ivy settings file '" + settingsPath.getResolvedPath()
+ "' could not be parsed: " + e.getMessage(), e);
} catch (IOException e) {
ivy = null;
throw new IvyDEException("Read error of the Ivy settings",
- "The ivy settings file '" + settingsPath.getResolvedPath()
+ "The Ivy settings file '" + settingsPath.getResolvedPath()
+ "' could not be read: " + e.getMessage(), e);
}
}
@@ -202,12 +202,12 @@ public abstract class CachedIvy {
} catch (ParseException e) {
ivy = null;
throw new IvyDEException("Parsing error of the Ivy settings",
- "The ivy settings file '" + ivySettingsPath.getResolvedPath()
+ "The Ivy settings file '" + ivySettingsPath.getResolvedPath()
+ "' could not be parsed: " + e.getMessage(), e);
} catch (IOException e) {
ivy = null;
throw new IvyDEException("Read error of the Ivy settings",
- "The ivy settings file '" + ivySettingsPath.getResolvedPath()
+ "The Ivy settings file '" + ivySettingsPath.getResolvedPath()
+ "' could not be read: " + e.getMessage(), e);
}
ivySettingsLastModified = file.lastModified();
@@ -279,17 +279,17 @@ public abstract class CachedIvy {
public File getIvyFile() throws IvyDEException {
ResolvedPath ivyPath = new ResolvedPath(getIvyXmlPath(), getProject());
if (ivyPath.getError() != null) {
- throw new IvyDEException("Incorrect path of the ivy.xml",
+ throw new IvyDEException("Incorrect path of the ivy.xml file",
"The ivy.xml path '" + ivyPath.getInputPath() + "' is incorrect: "
+ ivyPath.getError().getMessage(), ivyPath.getError());
}
if (!ivyPath.isSet()) {
- throw new IvyDEException("Empty path of the ivy.xml",
+ throw new IvyDEException("Empty path of the ivy.xml file",
"The ivy.xml path is resolved to be empty: '" + ivyPath.getInputPath() + "'",
null);
}
if (ivyPath.getFile() == null) {
- throw new IvyDEException("The path of the ivy.xml is not a local file",
+ throw new IvyDEException("Non-local path of the ivy.xml file",
"The ivy.xml path is resolved to be a file: '" + ivyPath.getResolvedPath()
+ "'", null);
}
@@ -356,10 +356,10 @@ public abstract class CachedIvy {
throw new IvyDEException("Incorrect URL of the Ivy file",
"The URL to the ivy.xml file is incorrect: '" + file.getAbsolutePath() + "'", e);
} catch (ParseException e) {
- throw new IvyDEException("Parsing error of the Ivy file", "The ivy file '"
+ throw new IvyDEException("Parsing error of the Ivy file", "The Ivy file '"
+ file.getAbsolutePath() + "' could not be parsed: " + e.getMessage(), e);
} catch (IOException e) {
- throw new IvyDEException("Read error of the Ivy file", "The ivy file '"
+ throw new IvyDEException("Read error of the Ivy file", "The Ivy file '"
+ file.getAbsolutePath() + "' could not be read: " + e.getMessage(), e);
}
}
http://git-wip-us.apache.org/repos/asf/ant-ivyde/blob/cb1bb143/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/internal/eclipse/cpcontainer/IvyClasspathContainerConfAdapter.java
----------------------------------------------------------------------
diff --git a/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/internal/eclipse/cpcontainer/IvyClasspathContainerConfAdapter.java b/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/internal/eclipse/cpcontainer/IvyClasspathContainerConfAdapter.java
index 19511d3..8e4012e 100644
--- a/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/internal/eclipse/cpcontainer/IvyClasspathContainerConfAdapter.java
+++ b/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/internal/eclipse/cpcontainer/IvyClasspathContainerConfAdapter.java
@@ -333,7 +333,7 @@ public final class IvyClasspathContainerConfAdapter {
}
/**
- * Read old configuration that were based on relative urls, like: "file://./ivysettings.xml" or
+ * Read old configuration that were based on relative URLs, like: "file://./ivysettings.xml" or
* "file:./ivysettings.xml", and also URL like "project:///ivysettings.xml".
* <p>
* It will be replaced by the Eclipse variable ${workspace_loc: ... }
http://git-wip-us.apache.org/repos/asf/ant-ivyde/blob/cb1bb143/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/internal/eclipse/cpcontainer/IvyClasspathContainerMapper.java
----------------------------------------------------------------------
diff --git a/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/internal/eclipse/cpcontainer/IvyClasspathContainerMapper.java b/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/internal/eclipse/cpcontainer/IvyClasspathContainerMapper.java
index 37a74cf..fd36377 100644
--- a/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/internal/eclipse/cpcontainer/IvyClasspathContainerMapper.java
+++ b/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/internal/eclipse/cpcontainer/IvyClasspathContainerMapper.java
@@ -367,12 +367,11 @@ public class IvyClasspathContainerMapper {
url = new URL(u);
} catch (MalformedURLException e) {
// this should not happen
- IvyPlugin.logError("The jar URL for the javadoc is not formed correctly "
- + u, e);
+ IvyPlugin.logError("The jar URL for the javadoc is malformed " + u, e);
}
} catch (MalformedURLException e) {
// this should not happen
- IvyPlugin.logError("The path has not a correct URL: " + javadocArtifact, e);
+ IvyPlugin.logError("The path has incorrect URL: " + javadocArtifact, e);
}
}
}
http://git-wip-us.apache.org/repos/asf/ant-ivyde/blob/cb1bb143/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/internal/eclipse/cpcontainer/IvydeContainerPage.java
----------------------------------------------------------------------
diff --git a/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/internal/eclipse/cpcontainer/IvydeContainerPage.java b/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/internal/eclipse/cpcontainer/IvydeContainerPage.java
index a46c270..5880603 100644
--- a/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/internal/eclipse/cpcontainer/IvydeContainerPage.java
+++ b/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/internal/eclipse/cpcontainer/IvydeContainerPage.java
@@ -112,7 +112,7 @@ public class IvydeContainerPage extends NewElementWizardPage implements IClasspa
void checkCompleted() {
String error = null;
if (ivyFilePathText.getIvyFilePath().length() == 0) {
- error = "Choose an ivy file";
+ error = "Choose an Ivy file";
} else if (project != null) {
error = checkConf();
}
@@ -282,7 +282,7 @@ public class IvydeContainerPage extends NewElementWizardPage implements IClasspa
public void createControl(Composite parent) {
setTitle("IvyDE Managed Libraries");
- setDescription("Choose ivy file and its configurations.");
+ setDescription("Choose Ivy file and its configurations.");
tabs = new TabFolder(parent, SWT.BORDER);
tabs.setLayoutData(new GridData(GridData.FILL, GridData.FILL, true, true));
@@ -373,7 +373,7 @@ public class IvydeContainerPage extends NewElementWizardPage implements IClasspa
} catch (IvyDEException e) {
md = null;
e.show(IStatus.ERROR, "Ivy configuration error",
- "The configurations of the ivy.xml could not be retrieved: ");
+ "The configurations of the ivy.xml file could not be retrieved: ");
}
confTableViewer.setModuleDescriptor(md);
}
http://git-wip-us.apache.org/repos/asf/ant-ivyde/blob/cb1bb143/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/internal/eclipse/resolve/IvyResolveJob.java
----------------------------------------------------------------------
diff --git a/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/internal/eclipse/resolve/IvyResolveJob.java b/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/internal/eclipse/resolve/IvyResolveJob.java
index 84f7044..9079ec7 100644
--- a/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/internal/eclipse/resolve/IvyResolveJob.java
+++ b/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/internal/eclipse/resolve/IvyResolveJob.java
@@ -104,7 +104,7 @@ public class IvyResolveJob extends Job {
IvyDEMessage.verbose(toResolve.size() + " container(s) to resolve");
- monitor.beginTask("Loading ivy descriptors", MONITOR_LENGTH);
+ monitor.beginTask("Loading Ivy descriptors", MONITOR_LENGTH);
Map<ModuleDescriptor, List<ResolveRequest>> inworkspaceModules = new LinkedHashMap<>();
List<ResolveRequest> otherModules = new ArrayList<>();
@@ -134,7 +134,7 @@ public class IvyResolveJob extends Job {
monitor.worked(step);
continue;
}
- IvyDEMessage.verbose("Loading ivysettings for " + request.toString());
+ IvyDEMessage.verbose("Loading Ivy settings for " + request.toString());
CachedIvy cachedIvy = request.getCachedIvy();
Ivy ivy;
try {
http://git-wip-us.apache.org/repos/asf/ant-ivyde/blob/cb1bb143/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/internal/eclipse/resolve/IvyResolver.java
----------------------------------------------------------------------
diff --git a/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/internal/eclipse/resolve/IvyResolver.java b/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/internal/eclipse/resolve/IvyResolver.java
index ba6bfc8..8dc7f46 100644
--- a/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/internal/eclipse/resolve/IvyResolver.java
+++ b/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/internal/eclipse/resolve/IvyResolver.java
@@ -157,7 +157,7 @@ public class IvyResolver {
postResolveOrRefresh(ivy, md, result, monitor);
}
} catch (ParseException e) {
- String errorMsg = "Error while parsing the ivy file from " + this.toString() + "\n"
+ String errorMsg = "Error while parsing the Ivy file from " + this.toString() + "\n"
+ e.getMessage();
IvyDEMessage.error(errorMsg);
return new Status(IStatus.ERROR, IvyPlugin.ID, IStatus.ERROR, errorMsg, e);
@@ -268,7 +268,7 @@ public class IvyResolver {
// some artifact were 'forced' by the dependency declaration, whereas they should be
// switch by the eclipse project reference
for (int i = 0; i < artifactReports.length; i++) {
- ArtifactDownloadReport eclipseArtifactReport = (ArtifactDownloadReport) workspaceArtifacts
+ ArtifactDownloadReport eclipseArtifactReport = workspaceArtifacts
.get(artifactReports[i].getArtifact());
if (eclipseArtifactReport != null) {
// let's switch.
http://git-wip-us.apache.org/repos/asf/ant-ivyde/blob/cb1bb143/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/internal/eclipse/revdepexplorer/SyncIvyFilesJob.java
----------------------------------------------------------------------
diff --git a/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/internal/eclipse/revdepexplorer/SyncIvyFilesJob.java b/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/internal/eclipse/revdepexplorer/SyncIvyFilesJob.java
index 070e566..1e0c3fd 100644
--- a/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/internal/eclipse/revdepexplorer/SyncIvyFilesJob.java
+++ b/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/internal/eclipse/revdepexplorer/SyncIvyFilesJob.java
@@ -139,7 +139,7 @@ public class SyncIvyFilesJob extends WorkspaceJob {
ivyFile = ivycps.getIvyFile();
} catch (IvyDEException e) {
errorStatuses.add(new Status(IStatus.ERROR, IvyPlugin.ID, IStatus.ERROR,
- "Fail to resolve the ivy file", e));
+ "Fail to resolve the Ivy file", e));
continue;
}
http://git-wip-us.apache.org/repos/asf/ant-ivyde/blob/cb1bb143/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/internal/eclipse/ui/ClasspathSetupEditor.java
----------------------------------------------------------------------
diff --git a/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/internal/eclipse/ui/ClasspathSetupEditor.java b/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/internal/eclipse/ui/ClasspathSetupEditor.java
index d372b72..a08c3e4 100644
--- a/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/internal/eclipse/ui/ClasspathSetupEditor.java
+++ b/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/internal/eclipse/ui/ClasspathSetupEditor.java
@@ -81,7 +81,7 @@ public class ClasspathSetupEditor extends Composite {
false, 2, 1));
transitiveResolveCheck.setText("Resolve dependencies transitively");
transitiveResolveCheck
- .setToolTipText("If unchecked, will resolve dependency with transitivity disabled regardless of the settings in ivy.xml");
+ .setToolTipText("If unchecked, will resolve dependency with transitivity disabled regardless of the settings in the ivy.xml file");
readOSGiMetadataCheck = new Button(this, SWT.CHECK);
readOSGiMetadataCheck.setLayoutData(new GridData(GridData.FILL, GridData.FILL, true, false,
http://git-wip-us.apache.org/repos/asf/ant-ivyde/blob/cb1bb143/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/internal/eclipse/ui/IvyFilePathText.java
----------------------------------------------------------------------
diff --git a/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/internal/eclipse/ui/IvyFilePathText.java b/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/internal/eclipse/ui/IvyFilePathText.java
index 2299118..d8735fa 100644
--- a/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/internal/eclipse/ui/IvyFilePathText.java
+++ b/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/internal/eclipse/ui/IvyFilePathText.java
@@ -93,7 +93,7 @@ public class IvyFilePathText extends PathEditor {
textUpdated();
} catch (MalformedURLException ex) {
// this cannot happen
- IvyPlugin.logError("The file got from the file browser has not a valid URL", ex);
+ IvyPlugin.logError("The file got from the file browser has an invalid URL", ex);
}
}
http://git-wip-us.apache.org/repos/asf/ant-ivyde/blob/cb1bb143/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/internal/eclipse/ui/SettingsSetupEditor.java
----------------------------------------------------------------------
diff --git a/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/internal/eclipse/ui/SettingsSetupEditor.java b/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/internal/eclipse/ui/SettingsSetupEditor.java
index 72ec5da..bf1284a 100644
--- a/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/internal/eclipse/ui/SettingsSetupEditor.java
+++ b/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/internal/eclipse/ui/SettingsSetupEditor.java
@@ -43,8 +43,8 @@ import org.eclipse.swt.widgets.Text;
public class SettingsSetupEditor extends Composite {
- public static final String TOOLTIP_SETTINGS_PATH = "The url where your ivysettings file can be"
- + " found. \nLeave it empty to reference the default ivy settings. \n"
+ public static final String TOOLTIP_SETTINGS_PATH = "The URL where your Ivy settings file can be"
+ + " found. \nLeave it empty to reference the default Ivy settings. \n"
+ "Relative paths are handled relative to the project.";
public static final String TOOLTIP_PROPERTY_FILES = "Comma separated list of build property"
@@ -135,7 +135,7 @@ public class SettingsSetupEditor extends Composite {
} catch (MalformedURLException ex) {
// this cannot happen
IvyPlugin
- .logError("The file got from the file browser has not a valid URL", ex);
+ .logError("The file got from the file browser has an invalid URL", ex);
}
}
http://git-wip-us.apache.org/repos/asf/ant-ivyde/blob/cb1bb143/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/internal/eclipse/ui/console/IvyConsole.java
----------------------------------------------------------------------
diff --git a/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/internal/eclipse/ui/console/IvyConsole.java b/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/internal/eclipse/ui/console/IvyConsole.java
index 6626001..217ae93 100644
--- a/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/internal/eclipse/ui/console/IvyConsole.java
+++ b/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/internal/eclipse/ui/console/IvyConsole.java
@@ -36,7 +36,7 @@ import org.eclipse.ui.console.MessageConsole;
import org.eclipse.ui.console.MessageConsoleStream;
/**
- * This class is used to deal with ivy output, and is largely inspired of CVSOutputConsole for its
+ * This class is used to deal with Ivy output, and is largely inspired of CVSOutputConsole for its
* implementation
*/
public class IvyConsole extends MessageConsole implements MessageLogger {
http://git-wip-us.apache.org/repos/asf/ant-ivyde/blob/cb1bb143/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/internal/eclipse/ui/views/ReportView.java
----------------------------------------------------------------------
diff --git a/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/internal/eclipse/ui/views/ReportView.java b/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/internal/eclipse/ui/views/ReportView.java
index c38b350..bfe04e6 100644
--- a/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/internal/eclipse/ui/views/ReportView.java
+++ b/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/internal/eclipse/ui/views/ReportView.java
@@ -62,7 +62,7 @@ public class ReportView extends ViewPart implements ISelectionListener {
URL report = container.getReportUrl();
if (report == null || !browser.setUrl(report.toExternalForm())) {
browser.setText("<html></html>");
- IvyDEMessage.warn("Impossible to set report view url to " + report.toExternalForm());
+ IvyDEMessage.warn("Impossible to set report view URL to " + report.toExternalForm());
}
}
}
http://git-wip-us.apache.org/repos/asf/ant-ivyde/blob/cb1bb143/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/internal/eclipse/ui/views/ReverseDependencyExplorerView.java
----------------------------------------------------------------------
diff --git a/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/internal/eclipse/ui/views/ReverseDependencyExplorerView.java b/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/internal/eclipse/ui/views/ReverseDependencyExplorerView.java
index 931b42a..8d20be4 100644
--- a/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/internal/eclipse/ui/views/ReverseDependencyExplorerView.java
+++ b/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/internal/eclipse/ui/views/ReverseDependencyExplorerView.java
@@ -114,7 +114,7 @@ public class ReverseDependencyExplorerView extends ViewPart {
}
}
};
- syncAction.setToolTipText("Synchronize ivy dependencies");
+ syncAction.setToolTipText("Synchronize Ivy dependencies");
syncAction.setImageDescriptor(IvyPlugin.getImageDescriptor("icons/synced.gif"));
Action refreshAction = new Action() {
http://git-wip-us.apache.org/repos/asf/ant-ivyde/blob/cb1bb143/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/internal/eclipse/ui/wizards/IvyNewWizard.java
----------------------------------------------------------------------
diff --git a/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/internal/eclipse/ui/wizards/IvyNewWizard.java b/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/internal/eclipse/ui/wizards/IvyNewWizard.java
index a368b8a..afd81ca 100644
--- a/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/internal/eclipse/ui/wizards/IvyNewWizard.java
+++ b/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/internal/eclipse/ui/wizards/IvyNewWizard.java
@@ -156,7 +156,7 @@ public class IvyNewWizard extends Wizard implements INewWizard {
stream.close();
} catch (IOException e) {
throw new CoreException(new Status(IStatus.ERROR, IvyPlugin.ID, IStatus.ERROR,
- "The ivy.xml could not be created", e));
+ "The ivy.xml file could not be created", e));
}
monitor.worked(1);
monitor.setTaskName("Opening file for editing...");
http://git-wip-us.apache.org/repos/asf/ant-ivyde/blob/cb1bb143/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/internal/eclipse/ui/wizards/IvyNewWizardPage.java
----------------------------------------------------------------------
diff --git a/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/internal/eclipse/ui/wizards/IvyNewWizardPage.java b/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/internal/eclipse/ui/wizards/IvyNewWizardPage.java
index 03801a2..6d9a306 100644
--- a/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/internal/eclipse/ui/wizards/IvyNewWizardPage.java
+++ b/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/internal/eclipse/ui/wizards/IvyNewWizardPage.java
@@ -67,8 +67,8 @@ public class IvyNewWizardPage extends WizardPage {
public IvyNewWizardPage(ISelection selection) {
super("wizardPage");
setTitle("Ivy File");
- setDescription("This wizard creates a new ivy.xml "
- + "that can be opened by the ivy multi-page editor.");
+ setDescription("This wizard creates a new ivy.xml file "
+ + "that can be opened by the Ivy multi-page editor.");
this.selection = selection;
}
http://git-wip-us.apache.org/repos/asf/ant-ivyde/blob/cb1bb143/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/internal/eclipse/validator/BaseValidator.java
----------------------------------------------------------------------
diff --git a/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/internal/eclipse/validator/BaseValidator.java b/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/internal/eclipse/validator/BaseValidator.java
index 26dce1c..0b5069d 100644
--- a/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/internal/eclipse/validator/BaseValidator.java
+++ b/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/internal/eclipse/validator/BaseValidator.java
@@ -30,7 +30,7 @@ public abstract class BaseValidator implements IValidator {
public static final String EXISTING_ENTRY_ERROR = "An entry with that host and realm already exists";
- public static final String VALID_MESSAGE = "Valid ivy credentials: Press 'OK' to save them";
+ public static final String VALID_MESSAGE = "Valid Ivy credentials: Press 'OK' to save them";
public abstract boolean doValidation(Object validatedObject);
http://git-wip-us.apache.org/repos/asf/ant-ivyde/blob/cb1bb143/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/internal/eclipse/workspaceresolver/WorkspaceIvySettings.java
----------------------------------------------------------------------
diff --git a/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/internal/eclipse/workspaceresolver/WorkspaceIvySettings.java b/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/internal/eclipse/workspaceresolver/WorkspaceIvySettings.java
index 9e51907..e58cb54 100644
--- a/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/internal/eclipse/workspaceresolver/WorkspaceIvySettings.java
+++ b/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/internal/eclipse/workspaceresolver/WorkspaceIvySettings.java
@@ -42,7 +42,7 @@ public class WorkspaceIvySettings extends IvySettings {
private DependencyResolver decorate(DependencyResolver resolver) {
if (resolver == null) {
- return resolver;
+ return null;
}
String projectName = project == null ? "<null>" : project.getName();
ChainResolver chain = new ChainResolver();