mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-04-29 19:45:01 +02:00
Code Issues Wiki Activity

Bug # 229809 : NPE in Build Variables global preferences tab

Browse source
This commit is contained in:
Oleg Krasilnikov 2008-05-03 07:30:52 +00:00
parent d8bfd60f62
commit 0010c4d7b8
1 changed files with 26 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

47
build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/properties/CPropertyVarsTab.java
View file

@ -116,7 +116,7 @@ public class CPropertyVarsTab extends AbstractCPropertyTab {
private static final EnvCmp comparator = new EnvCmp(); private static final EnvCmp comparator = new EnvCmp();
private ICConfigurationDescription cfgd = null; private ICConfigurationDescription cfgd = null;
private IStorableCdtVariables vars = null; private IStorableCdtVariables prefvars = null;
//currently the "CWD" and "PWD" macros are not displayed in UI //currently the "CWD" and "PWD" macros are not displayed in UI
private static final String fHiddenMacros[] = new String[]{ private static final String fHiddenMacros[] = new String[]{
@ -293,8 +293,8 @@ public class CPropertyVarsTab extends AbstractCPropertyTab {
fUserSup.createMacro(macro, cfgd); fUserSup.createMacro(macro, cfgd);
} }
} }
else if (vars != null) else if (chkVars())
vars.createMacro(macro); prefvars.createMacro(macro);
updateData(); updateData();
} }
@ -329,8 +329,8 @@ public class CPropertyVarsTab extends AbstractCPropertyTab {
else else
fUserSup.deleteMacro(macros[i].getName(), cfgd); fUserSup.deleteMacro(macros[i].getName(), cfgd);
} }
else if (vars != null) else if (chkVars())
vars.deleteMacro(macros[i].getName()); prefvars.deleteMacro(macros[i].getName());
} }
updateData(); updateData();
} }
@ -344,7 +344,7 @@ public class CPropertyVarsTab extends AbstractCPropertyTab {
private ICdtVariable[] getSelectedUserMacros(){ private ICdtVariable[] getSelectedUserMacros(){
if(tv == null) return null; if(tv == null) return null;
List<ICdtVariable> list = ((IStructuredSelection)tv.getSelection()).toList(); List<ICdtVariable> list = ((IStructuredSelection)tv.getSelection()).toList();
return (ICdtVariable[])list.toArray(new ICdtVariable[list.size()]); return list.toArray(new ICdtVariable[list.size()]);
} }
/* (non-Javadoc) /* (non-Javadoc)
@ -362,8 +362,8 @@ public class CPropertyVarsTab extends AbstractCPropertyTab {
} else } else
fUserSup.deleteAll(cfgd); fUserSup.deleteAll(cfgd);
} }
else if (vars != null) else if (chkVars())
vars.deleteAll(); prefvars.deleteAll();
updateData(); updateData();
} }
} }
@ -484,15 +484,20 @@ public class CPropertyVarsTab extends AbstractCPropertyTab {
public void updateData(ICResourceDescription _cfgd) { public void updateData(ICResourceDescription _cfgd) {
if (_cfgd == null) { if (_cfgd == null) {
cfgd = null; cfgd = null;
if (vars == null) chkVars();
vars = fUserSup.getWorkspaceVariablesCopy();
} else { } else {
cfgd = _cfgd.getConfiguration(); cfgd = _cfgd.getConfiguration();
vars = null; prefvars = null;
} }
updateData(); updateData();
} }
private boolean chkVars() {
if (prefvars == null)
prefvars = fUserSup.getWorkspaceVariablesCopy();
return (prefvars != null);
}
private void checkVariableIntegrity() { private void checkVariableIntegrity() {
try{ try{
if (page.isMultiCfg() && cfgd instanceof ICMultiItemsHolder) { if (page.isMultiCfg() && cfgd instanceof ICMultiItemsHolder) {
@ -533,9 +538,10 @@ public class CPropertyVarsTab extends AbstractCPropertyTab {
updateLbs(lb1, lb2); updateLbs(lb1, lb2);
if (cfgd == null) { if (cfgd == null) {
chkVars();
if (fShowSysMacros) { if (fShowSysMacros) {
List<ICdtVariable> lst = new ArrayList<ICdtVariable>(_vars.length); List<ICdtVariable> lst = new ArrayList<ICdtVariable>(_vars.length);
ICdtVariable[] uvars = vars.getMacros(); ICdtVariable[] uvars = prefvars.getMacros();
for (int i=0; i<uvars.length; i++) { for (int i=0; i<uvars.length; i++) {
lst.add(uvars[i]); lst.add(uvars[i]);
for (int j=0; j<_vars.length; j++) { for (int j=0; j<_vars.length; j++) {
@ -550,9 +556,9 @@ public class CPropertyVarsTab extends AbstractCPropertyTab {
if (_vars[j] != null && !vmgr.isUserVariable(_vars[j], null)) if (_vars[j] != null && !vmgr.isUserVariable(_vars[j], null))
lst.add(_vars[j]); lst.add(_vars[j]);
} }
_vars = (ICdtVariable[])lst.toArray(new ICdtVariable[lst.size()]); _vars = lst.toArray(new ICdtVariable[lst.size()]);
} else { } else {
_vars = vars.getMacros(); _vars = prefvars.getMacros();
} }
} }
@ -589,7 +595,7 @@ public class CPropertyVarsTab extends AbstractCPropertyTab {
*/ */
private boolean isUserVar(ICdtVariable v) { private boolean isUserVar(ICdtVariable v) {
if (cfgd == null) if (cfgd == null)
return vars.contains(v); return chkVars() && prefvars.contains(v);
if (page.isMultiCfg() && cfgd instanceof ICMultiItemsHolder) { if (page.isMultiCfg() && cfgd instanceof ICMultiItemsHolder) {
ICConfigurationDescription[] cfs = (ICConfigurationDescription[])((ICMultiItemsHolder)cfgd).getItems(); ICConfigurationDescription[] cfs = (ICConfigurationDescription[])((ICMultiItemsHolder)cfgd).getItems();
for (int i=0; i<cfs.length; i++) for (int i=0; i<cfs.length; i++)
@ -633,7 +639,7 @@ public class CPropertyVarsTab extends AbstractCPropertyTab {
ICdtVariable[] vs = fUserSup.getMacros(src.getConfiguration()); ICdtVariable[] vs = fUserSup.getMacros(src.getConfiguration());
fUserSup.setMacros(vs, dst.getConfiguration()); fUserSup.setMacros(vs, dst.getConfiguration());
} }
} else if (vars != null) } else if (chkVars())
fUserSup.storeWorkspaceVariables(true); fUserSup.storeWorkspaceVariables(true);
} }
@ -642,17 +648,17 @@ public class CPropertyVarsTab extends AbstractCPropertyTab {
* should be stored explicitly on "OK". * should be stored explicitly on "OK".
*/ */
protected void performOK() { protected void performOK() {
if (vars != null) try { if (chkVars()) try {
if (fUserSup.setWorkspaceVariables(vars)) if (fUserSup.setWorkspaceVariables(prefvars))
if (page instanceof PrefPage_Abstract) if (page instanceof PrefPage_Abstract)
PrefPage_Abstract.isChanged = true; PrefPage_Abstract.isChanged = true;
} catch (CoreException e) {} } catch (CoreException e) {}
vars = null; prefvars = null;
super.performOK(); super.performOK();
} }
protected void performCancel() { protected void performCancel() {
vars = null; prefvars = null;
super.performCancel(); super.performCancel();
} }
@ -682,5 +688,4 @@ public class CPropertyVarsTab extends AbstractCPropertyTab {
} }
} }
} }