improve the description of quickfix #1760

Author: jan

io.sloeber.ui/src/io/sloeber/ui/MarkerResolutionGenerator/UnresolvedIncludesResolutionGenerator.java

@@ -1,5 +1,7 @@
 package io.sloeber.ui.MarkerResolutionGenerator;
 
+import static io.sloeber.core.api.Const.*;
+import static io.sloeber.ui.Messages.*;
 import java.util.HashSet;
 import java.util.Map;
 import java.util.Set;
@@ -19,35 +21,35 @@
 import io.sloeber.core.api.ConfigurationPreferences;
 import io.sloeber.core.api.ISloeberConfiguration;
 
+
 public class UnresolvedIncludesResolutionGenerator implements IMarkerResolutionGenerator {
 
-	@SuppressWarnings("nls")
 	@Override
 	public IMarkerResolution[] getResolutions(IMarker marker) {
 		IMarkerResolution[] ret = new IMarkerResolution[0];
 		try {
 			Map<String, Object> attributes = marker.getAttributes();
-			Object severityObject = attributes.get("severity");
+			Object severityObject = attributes.get("severity"); //$NON-NLS-1$
 			if (!(severityObject instanceof Integer)) {
 				return ret;
 			}
 			int severity = ((Integer) severityObject).intValue();
 			if (severity != 2) {
 				return ret;
 			}
-			Object messageObject = attributes.get("message");
+			Object messageObject = attributes.get("message"); //$NON-NLS-1$
 			if (!(messageObject instanceof String)) {
 				return ret;
 			}
 			String message = (String) messageObject;
-			if (!message.endsWith(": No such file or directory")) {
+			if (!message.endsWith(": No such file or directory")) { //$NON-NLS-1$
 				return ret;
 			}
-			String libName = message.split(":")[1].trim();
+			String libName = message.split(COLON)[1].trim();
 			if (libName.isBlank()) {
 				return ret;
 			}
-			if (!libName.endsWith(".h")) {
+			if (!libName.endsWith(".h")) { //$NON-NLS-1$
 				return ret;
 			}
 
@@ -67,7 +69,7 @@ public IMarkerResolution[] getResolutions(IMarker marker) {
 
 						@Override
 						public String getLabel() {
-							return "Add the library to the project";
+							return AddLibraryToProject.replace(LIB_KEY, curlib.getFQN().toString());
 						}
 
 						@Override
@@ -108,21 +110,25 @@ public void run(IMarker marker11) {
 
 			Map<String, IArduinoLibraryVersion> toInstallLibs = LibraryManager.getLatestInstallableLibraries(librariesToInstall);
 
-			if (toInstallLibs.isEmpty()) {
-				//No installable lib found
+			if (toInstallLibs.size()!=1) {
+				//No or more than 1 installable lib found
+				//skip
 				return ret;
 			}
+			IArduinoLibraryVersion toInstalllLib=toInstallLibs.get(libName);
 
 				ret = new IMarkerResolution[1];
 				ret[0] = new IMarkerResolution() {
 
 					@Override
 					public String getLabel() {
-						return "Install the library in the workspace and add it to the project";
+						return InstallAndAddLibraryToProject.replace(LIB_KEY,toInstalllLib.getName())
+								.replace(VERSION_KEY, toInstalllLib.getVersion().toString())
+								.replace(MAINTAINER, toInstalllLib.getMaintainer());
 					}
 
 					@Override
-					public void run(@SuppressWarnings("hiding") IMarker marker) {
+					public void run( IMarker marker1) {
 						IArduinoLibraryVersion curlib=null;
 
 						for (Entry<String, IArduinoLibraryVersion> curLibSet : toInstallLibs.entrySet()) {

io.sloeber.ui/src/io/sloeber/ui/Messages.java

@@ -14,6 +14,8 @@ public class Messages extends NLS {
     public static final String MAINTAINER = "{MAINTAINER}"; //$NON-NLS-1$
     public static final String EMAIL = "{EMAIL}"; //$NON-NLS-1$
     public static final String URL = "{URL}"; //$NON-NLS-1$
+    public static final String LIB_KEY = "{LIB}"; //$NON-NLS-1$
+    public static final String VERSION_KEY = "{VERSION}"; //$NON-NLS-1$
 
 	public static String ui_select_debug_level;
 
@@ -197,6 +199,10 @@ public class Messages extends NLS {
 
 	public static String ui_new_sketch_sketch_source_folder;
 
+	public static String AddLibraryToProject;
+
+	public static String InstallAndAddLibraryToProject;
+
     public static String yes;
 
 

io.sloeber.ui/src/io/sloeber/ui/messages.properties

@@ -154,3 +154,5 @@ NewProjectSourceLocationPage_CodeInSrcFolder=put code in the src folder
 NewProjectSourceLocationPage_CustomSourceTextFieldError=You must provide a text in the text field that matches a valid folder name
 NewProjectSourceLocationPage_ExplainText=You can separate the source code from the rest of the project content by putting it in a source folder.
 
+AddLibraryToProject=Add the library {LIB} to the project.
+InstallAndAddLibraryToProject=Install the library {LIB} version {VERSION} from {MAINTAINER} in the workspace and add it to the project.

io.sloeber.ui/src/io/sloeber/ui/messages_nl.properties

@@ -68,7 +68,7 @@ ui_append_archive_text=Voeg to aan bibliotheek commando.
 ui_append_assembly=asm
 ui_append_assembly_text=Voeg toe aan machine code commando
 ui_append_c=C
-ui_append_c_cpp= C en C++ 
+ui_append_c_cpp= C en C++
 ui_append_c_cpp_text=Deze tekens worden toegevoegd aan de C en C++ compileer commandos.
 ui_append_c_text=Deze tekens worden toegevoegd aan het C compileer commando.
 ui_append_cpp=C++
@@ -132,3 +132,8 @@ Invalid_Private_Library_folder=[sloeber]/arduinoPlugin is geen geldig prive bibl
 ui_enable_bonjour=Zoek op het netwerk naar bonjour borden
 ui_put_in_version_control=Delen in versie controle?
 Build_Error_Before_Upload=De bouw van het project faalde voor het opladen.
+
+
+AddLibraryToProject=Voeg de bibliotheek {LIB} toe aan het project.
+InstallAndAddLibraryToProject=Installeer de biblitheek {LIB} versie {VERSION} van {MAINTAINER} in de werkplaats en voeg hem toe aan het project.
+