Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
Eclipse Projects
The Eclipse Integrated Computational Environment
ice
Commits
980be357
Commit
980be357
authored
Dec 02, 2016
by
Robert Smith
Browse files
Merge remote-tracking branch 'origin/2.2.2' into next
parents
b8995bdd
8ae7ae53
Changes
1
Hide whitespace changes
Inline
Side-by-side
org.eclipse.ice.vibe/src/org/eclipse/ice/vibe/kvPair/VibeKVPair.java
View file @
980be357
...
...
@@ -323,7 +323,6 @@ public class VibeKVPair extends Item implements IReader, IWriter {
logger
.
info
(
"VibeKVPair Message: Loading"
+
inputFile
.
getFullPath
().
toOSString
());
form
=
read
(
inputFile
);
form
.
setName
(
getName
());
form
.
setDescription
(
getDescription
());
form
.
setId
(
getId
());
form
.
setItemID
(
getId
());
...
...
@@ -434,7 +433,7 @@ public class VibeKVPair extends Item implements IReader, IWriter {
try
{
reader
=
new
BufferedReader
(
new
InputStreamReader
(
ifile
.
getContents
()));
// Read the FileInputStream and append to a StringBuffer
StringBuffer
buffer
=
new
StringBuffer
();
int
fileByte
;
...
...
@@ -451,6 +450,10 @@ public class VibeKVPair extends Item implements IReader, IWriter {
// Add a dummy EOF line so that the last line of the file is
// read in correctly
lines
.
add
(
"EOF"
);
//Close the reader
reader
.
close
();
}
catch
(
FileNotFoundException
e
)
{
logger
.
error
(
"VibeKVPair Message: "
+
"Error! Could not find file for loading."
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment