Merge branch 'release/2.0.1'

upeuker · upeuker · commit ac416f82c38d · 2017-09-07T11:33:23.000+02:00
diff --git a/README.md b/README.md
@@ -7,3 +7,7 @@ Allgemeine Bibliothek für BitCtrl-Projekte
 ## Version 2.0
 - Update auf Java 8
 - MessageHandler-Interface erweitert
+
+## Version 2.0.1
+- AbstractBeanInfo prüft für Properties jetzt, ob es Getter und Setter gibt
+
diff --git a/pom.xml b/pom.xml
@@ -5,7 +5,7 @@
 
 	<groupId>com.bitctrl</groupId>
 	<artifactId>com.bitctrl</artifactId>
-	<version>2.0.0</version>
+	<version>2.0.1</version>
 
 	<name>Allgemeine BitCtrl-Bibliothek</name>
 	<url>http://bitctrl.github.io/${project.artifactId}/</url>
diff --git a/src/main/java/com/bitctrl/beans/AbstractBeanInfo.java b/src/main/java/com/bitctrl/beans/AbstractBeanInfo.java
@@ -30,6 +30,7 @@
 import java.beans.IntrospectionException;
 import java.beans.PropertyDescriptor;
 import java.beans.SimpleBeanInfo;
+import java.lang.reflect.Method;
 import java.util.Arrays;
 import java.util.List;
 
@@ -94,23 +95,26 @@ public PropertyDescriptor[] getPropertyDescriptors() {
 		synchronized (AbstractBeanInfo.class) {
 			if (propertyDescriptorCache == null) {
 				final PropertyInfo[] propInfo = getProperties();
-				final List<PropertyInfo> hiddenProps = Arrays
-						.asList(getHiddenProperties());
-				final List<PropertyInfo> preferredProps = Arrays
-						.asList(getPreferredProperties());
-				final List<PropertyInfo> expertProps = Arrays
-						.asList(getExpertProperties());
+				final List<PropertyInfo> hiddenProps = Arrays.asList(getHiddenProperties());
+				final List<PropertyInfo> preferredProps = Arrays.asList(getPreferredProperties());
+				final List<PropertyInfo> expertProps = Arrays.asList(getExpertProperties());
 				propertyDescriptorCache = new PropertyDescriptor[propInfo.length];
 
 				try {
 					for (int i = 0; i < propertyDescriptorCache.length; ++i) {
 						final PropertyDescriptor prop;
 
-						prop = new PropertyDescriptor(propInfo[i].name(),
-								getBeanClass());
+						Class<?> beanClass = getBeanClass();
+						String propName = propInfo[i].name();
+						propName = propName.substring(0, 1).toUpperCase() + propName.substring(1);
+
+						String readMethodName = getReadMethodName(beanClass, propName);
+						String writeMethodName = getWriteMethodName(beanClass, propName);
+
+						prop = new PropertyDescriptor(propInfo[i].name(), getBeanClass(), readMethodName,
+								writeMethodName);
 						prop.setDisplayName(getDisplayName(propInfo[i]));
-						prop
-								.setShortDescription(getShortDescription(propInfo[i]));
+						prop.setShortDescription(getShortDescription(propInfo[i]));
 						if (hiddenProps.contains(propInfo[i])) {
 							prop.setHidden(true);
 						}
@@ -132,6 +136,34 @@ public PropertyDescriptor[] getPropertyDescriptors() {
 		return propertyDescriptorCache;
 	}
 
+	private String getReadMethodName(Class<?> beanClass, String propName) {
+		
+		try {
+			return beanClass.getMethod("get" + propName).getName();
+		} catch (NoSuchMethodException ignored) {
+			try {
+				return beanClass.getMethod("is" + propName).getName();
+			} catch (NoSuchMethodException ex) {
+				return null;
+			}
+		}
+	}
+
+	private String getWriteMethodName(Class<?> beanClass, String propName) {
+		
+		String name = "set" + propName;
+		
+		Method[] declaredMethods = beanClass.getDeclaredMethods();
+		for ( Method method : declaredMethods) {
+			if( name.equals(method.getName())) {
+				return name;
+			}
+		}
+		
+		return null;
+	}
+
+	
 	/**
 	 * Gibt die Liste der Properties zurück der Java Bean zurück.
 	 * 
