fix warnings

jan · jan · commit ec20b8052af3 · 2024-12-21T02:14:05.000+01:00
diff --git a/io.sloeber.autoBuild.ui/src/io/sloeber/autoBuild/ui/tabs/ToolSettingsTab.java b/io.sloeber.autoBuild.ui/src/io/sloeber/autoBuild/ui/tabs/ToolSettingsTab.java
@@ -216,7 +216,7 @@ public void controlResized(ControlEvent e) {
         } else {
             //the line below is only here for development so I know there will only be resources
             //TODO remove the line below after evaluation this never ever happens
-            System.err.println("Element should be resource " + pageElement);
+            System.err.println("Element should be resource " + pageElement); //$NON-NLS-1$
         }
 
         setValues();
@@ -280,17 +280,6 @@ protected void updateTipText(String name, String tip) {
         tipText.update();
     }
 
-    /* (non-Javadoc)
-     * Method resetTipText
-     * @since 7.0
-     */
-    private void resetTipText() {
-        if (tipText == null) {
-            return;
-        }
-        tipText.setText(Messages.ToolSettingsTab_0);
-        tipText.update();
-    }
 
     /* (non-Javadoc)
      * Method displayOptionsForCategory
@@ -411,7 +400,7 @@ public void modifyText(ModifyEvent e) {
                         }
                         }
 
-                        Label label = stringField.getLabelControl(mySettingsPageContainer);
+                        //Label label = stringField.getLabelControl(mySettingsPageContainer);
                         Text text = stringField.getTextControl(mySettingsPageContainer);
                         text.setText(optionValue);
                         //    if(pageHasToolTipBox)
diff --git a/io.sloeber.autoBuild/src/io/sloeber/autoBuild/buildTools/internal/MinGW32ToolsProvider.java b/io.sloeber.autoBuild/src/io/sloeber/autoBuild/buildTools/internal/MinGW32ToolsProvider.java
@@ -36,7 +36,7 @@ private  void findTools() {
     	try {
         myMinGWHome = org.eclipse.cdt.internal.core.MinGW.getMinGWHome();
     	}
-    	catch(@SuppressWarnings("unused") Exception e) {
+    	catch( Exception e) {
     		//ignore as this fails in maven build due to lack of gui and as such registry
     		//is not available
     		e.printStackTrace();
diff --git a/io.sloeber.autoBuild/src/io/sloeber/autoBuild/extensionPoint/providers/AutoBuildMakeRule.java b/io.sloeber.autoBuild/src/io/sloeber/autoBuild/extensionPoint/providers/AutoBuildMakeRule.java
@@ -296,7 +296,7 @@ public String[] getRecipes(IFolder buildFolder, AutoBuildConfigurationDescriptio
 										.getFolder(IPath.forPosix(curEntry.getValue())).getLocation();
 								if(path==null) {
 									//Log error to allow for investigation
-									Activator.log(new Status(IStatus.WARNING, Activator.PLUGIN_ID, "No location found for "+curEntry.getValue()));
+									Activator.log(new Status(IStatus.WARNING, Activator.PLUGIN_ID, "No location found for "+curEntry.getValue())); //$NON-NLS-1$
 
 								}else {
 								includePath = includePath + WHITESPACE + DOUBLE_QUOTE + CMD_LINE_INCLUDE_FOLDER
diff --git a/io.sloeber.autoBuild/src/io/sloeber/autoBuild/helpers/api/KeyValueTree.java b/io.sloeber.autoBuild/src/io/sloeber/autoBuild/helpers/api/KeyValueTree.java
@@ -8,8 +8,6 @@
 import java.util.LinkedHashMap;
 import java.util.Map;
 import java.util.Map.Entry;
-import java.util.TreeMap;
-
 import org.apache.commons.io.FileUtils;
 import org.eclipse.core.resources.IFile;
 import org.eclipse.core.resources.IFolder;
diff --git a/io.sloeber.autoBuild/src/io/sloeber/autoBuild/integration/AutoBuildConfigurationDescription.java b/io.sloeber.autoBuild/src/io/sloeber/autoBuild/integration/AutoBuildConfigurationDescription.java
@@ -1149,7 +1149,7 @@ public void deleteBuildFolder(IProgressMonitor monitor) {
 						curMember.delete(true, monitor);
 					} catch (CoreException e) {
 						Activator.log(new Status(IStatus.ERROR, Activator.PLUGIN_ID,
-				                "Failed to delete member "+curMember.getName(), e));
+				                "Failed to delete member "+curMember.getName(), e)); //$NON-NLS-1$
 					}
 
 				}
diff --git a/io.sloeber.autoBuild/src/io/sloeber/autoBuild/integration/AutoBuildManager.java b/io.sloeber.autoBuild/src/io/sloeber/autoBuild/integration/AutoBuildManager.java
@@ -266,8 +266,8 @@ public static Set<IProjectType> getProjectTypes(String extensionPointID, String
 				IProjectType projectType = AutoBuildManager.getProjectType(extensionPointID, extensionID,
 						element.getAttribute(ID), true);
 				if (projectType == null) {
-					System.err.println("project not found: extensionPoint ID " + extensionPointID + " and extension ID "
-							+ extensionID + " and " + ID);
+					System.err.println("project not found: extensionPoint ID " + extensionPointID + " and extension ID " //$NON-NLS-1$ //$NON-NLS-2$
+							+ extensionID + " and " + ID); //$NON-NLS-1$
 				} else {
 					ret.add(projectType);
 				}
diff --git a/io.sloeber.core/src/io/sloeber/core/Activator.java b/io.sloeber.core/src/io/sloeber/core/Activator.java
@@ -173,7 +173,7 @@ private static void testKnownIssues() {
         if (!errorString.isEmpty()) {
             errorString += "\n\nSloeber might still function but if you get strange results you know where to look.\n";
             errorString += "Do not create an issue if you see this!!!";
-            log(new Status(IStatus.ERROR, PLUGIN_ID, errorString));
+            log(new Status(IStatus.ERROR, Activator.getId(), errorString));
         }
 
     }
@@ -301,7 +301,7 @@ public void stop(BundleContext context) throws Exception {
      * the io.sloeber.core.managers and io.sloeber.core.managers.ui to work.
      */
     public static String getId() {
-        return PLUGIN_ID;
+        return "io.sloeber.core";
     }
 
     /**
diff --git a/io.sloeber.core/src/io/sloeber/core/api/Const.java b/io.sloeber.core/src/io/sloeber/core/api/Const.java
@@ -73,7 +73,7 @@ public class Const extends AutoBuildConstants {
     public static final String REMOTE_SUFFIX = "_remote";
 
     // General stuff
-    public static final String PLUGIN_ID = "io.sloeber.core";
+    //public static final String PLUGIN_ID = "io.sloeber.core";
     public static final String CORE_PLUGIN_ID = "io.sloeber.arduino.core";
     public static final String SLOEBER_NATURE_ID = "io.sloeber.arduinonature";
     public static final String KEY_LAST_USED_EXAMPLES = "Last used Examples";
diff --git a/io.sloeber.core/src/io/sloeber/core/api/PasswordManager.java b/io.sloeber.core/src/io/sloeber/core/api/PasswordManager.java
@@ -6,6 +6,7 @@
 import org.eclipse.equinox.security.storage.SecurePreferencesFactory;
 import org.eclipse.equinox.security.storage.StorageException;
 
+import io.sloeber.autoBuild.helpers.api.AutoBuildConstants;
 import io.sloeber.core.Activator;
 import io.sloeber.core.Messages;
 
@@ -113,7 +114,7 @@ public static void ErasePassword(String host) {
 
     private static String ConvertHostToNodeName(String host) {
 
-        return "ssh/" + host.replace(Const.DOT, Const.SLACH); //$NON-NLS-1$
+        return "ssh/" + host.replace(AutoBuildConstants.DOT, AutoBuildConstants.SLACH); //$NON-NLS-1$
     }
 
 }
diff --git a/io.sloeber.core/src/io/sloeber/core/eclipseIntegrations/CDT_EnvironmentVariableResolver.java b/io.sloeber.core/src/io/sloeber/core/eclipseIntegrations/CDT_EnvironmentVariableResolver.java
@@ -1,7 +1,5 @@
 package io.sloeber.core.eclipseIntegrations;
 
-import static io.sloeber.core.api.Const.*;
-
 import org.eclipse.cdt.core.CCorePlugin;
 import org.eclipse.cdt.core.envvar.IEnvironmentVariableManager;
 import org.eclipse.cdt.core.settings.model.ICConfigurationDescription;
@@ -18,6 +16,7 @@
 import org.eclipse.core.variables.IStringVariableManager;
 import org.eclipse.core.variables.VariablesPlugin;
 
+import io.sloeber.core.Activator;
 import io.sloeber.core.Messages;
 
 public class CDT_EnvironmentVariableResolver implements IDynamicVariableResolver {
@@ -29,7 +28,7 @@ public String resolveValue(IDynamicVariable variable, String varName) throws Cor
             return getBuildEnvironmentVariable(confDesc, varName);
 
         } catch ( Exception e) {
-            Status iStatus = new Status(IStatus.ERROR, PLUGIN_ID, Messages.projectNotFoundInGUI,e);
+            Status iStatus = new Status(IStatus.ERROR, Activator.getId(), Messages.projectNotFoundInGUI,e);
             throw new CoreException(iStatus);
         }
     }
diff --git a/io.sloeber.ui/src/io/sloeber/ui/actions/BuildHandler.java b/io.sloeber.ui/src/io/sloeber/ui/actions/BuildHandler.java
@@ -43,7 +43,7 @@ protected IStatus run(IProgressMonitor monitor) {
 		} catch (CoreException e) {
 			return new Status(IStatus.ERROR, NODE_ARDUINO,
 					Messages.buildHandler_build_code_of_project.replace(Messages.PROJECT, myBuildProject.getName())
-							+ " failed",
+							+ " failed", //$NON-NLS-1$
 					e);
 		}
 		return Status.OK_STATUS;
diff --git a/io.sloeber.ui/src/io/sloeber/ui/monitor/views/PlotterView.java b/io.sloeber.ui/src/io/sloeber/ui/monitor/views/PlotterView.java
@@ -1,5 +1,9 @@
 package io.sloeber.ui.monitor.views;
 
+
+import static io.sloeber.core.api.Const.*;
+
+import java.net.URI;
 import java.net.URL;
 
 import org.eclipse.core.runtime.IProgressMonitor;
@@ -41,7 +45,7 @@ public class PlotterView extends ViewPart implements ServiceListener {
 	Serial mySerial = null;
 
 	private static final String FLAG_MONITOR = "FmStatus"; //$NON-NLS-1$
-	String uri = "h tt p://bae yens.i t/ec li pse/do wnl oad/Sc opeS tart.h t ml?m="; //$NON-NLS-1$
+	private static String uri = "h tt p://bae yens.i t/ec li pse/do wnl oad/Sc opeS tart.h t ml?m="; //$NON-NLS-1$
 	public Object mstatus; // status of the plotter
 
 	public PlotterView() {
@@ -53,8 +57,8 @@ protected IStatus run(IProgressMonitor monitor) {
 					IEclipsePreferences mySCope = InstanceScope.INSTANCE.getNode(MyPreferences.NODE_ARDUINO);
 					int curFsiStatus = mySCope.getInt(FLAG_MONITOR, 0) + 1;
 					mySCope.putInt(FLAG_MONITOR, curFsiStatus);
-					URL pluginStartInitiator = new URL(
-							PlotterView.this.uri.replace(" ", "") + Integer.toString(curFsiStatus)); //$NON-NLS-1$ //$NON-NLS-2$
+					URI tt= new URI(uri.replace(SPACE, EMPTY) + Integer.toString(curFsiStatus));
+					URL pluginStartInitiator = tt.toURL();
 					PlotterView.this.mstatus = pluginStartInitiator.getContent();
 				} catch (Exception e) {// JABA is not going to add code
 				}
diff --git a/io.sloeber.ui/src/io/sloeber/ui/monitor/views/SerialMonitor.java b/io.sloeber.ui/src/io/sloeber/ui/monitor/views/SerialMonitor.java
@@ -1,8 +1,10 @@
 package io.sloeber.ui.monitor.views;
 
+import static io.sloeber.core.api.Const.*;
 import static io.sloeber.ui.Activator.*;
 
 import java.io.File;
+import java.net.URI;
 import java.net.URL;
 import java.nio.charset.Charset;
 import java.nio.file.Files;
@@ -200,9 +202,8 @@ protected IStatus run(IProgressMonitor monitor) {
 					IEclipsePreferences myScope = InstanceScope.INSTANCE.getNode(MyPreferences.NODE_ARDUINO);
 					int curFsiStatus = myScope.getInt(MY_FLAG_MONITOR, 0) + 1;
 					myScope.putInt(MY_FLAG_MONITOR, curFsiStatus);
-					URL mypluginStartInitiator = new URL(uri.replace(" ", new String()) //$NON-NLS-1$
-							+ Integer.toString(curFsiStatus));
-					mypluginStartInitiator.getContent();
+					URI tt= new URI(uri.replace(SPACE, EMPTY) + Integer.toString(curFsiStatus));
+					tt.toURL().getContent();
 				} catch (Exception e) {// JABA is not going to add code
 				}
 				return Status.OK_STATUS;
diff --git a/io.sloeber.ui/src/io/sloeber/ui/preferences/LibrarySelectionPage.java b/io.sloeber.ui/src/io/sloeber/ui/preferences/LibrarySelectionPage.java
@@ -147,9 +147,9 @@ public boolean canUpdate() {
 			public String getTooltip() {
 				if (myTooltip == null) {
 					IArduinoLibraryVersion libVers = getLatest();
-					myTooltip = "Architectures:" + libVers.getArchitectures().toString() + blankLine
-							+ libVers.getSentence() + blankLine + libVers.getParagraph() + blankLine + "Author: "
-							+ libVers.getAuthor() + blankLine + "Maintainer: " + libVers.getMaintainer() ;
+					myTooltip = "Architectures:" + libVers.getArchitectures().toString() + blankLine //$NON-NLS-1$
+							+ libVers.getSentence() + blankLine + libVers.getParagraph() + blankLine + "Author: " //$NON-NLS-1$
+							+ libVers.getAuthor() + blankLine + "Maintainer: " + libVers.getMaintainer() ; //$NON-NLS-1$
 				}
 				return myTooltip;
 			}
diff --git a/io.sloeber.ui/src/io/sloeber/ui/wizard/newsketch/NewSketchWizard.java b/io.sloeber.ui/src/io/sloeber/ui/wizard/newsketch/NewSketchWizard.java
@@ -40,7 +40,7 @@ public class NewSketchWizard extends Wizard implements INewWizard, IExecutableEx
 			Messages.ui_new_sketch_arduino_information);
 	protected NewSketchWizardCodeSelectionPage mNewArduinoSketchWizardCodeSelectionPage = new NewSketchWizardCodeSelectionPage(
 			Messages.ui_new_sketch_sketch_template_location);
-	private NewProjectSourceLocationPage mySourceLocationPage= new NewProjectSourceLocationPage("code location page");
+	private NewProjectSourceLocationPage mySourceLocationPage= new NewProjectSourceLocationPage("code location page"); //$NON-NLS-1$
 	private IConfigurationElement mConfig;
 	private IProject mProject;
 

Original file line number	Diff line number	Diff line change
`@@ -36,7 +36,7 @@ private void findTools() {`
`36`	`36`	`try {`
`37`	`37`	`myMinGWHome = org.eclipse.cdt.internal.core.MinGW.getMinGWHome();`
`38`	`38`	`}`
`39`		`- catch(@SuppressWarnings("unused") Exception e) {`
	`39`	`+ catch( Exception e) {`
`40`	`40`	`//ignore as this fails in maven build due to lack of gui and as such registry`
`41`	`41`	`//is not available`
`42`	`42`	`e.printStackTrace();`
Original file line number	Diff line number	Diff line change
`@@ -1149,7 +1149,7 @@ public void deleteBuildFolder(IProgressMonitor monitor) {`
`1149`	`1149`	`curMember.delete(true, monitor);`
`1150`	`1150`	`} catch (CoreException e) {`
`1151`	`1151`	`Activator.log(new Status(IStatus.ERROR, Activator.PLUGIN_ID,`
`1152`		`- "Failed to delete member "+curMember.getName(), e));`
	`1152`	`+ "Failed to delete member "+curMember.getName(), e)); //$NON-NLS-1$`
`1153`	`1153`	`}`
`1154`	`1154`
`1155`	`1155`	`}`
Original file line number	Diff line number	Diff line change
`@@ -173,7 +173,7 @@ private static void testKnownIssues() {`
`173`	`173`	`if (!errorString.isEmpty()) {`
`174`	`174`	`errorString += "\n\nSloeber might still function but if you get strange results you know where to look.\n";`
`175`	`175`	`errorString += "Do not create an issue if you see this!!!";`
`176`		`- log(new Status(IStatus.ERROR, PLUGIN_ID, errorString));`
	`176`	`+ log(new Status(IStatus.ERROR, Activator.getId(), errorString));`
`177`	`177`	`}`
`178`	`178`
`179`	`179`	`}`
`@@ -301,7 +301,7 @@ public void stop(BundleContext context) throws Exception {`
`301`	`301`	`* the io.sloeber.core.managers and io.sloeber.core.managers.ui to work.`
`302`	`302`	`*/`
`303`	`303`	`public static String getId() {`
`304`		`- return PLUGIN_ID;`
	`304`	`+ return "io.sloeber.core";`
`305`	`305`	`}`
`306`	`306`
`307`	`307`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -6,6 +6,7 @@`
`6`	`6`	`import org.eclipse.equinox.security.storage.SecurePreferencesFactory;`
`7`	`7`	`import org.eclipse.equinox.security.storage.StorageException;`
`8`	`8`
	`9`	`+import io.sloeber.autoBuild.helpers.api.AutoBuildConstants;`
`9`	`10`	`import io.sloeber.core.Activator;`
`10`	`11`	`import io.sloeber.core.Messages;`
`11`	`12`
`@@ -113,7 +114,7 @@ public static void ErasePassword(String host) {`
`113`	`114`
`114`	`115`	`private static String ConvertHostToNodeName(String host) {`
`115`	`116`
`116`		`- return "ssh/" + host.replace(Const.DOT, Const.SLACH); //$NON-NLS-1$`
	`117`	`+ return "ssh/" + host.replace(AutoBuildConstants.DOT, AutoBuildConstants.SLACH); //$NON-NLS-1$`
`117`	`118`	`}`
`118`	`119`
`119`	`120`	`}`