Merge lp:~tapaal-contributor/tapaal/slowComponentSorting into lp:tapaal/2.1

[Mathias Grund Sørensen]

[Jiri Srba (srba)]

review: Approve

[Kenneth Yrke Jørgensen (yrke)]

review: Approve

=== modified file 'src/dk/aau/cs/gui/TemplateExplorer.java'
--- src/dk/aau/cs/gui/TemplateExplorer.java	2012-03-07 11:17:45 +0000
+++ src/dk/aau/cs/gui/TemplateExplorer.java	2012-07-03 15:13:39 +0000
@@ -206,7 +206,10 @@
 				
 				if(index > 0) {
 					parent.swapTemplates(index, index-1);
-					updateTemplateList();
+					Object o = listModel.getElementAt(index);
+                    listModel.setElementAt(listModel.getElementAt(index-1), index);
+                    listModel.setElementAt(o, index-1);
+                    templateList.ensureIndexIsVisible(index+1);
 					templateList.setSelectedIndex(index-1);
 				}
 			}
@@ -227,7 +230,10 @@
 				
 				if(index < parent.network().allTemplates().size() - 1) {
 					parent.swapTemplates(index, index+1);
-					updateTemplateList();
+					Object o = listModel.getElementAt(index);
+                    listModel.setElementAt(listModel.getElementAt(index+1), index);
+                    listModel.setElementAt(o, index+1);
+                    templateList.ensureIndexIsVisible(index+1);
 					templateList.setSelectedIndex(index+1);
 				}
 			}