Target Explorer: rework path map page, add enablement and up/down, fix

layout

10 files changed, 68 insertions, 110 deletions

diff --git a/target_explorer/plugins/org.eclipse.tcf.te.tcf.launch.ui/src/org/eclipse/tcf/te/tcf/launch/ui/attach/LaunchConfigurationTabGroup.java b/target_explorer/plugins/org.eclipse.tcf.te.tcf.launch.ui/src/org/eclipse/tcf/te/tcf/launch/ui/attach/LaunchConfigurationTabGroup.java
index 53886e452..6ffe56915 100644
--- a/target_explorer/plugins/org.eclipse.tcf.te.tcf.launch.ui/src/org/eclipse/tcf/te/tcf/launch/ui/attach/LaunchConfigurationTabGroup.java
+++ b/target_explorer/plugins/org.eclipse.tcf.te.tcf.launch.ui/src/org/eclipse/tcf/te/tcf/launch/ui/attach/LaunchConfigurationTabGroup.java
@@ -15,9 +15,9 @@ import org.eclipse.core.runtime.Assert;
 import org.eclipse.debug.ui.ILaunchConfigurationDialog;
 import org.eclipse.debug.ui.ILaunchConfigurationTab;
 import org.eclipse.debug.ui.sourcelookup.SourceLookupTab;
-import org.eclipse.tcf.internal.debug.ui.launch.TCFMemoryMapTab;
-import org.eclipse.tcf.internal.debug.ui.launch.TCFPathMapTab;
 import org.eclipse.tcf.te.launch.ui.tabs.AbstractLaunchConfigurationTabGroup;
+import org.eclipse.tcf.te.tcf.launch.ui.editor.tabs.MemoryMapTab;
+import org.eclipse.tcf.te.tcf.launch.ui.editor.tabs.PathMapTab;
 
 /**
  * Remote application launch configuration tab group implementation.
@@ -41,8 +41,8 @@ public class LaunchConfigurationTabGroup extends AbstractLaunchConfigurationTabG
 	@Override
 	public void createAdditionalTabs(ILaunchConfigurationDialog dialog, List<ILaunchConfigurationTab> tabs, String mode) {
 
-		tabs.add(new TCFMemoryMapTab());
-		tabs.add(new TCFPathMapTab());
+		tabs.add(new MemoryMapTab(null));
+		tabs.add(new PathMapTab(null));
 		tabs.add(new SourceLookupTab());
 		//		tabs.add(new CommonTab());
 	}
diff --git a/target_explorer/plugins/org.eclipse.tcf.te.tcf.launch.ui/src/org/eclipse/tcf/te/tcf/launch/ui/editor/AbstractTcfLaunchTabContainerEditorPage.java b/target_explorer/plugins/org.eclipse.tcf.te.tcf.launch.ui/src/org/eclipse/tcf/te/tcf/launch/ui/editor/AbstractTcfLaunchTabContainerEditorPage.java
index d86f6d796..154fb7861 100644
--- a/target_explorer/plugins/org.eclipse.tcf.te.tcf.launch.ui/src/org/eclipse/tcf/te/tcf/launch/ui/editor/AbstractTcfLaunchTabContainerEditorPage.java
+++ b/target_explorer/plugins/org.eclipse.tcf.te.tcf.launch.ui/src/org/eclipse/tcf/te/tcf/launch/ui/editor/AbstractTcfLaunchTabContainerEditorPage.java
@@ -181,17 +181,16 @@ public abstract class AbstractTcfLaunchTabContainerEditorPage extends AbstractLa
 	@Override
 	public void setDirty(boolean dirty) {
 		if (isAutoSave()) {
-			ILaunchConfigurationWorkingCopy wc = getLaunchConfig(getPeerModel(getEditorInput()));
+			final ILaunchConfigurationWorkingCopy wc = getLaunchConfig(getPeerModel(getEditorInput()));
 			if (wc != null && dirty) {
-				try {
-					wc.doSave();
 					IPeerModel peerModel = getPeerModel(getEditorInput());
-					IPropertiesAccessService service = ServiceManager.getInstance()
-					                .getService(peerModel, IPropertiesAccessService.class);
+					IPropertiesAccessService service = ServiceManager.getInstance().getService(peerModel, IPropertiesAccessService.class);
 					service.setProperty(peerModel, PROP_LAUNCH_CONFIG_WC, null);
-				}
-				catch (Exception e) {
-				}
+					try {
+						wc.doSave();
+					}
+					catch (Exception e) {
+					}
 			}
 		}
 		else {
diff --git a/target_explorer/plugins/org.eclipse.tcf.te.tcf.launch.ui/src/org/eclipse/tcf/te/tcf/launch/ui/editor/MemoryMapEditorPage.java b/target_explorer/plugins/org.eclipse.tcf.te.tcf.launch.ui/src/org/eclipse/tcf/te/tcf/launch/ui/editor/MemoryMapEditorPage.java
index a6b5a6b94..918347477 100644
--- a/target_explorer/plugins/org.eclipse.tcf.te.tcf.launch.ui/src/org/eclipse/tcf/te/tcf/launch/ui/editor/MemoryMapEditorPage.java
+++ b/target_explorer/plugins/org.eclipse.tcf.te.tcf.launch.ui/src/org/eclipse/tcf/te/tcf/launch/ui/editor/MemoryMapEditorPage.java
@@ -12,7 +12,6 @@ package org.eclipse.tcf.te.tcf.launch.ui.editor;
 import org.eclipse.debug.ui.AbstractLaunchConfigurationTab;
 import org.eclipse.debug.ui.IDebugView;
 import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.tcf.internal.debug.ui.launch.TCFMemoryMapTab;
 import org.eclipse.tcf.te.tcf.launch.ui.editor.tabs.MemoryMapTab;
 import org.eclipse.ui.IEditorInput;
 import org.eclipse.ui.IEditorSite;
@@ -50,8 +49,8 @@ public class MemoryMapEditorPage extends AbstractTcfLaunchTabContainerEditorPage
 	@Override
 	public void selectionChanged(IWorkbenchPart part, ISelection selection) {
 		if (isActive() && part instanceof IDebugView) {
-			if (((TCFMemoryMapTab)getLaunchConfigurationTab()).updateContext()) {
-				((TCFMemoryMapTab)getLaunchConfigurationTab()).initializeFrom(getLaunchConfig(getPeerModel(getEditorInput())));
+			if (((MemoryMapTab)getLaunchConfigurationTab()).updateContext()) {
+				((MemoryMapTab)getLaunchConfigurationTab()).initializeFrom(getLaunchConfig(getPeerModel(getEditorInput())));
 			}
 		}
 	}
diff --git a/target_explorer/plugins/org.eclipse.tcf.te.tcf.launch.ui/src/org/eclipse/tcf/te/tcf/launch/ui/editor/SourceLookupEditorPage.java b/target_explorer/plugins/org.eclipse.tcf.te.tcf.launch.ui/src/org/eclipse/tcf/te/tcf/launch/ui/editor/SourceLookupEditorPage.java
index 9361050bb..86bb8dc3c 100644
--- a/target_explorer/plugins/org.eclipse.tcf.te.tcf.launch.ui/src/org/eclipse/tcf/te/tcf/launch/ui/editor/SourceLookupEditorPage.java
+++ b/target_explorer/plugins/org.eclipse.tcf.te.tcf.launch.ui/src/org/eclipse/tcf/te/tcf/launch/ui/editor/SourceLookupEditorPage.java
@@ -14,9 +14,12 @@ import org.eclipse.core.runtime.Preferences;
 import org.eclipse.core.runtime.Preferences.IPropertyChangeListener;
 import org.eclipse.core.runtime.Preferences.PropertyChangeEvent;
 import org.eclipse.debug.core.ILaunchConfiguration;
+import org.eclipse.debug.internal.ui.DebugPluginImages;
+import org.eclipse.debug.internal.ui.IInternalDebugUIConstants;
 import org.eclipse.debug.internal.ui.sourcelookup.SourceLookupPanel;
 import org.eclipse.debug.ui.AbstractLaunchConfigurationTab;
 import org.eclipse.swt.SWT;
+import org.eclipse.swt.graphics.Image;
 import org.eclipse.swt.layout.GridData;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.tcf.te.core.cdt.CdtUtils;
@@ -116,6 +119,11 @@ public class SourceLookupEditorPage extends AbstractTcfLaunchTabContainerEditorP
 				editorPage.extractData();
 			}
 		}
+
+		@Override
+        public Image getImage() {
+			return DebugPluginImages.getImage(IInternalDebugUIConstants.IMG_SRC_LOOKUP_TAB);
+		}
 	}
 
 	/* (non-Javadoc)
diff --git a/target_explorer/plugins/org.eclipse.tcf.te.tcf.launch.ui/src/org/eclipse/tcf/te/tcf/launch/ui/editor/tabs/MemoryMapTab.java b/target_explorer/plugins/org.eclipse.tcf.te.tcf.launch.ui/src/org/eclipse/tcf/te/tcf/launch/ui/editor/tabs/MemoryMapTab.java
index ac04d4f50..c316f997a 100644
--- a/target_explorer/plugins/org.eclipse.tcf.te.tcf.launch.ui/src/org/eclipse/tcf/te/tcf/launch/ui/editor/tabs/MemoryMapTab.java
+++ b/target_explorer/plugins/org.eclipse.tcf.te.tcf.launch.ui/src/org/eclipse/tcf/te/tcf/launch/ui/editor/tabs/MemoryMapTab.java
@@ -9,16 +9,12 @@
  *******************************************************************************/
 package org.eclipse.tcf.te.tcf.launch.ui.editor.tabs;
 
-import org.eclipse.core.runtime.Assert;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.layout.GridData;
 import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Table;
-import org.eclipse.swt.widgets.TableColumn;
 import org.eclipse.tcf.internal.debug.ui.commands.MemoryMapWidget;
 import org.eclipse.tcf.internal.debug.ui.launch.TCFMemoryMapTab;
 import org.eclipse.tcf.internal.debug.ui.model.TCFNode;
 import org.eclipse.tcf.te.tcf.launch.ui.editor.AbstractTcfLaunchTabContainerEditorPage;
+import org.eclipse.tcf.te.tcf.launch.ui.nls.Messages;
 
 /**
  * Customized TCF memory map launch configuration tab implementation to work better
@@ -43,45 +39,21 @@ public class MemoryMapTab extends TCFMemoryMapTab {
 	        super(composite, node);
         }
 
-        /* (non-Javadoc)
-         * @see org.eclipse.tcf.internal.debug.ui.commands.MemoryMapWidget#configureTableLayout(org.eclipse.swt.widgets.Table, int, int, java.lang.String[])
-         */
-        @Override
-        protected void configureTableLayout(Table table, int widthHint, int heighHint, String[] columnNames) {
-        	Assert.isNotNull(table);
-
-            GridData data = new GridData(GridData.FILL_BOTH);
-            data.widthHint = SWT.DEFAULT;
-            data.heightHint = heighHint;
-            table.setLayoutData(data);
-
-            for (int i = 0; i < columnNames.length; i++) {
-                final TableColumn column = new TableColumn(table, SWT.LEAD, i);
-                column.setMoveable(false);
-                column.setText(columnNames[i]);
-                switch (i) {
-        		case 0:
-        			column.setWidth(37);
-        			column.setData("widthHint", Integer.valueOf(37)); //$NON-NLS-1$
-					break;
-				case 1:
-                case 2:
-        			column.setWidth(10);
-        			column.setData("widthHint", Integer.valueOf(10)); //$NON-NLS-1$
-                    break;
-                case 4:
-        			column.setWidth(18);
-        			column.setData("widthHint", Integer.valueOf(18)); //$NON-NLS-1$
-                    break;
-                default:
-        			column.setWidth(7);
-        			column.setData("widthHint", Integer.valueOf(7)); //$NON-NLS-1$
-                    break;
-                }
-            }
-
-        	TableUtils.adjustTableColumnWidth(table);
-        }
+    	@Override
+    	protected String getColumnText(int column) {
+    		String text = super.getColumnText(column);
+    		if (text != null && text.trim().length() > 0) {
+    			String key = "MemoryMapEditorPage_column_" + text; //$NON-NLS-1$
+    			if (Messages.hasString(key))
+    				text = Messages.getString(key);
+    			else {
+        			key = "MemoryMapEditorPage_column_" + column; //$NON-NLS-1$
+        			if (Messages.hasString(key))
+        				text = Messages.getString(key);
+    			}
+    		}
+    	    return text != null ? text : ""; //$NON-NLS-1$
+    	}
 	}
 
 	/**
@@ -91,7 +63,6 @@ public class MemoryMapTab extends TCFMemoryMapTab {
      */
     public MemoryMapTab(AbstractTcfLaunchTabContainerEditorPage parentEditorPage) {
     	super();
-    	Assert.isNotNull(parentEditorPage);
     	this.parentEditorPage = parentEditorPage;
     }
 
@@ -110,8 +81,10 @@ public class MemoryMapTab extends TCFMemoryMapTab {
 	@Override
 	protected void updateLaunchConfigurationDialog() {
 		super.updateLaunchConfigurationDialog();
-		performApply(AbstractTcfLaunchTabContainerEditorPage.getLaunchConfig(parentEditorPage.getPeerModel(parentEditorPage.getEditorInput())));
-		parentEditorPage.checkLaunchConfigDirty();
+		if (parentEditorPage != null) {
+			performApply(AbstractTcfLaunchTabContainerEditorPage.getLaunchConfig(parentEditorPage.getPeerModel(parentEditorPage.getEditorInput())));
+			parentEditorPage.checkLaunchConfigDirty();
+		}
 	}
 
 	/* (non-Javadoc)
diff --git a/target_explorer/plugins/org.eclipse.tcf.te.tcf.launch.ui/src/org/eclipse/tcf/te/tcf/launch/ui/editor/tabs/PathMapTab.java b/target_explorer/plugins/org.eclipse.tcf.te.tcf.launch.ui/src/org/eclipse/tcf/te/tcf/launch/ui/editor/tabs/PathMapTab.java
index 3ec23500b..1880d1e24 100644
--- a/target_explorer/plugins/org.eclipse.tcf.te.tcf.launch.ui/src/org/eclipse/tcf/te/tcf/launch/ui/editor/tabs/PathMapTab.java
+++ b/target_explorer/plugins/org.eclipse.tcf.te.tcf.launch.ui/src/org/eclipse/tcf/te/tcf/launch/ui/editor/tabs/PathMapTab.java
@@ -9,9 +9,6 @@
  *******************************************************************************/
 package org.eclipse.tcf.te.tcf.launch.ui.editor.tabs;
 
-import org.eclipse.core.runtime.Assert;
-import org.eclipse.jface.viewers.TableViewer;
-import org.eclipse.swt.widgets.Composite;
 import org.eclipse.tcf.internal.debug.ui.launch.TCFPathMapTab;
 import org.eclipse.tcf.te.tcf.launch.ui.editor.AbstractTcfLaunchTabContainerEditorPage;
 import org.eclipse.tcf.te.tcf.launch.ui.nls.Messages;
@@ -31,7 +28,6 @@ public class PathMapTab extends TCFPathMapTab {
      */
     public PathMapTab(AbstractTcfLaunchTabContainerEditorPage parentEditorPage) {
     	super();
-    	Assert.isNotNull(parentEditorPage);
     	this.parentEditorPage = parentEditorPage;
     }
 
@@ -50,8 +46,10 @@ public class PathMapTab extends TCFPathMapTab {
 	@Override
 	protected void updateLaunchConfigurationDialog() {
 		super.updateLaunchConfigurationDialog();
-		performApply(AbstractTcfLaunchTabContainerEditorPage.getLaunchConfig(parentEditorPage.getPeerModel(parentEditorPage.getEditorInput())));
-		parentEditorPage.checkLaunchConfigDirty();
+		if (parentEditorPage != null) {
+			performApply(AbstractTcfLaunchTabContainerEditorPage.getLaunchConfig(parentEditorPage.getPeerModel(parentEditorPage.getEditorInput())));
+			parentEditorPage.checkLaunchConfigDirty();
+		}
 	}
 
 	/* (non-Javadoc)
@@ -63,44 +61,29 @@ public class PathMapTab extends TCFPathMapTab {
 	}
 
 	/* (non-Javadoc)
-	 * @see org.eclipse.tcf.internal.debug.ui.launch.TCFPathMapTab#createControl(org.eclipse.swt.widgets.Composite)
-	 */
-	@Override
-	public void createControl(Composite parent) {
-	    super.createControl(parent);
-
-	    TableViewer viewer = getViewer();
-	    if (viewer != null) TableUtils.adjustTableColumnWidth(viewer);
-	}
-
-	/* (non-Javadoc)
 	 * @see org.eclipse.tcf.internal.debug.ui.launch.TCFPathMapTab#getColumnText(int)
 	 */
 	@Override
 	protected String getColumnText(int column) {
 		String text = super.getColumnText(column);
-		String key = "PathMapEditorPage_column_" + text; //$NON-NLS-1$
-		if (Messages.hasString(key)) text = Messages.getString(key);
-	    return text;
+		if (text != null && text.trim().length() > 0) {
+			String key = "PathMapEditorPage_column_" + text; //$NON-NLS-1$
+			if (Messages.hasString(key))
+				text = Messages.getString(key);
+			else {
+    			key = "PathMapEditorPage_column_" + column; //$NON-NLS-1$
+    			if (Messages.hasString(key))
+    				text = Messages.getString(key);
+			}
+		}
+	    return text != null ? text : ""; //$NON-NLS-1$
 	}
 
 	/* (non-Javadoc)
-	 * @see org.eclipse.tcf.internal.debug.ui.launch.TCFPathMapTab#getColumnWidth(int)
+	 * @see org.eclipse.tcf.internal.debug.ui.launch.TCFPathMapTab#showContextQuery()
 	 */
 	@Override
-	protected int getColumnWidth(int column) {
-		int width = -1;
-		switch (column) {
-		case 0:
-		case 1:
-			width = 27;
-			break;
-		case 2:
-			width = 15;
-			break;
-		default:
-			width = -1;
-		}
-	    return width != -1 ? width : super.getColumnWidth(column);
+	protected boolean showContextQuery() {
+	    return false;
 	}
 }
diff --git a/target_explorer/plugins/org.eclipse.tcf.te.tcf.launch.ui/src/org/eclipse/tcf/te/tcf/launch/ui/editor/tabs/TableUtils.java b/target_explorer/plugins/org.eclipse.tcf.te.tcf.launch.ui/src/org/eclipse/tcf/te/tcf/launch/ui/editor/tabs/TableUtils.java
index 932834cb7..7aa2702fa 100644
--- a/target_explorer/plugins/org.eclipse.tcf.te.tcf.launch.ui/src/org/eclipse/tcf/te/tcf/launch/ui/editor/tabs/TableUtils.java
+++ b/target_explorer/plugins/org.eclipse.tcf.te.tcf.launch.ui/src/org/eclipse/tcf/te/tcf/launch/ui/editor/tabs/TableUtils.java
@@ -67,9 +67,11 @@ public final class TableUtils {
 					int weight = (width * 100) / sumColumnWidth;
 					int newWidth = (weight * tableWidth) / 100;
 					sumColumnWidth2 += newWidth;
-					column.setWidth(newWidth);
-					if (maxColumn == null || maxColumn.getWidth() < column.getWidth()) {
-						maxColumn = column;
+					if (column.getResizable()) {
+						column.setWidth(newWidth);
+						if (maxColumn == null || maxColumn.getWidth() < column.getWidth()) {
+							maxColumn = column;
+						}
 					}
 				}
 
diff --git a/target_explorer/plugins/org.eclipse.tcf.te.tcf.launch.ui/src/org/eclipse/tcf/te/tcf/launch/ui/nls/Messages.java b/target_explorer/plugins/org.eclipse.tcf.te.tcf.launch.ui/src/org/eclipse/tcf/te/tcf/launch/ui/nls/Messages.java
index d3876d80e..b705cf297 100644
--- a/target_explorer/plugins/org.eclipse.tcf.te.tcf.launch.ui/src/org/eclipse/tcf/te/tcf/launch/ui/nls/Messages.java
+++ b/target_explorer/plugins/org.eclipse.tcf.te.tcf.launch.ui/src/org/eclipse/tcf/te/tcf/launch/ui/nls/Messages.java
@@ -96,9 +96,6 @@ public class Messages extends NLS {
 	public static String LaunchConfigurationAdvancedTabSection_lineseparator_cr;
 
 	public static String PathMapEditorPage_name;
-//	public static String PathMapEditorPage_column_source;
-//	public static String PathMapEditorPage_column_destination;
-	public static String PathMapEditorPage_column_contextquery;
 
 	public static String SourceLookupEditorPage_name;
 
diff --git a/target_explorer/plugins/org.eclipse.tcf.te.tcf.launch.ui/src/org/eclipse/tcf/te/tcf/launch/ui/nls/Messages.properties b/target_explorer/plugins/org.eclipse.tcf.te.tcf.launch.ui/src/org/eclipse/tcf/te/tcf/launch/ui/nls/Messages.properties
index 247c2ccfc..0d3495ded 100644
--- a/target_explorer/plugins/org.eclipse.tcf.te.tcf.launch.ui/src/org/eclipse/tcf/te/tcf/launch/ui/nls/Messages.properties
+++ b/target_explorer/plugins/org.eclipse.tcf.te.tcf.launch.ui/src/org/eclipse/tcf/te/tcf/launch/ui/nls/Messages.properties
@@ -37,9 +37,6 @@ LaunchConfigurationAdvancedTabSection_lineseparator_crlf=CRLF
 LaunchConfigurationAdvancedTabSection_lineseparator_cr=CR
 
 PathMapEditorPage_name=Object Paths
-#PathMapEditorPage_column_source=Local
-#PathMapEditorPage_column_destination=Origin
-PathMapEditorPage_column_contextquery=Context Query
 
 SourceLookupEditorPage_name=Source Paths
 
diff --git a/target_explorer/plugins/org.eclipse.tcf.te.tcf.launch.ui/src/org/eclipse/tcf/te/tcf/launch/ui/remote/app/LaunchConfigurationTabGroup.java b/target_explorer/plugins/org.eclipse.tcf.te.tcf.launch.ui/src/org/eclipse/tcf/te/tcf/launch/ui/remote/app/LaunchConfigurationTabGroup.java
index f801d7b02..b18d5644d 100644
--- a/target_explorer/plugins/org.eclipse.tcf.te.tcf.launch.ui/src/org/eclipse/tcf/te/tcf/launch/ui/remote/app/LaunchConfigurationTabGroup.java
+++ b/target_explorer/plugins/org.eclipse.tcf.te.tcf.launch.ui/src/org/eclipse/tcf/te/tcf/launch/ui/remote/app/LaunchConfigurationTabGroup.java
@@ -17,10 +17,10 @@ import org.eclipse.debug.ui.CommonTab;
 import org.eclipse.debug.ui.ILaunchConfigurationDialog;
 import org.eclipse.debug.ui.ILaunchConfigurationTab;
 import org.eclipse.debug.ui.sourcelookup.SourceLookupTab;
-import org.eclipse.tcf.internal.debug.ui.launch.TCFMemoryMapTab;
-import org.eclipse.tcf.internal.debug.ui.launch.TCFPathMapTab;
 import org.eclipse.tcf.te.launch.ui.tabs.AbstractLaunchConfigurationTabGroup;
 import org.eclipse.tcf.te.launch.ui.tabs.refprojects.RefProjetcsTab;
+import org.eclipse.tcf.te.tcf.launch.ui.editor.tabs.MemoryMapTab;
+import org.eclipse.tcf.te.tcf.launch.ui.editor.tabs.PathMapTab;
 import org.eclipse.tcf.te.tcf.launch.ui.filetransfer.FileTransferTab;
 
 /**
@@ -48,8 +48,8 @@ public class LaunchConfigurationTabGroup extends AbstractLaunchConfigurationTabG
 		tabs.add(new FileTransferTab());
 		tabs.add(new RefProjetcsTab());
 		if (ILaunchManager.DEBUG_MODE.equalsIgnoreCase(mode)) {
-			tabs.add(new TCFMemoryMapTab());
-			tabs.add(new TCFPathMapTab());
+			tabs.add(new MemoryMapTab(null));
+			tabs.add(new PathMapTab(null));
 			tabs.add(new SourceLookupTab());
 		}
 		tabs.add(new CommonTab());