From c9d8f46f15e3c7c74a5b10929d4fdc340d128bf2 Mon Sep 17 00:00:00 2001
From: Harald Wolff <haraldwolff@hwo-book>
Date: Fri, 2 Dec 2016 09:17:14 +0100
Subject: [PATCH] WIP161202

---
 src/org/hwo/models/TableMapper/TableMapper.java |  2 +-
 src/org/hwo/ui/EditorComponent.java             | 11 +++++++++++
 src/org/hwo/ui/KeyStrokeHelper.java             |  1 +
 src/org/hwo/ui/diagram/SimplePlotLabeler.java   |  2 +-
 4 files changed, 14 insertions(+), 2 deletions(-)
 create mode 100644 src/org/hwo/ui/EditorComponent.java

diff --git a/src/org/hwo/models/TableMapper/TableMapper.java b/src/org/hwo/models/TableMapper/TableMapper.java
index 2c8d6fb..ca4b50b 100644
--- a/src/org/hwo/models/TableMapper/TableMapper.java
+++ b/src/org/hwo/models/TableMapper/TableMapper.java
@@ -229,7 +229,7 @@ public class TableMapper extends AbstractTableModel
 		{
 			Object v = fetchValue(instance);
 			
-			if (v.getClass().isArray() && (extractField != null)){
+			if ((v!=null) && v.getClass().isArray() && (extractField != null)){
 				v = ((Object[])v)[extractField];
 			}
 			
diff --git a/src/org/hwo/ui/EditorComponent.java b/src/org/hwo/ui/EditorComponent.java
new file mode 100644
index 0000000..617c207
--- /dev/null
+++ b/src/org/hwo/ui/EditorComponent.java
@@ -0,0 +1,11 @@
+package org.hwo.ui;
+
+import java.awt.Component;
+
+public interface EditorComponent {
+
+	public Component asComponent();
+	public void setEditorValue(Object value);
+	public Object getEditorValue();
+	
+}
diff --git a/src/org/hwo/ui/KeyStrokeHelper.java b/src/org/hwo/ui/KeyStrokeHelper.java
index dea4151..3770d36 100644
--- a/src/org/hwo/ui/KeyStrokeHelper.java
+++ b/src/org/hwo/ui/KeyStrokeHelper.java
@@ -55,6 +55,7 @@ public class KeyStrokeHelper {
 		else
 			focused = JComponent.WHEN_FOCUSED;
 		component.registerKeyboardAction(new KeyStrokeActionListener(keyCode), KeyStroke.getKeyStroke(keyCode, 0), focused);
+		
 		return this;
 	}
 	
diff --git a/src/org/hwo/ui/diagram/SimplePlotLabeler.java b/src/org/hwo/ui/diagram/SimplePlotLabeler.java
index cb20e93..e759c79 100644
--- a/src/org/hwo/ui/diagram/SimplePlotLabeler.java
+++ b/src/org/hwo/ui/diagram/SimplePlotLabeler.java
@@ -43,7 +43,7 @@ public class SimplePlotLabeler implements PlotLabeler {
 					);
 		} else if (digits == 0){
 			return String.format("%1.2f",value);
-		} else if (digits > 0){
+		} else {
 			return String.format(
 					String.format("%%%d.2f",digits),
 					value