[CIShell-SVN] SF.net SVN: cishell: [217] trunk/clients/gui/org.cishell.reference.gui. datamanager/src/org/cishell/reference/gui/datamanager/ AbstractDataManagerView.java

[<bea...@us...>]

Revision: 217
          http://svn.sourceforge.net/cishell/?rev=217&view=rev
Author:   bearsfan
Date:     2006-09-28 12:34:50 -0700 (Thu, 28 Sep 2006)

Log Message:
-----------
When a new data object is added to the viewer, it will be highlighted.

Modified Paths:
--------------
    trunk/clients/gui/org.cishell.reference.gui.datamanager/src/org/cishell/reference/gui/datamanager/AbstractDataManagerView.java

Modified: trunk/clients/gui/org.cishell.reference.gui.datamanager/src/org/cishell/reference/gui/datamanager/AbstractDataManagerView.java
===================================================================
--- trunk/clients/gui/org.cishell.reference.gui.datamanager/src/org/cishell/reference/gui/datamanager/AbstractDataManagerView.java	2006-09-28 19:14:41 UTC (rev 216)
+++ trunk/clients/gui/org.cishell.reference.gui.datamanager/src/org/cishell/reference/gui/datamanager/AbstractDataManagerView.java	2006-09-28 19:34:50 UTC (rev 217)
@@ -189,9 +189,8 @@
 		dataToDataGUIItemMap.put(data, item);
 
 		// update the ModelManager with the new selection
-		Set selection = new HashSet();
+		final Set selection = new HashSet();
 		selection.add(data);
-		manager.setSelectedData((Data[]) selection.toArray(new Data[0]));
 		Display.getDefault().syncExec(new Runnable() {
 			public void run() {
 				if (!tree.isDisposed()) {
@@ -202,27 +201,12 @@
 					updateContextMenu(data);
 					// update the global selection
 					viewer.expandToLevel(item, 0);
-					selectItem(item, tree.getItems());
-					getSite().getSelectionProvider().setSelection(
-							new StructuredSelection(new Data[] { data }));
-					setFocus();
+					manager.setSelectedData((Data[]) selection.toArray(new Data[0]));
 				}
 			}
 		});
 	}
 
-	private void selectItem(DataGUIItem item, TreeItem[] items) {
-		for (int i = 0; i < items.length; i++) {
-			TreeItem treeItem = items[i];
-			if (treeItem.getData() == item) {
-				manager.setSelectedData(new Data[] { item.getModel() });
-				treeItem.getParent().setSelection(new TreeItem[] { treeItem });
-				return;
-			}
-			selectItem(item, treeItem.getItems());
-		}
-	}
-
 	public void dataLabelChanged(Data data, String label) {
 		if (data != null && label != null) {
 			TreeItem[] treeItems = tree.getItems();
@@ -246,11 +230,11 @@
 
 	public void dataSelected(final Data[] data) {
 		if (data != null) {
+			//setFocus();
 			Display.getDefault().syncExec(new Runnable() {
 				public void run() {
 					Set itemSet = new HashSet();
 					for (int i = 0; i < data.length; ++i) {
-
 						TreeItem[] treeItems = tree.getItems();
 						for (int j = 0; j < treeItems.length; ++j) {
 							if (treeItems[i].getData() == data[i]) {
@@ -261,6 +245,8 @@
 					}
 					tree.setSelection((TreeItem[]) itemSet
 							.toArray(new TreeItem[0]));
+					getSite().getSelectionProvider().setSelection(
+							new StructuredSelection(data));
 				}
 			});
 		}
@@ -298,8 +284,6 @@
 			}
 
 			manager.setSelectedData(modelArray);
-			getSite().getSelectionProvider().setSelection(
-					new StructuredSelection(modelArray));
 		}
 	}
 
@@ -440,10 +424,10 @@
 	 */
 	private class TreeItemEditorListener extends MouseAdapter implements
 			KeyListener {
-		// private TreeEditor editor;
+		private TreeEditor editor;
 
 		public TreeItemEditorListener(TreeEditor editor) {
-			// this.editor = editor;
+			this.editor = editor;
 		}
 
 		public void keyReleased(KeyEvent e) {
@@ -458,8 +442,12 @@
 
 		public void keyPressed(KeyEvent e) {
 		}
+		
+		public void mouseDown(MouseEvent e) {
+		}
 	}
 
+
 	private class DataModelSelectionProvider implements ISelectionProvider {
 
 		private Set listeners = new HashSet();


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.