multiple code improvements: squid:S1066, squid:S1197, squid:S00117, s…

…quid:S1118, squid:CommentedOutCodeLine, squid:S00116

it.baeyens.arduino.monitor/src/it/baeyens/arduino/monitor/SerialConnection.java

@@ -3,13 +3,14 @@
 import it.baeyens.arduino.monitor.views.SerialMonitor;
 
 public class SerialConnection {
-    public static void add(String comPort, int baudrate) {
-	SerialMonitor.getSerialMonitor().connectSerial(comPort, baudrate);
+    private SerialConnection() {}
 
+    public static void add(String comPort, int baudrate) {
+    SerialMonitor.getSerialMonitor().connectSerial(comPort, baudrate);
     }
 
     public static void remove(String comPort) {
-	SerialMonitor.getSerialMonitor().disConnectSerialPort(comPort);
+    SerialMonitor.getSerialMonitor().disConnectSerialPort(comPort);
     }
 
 }

it.baeyens.arduino.monitor/src/it/baeyens/arduino/monitor/internal/ScopeListener.java

@@ -81,7 +81,6 @@ public synchronized void message(byte[] newData) {
 
     @Override
     public void dispose() {
-	// myScope.removeStackListener(0, stackAdapter);
 	this.myScope = null;
 	this.myReceivedScopeData = null;
     }

it.baeyens.arduino.monitor/src/it/baeyens/arduino/monitor/internal/SerialListener.java

@@ -16,10 +16,16 @@
 
 public class SerialListener implements MessageConsumer {
     private static boolean myScopeFilterFlag = false;
-    SerialMonitor TheMonitor;
+    SerialMonitor theMonitor;
     int theColorIndex;
     private ByteBuffer myReceivedScopeData = ByteBuffer.allocate(2000);
 
+    public SerialListener(SerialMonitor monitor, int colorIndex) {
+	this.theMonitor = monitor;
+	this.theColorIndex = colorIndex;
+	this.myReceivedScopeData.order(ByteOrder.LITTLE_ENDIAN);
+    }
+
     public int removeBytesFromStart(int n) {
 	if (n == 0) {
 	    return this.myReceivedScopeData.position();
@@ -35,12 +41,6 @@ public int removeBytesFromStart(int n) {
 	return this.myReceivedScopeData.position(index).position();
     }
 
-    public SerialListener(SerialMonitor Monitor, int ColorIndex) {
-	this.TheMonitor = Monitor;
-	this.theColorIndex = ColorIndex;
-	this.myReceivedScopeData.order(ByteOrder.LITTLE_ENDIAN);
-    }
-
     @Override
     public void message(byte[] newData) {
 	if (myScopeFilterFlag) {
@@ -64,18 +64,14 @@ public void message(byte[] newData) {
 
     private void internalExtractAndRemoveScopeData() {
 
-	String MonitorMessage = Const.EMPTY_STRING;
+	String monitorMessage = Const.EMPTY_STRING;
 	boolean doneSearching = false;
 	int length = this.myReceivedScopeData.position();
-	// System.out.println(""); //$NON-NLS-1$
-	// System.out.print("start :>"); //$NON-NLS-1$
-	// System.out.print(new String(this.myReceivedScopeData.array()));
-	// System.out.println("<"); //$NON-NLS-1$
 	int searchPointer;
 	for (searchPointer = 0; (searchPointer < length - 1) && !doneSearching; searchPointer++) {
 	    if (this.myReceivedScopeData.getShort(searchPointer) != Const.SCOPE_START_DATA) {
 		char addChar = (char) this.myReceivedScopeData.get(searchPointer);
-		MonitorMessage += Character.toString(addChar);
+		monitorMessage += Character.toString(addChar);
 	    } else {
 		// have we received the full header of the scope data?
 		if (length < (searchPointer + 6)) {
@@ -122,18 +118,12 @@ private void internalExtractAndRemoveScopeData() {
 			addChar = ' ';
 		    }
 		    searchPointer++;
-		    MonitorMessage += Character.toString((char) addChar);
+		    monitorMessage += Character.toString((char) addChar);
 		}
 	    }
 	    removeBytesFromStart(searchPointer);
 	}
-
-	// System.out.print("done :"); //$NON-NLS-1$
-	// System.out.print(" :>"); //$NON-NLS-1$
-	// System.out.print(MonitorMessage);
-	// System.out.println("<"); //$NON-NLS-1$
-
-	event(MonitorMessage);
+	event(monitorMessage);
     }
 
     @Override
@@ -143,12 +133,12 @@ public void dispose() {
 
     @Override
     public void event(String event) {
-	final String TempString = new String(event);
+	final String tempString = new String(event);
 	Display.getDefault().asyncExec(new Runnable() {
 	    @Override
 	    public void run() {
 		try {
-		    SerialListener.this.TheMonitor.ReportSerialActivity(TempString, SerialListener.this.theColorIndex);
+		    SerialListener.this.theMonitor.ReportSerialActivity(tempString, SerialListener.this.theColorIndex);
 		} catch (Exception e) {// ignore as we get errors when closing
 				       // down
 		}

it.baeyens.cdt.refactor/src/it/baeyens/cdt/refactor/RenameFolderChangeHandler.java

@@ -58,7 +58,7 @@ public Change perform(IProgressMonitor pm) throws CoreException {
 	for (int curProject = 0; curProject < projects.length; curProject++) {
 	    ICProjectDescription projectDescription = mngr.getProjectDescription(projects[curProject], true);
 	    if (projectDescription != null) { // if the description is null it probably is not a cdt project
-		ICConfigurationDescription configurationDescriptions[] = projectDescription.getConfigurations();
+		ICConfigurationDescription[] configurationDescriptions = projectDescription.getConfigurations();
 		boolean projectDescriptionChanged = false;
 		for (int curConfigDescription = 0; curConfigDescription < configurationDescriptions.length; curConfigDescription++) {
 
@@ -68,27 +68,25 @@ public Change perform(IProgressMonitor pm) throws CoreException {
 		    // Add include path to all languages
 		    for (int idx = 0; idx < languageSettings.length; idx++) {
 			ICLanguageSetting lang = languageSettings[idx];
-			String LangID = lang.getLanguageId();
-			if (LangID != null) {
-			    if (LangID.startsWith("org.eclipse.cdt.")) { //$NON-NLS-1$
+			String langId = lang.getLanguageId();
+			if (langId != null && langId.startsWith("org.eclipse.cdt.")) { //$NON-NLS-1$
 				boolean languageChanged = false;
-				ICLanguageSettingEntry[] IncludeEntries = lang.getSettingEntries(ICSettingEntry.INCLUDE_PATH);
-				for (int curIncludeEntry = 0; curIncludeEntry < IncludeEntries.length; curIncludeEntry++) {
-				    if (IncludeEntries[curIncludeEntry].getName().startsWith(this.myOldName)) {
-					String newValue = IncludeEntries[curIncludeEntry].getName().replace(this.myOldName, this.myNewName);
+				ICLanguageSettingEntry[] includeEntries = lang.getSettingEntries(ICSettingEntry.INCLUDE_PATH);
+				for (int curIncludeEntry = 0; curIncludeEntry < includeEntries.length; curIncludeEntry++) {
+				    if (includeEntries[curIncludeEntry].getName().startsWith(this.myOldName)) {
+					String newValue = includeEntries[curIncludeEntry].getName().replace(this.myOldName, this.myNewName);
 					languageChanged = true;
 					projectDescriptionChanged = true;
-					IncludeEntries[curIncludeEntry] = new CIncludePathEntry(newValue, ICSettingEntry.VALUE_WORKSPACE_PATH);
+					includeEntries[curIncludeEntry] = new CIncludePathEntry(newValue, ICSettingEntry.VALUE_WORKSPACE_PATH);
 					Activator.getDefault().getLog()
 						.log(new Status(IStatus.INFO, "it.baeyens.cdt.refactor", //$NON-NLS-1$
 							"changed path from " + this.myOldName + " to " //$NON-NLS-1$ //$NON-NLS-2$
 								+ this.myNewName));
 				    }
 				}
-				if (languageChanged) {
-				    lang.setSettingEntries(ICSettingEntry.INCLUDE_PATH, IncludeEntries);
-				}
-			    }
+			if (languageChanged) {
+				lang.setSettingEntries(ICSettingEntry.INCLUDE_PATH, includeEntries);
+			}
 			}
 		    }
 		}