[Jnode-svn-commits] SF.net SVN: jnode:[4687] trunk/distr/src

[<cr...@us...>]

Revision: 4687
          http://jnode.svn.sourceforge.net/jnode/?rev=4687&view=rev
Author:   crawley
Date:     2008-11-09 09:41:09 +0000 (Sun, 09 Nov 2008)

Log Message:
-----------
Tracking API changes.

Modified Paths:
--------------
    trunk/distr/src/apps/org/jnode/apps/jpartition/commands/BaseDeviceCommand.java
    trunk/distr/src/apps/org/jnode/apps/jpartition/commands/InitMbrCommand.java
    trunk/distr/src/install/org/jnode/install/action/GrubInstallerAction.java
    trunk/distr/src/test/org/jnode/apps/jpartition/JPartitionTest.java

Modified: trunk/distr/src/apps/org/jnode/apps/jpartition/commands/BaseDeviceCommand.java
===================================================================
--- trunk/distr/src/apps/org/jnode/apps/jpartition/commands/BaseDeviceCommand.java	2008-11-09 08:08:19 UTC (rev 4686)
+++ trunk/distr/src/apps/org/jnode/apps/jpartition/commands/BaseDeviceCommand.java	2008-11-09 09:41:09 UTC (rev 4687)
@@ -1,6 +1,8 @@
 package org.jnode.apps.jpartition.commands;
 
 import java.io.IOException;
+import java.io.OutputStreamWriter;
+import java.io.PrintWriter;
 
 import org.jnode.apps.jpartition.commands.framework.BaseCommand;
 import org.jnode.apps.jpartition.commands.framework.CommandException;
@@ -24,7 +26,7 @@
     protected final PartitionHelper createPartitionHelper() throws CommandException {
         try {
             //FIXME replace System.out by output stream from (Console)ViewFactory 
-            return new PartitionHelper(device, System.out);
+            return new PartitionHelper(device, new PrintWriter(new OutputStreamWriter(System.out)));
         } catch (DeviceNotFoundException e) {
             throw new CommandException(e);
         } catch (ApiNotFoundException e) {

Modified: trunk/distr/src/apps/org/jnode/apps/jpartition/commands/InitMbrCommand.java
===================================================================
--- trunk/distr/src/apps/org/jnode/apps/jpartition/commands/InitMbrCommand.java	2008-11-09 08:08:19 UTC (rev 4686)
+++ trunk/distr/src/apps/org/jnode/apps/jpartition/commands/InitMbrCommand.java	2008-11-09 09:41:09 UTC (rev 4687)
@@ -1,5 +1,8 @@
 package org.jnode.apps.jpartition.commands;
 
+import java.io.OutputStreamWriter;
+import java.io.PrintWriter;
+
 import org.jnode.apps.jpartition.commands.framework.CommandException;
 import org.jnode.driver.bus.ide.IDEDevice;
 import org.jnode.partitions.command.PartitionHelper;
@@ -15,7 +18,7 @@
         PartitionHelper helper;
         try {
             //FIXME replace System.out by output stream from (Console)ViewFactory 
-            helper = new PartitionHelper(device, System.out);
+            helper = new PartitionHelper(device, new PrintWriter(new OutputStreamWriter(System.out)));
             helper.initMbr();
         } catch (Throwable t) {
             throw new CommandException(t);

Modified: trunk/distr/src/install/org/jnode/install/action/GrubInstallerAction.java
===================================================================
--- trunk/distr/src/install/org/jnode/install/action/GrubInstallerAction.java	2008-11-09 08:08:19 UTC (rev 4686)
+++ trunk/distr/src/install/org/jnode/install/action/GrubInstallerAction.java	2008-11-09 09:41:09 UTC (rev 4687)
@@ -3,6 +3,9 @@
  */
 package org.jnode.install.action;
 
+import java.io.OutputStreamWriter;
+import java.io.PrintWriter;
+
 import org.jnode.driver.Device;
 import org.jnode.driver.DeviceUtils;
 import org.jnode.fs.jfat.command.JGrub;
@@ -27,7 +30,7 @@
                         inContext.getStringInput("Enter the installation disk device name (example: hda0) : ");
 
                     Device disk = DeviceUtils.getDevice(deviceID);
-                    JGrub jgrub = new JGrub(System.out, System.err, disk);
+                    JGrub jgrub = new JGrub(new PrintWriter(new OutputStreamWriter(System.out)), disk);
 
                     inContext.setStringValue(ActionConstants.INSTALL_ROOT_DIR, jgrub.getMountPoint());
                     return AbstractInstaller.Step.forth;

Modified: trunk/distr/src/test/org/jnode/apps/jpartition/JPartitionTest.java
===================================================================
--- trunk/distr/src/test/org/jnode/apps/jpartition/JPartitionTest.java	2008-11-09 08:08:19 UTC (rev 4686)
+++ trunk/distr/src/test/org/jnode/apps/jpartition/JPartitionTest.java	2008-11-09 09:41:09 UTC (rev 4687)
@@ -1,5 +1,8 @@
 package org.jnode.apps.jpartition;
 
+import java.io.OutputStreamWriter;
+import java.io.PrintWriter;
+
 import junit.framework.TestSuite;
 
 import org.jnode.apps.jpartition.consoleview.ConsoleViewFactory;
@@ -41,7 +44,7 @@
 
         // DeviceUtils.createFakeDevice(new ErrorReporter());
         AbstractIDEDevice dev = DeviceUtils.createFileDevice();
-        JGrub jgrub = new JGrub(System.out, System.err, dev);
+        JGrub jgrub = new JGrub(new PrintWriter(new OutputStreamWriter(System.out)), dev);
         jgrub.install();
 
         JPartitionCommand.main(args);


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.