From 3650d065499966327e91caa7673b1b134a93e8c7 Mon Sep 17 00:00:00 2001
From: wentch <22250530@qq.com>
Date: Thu, 10 Dec 2015 09:41:40 +0800
Subject: [PATCH]
---
.../src/java/bean/ConstructorProperties.java | 76 +++++++++++++++++++
...thodVisitor.java => AsmMethodVisitor.java} | 4 +-
.../redkale/util/ConstructorProperties.java | 24 ------
.../src/org/redkale/util/Creator.java | 61 +--------------
4 files changed, 79 insertions(+), 86 deletions(-)
create mode 100644 android-jdk6-redkale/src/java/bean/ConstructorProperties.java
rename android-jdk6-redkale/src/org/redkale/util/{DebugMethodVisitor.java => AsmMethodVisitor.java} (95%)
delete mode 100644 android-jdk6-redkale/src/org/redkale/util/ConstructorProperties.java
diff --git a/android-jdk6-redkale/src/java/bean/ConstructorProperties.java b/android-jdk6-redkale/src/java/bean/ConstructorProperties.java
new file mode 100644
index 000000000..5ee947c1f
--- /dev/null
+++ b/android-jdk6-redkale/src/java/bean/ConstructorProperties.java
@@ -0,0 +1,76 @@
+/*
+ * Copyright (c) 2006, 2013, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation. Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package java.beans;
+
+import java.lang.annotation.*;
+import static java.lang.annotation.ElementType.*;
+import static java.lang.annotation.RetentionPolicy.*;
+
+/**
+ An annotation on a constructor that shows how the parameters of
+ that constructor correspond to the constructed object's getter
+ methods. For example:
+
+
+
+ public class Point {
+ @ConstructorProperties({"x", "y"})
+ public Point(int x, int y) {
+ this.x = x;
+ this.y = y;
+ }
+
+ public int getX() {
+ return x;
+ }
+
+ public int getY() {
+ return y;
+ }
+
+ private final int x, y;
+ }
+
+
+
+ The annotation shows that the first parameter of the constructor
+ can be retrieved with the {@code getX()} method and the second with
+ the {@code getY()} method. Since parameter names are not in
+ general available at runtime, without the annotation there would be
+ no way to know whether the parameters correspond to {@code getX()}
+ and {@code getY()} or the other way around.
+
+ @since 1.6
+*/
+@Documented @Target(CONSTRUCTOR) @Retention(RUNTIME)
+public @interface ConstructorProperties {
+ /**
+ The getter names.
+ @return the getter names corresponding to the parameters in the
+ annotated constructor.
+ */
+ String[] value();
+}
diff --git a/android-jdk6-redkale/src/org/redkale/util/DebugMethodVisitor.java b/android-jdk6-redkale/src/org/redkale/util/AsmMethodVisitor.java
similarity index 95%
rename from android-jdk6-redkale/src/org/redkale/util/DebugMethodVisitor.java
rename to android-jdk6-redkale/src/org/redkale/util/AsmMethodVisitor.java
index e58f8823e..c53b8f5b3 100644
--- a/android-jdk6-redkale/src/org/redkale/util/DebugMethodVisitor.java
+++ b/android-jdk6-redkale/src/org/redkale/util/AsmMethodVisitor.java
@@ -12,7 +12,7 @@ import org.objectweb.asm.*;
*
* @author zhangjx
*/
-public class DebugMethodVisitor {
+public class AsmMethodVisitor {
private final MethodVisitor visitor;
@@ -44,7 +44,7 @@ public class DebugMethodVisitor {
}
}
- public DebugMethodVisitor(MethodVisitor visitor) {
+ public AsmMethodVisitor(MethodVisitor visitor) {
//super(Opcodes.ASM5, visitor);
this.visitor = visitor;
}
diff --git a/android-jdk6-redkale/src/org/redkale/util/ConstructorProperties.java b/android-jdk6-redkale/src/org/redkale/util/ConstructorProperties.java
deleted file mode 100644
index a6b9010a8..000000000
--- a/android-jdk6-redkale/src/org/redkale/util/ConstructorProperties.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * To change this license header, choose License Headers in Project Properties.
- * To change this template file, choose Tools | Templates
- * and open the template in the editor.
- */
-package org.redkale.util;
-
-import java.lang.annotation.*;
-import static java.lang.annotation.ElementType.CONSTRUCTOR;
-import static java.lang.annotation.RetentionPolicy.RUNTIME;
-
-/**
- *
- * @author zhangjx
- */
-@Documented @Target(CONSTRUCTOR) @Retention(RUNTIME)
-public @interface ConstructorProperties {
- /**
- The getter names.
- @return the getter names corresponding to the parameters in the
- annotated constructor.
- */
- String[] value();
-}
diff --git a/android-jdk6-redkale/src/org/redkale/util/Creator.java b/android-jdk6-redkale/src/org/redkale/util/Creator.java
index 2c8adff43..a6ba455d5 100644
--- a/android-jdk6-redkale/src/org/redkale/util/Creator.java
+++ b/android-jdk6-redkale/src/org/redkale/util/Creator.java
@@ -4,6 +4,7 @@
*/
package org.redkale.util;
+import java.beans.*;
import java.lang.reflect.*;
import java.util.*;
import org.objectweb.asm.*;
@@ -17,66 +18,6 @@ import org.objectweb.asm.Type;
* @param
*/
public interface Creator {
-//
-// static class PooledCreator implements Creator {
-//
-// private final T defValue;
-//
-// private final Reproduce reproduce;
-//
-// private final ReferenceQueue refQueue = new ReferenceQueue();
-//
-// private final Queue queue;
-//
-// private final Creator creator;
-//
-// public PooledCreator(int max, Class clazz, Creator creator) {
-// this.creator = creator;
-// this.defValue = creator.create();
-// this.reproduce = Reproduce.create(clazz, clazz);
-// this.queue = new ArrayBlockingQueue<>(Math.max(Runtime.getRuntime().availableProcessors() * 2, max));
-// new Thread() {
-// {
-// setDaemon(true);
-// setName(PooledCreator.class.getSimpleName() + " " + clazz.getSimpleName() + " Reference Handler");
-// }
-//
-// @Override
-// public void run() {
-// try {
-// for (;;) {
-// T r = refQueue.remove().get();
-// if (r == null) continue;
-// reproduce.copy(r, defValue);
-// queue.offer(r);
-// }
-// } catch (Exception e) {
-// //do nothind
-// }
-// }
-// }.start();
-// }
-//
-// @Override
-// public T create(Object... params) {
-// T rs = queue.poll();
-// if (rs == null) {
-// rs = creator.create(params);
-// }
-// return new WeakReference<>(rs, refQueue).get();
-// }
-//
-// }
-//
-// @SuppressWarnings("unchecked")
-// public static Creator create(int max, Class clazz) {
-// return new PooledCreator<>(max, clazz, create(clazz));
-// }
-//
-// @SuppressWarnings("unchecked")
-// public static Creator create(int max, Class clazz, Creator creator) {
-// return new PooledCreator<>(max, clazz, creator);
-// }
public T create(Object... params);