mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-07-24 09:25:31 +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-14 05:36:25 +00:00
parent 338a01952d
commit bd655c6a8a
3 changed files with 48 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/internal/ui/Messages.java
View file

@ -240,6 +240,8 @@ public class Messages extends NLS {
public static String ToolChainEditTab_7;
public static String ToolChainEditTab_8;
public static String ToolChainEditTab_9;
public static String ToolChainEditTab_OrphanedBuilder;
public static String ToolChainEditTab_OrphanedToolchain;
public static String ToolSelectionDialog_0;
public static String ToolSelectionDialog_1;
public static String ToolSelectionDialog_10;

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

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

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

@ -40,6 +40,7 @@ import org.eclipse.cdt.managedbuilder.tcmodification.IToolListModification;
import org.eclipse.cdt.managedbuilder.tcmodification.IToolModification;
import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IStatus;
import org.eclipse.osgi.util.NLS;
import org.eclipse.swt.SWT;
import org.eclipse.swt.events.SelectionAdapter;
import org.eclipse.swt.events.SelectionEvent;
@ -204,7 +205,13 @@ public class ToolChainEditTab extends AbstractCBuildPropertyTab {
private void showErrorMessage() {
if (ri instanceof IFolderInfo) {
IFolderInfoModification foim = (IFolderInfoModification)mod;
if (foim.isToolChainCompatible()) {
IToolChain toolChain = ((IFolderInfoModification)mod).getToolChain();
IToolChain realToolChain = ManagedBuildManager.getRealToolChain(toolChain);
if (realToolChain==null) {
// The toolchain is not derived from extension
String errText = NLS.bind(Messages.ToolChainEditTab_OrphanedToolchain, toolChain.getId(), toolChain.getName());
st_toolchain.setText(errText);
} else if (foim.isToolChainCompatible()) {
st_toolchain.setText(EMPTY_STR);
} else {
String s = foim.getToolChainCompatibilityStatus().getMessage();
@ -214,10 +221,18 @@ public class ToolChainEditTab extends AbstractCBuildPropertyTab {
if (foim instanceof IConfigurationModification) {
IConfigurationModification cm = (IConfigurationModification)foim;
if (!cm.isBuilderCompatible()) {
CompatibilityStatus cs = cm.getBuilderCompatibilityStatus();
if (cs != null) {
String s = cs.getMessage();
st_builder.setText(s);
IBuilder builder = cfg.getBuilder();
IBuilder realBuilder = ManagedBuildManager.getRealBuilder(builder);
if (realBuilder==null) {
// The builder is not derived from extension
String errText = NLS.bind(Messages.ToolChainEditTab_OrphanedBuilder, builder.getId(), builder.getName());
st_builder.setText(errText);
} else {
CompatibilityStatus cs = cm.getBuilderCompatibilityStatus();
if (cs != null) {
String s = cs.getMessage();
st_builder.setText(s);
}
}
}
}
@ -228,9 +243,13 @@ public class ToolChainEditTab extends AbstractCBuildPropertyTab {
}
private void fillToolChainCombo() {
IToolChain tc = null;
if (ri instanceof IFolderInfo)
tc = ManagedBuildManager.getRealToolChain(((IFolderInfoModification)mod).getToolChain());
IToolChain realToolChain = null;
if (ri instanceof IFolderInfo) {
IToolChain toolChainInstance = ((IFolderInfoModification)mod).getToolChain();
realToolChain = ManagedBuildManager.getRealToolChain(toolChainInstance);
if (realToolChain==null)
realToolChain = toolChainInstance;
}
c_toolchain.removeAll();
boolean isMng = cfg.getBuilder().isManagedBuildOn();
@ -242,16 +261,15 @@ public class ToolChainEditTab extends AbstractCBuildPropertyTab {
tcs = fim.getCompatibleToolChains();
IToolChain[] tcs1 = new IToolChain[tcs.length + 1];
System.arraycopy(tcs, 0, tcs1, 0, tcs.length);
tcs1[tcs.length] = tc; // add existing toolchain
tcs1[tcs.length] = realToolChain; // add existing toolchain
tcs = tcs1;
}
for (int i=0; i<tcs.length; i++) {
if (tcs[i].isSystemObject() &&
!( ((ToolChain)tcs[i]).isPreferenceToolChain() &&
!isMng)
) // NO TOOLCHAIN
for (IToolChain tc : tcs) {
if ( tc.isSystemObject() && !(((ToolChain)tc).isPreferenceToolChain() && !isMng) ) {
// NO TOOLCHAIN
continue;
list.add(tcs[i]);
}
list.add(tc);
}
Collections.sort(list, BuildListComparator.getInstance());
@ -259,7 +277,7 @@ public class ToolChainEditTab extends AbstractCBuildPropertyTab {
v_tcs = list.toArray(new IToolChain[list.size()]);
for (int i=0; i<v_tcs.length; i++) {
c_toolchain.add(v_tcs[i].getUniqueRealName());
if (v_tcs[i].matches(tc)) pos = i;
if (v_tcs[i].matches(realToolChain)) pos = i;
}
if (pos != -1) {
@ -273,7 +291,9 @@ public class ToolChainEditTab extends AbstractCBuildPropertyTab {
}
private void fillBuilderCombo() {
IBuilder b = ManagedBuildManager.getRealBuilder(cfg.getBuilder());
IBuilder realBuilder = ManagedBuildManager.getRealBuilder(cfg.getBuilder());
if (realBuilder==null)
realBuilder = cfg.getBuilder();
int pos = -1;
c_builder.removeAll();
ArrayList<IBuilder> list = new ArrayList<IBuilder>();
@ -283,14 +303,15 @@ public class ToolChainEditTab extends AbstractCBuildPropertyTab {
if (b_dispCompatible.getSelection() && (ri instanceof IFolderInfo)) {
IFolderInfoModification fim = (IFolderInfoModification)mod;
if (fim instanceof IConfigurationModification) {
IBuilder[] bs1 = ((IConfigurationModification)fim).getCompatibleBuilders();
bs = new IBuilder[bs1.length + 1];
System.arraycopy(bs1, 0, bs, 0, bs1.length);
bs[bs1.length] = b;
bs = ((IConfigurationModification)fim).getCompatibleBuilders();
IBuilder[] bs1 = new IBuilder[bs.length + 1];
System.arraycopy(bs, 0, bs1, 0, bs.length);
bs1[bs.length] = realBuilder;
bs = bs1;
}
}
for (int i=0; i<bs.length; i++) {
if (bs[i].isSystemObject() && ! b.equals(bs[i]))
if (bs[i].isSystemObject() && ! bs[i].equals(realBuilder))
continue;
list.add(bs[i]);
}
@ -299,7 +320,7 @@ public class ToolChainEditTab extends AbstractCBuildPropertyTab {
v_bs = list.toArray(new IBuilder[list.size()]);
for (int i=0; i<v_bs.length; i++) {
c_builder.add(v_bs[i].getUniqueRealName());
if (v_bs[i].matches(b)) pos = i;
if (v_bs[i].matches(realBuilder)) pos = i;
}
if (pos != -1)
c_builder.select(pos);