merge of 'db5a04b2f4ebd4869d162a3bfa48221dec583b7e'

and 'e82c7db57396b2f2057f46c000a688200c4d12ea'

core/java/src/freenet/support/CPUInformation/AMDCPUInfo.java

@@ -1,19 +1,19 @@
 /*
  * Created on Jul 17, 2004
  *
- */
-package freenet.support.CPUInformation;
-
-/**
- * @author Iakin
- * An interface for classes that provide lowlevel information about AMD CPU's
- *
  * free (adj.): unencumbered; not under the control of others
  * Written by Iakin in 2004 and released into the public domain 
  * with no warranty of any kind, either expressed or implied.  
  * It probably won't make your computer catch on fire, or eat 
  * your children, but it might. Use at your own risk.
  */
+package freenet.support.CPUInformation;
+
+/**
+ * An interface for classes that provide lowlevel information about AMD CPU's
+ *
+ * @author Iakin
+ */
 public interface AMDCPUInfo extends CPUInfo {
     /**
      * @return true if the CPU present in the machine is at least an 'k6' CPU

core/java/src/freenet/support/CPUInformation/CPUID.java

@@ -1,6 +1,12 @@
 /*
  * Created on Jul 14, 2004
  * Updated on Jan 8, 2011
+ *
+ * free (adj.): unencumbered; not under the control of others
+ * Written by Iakin in 2004 and released into the public domain
+ * with no warranty of any kind, either expressed or implied.
+ * It probably won't make your computer catch on fire, or eat
+ * your children, but it might. Use at your own risk.
  */
 package freenet.support.CPUInformation;
 
@@ -17,16 +23,11 @@ import net.i2p.util.FileUtil;
 
 
 /**
- * @author Iakin
  * A class for retrieveing details about the CPU using the CPUID assembly instruction.
  * A good resource for information about the CPUID instruction can be found here:
  * http://www.paradicesoftware.com/specs/cpuid/index.htm
  *
- * free (adj.): unencumbered; not under the control of others
- * Written by Iakin in 2004 and released into the public domain
- * with no warranty of any kind, either expressed or implied.
- * It probably won't make your computer catch on fire, or eat
- * your children, but it might. Use at your own risk.
+ * @author Iakin
 */
 
 public class CPUID {

core/java/src/freenet/support/CPUInformation/CPUInfo.java

@@ -1,12 +1,6 @@
 /*
  * Created on Jul 14, 2004
  * Updated on Jan 8, 2011
- */
-package freenet.support.CPUInformation;
-
-/**
- * @author Iakin
- * An interface for classes that provide lowlevel information about CPU's
  *
  * free (adj.): unencumbered; not under the control of others
  * Written by Iakin in 2004 and released into the public domain 
@@ -14,6 +8,13 @@ package freenet.support.CPUInformation;
  * It probably won't make your computer catch on fire, or eat 
  * your children, but it might. Use at your own risk.
  */
+package freenet.support.CPUInformation;
+
+/**
+ * An interface for classes that provide lowlevel information about CPU's
+ *
+ * @author Iakin
+ */
 
 public interface CPUInfo
 {

core/java/src/freenet/support/CPUInformation/IntelCPUInfo.java

@@ -1,19 +1,19 @@
 /*
  * Created on Jul 17, 2004
  *
- */
-package freenet.support.CPUInformation;
-
-/**
- * @author Iakin
- * An interface for classes that provide lowlevel information about Intel CPU's
- *
  * free (adj.): unencumbered; not under the control of others
  * Written by Iakin in 2004 and released into the public domain 
  * with no warranty of any kind, either expressed or implied.  
  * It probably won't make your computer catch on fire, or eat 
  * your children, but it might. Use at your own risk.
  */
+package freenet.support.CPUInformation;
+
+/**
+ * An interface for classes that provide lowlevel information about Intel CPU's
+ *
+ * @author Iakin
+ */
 public interface IntelCPUInfo extends CPUInfo {
     /**
      * @return true if the CPU is at least a Pentium CPU.