I am a one man S corporation in California. I incorporated in August 2012 and before that I was a sole proprietor - filed 2011 as such.

At the end of 2012 all income was based on my SS number and the customers send me 1099 reflecting that.
I did not take a salary during the year.

Questions:
1. How do I file my federal and state taxes for last year? As a sole proprietor, based on the 1099 or as a S corp?

2. If I file as a sole proprietor what happen to the S corp filing?