Revise messages

org.apache.ivyde.eclipse/src/java/org/apache/ivyde/common/ivyfile/IvyModuleDescriptorModel.java

@@ -50,11 +50,11 @@ public IvyModuleDescriptorModel(IvyModelSettings settings) {
         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 String[] getValuesfor(IvyTagAttribute att, IvyFile ivyFile) {
             }
         });
         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 String[] getValuesfor(IvyTagAttribute att, IvyFile ivyFile) {
                 + "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 String[] getValuesfor(IvyTagAttribute att, IvyFile ivyFile) {
                         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 String[] getValuesfor(IvyTagAttribute att, IvyFile ivyFile) {
 
                 }));
         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 String[] getValuesfor(IvyTagAttribute att, IvyFile ivyFile) {
         });
         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 String[] getValuesfor(IvyTagAttribute att, IvyFile ivyFile) {
                 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 String[] getValuesfor(IvyTagAttribute att, IvyFile ivyFile) {
         }
         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 String[] getValuesfor(IvyTagAttribute att, IvyFile ivyFile) {
                         + "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 String[] getValuesfor(IvyTagAttribute att, IvyFile ivyFile) {
         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 String[] getValuesfor(IvyTagAttribute att, IvyFile ivyFile) {
         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));

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.

org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/IvyDEsecurityHelper.java

@@ -48,14 +48,14 @@ private 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 static List<SecuritySetup> getCredentialsFromSecureStore() {
                                 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 @@ private static void removeCredentialsFromSecureStore(SecuritySetup setup) {
                     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 @@ private static void invalidateIvyCredentials(SecuritySetup setup) {
         // 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() {

org.apache.ivyde.eclipse/src/java/org/apache/ivyde/internal/eclipse/CachedIvy.java

@@ -122,7 +122,7 @@ public Ivy getIvy() throws IvyDEException {
         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 @@ private Ivy doGetIvy() throws IvyDEException {
             } 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 @@ private Ivy getIvyFromFile(ResolvedPath ivySettingsPath) throws IvyDEException {
             } 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 @@ private IvySettings createIvySettings() throws IvyDEException {
     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 ModuleDescriptor getModuleDescriptor(Ivy i) throws IvyDEException {
             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);
         }
     }

org.apache.ivyde.eclipse/src/java/org/apache/ivyde/internal/eclipse/cpcontainer/IvyClasspathContainerConfAdapter.java

@@ -333,7 +333,7 @@ private static void convertOldRetrieveConf(IvyClasspathContainerConfiguration co
     }
 
     /**
-     * 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: ... }

org.apache.ivyde.eclipse/src/java/org/apache/ivyde/internal/eclipse/cpcontainer/IvyClasspathContainerMapper.java

@@ -367,12 +367,11 @@ private IClasspathAttribute[] getExtraAttribute(IPath classpathArtifact, IPath j
                         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);
                 }
             }
         }

org.apache.ivyde.eclipse/src/java/org/apache/ivyde/internal/eclipse/cpcontainer/IvydeContainerPage.java

@@ -112,7 +112,7 @@ public IJavaProject getProject() {
     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 void setSelection(IFile ivyfile) {
 
     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 void widgetSelected(SelectionEvent ev) {
                 } 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);
             }

org.apache.ivyde.eclipse/src/java/org/apache/ivyde/internal/eclipse/resolve/IvyResolveJob.java

@@ -104,7 +104,7 @@ private IStatus doRun(IProgressMonitor monitor) {
 
         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 @@ private IStatus doRun(IProgressMonitor monitor) {
                     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 {