Changeset 1966

Show
Ignore:
Timestamp:
02/29/08 14:23:22 (9 months ago)
Author:
jjarrett
Message:

Removing the default level needs to handle correcting the project default setting if that's the level removed.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • branches/mls/framework-plugin/src/com/tresys/framework/plugin/preferences/MLSSettingsProjProperties.java

    r1955 r1966  
    319319                // Select the user's currently defined Default MLS Level  
    320320                String defaultMLSLevel = projPrefs.get (SEFPreferencePage.DEFAULT_MLS_LEVEL, MLSSettingsProjProperties.DEFAULT_MLS); 
     321                MLSLevel defaultMLSInstance = null; 
     322                if (_levels.contains (defaultMLSLevel)) 
     323                { 
     324                        defaultMLSInstance = _levels.getLevel (defaultMLSLevel); 
     325                } 
     326                else 
     327                { 
     328                        defaultMLSInstance = _levels.getLevelOrderedAt (0); 
     329                } 
    321330                                 
    322331                _levelsDefault = new ComboViewer(LevelControls); 
    …… 
    324333                _levelsDefault.setContentProvider (new ArrayContentProvider ()); 
    325334                _levelsDefault.setInput (_levels); 
    326                 _levelsDefault.setSelection (new StructuredSelection(_levels.getLevel (defaultMLSLevel))); 
     335                _levelsDefault.setSelection (new StructuredSelection(defaultMLSInstance)); 
     336                 
    327337                 
    328338                // Define the controls for Adding a new MLS level