修复了bug,调整了框架中类和函数命名
This commit is contained in:
@@ -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;
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
|
||||
@@ -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;
|
||||
}
|
||||
}
|
||||
@@ -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;
|
||||
}
|
||||
|
||||
}
|
||||
@@ -22,17 +22,8 @@ public class FXPlusContext {
|
||||
|
||||
private static Map<String, List<FXBaseController>> controllerContext = new ConcurrentHashMap<>(); //FXController控制器注册表
|
||||
|
||||
private static Map<Object, FXEntityProxy> beanProxyMap = new ConcurrentHashMap<>(); // Object注册为FXEntityObject
|
||||
private static Map<Object, FXEntityProxy> 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<String, Object> session = new ConcurrentHashMap<>();
|
||||
|
||||
public static void addController(FXBaseController fxBaseController){
|
||||
List<FXBaseController> 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<Object, FXEntityProxy> getBeanProxyMap() {
|
||||
return beanProxyMap;
|
||||
beanMap.put(object,fxEntityProxy);
|
||||
}
|
||||
|
||||
public static void setBeanProxyMap(Map<Object, FXEntityProxy> beanProxyMap) {
|
||||
FXPlusContext.beanProxyMap = beanProxyMap;
|
||||
}
|
||||
|
||||
public static Map<String, List<FXBaseController>> getControllerContext() {
|
||||
return controllerContext;
|
||||
}
|
||||
|
||||
public static void setControllerContext(Map<String, List<FXBaseController>> controllerContext) {
|
||||
FXPlusContext.controllerContext = controllerContext;
|
||||
}
|
||||
|
||||
public static Map<String, Object> getSession() {
|
||||
return session;
|
||||
}
|
||||
|
||||
public static void setSession(Map<String, Object> session) {
|
||||
FXPlusContext.session = session;
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user