Permalink
Browse files

save and load the .xml files in utf8 coding to avoid corrupt streams and

schedules

Conflicts:
	etc/changelog
  • Loading branch information...
1 parent 6fb15c0 commit 085c9331cba2e4d2e371b61e5968ec3088a6f168 @Eule committed Mar 6, 2012
View
@@ -266,6 +266,7 @@
0.6 Beta6 -> 0.6
- fix: starts with an endless log cycle
<<<<<<< OURS
+<<<<<<< OURS
- fix: import .pls or .m3u streams doesn't work
=======
- fix: import .pls or .m3u streams doesn't work
@@ -288,3 +289,10 @@
- save and load the .xml files in utf8 coding to avoid corrupt streams and schedules
- delete large log files automatically
>>>>>>> THEIRS
+=======
+ - fix: import .pls or .m3u streams doesn't work
+
+ ----------------------------
+ 0.6 -> 0.6.1
+ - save and load the .xml files in utf8 coding to avoid corrupt streams and schedules
+>>>>>>> THEIRS
@@ -51,7 +51,7 @@ public void saveStreamVector() {
String savePath = new Control_GetPath().getStreamRipStarPath();
XMLOutputFactory outputFactory = XMLOutputFactory.newInstance();
try {
- XMLEventWriter writer = outputFactory.createXMLEventWriter( new FileOutputStream(savePath+"/Streams.xml" ) );
+ XMLEventWriter writer = outputFactory.createXMLEventWriter( new FileOutputStream(savePath+"/Streams.xml" ), "UTF-8");
XMLEventFactory eventFactory = XMLEventFactory.newInstance();
//header for the file
@@ -242,7 +242,7 @@ public void saveDefaultStream() {
String savePath = new Control_GetPath().getStreamRipStarPath();
XMLOutputFactory outputFactory = XMLOutputFactory.newInstance();
try {
- XMLEventWriter writer = outputFactory.createXMLEventWriter( new FileOutputStream(savePath+"/DefaultStream.xml" ) );
+ XMLEventWriter writer = outputFactory.createXMLEventWriter( new FileOutputStream(savePath+"/DefaultStream.xml" ), "UTF-8");
XMLEventFactory eventFactory = XMLEventFactory.newInstance();
//header for the file
@@ -436,7 +436,7 @@ public void loadStreamsOnStart() {
try {
XMLInputFactory factory = XMLInputFactory.newInstance();
XMLStreamReader parser;
- parser = factory.createXMLStreamReader( new FileInputStream(loadPath+"/Streams.xml" ) );
+ parser = factory.createXMLStreamReader( new FileInputStream(loadPath+"/Streams.xml" ),"UTF-8" );
while ( parser.hasNext() ) {
switch ( parser.getEventType() ) {
@@ -636,7 +636,7 @@ public void loadDefaultStreamOnStart() {
try {
XMLInputFactory factory = XMLInputFactory.newInstance();
XMLStreamReader parser;
- parser = factory.createXMLStreamReader( new FileInputStream(loadPath+"/DefaultStream.xml" ) );
+ parser = factory.createXMLStreamReader( new FileInputStream(loadPath+"/DefaultStream.xml" ), "UTF-8" );
while ( parser.hasNext() ) {
switch ( parser.getEventType() ) {
@@ -389,7 +389,7 @@ public void save()
int[] intOptions = new int[5];
try {
- XMLEventWriter writer = outputFactory.createXMLEventWriter( new FileOutputStream(savePath+"/ScheduleManager.xml" ) );
+ XMLEventWriter writer = outputFactory.createXMLEventWriter( new FileOutputStream(savePath+"/ScheduleManager.xml" ), "UTF-8" );
XMLEventFactory eventFactory = XMLEventFactory.newInstance();
//save Intgers of the widths of any cell that is shown
@@ -454,7 +454,7 @@ public void load()
{
XMLInputFactory factory = XMLInputFactory.newInstance();
XMLStreamReader parser;
- parser = factory.createXMLStreamReader( new FileInputStream(loadPath+"/ScheduleManager.xml" ) );
+ parser = factory.createXMLStreamReader( new FileInputStream(loadPath+"/ScheduleManager.xml" ), "UTF-8" );
while ( parser.hasNext() ) {
switch ( parser.getEventType() )
@@ -666,7 +666,7 @@ public void loadProp() {
try {
XMLInputFactory factory = XMLInputFactory.newInstance();
XMLStreamReader parser;
- parser = factory.createXMLStreamReader( new FileInputStream(loadPath+"/Prefs-MainWindow.xml" ) );
+ parser = factory.createXMLStreamReader( new FileInputStream(loadPath+"/Prefs-MainWindow.xml" ), "UTF-8" );
while ( parser.hasNext() ) {
switch ( parser.getEventType() ) {
@@ -719,7 +719,7 @@ public void loadProp() {
try {
XMLInputFactory factory = XMLInputFactory.newInstance();
XMLStreamReader parser;
- parser = factory.createXMLStreamReader( new FileInputStream(loadPath+"/Settings-StreamRipStar.xml" ) );
+ parser = factory.createXMLStreamReader( new FileInputStream(loadPath+"/Settings-StreamRipStar.xml" ), "UTF-8" );
while ( parser.hasNext() ) {
switch ( parser.getEventType() ) {
@@ -820,7 +820,7 @@ public void saveProp() {
try {
XMLEventWriter writer = outputFactory.createXMLEventWriter(
- new FileOutputStream(savePath+"/Prefs-MainWindow.xml" ) );
+ new FileOutputStream(savePath+"/Prefs-MainWindow.xml" ), "UTF-8" );
XMLEventFactory eventFactory = XMLEventFactory.newInstance();
//header for the file
@@ -225,7 +225,7 @@ public void loadScheduleJobsOnStart() {
try {
XMLInputFactory factory = XMLInputFactory.newInstance();
XMLStreamReader parser;
- parser = factory.createXMLStreamReader( new FileInputStream(loadPath+"/Scheduls.xml" ) );
+ parser = factory.createXMLStreamReader( new FileInputStream(loadPath+"/Scheduls.xml" ), "UTF-8" );
while ( parser.hasNext() ) {
switch ( parser.getEventType() ) {
@@ -480,7 +480,7 @@ public void saveScheduleVector() {
try {
XMLEventWriter writer = outputFactory.createXMLEventWriter(
- new FileOutputStream(savePath+"/Scheduls.xml" ) );
+ new FileOutputStream(savePath+"/Scheduls.xml" ), "UTF-8" );
XMLEventFactory eventFactory = XMLEventFactory.newInstance();
//header for the file

0 comments on commit 085c933

Please sign in to comment.