fixes #455 Table/TreeTable Memento: support more than one (Tree)Table

eclipse-efx · May 3, 2023 · e6a79c6 · e6a79c6
1 parent 7f7be1c
commit e6a79c6
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 6 deletions.
diff --git a/....eclipse.fx.ui.controls/src/main/java/org/eclipse/fx/ui/controls/table/TableViewUtil.java b/....eclipse.fx.ui.controls/src/main/java/org/eclipse/fx/ui/controls/table/TableViewUtil.java
@@ -104,7 +104,7 @@ public static <S> TableView<S> restoreState(TableView<S> view, Memento m, Functi
 		Map<TableColumn<S, ?>, String> nodeToIdMap = idToNodeMap.entrySet().stream().collect(Collectors.toMap(Entry::getValue, Entry::getKey));
 
 		@SuppressWarnings("unchecked")
-		final List<String> savedOrder = m.get(COLUMN_ORDER_KEY, List.class, Collections.emptyList());
+		final List<String> savedOrder = m.get(getColumnOrderKey(view), List.class, Collections.emptyList());
 
 		if( savedOrder == null ) {
 			throw new IllegalStateException();
@@ -142,7 +142,7 @@ public static <S> TableView<S> restoreState(TableView<S> view, Memento m, Functi
 		if (isPropertySet(properties, TableView_Properties.COLUMN_ORDER)) {
 			List<String> currentOrder = view.getColumns().stream().map(columnKeyProvider).collect(Collectors.toList());
 			@SuppressWarnings("unchecked")
-			List<String> restoredOrder = m.get(COLUMN_ORDER_KEY, List.class, currentOrder);
+			List<String> restoredOrder = m.get(getColumnOrderKey(view), List.class, currentOrder);
 			if (!currentOrder.equals(restoredOrder)) {
 				// Unable to restore if the column count matches
 				if (restoredOrder != null && currentOrder.size() == restoredOrder.size()) {
@@ -314,7 +314,7 @@ public static <S> Subscription enableAutomaticCaptureing(TableView<S> view, Meme
 						});
 					}
 					if (c.wasPermutated() || c.wasAdded() && c.wasRemoved()) {
-						m.put(COLUMN_ORDER_KEY, view.getColumns().stream().map(columnKeyProvider).collect(Collectors.toList()), ObjectSerializer.JAXB_SERIALIZER);
+						m.put(getColumnOrderKey(view), view.getColumns().stream().map(columnKeyProvider).collect(Collectors.toList()), ObjectSerializer.JAXB_SERIALIZER);
 					}
 				}
 			});
@@ -348,4 +348,11 @@ private static String key(String key, Enum<?> property) {
 	private static boolean isPropertySet(TableView_Properties[] properties, TableView_Properties property) {
 		return properties.length == 0 || Arrays.asList(properties).contains(property);
 	}
+
+	private static String getColumnOrderKey(TableView<?> view) {
+		if (view.getId() != null) {
+			return view.getId() + "_" + COLUMN_ORDER_KEY;
+		}
+		return COLUMN_ORDER_KEY;
+	}
 }
diff --git a/...lipse.fx.ui.controls/src/main/java/org/eclipse/fx/ui/controls/tree/TreeTableViewUtil.java b/...lipse.fx.ui.controls/src/main/java/org/eclipse/fx/ui/controls/tree/TreeTableViewUtil.java
@@ -105,7 +105,7 @@ public static <S> TreeTableView<S> restoreState(TreeTableView<S> view, Memento m
 		Map<TreeTableColumn<S, ?>, String> nodeToIdMap = idToNodeMap.entrySet().stream().collect(Collectors.toMap(Entry::getValue, Entry::getKey));
 
 		@SuppressWarnings("unchecked")
-		final @Nullable List<String> savedOrder = m.get(COLUMN_ORDER_KEY, List.class, Collections.emptyList());
+		final @Nullable List<String> savedOrder = m.get(getColumnOrderKey(view), List.class, Collections.emptyList());
 
 		if( savedOrder == null ) {
 			throw new IllegalStateException();
@@ -143,7 +143,7 @@ public static <S> TreeTableView<S> restoreState(TreeTableView<S> view, Memento m
 		if (isPropertySet(properties, TreeTableView_Properties.COLUMN_ORDER)) {
 			List<String> currentOrder = view.getColumns().stream().map(columnKeyProvider).collect(Collectors.toList());
 			@SuppressWarnings("unchecked")
-			List<String> restoredOrder = m.get(COLUMN_ORDER_KEY, List.class, currentOrder);
+			List<String> restoredOrder = m.get(getColumnOrderKey(view), List.class, currentOrder);
 			if (!currentOrder.equals(restoredOrder)) {
 				// Unable to restore if the column count matches
 				if (restoredOrder != null && currentOrder.size() == restoredOrder.size()) {
@@ -316,7 +316,7 @@ public static <S> Subscription enableAutomaticCaptureing(TreeTableView<S> view,
 						});
 					}
 					if (c.wasPermutated() || c.wasAdded() && c.wasRemoved()) {
-						m.put(COLUMN_ORDER_KEY, view.getColumns().stream().map(columnKeyProvider).collect(Collectors.toList()), ObjectSerializer.JAXB_SERIALIZER);
+						m.put(getColumnOrderKey(view), view.getColumns().stream().map(columnKeyProvider).collect(Collectors.toList()), ObjectSerializer.JAXB_SERIALIZER);
 					}
 				}
 			});
@@ -350,4 +350,11 @@ private static String key(String key, Enum<?> property) {
 	private static boolean isPropertySet(TreeTableView_Properties[] properties, TreeTableView_Properties property) {
 		return properties.length == 0 || Arrays.asList(properties).contains(property);
 	}
+
+	private static String getColumnOrderKey(TableView<?> view) {
+		if (view.getId() != null) {
+			return view.getId() + "_" + COLUMN_ORDER_KEY;
+		}
+		return COLUMN_ORDER_KEY;
+	}
 }