Menu
▾
▴
[Jnode-svn-commits] SF.net SVN: jnode: [3380] trunk/distr/src
|
From: <ls...@us...> - 2007-08-04 10:24:58
|
Revision: 3380
http://jnode.svn.sourceforge.net/jnode/?rev=3380&view=rev
Author: lsantha
Date: 2007-08-04 03:24:21 -0700 (Sat, 04 Aug 2007)
Log Message:
-----------
Optimized imports.
Modified Paths:
--------------
trunk/distr/src/apps/fi/iki/elonen/NanoHTTPD.java
trunk/distr/src/apps/org/jnode/apps/charvabsh/CharvaBsh.java
trunk/distr/src/apps/org/jnode/apps/console/SwingConsole.java
trunk/distr/src/apps/org/jnode/apps/debug/ListPanel.java
trunk/distr/src/apps/org/jnode/apps/debug/RootObjectPanel.java
trunk/distr/src/apps/org/jnode/apps/debug/TC.java
trunk/distr/src/apps/org/jnode/apps/edit/EditCommand.java
trunk/distr/src/apps/org/jnode/apps/edit/Editor.java
trunk/distr/src/apps/org/jnode/apps/editor/LeedCommand.java
trunk/distr/src/apps/org/jnode/apps/editor/TextEditor.java
trunk/distr/src/apps/org/jnode/apps/httpd/NanoHTTPDCommand.java
trunk/distr/src/apps/org/jnode/apps/jpartition/JPartition.java
trunk/distr/src/apps/org/jnode/apps/jpartition/commands/framework/CommandProcessor.java
trunk/distr/src/apps/org/jnode/apps/jpartition/controller/MainController.java
trunk/distr/src/apps/org/jnode/apps/jpartition/model/AbstractModel.java
trunk/distr/src/apps/org/jnode/apps/jpartition/model/DeviceModel.java
trunk/distr/src/apps/org/jnode/apps/jpartition/model/FileDeviceModel.java
trunk/distr/src/apps/org/jnode/apps/jpartition/model/PartitionModel.java
trunk/distr/src/apps/org/jnode/apps/jpartition/swingview/CommandProcessorView.java
trunk/distr/src/apps/org/jnode/apps/jpartition/swingview/DeviceView.java
trunk/distr/src/apps/org/jnode/apps/jpartition/swingview/DiskAreaView.java
trunk/distr/src/apps/org/jnode/apps/jpartition/swingview/ErrorReporter.java
trunk/distr/src/apps/org/jnode/apps/jpartition/swingview/FileDeviceView.java
trunk/distr/src/apps/org/jnode/apps/jpartition/swingview/MainView.java
trunk/distr/src/apps/org/jnode/apps/jpartition/swingview/PartitionView.java
trunk/distr/src/apps/org/jnode/apps/jpartition/swingview/SwingViewFactory.java
trunk/distr/src/apps/org/jnode/apps/jpartition/swingview/actions/BaseDeviceAction.java
trunk/distr/src/apps/org/jnode/apps/jpartition/utils/BasicNameSpace.java
trunk/distr/src/apps/org/jnode/apps/jpartition/utils/device/AbstractIDEDevice.java
trunk/distr/src/apps/org/jnode/apps/jpartition/utils/device/DeviceUtils.java
trunk/distr/src/apps/org/jnode/apps/jpartition/utils/device/FakeIDEDevice.java
trunk/distr/src/apps/org/jnode/apps/jpartition/utils/device/FileIDEDevice.java
trunk/distr/src/apps/org/jnode/apps/jpartition/utils/device/FileIDEDeviceDriver.java
trunk/distr/src/apps/org/jnode/apps/vmware/disk/ExtentDeclaration.java
trunk/distr/src/apps/org/jnode/apps/vmware/disk/IOUtils.java
trunk/distr/src/apps/org/jnode/apps/vmware/disk/VMWareDisk.java
trunk/distr/src/apps/org/jnode/apps/vmware/disk/descriptor/Descriptor.java
trunk/distr/src/apps/org/jnode/apps/vmware/disk/descriptor/DescriptorRW.java
trunk/distr/src/apps/org/jnode/apps/vmware/disk/extent/Extent.java
trunk/distr/src/apps/org/jnode/apps/vmware/disk/handler/ExtentFactory.java
trunk/distr/src/apps/org/jnode/apps/vmware/disk/handler/ExtentIO.java
trunk/distr/src/apps/org/jnode/apps/vmware/disk/handler/FileDescriptor.java
trunk/distr/src/apps/org/jnode/apps/vmware/disk/handler/IOHandler.java
trunk/distr/src/apps/org/jnode/apps/vmware/disk/handler/simple/SimpleDescriptorRW.java
trunk/distr/src/apps/org/jnode/apps/vmware/disk/handler/simple/SimpleExtentFactory.java
trunk/distr/src/apps/org/jnode/apps/vmware/disk/handler/simple/SimpleIOHandler.java
trunk/distr/src/apps/org/jnode/apps/vmware/disk/handler/sparse/AllocationTable.java
trunk/distr/src/apps/org/jnode/apps/vmware/disk/handler/sparse/AllocationTableRW.java
trunk/distr/src/apps/org/jnode/apps/vmware/disk/handler/sparse/EntryArray.java
trunk/distr/src/apps/org/jnode/apps/vmware/disk/handler/sparse/GrainDirectory.java
trunk/distr/src/apps/org/jnode/apps/vmware/disk/handler/sparse/GrainTable.java
trunk/distr/src/apps/org/jnode/apps/vmware/disk/handler/sparse/SparseDescriptorRW.java
trunk/distr/src/apps/org/jnode/apps/vmware/disk/handler/sparse/SparseDiskFactory.java
trunk/distr/src/apps/org/jnode/apps/vmware/disk/handler/sparse/SparseExtent.java
trunk/distr/src/apps/org/jnode/apps/vmware/disk/handler/sparse/SparseExtentFactory.java
trunk/distr/src/apps/org/jnode/apps/vmware/disk/handler/sparse/SparseExtentHeader.java
trunk/distr/src/apps/org/jnode/apps/vmware/disk/handler/sparse/SparseExtentHeaderRW.java
trunk/distr/src/apps/org/jnode/apps/vmware/disk/handler/sparse/SparseExtentIO.java
trunk/distr/src/apps/org/jnode/apps/vmware/disk/handler/sparse/SparseExtentRW.java
trunk/distr/src/apps/org/jnode/apps/vmware/disk/handler/sparse/SparseFileDescriptor.java
trunk/distr/src/apps/org/jnode/apps/vmware/disk/handler/sparse/SparseIOHandler.java
trunk/distr/src/apps/org/jnode/apps/vmware/disk/test/BaseTest.java
trunk/distr/src/apps/org/jnode/apps/vmware/disk/test/TestCreation.java
trunk/distr/src/apps/org/jnode/apps/vmware/disk/test/Utils.java
trunk/distr/src/apps/org/jnode/apps/vmware/disk/test/readwrite/BaseReadWriteTest.java
trunk/distr/src/apps/org/jnode/apps/vmware/disk/test/readwrite/TestHeader.java
trunk/distr/src/apps/org/jnode/apps/vmware/disk/test/readwrite/TestVMWareDisk.java
trunk/distr/src/apps/org/jnode/apps/vmware/disk/tools/DiskCopier.java
trunk/distr/src/apps/org/jnode/apps/vmware/disk/tools/DiskFactory.java
trunk/distr/src/emu/org/jnode/emu/DeviceManager.java
trunk/distr/src/emu/org/jnode/emu/DummyExtensionPoint.java
trunk/distr/src/emu/org/jnode/emu/EditEmu.java
trunk/distr/src/emu/org/jnode/emu/Emu.java
trunk/distr/src/emu/org/jnode/emu/ShellEmu.java
trunk/distr/src/install/org/jnode/install/AbstractInstaller.java
trunk/distr/src/install/org/jnode/install/ProgressSupport.java
trunk/distr/src/install/org/jnode/install/action/CopyFilesAction.java
trunk/distr/src/install/org/jnode/install/action/GrubInstallerAction.java
trunk/distr/src/install/org/jnode/install/cmdline/CommandLineInstaller.java
Modified: trunk/distr/src/apps/fi/iki/elonen/NanoHTTPD.java
===================================================================
--- trunk/distr/src/apps/fi/iki/elonen/NanoHTTPD.java 2007-08-04 10:19:57 UTC (rev 3379)
+++ trunk/distr/src/apps/fi/iki/elonen/NanoHTTPD.java 2007-08-04 10:24:21 UTC (rev 3380)
@@ -22,8 +22,10 @@
package fi.iki.elonen;
import java.io.*;
+import java.net.ServerSocket;
+import java.net.Socket;
+import java.net.URLEncoder;
import java.util.*;
-import java.net.*;
/**
* A simple, tiny, nicely embeddable HTTP 1.0 server in Java
Modified: trunk/distr/src/apps/org/jnode/apps/charvabsh/CharvaBsh.java
===================================================================
--- trunk/distr/src/apps/org/jnode/apps/charvabsh/CharvaBsh.java 2007-08-04 10:19:57 UTC (rev 3379)
+++ trunk/distr/src/apps/org/jnode/apps/charvabsh/CharvaBsh.java 2007-08-04 10:24:21 UTC (rev 3380)
@@ -36,15 +36,14 @@
import charvax.swing.*;
import charvax.swing.border.TitledBorder;
import gnu.java.io.NullOutputStream;
+import java.io.*;
+import java.net.MalformedURLException;
+import java.net.URL;
+import javax.naming.NameNotFoundException;
import org.jnode.shell.CommandShell;
import org.jnode.shell.Shell;
import org.jnode.shell.ShellUtils;
-import javax.naming.NameNotFoundException;
-import java.io.*;
-import java.net.MalformedURLException;
-import java.net.URL;
-
/**
* User: Sam Reid
* Date: Mar 19, 2004
Modified: trunk/distr/src/apps/org/jnode/apps/console/SwingConsole.java
===================================================================
--- trunk/distr/src/apps/org/jnode/apps/console/SwingConsole.java 2007-08-04 10:19:57 UTC (rev 3379)
+++ trunk/distr/src/apps/org/jnode/apps/console/SwingConsole.java 2007-08-04 10:24:21 UTC (rev 3380)
@@ -1,17 +1,16 @@
package org.jnode.apps.console;
+import java.awt.event.WindowAdapter;
+import java.awt.event.WindowEvent;
+import javax.swing.*;
import org.jnode.driver.console.ConsoleManager;
import org.jnode.driver.console.TextConsole;
-import org.jnode.driver.console.textscreen.TextScreenConsoleManager;
import org.jnode.driver.console.swing.SwingTextScreenConsoleManager;
+import org.jnode.driver.console.textscreen.TextScreenConsoleManager;
+import org.jnode.naming.InitialNaming;
import org.jnode.shell.CommandShell;
import org.jnode.shell.ShellManager;
-import org.jnode.naming.InitialNaming;
-import javax.swing.JFrame;
-import java.awt.event.WindowAdapter;
-import java.awt.event.WindowEvent;
-
/**
* @author Levente S\u00e1ntha
*/
Modified: trunk/distr/src/apps/org/jnode/apps/debug/ListPanel.java
===================================================================
--- trunk/distr/src/apps/org/jnode/apps/debug/ListPanel.java 2007-08-04 10:19:57 UTC (rev 3379)
+++ trunk/distr/src/apps/org/jnode/apps/debug/ListPanel.java 2007-08-04 10:24:21 UTC (rev 3380)
@@ -21,18 +21,13 @@
package org.jnode.apps.debug;
-import java.util.Vector;
-
import charva.awt.Dimension;
import charva.awt.event.KeyAdapter;
import charva.awt.event.KeyEvent;
-import charvax.swing.DefaultListModel;
-import charvax.swing.JList;
-import charvax.swing.JPanel;
-import charvax.swing.JScrollPane;
-import charvax.swing.ListSelectionModel;
+import charvax.swing.*;
import charvax.swing.event.ListSelectionEvent;
import charvax.swing.event.ListSelectionListener;
+import java.util.Vector;
/**
*
Modified: trunk/distr/src/apps/org/jnode/apps/debug/RootObjectPanel.java
===================================================================
--- trunk/distr/src/apps/org/jnode/apps/debug/RootObjectPanel.java 2007-08-04 10:19:57 UTC (rev 3379)
+++ trunk/distr/src/apps/org/jnode/apps/debug/RootObjectPanel.java 2007-08-04 10:24:21 UTC (rev 3380)
@@ -25,9 +25,7 @@
import java.util.Iterator;
import java.util.Set;
import java.util.Vector;
-
import javax.naming.NameNotFoundException;
-
import org.jnode.naming.InitialNaming;
/**
Modified: trunk/distr/src/apps/org/jnode/apps/debug/TC.java
===================================================================
--- trunk/distr/src/apps/org/jnode/apps/debug/TC.java 2007-08-04 10:19:57 UTC (rev 3379)
+++ trunk/distr/src/apps/org/jnode/apps/debug/TC.java 2007-08-04 10:24:21 UTC (rev 3380)
@@ -20,7 +20,7 @@
*/
package org.jnode.apps.debug;
-import java.util.Vector;
+
import charva.awt.BorderLayout;
import charva.awt.Color;
import charva.awt.FlowLayout;
@@ -29,6 +29,8 @@
import charvax.swing.JPanel;
import charvax.swing.border.LineBorder;
import charvax.swing.border.TitledBorder;
+import java.util.Vector;
+
/**
* @author blind
*
Modified: trunk/distr/src/apps/org/jnode/apps/edit/EditCommand.java
===================================================================
--- trunk/distr/src/apps/org/jnode/apps/edit/EditCommand.java 2007-08-04 10:19:57 UTC (rev 3379)
+++ trunk/distr/src/apps/org/jnode/apps/edit/EditCommand.java 2007-08-04 10:24:21 UTC (rev 3380)
@@ -21,13 +21,12 @@
package org.jnode.apps.edit;
+import java.io.File;
import org.jnode.shell.help.Help;
import org.jnode.shell.help.Parameter;
import org.jnode.shell.help.ParsedArguments;
import org.jnode.shell.help.argument.FileArgument;
-import java.io.File;
-
/**
* @author Levente S\u00e1ntha
*/
Modified: trunk/distr/src/apps/org/jnode/apps/edit/Editor.java
===================================================================
--- trunk/distr/src/apps/org/jnode/apps/edit/Editor.java 2007-08-04 10:19:57 UTC (rev 3379)
+++ trunk/distr/src/apps/org/jnode/apps/edit/Editor.java 2007-08-04 10:24:21 UTC (rev 3380)
@@ -21,33 +21,18 @@
package org.jnode.apps.edit;
-import charvax.swing.JFileChooser;
-import charvax.swing.JFrame;
-import charvax.swing.JMenu;
-import charvax.swing.JMenuBar;
-import charvax.swing.JMenuItem;
-import charvax.swing.JOptionPane;
-import charvax.swing.JPanel;
-import charvax.swing.JScrollPane;
-import charvax.swing.JTextArea;
-import charvax.swing.ListSelectionModel;
-import charvax.swing.border.TitledBorder;
import charva.awt.BorderLayout;
-import charva.awt.Toolkit;
import charva.awt.Color;
+import charva.awt.Toolkit;
import charva.awt.event.ActionEvent;
import charva.awt.event.ActionListener;
-
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
-import java.io.FileWriter;
-import java.io.IOException;
+import charvax.swing.*;
+import charvax.swing.border.TitledBorder;
+import gnu.java.security.action.GetPropertyAction;
+import java.io.*;
import java.security.AccessController;
import java.security.PrivilegedAction;
-
import org.apache.log4j.Logger;
-import gnu.java.security.action.GetPropertyAction;
/**
* @author Levente S\u00e1ntha
Modified: trunk/distr/src/apps/org/jnode/apps/editor/LeedCommand.java
===================================================================
--- trunk/distr/src/apps/org/jnode/apps/editor/LeedCommand.java 2007-08-04 10:19:57 UTC (rev 3379)
+++ trunk/distr/src/apps/org/jnode/apps/editor/LeedCommand.java 2007-08-04 10:24:21 UTC (rev 3380)
@@ -1,12 +1,11 @@
package org.jnode.apps.editor;
+import java.io.File;
import org.jnode.shell.help.Help;
import org.jnode.shell.help.Parameter;
import org.jnode.shell.help.ParsedArguments;
import org.jnode.shell.help.argument.FileArgument;
-import java.io.File;
-
/**
* @author Levente S\u00e1ntha
*/
Modified: trunk/distr/src/apps/org/jnode/apps/editor/TextEditor.java
===================================================================
--- trunk/distr/src/apps/org/jnode/apps/editor/TextEditor.java 2007-08-04 10:19:57 UTC (rev 3379)
+++ trunk/distr/src/apps/org/jnode/apps/editor/TextEditor.java 2007-08-04 10:24:21 UTC (rev 3380)
@@ -1,24 +1,19 @@
package org.jnode.apps.editor;
-import org.jnode.driver.input.KeyboardListener;
-import org.jnode.driver.input.KeyboardEvent;
+import java.awt.event.KeyEvent;
+import java.io.*;
+import java.security.AccessController;
+import java.security.PrivilegedAction;
+import java.util.ArrayList;
+import java.util.List;
import org.jnode.driver.console.ConsoleManager;
import org.jnode.driver.console.TextConsole;
import org.jnode.driver.console.textscreen.TextScreenConsoleManager;
+import org.jnode.driver.input.KeyboardEvent;
+import org.jnode.driver.input.KeyboardListener;
import org.jnode.naming.InitialNaming;
import org.jnode.shell.ShellManager;
-import java.util.List;
-import java.util.ArrayList;
-import java.io.IOException;
-import java.io.File;
-import java.io.BufferedReader;
-import java.io.FileReader;
-import java.io.FileWriter;
-import java.awt.event.KeyEvent;
-import java.security.AccessController;
-import java.security.PrivilegedAction;
-
/**
* @author Levente S\u00e1ntha
*/
Modified: trunk/distr/src/apps/org/jnode/apps/httpd/NanoHTTPDCommand.java
===================================================================
--- trunk/distr/src/apps/org/jnode/apps/httpd/NanoHTTPDCommand.java 2007-08-04 10:19:57 UTC (rev 3379)
+++ trunk/distr/src/apps/org/jnode/apps/httpd/NanoHTTPDCommand.java 2007-08-04 10:24:21 UTC (rev 3380)
@@ -21,18 +21,12 @@
package org.jnode.apps.httpd;
-import java.io.File;
-import java.io.FileOutputStream;
-import java.io.InputStream;
-import java.io.PrintStream;
-import java.io.PrintWriter;
+import fi.iki.elonen.NanoHTTPD;
+import java.io.*;
import java.util.Properties;
-
import org.jnode.shell.Command;
import org.jnode.shell.CommandLine;
-import fi.iki.elonen.NanoHTTPD;
-
/**
* @author Martin Husted Hartvig (ha...@jn...)
*/
Modified: trunk/distr/src/apps/org/jnode/apps/jpartition/JPartition.java
===================================================================
--- trunk/distr/src/apps/org/jnode/apps/jpartition/JPartition.java 2007-08-04 10:19:57 UTC (rev 3379)
+++ trunk/distr/src/apps/org/jnode/apps/jpartition/JPartition.java 2007-08-04 10:24:21 UTC (rev 3380)
@@ -4,12 +4,12 @@
import org.jnode.apps.jpartition.controller.MainController;
import org.jnode.apps.jpartition.swingview.SwingViewFactory;
import org.jnode.apps.jpartition.utils.BasicNameSpace;
+import org.jnode.driver.DeviceManager;
+import org.jnode.emu.Emu;
import org.jnode.naming.InitialNaming;
import org.jnode.naming.NameSpace;
import org.jnode.test.fs.driver.stubs.StubDeviceManager;
import org.jnode.util.OsUtils;
-import org.jnode.emu.Emu;
-import org.jnode.driver.DeviceManager;
public class JPartition extends Emu {
private static final Logger log = Logger.getLogger(JPartition.class);
Modified: trunk/distr/src/apps/org/jnode/apps/jpartition/commands/framework/CommandProcessor.java
===================================================================
--- trunk/distr/src/apps/org/jnode/apps/jpartition/commands/framework/CommandProcessor.java 2007-08-04 10:19:57 UTC (rev 3379)
+++ trunk/distr/src/apps/org/jnode/apps/jpartition/commands/framework/CommandProcessor.java 2007-08-04 10:24:21 UTC (rev 3380)
@@ -3,7 +3,6 @@
import java.util.ArrayList;
import java.util.List;
import java.util.Stack;
-
import org.apache.log4j.Logger;
public class CommandProcessor {
Modified: trunk/distr/src/apps/org/jnode/apps/jpartition/controller/MainController.java
===================================================================
--- trunk/distr/src/apps/org/jnode/apps/jpartition/controller/MainController.java 2007-08-04 10:19:57 UTC (rev 3379)
+++ trunk/distr/src/apps/org/jnode/apps/jpartition/controller/MainController.java 2007-08-04 10:24:21 UTC (rev 3380)
@@ -3,12 +3,10 @@
import it.battlehorse.stamps.Dispatcher;
import it.battlehorse.stamps.factories.DispatcherRegistry;
import it.battlehorse.stamps.factories.TransformerRegistry;
-
import org.jnode.apps.jpartition.ViewFactory;
import org.jnode.apps.jpartition.model.CommandProcessorModel;
import org.jnode.apps.jpartition.model.DeviceModel;
import org.jnode.apps.jpartition.model.FileDeviceModel;
-import org.jnode.apps.jpartition.swingview.MainView;
public class MainController
{
Modified: trunk/distr/src/apps/org/jnode/apps/jpartition/model/AbstractModel.java
===================================================================
--- trunk/distr/src/apps/org/jnode/apps/jpartition/model/AbstractModel.java 2007-08-04 10:19:57 UTC (rev 3379)
+++ trunk/distr/src/apps/org/jnode/apps/jpartition/model/AbstractModel.java 2007-08-04 10:24:21 UTC (rev 3380)
@@ -1,7 +1,6 @@
package org.jnode.apps.jpartition.model;
import it.battlehorse.stamps.Model;
-
import java.beans.PropertyChangeListener;
import java.beans.PropertyChangeSupport;
Modified: trunk/distr/src/apps/org/jnode/apps/jpartition/model/DeviceModel.java
===================================================================
--- trunk/distr/src/apps/org/jnode/apps/jpartition/model/DeviceModel.java 2007-08-04 10:19:57 UTC (rev 3379)
+++ trunk/distr/src/apps/org/jnode/apps/jpartition/model/DeviceModel.java 2007-08-04 10:24:21 UTC (rev 3380)
@@ -2,9 +2,7 @@
import java.util.ArrayList;
import java.util.List;
-
import javax.naming.NameNotFoundException;
-
import org.apache.log4j.Logger;
import org.jnode.driver.Device;
import org.jnode.driver.DeviceListener;
Modified: trunk/distr/src/apps/org/jnode/apps/jpartition/model/FileDeviceModel.java
===================================================================
--- trunk/distr/src/apps/org/jnode/apps/jpartition/model/FileDeviceModel.java 2007-08-04 10:19:57 UTC (rev 3379)
+++ trunk/distr/src/apps/org/jnode/apps/jpartition/model/FileDeviceModel.java 2007-08-04 10:24:21 UTC (rev 3380)
@@ -2,7 +2,6 @@
import java.util.ArrayList;
import java.util.List;
-
import org.jnode.apps.jpartition.utils.device.DeviceUtils;
import org.jnode.driver.bus.ide.IDEDevice;
Modified: trunk/distr/src/apps/org/jnode/apps/jpartition/model/PartitionModel.java
===================================================================
--- trunk/distr/src/apps/org/jnode/apps/jpartition/model/PartitionModel.java 2007-08-04 10:19:57 UTC (rev 3379)
+++ trunk/distr/src/apps/org/jnode/apps/jpartition/model/PartitionModel.java 2007-08-04 10:24:21 UTC (rev 3380)
@@ -1,7 +1,6 @@
package org.jnode.apps.jpartition.model;
import it.battlehorse.stamps.annotations.Refreshable;
-
import org.jnode.partitions.ibm.IBMPartitionTableEntry;
import org.jnode.partitions.ibm.IBMPartitionTypes;
Modified: trunk/distr/src/apps/org/jnode/apps/jpartition/swingview/CommandProcessorView.java
===================================================================
--- trunk/distr/src/apps/org/jnode/apps/jpartition/swingview/CommandProcessorView.java 2007-08-04 10:19:57 UTC (rev 3379)
+++ trunk/distr/src/apps/org/jnode/apps/jpartition/swingview/CommandProcessorView.java 2007-08-04 10:24:21 UTC (rev 3380)
@@ -1,18 +1,10 @@
package org.jnode.apps.jpartition.swingview;
import it.battlehorse.stamps.annotations.ModelDependent;
-
-import java.awt.BorderLayout;
+import java.awt.*;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
-
-import javax.swing.BorderFactory;
-import javax.swing.DefaultListModel;
-import javax.swing.JButton;
-import javax.swing.JList;
-import javax.swing.JPanel;
-import javax.swing.JScrollPane;
-
+import javax.swing.*;
import org.apache.log4j.Logger;
import org.jnode.apps.jpartition.controller.MainController;
Modified: trunk/distr/src/apps/org/jnode/apps/jpartition/swingview/DeviceView.java
===================================================================
--- trunk/distr/src/apps/org/jnode/apps/jpartition/swingview/DeviceView.java 2007-08-04 10:19:57 UTC (rev 3379)
+++ trunk/distr/src/apps/org/jnode/apps/jpartition/swingview/DeviceView.java 2007-08-04 10:24:21 UTC (rev 3380)
@@ -1,12 +1,9 @@
package org.jnode.apps.jpartition.swingview;
import it.battlehorse.stamps.annotations.ModelDependent;
-
-import javax.swing.JPanel;
-
+import javax.swing.*;
import org.apache.log4j.Logger;
import org.jnode.apps.jpartition.controller.MainController;
-import org.jnode.apps.jpartition.model.DeviceModel;
public class DeviceView extends JPanel
{
Modified: trunk/distr/src/apps/org/jnode/apps/jpartition/swingview/DiskAreaView.java
===================================================================
--- trunk/distr/src/apps/org/jnode/apps/jpartition/swingview/DiskAreaView.java 2007-08-04 10:19:57 UTC (rev 3379)
+++ trunk/distr/src/apps/org/jnode/apps/jpartition/swingview/DiskAreaView.java 2007-08-04 10:24:21 UTC (rev 3380)
@@ -1,13 +1,9 @@
package org.jnode.apps.jpartition.swingview;
-import java.awt.Color;
+import java.awt.*;
import java.awt.event.MouseAdapter;
import java.awt.event.MouseEvent;
-
-import javax.swing.BorderFactory;
-import javax.swing.JLabel;
-import javax.swing.JPanel;
-
+import javax.swing.*;
import org.jnode.apps.jpartition.controller.MainController;
public class DiskAreaView extends JPanel
Modified: trunk/distr/src/apps/org/jnode/apps/jpartition/swingview/ErrorReporter.java
===================================================================
--- trunk/distr/src/apps/org/jnode/apps/jpartition/swingview/ErrorReporter.java 2007-08-04 10:19:57 UTC (rev 3379)
+++ trunk/distr/src/apps/org/jnode/apps/jpartition/swingview/ErrorReporter.java 2007-08-04 10:24:21 UTC (rev 3380)
@@ -1,9 +1,8 @@
package org.jnode.apps.jpartition.swingview;
-import org.apache.log4j.Logger;
-
import charva.awt.Component;
import charvax.swing.JOptionPane;
+import org.apache.log4j.Logger;
public class ErrorReporter {
public static void reportError(Logger log, Object source, Throwable t)
Modified: trunk/distr/src/apps/org/jnode/apps/jpartition/swingview/FileDeviceView.java
===================================================================
--- trunk/distr/src/apps/org/jnode/apps/jpartition/swingview/FileDeviceView.java 2007-08-04 10:19:57 UTC (rev 3379)
+++ trunk/distr/src/apps/org/jnode/apps/jpartition/swingview/FileDeviceView.java 2007-08-04 10:24:21 UTC (rev 3380)
@@ -1,19 +1,10 @@
package org.jnode.apps.jpartition.swingview;
import it.battlehorse.stamps.annotations.ModelDependent;
-
-import java.awt.BorderLayout;
+import java.awt.*;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
-
-import javax.swing.AbstractListModel;
-import javax.swing.DefaultListModel;
-import javax.swing.JButton;
-import javax.swing.JFrame;
-import javax.swing.JList;
-import javax.swing.JPanel;
-import javax.swing.JScrollPane;
-
+import javax.swing.*;
import org.apache.log4j.Logger;
import org.jnode.apps.jpartition.controller.MainController;
Modified: trunk/distr/src/apps/org/jnode/apps/jpartition/swingview/MainView.java
===================================================================
--- trunk/distr/src/apps/org/jnode/apps/jpartition/swingview/MainView.java 2007-08-04 10:19:57 UTC (rev 3379)
+++ trunk/distr/src/apps/org/jnode/apps/jpartition/swingview/MainView.java 2007-08-04 10:24:21 UTC (rev 3380)
@@ -1,16 +1,10 @@
package org.jnode.apps.jpartition.swingview;
import it.battlehorse.stamps.annotations.ModelDependent;
-
-import java.awt.BorderLayout;
+import java.awt.*;
import java.awt.event.ItemEvent;
import java.awt.event.ItemListener;
-
-import javax.swing.DefaultComboBoxModel;
-import javax.swing.JComboBox;
-import javax.swing.JComponent;
-import javax.swing.JFrame;
-
+import javax.swing.*;
import org.apache.log4j.Logger;
import org.jnode.apps.jpartition.controller.MainController;
Modified: trunk/distr/src/apps/org/jnode/apps/jpartition/swingview/PartitionView.java
===================================================================
--- trunk/distr/src/apps/org/jnode/apps/jpartition/swingview/PartitionView.java 2007-08-04 10:19:57 UTC (rev 3379)
+++ trunk/distr/src/apps/org/jnode/apps/jpartition/swingview/PartitionView.java 2007-08-04 10:24:21 UTC (rev 3380)
@@ -1,7 +1,6 @@
package org.jnode.apps.jpartition.swingview;
import it.battlehorse.stamps.annotations.ModelDependent;
-
import org.apache.log4j.Logger;
import org.jnode.apps.jpartition.controller.MainController;
import org.jnode.partitions.ibm.IBMPartitionTypes;
Modified: trunk/distr/src/apps/org/jnode/apps/jpartition/swingview/SwingViewFactory.java
===================================================================
--- trunk/distr/src/apps/org/jnode/apps/jpartition/swingview/SwingViewFactory.java 2007-08-04 10:19:57 UTC (rev 3379)
+++ trunk/distr/src/apps/org/jnode/apps/jpartition/swingview/SwingViewFactory.java 2007-08-04 10:24:21 UTC (rev 3380)
@@ -1,8 +1,6 @@
package org.jnode.apps.jpartition.swingview;
-import javax.swing.JComponent;
-import javax.swing.JFrame;
-
+import javax.swing.*;
import org.jnode.apps.jpartition.ViewFactory;
import org.jnode.apps.jpartition.controller.MainController;
Modified: trunk/distr/src/apps/org/jnode/apps/jpartition/swingview/actions/BaseDeviceAction.java
===================================================================
--- trunk/distr/src/apps/org/jnode/apps/jpartition/swingview/actions/BaseDeviceAction.java 2007-08-04 10:19:57 UTC (rev 3379)
+++ trunk/distr/src/apps/org/jnode/apps/jpartition/swingview/actions/BaseDeviceAction.java 2007-08-04 10:24:21 UTC (rev 3380)
@@ -1,10 +1,7 @@
package org.jnode.apps.jpartition.swingview.actions;
import java.awt.event.ActionEvent;
-
-import javax.swing.AbstractAction;
-import javax.swing.Icon;
-
+import javax.swing.*;
import org.apache.log4j.Logger;
import org.jnode.apps.jpartition.commands.BaseDeviceCommand;
import org.jnode.apps.jpartition.commands.framework.Command;
Modified: trunk/distr/src/apps/org/jnode/apps/jpartition/utils/BasicNameSpace.java
===================================================================
--- trunk/distr/src/apps/org/jnode/apps/jpartition/utils/BasicNameSpace.java 2007-08-04 10:19:57 UTC (rev 3379)
+++ trunk/distr/src/apps/org/jnode/apps/jpartition/utils/BasicNameSpace.java 2007-08-04 10:24:21 UTC (rev 3380)
@@ -6,11 +6,9 @@
import java.util.HashMap;
import java.util.Map;
import java.util.Set;
-
import javax.naming.NameAlreadyBoundException;
import javax.naming.NameNotFoundException;
import javax.naming.NamingException;
-
import org.jnode.naming.NameSpace;
public final class BasicNameSpace implements NameSpace {
Modified: trunk/distr/src/apps/org/jnode/apps/jpartition/utils/device/AbstractIDEDevice.java
===================================================================
--- trunk/distr/src/apps/org/jnode/apps/jpartition/utils/device/AbstractIDEDevice.java 2007-08-04 10:19:57 UTC (rev 3379)
+++ trunk/distr/src/apps/org/jnode/apps/jpartition/utils/device/AbstractIDEDevice.java 2007-08-04 10:24:21 UTC (rev 3380)
@@ -2,9 +2,7 @@
import java.io.IOException;
import java.nio.ByteBuffer;
-
import javax.naming.NameNotFoundException;
-
import org.jnode.driver.DriverException;
import org.jnode.driver.block.PartitionableBlockDeviceAPI;
import org.jnode.driver.bus.ide.IDEConstants;
Modified: trunk/distr/src/apps/org/jnode/apps/jpartition/utils/device/DeviceUtils.java
===================================================================
--- trunk/distr/src/apps/org/jnode/apps/jpartition/utils/device/DeviceUtils.java 2007-08-04 10:19:57 UTC (rev 3379)
+++ trunk/distr/src/apps/org/jnode/apps/jpartition/utils/device/DeviceUtils.java 2007-08-04 10:24:21 UTC (rev 3380)
@@ -2,20 +2,13 @@
import java.io.File;
import java.io.IOException;
-
import javax.naming.NameNotFoundException;
-
import org.apache.log4j.Logger;
import org.jnode.apps.jpartition.swingview.ErrorReporter;
import org.jnode.apps.jpartition.swingview.FileDeviceView;
import org.jnode.apps.vmware.disk.VMWareDisk;
import org.jnode.apps.vmware.disk.tools.DiskFactory;
-import org.jnode.driver.ApiNotFoundException;
-import org.jnode.driver.Device;
-import org.jnode.driver.DeviceAlreadyRegisteredException;
-import org.jnode.driver.DeviceManager;
-import org.jnode.driver.DeviceNotFoundException;
-import org.jnode.driver.DriverException;
+import org.jnode.driver.*;
import org.jnode.driver.bus.ide.IDEDevice;
import org.jnode.partitions.command.PartitionHelper;
import org.jnode.partitions.ibm.IBMPartitionTypes;
Modified: trunk/distr/src/apps/org/jnode/apps/jpartition/utils/device/FakeIDEDevice.java
===================================================================
--- trunk/distr/src/apps/org/jnode/apps/jpartition/utils/device/FakeIDEDevice.java 2007-08-04 10:19:57 UTC (rev 3379)
+++ trunk/distr/src/apps/org/jnode/apps/jpartition/utils/device/FakeIDEDevice.java 2007-08-04 10:24:21 UTC (rev 3380)
@@ -1,24 +1,15 @@
package org.jnode.apps.jpartition.utils.device;
-import java.io.File;
import java.io.IOException;
-import java.io.RandomAccessFile;
import java.nio.ByteBuffer;
-
import javax.naming.NameNotFoundException;
-import javax.naming.NamingException;
-
-import org.jnode.apps.vmware.disk.VMWareDisk;
import org.jnode.apps.vmware.disk.handler.UnsupportedFormatException;
-import org.jnode.apps.vmware.disk.tools.DiskFactory;
-import org.jnode.driver.DeviceManager;
import org.jnode.driver.DriverException;
import org.jnode.driver.block.BlockDeviceAPIHelper;
import org.jnode.driver.block.PartitionableBlockDeviceAPI;
import org.jnode.driver.bus.ide.IDEDevice;
import org.jnode.driver.bus.ide.IDEDeviceFactory;
import org.jnode.driver.bus.ide.IDEDriverUtils;
-import org.jnode.naming.InitialNaming;
public class FakeIDEDevice extends AbstractIDEDevice implements PartitionableBlockDeviceAPI
{
Modified: trunk/distr/src/apps/org/jnode/apps/jpartition/utils/device/FileIDEDevice.java
===================================================================
--- trunk/distr/src/apps/org/jnode/apps/jpartition/utils/device/FileIDEDevice.java 2007-08-04 10:19:57 UTC (rev 3379)
+++ trunk/distr/src/apps/org/jnode/apps/jpartition/utils/device/FileIDEDevice.java 2007-08-04 10:24:21 UTC (rev 3380)
@@ -1,24 +1,16 @@
package org.jnode.apps.jpartition.utils.device;
-import java.io.File;
import java.io.IOException;
-import java.io.RandomAccessFile;
import java.nio.ByteBuffer;
-
import javax.naming.NameNotFoundException;
-import javax.naming.NamingException;
-
import org.jnode.apps.vmware.disk.VMWareDisk;
import org.jnode.apps.vmware.disk.handler.UnsupportedFormatException;
-import org.jnode.apps.vmware.disk.tools.DiskFactory;
-import org.jnode.driver.DeviceManager;
import org.jnode.driver.DriverException;
import org.jnode.driver.block.BlockDeviceAPIHelper;
import org.jnode.driver.block.PartitionableBlockDeviceAPI;
import org.jnode.driver.bus.ide.IDEDevice;
import org.jnode.driver.bus.ide.IDEDeviceFactory;
import org.jnode.driver.bus.ide.IDEDriverUtils;
-import org.jnode.naming.InitialNaming;
public class FileIDEDevice extends AbstractIDEDevice implements PartitionableBlockDeviceAPI
{
Modified: trunk/distr/src/apps/org/jnode/apps/jpartition/utils/device/FileIDEDeviceDriver.java
===================================================================
--- trunk/distr/src/apps/org/jnode/apps/jpartition/utils/device/FileIDEDeviceDriver.java 2007-08-04 10:19:57 UTC (rev 3379)
+++ trunk/distr/src/apps/org/jnode/apps/jpartition/utils/device/FileIDEDeviceDriver.java 2007-08-04 10:24:21 UTC (rev 3380)
@@ -2,7 +2,6 @@
import org.jnode.driver.Driver;
import org.jnode.driver.DriverException;
-import org.jnode.driver.DeviceAlreadyRegisteredException;
import org.jnode.driver.bus.ide.IDEDevice;
/**
Modified: trunk/distr/src/apps/org/jnode/apps/vmware/disk/ExtentDeclaration.java
===================================================================
--- trunk/distr/src/apps/org/jnode/apps/vmware/disk/ExtentDeclaration.java 2007-08-04 10:19:57 UTC (rev 3379)
+++ trunk/distr/src/apps/org/jnode/apps/vmware/disk/ExtentDeclaration.java 2007-08-04 10:24:21 UTC (rev 3380)
@@ -1,7 +1,6 @@
package org.jnode.apps.vmware.disk;
import java.io.File;
-
import org.jnode.apps.vmware.disk.extent.Access;
import org.jnode.apps.vmware.disk.extent.ExtentType;
Modified: trunk/distr/src/apps/org/jnode/apps/vmware/disk/IOUtils.java
===================================================================
--- trunk/distr/src/apps/org/jnode/apps/vmware/disk/IOUtils.java 2007-08-04 10:19:57 UTC (rev 3379)
+++ trunk/distr/src/apps/org/jnode/apps/vmware/disk/IOUtils.java 2007-08-04 10:24:21 UTC (rev 3380)
@@ -10,7 +10,6 @@
import java.nio.channels.FileChannel.MapMode;
import java.util.HashMap;
import java.util.Map;
-
import org.apache.log4j.Logger;
import org.jnode.apps.vmware.disk.extent.Access;
import org.jnode.apps.vmware.disk.extent.ExtentType;
Modified: trunk/distr/src/apps/org/jnode/apps/vmware/disk/VMWareDisk.java
===================================================================
--- trunk/distr/src/apps/org/jnode/apps/vmware/disk/VMWareDisk.java 2007-08-04 10:19:57 UTC (rev 3379)
+++ trunk/distr/src/apps/org/jnode/apps/vmware/disk/VMWareDisk.java 2007-08-04 10:24:21 UTC (rev 3380)
@@ -3,15 +3,12 @@
import java.io.File;
import java.io.IOException;
import java.nio.ByteBuffer;
-
import org.apache.log4j.Logger;
import org.jnode.apps.vmware.disk.descriptor.Descriptor;
-import org.jnode.apps.vmware.disk.descriptor.DiskDatabase;
import org.jnode.apps.vmware.disk.handler.ExtentFactory;
import org.jnode.apps.vmware.disk.handler.FileDescriptor;
import org.jnode.apps.vmware.disk.handler.IOHandler;
import org.jnode.apps.vmware.disk.handler.UnsupportedFormatException;
-import org.jnode.apps.vmware.disk.handler.sparse.SparseIOHandler;
/**
* Wrote from the 'Virtual Disk Format 1.0' specifications (from VMWare)
Modified: trunk/distr/src/apps/org/jnode/apps/vmware/disk/descriptor/Descriptor.java
===================================================================
--- trunk/distr/src/apps/org/jnode/apps/vmware/disk/descriptor/Descriptor.java 2007-08-04 10:19:57 UTC (rev 3379)
+++ trunk/distr/src/apps/org/jnode/apps/vmware/disk/descriptor/Descriptor.java 2007-08-04 10:24:21 UTC (rev 3380)
@@ -2,12 +2,8 @@
import java.io.File;
import java.util.List;
-
import org.apache.log4j.Logger;
-import org.jnode.apps.vmware.disk.VMWareDisk;
import org.jnode.apps.vmware.disk.extent.Extent;
-import org.jnode.apps.vmware.disk.handler.ExtentFactory;
-import org.jnode.apps.vmware.disk.handler.FileDescriptor;
/**
* Wrote from the 'Virtual Disk Format 1.0' specifications (from VMWare)
Modified: trunk/distr/src/apps/org/jnode/apps/vmware/disk/descriptor/DescriptorRW.java
===================================================================
--- trunk/distr/src/apps/org/jnode/apps/vmware/disk/descriptor/DescriptorRW.java 2007-08-04 10:19:57 UTC (rev 3379)
+++ trunk/distr/src/apps/org/jnode/apps/vmware/disk/descriptor/DescriptorRW.java 2007-08-04 10:24:21 UTC (rev 3380)
@@ -1,19 +1,11 @@
package org.jnode.apps.vmware.disk.descriptor;
-import java.io.BufferedReader;
-import java.io.File;
-import java.io.IOException;
-import java.io.InputStreamReader;
-import java.io.RandomAccessFile;
-import java.io.Reader;
+import java.io.*;
import java.nio.ByteBuffer;
-import java.nio.ByteOrder;
-import java.nio.channels.FileChannel.MapMode;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
import java.util.StringTokenizer;
-
import org.apache.log4j.Logger;
import org.jnode.apps.vmware.disk.ExtentDeclaration;
import org.jnode.apps.vmware.disk.IOUtils;
@@ -21,10 +13,8 @@
import org.jnode.apps.vmware.disk.extent.Access;
import org.jnode.apps.vmware.disk.extent.Extent;
import org.jnode.apps.vmware.disk.extent.ExtentType;
-import org.jnode.apps.vmware.disk.handler.ExtentFactory;
import org.jnode.apps.vmware.disk.handler.FileDescriptor;
import org.jnode.apps.vmware.disk.handler.UnsupportedFormatException;
-import org.jnode.apps.vmware.disk.handler.sparse.SparseExtentHeader;
import org.jnode.util.ByteBufferInputStream;
/**
Modified: trunk/distr/src/apps/org/jnode/apps/vmware/disk/extent/Extent.java
===================================================================
--- trunk/distr/src/apps/org/jnode/apps/vmware/disk/extent/Extent.java 2007-08-04 10:19:57 UTC (rev 3379)
+++ trunk/distr/src/apps/org/jnode/apps/vmware/disk/extent/Extent.java 2007-08-04 10:24:21 UTC (rev 3380)
@@ -1,12 +1,9 @@
package org.jnode.apps.vmware.disk.extent;
import java.io.File;
-
import org.apache.log4j.Logger;
import org.jnode.apps.vmware.disk.ExtentDeclaration;
-import org.jnode.apps.vmware.disk.IOUtils;
import org.jnode.apps.vmware.disk.descriptor.Descriptor;
-import org.jnode.apps.vmware.disk.handler.sparse.SparseExtentFactory;
/**
* Wrote from the 'Virtual Disk Format 1.0' specifications (from VMWare)
Modified: trunk/distr/src/apps/org/jnode/apps/vmware/disk/handler/ExtentFactory.java
===================================================================
--- trunk/distr/src/apps/org/jnode/apps/vmware/disk/handler/ExtentFactory.java 2007-08-04 10:19:57 UTC (rev 3379)
+++ trunk/distr/src/apps/org/jnode/apps/vmware/disk/handler/ExtentFactory.java 2007-08-04 10:24:21 UTC (rev 3380)
@@ -3,16 +3,8 @@
import java.io.File;
import java.io.IOException;
import java.io.RandomAccessFile;
-import java.nio.ByteBuffer;
-import java.nio.ByteOrder;
-import java.nio.channels.FileChannel.MapMode;
-
import org.apache.log4j.Logger;
-import org.jnode.apps.vmware.disk.ExtentDeclaration;
-import org.jnode.apps.vmware.disk.IOUtils;
-import org.jnode.apps.vmware.disk.descriptor.Descriptor;
import org.jnode.apps.vmware.disk.descriptor.DescriptorRW;
-import org.jnode.apps.vmware.disk.extent.Extent;
import org.jnode.apps.vmware.disk.handler.sparse.SparseExtentFactory;
/**
Modified: trunk/distr/src/apps/org/jnode/apps/vmware/disk/handler/ExtentIO.java
===================================================================
--- trunk/distr/src/apps/org/jnode/apps/vmware/disk/handler/ExtentIO.java 2007-08-04 10:19:57 UTC (rev 3379)
+++ trunk/distr/src/apps/org/jnode/apps/vmware/disk/handler/ExtentIO.java 2007-08-04 10:24:21 UTC (rev 3380)
@@ -4,10 +4,8 @@
import java.io.RandomAccessFile;
import java.nio.ByteBuffer;
import java.nio.channels.FileChannel;
-
import org.apache.log4j.Logger;
import org.jnode.apps.vmware.disk.extent.Extent;
-import org.jnode.apps.vmware.disk.handler.sparse.SparseExtentFactory;
/**
* Wrote from the 'Virtual Disk Format 1.0' specifications (from VMWare)
Modified: trunk/distr/src/apps/org/jnode/apps/vmware/disk/handler/FileDescriptor.java
===================================================================
--- trunk/distr/src/apps/org/jnode/apps/vmware/disk/handler/FileDescriptor.java 2007-08-04 10:19:57 UTC (rev 3379)
+++ trunk/distr/src/apps/org/jnode/apps/vmware/disk/handler/FileDescriptor.java 2007-08-04 10:24:21 UTC (rev 3380)
@@ -1,7 +1,6 @@
package org.jnode.apps.vmware.disk.handler;
import java.io.RandomAccessFile;
-
import org.jnode.apps.vmware.disk.descriptor.Descriptor;
/**
Modified: trunk/distr/src/apps/org/jnode/apps/vmware/disk/handler/IOHandler.java
===================================================================
--- trunk/distr/src/apps/org/jnode/apps/vmware/disk/handler/IOHandler.java 2007-08-04 10:19:57 UTC (rev 3379)
+++ trunk/distr/src/apps/org/jnode/apps/vmware/disk/handler/IOHandler.java 2007-08-04 10:24:21 UTC (rev 3380)
@@ -5,10 +5,8 @@
import java.nio.ByteBuffer;
import java.util.HashMap;
import java.util.Map;
-
import org.apache.log4j.Logger;
import org.jnode.apps.vmware.disk.descriptor.Descriptor;
-import org.jnode.apps.vmware.disk.descriptor.DescriptorRW;
import org.jnode.apps.vmware.disk.descriptor.DiskDatabase;
import org.jnode.apps.vmware.disk.extent.Extent;
Modified: trunk/distr/src/apps/org/jnode/apps/vmware/disk/handler/simple/SimpleDescriptorRW.java
===================================================================
--- trunk/distr/src/apps/org/jnode/apps/vmware/disk/handler/simple/SimpleDescriptorRW.java 2007-08-04 10:19:57 UTC (rev 3379)
+++ trunk/distr/src/apps/org/jnode/apps/vmware/disk/handler/simple/SimpleDescriptorRW.java 2007-08-04 10:24:21 UTC (rev 3380)
@@ -4,7 +4,6 @@
package org.jnode.apps.vmware.disk.handler.simple;
import java.io.IOException;
-
import org.jnode.apps.vmware.disk.ExtentDeclaration;
import org.jnode.apps.vmware.disk.descriptor.Descriptor;
import org.jnode.apps.vmware.disk.descriptor.DescriptorRW;
Modified: trunk/distr/src/apps/org/jnode/apps/vmware/disk/handler/simple/SimpleExtentFactory.java
===================================================================
--- trunk/distr/src/apps/org/jnode/apps/vmware/disk/handler/simple/SimpleExtentFactory.java 2007-08-04 10:19:57 UTC (rev 3379)
+++ trunk/distr/src/apps/org/jnode/apps/vmware/disk/handler/simple/SimpleExtentFactory.java 2007-08-04 10:24:21 UTC (rev 3380)
@@ -3,16 +3,9 @@
import java.io.File;
import java.io.IOException;
import java.io.RandomAccessFile;
-import java.nio.ByteBuffer;
-
-import org.jnode.apps.vmware.disk.ExtentDeclaration;
-import org.jnode.apps.vmware.disk.IOUtils;
import org.jnode.apps.vmware.disk.descriptor.Descriptor;
-import org.jnode.apps.vmware.disk.descriptor.DescriptorRW;
-import org.jnode.apps.vmware.disk.extent.Extent;
import org.jnode.apps.vmware.disk.handler.ExtentFactory;
import org.jnode.apps.vmware.disk.handler.FileDescriptor;
-import org.jnode.apps.vmware.disk.handler.IOHandler;
import org.jnode.apps.vmware.disk.handler.UnsupportedFormatException;
/**
Modified: trunk/distr/src/apps/org/jnode/apps/vmware/disk/handler/simple/SimpleIOHandler.java
===================================================================
--- trunk/distr/src/apps/org/jnode/apps/vmware/disk/handler/simple/SimpleIOHandler.java 2007-08-04 10:19:57 UTC (rev 3379)
+++ trunk/distr/src/apps/org/jnode/apps/vmware/disk/handler/simple/SimpleIOHandler.java 2007-08-04 10:24:21 UTC (rev 3380)
@@ -4,7 +4,6 @@
package org.jnode.apps.vmware.disk.handler.simple;
import java.io.IOException;
-
import org.jnode.apps.vmware.disk.handler.FileDescriptor;
import org.jnode.apps.vmware.disk.handler.IOHandler;
import org.jnode.apps.vmware.disk.handler.UnsupportedFormatException;
Modified: trunk/distr/src/apps/org/jnode/apps/vmware/disk/handler/sparse/AllocationTable.java
===================================================================
--- trunk/distr/src/apps/org/jnode/apps/vmware/disk/handler/sparse/AllocationTable.java 2007-08-04 10:19:57 UTC (rev 3379)
+++ trunk/distr/src/apps/org/jnode/apps/vmware/disk/handler/sparse/AllocationTable.java 2007-08-04 10:24:21 UTC (rev 3380)
@@ -1,7 +1,5 @@
package org.jnode.apps.vmware.disk.handler.sparse;
-import java.io.IOException;
-
import org.apache.log4j.Logger;
import org.jnode.apps.vmware.disk.test.readwrite.TestVMWareDisk;
Modified: trunk/distr/src/apps/org/jnode/apps/vmware/disk/handler/sparse/AllocationTableRW.java
===================================================================
--- trunk/distr/src/apps/org/jnode/apps/vmware/disk/handler/sparse/AllocationTableRW.java 2007-08-04 10:19:57 UTC (rev 3379)
+++ trunk/distr/src/apps/org/jnode/apps/vmware/disk/handler/sparse/AllocationTableRW.java 2007-08-04 10:24:21 UTC (rev 3380)
@@ -5,7 +5,6 @@
import java.nio.ByteBuffer;
import java.nio.IntBuffer;
import java.nio.channels.FileChannel;
-
import org.apache.log4j.Logger;
import org.jnode.apps.vmware.disk.IOUtils;
import org.jnode.apps.vmware.disk.handler.IOHandler;
Modified: trunk/distr/src/apps/org/jnode/apps/vmware/disk/handler/sparse/EntryArray.java
===================================================================
--- trunk/distr/src/apps/org/jnode/apps/vmware/disk/handler/sparse/EntryArray.java 2007-08-04 10:19:57 UTC (rev 3379)
+++ trunk/distr/src/apps/org/jnode/apps/vmware/disk/handler/sparse/EntryArray.java 2007-08-04 10:24:21 UTC (rev 3380)
@@ -1,13 +1,6 @@
package org.jnode.apps.vmware.disk.handler.sparse;
-import java.io.IOException;
-import java.io.RandomAccessFile;
-import java.nio.ByteBuffer;
-import java.nio.IntBuffer;
-import java.nio.channels.FileChannel;
-
import org.apache.log4j.Logger;
-import org.jnode.apps.vmware.disk.IOUtils;
/**
* Wrote from the 'Virtual Disk Format 1.0' specifications (from VMWare)
Modified: trunk/distr/src/apps/org/jnode/apps/vmware/disk/handler/sparse/GrainDirectory.java
===================================================================
--- trunk/distr/src/apps/org/jnode/apps/vmware/disk/handler/sparse/GrainDirectory.java 2007-08-04 10:19:57 UTC (rev 3379)
+++ trunk/distr/src/apps/org/jnode/apps/vmware/disk/handler/sparse/GrainDirectory.java 2007-08-04 10:24:21 UTC (rev 3380)
@@ -1,8 +1,5 @@
package org.jnode.apps.vmware.disk.handler.sparse;
-import java.io.IOException;
-import java.io.RandomAccessFile;
-
/**
* Wrote from the 'Virtual Disk Format 1.0' specifications (from VMWare)
*
Modified: trunk/distr/src/apps/org/jnode/apps/vmware/disk/handler/sparse/GrainTable.java
===================================================================
--- trunk/distr/src/apps/org/jnode/apps/vmware/disk/handler/sparse/GrainTable.java 2007-08-04 10:19:57 UTC (rev 3379)
+++ trunk/distr/src/apps/org/jnode/apps/vmware/disk/handler/sparse/GrainTable.java 2007-08-04 10:24:21 UTC (rev 3380)
@@ -1,8 +1,5 @@
package org.jnode.apps.vmware.disk.handler.sparse;
-import java.io.IOException;
-import java.io.RandomAccessFile;
-
/**
* Wrote from the 'Virtual Disk Format 1.0' specifications (from VMWare)
*
Modified: trunk/distr/src/apps/org/jnode/apps/vmware/disk/handler/sparse/SparseDescriptorRW.java
===================================================================
--- trunk/distr/src/apps/org/jnode/apps/vmware/disk/handler/sparse/SparseDescriptorRW.java 2007-08-04 10:19:57 UTC (rev 3379)
+++ trunk/distr/src/apps/org/jnode/apps/vmware/disk/handler/sparse/SparseDescriptorRW.java 2007-08-04 10:24:21 UTC (rev 3380)
@@ -6,13 +6,11 @@
import java.io.IOException;
import java.io.RandomAccessFile;
import java.nio.ByteBuffer;
-
import org.apache.log4j.Logger;
import org.jnode.apps.vmware.disk.ExtentDeclaration;
import org.jnode.apps.vmware.disk.IOUtils;
import org.jnode.apps.vmware.disk.descriptor.Descriptor;
import org.jnode.apps.vmware.disk.descriptor.DescriptorRW;
-import org.jnode.apps.vmware.disk.extent.Extent;
import org.jnode.apps.vmware.disk.handler.FileDescriptor;
import org.jnode.apps.vmware.disk.handler.UnsupportedFormatException;
Modified: trunk/distr/src/apps/org/jnode/apps/vmware/disk/handler/sparse/SparseDiskFactory.java
===================================================================
--- trunk/distr/src/apps/org/jnode/apps/vmware/disk/handler/sparse/SparseDiskFactory.java 2007-08-04 10:19:57 UTC (rev 3379)
+++ trunk/distr/src/apps/org/jnode/apps/vmware/disk/handler/sparse/SparseDiskFactory.java 2007-08-04 10:24:21 UTC (rev 3380)
@@ -7,15 +7,10 @@
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
-
import org.apache.log4j.Logger;
import org.jnode.apps.vmware.disk.ExtentDeclaration;
import org.jnode.apps.vmware.disk.IOUtils;
-import org.jnode.apps.vmware.disk.descriptor.AdapterType;
-import org.jnode.apps.vmware.disk.descriptor.CreateType;
-import org.jnode.apps.vmware.disk.descriptor.Descriptor;
-import org.jnode.apps.vmware.disk.descriptor.DiskDatabase;
-import org.jnode.apps.vmware.disk.descriptor.Header;
+import org.jnode.apps.vmware.disk.descriptor.*;
import org.jnode.apps.vmware.disk.extent.Access;
import org.jnode.apps.vmware.disk.extent.Extent;
import org.jnode.apps.vmware.disk.extent.ExtentType;
Modified: trunk/distr/src/apps/org/jnode/apps/vmware/disk/handler/sparse/SparseExtent.java
===================================================================
--- trunk/distr/src/apps/org/jnode/apps/vmware/disk/handler/sparse/SparseExtent.java 2007-08-04 10:19:57 UTC (rev 3379)
+++ trunk/distr/src/apps/org/jnode/apps/vmware/disk/handler/sparse/SparseExtent.java 2007-08-04 10:24:21 UTC (rev 3380)
@@ -2,8 +2,6 @@
import java.io.IOException;
import java.io.RandomAccessFile;
-import java.nio.channels.FileChannel;
-
import org.apache.log4j.Logger;
import org.jnode.apps.vmware.disk.ExtentDeclaration;
import org.jnode.apps.vmware.disk.descriptor.Descriptor;
Modified: trunk/distr/src/apps/org/jnode/apps/vmware/disk/handler/sparse/SparseExtentFactory.java
===================================================================
--- trunk/distr/src/apps/org/jnode/apps/vmware/disk/handler/sparse/SparseExtentFactory.java 2007-08-04 10:19:57 UTC (rev 3379)
+++ trunk/distr/src/apps/org/jnode/apps/vmware/disk/handler/sparse/SparseExtentFactory.java 2007-08-04 10:24:21 UTC (rev 3380)
@@ -4,7 +4,6 @@
import java.io.IOException;
import java.io.RandomAccessFile;
import java.nio.ByteBuffer;
-
import org.apache.log4j.Logger;
import org.jnode.apps.vmware.disk.IOUtils;
import org.jnode.apps.vmware.disk.descriptor.Descriptor;
Modified: trunk/distr/src/apps/org/jnode/apps/vmware/disk/handler/sparse/SparseExtentHeader.java
===================================================================
--- trunk/distr/src/apps/org/jnode/apps/vmware/disk/handler/sparse/SparseExtentHeader.java 2007-08-04 10:19:57 UTC (rev 3379)
+++ trunk/distr/src/apps/org/jnode/apps/vmware/disk/handler/sparse/SparseExtentHeader.java 2007-08-04 10:24:21 UTC (rev 3380)
@@ -2,7 +2,6 @@
import org.apache.log4j.Logger;
-import org.jnode.apps.vmware.disk.handler.UnsupportedFormatException;
/**
* Wrote from the 'Virtual Disk Format 1.0' specifications (from VMWare)
Modified: trunk/distr/src/apps/org/jnode/apps/vmware/disk/handler/sparse/SparseExtentHeaderRW.java
===================================================================
--- trunk/distr/src/apps/org/jnode/apps/vmware/disk/handler/sparse/SparseExtentHeaderRW.java 2007-08-04 10:19:57 UTC (rev 3379)
+++ trunk/distr/src/apps/org/jnode/apps/vmware/disk/handler/sparse/SparseExtentHeaderRW.java 2007-08-04 10:24:21 UTC (rev 3380)
@@ -2,9 +2,7 @@
import java.io.IOException;
import java.nio.ByteBuffer;
-import java.nio.channels.Channel;
import java.nio.channels.FileChannel;
-
import org.apache.log4j.Logger;
import org.jnode.apps.vmware.disk.IOUtils;
import org.jnode.apps.vmware.disk.handler.UnsupportedFormatException;
Modified: trunk/distr/src/apps/org/jnode/apps/vmware/disk/handler/sparse/SparseExtentIO.java
===================================================================
--- trunk/distr/src/apps/org/jnode/apps/vmware/disk/handler/sparse/SparseExtentIO.java 2007-08-04 10:19:57 UTC (rev 3379)
+++ trunk/distr/src/apps/org/jnode/apps/vmware/disk/handler/sparse/SparseExtentIO.java 2007-08-04 10:24:21 UTC (rev 3380)
@@ -3,7 +3,6 @@
import java.io.IOException;
import java.io.RandomAccessFile;
import java.nio.ByteBuffer;
-
import org.apache.log4j.Logger;
import org.jnode.apps.vmware.disk.extent.Extent;
import org.jnode.apps.vmware.disk.handler.ExtentIO;
Modified: trunk/distr/src/apps/org/jnode/apps/vmware/disk/handler/sparse/SparseExtentRW.java
===================================================================
--- trunk/distr/src/apps/org/jnode/apps/vmware/disk/handler/sparse/SparseExtentRW.java 2007-08-04 10:19:57 UTC (rev 3379)
+++ trunk/distr/src/apps/org/jnode/apps/vmware/disk/handler/sparse/SparseExtentRW.java 2007-08-04 10:24:21 UTC (rev 3380)
@@ -3,7 +3,6 @@
import java.io.IOException;
import java.io.RandomAccessFile;
import java.nio.channels.FileChannel;
-
import org.apache.log4j.Logger;
import org.jnode.apps.vmware.disk.ExtentDeclaration;
import org.jnode.apps.vmware.disk.IOUtils;
Modified: trunk/distr/src/apps/org/jnode/apps/vmware/disk/handler/sparse/SparseFileDescriptor.java
===================================================================
--- trunk/distr/src/apps/org/jnode/apps/vmware/disk/handler/sparse/SparseFileDescriptor.java 2007-08-04 10:19:57 UTC (rev 3379)
+++ trunk/distr/src/apps/org/jnode/apps/vmware/disk/handler/sparse/SparseFileDescriptor.java 2007-08-04 10:24:21 UTC (rev 3380)
@@ -1,7 +1,6 @@
package org.jnode.apps.vmware.disk.handler.sparse;
import java.io.RandomAccessFile;
-
import org.jnode.apps.vmware.disk.descriptor.Descriptor;
import org.jnode.apps.vmware.disk.handler.ExtentFactory;
import org.jnode.apps.vmware.disk.handler.FileDescriptor;
Modified: trunk/distr/src/apps/org/jnode/apps/vmware/disk/handler/sparse/SparseIOHandler.java
===================================================================
--- trunk/distr/src/apps/org/jnode/apps/vmware/disk/handler/sparse/SparseIOHandler.java 2007-08-04 10:19:57 UTC (rev 3379)
+++ trunk/distr/src/apps/org/jnode/apps/vmware/disk/handler/sparse/SparseIOHandler.java 2007-08-04 10:24:21 UTC (rev 3380)
@@ -5,11 +5,9 @@
import java.io.IOException;
import java.io.RandomAccessFile;
-
import org.apache.log4j.Logger;
import org.jnode.apps.vmware.disk.descriptor.Descriptor;
import org.jnode.apps.vmware.disk.extent.Extent;
-import org.jnode.apps.vmware.disk.handler.ExtentIO;
import org.jnode.apps.vmware.disk.handler.IOHandler;
/**
Modified: trunk/distr/src/apps/org/jnode/apps/vmware/disk/test/BaseTest.java
===================================================================
--- trunk/distr/src/apps/org/jnode/apps/vmware/disk/test/BaseTest.java 2007-08-04 10:19:57 UTC (rev 3379)
+++ trunk/distr/src/apps/org/jnode/apps/vmware/disk/test/BaseTest.java 2007-08-04 10:24:21 UTC (rev 3380)
@@ -2,8 +2,6 @@
import java.io.File;
import java.io.IOException;
-
-import org.jnode.apps.vmware.disk.IOUtils;
import org.jnode.apps.vmware.disk.tools.DiskCopier;
import org.junit.After;
import org.junit.Before;
Modified: trunk/distr/src/apps/org/jnode/apps/vmware/disk/test/TestCreation.java
===================================================================
--- trunk/distr/src/apps/org/jnode/apps/vmware/disk/test/TestCreation.java 2007-08-04 10:19:57 UTC (rev 3379)
+++ trunk/distr/src/apps/org/jnode/apps/vmware/disk/test/TestCreation.java 2007-08-04 10:24:21 UTC (rev 3380)
@@ -1,10 +1,7 @@
package org.jnode.apps.vmware.disk.test;
-import java.io.File;
import java.io.IOException;
-
import org.apache.log4j.Logger;
-import org.jnode.apps.vmware.disk.IOUtils;
import org.junit.Test;
Modified: trunk/distr/src/apps/org/jnode/apps/vmware/disk/test/Utils.java
===================================================================
--- trunk/distr/src/apps/org/jnode/apps/vmware/disk/test/Utils.java 2007-08-04 10:19:57 UTC (rev 3379)
+++ trunk/distr/src/apps/org/jnode/apps/vmware/disk/test/Utils.java 2007-08-04 10:24:21 UTC (rev 3380)
@@ -1,12 +1,7 @@
package org.jnode.apps.vmware.disk.test;
import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
-import java.io.FilenameFilter;
import java.io.IOException;
-import java.nio.channels.FileChannel;
-
import org.apache.log4j.Logger;
/**
Modified: trunk/distr/src/apps/org/jnode/apps/vmware/disk/test/readwrite/BaseReadWriteTest.java
===================================================================
--- trunk/distr/src/apps/org/jnode/apps/vmware/disk/test/readwrite/BaseReadWriteTest.java 2007-08-04 10:19:57 UTC (rev 3379)
+++ trunk/distr/src/apps/org/jnode/apps/vmware/disk/test/readwrite/BaseReadWriteTest.java 2007-08-04 10:24:21 UTC (rev 3380)
@@ -7,18 +7,13 @@
import java.util.ArrayList;
import java.util.List;
import java.util.StringTokenizer;
-
import org.apache.log4j.Logger;
import org.jnode.apps.vmware.disk.IOUtils;
import org.jnode.apps.vmware.disk.VMWareDisk;
import org.jnode.apps.vmware.disk.handler.IOHandler;
import org.jnode.apps.vmware.disk.test.BaseTest;
import org.jnode.apps.vmware.disk.test.Utils;
-import org.junit.After;
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Ignore;
-import org.junit.Test;
+import org.junit.*;
import org.junit.runner.RunWith;
import org.junit.runners.Parameterized;
import org.junit.runners.Parameterized.Parameters;
Modified: trunk/distr/src/apps/org/jnode/apps/vmware/disk/test/readwrite/TestHeader.java
===================================================================
--- trunk/distr/src/apps/org/jnode/apps/vmware/disk/test/readwrite/TestHeader.java 2007-08-04 10:19:57 UTC (rev 3379)
+++ trunk/distr/src/apps/org/jnode/apps/vmware/disk/test/readwrite/TestHeader.java 2007-08-04 10:24:21 UTC (rev 3380)
@@ -1,22 +1,11 @@
package org.jnode.apps.vmware.disk.test.readwrite;
import java.io.File;
-import java.io.FilenameFilter;
import java.io.IOException;
-import java.nio.ByteBuffer;
-import java.util.ArrayList;
-import java.util.List;
-
import org.apache.log4j.Logger;
-import org.jnode.apps.vmware.disk.IOUtils;
import org.jnode.apps.vmware.disk.VMWareDisk;
-import org.jnode.apps.vmware.disk.handler.IOHandler;
import org.jnode.apps.vmware.disk.test.Utils;
-import org.junit.After;
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Ignore;
-import org.junit.Test;
+import org.junit.*;
import org.junit.runner.RunWith;
import org.junit.runners.Parameterized;
import org.junit.runners.Parameterized.Parameters;
Modified: trunk/distr/src/apps/org/jnode/apps/vmware/disk/test/readwrite/TestVMWareDisk.java
===================================================================
--- trunk/distr/src/apps/org/jnode/apps/vmware/disk/test/readwrite/TestVMWareDisk.java 2007-08-04 10:19:57 UTC (rev 3379)
+++ trunk/distr/src/apps/org/jnode/apps/vmware/disk/test/readwrite/TestVMWareDisk.java 2007-08-04 10:24:21 UTC (rev 3380)
@@ -1,22 +1,14 @@
package org.jnode.apps.vmware.disk.test.readwrite;
import java.io.File;
-import java.io.FilenameFilter;
import java.io.IOException;
import java.nio.ByteBuffer;
-import java.util.ArrayList;
-import java.util.List;
-
import org.apache.log4j.Logger;
import org.jnode.apps.vmware.disk.IOUtils;
import org.jnode.apps.vmware.disk.VMWareDisk;
import org.jnode.apps.vmware.disk.handler.IOHandler;
import org.jnode.apps.vmware.disk.test.Utils;
-import org.junit.After;
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Ignore;
-import org.junit.Test;
+import org.junit.*;
import org.junit.runner.RunWith;
import org.junit.runners.Parameterized;
import org.junit.runners.Parameterized.Parameters;
Modified: trunk/distr/src/apps/org/jnode/apps/vmware/disk/tools/DiskCopier.java
===================================================================
--- trunk/distr/src/apps/org/jnode/apps/vmware/disk/tools/DiskCopier.java 2007-08-04 10:19:57 UTC (rev 3379)
+++ trunk/distr/src/apps/org/jnode/apps/vmware/disk/tools/DiskCopier.java 2007-08-04 10:24:21 UTC (rev 3380)
@@ -1,12 +1,7 @@
package org.jnode.apps.vmware.disk.tools;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
-import java.io.FilenameFilter;
-import java.io.IOException;
+import java.io.*;
import java.nio.channels.FileC...
[truncated message content] |
