From 5e69847e7d8a012c31514edeabc328a766ec1aae Mon Sep 17 00:00:00 2001
From: Harald Wolff <haraldwolff@hwo-devel.drbender.lupus>
Date: Thu, 15 Sep 2016 10:25:15 +0200
Subject: [PATCH] TableMapper Update

---
 src/org/hwo/models/TableMapper/TableMapper.java | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/src/org/hwo/models/TableMapper/TableMapper.java b/src/org/hwo/models/TableMapper/TableMapper.java
index 5356699..dde8466 100644
--- a/src/org/hwo/models/TableMapper/TableMapper.java
+++ b/src/org/hwo/models/TableMapper/TableMapper.java
@@ -14,6 +14,8 @@ import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
 import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.Collection;
+import java.util.Collections;
 import java.util.Comparator;
 import java.util.Hashtable;
 import java.util.LinkedList;
@@ -433,11 +435,12 @@ public class TableMapper extends AbstractTableModel
 		
 		try {
 			Object editorObject = getEditorObject();
+			if (editorObject != null){
+				centerWindowOnPointer( ObjectEditorUIHelper.editor(editorObject) );
 			
-			centerWindowOnPointer(ObjectEditorUIHelper.editor(editorObject));
-			
-			if (ObjectEditorUIHelper.edit(editorObject)){
-				fireTableDataChanged();
+				if (ObjectEditorUIHelper.edit(editorObject)){
+					fireTableDataChanged();
+				}
 			}
 			
 			return;
@@ -566,7 +569,7 @@ public class TableMapper extends AbstractTableModel
 	
 	private void reorderColumns()
 	{
-		p_columns.sort(new Comparator<ColumnInfo>() {
+		Collections.sort(p_columns,new Comparator<ColumnInfo>() {
 			@Override
 			public int compare(ColumnInfo o1, ColumnInfo o2) {
 				return o1.getOrder()-o2.getOrder();