Skip to content

Commit 8587e05

Browse files
author
jantje
committed
Fixing warnings cause by eclipse upgrade
1 parent b278417 commit 8587e05

File tree

6 files changed

+14
-10
lines changed

6 files changed

+14
-10
lines changed

io.sloeber.core/src/io/sloeber/core/Activator.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
import java.io.InputStream;
77
import java.net.MalformedURLException;
88
import java.net.URL;
9+
import java.nio.charset.Charset;
910

1011
import org.apache.commons.io.IOUtils;
1112
import org.eclipse.cdt.core.CCorePlugin;
@@ -415,7 +416,7 @@ static boolean isPatron() {
415416

416417
try {
417418
URL url = new URL(HELP_LOC + "?systemhash=" + systemhash);
418-
String content= IOUtils.toString( url);
419+
String content= IOUtils.toString( url, Charset.defaultCharset());
419420
isPatron = new Boolean(content.length() < 1000);
420421

421422
} catch ( Exception e) {

io.sloeber.core/src/io/sloeber/core/common/IndexHelper.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
import java.io.File;
44
import java.io.IOException;
5+
import java.nio.charset.Charset;
56

67
import org.apache.commons.io.FileUtils;
78
import org.eclipse.cdt.core.CCorePlugin;
@@ -34,7 +35,7 @@ private static String findParameterInFunction(IIndexName[] names, String functio
3435
String codeFileName = name.getFileLocation().getFileName();
3536
String rawCodeFileContent;
3637
try {
37-
rawCodeFileContent = FileUtils.readFileToString(new File(codeFileName));
38+
rawCodeFileContent = FileUtils.readFileToString(new File(codeFileName), Charset.defaultCharset());
3839
} catch (IOException e) {
3940
return defaultValue;
4041
}

io.sloeber.core/src/io/sloeber/core/tools/FileModifiers.java

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
import java.io.File;
44
import java.io.IOException;
5+
import java.nio.charset.Charset;
56
import java.nio.file.FileVisitResult;
67
import java.nio.file.Files;
78
import java.nio.file.Paths;
@@ -29,8 +30,8 @@ public class FileModifiers {
2930
* @throws IOException
3031
*/
3132
public static void appendString(File input, String addString) throws IOException {
32-
String fileString = FileUtils.readFileToString(input) +addString;
33-
FileUtils.write(input, fileString);
33+
String fileString = FileUtils.readFileToString(input, Charset.defaultCharset()) +addString;
34+
FileUtils.write(input, fileString, Charset.defaultCharset());
3435
}
3536

3637
/**
@@ -95,14 +96,14 @@ public FileVisitResult visitFileFailed(java.nio.file.Path file, IOException exc)
9596

9697
public static void replaceInFile(File file, boolean regex, String find, String replace) {
9798
try {
98-
String textFromFile = FileUtils.readFileToString(file);
99+
String textFromFile = FileUtils.readFileToString(file, Charset.defaultCharset());
99100

100101
if (regex) {
101102
textFromFile = textFromFile.replaceAll(find, replace);
102103
} else {
103104
textFromFile = textFromFile.replace(find, replace);
104105
}
105-
FileUtils.write(file, textFromFile);
106+
FileUtils.write(file, textFromFile, Charset.defaultCharset());
106107
} catch (IOException e) {
107108
Common.log(new Status(IStatus.WARNING, Activator.getId(),
108109
"Failed to replace "+find+" with "+replace+" in file "+file.toString(), e)); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$

io.sloeber.core/src/io/sloeber/core/tools/PdePreprocessor.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121

2222
import java.io.ByteArrayInputStream;
2323
import java.io.IOException;
24+
import java.nio.charset.Charset;
2425
import java.text.SimpleDateFormat;
2526
import java.util.ArrayList;
2627
import java.util.Arrays;
@@ -145,7 +146,7 @@ private static void writeTheGeneratedFile(IProject iProject, String content) thr
145146
String currentFileContent = null;
146147
try {
147148
currentFileContent = FileUtils
148-
.readFileToString(iProject.getFile(new Path(generatedFile)).getLocation().toFile());
149+
.readFileToString(iProject.getFile(new Path(generatedFile)).getLocation().toFile(), Charset.defaultCharset());
149150
} catch (IOException e) {
150151
// This happens when the generated file does not yet exist
151152
}

io.sloeber.core/src/io/sloeber/core/tools/ShouldHaveBeenInCDT.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@
1919
import org.eclipse.cdt.managedbuilder.internal.core.Configuration;
2020
import org.eclipse.cdt.managedbuilder.internal.core.ManagedBuildInfo;
2121
import org.eclipse.cdt.managedbuilder.internal.core.ManagedProject;
22-
import org.eclipse.cdt.managedbuilder.internal.core.ToolChain;
2322
import org.eclipse.core.resources.IProject;
2423
import org.eclipse.core.runtime.CoreException;
2524
import org.eclipse.core.runtime.IProgressMonitor;
@@ -69,7 +68,7 @@ public static ICProjectDescription setCProjectDescription(IProject project,
6968
for (ConfigurationDescriptor curConfDesc : alCfgs) {
7069
IToolChain tcs = ManagedBuildManager.getExtensionToolChain(curConfDesc.ToolchainID);
7170

72-
Configuration cfg = new Configuration(mProj, (ToolChain) tcs,
71+
Configuration cfg = new Configuration(mProj, tcs,
7372
ManagedBuildManager.calculateChildId(curConfDesc.ToolchainID, null), curConfDesc.configName);
7473
if (enableParallelBuild) {
7574
cfg.setParallelDef(true);

io.sloeber.ui/src/io/sloeber/ui/monitor/views/SerialMonitor.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
import java.io.File;
44
import java.net.URL;
5+
import java.nio.charset.Charset;
56
import java.util.ArrayList;
67
import java.util.LinkedHashMap;
78
import java.util.List;
@@ -322,7 +323,7 @@ public void mouseDown(MouseEvent e) {
322323
String activeConfigName= activeCfg.getName();
323324
IPath buildFolder=selectedProject.findMember(activeConfigName).getLocation();
324325
File dumpFile=buildFolder.append("serialdump.txt").toFile(); //$NON-NLS-1$
325-
FileUtils.writeStringToFile(dumpFile, selectedText);
326+
FileUtils.writeStringToFile(dumpFile, selectedText, Charset.defaultCharset());
326327
} catch (Exception e1) {
327328
// ignore
328329
e1.printStackTrace();

0 commit comments

Comments
 (0)