diff --git a/log4j.properties b/log4j.properties index cfb0397..aff155b 100644 --- a/log4j.properties +++ b/log4j.properties @@ -1,4 +1,4 @@ -log4j.rootLogger=INFO,stdout +log4j.rootLogger=TRACE,stdout log4j.com.jdbernard.teammaker=TRACE,file log4j.appender.stdout=org.apache.log4j.ConsoleAppender diff --git a/project.properties b/project.properties index 211a627..b06a14b 100644 --- a/project.properties +++ b/project.properties @@ -1,7 +1,7 @@ -#Wed, 25 Aug 2010 08:14:14 -0500 +#Wed, 25 Aug 2010 09:05:51 -0500 #Mon Jul 05 23:10:39 CDT 2010 app.version=0.4.0 -build.number=0 +build.number=2 src.dir=src lib.dir=lib build.dir=build diff --git a/src/com/jdbernard/teammaker/TeamMaker.groovy b/src/com/jdbernard/teammaker/TeamMaker.groovy index da949d1..f098d80 100644 --- a/src/com/jdbernard/teammaker/TeamMaker.groovy +++ b/src/com/jdbernard/teammaker/TeamMaker.groovy @@ -40,7 +40,7 @@ public class TeamMaker { @Bindable List sittingPlayers = [] @Bindable boolean inGame = false @Bindable int teamSize = 4 - @Bindable Player popupPlayer = null + @Bindable List popupPlayers = null @Bindable int popupTeam; } @@ -77,19 +77,22 @@ public class TeamMaker { inGamePlayerDropMenu = swing.popupMenu(/*'Player Options'*/) { menuItem('Bench Player',/* enabled: bind { !model.inGame },*/ - actionPerformed: { benchPlayer(model.popupPlayer, + actionPerformed: { benchPlayer(model.popupPlayers, model.popupTeam) }) } sittingPlayerDropMenu = swing.popupMenu(/*'Player Options'*/) { menuItem('Assign to Team A', /*enabled: bind { !model.inGame },*/ - actionPerformed: { assignPlayer(model.popupPlayer, 1) }) + actionPerformed: { + model.popupPlayers.each { assignPlayer(it, 1) }}) menuItem('Assign to Team B', /*enabled: bind { !model.inGame },*/ - actionPerformed: { assignPlayer(model.popupPlayer, 2) }) + actionPerformed: { + model.popupPlayers.each { assignPlayer(it, 2) }}) menuItem('Set Games Sat', - actionPerformed: { setGamesSat(model.popupPlayer) }) + actionPerformed: { + model.popupPlayers.each { setGamesSat(it) }}) } frame = swing.frame(title: "JDB TeamMaker v$version", @@ -172,7 +175,7 @@ public class TeamMaker { constraints: gbc(gridx: 2, gridy: 1, anchor: GBC.CENTER, insets: [5, 5, 5, 5]), actionPerformed: { - model.sittingPlayers.remove(sittingList.selectedValue) + model.sittingPlayers.remove(sittingList.selectedValues) refreshGUI() }) } @@ -301,8 +304,12 @@ public class TeamMaker { private void showSittingPlayerDropMenu(def evt) { int index = sittingList.locationToIndex(evt.point) - sittingList.selectedIndex = index - this.model.popupPlayer = sittingList.model.getElementAt(index) + if (sittingList.isSelectedIndex(index)) + this.model.popupPlayers = sittingList.selectedValues + else { + sittingList.selectedIndex = index + this.model.popupPlayers = [sittingList.model.getElementAt(index)] + } sittingPlayerDropMenu.show(sittingList, evt.point.@x, evt.point.@y) } @@ -310,8 +317,13 @@ public class TeamMaker { private void showInGamePlayerDropMenu(def evt) { def teamList = evt.source int index = teamList.locationToIndex(evt.point) - teamList.selectedIndex = index - this.model.popupPlayer = teamList.model.getElementAt(index) + if (teamList.isSelectedIndex(index)) + this.model.popupPlayers = teamList.selectedValues + else { + teamList.selectedIndex = index + model.popupPlayers = [teamList.model.getElementAt(index)] + } + this.model.popupTeam = (teamList == team1List ? 1 : 2) inGamePlayerDropMenu.show(teamList, evt.point.@x, evt.point.@y)