Upgrade version and copyright.

Hesey · May 23, 2013 · 2915e06 · 2915e06
1 parent 0a0a12f
commit 2915e06
Show file tree

Hide file tree

Showing 34 changed files with 253 additions and 243 deletions.
diff --git a/acceptance-test/TraceTarget.java b/acceptance-test/TraceTarget.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 zhongl
+ * Copyright 2013 zhongl
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.

diff --git a/project/Build.scala b/project/Build.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 zhongl
+ * Copyright 2013 zhongl
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -23,7 +23,7 @@ object Build extends sbt.Build {
   import Dependencies._
   import Unmanaged._
 
-  val VERSION  = "0.2.4"
+  val VERSION  = "0.2.5"
   val javaHome = sys.props("java.home").replace("/jre", "")
 
   lazy val proguard = proguardSettings ++ Seq(

diff --git a/src/main/java/com/github/zhongl/housemd/command/Env.java b/src/main/java/com/github/zhongl/housemd/command/Env.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 zhongl
+ * Copyright 2013 zhongl
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -16,26 +16,14 @@
 
 package com.github.zhongl.housemd.command;
 
-import static com.github.zhongl.yascli.JavaConvertions.defaultConverter;
-import static com.github.zhongl.yascli.JavaConvertions.get;
-import static com.github.zhongl.yascli.JavaConvertions.is;
-import static com.github.zhongl.yascli.JavaConvertions.list;
-import static com.github.zhongl.yascli.JavaConvertions.manifest;
-import static com.github.zhongl.yascli.JavaConvertions.none;
-
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.SortedMap;
-import java.util.SortedSet;
-import java.util.TreeMap;
-import java.util.TreeSet;
-
+import com.github.zhongl.yascli.Command;
+import com.github.zhongl.yascli.PrintOut;
 import jline.console.completer.Completer;
 import scala.Function0;
 
-import com.github.zhongl.yascli.Command;
-import com.github.zhongl.yascli.PrintOut;
+import java.util.*;
+
+import static com.github.zhongl.yascli.JavaConvertions.*;
 
 
 /**

diff --git a/src/main/java/com/github/zhongl/housemd/command/Inspect.java b/src/main/java/com/github/zhongl/housemd/command/Inspect.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 zhongl
+ * Copyright 2013 zhongl
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -28,7 +28,7 @@
 import java.util.List;
 import java.util.Set;
 
-import static com.github.zhongl.housemd.misc.ReflectionUtils.*;
+import static com.github.zhongl.housemd.misc.ReflectionUtils.simpleNameOf;
 import static com.github.zhongl.yascli.JavaConvertions.manifest;
 import static com.github.zhongl.yascli.JavaConvertions.none;
 

diff --git a/src/main/java/com/github/zhongl/housemd/duck/Duck.java b/src/main/java/com/github/zhongl/housemd/duck/Duck.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 zhongl
+ * Copyright 2013 zhongl
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.

diff --git a/src/main/scala/com/github/zhongl/housemd/command/ClassMemberCompleter.scala b/src/main/scala/com/github/zhongl/housemd/command/ClassMemberCompleter.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 zhongl
+ * Copyright 2013 zhongl
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -53,15 +53,15 @@ trait MethodFilterCompleter extends ClassMemberCompleter {
     }
 
   override protected def completeAll(classSimpleName: String, cursor: Int, candidates: List[CharSequence]) =
-    allDeclaredMethodsOf(classSimpleName) {a => a} match {
+    allDeclaredMethodsOf(classSimpleName) { a => a } match {
       case Array() => -1
-      case all     => all.flatten.sorted foreach {candidates.add}; cursor
+      case all     => all.flatten.sorted foreach { candidates.add }; cursor
     }
 
   override protected def complete(simpleName: String, prefix: String, cursor: Int, candidates: List[CharSequence]) =
-    allDeclaredMethodsOf(simpleName) {_ collect {case m if m.startsWith(prefix) => m }} match {
+    allDeclaredMethodsOf(simpleName) { _ collect { case m if m.startsWith(prefix) => m } } match {
       case Array() => -1
-      case all     => all.flatten.sorted foreach {candidates.add}; cursor - prefix.length
+      case all     => all.flatten.sorted foreach { candidates.add }; cursor - prefix.length
     }
 }
 
@@ -74,14 +74,14 @@ trait FieldFilterCompleter extends ClassMemberCompleter {
     }
 
   override protected def completeAll(classSimpleName: String, cursor: Int, candidates: List[CharSequence]) =
-    allDeclaredFieldsOf(classSimpleName) {_ map {_.getName}} match {
+    allDeclaredFieldsOf(classSimpleName) { _ map { _.getName } } match {
       case Array() => -1
-      case all     => all.flatten.sorted foreach {candidates.add}; cursor
+      case all     => all.flatten.sorted foreach { candidates.add }; cursor
     }
 
   override protected def complete(simpleName: String, prefix: String, cursor: Int, candidates: List[CharSequence]) =
-    allDeclaredFieldsOf(simpleName) {_ collect {case f if f.getName.startsWith(prefix) => f.getName }} match {
+    allDeclaredFieldsOf(simpleName) { _ collect { case f if f.getName.startsWith(prefix) => f.getName } } match {
       case Array() => -1
-      case all     => all.flatten.sorted foreach {candidates.add}; cursor - prefix.length
+      case all     => all.flatten.sorted foreach { candidates.add }; cursor - prefix.length
     }
 }
diff --git a/src/main/scala/com/github/zhongl/housemd/command/Loaded.scala b/src/main/scala/com/github/zhongl/housemd/command/Loaded.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 zhongl
+ * Copyright 2013 zhongl
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -34,11 +34,12 @@ class Loaded(val inst: Instrumentation, out: PrintOut)
 
   override def run() {
     val k = classSimpleName()
-    val matched = inst.getAllLoadedClasses filter {simpleNameOf(_) == k}
+    val matched = inst.getAllLoadedClasses filter { simpleNameOf(_) == k }
     if (matched.isEmpty) println("No matched class")
-    else matched foreach { c =>
-      println(c.getName + " -> " + sourceOf(Manifest.classType(c)))
-      if (hierarchyable()) layout(Option(c.getClassLoader))
+    else matched foreach {
+      c =>
+        println(c.getName + " -> " + sourceOf(Manifest.classType(c)))
+        if (hierarchyable()) layout(Option(c.getClassLoader))
     }
   }
 

diff --git a/src/main/scala/com/github/zhongl/housemd/command/MethodFilter.scala b/src/main/scala/com/github/zhongl/housemd/command/MethodFilter.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 zhongl
+ * Copyright 2013 zhongl
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -36,16 +36,16 @@ class MethodFilter(classSimpleName: String, methodName: String = "*") {
     }
   }
 
-  private def lazyFilter(cond: => Boolean)(m: String) = if (cond) {methodName == "*" || methodName == m} else false
+  private def lazyFilter(cond: => Boolean)(m: String) = if (cond) {methodName == "*" || methodName == m } else false
 
   private def lazyFilter(c: Class[_]): (String => Boolean) = lazyFilter(filterOnly(c))
 
   private def filterOnly(className: String, superClassName: String, interfaceNames: Array[String]): Boolean = {
     if (classSimpleName.endsWith("+")) {
       val realname = classSimpleName.dropRight(1)
       (simpleNameOf(className) == realname ||
-        superClassName != null && simpleNameOf(superClassName) == realname) ||
-        interfaceNames.find(simpleNameOf(_) == realname).isDefined
+       superClassName != null && simpleNameOf(superClassName) == realname) ||
+      interfaceNames.find(simpleNameOf(_) == realname).isDefined
     } else {
       simpleNameOf(className) == classSimpleName
     }
@@ -70,7 +70,7 @@ object MethodFilter {
     }
   }
 
-  implicit val string2MethodFilters = (_: String).split("\\s+") map {apply}
+  implicit val string2MethodFilters = (_: String).split("\\s+") map { apply }
 }
 
 
diff --git a/src/main/scala/com/github/zhongl/housemd/command/Trace.scala b/src/main/scala/com/github/zhongl/housemd/command/Trace.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 zhongl
+ * Copyright 2013 zhongl
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -76,7 +76,7 @@ class Trace(val inst: Instrumentation, out: PrintOut)
       maxClassLoaderLength = math.max(maxClassLoaderLength, statistic.loader.length)
       maxMethodSignLength = math.max(maxMethodSignLength, statistic.methodSign.length)
 
-      statistics = statistics find {_.filter(context)} match {
+      statistics = statistics find { _.filter(context) } match {
         case Some(s) => (statistics - s) + (s + statistic)
         case None    => statistics + statistic
       }
@@ -125,11 +125,11 @@ class Trace(val inst: Instrumentation, out: PrintOut)
     def +(s: Statistic) = new Statistic(context, totalTimes + s.totalTimes, totalElapseMills + s.totalElapseMills)
 
     def filter(context: Context) = this.context.loader == context.loader &&
-      this.context.className == context.className &&
-      this.context.methodName == context.methodName &&
-      this.context.arguments.size == context.arguments.size &&
-      this.context.descriptor == context.descriptor &&
-      (isInit(context.methodName) || this.context.thisObject == context.thisObject)
+                                   this.context.className == context.className &&
+                                   this.context.methodName == context.methodName &&
+                                   this.context.arguments.size == context.arguments.size &&
+                                   this.context.descriptor == context.descriptor &&
+                                   (isInit(context.methodName) || this.context.thisObject == context.thisObject)
 
     def reps(maxMethodSignLength: Int, maxClassLoaderLength: Int) =
       "%1$-" + maxMethodSignLength + "s    %2$-" + maxClassLoaderLength + "s    %3$#9s    %4$#9sms    %5$s" format(
@@ -164,9 +164,10 @@ class DetailWriter(writer: BufferedWriter) {
     writer.newLine()
 
     context.resultOrException match {
-      case Some(x) if x.isInstanceOf[Throwable] => x.asInstanceOf[Throwable].getStackTrace.foreach { s =>
-        writer.write("\tat " + s)
-        writer.newLine()
+      case Some(x) if x.isInstanceOf[Throwable] => x.asInstanceOf[Throwable].getStackTrace.foreach {
+        s =>
+          writer.write("\tat " + s)
+          writer.newLine()
       }
       case _                                    =>
     }

diff --git a/src/main/scala/com/github/zhongl/housemd/command/TransformCommand.scala b/src/main/scala/com/github/zhongl/housemd/command/TransformCommand.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 zhongl
+ * Copyright 2013 zhongl
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.

diff --git a/src/main/scala/com/github/zhongl/housemd/duck/Telephone.scala b/src/main/scala/com/github/zhongl/housemd/duck/Telephone.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 zhongl
+ * Copyright 2013 zhongl
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -22,7 +22,6 @@ import jline.console.ConsoleReader
 import com.github.zhongl.yascli.{Shell, PrintOut, Command}
 import jline.TerminalFactory
 import jline.console.history.FileHistory
-import management.ManagementFactory
 import java.io.File
 import com.github.zhongl.housemd.command.Last
 
@@ -44,7 +43,9 @@ class Telephone(inst: Instrumentation, port: Int, classes: Array[Class[Command]]
       new Shell(name = "housemd", description = "a runtime diagnosis tool of jvm.", reader = reader) {
         private val lastCommand = new Last(out)
 
-        override protected def commands = Quit :: helpCommand :: lastCommand :: classes.map {toCommand(_, PrintOut(reader))}.toList
+        override protected def commands = Quit :: helpCommand :: lastCommand :: classes
+          .map { toCommand(_, PrintOut(reader)) }
+          .toList
 
         override def error(a: Any) {
           super.error(a)

diff --git a/src/main/scala/com/github/zhongl/housemd/house/House.scala b/src/main/scala/com/github/zhongl/housemd/house/House.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 zhongl
+ * Copyright 2013 zhongl
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -33,14 +33,16 @@ import java.util.jar.{Attributes, JarInputStream}
  */
 object House extends Command("housemd", "a runtime diagnosis tool of JVM.", PrintOut(System.out)) with Application {
 
-  implicit private val string2Port = { value: String =>
-    val p = value.toInt
-    if (p > 1024 && p < 65536) p else throw new IllegalArgumentException(", it should be between 1025 and 65535")
+  implicit private val string2Port = {
+    value: String =>
+      val p = value.toInt
+      if (p > 1024 && p < 65536) p else throw new IllegalArgumentException(", it should be between 1025 and 65535")
   }
 
-  implicit private val string2File = { value: String =>
-    val file = new File(value)
-    if (file.exists() && file.isFile) file else throw new IllegalArgumentException(", it should be an existed file")
+  implicit private val string2File = {
+    value: String =>
+      val file = new File(value)
+      if (file.exists() && file.isFile) file else throw new IllegalArgumentException(", it should be an existed file")
   }
 
   private val port = option[Int]("-p" :: "--port" :: Nil, "set console local socket server port number.", 54321)
@@ -49,15 +51,15 @@ object House extends Command("housemd", "a runtime diagnosis tool of JVM.", Prin
 
   private lazy val agentJarFile = sourceOf(Manifest.classType(getClass))
   private lazy val agentOptions = agentJarFile ::
-    classNameOf[Telephone] ::
-    port() ::
-    classNameOf[Trace] ::
-    classNameOf[Loaded] ::
-    classNameOf[Env] ::
-    classNameOf[Inspect] ::
-    classNameOf[Prop] ::
-    classNameOf[Resources] ::
-    Nil
+                                  classNameOf[Telephone] ::
+                                  port() ::
+                                  classNameOf[Trace] ::
+                                  classNameOf[Loaded] ::
+                                  classNameOf[Env] ::
+                                  classNameOf[Inspect] ::
+                                  classNameOf[Prop] ::
+                                  classNameOf[Resources] ::
+                                  Nil
 
   private lazy val errorDetailFile   = "/tmp/housemd.err." + pid()
   private lazy val errorDetailWriter = new BufferedWriter(new FileWriter(errorDetailFile))

diff --git a/src/main/scala/com/github/zhongl/housemd/house/Mobilephone.scala b/src/main/scala/com/github/zhongl/housemd/house/Mobilephone.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 zhongl
+ * Copyright 2013 zhongl
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -43,7 +43,7 @@ class Mobilephone(port: Int, handle: PartialFunction[Signal, Any]) extends Actor
 
   def act() {
     val a = self
-    val hook = sys.addShutdownHook {a !? PowerOff}
+    val hook = sys.addShutdownHook { a !? PowerOff }
     var killer = Option.empty[OutputChannel[Any]]
 
     def select() {

diff --git a/src/main/scala/com/github/zhongl/housemd/instrument/Advice.java b/src/main/scala/com/github/zhongl/housemd/instrument/Advice.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 zhongl
+ * Copyright 2013 zhongl
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.

diff --git a/src/main/scala/com/github/zhongl/housemd/instrument/ClassDecorator.scala b/src/main/scala/com/github/zhongl/housemd/instrument/ClassDecorator.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 zhongl
+ * Copyright 2013 zhongl
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.

diff --git a/src/main/scala/com/github/zhongl/housemd/instrument/Context.scala b/src/main/scala/com/github/zhongl/housemd/instrument/Context.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 zhongl
+ * Copyright 2013 zhongl
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -16,8 +16,6 @@
 
 package com.github.zhongl.housemd.instrument
 
-import java.util
-
 
 /**
  * @author <a href="mailto:[email protected]">zhongl<a>

diff --git a/src/main/scala/com/github/zhongl/housemd/instrument/Hook.scala b/src/main/scala/com/github/zhongl/housemd/instrument/Hook.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 zhongl
+ * Copyright 2013 zhongl
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.

diff --git a/src/main/scala/com/github/zhongl/housemd/instrument/Seconds.scala b/src/main/scala/com/github/zhongl/housemd/instrument/Seconds.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 zhongl
+ * Copyright 2013 zhongl
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.