[
Date Prev][
Date Next][
Thread Prev][
Thread Next][
Date Index][
Thread Index]
[
List Home]
|
[cdt-patch] Moving the shared library search paths block to mi UI
|
Index: ChangeLog
===================================================================
RCS file: /home/tools/org.eclipse.cdt.debug.core/ChangeLog,v
retrieving revision 1.247
diff -u -r1.247 ChangeLog
--- ChangeLog 10 Sep 2003 21:23:38 -0000 1.247
+++ ChangeLog 11 Sep 2003 17:32:56 -0000
@@ -1,3 +1,7 @@
+2003-11-10 Mikhail Khodjaiants
+ Moving the shared library search paths block to mi UI.
+ * ICDTLaunchConfigurationConstants.java: moved the 'ATTR_DEBUGGER_SOLIB_PATH' attribute to mi.
+
2003-09-10 Mikhail Khodjaiants
If breakpoint is a line breakpoint check if source locator contains this file
instead of container project.
Index: src/org/eclipse/cdt/debug/core/ICDTLaunchConfigurationConstants.java
===================================================================
RCS file: /home/tools/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/ICDTLaunchConfigurationConstants.java,v
retrieving revision 1.4
diff -u -r1.4 ICDTLaunchConfigurationConstants.java
--- src/org/eclipse/cdt/debug/core/ICDTLaunchConfigurationConstants.java 8 Sep 2003 21:40:07 -0000 1.4
+++ src/org/eclipse/cdt/debug/core/ICDTLaunchConfigurationConstants.java 11 Sep 2003 17:32:56 -0000
@@ -102,11 +102,6 @@
// public static final String ATTR_DEBUGGER_DEFERRED_BREAKPOINTS = CDT_LAUNCH_ID + ".DEFERRED_BREAKPOINTS"; //$NON-NLS-1$
/**
- * Launch configuration attribute key. The value is a List (array of String) directories for the search path of shared libraries.
- */
- public static final String ATTR_DEBUGGER_SOLIB_PATH = CDT_LAUNCH_ID + ".SOLIB_PATH"; //$NON-NLS-1$
-
- /**
* Launch configuration attribute value. The key is ATTR_DEBUGGER_START_MODE.
* Startup debugger running the program.
*/
Index: ChangeLog
===================================================================
RCS file: /home/tools/org.eclipse.cdt.debug.mi.core/ChangeLog,v
retrieving revision 1.176
diff -u -r1.176 ChangeLog
--- ChangeLog 8 Sep 2003 21:40:11 -0000 1.176
+++ ChangeLog 11 Sep 2003 17:33:34 -0000
@@ -1,3 +1,7 @@
+2003-11-10 Mikhail Khodjaiants
+ Moving the shared library search paths block to mi UI.
+ * IMILaunchConfigurationConstants.java: added the 'ATTR_DEBUGGER_SOLIB_PATH' attribute.
+
2003-09-09 Mikhail Khodjaiants
Regrouping the launch configuration constants.
* IMILaunchConfigurationConstants.java
Index: src/org/eclipse/cdt/debug/mi/core/GDBDebugger.java
===================================================================
RCS file: /home/tools/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/GDBDebugger.java,v
retrieving revision 1.17
diff -u -r1.17 GDBDebugger.java
--- src/org/eclipse/cdt/debug/mi/core/GDBDebugger.java 8 Sep 2003 21:27:56 -0000 1.17
+++ src/org/eclipse/cdt/debug/mi/core/GDBDebugger.java 11 Sep 2003 17:33:34 -0000
@@ -9,7 +9,6 @@
import java.util.Collections;
import java.util.List;
-import org.eclipse.cdt.debug.core.ICDTLaunchConfigurationConstants;
import org.eclipse.cdt.debug.core.ICDebugger;
import org.eclipse.cdt.debug.core.cdi.CDIException;
import org.eclipse.cdt.debug.core.cdi.ICDISession;
@@ -37,7 +36,7 @@
// it seems to be a real problem on many gdb platform
}
}
- List p = config.getAttribute(ICDTLaunchConfigurationConstants.ATTR_DEBUGGER_SOLIB_PATH, Collections.EMPTY_LIST);
+ List p = config.getAttribute(IMILaunchConfigurationConstants.ATTR_DEBUGGER_SOLIB_PATH, Collections.EMPTY_LIST);
if (p.size() > 0) {
String[] oldPaths = mgr.getSharedLibraryPaths();
String[] paths = new String[oldPaths.length + p.size()];
Index: src/org/eclipse/cdt/debug/mi/core/GDBServerDebugger.java
===================================================================
RCS file: /home/tools/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/GDBServerDebugger.java,v
retrieving revision 1.3
diff -u -r1.3 GDBServerDebugger.java
--- src/org/eclipse/cdt/debug/mi/core/GDBServerDebugger.java 8 Sep 2003 21:48:53 -0000 1.3
+++ src/org/eclipse/cdt/debug/mi/core/GDBServerDebugger.java 11 Sep 2003 17:33:34 -0000
@@ -16,7 +16,6 @@
import java.util.ArrayList;
import java.util.List;
-import org.eclipse.cdt.debug.core.ICDTLaunchConfigurationConstants;
import org.eclipse.cdt.debug.core.ICDebugger;
import org.eclipse.cdt.debug.core.cdi.CDIException;
import org.eclipse.cdt.debug.core.cdi.ICDISession;
@@ -41,7 +40,7 @@
// ignore this one, cause problems for many gdb.
}
}
- List p = config.getAttribute(ICDTLaunchConfigurationConstants.ATTR_DEBUGGER_SOLIB_PATH, new ArrayList(1));
+ List p = config.getAttribute(IMILaunchConfigurationConstants.ATTR_DEBUGGER_SOLIB_PATH, new ArrayList(1));
if (p.size() > 0) {
String[] paths = (String[])p.toArray(new String[0]);
mgr.setSharedLibraryPaths(paths);
Index: src/org/eclipse/cdt/debug/mi/core/IMILaunchConfigurationConstants.java
===================================================================
RCS file: /home/tools/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/IMILaunchConfigurationConstants.java,v
retrieving revision 1.4
diff -u -r1.4 IMILaunchConfigurationConstants.java
--- src/org/eclipse/cdt/debug/mi/core/IMILaunchConfigurationConstants.java 8 Sep 2003 21:40:11 -0000 1.4
+++ src/org/eclipse/cdt/debug/mi/core/IMILaunchConfigurationConstants.java 11 Sep 2003 17:33:34 -0000
@@ -28,4 +28,9 @@
* Launch configuration attribute key. Boolean value to set the 'stop on shared library events' flag of the debugger.
*/
public static final String ATTR_DEBUGGER_STOP_ON_SOLIB_EVENTS = MIPlugin.getUniqueIdentifier() + ".STOP_ON_SOLIB_EVENTS"; //$NON-NLS-1$
+
+ /**
+ * Launch configuration attribute key. The value is a List (array of String) of directories for the search path of shared libraries.
+ */
+ public static final String ATTR_DEBUGGER_SOLIB_PATH = MIPlugin.getUniqueIdentifier() + ".SOLIB_PATH"; //$NON-NLS-1$
}
Index: ChangeLog
===================================================================
RCS file: /home/tools/org.eclipse.cdt.debug.mi.ui/ChangeLog,v
retrieving revision 1.13
diff -u -r1.13 ChangeLog
--- ChangeLog 11 Sep 2003 15:26:14 -0000 1.13
+++ ChangeLog 11 Sep 2003 17:34:20 -0000
@@ -1,3 +1,8 @@
+2003-11-10 Mikhail Khodjaiants
+ Moving the shared library search paths block to mi UI.
+ * SolibSearchPathBlock.java: new
+ * GDBSolibBlock.java
+
2003-09-11 Mikhail Khodjaiants
Added the 'org.eclipse.cdt.debug.mi.internal.ui.dialogfields' package.
* CheckedListDialogField.java: new
Index: src/org/eclipse/cdt/debug/mi/internal/ui/GDBSolibBlock.java
===================================================================
RCS file: /home/tools/org.eclipse.cdt.debug.mi.ui/src/org/eclipse/cdt/debug/mi/internal/ui/GDBSolibBlock.java,v
retrieving revision 1.1
diff -u -r1.1 GDBSolibBlock.java
--- src/org/eclipse/cdt/debug/mi/internal/ui/GDBSolibBlock.java 8 Sep 2003 21:42:43 -0000 1.1
+++ src/org/eclipse/cdt/debug/mi/internal/ui/GDBSolibBlock.java 11 Sep 2003 17:34:20 -0000
@@ -11,7 +11,6 @@
import org.eclipse.cdt.debug.core.ICDTLaunchConfigurationConstants;
import org.eclipse.cdt.debug.mi.core.IMILaunchConfigurationConstants;
-import org.eclipse.cdt.debug.ui.SolibSearchPathBlock;
import org.eclipse.cdt.utils.ui.controls.ControlFactory;
import org.eclipse.core.runtime.CoreException;
import org.eclipse.debug.core.ILaunchConfiguration;
Index: src/org/eclipse/cdt/debug/mi/internal/ui/SolibSearchPathBlock.java
===================================================================
RCS file: src/org/eclipse/cdt/debug/mi/internal/ui/SolibSearchPathBlock.java
diff -N src/org/eclipse/cdt/debug/mi/internal/ui/SolibSearchPathBlock.java
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ src/org/eclipse/cdt/debug/mi/internal/ui/SolibSearchPathBlock.java 11 Sep 2003 17:34:21 -0000
@@ -0,0 +1,167 @@
+/*
+ *(c) Copyright QNX Software Systems Ltd. 2002.
+ * All Rights Reserved.
+ *
+ */
+
+package org.eclipse.cdt.debug.mi.internal.ui;
+
+import java.util.Collections;
+import java.util.Observable;
+
+import org.eclipse.cdt.debug.internal.ui.PixelConverter;
+import org.eclipse.cdt.debug.internal.ui.dialogfields.DialogField;
+import org.eclipse.cdt.debug.internal.ui.dialogfields.IListAdapter;
+import org.eclipse.cdt.debug.internal.ui.dialogfields.LayoutUtil;
+import org.eclipse.cdt.debug.internal.ui.dialogfields.ListDialogField;
+import org.eclipse.cdt.debug.internal.ui.dialogfields.Separator;
+import org.eclipse.cdt.debug.mi.core.IMILaunchConfigurationConstants;
+import org.eclipse.cdt.utils.ui.controls.ControlFactory;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.debug.core.ILaunchConfiguration;
+import org.eclipse.debug.core.ILaunchConfigurationWorkingCopy;
+import org.eclipse.jface.resource.JFaceResources;
+import org.eclipse.jface.viewers.ILabelProvider;
+import org.eclipse.jface.viewers.LabelProvider;
+import org.eclipse.swt.layout.GridData;
+import org.eclipse.swt.layout.GridLayout;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.DirectoryDialog;
+import org.eclipse.swt.widgets.Shell;
+
+/**
+ * Enter type comment.
+ *
+ * @since Sep 4, 2003
+ */
+public class SolibSearchPathBlock extends Observable
+{
+ public class SolibSearchPathListDialogField extends ListDialogField
+ {
+ public SolibSearchPathListDialogField( IListAdapter adapter, String[] buttonLabels, ILabelProvider lprovider )
+ {
+ super( adapter, buttonLabels, lprovider );
+ }
+
+ /* (non-Javadoc)
+ * @see org.eclipse.cdt.debug.internal.ui.dialogfields.ListDialogField#managedButtonPressed(int)
+ */
+ protected boolean managedButtonPressed( int index )
+ {
+ boolean result = super.managedButtonPressed( index );
+ if ( result )
+ buttonPressed( index );
+ return result;
+ }
+
+ }
+
+ private Shell fShell;
+ private SolibSearchPathListDialogField fDirList;
+
+ public SolibSearchPathBlock()
+ {
+ super();
+
+ String[] buttonLabels = new String[]
+ {
+ /* 0 */ "Add...",
+ /* 1 */ null,
+ /* 2 */ "Up",
+ /* 3 */ "Down",
+ /* 4 */ null,
+ /* 5 */ "Remove",
+ };
+
+ IListAdapter listAdapter = new IListAdapter()
+ {
+ public void customButtonPressed( DialogField field, int index )
+ {
+ buttonPressed( index );
+ }
+
+ public void selectionChanged( DialogField field )
+ {
+ }
+ };
+
+ fDirList = new SolibSearchPathListDialogField( listAdapter, buttonLabels, new LabelProvider() );
+ fDirList.setLabelText( "Directories:" );
+ fDirList.setUpButtonIndex( 2 );
+ fDirList.setDownButtonIndex( 3 );
+ fDirList.setRemoveButtonIndex( 5 );
+ }
+
+ public void createBlock( Composite parent )
+ {
+ fShell = parent.getShell();
+ Composite comp = ControlFactory.createCompositeEx( parent, 2, GridData.FILL_BOTH );
+ ((GridLayout)comp.getLayout()).makeColumnsEqualWidth = false;
+ ((GridLayout)comp.getLayout()).marginHeight = 0;
+ ((GridLayout)comp.getLayout()).marginWidth = 0;
+ comp.setFont( JFaceResources.getDialogFont() );
+
+ PixelConverter converter = new PixelConverter( comp );
+
+ fDirList.doFillIntoGrid( comp, 3 );
+ LayoutUtil.setHorizontalSpan( fDirList.getLabelControl( null ), 2 );
+ LayoutUtil.setWidthHint( fDirList.getLabelControl( null ), converter.convertWidthInCharsToPixels( 30 ) );
+ LayoutUtil.setHorizontalGrabbing( fDirList.getListControl( null ) );
+
+ new Separator().doFillIntoGrid( comp, 3, converter.convertHeightInCharsToPixels( 1 ) );
+ }
+
+ public void initializeFrom( ILaunchConfiguration configuration )
+ {
+ if ( fDirList != null )
+ {
+ try
+ {
+ fDirList.addElements( configuration.getAttribute( IMILaunchConfigurationConstants.ATTR_DEBUGGER_SOLIB_PATH, Collections.EMPTY_LIST ) );
+ }
+ catch( CoreException e )
+ {
+ }
+ }
+ }
+
+ public void setDefaults( ILaunchConfigurationWorkingCopy configuration )
+ {
+ configuration.setAttribute( IMILaunchConfigurationConstants.ATTR_DEBUGGER_SOLIB_PATH, Collections.EMPTY_LIST );
+ }
+
+ public void performApply( ILaunchConfigurationWorkingCopy configuration )
+ {
+ if ( fDirList != null )
+ {
+ configuration.setAttribute( IMILaunchConfigurationConstants.ATTR_DEBUGGER_SOLIB_PATH, fDirList.getElements() );
+ }
+ }
+
+ protected void buttonPressed( int index )
+ {
+ if ( index == 0 )
+ addDirectory();
+ setChanged();
+ notifyObservers();
+ }
+
+ protected Shell getShell()
+ {
+ return fShell;
+ }
+
+ private void addDirectory()
+ {
+ DirectoryDialog dialog = new DirectoryDialog( getShell() );
+ dialog.setMessage( "Select directory that contains shared library." );
+ String res = dialog.open();
+ if ( res != null )
+ fDirList.addElement( res );
+ }
+
+ public void dispose()
+ {
+ deleteObservers();
+ }
+}
Index: ChangeLog
===================================================================
RCS file: /home/tools/org.eclipse.cdt.debug.ui/ChangeLog,v
retrieving revision 1.181
diff -u -r1.181 ChangeLog
--- ChangeLog 8 Sep 2003 20:08:13 -0000 1.181
+++ ChangeLog 11 Sep 2003 17:34:59 -0000
@@ -1,3 +1,7 @@
+2003-11-10 Mikhail Khodjaiants
+ Moving the shared library search paths block to mi UI.
+ * SolibSearchPathBlock.java: moved to mi UI.
+
2003-09-09 Mikhail Khodjaiants
New class - SolibSearchPathBlock. Implements the UI control block to set the shared library search path.
* SolibSearchPathBlock.java
Index: src/org/eclipse/cdt/debug/ui/SolibSearchPathBlock.java
===================================================================
RCS file: src/org/eclipse/cdt/debug/ui/SolibSearchPathBlock.java
diff -N src/org/eclipse/cdt/debug/ui/SolibSearchPathBlock.java
--- src/org/eclipse/cdt/debug/ui/SolibSearchPathBlock.java 8 Sep 2003 20:08:13 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,167 +0,0 @@
-/*
- *(c) Copyright QNX Software Systems Ltd. 2002.
- * All Rights Reserved.
- *
- */
-
-package org.eclipse.cdt.debug.ui;
-
-import java.util.Collections;
-import java.util.Observable;
-
-import org.eclipse.cdt.debug.core.ICDTLaunchConfigurationConstants;
-import org.eclipse.cdt.debug.internal.ui.PixelConverter;
-import org.eclipse.cdt.debug.internal.ui.dialogfields.DialogField;
-import org.eclipse.cdt.debug.internal.ui.dialogfields.IListAdapter;
-import org.eclipse.cdt.debug.internal.ui.dialogfields.LayoutUtil;
-import org.eclipse.cdt.debug.internal.ui.dialogfields.ListDialogField;
-import org.eclipse.cdt.debug.internal.ui.dialogfields.Separator;
-import org.eclipse.cdt.utils.ui.controls.ControlFactory;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.debug.core.ILaunchConfiguration;
-import org.eclipse.debug.core.ILaunchConfigurationWorkingCopy;
-import org.eclipse.jface.resource.JFaceResources;
-import org.eclipse.jface.viewers.ILabelProvider;
-import org.eclipse.jface.viewers.LabelProvider;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.DirectoryDialog;
-import org.eclipse.swt.widgets.Shell;
-
-/**
- * Enter type comment.
- *
- * @since Sep 4, 2003
- */
-public class SolibSearchPathBlock extends Observable
-{
- public class SolibSearchPathListDialogField extends ListDialogField
- {
- public SolibSearchPathListDialogField( IListAdapter adapter, String[] buttonLabels, ILabelProvider lprovider )
- {
- super( adapter, buttonLabels, lprovider );
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.cdt.debug.internal.ui.dialogfields.ListDialogField#managedButtonPressed(int)
- */
- protected boolean managedButtonPressed( int index )
- {
- boolean result = super.managedButtonPressed( index );
- if ( result )
- buttonPressed( index );
- return result;
- }
-
- }
-
- private Shell fShell;
- private SolibSearchPathListDialogField fDirList;
-
- public SolibSearchPathBlock()
- {
- super();
-
- String[] buttonLabels = new String[]
- {
- /* 0 */ "Add...",
- /* 1 */ null,
- /* 2 */ "Up",
- /* 3 */ "Down",
- /* 4 */ null,
- /* 5 */ "Remove",
- };
-
- IListAdapter listAdapter = new IListAdapter()
- {
- public void customButtonPressed( DialogField field, int index )
- {
- buttonPressed( index );
- }
-
- public void selectionChanged( DialogField field )
- {
- }
- };
-
- fDirList = new SolibSearchPathListDialogField( listAdapter, buttonLabels, new LabelProvider() );
- fDirList.setLabelText( "Directories:" );
- fDirList.setUpButtonIndex( 2 );
- fDirList.setDownButtonIndex( 3 );
- fDirList.setRemoveButtonIndex( 5 );
- }
-
- public void createBlock( Composite parent )
- {
- fShell = parent.getShell();
- Composite comp = ControlFactory.createCompositeEx( parent, 2, GridData.FILL_BOTH );
- ((GridLayout)comp.getLayout()).makeColumnsEqualWidth = false;
- ((GridLayout)comp.getLayout()).marginHeight = 0;
- ((GridLayout)comp.getLayout()).marginWidth = 0;
- comp.setFont( JFaceResources.getDialogFont() );
-
- PixelConverter converter = new PixelConverter( comp );
-
- fDirList.doFillIntoGrid( comp, 3 );
- LayoutUtil.setHorizontalSpan( fDirList.getLabelControl( null ), 2 );
- LayoutUtil.setWidthHint( fDirList.getLabelControl( null ), converter.convertWidthInCharsToPixels( 30 ) );
- LayoutUtil.setHorizontalGrabbing( fDirList.getListControl( null ) );
-
- new Separator().doFillIntoGrid( comp, 3, converter.convertHeightInCharsToPixels( 1 ) );
- }
-
- public void initializeFrom( ILaunchConfiguration configuration )
- {
- if ( fDirList != null )
- {
- try
- {
- fDirList.addElements( configuration.getAttribute( ICDTLaunchConfigurationConstants.ATTR_DEBUGGER_SOLIB_PATH, Collections.EMPTY_LIST ) );
- }
- catch( CoreException e )
- {
- }
- }
- }
-
- public void setDefaults( ILaunchConfigurationWorkingCopy configuration )
- {
- configuration.setAttribute( ICDTLaunchConfigurationConstants.ATTR_DEBUGGER_SOLIB_PATH, Collections.EMPTY_LIST );
- }
-
- public void performApply( ILaunchConfigurationWorkingCopy configuration )
- {
- if ( fDirList != null )
- {
- configuration.setAttribute( ICDTLaunchConfigurationConstants.ATTR_DEBUGGER_SOLIB_PATH, fDirList.getElements() );
- }
- }
-
- protected void buttonPressed( int index )
- {
- if ( index == 0 )
- addDirectory();
- setChanged();
- notifyObservers();
- }
-
- protected Shell getShell()
- {
- return fShell;
- }
-
- private void addDirectory()
- {
- DirectoryDialog dialog = new DirectoryDialog( getShell() );
- dialog.setMessage( "Select directory that contains shared library." );
- String res = dialog.open();
- if ( res != null )
- fDirList.addElement( res );
- }
-
- public void dispose()
- {
- deleteObservers();
- }
-}
