Card Pane Association (#549)

* Allow specifying tree node hash code as string name of card in settings/preferences card panes.
* If card with the tree node name does not exist, then showing it is a noop, and hash code name takes precedence.
* Use hash code for all built in settings/preferences panels in the card panes.

org/lateralgm/main/LGM.java

@@ -131,7 +131,7 @@
 
 public final class LGM
 	{
-	public static final String version = "1.8.222"; //$NON-NLS-1$
+	public static final String version = "1.8.223"; //$NON-NLS-1$
 
 	// TODO: This list holds the class loader for any loaded plugins which should be
 	// cleaned up and closed when the application closes.

org/lateralgm/main/PreferencesFrame.java

@@ -120,7 +120,7 @@ public PreferencesFrame()
 			{
 			DefaultMutableTreeNode node = new DefaultMutableTreeNode(group.name);
 			root.add(node);
-			cardPane.add(group.makePanel(), group.name);
+			cardPane.add(group.makePanel(), Integer.toString(node.hashCode()));
 			}
 
 		//TODO: Fix UI bugs in JoshEdit repo and then use the serialize feature to save them.
@@ -161,20 +161,24 @@ public PreferencesFrame()
 
 		tree.addTreeSelectionListener(new TreeSelectionListener()
 			{
-				public void valueChanged(TreeSelectionEvent e)
-					{
-					DefaultMutableTreeNode node =
-						(DefaultMutableTreeNode) tree.getLastSelectedPathComponent();
+			public void valueChanged(TreeSelectionEvent e)
+				{
+				// retrieve the node that was selected
+				DefaultMutableTreeNode node =
+					(DefaultMutableTreeNode) tree.getLastSelectedPathComponent();
 
-					/* if nothing is selected */
-					if (node == null) return;
+				// short-circuit if nothing is selected
+				if (node == null) return;
 
-					/* retrieve the node that was selected */
-					String nodeInfo = node.getUserObject().toString();
+				CardLayout cl = (CardLayout) (cardPane.getLayout());
 
-					CardLayout cl = (CardLayout) (cardPane.getLayout());
-					cl.show(cardPane,nodeInfo);
-					}
+				// show panel with same name as the node
+				String nodeInfo = node.getUserObject().toString();
+				cl.show(cardPane,nodeInfo);
+				// show card with node hash if name was not unique
+				nodeInfo = Integer.toString(node.hashCode());
+				cl.show(cardPane,nodeInfo);
+				}
 			});
 
 		JScrollPane scroll = new JScrollPane(tree);

org/lateralgm/subframes/GameSettingFrame.java

@@ -844,21 +844,27 @@ public GameSettingFrame(GameSettings res, ResNode node)
 		// reload after adding all root children to make sure its children are visible
 		((DefaultTreeModel)tree.getModel()).reload();
 
-		tree.addTreeSelectionListener(new TreeSelectionListener() {
-		public void valueChanged(TreeSelectionEvent e) {
+		tree.addTreeSelectionListener(new TreeSelectionListener()
+			{
+			public void valueChanged(TreeSelectionEvent e)
+				{
+				// retrieve the node that was selected
 				DefaultMutableTreeNode node = (DefaultMutableTreeNode)
 													 tree.getLastSelectedPathComponent();
-
-				// if nothing is selected
+	
+				// short-circuit if nothing is selected
 				if (node == null) return;
+
+				CardLayout cl = (CardLayout) (cardPane.getLayout());
 
-				// retrieve the node that was selected
+				// show panel with same name as the node
 				String nodeInfo = node.getUserObject().toString();
-
-				CardLayout cl = (CardLayout)(cardPane.getLayout());
-				cl.show(cardPane, nodeInfo);
-			}
-		});
+				cl.show(cardPane,nodeInfo);
+				// show card with node hash if name was not unique
+				nodeInfo = Integer.toString(node.hashCode());
+				cl.show(cardPane,nodeInfo);
+				}
+			});
 
 		JSplitPane split = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT,true,
 				new JScrollPane(tree),cardPane);
@@ -892,7 +898,7 @@ private DefaultMutableTreeNode buildTab(DefaultMutableTreeNode root, String key,
 		root.add(node);
 		if (pane != null) {
 			pane.setName(key);
-			cardPane.add(Messages.getString(key),pane);
+			cardPane.add(pane,Integer.toString(node.hashCode()));
 		}
 		return node;
 	}