← Back to branch summary

~bratsche/ubuntu/maverick/monodevelop/disable-appmenu

« back to all changes in this revision

Viewing changes to src/core/MonoDevelop.Projects.Gui/MonoDevelop.Projects.Gui.Dialogs/MultiConfigItemOptionsDialog.cs

  • Committer: Bazaar Package Importer
  • Author(s): Stefan Ebner
  • Date: 2009-03-17 17:55:55 UTC
  • mfrom: (1.1.13 sid)
  • Revision ID: james.westby@ubuntu.com-20090317175555-2w5qbmu0l5maq6fq
Tags: 1.9.3+dfsg-1ubuntu1
* FFe for Monodevelop 2 granted by motu-release team :)
* Merge from Debian Unstable , remaining Ubuntu changes:
  + debian/control:
    - Update for Gnome# 2.24

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/core/MonoDevelop.Projects.Gui/MonoDevelop.Projects.Gui.Dialogs/MultiConfigItemOptionsDialog.cs
115
115
                        this.entry = obj;
116
116
                }
117
117
                
 
118
                public ConfigurationData FindConfigurationData (IConfigurationTarget item)
 
119
                {
 
120
                        if (this.entry == item)
 
121
                                return this;
 
122
                        foreach (ConfigurationData data in children) {
 
123
                                ConfigurationData ret = data.FindConfigurationData (item);
 
124
                                if (ret != null)
 
125
                                        return ret;
 
126
                        }
 
127
                        return null;
 
128
                }
 
129
                
118
130
                internal static ConfigurationData Build (IConfigurationTarget entry)
119
131
                {
120
132
                        ConfigurationData data = new ConfigurationData (entry);
190
202
                                ItemConfiguration sc = configurations [sourceName];
191
203
                                if (sc != null)
192
204
                                        conf.CopyFrom (sc);
 
205
                                else
 
206
                                        sourceName = null;
193
207
                        }
194
208
                        
195
209
                        if (entry is Solution) {
196
210
                                SolutionConfiguration cc = (SolutionConfiguration) conf;
197
211
                                foreach (ConfigurationData data in children) {
198
 
                                        SolutionConfigurationEntry ce = cc.AddItem ((SolutionEntityItem) data.Entry);
 
212
                                        SolutionConfigurationEntry ce;
 
213
                                        if (sourceName != null)
 
214
                                                ce = cc.GetEntryForItem ((SolutionEntityItem)data.Entry);
 
215
                                        else
 
216
                                                ce = cc.AddItem ((SolutionEntityItem) data.Entry);
199
217
                                        if (createChildConfigurations) {
200
218
                                                ce.ItemConfiguration = name;
201
219
                                                if (data.Configurations [name] == null)
202
220
                                                        data.AddConfiguration (name, sourceName, createChildConfigurations);
203
 
                                        } else {
 
221
                                        } else if (sourceName == null) {
204
222
                                                if (data.Configurations.Count > 0)
205
223
                                                        ce.ItemConfiguration = data.Configurations [0].Id;
206
224
                                        }
230
248
                        
231
249
                        ItemConfiguration cc = configurations [oldName];
232
250
                        if (cc != null) {
233
 
                                cc.Name = newName;
 
251
                                cc.Id = newName;
234
252
                        }
235
253
                        if (renameChildConfigurations) {
 
254
                                if (entry is Solution) {
 
255
                                        foreach (SolutionConfiguration conf in Configurations) {
 
256
                                                foreach (SolutionConfigurationEntry se in conf.Configurations) {
 
257
                                                        if (se.ItemConfiguration == oldName)
 
258
                                                                se.ItemConfiguration = newName;
 
259
                                                }
 
260
                                        }
 
261
                                }
236
262
                                foreach (ConfigurationData data in children)
237
263
                                        data.RenameConfiguration (oldName, newName, true);
238
264
                        }