mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-06-07 17:56:01 +02:00
Code Issues Wiki Activity

bug 322695: Can't access preferences of any unrelated CDT project having "bad" project in workspace

Browse source
This commit is contained in:
Andrew Gvozdev 2010-08-15 02:08:08 +00:00
parent ed40d8e4d6
commit aae17ceace
4 changed files with 14 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/dataprovider/DataProviderMessages.properties
View file

@ -22,4 +22,4 @@ ProjectConverter.7=targets conversion
ProjectConverter.8=the project conversion failed due to unknown reason ProjectConverter.8=the project conversion failed due to unknown reason
ProjectConverter.9=the given project is not a valid CDT project ProjectConverter.9=the given project is not a valid CDT project
BuildConfigurationData.NoConfigurationSupport=The configuration support is not installed on the system BuildConfigurationData.NoConfigurationSupport=The configuration support is not installed on the system
BuildConfigurationData.OrphanedConfiguration=Orphaned configuration. No base extension cfg exists for ID={0} BuildConfigurationData.OrphanedConfiguration=Orphaned configuration. No base extension cfg exists for {0}

4
build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/internal/ui/Messages.properties
View file

@ -99,8 +99,8 @@ ToolChainEditTab_6=-- NO TOOL --
ToolChainEditTab_7=incompatibility with ToolChainEditTab_7=incompatibility with
ToolChainEditTab_8=source extension conflict with ToolChainEditTab_8=source extension conflict with
ToolChainEditTab_9=toolchain ToolChainEditTab_9=toolchain
ToolChainEditTab_OrphanedBuilder=Orphaned builder: ID={0}, name={1} ToolChainEditTab_OrphanedBuilder=Orphaned builder {0} ({1})
ToolChainEditTab_OrphanedToolchain=Orphaned toolchain: ID={0}, name={1} ToolChainEditTab_OrphanedToolchain=Orphaned toolchain {0} ({1})
NewVarDialog_0=Variable name: NewVarDialog_0=Variable name:
NewVarDialog_1=Apply to all configurations NewVarDialog_1=Apply to all configurations
NewCfgDialog_0=Existing configuration NewCfgDialog_0=Existing configuration

12
build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/properties/ToolChainEditTab.java
View file

@ -82,8 +82,8 @@ public class ToolChainEditTab extends AbstractCBuildPropertyTab {
private Button button_edit; private Button button_edit;
private Group tools_group; private Group tools_group;
private Group single_tool_group; private Group single_tool_group;
private Label st_builder; private Text st_builder;
private Label st_toolchain; private Text st_toolchain;
private Label st_tool; private Label st_tool;
private IBuilder[] v_bs; private IBuilder[] v_bs;
@ -113,7 +113,8 @@ public class ToolChainEditTab extends AbstractCBuildPropertyTab {
}}); }});
c_toolchain.setEnabled(!page.isForFile()); c_toolchain.setEnabled(!page.isForFile());
st_toolchain = setupLabel(usercomp, EMPTY_STR, 2, GridData.FILL_HORIZONTAL); st_toolchain = new Text(usercomp, SWT.LEFT | SWT.READ_ONLY);
setupControl(st_toolchain, 2, GridData.FILL_HORIZONTAL);
st_toolchain.setForeground(red); st_toolchain.setForeground(red);
setupLabel(usercomp, Messages.ToolChainEditTab_2, 1, GridData.BEGINNING); setupLabel(usercomp, Messages.ToolChainEditTab_2, 1, GridData.BEGINNING);
@ -128,7 +129,8 @@ public class ToolChainEditTab extends AbstractCBuildPropertyTab {
}}); }});
c_builder.setEnabled(page.isForProject()); c_builder.setEnabled(page.isForProject());
st_builder = setupLabel(usercomp, EMPTY_STR, 2, GridData.FILL_HORIZONTAL); st_builder = new Text(usercomp, SWT.LEFT | SWT.READ_ONLY);
setupControl(st_builder, 2, GridData.FILL_HORIZONTAL);
st_builder.setForeground(red); st_builder.setForeground(red);
// make table for tools list // make table for tools list
@ -240,6 +242,8 @@ public class ToolChainEditTab extends AbstractCBuildPropertyTab {
// IFileInfoModification fim = (IFileInfoModification)mod; // IFileInfoModification fim = (IFileInfoModification)mod;
// fim.getProjectToolModifications(); // fim.getProjectToolModifications();
} }
st_toolchain.setEnabled(!EMPTY_STR.equals(st_toolchain.getText()));
st_builder.setEnabled(!EMPTY_STR.equals(st_builder.getText()));
} }
private void fillToolChainCombo() { private void fillToolChainCombo() {

5
core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/AbstractPage.java
View file

@ -72,6 +72,7 @@ import org.eclipse.swt.widgets.MessageBox;
import org.eclipse.swt.widgets.Shell; import org.eclipse.swt.widgets.Shell;
import org.eclipse.swt.widgets.TabFolder; import org.eclipse.swt.widgets.TabFolder;
import org.eclipse.swt.widgets.TabItem; import org.eclipse.swt.widgets.TabItem;
import org.eclipse.swt.widgets.Text;
import org.eclipse.ui.IWorkbenchPart; import org.eclipse.ui.IWorkbenchPart;
import org.eclipse.ui.IWorkbenchPartReference; import org.eclipse.ui.IWorkbenchPartReference;
import org.eclipse.ui.PlatformUI; import org.eclipse.ui.PlatformUI;
@ -159,7 +160,7 @@ implements
private Button manageButton; private Button manageButton;
private Button excludeFromBuildCheck; private Button excludeFromBuildCheck;
private Label errIcon; private Label errIcon;
private Label errMessage; private Text errMessage;
private Composite errPane; private Composite errPane;
private Composite parentComposite; private Composite parentComposite;
/* /*
@ -314,7 +315,7 @@ implements
errIcon.setLayoutData(new GridData(GridData.BEGINNING)); errIcon.setLayoutData(new GridData(GridData.BEGINNING));
errIcon.setImage(IMG_WARN); errIcon.setImage(IMG_WARN);
errMessage = new Label(errPane, SWT.LEFT); errMessage = new Text(errPane, SWT.LEFT | SWT.READ_ONLY);
errMessage.setLayoutData(new GridData(GridData.FILL_HORIZONTAL)); errMessage.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
if (isForFolder() || isForFile()) { if (isForFolder() || isForFile()) {