Re: [FalconJx] avoiding interesting merge situation ;-)

2013-01-21 Thread Michael Schmalle
Ok, We are on the same page now. I just committed the preliminary MXML traversing and how to get it working with the backends. There is one test that is really hack that I need to clean up, I haven't figured out how I want to unit test this yet. Whatever... Still in the tinkering phase.

Re: [FalconJx] avoiding interesting merge situation ;-)

2013-01-21 Thread Michael Schmalle
Quoting Erik de Bruin : Ok, I've resolved a few minor conflicts and committed my code for FalconJx. I completely agree on the formatter thing, the whitespace stuff is already driving me nuts. I'll follow your lead. I will get this together, I will set mine up to look as much like Falcon doe

Re: [FalconJx] avoiding interesting merge situation ;-)

2013-01-21 Thread Erik de Bruin
I did, I tried to be extra careful :( Sorry if I messed up, feel free to revert and kick out my mess, I'll sort it out on my side. EdB On Mon, Jan 21, 2013 at 11:05 PM, Michael Schmalle wrote: > Erik, > > It doesn't look like you merged my commits, they are gone from the > GoogEmitter. > > Did

Re: [FalconJx] avoiding interesting merge situation ;-)

2013-01-21 Thread Michael Schmalle
Erik, It doesn't look like you merged my commits, they are gone from the GoogEmitter. Did you merge and refresh the eclipse files after you did it? Mike Quoting Michael Schmalle : Erik, We seriously need to get a format.xml file to share for the Eclipse formater. Once we get passed th

Re: [FalconJx] avoiding interesting merge situation ;-)

2013-01-21 Thread Erik de Bruin
Ok, I've resolved a few minor conflicts and committed my code for FalconJx. I completely agree on the formatter thing, the whitespace stuff is already driving me nuts. I'll follow your lead. I'll work on the publisher app a bit, but I must say, for a Monday, things aren't going half bad. I have an

Re: [FalconJx] avoiding interesting merge situation ;-)

2013-01-21 Thread Michael Schmalle
Erik, We seriously need to get a format.xml file to share for the Eclipse formater. Once we get passed this rough development we are only going to want to see non whitespace commits. I compulsively format all the time, it's habit. :) We can try to make it look a lot like falcons's maybe u

Re: [FalconJx] avoiding interesting merge situation ;-)

2013-01-21 Thread Michael Schmalle
I'm done, so do what you need to do, I promise I won't touch any files in SVN until I see your new stuff. I didn't change much that should affect you really. I haven't committed the MXML specific api files yet, I'm waiting to get those more concrete but things are working! I have the ASBl

Re: [FalconJx] avoiding interesting merge situation ;-)

2013-01-21 Thread Erik de Bruin
Ah, ping me when you're done for the day, so I'll know when it's safe to figure out where my stuff goes in the new improved scheme :-) EdB On Mon, Jan 21, 2013 at 10:05 PM, Erik de Bruin wrote: > Awesome! > > You go ahead, play for a while :-) Wouldn't want to break you out of > the zone. My c

Re: [FalconJx] avoiding interesting merge situation ;-)

2013-01-21 Thread Erik de Bruin
Awesome! You go ahead, play for a while :-) Wouldn't want to break you out of the zone. My changes can wait, I have other loose ends to tie up. Have fun! EdB On Mon, Jan 21, 2013 at 10:03 PM, Michael Schmalle wrote: > Err... > > DO it NOW! :) I am on a roll and at a point where it's safe, le

Re: [FalconJx] avoiding interesting merge situation ;-)

2013-01-21 Thread Michael Schmalle
Err... DO it NOW! :) I am on a roll and at a point where it's safe, let me commit one more tiny change. Check this out. :) goog.provide('Main'); goog.require('spark.components.Button'); goog.require('mx.events.FlexEvent'); /** * @param {FlexEvent} event */ Main.prototype.creationComplet

[FalconJx] avoiding interesting merge situation ;-)

2013-01-21 Thread Erik de Bruin
Mike, In the interest of expediency, will you be checking in a lot more today, or can I start to merge my local changes with your latest commits? EdB -- Ix Multimedia Software Jan Luykenstraat 27 3521 VB Utrecht T. 06-51952295 I. www.ixsoftware.nl