Menu
▾
▴
jnode-svn-commits
|
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/build...
[truncated message content] |
|
From: <fd...@us...> - 2008-04-20 22:23:18
|
Revision: 3989
http://jnode.svn.sourceforge.net/jnode/?rev=3989&view=rev
Author: fduminy
Date: 2008-04-20 15:23:15 -0700 (Sun, 20 Apr 2008)
Log Message:
-----------
vbe/vesa driver : added property to specify/disable the video setup by grub
Modified Paths:
--------------
trunk/builder/src/builder/org/jnode/ant/taskdefs/Asm.java
trunk/builder/src/builder/org/jnode/build/x86/BootImageBuilder.java
Modified: trunk/builder/src/builder/org/jnode/ant/taskdefs/Asm.java
===================================================================
--- trunk/builder/src/builder/org/jnode/ant/taskdefs/Asm.java 2008-04-20 22:21:31 UTC (rev 3988)
+++ trunk/builder/src/builder/org/jnode/ant/taskdefs/Asm.java 2008-04-20 22:23:15 UTC (rev 3989)
@@ -95,6 +95,8 @@
private String version;
+ private boolean setVbe;
+
/**
* Add an includedir
*
@@ -103,6 +105,12 @@
public void addConfiguredIncludeDir(IncludeDir dir) {
includeDirs.add(dir);
}
+
+ public void setVbeMode(String vbeMode)
+ {
+ System.err.println("setVbeMode");
+ this.setVbe = (vbeMode != null) && (vbeMode.trim().length() > 0);
+ }
/**
* Description of the Method
@@ -128,7 +136,7 @@
}
cmdLine.add("-o");
- cmdLine.add(dstFile.toString());
+ cmdLine.add(dstFile.toString());
if (bits == 64) {
cmdLine.add("-m");
@@ -138,6 +146,13 @@
cmdLine.add("nasm");
}
+ if(setVbe)
+ {
+ System.err.println("setVbeMode : add property");
+ cmdLine.add("-D");
+ cmdLine.add("SETUP_VBE");
+ }
+
cmdLine.add("-D");
cmdLine.add("BITS" + bits);
Modified: trunk/builder/src/builder/org/jnode/build/x86/BootImageBuilder.java
===================================================================
--- trunk/builder/src/builder/org/jnode/build/x86/BootImageBuilder.java 2008-04-20 22:21:31 UTC (rev 3988)
+++ trunk/builder/src/builder/org/jnode/build/x86/BootImageBuilder.java 2008-04-20 22:23:15 UTC (rev 3989)
@@ -25,6 +25,8 @@
import java.io.IOException;
import java.util.HashMap;
import java.util.Map;
+import java.util.StringTokenizer;
+
import org.apache.tools.ant.Project;
import org.jnode.assembler.Label;
import org.jnode.assembler.NativeStream;
@@ -74,6 +76,11 @@
private VmSharedStatics sharedStatics;
private int bits = 32;
+
+ private boolean useVbe = false;
+ private int vbeWidth = 0;
+ private int vbeHeight = 0;
+ private int vbeDepth = 0;
/**
* The offset in our (java) image file to the initial jump to our
@@ -598,6 +605,11 @@
private static final int MB_BSS_END_ADDR = 6 * 4;
+ private static final int MODE_TYPE = 8 * 4;
+ private static final int WIDTH = 9 * 4;
+ private static final int HEIGHT = 10 * 4;
+ private static final int DEPTH = 11 * 4;
+
/**
* Patch any fields in the header, just before the image is written to disk.
*
@@ -628,6 +640,12 @@
+ os.getLength());
os.set32(mb_hdr + MB_BSS_END_ADDR, (int) os.getBaseAddr()
+ os.getLength());
+
+ // initial wanted video mode (if possible)
+ os.set32(mb_hdr + MODE_TYPE, 0);
+ os.set32(mb_hdr + WIDTH, vbeWidth);
+ os.set32(mb_hdr + HEIGHT, vbeHeight);
+ os.set32(mb_hdr + DEPTH, vbeDepth);
}
/**
@@ -702,6 +720,46 @@
}
this.bits = bits;
}
+
+ public final void setVbeMode(String videoMode)
+ {
+ System.out.println("videoMode="+videoMode);
+ if((videoMode == null) || (videoMode.trim().length() == 0))
+ {
+ useVbe = false;
+ vbeWidth = 0;
+ vbeHeight = 0;
+ vbeDepth = 0;
+ }
+ else
+ {
+ StringTokenizer stok = new StringTokenizer(videoMode.trim().toLowerCase(), "x", false);
+ if(stok.countTokens() != 3)
+ {
+ throw new IllegalArgumentException("linearFrameBuffer must be of the form '<width>x<height>x<depth>'");
+ }
+
+ vbeWidth = Integer.parseInt(stok.nextToken());
+ if(vbeWidth <= 0)
+ {
+ throw new IllegalArgumentException("vbeWidth must be > 0");
+ }
+
+ vbeHeight = Integer.parseInt(stok.nextToken());
+ if(vbeWidth <= 0)
+ {
+ throw new IllegalArgumentException("vbeHeight must be > 0");
+ }
+
+ vbeDepth = Integer.parseInt(stok.nextToken());
+ if(vbeWidth <= 0)
+ {
+ throw new IllegalArgumentException("vbeDepth must be > 0");
+ }
+
+ useVbe = true;
+ }
+ }
/**
* Initialize the statics table.
@@ -730,6 +788,13 @@
final Map<String,String> symbols = new HashMap<String, String>();
symbols.put(bits,"");
symbols.put("JNODE_VERSION", "'" + version + "'");
+
+ if(useVbe)
+ {
+ symbols.put("SETUP_VBE", "");
+ log("Grub will setup linear framebuffer mode "+vbeWidth+"x"+vbeHeight+"x"+vbeDepth);
+ }
+
log("Compiling native kernel with JNAsm, Version " + version + ", " + i_bist + " bits");
JNAsm.assembler(os, sourceInfo, symbols);
} catch(Exception e){
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ls...@us...> - 2008-05-29 18:53:09
|
Revision: 4145
http://jnode.svn.sourceforge.net/jnode/?rev=4145&view=rev
Author: lsantha
Date: 2008-05-29 11:53:07 -0700 (Thu, 29 May 2008)
Log Message:
-----------
Checkstyle fixes.
Modified Paths:
--------------
trunk/builder/src/builder/org/jnode/ant/taskdefs/AnnotateTask.java
trunk/builder/src/builder/org/jnode/ant/taskdefs/Asm.java
trunk/builder/src/builder/org/jnode/ant/taskdefs/FileSetTask.java
trunk/builder/src/builder/org/jnode/ant/taskdefs/HeaderTask.java
trunk/builder/src/builder/org/jnode/ant/taskdefs/Hotswap.java
trunk/builder/src/builder/org/jnode/ant/taskdefs/Native2AsciiTask.java
trunk/builder/src/builder/org/jnode/ant/taskdefs/NativeCheckTask.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/ant/taskdefs/classpath/Flags.java
trunk/builder/src/builder/org/jnode/ant/taskdefs/classpath/PackageDirectory.java
trunk/builder/src/builder/org/jnode/ant/taskdefs/classpath/SourceFile.java
trunk/builder/src/builder/org/jnode/ant/taskdefs/classpath/TargetedFileSet.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/AsmSourceInfo.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/BuildException.java
trunk/builder/src/builder/org/jnode/build/BuildObjectResolver.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/JNodeClassNotFoundException.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/LicenseEntry.java
trunk/builder/src/builder/org/jnode/build/documentation/PackageData.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/documentation/ToolbarEntry.java
trunk/builder/src/builder/org/jnode/build/natives/NativeStubGenerator.java
trunk/builder/src/builder/org/jnode/build/package.html
trunk/builder/src/builder/org/jnode/build/x86/AsmConstBuilder.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/build/x86/package.html
trunk/builder/src/builder/org/jnode/jnasm/JNAsm.java
trunk/builder/src/builder/org/jnode/jnasm/assembler/Address.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/Identifier.java
trunk/builder/src/builder/org/jnode/jnasm/assembler/Instruction.java
trunk/builder/src/builder/org/jnode/jnasm/assembler/InstructionUtils.java
trunk/builder/src/builder/org/jnode/jnasm/assembler/PseudoInstructions.java
trunk/builder/src/builder/org/jnode/jnasm/assembler/Register.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/FileResolver.java
trunk/builder/src/builder/org/jnode/jnasm/preprocessor/Macro.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/LoadUtil.java
trunk/builder/src/builder/org/jnode/linker/Reloc.java
trunk/builder/src/builder/org/jnode/linker/Reloca.java
trunk/builder/src/builder/org/jnode/linker/Section.java
trunk/builder/src/builder/org/jnode/linker/StoreUtil.java
trunk/builder/src/builder/org/jnode/linker/StrTab.java
trunk/builder/src/builder/org/jnode/linker/Symbol.java
Modified: trunk/builder/src/builder/org/jnode/ant/taskdefs/AnnotateTask.java
===================================================================
--- trunk/builder/src/builder/org/jnode/ant/taskdefs/AnnotateTask.java 2008-05-29 18:52:00 UTC (rev 4144)
+++ trunk/builder/src/builder/org/jnode/ant/taskdefs/AnnotateTask.java 2008-05-29 18:53:07 UTC (rev 4145)
@@ -18,7 +18,7 @@
* along with this library; If not, write to the Free Software Foundation, Inc.,
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
-
+
package org.jnode.ant.taskdefs;
import java.io.File;
@@ -31,11 +31,8 @@
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
-import java.util.HashMap;
import java.util.List;
-import java.util.Map;
import java.util.Properties;
-
import org.apache.tools.ant.BuildException;
import org.jnode.vm.annotation.MagicPermission;
import org.jnode.vm.annotation.SharedStatics;
@@ -53,377 +50,337 @@
/**
* That ant task will add some annotations to some compiled classes
* mentioned in a property file.
- * For now, it's only necessary to add annotations to some
+ * For now, it's only necessary to add annotations to some
* openjdk classes to avoid modifying the original source code.
- *
- * @author Fabien DUMINY (fduminy at jnode dot org)
*
+ * @author Fabien DUMINY (fduminy at jnode dot org)
*/
public class AnnotateTask extends FileSetTask {
- private static final String SHAREDSTATICS_TYPE_DESC = Type.getDescriptor(SharedStatics.class);
- private static final String MAGICPERMISSION_TYPE_DESC = Type.getDescriptor(MagicPermission.class);
+ private static final String SHAREDSTATICS_TYPE_DESC = Type.getDescriptor(SharedStatics.class);
+ private static final String MAGICPERMISSION_TYPE_DESC = Type.getDescriptor(MagicPermission.class);
- private File annotationFile;
- private String[] classesFiles;
-
- private String buildStartTime = "";
- private String pattern = "";
- private long startTime = 0;
-
- private Properties annotations = new Properties();
+ private File annotationFile;
+ private String[] classesFiles;
- protected void doExecute() throws BuildException {
- try {
- SimpleDateFormat format = new SimpleDateFormat(pattern);
- startTime = format.parse(buildStartTime).getTime();
- } catch (Exception e) {
- throw new BuildException("invalid buildStartTime or pattern", e);
- }
-
- if(readProperties())
- {
- processFiles();
- }
- }
+ private String buildStartTime = "";
+ private String pattern = "";
+ private long startTime = 0;
- /**
- * Defines the annotation property file where are specified annotations to add
- * @param annotationFile
- */
- public final void setAnnotationFile(File annotationFile) {
- this.annotationFile = annotationFile;
- }
-
- /**
- * Define the time at which build started
- * @param annotationFile
- */
- public final void setBuildStartTime(String buildStartTime) {
- this.buildStartTime = buildStartTime;
- }
+ private Properties annotations = new Properties();
- /**
- * Define the pattern with which buildStartTime is defined
- * @param annotationFile
- */
- public final void setPattern(String pattern) {
- this.pattern = pattern;
- }
+ protected void doExecute() throws BuildException {
+ try {
+ SimpleDateFormat format = new SimpleDateFormat(pattern);
+ startTime = format.parse(buildStartTime).getTime();
+ } catch (Exception e) {
+ throw new BuildException("invalid buildStartTime or pattern", e);
+ }
- /**
- * Read the properties file. For now, it simply contains a list of
- * classes that need the SharedStatics annotation.
- *
- * @return
- * @throws BuildException
- */
- private boolean readProperties() throws BuildException
- {
- readProperties("annotationFile", annotationFile, annotations);
- if(annotations.isEmpty())
- {
- System.err.println("WARNING: annotationFile is empty (or doesn't exist)");
- return false;
- }
+ if (readProperties()) {
+ processFiles();
+ }
+ }
- classesFiles = (String[]) annotations.keySet().toArray(new String[annotations.size()]);
+ /**
+ * Defines the annotation property file where are specified annotations to add
+ *
+ * @param annotationFile
+ */
+ public final void setAnnotationFile(File annotationFile) {
+ this.annotationFile = annotationFile;
+ }
- // we must sort the classes in reverse order so that
- // classes with longest package name will be used first
- // (that is only necessary for classes whose name is the same
- // but package is different ; typical such class name : "Constants")
- Arrays.sort(classesFiles, Collections.reverseOrder());
+ /**
+ * Define the time at which build started
+ *
+ * @param annotationFile
+ */
+ public final void setBuildStartTime(String buildStartTime) {
+ this.buildStartTime = buildStartTime;
+ }
- return true;
- }
-
- /**
- * Generic method that read properties from a given file.
- *
- * @param name
- * @param file
- * @param properties
- * @throws BuildException
- */
- private void readProperties(String name, File file, Properties properties) throws BuildException
- {
- if(file == null)
- {
- throw new BuildException(name + " is mandatory");
- }
-
- if(!file.exists())
- {
- return;
- }
+ /**
+ * Define the pattern with which buildStartTime is defined
+ *
+ * @param annotationFile
+ */
+ public final void setPattern(String pattern) {
+ this.pattern = pattern;
+ }
- FileInputStream fis = null;
- try
- {
- fis = new FileInputStream(file);
- properties.load(fis);
- } catch (IOException e) {
- throw new BuildException(e);
- }
- finally
- {
- if(fis != null)
- {
- try {
- fis.close();
- } catch (IOException e) {
- throw new BuildException(e);
- }
- }
- }
- }
+ /**
+ * Read the properties file. For now, it simply contains a list of
+ * classes that need the SharedStatics annotation.
+ *
+ * @return
+ * @throws BuildException
+ */
+ private boolean readProperties() throws BuildException {
+ readProperties("annotationFile", annotationFile, annotations);
+ if (annotations.isEmpty()) {
+ System.err.println("WARNING: annotationFile is empty (or doesn't exist)");
+ return false;
+ }
- /**
- * Get the list of annotations for the given class file.
- *
- * @param classFile list of annotations with ',' as separator. null if no annotation for that class.
- * @return
- */
- private String getAnnotations(File classFile)
- {
- String annotations = null;
- String classFilePath = classFile.getAbsolutePath();
- for(String f : classesFiles)
- {
- if(classFilePath.endsWith(f))
- {
- annotations = this.annotations.getProperty(f);
- break;
- }
- }
+ classesFiles = (String[]) annotations.keySet().toArray(new String[annotations.size()]);
- return annotations;
- }
+ // we must sort the classes in reverse order so that
+ // classes with longest package name will be used first
+ // (that is only necessary for classes whose name is the same
+ // but package is different ; typical such class name : "Constants")
+ Arrays.sort(classesFiles, Collections.reverseOrder());
- /**
- * Actually process a class file (called from parent class)
- */
- @Override
- protected void processFile(File classFile) throws IOException {
- String annotations = getAnnotations(classFile);
- if(annotations == null)
- {
- return;
- }
-
- if(classFile.lastModified() < startTime)
- {
- System.out.println("Skipping already annotated file "+classFile.getName());
- return;
- }
-
- File tmpFile = new File(classFile.getParentFile(), classFile.getName()+".tmp");
- FileInputStream fis = null;
- boolean classIsModified = false;
+ return true;
+ }
- try
- {
- fis = new FileInputStream(classFile);
- classIsModified = addAnnotation(classFile, fis, tmpFile, annotations);
- }
- finally
- {
- if(fis != null)
- {
- fis.close();
- }
- }
+ /**
+ * Generic method that read properties from a given file.
+ *
+ * @param name
+ * @param file
+ * @param properties
+ * @throws BuildException
+ */
+ private void readProperties(String name, File file, Properties properties) throws BuildException {
+ if (file == null) {
+ throw new BuildException(name + " is mandatory");
+ }
- if(classIsModified)
- {
- if(trace)
- {
- traceClass(classFile, "before");
+ if (!file.exists()) {
+ return;
+ }
- traceClass(tmpFile, "after");
- }
+ FileInputStream fis = null;
+ try {
+ fis = new FileInputStream(file);
+ properties.load(fis);
+ } catch (IOException e) {
+ throw new BuildException(e);
+ } finally {
+ if (fis != null) {
+ try {
+ fis.close();
+ } catch (IOException e) {
+ throw new BuildException(e);
+ }
+ }
+ }
+ }
- if(!classFile.delete())
- {
- throw new IOException("can't delete "+classFile.getAbsolutePath());
- }
+ /**
+ * Get the list of annotations for the given class file.
+ *
+ * @param classFile list of annotations with ',' as separator. null if no annotation for that class.
+ * @return
+ */
+ private String getAnnotations(File classFile) {
+ String annotations = null;
+ String classFilePath = classFile.getAbsolutePath();
+ for (String f : classesFiles) {
+ if (classFilePath.endsWith(f)) {
+ annotations = this.annotations.getProperty(f);
+ break;
+ }
+ }
- if(!tmpFile.renameTo(classFile))
- {
- throw new IOException("can't rename "+tmpFile.getAbsolutePath());
- }
- }
- }
+ return annotations;
+ }
- /**
- * Simple debug method that trace a class file.
- * It can be used to visually check that the annotations has been
- * properly added
- *
- * @param file
- * @throws IOException
- */
- private void traceClass(File file, String message) throws IOException
- {
- System.out.println("===== ("+message+") trace for "+file.getAbsolutePath()+" =====");
- FileInputStream fis = null;
- try
- {
- fis = new FileInputStream(file);
+ /**
+ * Actually process a class file (called from parent class)
+ */
+ @Override
+ protected void processFile(File classFile) throws IOException {
+ String annotations = getAnnotations(classFile);
+ if (annotations == null) {
+ return;
+ }
- ClassReader cr = new ClassReader(fis);
- TraceClassVisitor tcv = new TraceClassVisitor(null, new PrintWriter(System.out));
- cr.accept(tcv, Attributes.getDefaultAttributes(), true);
- }
- finally
- {
- if(fis != null)
- {
- fis.close();
- }
- }
- System.out.println("----- end trace -----");
- }
+ if (classFile.lastModified() < startTime) {
+ System.out.println("Skipping already annotated file " + classFile.getName());
+ return;
+ }
- /**
- * Add an annotation to a class file
- *
- * @param classFile
- * @param inputClass
- * @param tmpFile
- * @param annotations
- * @return
- * @throws BuildException
- */
- private boolean addAnnotation(File classFile, InputStream inputClass, File tmpFile, String annotations) throws BuildException {
- boolean classIsModified = false;
- FileOutputStream outputClass = null;
+ File tmpFile = new File(classFile.getParentFile(), classFile.getName() + ".tmp");
+ FileInputStream fis = null;
+ boolean classIsModified = false;
- ClassWriter cw = new ClassWriter(false);
- try {
- ClassReader cr = new ClassReader(inputClass);
+ try {
+ fis = new FileInputStream(classFile);
+ classIsModified = addAnnotation(classFile, fis, tmpFile, annotations);
+ } finally {
+ if (fis != null) {
+ fis.close();
+ }
+ }
- List<String> annotationTypeDescs = new ArrayList<String>(2);
- if(annotations.contains("SharedStatics"))
- {
- annotationTypeDescs.add(SHAREDSTATICS_TYPE_DESC);
- }
- if(annotations.contains("MagicPermission"))
- {
- annotationTypeDescs.add(MAGICPERMISSION_TYPE_DESC);
- }
+ if (classIsModified) {
+ if (trace) {
+ traceClass(classFile, "before");
- MarkerClassVisitor mcv = new MarkerClassVisitor(cw, annotationTypeDescs);
- cr.accept(mcv, Attributes.getDefaultAttributes(), true);
+ traceClass(tmpFile, "after");
+ }
- if(mcv.classIsModified())
- {
- System.out.println("adding annotations "+annotations+" to file "+classFile.getName());
- classIsModified = true;
+ if (!classFile.delete()) {
+ throw new IOException("can't delete " + classFile.getAbsolutePath());
+ }
- outputClass = new FileOutputStream(tmpFile);
+ if (!tmpFile.renameTo(classFile)) {
+ throw new IOException("can't rename " + tmpFile.getAbsolutePath());
+ }
+ }
+ }
- byte[] b = cw.toByteArray();
- outputClass.write(b);
- }
- } catch (Exception ex) {
- ex.printStackTrace();
- throw new BuildException("Unable to add annotations to file "+classFile.getName(), ex);
- }
- finally
- {
- if(outputClass != null)
- {
- try {
- outputClass.close();
- } catch (IOException e) {
- System.err.println("Can't close stream for file "+classFile.getName());
- }
-
- long timestamp = classFile.lastModified();
- tmpFile.setLastModified(timestamp);
- }
- }
+ /**
+ * Simple debug method that trace a class file.
+ * It can be used to visually check that the annotations has been
+ * properly added
+ *
+ * @param file
+ * @throws IOException
+ */
+ private void traceClass(File file, String message) throws IOException {
+ System.out.println("===== (" + message + ") trace for " + file.getAbsolutePath() + " =====");
+ FileInputStream fis = null;
+ try {
+ fis = new FileInputStream(file);
- return classIsModified;
- }
+ ClassReader cr = new ClassReader(fis);
+ TraceClassVisitor tcv = new TraceClassVisitor(null, new PrintWriter(System.out));
+ cr.accept(tcv, Attributes.getDefaultAttributes(), true);
+ } finally {
+ if (fis != null) {
+ fis.close();
+ }
+ }
+ System.out.println("----- end trace -----");
+ }
- /**
- * Visitor for a class file that actually do the job of adding annotations in the class.
- *
- * @author fabien
- *
- */
- private static class MarkerClassVisitor extends ClassAdapter {
- final private List<String> annotationTypeDescs;
+ /**
+ * Add an annotation to a class file
+ *
+ * @param classFile
+ * @param inputClass
+ * @param tmpFile
+ * @param annotations
+ * @return
+ * @throws BuildException
+ */
+ private boolean addAnnotation(File classFile, InputStream inputClass, File tmpFile, String annotations)
+ throws BuildException {
+ boolean classIsModified = false;
+ FileOutputStream outputClass = null;
- private boolean classIsModified = false;
+ ClassWriter cw = new ClassWriter(false);
+ try {
+ ClassReader cr = new ClassReader(inputClass);
- public MarkerClassVisitor(ClassVisitor cv, List<String> annotationTypeDescs) {
- super(cv);
+ List<String> annotationTypeDescs = new ArrayList<String>(2);
+ if (annotations.contains("SharedStatics")) {
+ annotationTypeDescs.add(SHAREDSTATICS_TYPE_DESC);
+ }
+ if (annotations.contains("MagicPermission")) {
+ annotationTypeDescs.add(MAGICPERMISSION_TYPE_DESC);
+ }
- this.annotationTypeDescs = annotationTypeDescs;
- }
+ MarkerClassVisitor mcv = new MarkerClassVisitor(cw, annotationTypeDescs);
+ cr.accept(mcv, Attributes.getDefaultAttributes(), true);
- @Override
- public void visit(int version, int access, String name,
- String superName, String[] interfaces, String sourceFile) {
- super.visit(org.objectweb.asm.Constants.V1_5, access,
- name, superName, interfaces, sourceFile);
- }
+ if (mcv.classIsModified()) {
+ System.out.println("adding annotations " + annotations + " to file " + classFile.getName());
+ classIsModified = true;
- @Override
- public void visitAttribute(Attribute attr) {
- if(attr instanceof RuntimeVisibleAnnotations)
- {
- RuntimeVisibleAnnotations rva = (RuntimeVisibleAnnotations) attr;
- for(Object annotation : rva.annotations)
- {
- if(annotation instanceof Annotation)
- {
- Annotation ann = (Annotation) annotation;
- for(String annTypeDesc : annotationTypeDescs)
- {
- if(ann.type.equals(annTypeDesc))
- {
- // we have found one of the annotations -> we won't need to add it again !
- annotationTypeDescs.remove(annTypeDesc);
- break;
- }
- }
- }
- }
- }
+ outputClass = new FileOutputStream(tmpFile);
- super.visitAttribute(attr);
- }
+ byte[] b = cw.toByteArray();
+ outputClass.write(b);
+ }
+ } catch (Exception ex) {
+ ex.printStackTrace();
+ throw new BuildException("Unable to add annotations to file " + classFile.getName(), ex);
+ } finally {
+ if (outputClass != null) {
+ try {
+ outputClass.close();
+ } catch (IOException e) {
+ System.err.println("Can't close stream for file " + classFile.getName());
+ }
- @SuppressWarnings("unchecked")
- public void visitEnd() {
- if(!annotationTypeDescs.isEmpty())
- {
- // we have not found the annotation -> we will add it and so modify the class
- classIsModified = true;
- RuntimeVisibleAnnotations attr = new RuntimeVisibleAnnotations();
+ long timestamp = classFile.lastModified();
+ tmpFile.setLastModified(timestamp);
+ }
+ }
- for(String annTypeDesc : annotationTypeDescs)
- {
+ return classIsModified;
+ }
- Annotation ann = new Annotation(annTypeDesc);
- ann.add("name", "");
+ /**
+ * Visitor for a class file that actually do the job of adding annotations in the class.
+ *
+ * @author fabien
+ */
+ private static class MarkerClassVisitor extends ClassAdapter {
+ final private List<String> annotationTypeDescs;
- attr.annotations.add(ann);
- }
+ private boolean classIsModified = false;
- cv.visitAttribute(attr);
- }
+ public MarkerClassVisitor(ClassVisitor cv, List<String> annotationTypeDescs) {
+ super(cv);
- super.visitEnd();
- }
+ this.annotationTypeDescs = annotationTypeDescs;
+ }
- public boolean classIsModified()
- {
- return classIsModified;
- }
- }
+ @Override
+ public void visit(int version, int access, String name,
+ String superName, String[] interfaces, String sourceFile) {
+ super.visit(org.objectweb.asm.Constants.V1_5, access,
+ name, superName, interfaces, sourceFile);
+ }
+
+ @Override
+ public void visitAttribute(Attribute attr) {
+ if (attr instanceof RuntimeVisibleAnnotations) {
+ RuntimeVisibleAnnotations rva = (RuntimeVisibleAnnotations) attr;
+ for (Object annotation : rva.annotations) {
+ if (annotation instanceof Annotation) {
+ Annotation ann = (Annotation) annotation;
+ for (String annTypeDesc : annotationTypeDescs) {
+ if (ann.type.equals(annTypeDesc)) {
+ // we have found one of the annotations -> we won't need to add it again !
+ annotationTypeDescs.remove(annTypeDesc);
+ break;
+ }
+ }
+ }
+ }
+ }
+
+ super.visitAttribute(attr);
+ }
+
+ @SuppressWarnings("unchecked")
+ public void visitEnd() {
+ if (!annotationTypeDescs.isEmpty()) {
+ // we have not found the annotation -> we will add it and so modify the class
+ classIsModified = true;
+ RuntimeVisibleAnnotations attr = new RuntimeVisibleAnnotations();
+
+ for (String annTypeDesc : annotationTypeDescs) {
+
+ Annotation ann = new Annotation(annTypeDesc);
+ ann.add("name", "");
+
+ attr.annotations.add(ann);
+ }
+
+ cv.visitAttribute(attr);
+ }
+
+ super.visitEnd();
+ }
+
+ public boolean classIsModified() {
+ return classIsModified;
+ }
+ }
}
Modified: trunk/builder/src/builder/org/jnode/ant/taskdefs/Asm.java
===================================================================
--- trunk/builder/src/builder/org/jnode/ant/taskdefs/Asm.java 2008-05-29 18:52:00 UTC (rev 4144)
+++ trunk/builder/src/builder/org/jnode/ant/taskdefs/Asm.java 2008-05-29 18:53:07 UTC (rev 4145)
@@ -18,12 +18,16 @@
* along with this library; If not, write to the Free Software Foundation, Inc.,
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
-
+
package org.jnode.ant.taskdefs;
import java.io.File;
import java.io.IOException;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Map;
+import java.util.Set;
import org.apache.tools.ant.BuildException;
import org.apache.tools.ant.DirectoryScanner;
import org.apache.tools.ant.Project;
@@ -33,7 +37,7 @@
/**
* Description of the Class
- *
+ *
* @author epr
* @version $Revision$
*/
@@ -51,7 +55,7 @@
/**
* Returns the dir.
- *
+ *
* @return File
*/
public File getDir() {
@@ -60,9 +64,8 @@
/**
* Sets the dir.
- *
- * @param dir
- * The dir to set
+ *
+ * @param dir The dir to set
*/
public void setDir(File dir) {
this.dir = dir;
@@ -92,38 +95,35 @@
private File srcdir;
private boolean enableJNasm;
-
+
private String version;
-
+
private boolean setVbe;
-
+
/**
* Add an includedir
- *
+ *
* @param dir
*/
public void addConfiguredIncludeDir(IncludeDir dir) {
includeDirs.add(dir);
}
-
- public void setVbeMode(String vbeMode)
- {
- System.err.println("setVbeMode");
- this.setVbe = (vbeMode != null) && (vbeMode.trim().length() > 0);
+
+ public void setVbeMode(String vbeMode) {
+ System.err.println("setVbeMode");
+ this.setVbe = (vbeMode != null) && (vbeMode.trim().length() > 0);
}
/**
* Description of the Method
- *
+ *
* @param srcFile
* @param dstFile
- * @throws BuildException
- * Description of Exception
- * @throws IOException
- * Description of the Exception
+ * @throws BuildException Description of Exception
+ * @throws IOException Description of the Exception
*/
private void doNasm(File srcFile, File dstFile) throws BuildException,
- IOException {
+ IOException {
Execute exec = new Execute();
ArrayList<String> cmdLine = new ArrayList<String>();
@@ -136,26 +136,25 @@
}
cmdLine.add("-o");
- cmdLine.add(dstFile.toString());
+ cmdLine.add(dstFile.toString());
if (bits == 64) {
- cmdLine.add("-m");
- cmdLine.add("amd64");
+ cmdLine.add("-m");
+ cmdLine.add("amd64");
// Set preprocessor
cmdLine.add("-r");
cmdLine.add("nasm");
}
-
- if(setVbe)
- {
- System.err.println("setVbeMode : add property");
- cmdLine.add("-D");
- cmdLine.add("SETUP_VBE");
+
+ if (setVbe) {
+ System.err.println("setVbeMode : add property");
+ cmdLine.add("-D");
+ cmdLine.add("SETUP_VBE");
}
-
- cmdLine.add("-D");
- cmdLine.add("BITS" + bits);
-
+
+ cmdLine.add("-D");
+ cmdLine.add("BITS" + bits);
+
if (version != null) {
cmdLine.add("-D");
cmdLine.add("JNODE_VERSION='" + versio...
[truncated message content] |
Thanks for helping keep SourceForge clean.
X