From f731b7320793cd258ba183ee504379229193fbd1 Mon Sep 17 00:00:00 2001
From: billkiller <747441355@qq.com>
Date: Sun, 28 Jul 2019 02:00:14 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=BA=86bug=EF=BC=8C?=
=?UTF-8?q?=E8=B0=83=E6=95=B4=E4=BA=86=E6=A1=86=E6=9E=B6=E4=B8=AD=E7=B1=BB?=
=?UTF-8?q?=E5=92=8C=E5=87=BD=E6=95=B0=E5=91=BD=E5=90=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.idea/workspace.xml | 963 +++++++++---------
.../biubiusuisui/annotation/FXWindow.java | 2 +-
.../biubiusuisui/config/FXMLLoaderPlus.java | 4 +-
.../config/FXPlusApplication.java | 4 +-
.../biubiusuisui/entity/FXBaseController.java | 3 +-
.../entity/FXFieldPropertyMapping.java | 28 -
.../biubiusuisui/entity/FXFieldWarpper.java | 42 +
.../biubiusuisui/entity/FXPlusContext.java | 37 +-
.../biubiusuisui/example/listDemo/Demo.java | 18 +
.../example/listDemo/MainController.java | 47 +
.../biubiusuisui/example/listDemo/User.java | 57 ++
.../expression/data/MyBeanAdapter.java | 3 +-
...XFactory.java => FXControllerFactory.java} | 89 +-
.../biubiusuisui/factory/FXEntityFactory.java | 48 +-
.../messageQueue/MessageQueue.java | 1 -
.../biubiusuisui/proxy/FXEntityProxy.java | 38 +-
.../edu/scau/biubiusuisui/utils/BeanUtil.java | 19 +
src/main/resources/listDemo.fxml | 12 +
.../factory/FXEntityFactoryTest.java | 2 +-
19 files changed, 761 insertions(+), 656 deletions(-)
delete mode 100644 src/main/java/cn/edu/scau/biubiusuisui/entity/FXFieldPropertyMapping.java
create mode 100644 src/main/java/cn/edu/scau/biubiusuisui/entity/FXFieldWarpper.java
create mode 100644 src/main/java/cn/edu/scau/biubiusuisui/example/listDemo/Demo.java
create mode 100644 src/main/java/cn/edu/scau/biubiusuisui/example/listDemo/MainController.java
create mode 100644 src/main/java/cn/edu/scau/biubiusuisui/example/listDemo/User.java
rename src/main/java/cn/edu/scau/biubiusuisui/factory/{FXFactory.java => FXControllerFactory.java} (77%)
create mode 100644 src/main/java/cn/edu/scau/biubiusuisui/utils/BeanUtil.java
create mode 100644 src/main/resources/listDemo.fxml
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 3cae1e1..7855ba6 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -7,56 +7,23 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
-
-
-
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
@@ -86,56 +53,77 @@
-
-
+
+
-
-
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
+
+
-
+
-
-
+
+
+
+
+
+
+
+
+
+
+
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
-
-
+
+
+
+
+
+
+
+
+
+
+
@@ -144,37 +132,19 @@
-
+
-
-
+
+
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
@@ -183,10 +153,10 @@
-
+
-
-
+
+
@@ -201,16 +171,15 @@
-
-
+
+
- Builder
type
Expression.value
getExpression
@@ -240,6 +209,7 @@
managed
String
Property
+ cor
config.FXMLoaer
@@ -265,18 +235,6 @@
@@ -375,6 +345,7 @@
+
@@ -448,7 +419,7 @@
-
@@ -863,6 +817,7 @@
+
1561745555309
@@ -949,7 +904,7 @@
-
+
@@ -964,17 +919,17 @@
-
-
+
+
-
-
-
+
+
+
@@ -983,7 +938,7 @@
-
+
@@ -1096,7 +1051,7 @@
file://$PROJECT_DIR$/src/main/java/cn/edu/scau/biubiusuisui/expression/data/MyBeanAdapter.java
- 11
+ 12
@@ -1154,18 +1109,6 @@
-
- file://$PROJECT_DIR$/src/main/java/cn/edu/scau/biubiusuisui/expression/data/MyExpressionValue.java
- 166
-
-
-
-
- file://$PROJECT_DIR$/src/main/java/cn/edu/scau/biubiusuisui/factory/FXEntityFactory.java
- 100
-
-
-
file://$PROJECT_DIR$/src/main/java/cn/edu/scau/biubiusuisui/expression/data/ExpressionParser.java
168
@@ -1191,22 +1134,10 @@
- file://$PROJECT_DIR$/src/main/java/cn/edu/scau/biubiusuisui/expression/data/ExpressionParser.java
- 63
+ file://$PROJECT_DIR$/src/main/java/cn/edu/scau/biubiusuisui/proxy/FXEntityProxy.java
+ 70
-
-
-
- file://$PROJECT_DIR$/src/main/java/cn/edu/scau/biubiusuisui/expression/data/ExpressionParser.java
- 91
-
-
-
-
- file://$PROJECT_DIR$/src/main/java/cn/edu/scau/biubiusuisui/expression/data/ExpressionParser.java
- 97
-
-
+
jar://C:/java/jdk/javafx-src.zip!/com/sun/javafx/fxml/expression/BinaryExpression.java
@@ -1271,199 +1202,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -1478,23 +1216,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -1502,18 +1223,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
@@ -1528,20 +1237,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -1555,48 +1250,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -1604,23 +1257,26 @@
-
+
+
+
+
-
-
+
+
-
+
-
-
+
+
-
+
@@ -1628,46 +1284,35 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
@@ -1675,16 +1320,326 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/main/java/cn/edu/scau/biubiusuisui/annotation/FXWindow.java b/src/main/java/cn/edu/scau/biubiusuisui/annotation/FXWindow.java
index 5fc30e2..14affb7 100644
--- a/src/main/java/cn/edu/scau/biubiusuisui/annotation/FXWindow.java
+++ b/src/main/java/cn/edu/scau/biubiusuisui/annotation/FXWindow.java
@@ -18,7 +18,7 @@ public @interface FXWindow {
double minHeight() default 0.0;
boolean resizable() default false;
boolean draggable() default false;
-
+ boolean mainStage() default false;
StageStyle style() default StageStyle.DECORATED;
String title () ;
}
diff --git a/src/main/java/cn/edu/scau/biubiusuisui/config/FXMLLoaderPlus.java b/src/main/java/cn/edu/scau/biubiusuisui/config/FXMLLoaderPlus.java
index f0f3159..53135ce 100644
--- a/src/main/java/cn/edu/scau/biubiusuisui/config/FXMLLoaderPlus.java
+++ b/src/main/java/cn/edu/scau/biubiusuisui/config/FXMLLoaderPlus.java
@@ -3,7 +3,7 @@ package cn.edu.scau.biubiusuisui.config;
import cn.edu.scau.biubiusuisui.entity.FXBaseController;
import cn.edu.scau.biubiusuisui.expression.data.MyBeanAdapter;
import cn.edu.scau.biubiusuisui.expression.data.MyExpressionValue;
-import cn.edu.scau.biubiusuisui.factory.FXFactory;
+import cn.edu.scau.biubiusuisui.factory.FXControllerFactory;
import com.sun.javafx.beans.IDProperty;
import com.sun.javafx.fxml.BeanAdapter;
import com.sun.javafx.fxml.LoadListener;
@@ -1001,7 +1001,7 @@ public class FXMLLoaderPlus {
if (value == null) {
try {
if (FXBaseController.class.isAssignableFrom(type)) {
- value = FXFactory.getFXController(type, fx_id);
+ value = FXControllerFactory.getFXController(type, fx_id);
} else {
value = type.newInstance();
}
diff --git a/src/main/java/cn/edu/scau/biubiusuisui/config/FXPlusApplication.java b/src/main/java/cn/edu/scau/biubiusuisui/config/FXPlusApplication.java
index 11c9fca..5402e06 100644
--- a/src/main/java/cn/edu/scau/biubiusuisui/config/FXPlusApplication.java
+++ b/src/main/java/cn/edu/scau/biubiusuisui/config/FXPlusApplication.java
@@ -4,7 +4,7 @@ import cn.edu.scau.biubiusuisui.annotation.FXScan;
import cn.edu.scau.biubiusuisui.annotation.FXWindow;
import cn.edu.scau.biubiusuisui.factory.BeanBuilder;
import cn.edu.scau.biubiusuisui.factory.FXBuilder;
-import cn.edu.scau.biubiusuisui.factory.FXFactory;
+import cn.edu.scau.biubiusuisui.factory.FXControllerFactory;
import cn.edu.scau.biubiusuisui.function.FXWindowParser;
import cn.edu.scau.biubiusuisui.utils.ClassUtils;
@@ -61,7 +61,7 @@ public class FXPlusApplication {
private static void loadFXPlusClass(String className,BeanBuilder beanBuilder) throws ClassNotFoundException {
Class clazz = Class.forName(className);
if(clazz.getAnnotation(FXWindow.class)!=null) {
- FXFactory.loadFXController(clazz, beanBuilder);
+ FXControllerFactory.loadMainStage(clazz, beanBuilder);
}
}
}
diff --git a/src/main/java/cn/edu/scau/biubiusuisui/entity/FXBaseController.java b/src/main/java/cn/edu/scau/biubiusuisui/entity/FXBaseController.java
index 720cdab..1ac6ed8 100644
--- a/src/main/java/cn/edu/scau/biubiusuisui/entity/FXBaseController.java
+++ b/src/main/java/cn/edu/scau/biubiusuisui/entity/FXBaseController.java
@@ -4,6 +4,7 @@ import cn.edu.scau.biubiusuisui.annotation.FXController;
import cn.edu.scau.biubiusuisui.config.FXMLLoaderPlus;
import cn.edu.scau.biubiusuisui.config.FXPlusApplication;
import cn.edu.scau.biubiusuisui.utils.StringUtils;
+import javafx.scene.Scene;
import javafx.scene.layout.Pane;
import javafx.stage.Stage;
@@ -31,6 +32,7 @@ public class FXBaseController extends Pane {
private Stage stage;
+
private boolean isController = false;
private boolean isWindows = false;
@@ -107,5 +109,4 @@ public class FXBaseController extends Pane {
this.stage = stage;
}
-
}
diff --git a/src/main/java/cn/edu/scau/biubiusuisui/entity/FXFieldPropertyMapping.java b/src/main/java/cn/edu/scau/biubiusuisui/entity/FXFieldPropertyMapping.java
deleted file mode 100644
index 55ab6c4..0000000
--- a/src/main/java/cn/edu/scau/biubiusuisui/entity/FXFieldPropertyMapping.java
+++ /dev/null
@@ -1,28 +0,0 @@
-package cn.edu.scau.biubiusuisui.entity;
-
-/**
- * @Author jack
- * @Date:2019/6/28 10:03
- */
-public class FXFieldPropertyMapping {
-
- private boolean readOnly;
- private Class type;
-
-
- public boolean isReadOnly() {
- return readOnly;
- }
-
- public void setReadOnly(boolean readOnly) {
- this.readOnly = readOnly;
- }
-
- public Class getType() {
- return type;
- }
-
- public void setType(Class type) {
- this.type = type;
- }
-}
diff --git a/src/main/java/cn/edu/scau/biubiusuisui/entity/FXFieldWarpper.java b/src/main/java/cn/edu/scau/biubiusuisui/entity/FXFieldWarpper.java
new file mode 100644
index 0000000..707072e
--- /dev/null
+++ b/src/main/java/cn/edu/scau/biubiusuisui/entity/FXFieldWarpper.java
@@ -0,0 +1,42 @@
+package cn.edu.scau.biubiusuisui.entity;
+
+import cn.edu.scau.biubiusuisui.annotation.FXField;
+import javafx.beans.property.Property;
+
+/**
+ * @Author jack
+ * @Date:2019/6/28 10:03
+ */
+public class FXFieldWarpper {
+
+ private FXField fxField;
+
+ private Property property;
+
+ private Class type;
+
+ public Class getType() {
+ return type;
+ }
+
+ public void setType(Class type) {
+ this.type = type;
+ }
+
+ public FXField getFxField() {
+ return fxField;
+ }
+
+ public void setFxField(FXField fxField) {
+ this.fxField = fxField;
+ }
+
+ public Property getProperty() {
+ return property;
+ }
+
+ public void setProperty(Property property){
+ this.property = property;
+ }
+
+}
diff --git a/src/main/java/cn/edu/scau/biubiusuisui/entity/FXPlusContext.java b/src/main/java/cn/edu/scau/biubiusuisui/entity/FXPlusContext.java
index b494b85..c0ae09e 100644
--- a/src/main/java/cn/edu/scau/biubiusuisui/entity/FXPlusContext.java
+++ b/src/main/java/cn/edu/scau/biubiusuisui/entity/FXPlusContext.java
@@ -22,17 +22,8 @@ public class FXPlusContext {
private static Map> controllerContext = new ConcurrentHashMap<>(); //FXController控制器注册表
- private static Map beanProxyMap = new ConcurrentHashMap<>(); // Object注册为FXEntityObject
+ private static Map beanMap = new ConcurrentHashMap<>(); // Object注册为FXEntityObject
- public static Property getEntityPropertyByName(Object object, String fieldName){
- FXEntityProxy fxEntityProxy = FXPlusContext.getProxyByBeanObject(object);
- if(fxEntityProxy == null){
- return null;
- }
- return fxEntityProxy.getStringPropertyMap().get(fieldName);
- }
-
- private static Map session = new ConcurrentHashMap<>();
public static void addController(FXBaseController fxBaseController){
List controllers = controllerContext.get(fxBaseController.getName());
@@ -47,33 +38,11 @@ public class FXPlusContext {
}
public static FXEntityProxy getProxyByBeanObject(Object object){
- return beanProxyMap.get(object);
+ return beanMap.get(object);
}
public static void setProxyByBeanObject(Object object,FXEntityProxy fxEntityProxy){
- beanProxyMap.put(object,fxEntityProxy);
- }
- public static Map getBeanProxyMap() {
- return beanProxyMap;
+ beanMap.put(object,fxEntityProxy);
}
- public static void setBeanProxyMap(Map beanProxyMap) {
- FXPlusContext.beanProxyMap = beanProxyMap;
- }
-
- public static Map> getControllerContext() {
- return controllerContext;
- }
-
- public static void setControllerContext(Map> controllerContext) {
- FXPlusContext.controllerContext = controllerContext;
- }
-
- public static Map getSession() {
- return session;
- }
-
- public static void setSession(Map session) {
- FXPlusContext.session = session;
- }
}
diff --git a/src/main/java/cn/edu/scau/biubiusuisui/example/listDemo/Demo.java b/src/main/java/cn/edu/scau/biubiusuisui/example/listDemo/Demo.java
new file mode 100644
index 0000000..710445f
--- /dev/null
+++ b/src/main/java/cn/edu/scau/biubiusuisui/example/listDemo/Demo.java
@@ -0,0 +1,18 @@
+package cn.edu.scau.biubiusuisui.example.listDemo;
+
+import cn.edu.scau.biubiusuisui.annotation.FXScan;
+import cn.edu.scau.biubiusuisui.config.FXPlusApplication;
+import javafx.application.Application;
+import javafx.stage.Stage;
+
+/**
+ * @Author jack
+ * @Date:2019/7/27 1:43
+ */
+@FXScan(base = "cn.edu.scau.biubiusuisui.example.listDemo")
+public class Demo extends Application {
+ @Override
+ public void start(Stage primaryStage) throws Exception {
+ FXPlusApplication.start(Demo.class);
+ }
+}
diff --git a/src/main/java/cn/edu/scau/biubiusuisui/example/listDemo/MainController.java b/src/main/java/cn/edu/scau/biubiusuisui/example/listDemo/MainController.java
new file mode 100644
index 0000000..ec94845
--- /dev/null
+++ b/src/main/java/cn/edu/scau/biubiusuisui/example/listDemo/MainController.java
@@ -0,0 +1,47 @@
+package cn.edu.scau.biubiusuisui.example.listDemo;
+
+import cn.edu.scau.biubiusuisui.annotation.FXBind;
+import cn.edu.scau.biubiusuisui.annotation.FXController;
+import cn.edu.scau.biubiusuisui.annotation.FXData;
+import cn.edu.scau.biubiusuisui.annotation.FXWindow;
+import cn.edu.scau.biubiusuisui.entity.FXBaseController;
+import javafx.beans.value.ObservableValue;
+import javafx.collections.FXCollections;
+import javafx.collections.ObservableList;
+import javafx.fxml.FXML;
+import javafx.scene.control.Label;
+import javafx.scene.control.ListView;
+import javafx.scene.control.TextField;
+
+import java.util.ArrayList;
+
+/**
+ * @Author jack
+ * @Date:2019/7/27 1:43
+ */
+@FXController(path = "listDemo.fxml")
+@FXWindow(title = "actionDemo",mainStage = true)
+public class MainController extends FXBaseController {
+
+ @FXData
+ User user = new User();
+
+
+ @FXML
+ @FXBind("items=${@toList(user.names)}")
+ private ListView list;
+
+
+ public ObservableList hello(){
+ return FXCollections.observableList(new ArrayList(){{add("hello");}});
+ }
+
+ public ObservableList toList(ArrayList list){
+ return FXCollections.observableList(list);
+ }
+
+ @FXML
+ public void addName(){
+ user.addNames("hello");
+ }
+}
diff --git a/src/main/java/cn/edu/scau/biubiusuisui/example/listDemo/User.java b/src/main/java/cn/edu/scau/biubiusuisui/example/listDemo/User.java
new file mode 100644
index 0000000..7b224b8
--- /dev/null
+++ b/src/main/java/cn/edu/scau/biubiusuisui/example/listDemo/User.java
@@ -0,0 +1,57 @@
+package cn.edu.scau.biubiusuisui.example.listDemo;
+
+import cn.edu.scau.biubiusuisui.annotation.FXEntity;
+import cn.edu.scau.biubiusuisui.annotation.FXField;
+
+import java.util.ArrayList;
+
+/**
+ * @Author jack
+ * @Date:2019/7/27 12:19
+ */
+@FXEntity
+public class User {
+ @FXField
+ private String name;
+
+ @FXField
+ private String password;
+
+ public User() {
+ names.add("hello ");
+ names.add("test");
+ }
+
+
+
+
+ public void addNames(String name){
+ names.add(name);
+ }
+ @FXField
+ private ArrayList names = new ArrayList<>();
+
+ public String getName() {
+ return name;
+ }
+
+ public void setName(String name) {
+ this.name = name;
+ }
+
+ public String getPassword() {
+ return password;
+ }
+
+ public void setPassword(String password) {
+ this.password = password;
+ }
+
+ public ArrayList getNames() {
+ return names;
+ }
+
+ public void setNames(ArrayList names) {
+ this.names = names;
+ }
+}
diff --git a/src/main/java/cn/edu/scau/biubiusuisui/expression/data/MyBeanAdapter.java b/src/main/java/cn/edu/scau/biubiusuisui/expression/data/MyBeanAdapter.java
index 75c9073..3fca454 100644
--- a/src/main/java/cn/edu/scau/biubiusuisui/expression/data/MyBeanAdapter.java
+++ b/src/main/java/cn/edu/scau/biubiusuisui/expression/data/MyBeanAdapter.java
@@ -2,6 +2,7 @@ package cn.edu.scau.biubiusuisui.expression.data;
import cn.edu.scau.biubiusuisui.annotation.FXEntity;
import cn.edu.scau.biubiusuisui.entity.FXPlusContext;
+import cn.edu.scau.biubiusuisui.utils.BeanUtil;
import com.sun.javafx.fxml.BeanAdapter;
import javafx.beans.value.ObservableValue;
@@ -28,7 +29,7 @@ public class MyBeanAdapter extends BeanAdapter {
if (object.getClass().getAnnotation(FXEntity.class) == null) {
return super.getPropertyModel(key);
} else {
- return FXPlusContext.getEntityPropertyByName(object, key);
+ return BeanUtil.getPropertyByName(object, key);
}
}
diff --git a/src/main/java/cn/edu/scau/biubiusuisui/factory/FXFactory.java b/src/main/java/cn/edu/scau/biubiusuisui/factory/FXControllerFactory.java
similarity index 77%
rename from src/main/java/cn/edu/scau/biubiusuisui/factory/FXFactory.java
rename to src/main/java/cn/edu/scau/biubiusuisui/factory/FXControllerFactory.java
index f8ac721..ba12fab 100644
--- a/src/main/java/cn/edu/scau/biubiusuisui/factory/FXFactory.java
+++ b/src/main/java/cn/edu/scau/biubiusuisui/factory/FXControllerFactory.java
@@ -18,6 +18,7 @@ import javafx.scene.layout.Pane;
import javafx.stage.Stage;
import java.io.IOException;
+import java.lang.annotation.Annotation;
import java.lang.reflect.Field;
import java.net.URL;
@@ -25,7 +26,7 @@ import java.net.URL;
* @Author jack
* @Date:2019/6/25 8:12
*/
-public class FXFactory {
+public class FXControllerFactory {
private static final BeanBuilder BEAN_BUILDER = new FXBuilder();
@@ -80,17 +81,16 @@ public class FXFactory {
* @return
*/
private static FXBaseController getFxBaseController(Class clazz, String controllerName, BeanBuilder beanBuilder) {
+ return getFxBaseController0(clazz, controllerName, beanBuilder);
+ }
+ private static FXBaseController getFxBaseController0(Class clazz, String controllerName, BeanBuilder beanBuilder) {
URL fxmlPath;
- FXWindow fxWindow = null;
FXController fxController = null; //reflect and get FXController cn.edu.scau.biubiusuisui.annotation
fxController = (FXController) clazz.getDeclaredAnnotation(FXController.class);
- fxWindow = (FXWindow) clazz.getDeclaredAnnotation(FXWindow.class);
Pane parent = null;
-
- FXBaseController fxControllerProxy = null;
FXBaseController fxBaseController = null;
-
+ FXBaseController fxControllerProxy = null;
if (fxController != null) {
String name = fxController.path();
fxmlPath = clazz.getClassLoader().getResource(name);
@@ -101,23 +101,18 @@ public class FXFactory {
parseData(fxBaseController);
if (fxBaseController != null) {
FXControllerProxy controllerProxy = new FXControllerProxy();
-
-
fxControllerProxy = (FXBaseController) controllerProxy.getInstance(fxBaseController); //产生代理从而实现赋能
fxmlLoader.setRoot(fxControllerProxy);
fxmlLoader.setController(fxControllerProxy);
fxmlLoader.setBaseController(fxBaseController);
-
try {
parent = fxmlLoader.load();
-
if (controllerName != null) {
fxControllerProxy.setName(controllerName);
fxBaseController.setName(controllerName);
} else {
fxBaseController.setName(parent.getId());
}
-
ObservableMap namespace = fxmlLoader.getNamespace();
addDataInNameSpace(namespace, fxBaseController);
scanBind(namespace, fxBaseController);
@@ -129,14 +124,10 @@ public class FXFactory {
} else {
return null;
}
- //register
-
- if (fxWindow != null) {
- createWindow(fxWindow, fxControllerProxy, fxBaseController);
- }
return fxControllerProxy;
}
+
/**
* 将代理对象和目标对象注册
*
@@ -148,32 +139,26 @@ public class FXFactory {
MessageQueue.getInstance().registerCosumer(fxBaseController, fxBaseControllerProxy); // 添加进入消息队列 信号功能
}
- private static void createWindow(FXWindow fxWindow, FXBaseController fxControllerProxy, FXBaseController fxBaseController) {
+ private static Stage createWindow(FXWindow fxWindow, FXBaseController fxControllerProxy) {
Stage stage = new Stage();
fxControllerProxy.setStage(stage);
- fxBaseController.setStage(stage);
double preWidth = fxWindow.preWidth() == 0 ? fxControllerProxy.getPrefWidth() : fxWindow.preWidth();
double preHeight = fxWindow.preHeight() == 0 ? fxControllerProxy.getPrefHeight() : fxWindow.preHeight();
Scene scene = new Scene(fxControllerProxy, preWidth, preHeight);
stage.setScene(scene);
windowAnnotationParser.parse(stage, fxControllerProxy, fxWindow);
stage.show();
+ return stage;
}
- private FXFactory() {
+ private FXControllerFactory() {
}
-
- private static FXBaseController getFxBaseController(Class clazz, String controllerName) {
-
- return null;
- }
-
-
- public static void loadFXController(Class clazz, BeanBuilder beanBuilder) {
- if (clazz.getDeclaredAnnotation(FXWindow.class) != null) {
- getFXController(clazz, null, beanBuilder);
+ public static void loadMainStage(Class clazz, BeanBuilder beanBuilder) {
+ FXWindow declaredAnnotation = (FXWindow) clazz.getDeclaredAnnotation(FXWindow.class);
+ if ( declaredAnnotation != null && declaredAnnotation.mainStage() == true ) {
+ getFXWindow(clazz, null, beanBuilder);
}
}
@@ -194,7 +179,43 @@ public class FXFactory {
FXBaseController fxBaseController = getFxBaseController(clazz, controllerName, beanBuilder);
return fxBaseController;
}
+ public static Stage getFXWindow(Class clazz){
+ FXWindow fxWindow = (FXWindow) clazz.getDeclaredAnnotation(FXWindow.class);
+ if(fxWindow !=null){
+ FXBaseController fxController = getFXController(clazz, null, BEAN_BUILDER);
+ return createWindow(fxWindow, fxController);
+ }else{
+ return null;
+ }
+ }
+ public static Stage getFXWindow(Class clazz, BeanBuilder beanBuilder) {
+ FXWindow fxWindow = (FXWindow) clazz.getDeclaredAnnotation(FXWindow.class);
+ if(fxWindow !=null){
+ FXBaseController fxController = getFXController(clazz, null, beanBuilder);
+ return createWindow(fxWindow, fxController);
+ }else{
+ return null;
+ }
+ }
+ public static Stage getFXWindow(Class clazz, String controllerName) {
+ FXWindow fxWindow = (FXWindow) clazz.getDeclaredAnnotation(FXWindow.class);
+ if(fxWindow !=null){
+ FXBaseController fxController = getFXController(clazz, controllerName, BEAN_BUILDER);
+ return createWindow(fxWindow, fxController);
+ }else{
+ return null;
+ }
+ }
+ public static Stage getFXWindow(Class clazz, String controllerName, BeanBuilder beanBuilder){
+ FXWindow fxWindow = (FXWindow) clazz.getDeclaredAnnotation(FXWindow.class);
+ if(fxWindow !=null){
+ FXBaseController fxController = getFXController(clazz, controllerName, beanBuilder);
+ return createWindow(fxWindow, fxController);
+ }else{
+ return null;
+ }
+ }
private static void parseData(Object object) {
Class clazz = object.getClass();
Field[] fields = clazz.getDeclaredFields();
@@ -205,7 +226,7 @@ public class FXFactory {
//建立代理
try {
Object fieldValue = field.get(object);
- Object objectProxy = FXEntityFactory.createJavaBeanProxy(fieldValue);
+ Object objectProxy = FXEntityFactory.warpFxBean(fieldValue);
field.set(object, objectProxy);
} catch (IllegalAccessException e) {
e.printStackTrace();
@@ -264,4 +285,12 @@ public class FXFactory {
}
}
}
+
+ private boolean isFXWindow(Class clazz){
+ if(clazz.getDeclaredAnnotation(FXWindow.class)!=null){
+ return true;
+ }else{
+ return false;
+ }
+ }
}
diff --git a/src/main/java/cn/edu/scau/biubiusuisui/factory/FXEntityFactory.java b/src/main/java/cn/edu/scau/biubiusuisui/factory/FXEntityFactory.java
index 0fb2ac1..e2438c2 100644
--- a/src/main/java/cn/edu/scau/biubiusuisui/factory/FXEntityFactory.java
+++ b/src/main/java/cn/edu/scau/biubiusuisui/factory/FXEntityFactory.java
@@ -1,7 +1,7 @@
package cn.edu.scau.biubiusuisui.factory;
import cn.edu.scau.biubiusuisui.annotation.FXField;
-import cn.edu.scau.biubiusuisui.entity.FXFieldPropertyMapping;
+import cn.edu.scau.biubiusuisui.entity.FXFieldWarpper;
import cn.edu.scau.biubiusuisui.entity.FXPlusContext;
import cn.edu.scau.biubiusuisui.proxy.FXEntityProxy;
import cn.edu.scau.biubiusuisui.utils.ClassUtils;
@@ -22,21 +22,21 @@ public class FXEntityFactory {
private FXEntityFactory(){}
- public static Object createJavaBeanProxy(Class clazz){
- return createJavaBeanProxy(clazz, new FXBuilder());
+ public static Object warpFxBean(Class clazz){
+ return warpFxBean(clazz, new FXBuilder());
}
- public static Object createJavaBeanProxy(Class clazz,BeanBuilder beanBuilder) {
+ public static Object warpFxBean(Class clazz, BeanBuilder beanBuilder) {
Object object = null;
object = beanBuilder.getBean(clazz);
if(object !=null){
- return createJavaBeanProxy(object);
+ return warpFxBean(object);
}else {
return null;
}
}
- public static Object createJavaBeanProxy(Object object){
+ public static Object warpFxBean(Object object){
FXEntityProxy fxEntityProxy = new FXEntityProxy();
Object objectProxy = null;
try {
@@ -49,10 +49,8 @@ public class FXEntityFactory {
return objectProxy;
}
-
- public static void processFXEntityProxy(Object entity, Object proxy,FXEntityProxy fxEntityProxy) throws IllegalAccessException {
- Map stringPropertyMap = new HashMap<>();
- Map fxFieldPropertyMappingHashMap = new HashMap<>();
+ private static void processFXEntityProxy(Object entity, Object proxy,FXEntityProxy fxEntityProxy) throws IllegalAccessException {
+ Map fxFieldWarpperMap = new HashMap<>();
Field []fields = entity.getClass().getDeclaredFields();
for(Field field:fields){
Annotation annotation = ClassUtils.getAnnotationInList( FXField.class,field.getDeclaredAnnotations());
@@ -60,14 +58,9 @@ public class FXEntityFactory {
Property property = null;
field.setAccessible(true);
FXField fxField = (FXField)annotation;
-
- FXFieldPropertyMapping fieldPropertyMapping = new FXFieldPropertyMapping();
-
- fieldPropertyMapping.setReadOnly(fxField.readOnly());
- fieldPropertyMapping.setType(field.getType());
-
- fxFieldPropertyMappingHashMap.put(field.getName(), fieldPropertyMapping);
-
+ FXFieldWarpper fieldWarpper = new FXFieldWarpper();
+ fieldWarpper.setFxField(fxField);
+ fieldWarpper.setType(field.getType());
if(field.get(entity) == null){
property = getFieldDefalutProperty(field);
@@ -75,10 +68,9 @@ public class FXEntityFactory {
property = getFieldProperty(entity, field);
}
if(property !=null) {
- //添加时间;
property.addListener((object,oldVal,newVal)->{
if(!fxField.readOnly()) {
- if(!field.getType().equals(List.class)) {
+ if(!List.class.isAssignableFrom(field.getType())) {
try {
field.set(proxy, newVal);
} catch (IllegalAccessException e) {
@@ -87,12 +79,12 @@ public class FXEntityFactory {
}
}
});
- stringPropertyMap.put(field.getName(), property);
}
+ fieldWarpper.setProperty(property);
+ fxFieldWarpperMap.put(field.getName(), fieldWarpper);
}
}
- fxEntityProxy.setStringPropertyMap(stringPropertyMap);
- fxEntityProxy.setFxFieldPropertyMappingMap(fxFieldPropertyMappingHashMap);
+ fxEntityProxy.setFxFieldWarpperMap(fxFieldWarpperMap);
}
@@ -115,9 +107,9 @@ public class FXEntityFactory {
property = new SimpleLongProperty((Long) value);
}else if(String.class.equals(type)){
property = new SimpleStringProperty((String) value);
- }else if(List.class.equals(type)){
+ }else if(List.class.isAssignableFrom(type)){
property = new SimpleListProperty(FXCollections.observableList((List)value));
- }else if(Object.class.equals(type)){
+ }else if(Object.class.isAssignableFrom(type)){
property = new SimpleObjectProperty(value);
}
return property;
@@ -137,12 +129,14 @@ public class FXEntityFactory {
property = new SimpleLongProperty();
}else if(String.class.equals(type)){
property = new SimpleStringProperty();
- }else if(List.class.equals(type)){
+ }else if(List.class.isAssignableFrom(type)){
property = new SimpleListProperty();
- }else if(Object.class.equals(type)){
+ }else if(Object.class.isAssignableFrom(type)){
property = new SimpleObjectProperty();
}
return property;
}
+
+
}
diff --git a/src/main/java/cn/edu/scau/biubiusuisui/messageQueue/MessageQueue.java b/src/main/java/cn/edu/scau/biubiusuisui/messageQueue/MessageQueue.java
index d8418f1..0bade96 100644
--- a/src/main/java/cn/edu/scau/biubiusuisui/messageQueue/MessageQueue.java
+++ b/src/main/java/cn/edu/scau/biubiusuisui/messageQueue/MessageQueue.java
@@ -59,7 +59,6 @@ public class MessageQueue {
for (FXMethodEntity fxMethodEntity : lists) {
Method method = fxMethodEntity.getMethod();
method.setAccessible(true);
-
FXBaseController fxBaseController = fxMethodEntity.getFxBaseController();
if (method.getParameterCount() == 0) {
try {
diff --git a/src/main/java/cn/edu/scau/biubiusuisui/proxy/FXEntityProxy.java b/src/main/java/cn/edu/scau/biubiusuisui/proxy/FXEntityProxy.java
index 6a1cb30..339c979 100644
--- a/src/main/java/cn/edu/scau/biubiusuisui/proxy/FXEntityProxy.java
+++ b/src/main/java/cn/edu/scau/biubiusuisui/proxy/FXEntityProxy.java
@@ -1,6 +1,6 @@
package cn.edu.scau.biubiusuisui.proxy;
-import cn.edu.scau.biubiusuisui.entity.FXFieldPropertyMapping;
+import cn.edu.scau.biubiusuisui.entity.FXFieldWarpper;
import cn.edu.scau.biubiusuisui.utils.StringUtils;
import javafx.beans.property.*;
import net.sf.cglib.proxy.Enhancer;
@@ -17,9 +17,7 @@ import java.util.Map;
public class FXEntityProxy implements MethodInterceptor {
Object target;
-
- private Map stringPropertyMap;
- private Map fxFieldPropertyMappingMap;
+ private Map fxFieldWarpperMap;
public Object getInstance(Object target) {
this.target = target;
@@ -41,7 +39,6 @@ public class FXEntityProxy implements MethodInterceptor {
*/
@Override
public Object intercept(Object o, Method method, Object[] objects, MethodProxy methodProxy) throws Throwable {
-
Object o1 = methodProxy.invokeSuper(o, objects);
String methodName = method.getName();
String fieldName = null;
@@ -50,12 +47,12 @@ public class FXEntityProxy implements MethodInterceptor {
} else {
return o1;
}
- FXFieldPropertyMapping fxFieldPropertyMapping = fxFieldPropertyMappingMap.get(fieldName);
- Property property = stringPropertyMap.get(fieldName);
- if(fxFieldPropertyMapping == null || property == null){
+ FXFieldWarpper fxFieldWarpper = fxFieldWarpperMap.get(fieldName);
+ Property property = getPropertyByFieldName(fieldName);
+ if(fxFieldWarpper == null || property == null){
return o1;
}
- Class type = fxFieldPropertyMapping.getType();
+ Class type = fxFieldWarpper.getType();
if (methodName.startsWith("set")) {
if(Boolean.class.equals(type) || boolean.class.equals(type)){
((SimpleBooleanProperty)property).set((Boolean)objects[0]);
@@ -77,8 +74,6 @@ public class FXEntityProxy implements MethodInterceptor {
}else if(methodName.startsWith("cls")){
((SimpleListProperty)(property)).clear();
}
-
- //修改
return o1;
}
@@ -91,22 +86,17 @@ public class FXEntityProxy implements MethodInterceptor {
}
public Property getPropertyByFieldName(String name) {
- return stringPropertyMap.get(name);
+ if(fxFieldWarpperMap.get(name) ==null){
+ return null;
+ }
+ return fxFieldWarpperMap.get(name).getProperty() ;
}
- public Map getStringPropertyMap() {
- return stringPropertyMap;
+ public Map getFxFieldWarpperMap() {
+ return fxFieldWarpperMap;
}
- public void setStringPropertyMap(Map stringPropertyMap) {
- this.stringPropertyMap = stringPropertyMap;
- }
-
- public Map getFxFieldPropertyMappingMap() {
- return fxFieldPropertyMappingMap;
- }
-
- public void setFxFieldPropertyMappingMap(Map fxFieldPropertyMappingMap) {
- this.fxFieldPropertyMappingMap = fxFieldPropertyMappingMap;
+ public void setFxFieldWarpperMap(Map fxFieldWarpperMap) {
+ this.fxFieldWarpperMap = fxFieldWarpperMap;
}
}
diff --git a/src/main/java/cn/edu/scau/biubiusuisui/utils/BeanUtil.java b/src/main/java/cn/edu/scau/biubiusuisui/utils/BeanUtil.java
new file mode 100644
index 0000000..54ed9aa
--- /dev/null
+++ b/src/main/java/cn/edu/scau/biubiusuisui/utils/BeanUtil.java
@@ -0,0 +1,19 @@
+package cn.edu.scau.biubiusuisui.utils;
+
+import cn.edu.scau.biubiusuisui.entity.FXPlusContext;
+import cn.edu.scau.biubiusuisui.proxy.FXEntityProxy;
+import javafx.beans.property.Property;
+
+/**
+ * @Author jack
+ * @Date:2019/7/28 1:52
+ */
+public class BeanUtil {
+ public static Property getPropertyByName(Object entity, String fieldName){
+ FXEntityProxy fxEntityProxy = FXPlusContext.getProxyByBeanObject(entity);
+ if(fxEntityProxy == null){
+ return null;
+ }
+ return fxEntityProxy.getFxFieldWarpperMap().get(fieldName).getProperty();
+ }
+}
diff --git a/src/main/resources/listDemo.fxml b/src/main/resources/listDemo.fxml
new file mode 100644
index 0000000..ea36b91
--- /dev/null
+++ b/src/main/resources/listDemo.fxml
@@ -0,0 +1,12 @@
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/test/java/cn/edu/scau/biubiusuisui/factory/FXEntityFactoryTest.java b/src/test/java/cn/edu/scau/biubiusuisui/factory/FXEntityFactoryTest.java
index ce4ae3e..6a68f82 100644
--- a/src/test/java/cn/edu/scau/biubiusuisui/factory/FXEntityFactoryTest.java
+++ b/src/test/java/cn/edu/scau/biubiusuisui/factory/FXEntityFactoryTest.java
@@ -34,7 +34,7 @@ public class FXEntityFactoryTest {
@Test
public void createJavaBeanProxy2() throws InstantiationException, IllegalAccessException {
-// Student student1 = (Student) FXEntityFactory.createJavaBeanProxy(Student.class);
+// Student student1 = (Student) FXEntityFactory.warpFxBean(Student.class);
// System.out.println(student1);
// FXPlusContext.getProxyByBeanObject(student1).getStringPropertyMap().forEach((k, v)->{
// System.out.println("k " +k +"v" + v);