Ok，it's easier to commit from your side.
Just do the changes you need:) 
I will take a look at see what changed 

发自我的 iPhone

> 在 2014年3月4日，下午1:21，Alexandre St-  <notifications@github.com> 写道：
> 
> In src/View/editActivityFrame.java:
> 
> > @@ -75,6 +76,13 @@ public EditActivityFrame() {
> >      	gbc_comboTypeActivity.gridy = 3;
> >      	getContentPane().add(comboTypeActivity, gbc_comboTypeActivity);
> >      	
> > +        // TODO add items for the dropbox
> > +    	comboTypeActivity.addItem("1");
> > +    	comboTypeActivity.addItem("2");
> > +    	comboTypeActivity.addItem("3");
> > +    	comboTypeActivity.addItem("4");
> I'm pretty sure this should look like:
> 
> comboTypeActivity.addItem("Presentation");
> comboTypeActivity.addItem("Group Work");
> ...
> Then you can probably use comboTypeActivity.getSelectedIndex() in the controller...
> 
> —
> Reply to this email directly or view it on GitHub.