|
From: <ls...@us...> - 2007-08-04 10:19:59
|
Revision: 3379
http://jnode.svn.sourceforge.net/jnode/?rev=3379&view=rev
Author: lsantha
Date: 2007-08-04 03:19:57 -0700 (Sat, 04 Aug 2007)
Log Message:
-----------
Optimized imports.
Modified Paths:
--------------
trunk/builder/src/builder/org/jnode/ant/taskdefs/Asm.java
trunk/builder/src/builder/org/jnode/ant/taskdefs/HeaderTask.java
trunk/builder/src/builder/org/jnode/ant/taskdefs/Native2AsciiTask.java
trunk/builder/src/builder/org/jnode/ant/taskdefs/classpath/BaseDirs.java
trunk/builder/src/builder/org/jnode/ant/taskdefs/classpath/CompareTask.java
trunk/builder/src/builder/org/jnode/build/AbstractAsmConstBuilder.java
trunk/builder/src/builder/org/jnode/build/AbstractBootImageBuilder.java
trunk/builder/src/builder/org/jnode/build/AbstractPluginTask.java
trunk/builder/src/builder/org/jnode/build/AbstractPluginsTask.java
trunk/builder/src/builder/org/jnode/build/AddressFinder.java
trunk/builder/src/builder/org/jnode/build/BootDiskBuilder.java
trunk/builder/src/builder/org/jnode/build/BootFloppyBuilder.java
trunk/builder/src/builder/org/jnode/build/FieldInfo.java
trunk/builder/src/builder/org/jnode/build/InitJarBuilder.java
trunk/builder/src/builder/org/jnode/build/InitJarsBuilder.java
trunk/builder/src/builder/org/jnode/build/ObjectEmitter.java
trunk/builder/src/builder/org/jnode/build/PluginList.java
trunk/builder/src/builder/org/jnode/build/PluginTask.java
trunk/builder/src/builder/org/jnode/build/VMwareBuilderTask.java
trunk/builder/src/builder/org/jnode/build/dependencies/BCELDependencyChecker.java
trunk/builder/src/builder/org/jnode/build/documentation/DotBuilder.java
trunk/builder/src/builder/org/jnode/build/documentation/PluginData.java
trunk/builder/src/builder/org/jnode/build/documentation/PluginDocumentationTask.java
trunk/builder/src/builder/org/jnode/build/x86/BootImageBuilder.java
trunk/builder/src/builder/org/jnode/build/x86/Disasm.java
trunk/builder/src/builder/org/jnode/jnasm/JNAsm.java
trunk/builder/src/builder/org/jnode/jnasm/assembler/Assembler.java
trunk/builder/src/builder/org/jnode/jnasm/assembler/AssemblerModule.java
trunk/builder/src/builder/org/jnode/jnasm/assembler/HardwareSupport.java
trunk/builder/src/builder/org/jnode/jnasm/assembler/PseudoInstructions.java
trunk/builder/src/builder/org/jnode/jnasm/assembler/x86/AbstractX86Module.java
trunk/builder/src/builder/org/jnode/jnasm/assembler/x86/MMX.java
trunk/builder/src/builder/org/jnode/jnasm/assembler/x86/X86Core.java
trunk/builder/src/builder/org/jnode/jnasm/assembler/x86/X86Support.java
trunk/builder/src/builder/org/jnode/jnasm/preprocessor/Preprocessor.java
trunk/builder/src/builder/org/jnode/linker/Elf.java
trunk/builder/src/builder/org/jnode/linker/ElfLinker.java
trunk/builder/src/builder/org/jnode/linker/Reloc.java
trunk/builder/src/builder/org/jnode/linker/Section.java
Modified: trunk/builder/src/builder/org/jnode/ant/taskdefs/Asm.java
===================================================================
--- trunk/builder/src/builder/org/jnode/ant/taskdefs/Asm.java 2007-08-04 10:09:43 UTC (rev 3378)
+++ trunk/builder/src/builder/org/jnode/ant/taskdefs/Asm.java 2007-08-04 10:19:57 UTC (rev 3379)
@@ -23,12 +23,7 @@
import java.io.File;
import java.io.IOException;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Map;
-import java.util.Set;
-
+import java.util.*;
import org.apache.tools.ant.BuildException;
import org.apache.tools.ant.DirectoryScanner;
import org.apache.tools.ant.Project;
Modified: trunk/builder/src/builder/org/jnode/ant/taskdefs/HeaderTask.java
===================================================================
--- trunk/builder/src/builder/org/jnode/ant/taskdefs/HeaderTask.java 2007-08-04 10:09:43 UTC (rev 3378)
+++ trunk/builder/src/builder/org/jnode/ant/taskdefs/HeaderTask.java 2007-08-04 10:19:57 UTC (rev 3379)
@@ -21,14 +21,8 @@
package org.jnode.ant.taskdefs;
-import java.io.BufferedReader;
-import java.io.File;
-import java.io.FileReader;
-import java.io.FileWriter;
-import java.io.IOException;
-import java.io.PrintWriter;
+import java.io.*;
import java.util.ArrayList;
-
import org.apache.tools.ant.BuildException;
import org.apache.tools.ant.Task;
import org.apache.tools.ant.types.FileSet;
Modified: trunk/builder/src/builder/org/jnode/ant/taskdefs/Native2AsciiTask.java
===================================================================
--- trunk/builder/src/builder/org/jnode/ant/taskdefs/Native2AsciiTask.java 2007-08-04 10:09:43 UTC (rev 3378)
+++ trunk/builder/src/builder/org/jnode/ant/taskdefs/Native2AsciiTask.java 2007-08-04 10:19:57 UTC (rev 3379)
@@ -26,7 +26,6 @@
import java.io.FileInputStream;
import java.io.IOException;
import java.util.ArrayList;
-
import org.apache.tools.ant.BuildException;
import org.apache.tools.ant.Task;
import org.apache.tools.ant.taskdefs.Execute;
Modified: trunk/builder/src/builder/org/jnode/ant/taskdefs/classpath/BaseDirs.java
===================================================================
--- trunk/builder/src/builder/org/jnode/ant/taskdefs/classpath/BaseDirs.java 2007-08-04 10:09:43 UTC (rev 3378)
+++ trunk/builder/src/builder/org/jnode/ant/taskdefs/classpath/BaseDirs.java 2007-08-04 10:19:57 UTC (rev 3379)
@@ -24,7 +24,6 @@
import java.util.ArrayList;
import java.util.Map;
import java.util.TreeMap;
-
import org.apache.tools.ant.BuildException;
import org.apache.tools.ant.DirectoryScanner;
import org.apache.tools.ant.Project;
Modified: trunk/builder/src/builder/org/jnode/ant/taskdefs/classpath/CompareTask.java
===================================================================
--- trunk/builder/src/builder/org/jnode/ant/taskdefs/classpath/CompareTask.java 2007-08-04 10:09:43 UTC (rev 3378)
+++ trunk/builder/src/builder/org/jnode/ant/taskdefs/classpath/CompareTask.java 2007-08-04 10:19:57 UTC (rev 3379)
@@ -21,19 +21,11 @@
package org.jnode.ant.taskdefs.classpath;
-import java.io.BufferedReader;
-import java.io.ByteArrayOutputStream;
-import java.io.File;
-import java.io.FileOutputStream;
-import java.io.FileReader;
-import java.io.FileWriter;
-import java.io.IOException;
-import java.io.PrintWriter;
+import java.io.*;
import java.util.Date;
import java.util.Map;
import java.util.TreeMap;
import java.util.TreeSet;
-
import org.apache.tools.ant.BuildException;
import org.apache.tools.ant.Task;
import org.apache.tools.ant.taskdefs.Execute;
Modified: trunk/builder/src/builder/org/jnode/build/AbstractAsmConstBuilder.java
===================================================================
--- trunk/builder/src/builder/org/jnode/build/AbstractAsmConstBuilder.java 2007-08-04 10:09:43 UTC (rev 3378)
+++ trunk/builder/src/builder/org/jnode/build/AbstractAsmConstBuilder.java 2007-08-04 10:19:57 UTC (rev 3379)
@@ -31,7 +31,6 @@
import java.net.URL;
import java.util.ArrayList;
import java.util.Date;
-
import org.jnode.vm.Vm;
import org.jnode.vm.VmArchitecture;
import org.jnode.vm.VmSystemClassLoader;
Modified: trunk/builder/src/builder/org/jnode/build/AbstractBootImageBuilder.java
===================================================================
--- trunk/builder/src/builder/org/jnode/build/AbstractBootImageBuilder.java 2007-08-04 10:09:43 UTC (rev 3378)
+++ trunk/builder/src/builder/org/jnode/build/AbstractBootImageBuilder.java 2007-08-04 10:19:57 UTC (rev 3379)
@@ -21,31 +21,16 @@
package org.jnode.build;
-import java.io.File;
-import java.io.FileOutputStream;
-import java.io.FileWriter;
-import java.io.IOException;
-import java.io.PrintWriter;
+import java.io.*;
import java.lang.reflect.Field;
import java.net.URL;
import java.nio.ByteBuffer;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.Map;
-import java.util.Set;
-import java.util.SortedMap;
-import java.util.TreeMap;
-import java.util.TreeSet;
-
+import java.util.*;
import org.apache.tools.ant.Project;
import org.jnode.assembler.Label;
import org.jnode.assembler.NativeStream;
-import org.jnode.assembler.UnresolvedObjectRefException;
import org.jnode.assembler.NativeStream.ObjectRef;
+import org.jnode.assembler.UnresolvedObjectRefException;
import org.jnode.assembler.x86.X86BinaryAssembler;
import org.jnode.plugin.PluginDescriptor;
import org.jnode.plugin.PluginException;
@@ -56,28 +41,9 @@
import org.jnode.plugin.model.PluginRegistryModel;
import org.jnode.util.BootableHashMap;
import org.jnode.util.NumberUtils;
-import org.jnode.vm.JvmType;
-import org.jnode.vm.Unsafe;
-import org.jnode.vm.VirtualMemoryRegion;
-import org.jnode.vm.Vm;
-import org.jnode.vm.VmArchitecture;
-import org.jnode.vm.VmSystemClassLoader;
-import org.jnode.vm.VmSystemObject;
+import org.jnode.vm.*;
import org.jnode.vm.bytecode.BytecodeParser;
-import org.jnode.vm.classmgr.Modifier;
-import org.jnode.vm.classmgr.ObjectLayout;
-import org.jnode.vm.classmgr.VmArray;
-import org.jnode.vm.classmgr.VmArrayClass;
-import org.jnode.vm.classmgr.VmClassType;
-import org.jnode.vm.classmgr.VmCompiledCode;
-import org.jnode.vm.classmgr.VmField;
-import org.jnode.vm.classmgr.VmIsolatedStatics;
-import org.jnode.vm.classmgr.VmMethodCode;
-import org.jnode.vm.classmgr.VmNormalClass;
-import org.jnode.vm.classmgr.VmSharedStatics;
-import org.jnode.vm.classmgr.VmStaticField;
-import org.jnode.vm.classmgr.VmStatics;
-import org.jnode.vm.classmgr.VmType;
+import org.jnode.vm.classmgr.*;
import org.jnode.vm.compiler.NativeCodeCompiler;
import org.jnode.vm.memmgr.HeapHelper;
import org.jnode.vm.memmgr.VmHeapManager;
Modified: trunk/builder/src/builder/org/jnode/build/AbstractPluginTask.java
===================================================================
--- trunk/builder/src/builder/org/jnode/build/AbstractPluginTask.java 2007-08-04 10:09:43 UTC (rev 3378)
+++ trunk/builder/src/builder/org/jnode/build/AbstractPluginTask.java 2007-08-04 10:19:57 UTC (rev 3379)
@@ -27,10 +27,8 @@
import java.util.HashMap;
import java.util.Hashtable;
import java.util.LinkedList;
-
import nanoxml.XMLElement;
import nanoxml.XMLParseException;
-
import org.apache.tools.ant.BuildException;
import org.apache.tools.ant.Task;
import org.apache.tools.ant.taskdefs.Jar;
Modified: trunk/builder/src/builder/org/jnode/build/AbstractPluginsTask.java
===================================================================
--- trunk/builder/src/builder/org/jnode/build/AbstractPluginsTask.java 2007-08-04 10:09:43 UTC (rev 3378)
+++ trunk/builder/src/builder/org/jnode/build/AbstractPluginsTask.java 2007-08-04 10:19:57 UTC (rev 3379)
@@ -24,7 +24,6 @@
import java.io.File;
import java.net.MalformedURLException;
import java.net.URL;
-
import org.apache.tools.ant.Project;
import org.jnode.plugin.PluginDescriptor;
import org.jnode.plugin.PluginException;
Modified: trunk/builder/src/builder/org/jnode/build/AddressFinder.java
===================================================================
--- trunk/builder/src/builder/org/jnode/build/AddressFinder.java 2007-08-04 10:09:43 UTC (rev 3378)
+++ trunk/builder/src/builder/org/jnode/build/AddressFinder.java 2007-08-04 10:19:57 UTC (rev 3379)
@@ -21,15 +21,7 @@
package org.jnode.build;
-import java.io.BufferedReader;
-import java.io.File;
-import java.io.FileOutputStream;
-import java.io.FileReader;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.io.RandomAccessFile;
-
+import java.io.*;
import org.jnode.build.x86.BootImageBuilder;
/**
Modified: trunk/builder/src/builder/org/jnode/build/BootDiskBuilder.java
===================================================================
--- trunk/builder/src/builder/org/jnode/build/BootDiskBuilder.java 2007-08-04 10:09:43 UTC (rev 3378)
+++ trunk/builder/src/builder/org/jnode/build/BootDiskBuilder.java 2007-08-04 10:19:57 UTC (rev 3379)
@@ -26,7 +26,6 @@
import java.io.IOException;
import java.io.PrintWriter;
import java.util.StringTokenizer;
-
import org.apache.tools.ant.Project;
import org.jnode.driver.ApiNotFoundException;
import org.jnode.driver.Device;
Modified: trunk/builder/src/builder/org/jnode/build/BootFloppyBuilder.java
===================================================================
--- trunk/builder/src/builder/org/jnode/build/BootFloppyBuilder.java 2007-08-04 10:09:43 UTC (rev 3378)
+++ trunk/builder/src/builder/org/jnode/build/BootFloppyBuilder.java 2007-08-04 10:19:57 UTC (rev 3379)
@@ -27,7 +27,6 @@
import java.io.InputStream;
import java.nio.ByteBuffer;
import java.util.ArrayList;
-
import org.apache.tools.ant.DirectoryScanner;
import org.apache.tools.ant.Task;
import org.apache.tools.ant.types.FileSet;
Modified: trunk/builder/src/builder/org/jnode/build/FieldInfo.java
===================================================================
--- trunk/builder/src/builder/org/jnode/build/FieldInfo.java 2007-08-04 10:09:43 UTC (rev 3378)
+++ trunk/builder/src/builder/org/jnode/build/FieldInfo.java 2007-08-04 10:19:57 UTC (rev 3379)
@@ -25,7 +25,6 @@
import java.lang.reflect.Modifier;
import java.util.ArrayList;
import java.util.List;
-
import org.jnode.vm.classmgr.VmField;
import org.jnode.vm.classmgr.VmType;
Modified: trunk/builder/src/builder/org/jnode/build/InitJarBuilder.java
===================================================================
--- trunk/builder/src/builder/org/jnode/build/InitJarBuilder.java 2007-08-04 10:09:43 UTC (rev 3378)
+++ trunk/builder/src/builder/org/jnode/build/InitJarBuilder.java 2007-08-04 10:19:57 UTC (rev 3379)
@@ -24,12 +24,7 @@
import java.io.File;
import java.io.IOException;
import java.net.URL;
-import java.util.ArrayList;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Set;
-
+import java.util.*;
import org.apache.tools.ant.Project;
import org.apache.tools.ant.taskdefs.GZip;
import org.apache.tools.ant.taskdefs.Jar;
Modified: trunk/builder/src/builder/org/jnode/build/InitJarsBuilder.java
===================================================================
--- trunk/builder/src/builder/org/jnode/build/InitJarsBuilder.java 2007-08-04 10:09:43 UTC (rev 3378)
+++ trunk/builder/src/builder/org/jnode/build/InitJarsBuilder.java 2007-08-04 10:19:57 UTC (rev 3379)
@@ -23,7 +23,6 @@
import java.io.File;
import java.util.ArrayList;
-
import org.apache.tools.ant.BuildException;
import org.apache.tools.ant.DirectoryScanner;
import org.apache.tools.ant.Task;
Modified: trunk/builder/src/builder/org/jnode/build/ObjectEmitter.java
===================================================================
--- trunk/builder/src/builder/org/jnode/build/ObjectEmitter.java 2007-08-04 10:09:43 UTC (rev 3378)
+++ trunk/builder/src/builder/org/jnode/build/ObjectEmitter.java 2007-08-04 10:19:57 UTC (rev 3379)
@@ -27,7 +27,6 @@
import java.lang.reflect.Modifier;
import java.util.HashMap;
import java.util.Set;
-
import org.jnode.assembler.BootImageNativeStream;
import org.jnode.assembler.Label;
import org.jnode.assembler.NativeStream;
@@ -35,13 +34,7 @@
import org.jnode.system.BootLog;
import org.jnode.vm.BootableObject;
import org.jnode.vm.VmSystemObject;
-import org.jnode.vm.classmgr.VmArrayClass;
-import org.jnode.vm.classmgr.VmClassLoader;
-import org.jnode.vm.classmgr.VmClassType;
-import org.jnode.vm.classmgr.VmField;
-import org.jnode.vm.classmgr.VmInstanceField;
-import org.jnode.vm.classmgr.VmNormalClass;
-import org.jnode.vm.classmgr.VmType;
+import org.jnode.vm.classmgr.*;
import org.vmmagic.unboxed.UnboxedObject;
public class ObjectEmitter {
Modified: trunk/builder/src/builder/org/jnode/build/PluginList.java
===================================================================
--- trunk/builder/src/builder/org/jnode/build/PluginList.java 2007-08-04 10:09:43 UTC (rev 3378)
+++ trunk/builder/src/builder/org/jnode/build/PluginList.java 2007-08-04 10:19:57 UTC (rev 3379)
@@ -28,14 +28,8 @@
import java.net.MalformedURLException;
import java.net.URL;
import java.net.URLConnection;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Hashtable;
-import java.util.Iterator;
-import java.util.List;
-
+import java.util.*;
import nanoxml.XMLElement;
-
import org.apache.tools.ant.taskdefs.Manifest;
import org.apache.tools.ant.taskdefs.ManifestException;
import org.jnode.plugin.PluginException;
Modified: trunk/builder/src/builder/org/jnode/build/PluginTask.java
===================================================================
--- trunk/builder/src/builder/org/jnode/build/PluginTask.java 2007-08-04 10:09:43 UTC (rev 3378)
+++ trunk/builder/src/builder/org/jnode/build/PluginTask.java 2007-08-04 10:19:57 UTC (rev 3379)
@@ -29,16 +29,13 @@
import java.util.HashMap;
import java.util.LinkedList;
import java.util.Map;
-
import nanoxml.XMLElement;
import nanoxml.XMLParseException;
-
import org.apache.tools.ant.BuildException;
import org.apache.tools.ant.DirectoryScanner;
import org.apache.tools.ant.taskdefs.Jar;
import org.apache.tools.ant.taskdefs.Manifest;
import org.apache.tools.ant.taskdefs.ManifestException;
-import org.apache.tools.ant.taskdefs.Manifest.Attribute;
import org.apache.tools.ant.types.FileSet;
import org.apache.tools.ant.types.ZipFileSet;
import org.apache.tools.ant.util.FileUtils;
Modified: trunk/builder/src/builder/org/jnode/build/VMwareBuilderTask.java
===================================================================
--- trunk/builder/src/builder/org/jnode/build/VMwareBuilderTask.java 2007-08-04 10:09:43 UTC (rev 3378)
+++ trunk/builder/src/builder/org/jnode/build/VMwareBuilderTask.java 2007-08-04 10:19:57 UTC (rev 3379)
@@ -25,7 +25,6 @@
import java.io.FileWriter;
import java.io.IOException;
import java.io.PrintWriter;
-
import org.apache.tools.ant.BuildException;
import org.apache.tools.ant.Task;
Modified: trunk/builder/src/builder/org/jnode/build/dependencies/BCELDependencyChecker.java
===================================================================
--- trunk/builder/src/builder/org/jnode/build/dependencies/BCELDependencyChecker.java 2007-08-04 10:09:43 UTC (rev 3378)
+++ trunk/builder/src/builder/org/jnode/build/dependencies/BCELDependencyChecker.java 2007-08-04 10:19:57 UTC (rev 3379)
@@ -22,39 +22,13 @@
package org.jnode.build.dependencies;
import java.io.File;
-import java.io.FileNotFoundException;
-import java.io.FileOutputStream;
import java.io.IOException;
-import java.io.PrintStream;
-import java.io.PrintWriter;
-import java.util.Arrays;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.Enumeration;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.TreeSet;
+import java.util.*;
import java.util.jar.JarFile;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
import java.util.zip.ZipEntry;
-import java.util.zip.ZipException;
-import java.util.zip.ZipFile;
-
-import org.apache.bcel.classfile.Constant;
-import org.apache.bcel.classfile.ConstantClass;
-import org.apache.bcel.classfile.ConstantNameAndType;
-import org.apache.bcel.classfile.ConstantPool;
-import org.apache.bcel.classfile.EmptyVisitor;
-import org.apache.bcel.classfile.Field;
-import org.apache.bcel.classfile.Method;
-import org.apache.bcel.classfile.JavaClass;
+import org.apache.bcel.classfile.*;
import org.apache.bcel.generic.Type;
import org.apache.bcel.util.ClassPath;
import org.apache.bcel.util.SyntheticRepository;
@@ -62,12 +36,9 @@
import org.apache.tools.ant.DirectoryScanner;
import org.apache.tools.ant.types.FileSet;
import org.jnode.build.AbstractPluginTask;
-import org.jnode.plugin.Extension;
-import org.jnode.plugin.Library;
import org.jnode.plugin.FragmentDescriptor;
import org.jnode.plugin.PluginDescriptor;
import org.jnode.plugin.PluginPrerequisite;
-import org.jnode.plugin.model.PluginDescriptorModel;
/**
* Task used to check dependencies between plugins.
Modified: trunk/builder/src/builder/org/jnode/build/documentation/DotBuilder.java
===================================================================
--- trunk/builder/src/builder/org/jnode/build/documentation/DotBuilder.java 2007-08-04 10:09:43 UTC (rev 3378)
+++ trunk/builder/src/builder/org/jnode/build/documentation/DotBuilder.java 2007-08-04 10:19:57 UTC (rev 3379)
@@ -25,7 +25,6 @@
import java.io.FileWriter;
import java.io.IOException;
import java.io.PrintWriter;
-
import org.jnode.plugin.PluginPrerequisite;
/**
Modified: trunk/builder/src/builder/org/jnode/build/documentation/PluginData.java
===================================================================
--- trunk/builder/src/builder/org/jnode/build/documentation/PluginData.java 2007-08-04 10:09:43 UTC (rev 3378)
+++ trunk/builder/src/builder/org/jnode/build/documentation/PluginData.java 2007-08-04 10:19:57 UTC (rev 3379)
@@ -22,7 +22,6 @@
package org.jnode.build.documentation;
import java.io.File;
-
import org.jnode.plugin.PluginDescriptor;
/**
Modified: trunk/builder/src/builder/org/jnode/build/documentation/PluginDocumentationTask.java
===================================================================
--- trunk/builder/src/builder/org/jnode/build/documentation/PluginDocumentationTask.java 2007-08-04 10:09:43 UTC (rev 3378)
+++ trunk/builder/src/builder/org/jnode/build/documentation/PluginDocumentationTask.java 2007-08-04 10:19:57 UTC (rev 3379)
@@ -25,25 +25,12 @@
import java.io.FileWriter;
import java.io.IOException;
import java.io.PrintWriter;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Date;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Map;
-import java.util.SortedMap;
-import java.util.TreeMap;
-
+import java.util.*;
import org.apache.tools.ant.BuildException;
import org.apache.tools.ant.DirectoryScanner;
import org.apache.tools.ant.types.FileSet;
import org.jnode.build.AbstractPluginTask;
-import org.jnode.plugin.ConfigurationElement;
-import org.jnode.plugin.Extension;
-import org.jnode.plugin.ExtensionPoint;
-import org.jnode.plugin.Library;
-import org.jnode.plugin.PluginDescriptor;
-import org.jnode.plugin.PluginPrerequisite;
+import org.jnode.plugin.*;
/**
* @author Martin Husted Hartvig (ha...@jn...)
Modified: trunk/builder/src/builder/org/jnode/build/x86/BootImageBuilder.java
===================================================================
--- trunk/builder/src/builder/org/jnode/build/x86/BootImageBuilder.java 2007-08-04 10:09:43 UTC (rev 3378)
+++ trunk/builder/src/builder/org/jnode/build/x86/BootImageBuilder.java 2007-08-04 10:19:57 UTC (rev 3379)
@@ -25,12 +25,11 @@
import java.io.IOException;
import java.util.HashMap;
import java.util.Map;
-
import org.apache.tools.ant.Project;
import org.jnode.assembler.Label;
import org.jnode.assembler.NativeStream;
-import org.jnode.assembler.UnresolvedObjectRefException;
import org.jnode.assembler.NativeStream.ObjectInfo;
+import org.jnode.assembler.UnresolvedObjectRefException;
import org.jnode.assembler.x86.X86BinaryAssembler;
import org.jnode.assembler.x86.X86Constants;
import org.jnode.assembler.x86.X86Register;
@@ -44,32 +43,13 @@
import org.jnode.linker.ElfLinker;
import org.jnode.plugin.PluginRegistry;
import org.jnode.util.NumberUtils;
-import org.jnode.vm.SoftByteCodes;
-import org.jnode.vm.Vm;
-import org.jnode.vm.VmArchitecture;
-import org.jnode.vm.VmSystem;
-import org.jnode.vm.VmSystemObject;
-import org.jnode.vm.classmgr.ObjectLayout;
-import org.jnode.vm.classmgr.VmArray;
-import org.jnode.vm.classmgr.VmClassType;
-import org.jnode.vm.classmgr.VmInstanceField;
-import org.jnode.vm.classmgr.VmIsolatedStatics;
-import org.jnode.vm.classmgr.VmMethod;
-import org.jnode.vm.classmgr.VmMethodCode;
-import org.jnode.vm.classmgr.VmSharedStatics;
-import org.jnode.vm.classmgr.VmStaticField;
-import org.jnode.vm.classmgr.VmType;
+import org.jnode.vm.*;
+import org.jnode.vm.classmgr.*;
import org.jnode.vm.scheduler.MonitorManager;
import org.jnode.vm.scheduler.VmProcessor;
import org.jnode.vm.scheduler.VmScheduler;
import org.jnode.vm.scheduler.VmThread;
-import org.jnode.vm.x86.VmX86Architecture;
-import org.jnode.vm.x86.VmX86Architecture32;
-import org.jnode.vm.x86.VmX86Architecture64;
-import org.jnode.vm.x86.VmX86Processor;
-import org.jnode.vm.x86.VmX86Processor32;
-import org.jnode.vm.x86.VmX86Processor64;
-import org.jnode.vm.x86.X86CpuID;
+import org.jnode.vm.x86.*;
import org.jnode.vm.x86.compiler.X86CompilerConstants;
import org.jnode.vm.x86.compiler.X86JumpTable;
Modified: trunk/builder/src/builder/org/jnode/build/x86/Disasm.java
===================================================================
--- trunk/builder/src/builder/org/jnode/build/x86/Disasm.java 2007-08-04 10:09:43 UTC (rev 3378)
+++ trunk/builder/src/builder/org/jnode/build/x86/Disasm.java 2007-08-04 10:19:57 UTC (rev 3379)
@@ -21,11 +21,7 @@
package org.jnode.build.x86;
-import java.io.File;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
+import java.io.*;
/**
* @author Ewout Prangsma (ep...@us...)
Modified: trunk/builder/src/builder/org/jnode/jnasm/JNAsm.java
===================================================================
--- trunk/builder/src/builder/org/jnode/jnasm/JNAsm.java 2007-08-04 10:09:43 UTC (rev 3378)
+++ trunk/builder/src/builder/org/jnode/jnasm/JNAsm.java 2007-08-04 10:19:57 UTC (rev 3379)
@@ -21,13 +21,8 @@
package org.jnode.jnasm;
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
-import java.io.InputStream;
-import java.io.StringReader;
-import java.io.StringWriter;
+import java.io.*;
import java.util.Map;
-
import org.jnode.assembler.NativeStream;
import org.jnode.build.AsmSourceInfo;
import org.jnode.jnasm.assembler.Assembler;
Modified: trunk/builder/src/builder/org/jnode/jnasm/assembler/Assembler.java
===================================================================
--- trunk/builder/src/builder/org/jnode/jnasm/assembler/Assembler.java 2007-08-04 10:09:43 UTC (rev 3378)
+++ trunk/builder/src/builder/org/jnode/jnasm/assembler/Assembler.java 2007-08-04 10:19:57 UTC (rev 3379)
@@ -21,24 +21,15 @@
package org.jnode.jnasm.assembler;
-import org.jnode.assembler.Label;
-import org.jnode.assembler.NativeStream;
-import org.jnode.jnasm.assembler.x86.X86Support;
-
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.io.OutputStream;
-import java.io.RandomAccessFile;
-import java.io.Reader;
-import java.io.StringReader;
-import java.io.StringWriter;
+import java.io.*;
import java.lang.reflect.Constructor;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
+import org.jnode.assembler.Label;
+import org.jnode.assembler.NativeStream;
+import org.jnode.jnasm.assembler.x86.X86Support;
/**
* @author Levente S\u00e1ntha (ls...@us...)
Modified: trunk/builder/src/builder/org/jnode/jnasm/assembler/AssemblerModule.java
===================================================================
--- trunk/builder/src/builder/org/jnode/jnasm/assembler/AssemblerModule.java 2007-08-04 10:09:43 UTC (rev 3378)
+++ trunk/builder/src/builder/org/jnode/jnasm/assembler/AssemblerModule.java 2007-08-04 10:19:57 UTC (rev 3379)
@@ -23,7 +23,6 @@
import java.util.List;
import java.util.Map;
-
import org.jnode.assembler.Label;
import org.jnode.assembler.NativeStream;
Modified: trunk/builder/src/builder/org/jnode/jnasm/assembler/HardwareSupport.java
===================================================================
--- trunk/builder/src/builder/org/jnode/jnasm/assembler/HardwareSupport.java 2007-08-04 10:09:43 UTC (rev 3378)
+++ trunk/builder/src/builder/org/jnode/jnasm/assembler/HardwareSupport.java 2007-08-04 10:19:57 UTC (rev 3379)
@@ -21,11 +21,10 @@
package org.jnode.jnasm.assembler;
+import java.io.IOException;
+import java.io.OutputStream;
import org.jnode.assembler.NativeStream;
-import java.io.OutputStream;
-import java.io.IOException;
-
/**
* @author Levente S\u00e1ntha (ls...@us...)
*/
Modified: trunk/builder/src/builder/org/jnode/jnasm/assembler/PseudoInstructions.java
===================================================================
--- trunk/builder/src/builder/org/jnode/jnasm/assembler/PseudoInstructions.java 2007-08-04 10:09:43 UTC (rev 3378)
+++ trunk/builder/src/builder/org/jnode/jnasm/assembler/PseudoInstructions.java 2007-08-04 10:19:57 UTC (rev 3379)
@@ -21,11 +21,10 @@
package org.jnode.jnasm.assembler;
-import org.jnode.assembler.NativeStream;
-import org.jnode.assembler.Label;
-
import java.util.List;
import java.util.Map;
+import org.jnode.assembler.Label;
+import org.jnode.assembler.NativeStream;
/**
* @author Levente S\u00e1ntha (ls...@us...)
Modified: trunk/builder/src/builder/org/jnode/jnasm/assembler/x86/AbstractX86Module.java
===================================================================
--- trunk/builder/src/builder/org/jnode/jnasm/assembler/x86/AbstractX86Module.java 2007-08-04 10:09:43 UTC (rev 3378)
+++ trunk/builder/src/builder/org/jnode/jnasm/assembler/x86/AbstractX86Module.java 2007-08-04 10:19:57 UTC (rev 3379)
@@ -21,17 +21,16 @@
package org.jnode.jnasm.assembler.x86;
-import org.jnode.jnasm.assembler.AssemblerModule;
-import org.jnode.jnasm.assembler.Register;
-import org.jnode.jnasm.assembler.Address;
+import java.util.List;
+import java.util.Map;
import org.jnode.assembler.Label;
import org.jnode.assembler.NativeStream;
import org.jnode.assembler.x86.X86Assembler;
import org.jnode.assembler.x86.X86Register;
+import org.jnode.jnasm.assembler.Address;
+import org.jnode.jnasm.assembler.AssemblerModule;
+import org.jnode.jnasm.assembler.Register;
-import java.util.Map;
-import java.util.List;
-
/**
* @author Levente S\u00e1ntha (ls...@us...)
*/
Modified: trunk/builder/src/builder/org/jnode/jnasm/assembler/x86/MMX.java
===================================================================
--- trunk/builder/src/builder/org/jnode/jnasm/assembler/x86/MMX.java 2007-08-04 10:09:43 UTC (rev 3378)
+++ trunk/builder/src/builder/org/jnode/jnasm/assembler/x86/MMX.java 2007-08-04 10:19:57 UTC (rev 3379)
@@ -21,15 +21,14 @@
package org.jnode.jnasm.assembler.x86;
-import org.jnode.jnasm.assembler.InstructionUtils;
-import org.jnode.jnasm.assembler.Address;
-import org.jnode.jnasm.assembler.Register;
+import java.util.List;
+import java.util.Map;
import org.jnode.assembler.Label;
import org.jnode.assembler.x86.X86Register;
+import org.jnode.jnasm.assembler.Address;
+import org.jnode.jnasm.assembler.InstructionUtils;
+import org.jnode.jnasm.assembler.Register;
-import java.util.List;
-import java.util.Map;
-
/**
* @author Levente S\u00e1ntha (ls...@us...)
*/
Modified: trunk/builder/src/builder/org/jnode/jnasm/assembler/x86/X86Core.java
===================================================================
--- trunk/builder/src/builder/org/jnode/jnasm/assembler/x86/X86Core.java 2007-08-04 10:09:43 UTC (rev 3378)
+++ trunk/builder/src/builder/org/jnode/jnasm/assembler/x86/X86Core.java 2007-08-04 10:19:57 UTC (rev 3379)
@@ -21,22 +21,21 @@
package org.jnode.jnasm.assembler.x86;
-import org.jnode.jnasm.assembler.Address;
-import org.jnode.jnasm.assembler.InstructionUtils;
-import org.jnode.jnasm.assembler.Register;
-import org.jnode.jnasm.assembler.Identifier;
+import java.util.List;
+import java.util.Map;
+import org.jnode.assembler.Label;
+import org.jnode.assembler.UnresolvedObjectRefException;
import org.jnode.assembler.x86.X86Assembler;
-import org.jnode.assembler.x86.X86Register;
import org.jnode.assembler.x86.X86Constants;
+import org.jnode.assembler.x86.X86Register;
import org.jnode.assembler.x86.X86Register.CRX;
import org.jnode.assembler.x86.X86Register.GPR;
import org.jnode.assembler.x86.X86Register.SR;
-import org.jnode.assembler.Label;
-import org.jnode.assembler.UnresolvedObjectRefException;
+import org.jnode.jnasm.assembler.Address;
+import org.jnode.jnasm.assembler.Identifier;
+import org.jnode.jnasm.assembler.InstructionUtils;
+import org.jnode.jnasm.assembler.Register;
-import java.util.Map;
-import java.util.List;
-
/**
* @author Levente S\u00e1ntha (ls...@us...)
*/
Modified: trunk/builder/src/builder/org/jnode/jnasm/assembler/x86/X86Support.java
===================================================================
--- trunk/builder/src/builder/org/jnode/jnasm/assembler/x86/X86Support.java 2007-08-04 10:09:43 UTC (rev 3378)
+++ trunk/builder/src/builder/org/jnode/jnasm/assembler/x86/X86Support.java 2007-08-04 10:19:57 UTC (rev 3379)
@@ -21,6 +21,11 @@
package org.jnode.jnasm.assembler.x86;
+import java.io.IOException;
+import java.io.OutputStream;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
import org.jnode.assembler.Label;
import org.jnode.assembler.NativeStream;
import org.jnode.assembler.x86.X86Assembler;
@@ -33,12 +38,6 @@
import org.jnode.jnasm.assembler.Instruction;
import org.jnode.vm.x86.X86CpuID;
-import java.io.IOException;
-import java.io.OutputStream;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-
/**
* @author Levente S\u00e1ntha (ls...@us...)
*/
Modified: trunk/builder/src/builder/org/jnode/jnasm/preprocessor/Preprocessor.java
===================================================================
--- trunk/builder/src/builder/org/jnode/jnasm/preprocessor/Preprocessor.java 2007-08-04 10:09:43 UTC (rev 3378)
+++ trunk/builder/src/builder/org/jnode/jnasm/preprocessor/Preprocessor.java 2007-08-04 10:19:57 UTC (rev 3379)
@@ -21,23 +21,12 @@
package org.jnode.jnasm.preprocessor;
-import org.jnode.build.AsmSourceInfo;
-
+import java.io.*;
+import java.lang.reflect.Constructor;
import java.util.HashMap;
import java.util.HashSet;
import java.util.Map;
-import java.io.PrintWriter;
-import java.io.Writer;
-import java.io.InputStream;
-import java.io.OutputStreamWriter;
-import java.io.StringWriter;
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
-import java.io.StringReader;
-import java.io.Reader;
-import java.io.File;
-import java.io.BufferedInputStream;
-import java.lang.reflect.Constructor;
+import org.jnode.build.AsmSourceInfo;
/**
* @author Levente S\u00e1ntha (ls...@us...)
Modified: trunk/builder/src/builder/org/jnode/linker/Elf.java
===================================================================
--- trunk/builder/src/builder/org/jnode/linker/Elf.java 2007-08-04 10:09:43 UTC (rev 3378)
+++ trunk/builder/src/builder/org/jnode/linker/Elf.java 2007-08-04 10:19:57 UTC (rev 3379)
@@ -47,7 +47,6 @@
import java.io.RandomAccessFile;
import java.util.Collection;
import java.util.Vector;
-
import org.jnode.assembler.UnresolvedObjectRefException;
import org.jnode.assembler.x86.X86BinaryAssembler;
import org.jnode.assembler.x86.X86BinaryAssembler.X86ObjectRef;
Modified: trunk/builder/src/builder/org/jnode/linker/ElfLinker.java
===================================================================
--- trunk/builder/src/builder/org/jnode/linker/ElfLinker.java 2007-08-04 10:09:43 UTC (rev 3378)
+++ trunk/builder/src/builder/org/jnode/linker/ElfLinker.java 2007-08-04 10:19:57 UTC (rev 3379)
@@ -22,7 +22,6 @@
package org.jnode.linker;
import java.io.IOException;
-
import org.jnode.assembler.Label;
import org.jnode.assembler.NativeStream;
import org.jnode.assembler.UnresolvedObjectRefException;
Modified: trunk/builder/src/builder/org/jnode/linker/Reloc.java
===================================================================
--- trunk/builder/src/builder/org/jnode/linker/Reloc.java 2007-08-04 10:09:43 UTC (rev 3378)
+++ trunk/builder/src/builder/org/jnode/linker/Reloc.java 2007-08-04 10:19:57 UTC (rev 3379)
@@ -24,7 +24,6 @@
import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
-
import org.jnode.util.NumberUtils;
public class Reloc {
Modified: trunk/builder/src/builder/org/jnode/linker/Section.java
===================================================================
--- trunk/builder/src/builder/org/jnode/linker/Section.java 2007-08-04 10:09:43 UTC (rev 3378)
+++ trunk/builder/src/builder/org/jnode/linker/Section.java 2007-08-04 10:19:57 UTC (rev 3379)
@@ -38,11 +38,7 @@
// } Elf32_Shdr;
//
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.io.OutputStream;
-import java.io.RandomAccessFile;
+import java.io.*;
import java.util.Vector;
public class Section {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|