mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-08-09 17:25:38 +02:00
Code Issues Wiki Activity

cleanup

Browse source
This commit is contained in:
David Inglis 2004-03-23 03:07:40 +00:00
parent 118c31cd16
commit 18e6359b5b
9 changed files with 15 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/core/MakeCorePlugin.java
View file

@ -250,7 +250,7 @@ public class MakeCorePlugin extends Plugin {
for (int j = 0; j < configElements.length; j++) { for (int j = 0; j < configElements.length; j++) {
IConfigurationElement[] runElement = configElements[j].getChildren("run"); //$NON-NLS-1$ IConfigurationElement[] runElement = configElements[j].getChildren("run"); //$NON-NLS-1$
if (runElement.length > 0) { if (runElement.length > 0) {
IExternalScannerInfoProvider builder = (IExternalScannerInfoProvider) runElement[0].createExecutableExtension("class"); IExternalScannerInfoProvider builder = (IExternalScannerInfoProvider) runElement[0].createExecutableExtension("class"); //$NON-NLS-1$
return builder; return builder;
} }
} }

2
build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/internal/core/MakeTargetManager.java
View file

@ -48,7 +48,7 @@ public class MakeTargetManager implements IMakeTargetManager, IResourceChangeLis
private static String TARGETS_EXT = "targets"; //$NON-NLS-1$ private static String TARGETS_EXT = "targets"; //$NON-NLS-1$
private ListenerList listeners = new ListenerList(); private ListenerList listeners = new ListenerList();
private HashMap projectMap = new HashMap(); Map projectMap = new HashMap();
private HashMap builderMap; private HashMap builderMap;
protected Vector fProjects = new Vector(); protected Vector fProjects = new Vector();

2
build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/internal/core/ProjectTargets.java
View file

@ -33,7 +33,7 @@ import org.w3c.dom.NodeList;
public class ProjectTargets { public class ProjectTargets {
private static final String MAKE_TARGET_KEY = MakeCorePlugin.getUniqueIdentifier() + ".buildtargets"; private static final String MAKE_TARGET_KEY = MakeCorePlugin.getUniqueIdentifier() + ".buildtargets"; //$NON-NLS-1$
private static final String TARGETS_EXT = "targets"; //$NON-NLS-1$ private static final String TARGETS_EXT = "targets"; //$NON-NLS-1$
private static final String BUILD_TARGET_ELEMENT = "buildTargets"; //$NON-NLS-1$ private static final String BUILD_TARGET_ELEMENT = "buildTargets"; //$NON-NLS-1$

2
build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/internal/ui/properties/MakePropertyPage.java
View file

@ -85,7 +85,7 @@ public class MakePropertyPage extends PropertyPage implements ICOptionContainer
new ProgressMonitorDialog(getShell()).run(false, true, op); new ProgressMonitorDialog(getShell()).run(false, true, op);
} catch (InvocationTargetException e) { } catch (InvocationTargetException e) {
Throwable e1 = e.getTargetException(); Throwable e1 = e.getTargetException();
MakeUIPlugin.errorDialog(getShell(), MakeUIPlugin.getResourceString("MakeProjectPropertyPage.internalError"),e1.toString(), e1); MakeUIPlugin.errorDialog(getShell(), MakeUIPlugin.getResourceString("MakeProjectPropertyPage.internalError"),e1.toString(), e1); //$NON-NLS-1$
return false; return false;
} catch (InterruptedException e) { } catch (InterruptedException e) {
// cancelled // cancelled

4
build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/ui/dialogs/BuildTargetDialog.java
View file

@ -20,8 +20,8 @@ import org.eclipse.swt.widgets.Label;
import org.eclipse.swt.widgets.Shell; import org.eclipse.swt.widgets.Shell;
public class BuildTargetDialog extends Dialog { public class BuildTargetDialog extends Dialog {
private TargetListViewerPart targetPart; TargetListViewerPart targetPart;
private IContainer fContainer; IContainer fContainer;
public BuildTargetDialog(Shell shell, IContainer container) { public BuildTargetDialog(Shell shell, IContainer container) {
super(shell); super(shell);

12
build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/ui/dialogs/SettingsBlock.java
View file

@ -74,9 +74,9 @@ public class SettingsBlock extends AbstractCOptionPage {
Button incrButton; Button incrButton;
Button autoButton; Button autoButton;
private IMakeBuilderInfo fBuildInfo; IMakeBuilderInfo fBuildInfo;
private Preferences fPrefs; Preferences fPrefs;
private String fBuilderID; String fBuilderID;
public SettingsBlock(Preferences prefs, String builderID) { public SettingsBlock(Preferences prefs, String builderID) {
super(MakeUIPlugin.getResourceString(MAKE_LABEL)); super(MakeUIPlugin.getResourceString(MAKE_LABEL));
@ -354,15 +354,15 @@ public class SettingsBlock extends AbstractCOptionPage {
targetFull.setText(info.getFullBuildTarget()); targetFull.setText(info.getFullBuildTarget());
} }
private boolean isStopOnError() { boolean isStopOnError() {
return stopOnErrorButton.getSelection(); return stopOnErrorButton.getSelection();
} }
private boolean useDefaultBuildCmd() { boolean useDefaultBuildCmd() {
return defButton.getSelection(); return defButton.getSelection();
} }
private String getBuildLine() { String getBuildLine() {
if (buildCommand != null) { if (buildCommand != null) {
String cmd = buildCommand.getText(); String cmd = buildCommand.getText();
if (cmd != null) if (cmd != null)

2
debug/org.eclipse.cdt.debug.mi.ui/src/org/eclipse/cdt/debug/mi/internal/ui/GDBSolibBlock.java
View file

@ -56,7 +56,7 @@ public class GDBSolibBlock extends Observable implements Observer
if ( autoSolib ) if ( autoSolib )
{ {
fAutoSoLibButton = ControlFactory.createCheckBox( subComp, MIUIPlugin.getResourceString("mi.internal.ui.GDBSolibBlock.Load_shared_lib_symbols_automatically") ); fAutoSoLibButton = ControlFactory.createCheckBox( subComp, MIUIPlugin.getResourceString("mi.internal.ui.GDBSolibBlock.Load_shared_lib_symbols_automatically") ); //$NON-NLS-1$
fAutoSoLibButton.addSelectionListener( fAutoSoLibButton.addSelectionListener(
new SelectionAdapter() new SelectionAdapter()
{ {

3
launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/ui/CEnvironmentTab.java
View file

@ -107,7 +107,6 @@ public class CEnvironmentTab extends CLaunchConfigurationTab {
private boolean fEdit = false; private boolean fEdit = false;
private Button fBtnOk = null; private Button fBtnOk = null;
private Button fBtnCancel = null;
private Text fTextName = null; private Text fTextName = null;
private Text fTextValue = null; private Text fTextValue = null;
@ -175,7 +174,7 @@ public class CEnvironmentTab extends CLaunchConfigurationTab {
protected void createButtonsForButtonBar(Composite parent) { protected void createButtonsForButtonBar(Composite parent) {
fBtnOk = createButton(parent, IDialogConstants.OK_ID, IDialogConstants.OK_LABEL, true); fBtnOk = createButton(parent, IDialogConstants.OK_ID, IDialogConstants.OK_LABEL, true);
fBtnCancel = createButton(parent, IDialogConstants.CANCEL_ID, IDialogConstants.CANCEL_LABEL, false); createButton(parent, IDialogConstants.CANCEL_ID, IDialogConstants.CANCEL_LABEL, false);
} }
protected void updateButtonsState() { protected void updateButtonsState() {

2
launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/ui/CMainTab.java
View file

@ -335,7 +335,7 @@ public class CMainTab extends CLaunchConfigurationTab {
return; return;
} }
Object [] results = (Object [])dialog.getResult(); Object [] results = dialog.getResult();
try { try {
fProgText.setText(((IResource)results[0]).getProjectRelativePath().toString()); fProgText.setText(((IResource)results[0]).getProjectRelativePath().toString());