Хранение данных в onRetainNonConfigurationInstance()

public class EditActivity extends Activity
{
    BundleContainer bundleContainer;
    DataContainer dataContainer = new DataContainer();
    DrillConfig drillConfig = new DrillConfig();
    Draw2D draw2d;
    private ScalerLine scaler;
    
    @SuppressWarnings("deprecation")
    @Override
    protected void onCreate(Bundle savedInstanceState) 
    {
        if (getLastNonConfigurationInstance() != null)
        {
            bundleContainer = (BundleContainer)getLastNonConfigurationInstance();
            dataContainer = bundleContainer.getDataContainer();
            drillConfig = bundleContainer.getDrillConfig();
        }
        
        requestWindowFeature (Window.FEATURE_NO_TITLE);
        
        LinearLayout.LayoutParams lParams = new LinearLayout.LayoutParams
                   (LinearLayout.LayoutParams.MATCH_PARENT, LinearLayout.LayoutParams.MATCH_PARENT);
        LinearLayout.LayoutParams btnParams = new LinearLayout.LayoutParams
                   (LinearLayout.LayoutParams.WRAP_CONTENT, LinearLayout.LayoutParams.WRAP_CONTENT);
        
        frLayout = new FrameLayout (this);
        frLayout.setLayoutParams(lParams);
 
        if (getLastNonConfigurationInstance() != null)
        {
            draw2d = bundleContainer.getDraw2D();
            frLayout.addView(draw2d, lParams);
        }
        else
        {
            frLayout.addView(draw2d = new Draw2D (this, dataContainer, drillConfig), lParams);
        }
        
        scaler = new ScalerLine (this);
        if (getLastNonConfigurationInstance() != null)
        {
            scaler = bundleContainer.getScaler();
        }
        frLayout.addView(scaler);
        
        setContentView(frLayout);
         
        scaler.drawScaler(getStatusBar(), draw2d.mScaleFactor, draw2d.getScrollX(), draw2d.getScrollY());
        Log.d(TAG, "EditActivity: onCreate()");
 
        super.onCreate(savedInstanceState);
        bundleContainer = new BundleContainer (dataContainer, drillConfig, scaler, draw2d);
        setRequestedOrientation (ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE);
    }
    
    public BundleContainer onRetainNonConfigurationInstance()
    {
        Log.d(TAG, "retain");
        return bundleContainer;
    }

public class BundleContainer 
{
    private DataContainer dataContainer;
    private DrillConfig drillConfig;
    private ScalerLine scaler;
    private Draw2D draw2d;
    
    public BundleContainer(DataContainer dContainer, DrillConfig dConfig, ScalerLine dScaler, Draw2D d2d)
    {
        dataContainer = dContainer;
        drillConfig = dConfig;
        scaler = dScaler;
        draw2d = d2d;
    }
    
    public DataContainer getDataContainer()
    {
        return dataContainer;
    }
    
    public DrillConfig getDrillConfig()
    {
        return drillConfig;
    }
    
    public ScalerLine getScaler()
    {
        return scaler;
    }
    
    public Draw2D getDraw2D()
    {
        return draw2d;
    }
}