This is an automated email from the git hooks/post-receive script. mquinson pushed a commit to branch debian-debian in repository plm.
commit f3c4188f1f489a71d7e217f6221df993950f16a4 Merge: 7f91693 529872e Author: Martin Quinson <[email protected]> Date: Tue Oct 1 16:24:25 2013 +0200 Merge tag 'upstream/2.2.7' into debian-debian Upstream version 2.2.7 .classpath | 26 + .project | 24 + ChangeLog | 63 ++ checkDave.pl | 41 + lib/appbundler-1.0.jar | Bin 0 -> 133599 bytes lib/commons-logging-1.1.1.jar | Bin 0 -> 60686 bytes lib/gettext-ant-tasks-0.9.3.jar | Bin 0 -> 15581 bytes lib/gettext-commons-0.9.6.jar | Bin 0 -> 16845 bytes lib/httpclient-4.2.5.jar | Bin 0 -> 433368 bytes lib/httpcore-4.2.4.jar | Bin 0 -> 227275 bytes lib/httpmime-4.2.5.jar | Bin 0 -> 26477 bytes lib/jruby-1.5.6-5.jar | Bin 0 -> 7810930 bytes lib/json_simple-1.1.jar | Bin 0 -> 16057 bytes lib/jsyntaxpane-0.9.6~r156.jar | Bin 0 -> 392908 bytes lib/junit-4.11.jar | Bin 0 -> 245039 bytes lib/jython/antlr3-runtime.jar | Bin 0 -> 151576 bytes lib/jython/asm3-3.2.jar | Bin 0 -> 209577 bytes lib/jython/jython-2.5.1.jar | Bin 0 -> 4076286 bytes lib/l10n-engine/en.po | 189 +++-- lib/l10n-engine/fr.po | 199 +++-- lib/l10n-engine/plm.pot | 189 +++-- lib/l10n/fr.po | 889 +++++++++++--------- lib/l10n/plm.pot | 618 +++++++------- lib/langtools-beta.jar | Bin 0 -> 1816969 bytes lib/miglayout-3.7.4.jar | Bin 0 -> 276732 bytes lib/resources/plm.configuration.properties | 6 +- lib/scala/scala-compiler-2.10.2.jar | Bin 0 -> 14411576 bytes lib/scala/scala-library-2.10.2.jar | Bin 0 -> 7121811 bytes lib/scala/scala-reflect-2.10.2.jar | Bin 0 -> 3171170 bytes lib/twitter4j-core-3.0.3.jar | Bin 0 -> 284059 bytes po4a.conf | 30 +- .../maze/shortestpath/ShortestPathMaze.fr.html | 8 +- src/lessons/recursion/Main.java | 6 +- src/lessons/recursion/circle/Circle.fr.html | 24 - src/lessons/recursion/circle/Circle.html | 21 - src/lessons/recursion/circle/Circle.java | 20 - src/lessons/recursion/circle/CircleEntity.java | 22 - src/lessons/recursion/circle/CircleEntity.py | 10 - src/lessons/recursion/circle/CircleEntity.scala | 22 - .../recursion/dragoncurve/DragonCurve1Entity.java | 8 +- .../recursion/dragoncurve/DragonCurve1Entity.py | 8 +- .../recursion/dragoncurve/DragonCurve1Entity.scala | 8 +- .../recursion/dragoncurve/DragonCurve2Entity.java | 16 +- .../recursion/dragoncurve/DragonCurve2Entity.py | 16 +- src/lessons/recursion/hanoi/HanoiBoard.fr.html | 39 +- src/lessons/recursion/hanoi/HanoiBoard.html | 35 +- src/lessons/recursion/hanoi/HanoiBoard.java | 6 +- src/lessons/recursion/hanoi/HanoiBoardEntity.java | 22 +- src/lessons/recursion/hanoi/HanoiBoardEntity.py | 15 +- src/lessons/recursion/hanoi/HanoiBoardEntity.scala | 20 +- src/lessons/recursion/koch/Koch.fr.html | 21 +- src/lessons/recursion/koch/Koch.html | 20 +- src/lessons/recursion/koch/KochEntity.java | 4 + src/lessons/recursion/koch/KochEntity.py | 2 + src/lessons/recursion/koch/KochEntity.scala | 3 + .../recursion/sierpinski/Sierpinski.fr.html | 7 +- src/lessons/recursion/sierpinski/Sierpinski.html | 7 +- .../recursion/sierpinski/SierpinskiEntity.java | 11 +- .../recursion/sierpinski/SierpinskiEntity.py | 9 +- .../recursion/sierpinski/SierpinskiEntity.scala | 10 +- src/lessons/recursion/spiral/SpiralUse.fr.html | 51 +- src/lessons/recursion/spiral/SpiralUse.html | 43 +- src/lessons/recursion/spiral/SpiralUse.java | 26 +- src/lessons/recursion/spiral/SpiralUseEntity.java | 16 +- src/lessons/recursion/spiral/SpiralUseEntity.py | 16 +- src/lessons/recursion/spiral/SpiralUseEntity.scala | 17 +- src/lessons/recursion/spiral/example-1.png | Bin 0 -> 26119 bytes src/lessons/recursion/spiral/example-2.png | Bin 0 -> 3611 bytes src/lessons/recursion/spiral/example-3.png | Bin 0 -> 4737 bytes src/lessons/recursion/spiral/example-4.png | Bin 0 -> 2201 bytes src/lessons/recursion/star/Star.fr.html | 15 - src/lessons/recursion/star/Star.html | 14 - src/lessons/recursion/star/Star.java | 20 - src/lessons/recursion/star/StarEntity.java | 36 - src/lessons/recursion/star/StarEntity.py | 24 - src/lessons/recursion/star/StarEntity.scala | 36 - src/lessons/recursion/tree/Tree.fr.html | 26 +- src/lessons/recursion/tree/Tree.html | 20 +- src/lessons/recursion/tree/TreeEntity.java | 44 + src/lessons/recursion/tree/TreeEntity.py | 34 +- src/lessons/recursion/tree/TreeEntity.scala | 46 +- src/lessons/sort/{ => basic}/Main.fr.html | 0 src/lessons/sort/{ => basic}/Main.html | 0 src/lessons/sort/{ => basic}/Main.java | 26 +- .../sort/{ => basic}/bubble/AlgBubbleSort1.fr.html | 4 +- .../sort/{ => basic}/bubble/AlgBubbleSort1.html | 0 .../sort/{ => basic}/bubble/AlgBubbleSort1.java | 2 +- .../{ => basic}/bubble/AlgBubbleSort1Entity.java | 2 +- .../{ => basic}/bubble/AlgBubbleSort1Entity.py | 0 .../{ => basic}/bubble/AlgBubbleSort1Entity.scala | 2 +- .../sort/{ => basic}/bubble/AlgBubbleSort2.fr.html | 2 +- .../sort/{ => basic}/bubble/AlgBubbleSort2.html | 0 .../sort/{ => basic}/bubble/AlgBubbleSort2.java | 2 +- .../{ => basic}/bubble/AlgBubbleSort2Entity.java | 2 +- .../{ => basic}/bubble/AlgBubbleSort2Entity.py | 0 .../{ => basic}/bubble/AlgBubbleSort2Entity.scala | 2 +- .../sort/{ => basic}/bubble/AlgBubbleSort3.fr.html | 14 +- .../sort/{ => basic}/bubble/AlgBubbleSort3.html | 7 +- .../sort/{ => basic}/bubble/AlgBubbleSort3.java | 2 +- .../{ => basic}/bubble/AlgBubbleSort3Entity.java | 2 +- .../{ => basic}/bubble/AlgBubbleSort3Entity.py | 0 .../{ => basic}/bubble/AlgBubbleSort3Entity.scala | 2 +- .../{ => basic}/cocktail/AlgCocktailSort1.fr.html | 0 .../{ => basic}/cocktail/AlgCocktailSort1.html | 0 .../{ => basic}/cocktail/AlgCocktailSort1.java | 2 +- .../cocktail/AlgCocktailSort1Entity.java | 2 +- .../{ => basic}/cocktail/AlgCocktailSort1Entity.py | 0 .../cocktail/AlgCocktailSort1Entity.scala | 2 +- .../{ => basic}/cocktail/AlgCocktailSort2.fr.html | 4 +- .../{ => basic}/cocktail/AlgCocktailSort2.html | 4 +- .../{ => basic}/cocktail/AlgCocktailSort2.java | 2 +- .../cocktail/AlgCocktailSort2Entity.java | 2 +- .../{ => basic}/cocktail/AlgCocktailSort2Entity.py | 0 .../cocktail/AlgCocktailSort2Entity.scala | 2 +- .../{ => basic}/cocktail/AlgCocktailSort3.fr.html | 4 +- .../{ => basic}/cocktail/AlgCocktailSort3.html | 0 .../{ => basic}/cocktail/AlgCocktailSort3.java | 2 +- .../cocktail/AlgCocktailSort3Entity.java | 2 +- .../{ => basic}/cocktail/AlgCocktailSort3Entity.py | 0 .../cocktail/AlgCocktailSort3Entity.scala | 2 +- .../sort/{ => basic}/comb/AlgCombSort.fr.html | 15 +- src/lessons/sort/{ => basic}/comb/AlgCombSort.html | 12 +- src/lessons/sort/{ => basic}/comb/AlgCombSort.java | 2 +- .../sort/{ => basic}/comb/AlgCombSort11.fr.html | 0 .../sort/{ => basic}/comb/AlgCombSort11.html | 0 .../sort/{ => basic}/comb/AlgCombSort11.java | 2 +- .../sort/{ => basic}/comb/AlgCombSort11Entity.java | 2 +- .../sort/{ => basic}/comb/AlgCombSort11Entity.py | 0 .../{ => basic}/comb/AlgCombSort11Entity.scala | 2 +- .../sort/{ => basic}/comb/AlgCombSortEntity.java | 2 +- .../sort/{ => basic}/comb/AlgCombSortEntity.py | 0 .../sort/{ => basic}/comb/AlgCombSortEntity.scala | 4 +- .../sort/{ => basic}/gnome/AlgGnomeSort.fr.html | 0 .../sort/{ => basic}/gnome/AlgGnomeSort.html | 0 .../sort/{ => basic}/gnome/AlgGnomeSort.java | 2 +- .../sort/{ => basic}/gnome/AlgGnomeSortEntity.java | 4 +- .../sort/{ => basic}/gnome/AlgGnomeSortEntity.py | 2 +- .../{ => basic}/gnome/AlgGnomeSortEntity.scala | 4 +- src/lessons/sort/{ => basic}/icon.png | Bin 1590 -> 1590 bytes .../{ => basic}/insertion/AlgInsertionSort.fr.html | 20 +- .../{ => basic}/insertion/AlgInsertionSort.html | 18 +- .../{ => basic}/insertion/AlgInsertionSort.java | 2 +- .../insertion/AlgInsertionSortEntity.java | 2 +- .../insertion/AlgInsertionSortEntity.py | 0 .../insertion/AlgInsertionSortEntity.scala | 2 +- .../{ => basic}/insertion/InsertionsortAfter.png | Bin 2137 -> 2137 bytes .../{ => basic}/insertion/InsertionsortBefore.png | Bin 2213 -> 2213 bytes .../{ => basic}/selection/AlgSelectionSort.fr.html | 0 .../{ => basic}/selection/AlgSelectionSort.html | 0 .../{ => basic}/selection/AlgSelectionSort.java | 2 +- .../selection/AlgSelectionSortEntity.java | 2 +- .../selection/AlgSelectionSortEntity.py | 0 .../selection/AlgSelectionSortEntity.scala | 2 +- .../sort/{ => basic}/shell/AlgShellSort.fr.html | 0 .../sort/{ => basic}/shell/AlgShellSort.html | 0 .../sort/{ => basic}/shell/AlgShellSort.java | 2 +- .../sort/{ => basic}/shell/AlgShellSortEntity.java | 2 +- .../sort/{ => basic}/shell/AlgShellSortEntity.py | 0 .../{ => basic}/shell/AlgShellSortEntity.scala | 2 +- src/lessons/sort/{ => basic}/short_desc.fr.html | 0 src/lessons/sort/{ => basic}/short_desc.html | 0 src/lessons/sort/dutchflag/DutchFlagAlgo.html | 21 + src/lessons/sort/dutchflag/DutchFlagAlgo.java | 27 + .../sort/dutchflag/DutchFlagAlgoEntity.java | 39 + src/lessons/sort/dutchflag/DutchFlagAlgoEntity.py | 17 + .../sort/dutchflag/DutchFlagAlgoEntity.scala | 38 + src/lessons/sort/dutchflag/Main.html | 15 + src/lessons/sort/dutchflag/Main.java | 11 + src/lessons/sort/dutchflag/icon.png | Bin 0 -> 366 bytes src/lessons/sort/dutchflag/short_desc.html | 3 + .../sort/dutchflag/universe/DutchFlagEntity.java | 79 ++ .../sort/dutchflag/universe/DutchFlagWorld.html | 22 + .../sort/dutchflag/universe/DutchFlagWorld.java | 247 ++++++ .../dutchflag/universe/DutchFlagWorldView.java | 99 +++ .../sort/dutchflag/universe/world_dutchflag.png | Bin 0 -> 331 bytes .../sort/pancake/universe/PancakeWorld.fr.html | 2 +- .../sort/pancake/universe/PancakeWorld.java | 5 +- src/lessons/turtleart/FlowerEntity.java | 39 + src/lessons/turtleart/FlowerEntity.py | 28 + src/lessons/turtleart/FlowerEntity.scala | 40 + src/lessons/turtleart/Main.java | 5 + src/lessons/turtleart/StarEntity.java | 1 + src/lessons/turtleart/StarEntity.py | 1 + src/lessons/turtleart/StarEntity.scala | 2 + src/lessons/welcome/array/basics/Array2Entity.py | 1 - src/lessons/welcome/array/has271/Has271.fr.html | 3 +- src/lessons/welcome/variables/Variables.fr.html | 7 +- src/plm/core/ExoTest.java | 2 +- src/plm/core/model/session/FileSessionKit.java | 209 ----- src/plm/core/ui/AboutWorldDialog.java | 21 +- src/plm/core/ui/ChooseLectureDialog.java | 2 +- src/plm/core/ui/ChooseLessonDialog.java | 2 +- src/plm/core/ui/MainFrame.java | 7 +- src/plm/core/ui/StatusBar.java | 11 + src/plm/core/ui/action/ExportCloudSession.java | 1 + src/plm/core/ui/action/ImportCloudSession.java | 20 +- .../ui/editor/buggleeditor/PropertiesEditor.java | 6 +- src/plm/universe/bugglequest/AbstractBuggle.java | 32 +- src/plm/universe/bugglequest/Buggle.java | 2 +- src/plm/universe/bugglequest/BuggleWorld.fr.html | 24 +- src/plm/universe/bugglequest/BuggleWorld.html | 24 +- src/plm/universe/bugglequest/BuggleWorld.java | 15 +- .../universe/bugglequest/ui/BuggleButtonPanel.java | 4 +- .../universe/bugglequest/ui/BuggleWorldView.java | 2 +- src/plm/universe/sort/SortingWorld.fr.html | 2 +- src/plm/universe/sort/SortingWorld.java | 109 ++- src/plm/universe/sort/SortingWorldView.java | 33 +- src/plm/universe/turtles/Line.java | 52 +- src/plm/universe/turtles/TurtleWorld.fr.html | 19 + src/plm/universe/turtles/TurtleWorld.html | 19 + src/plm/universe/turtles/TurtleWorld.java | 99 ++- 211 files changed, 2960 insertions(+), 1897 deletions(-) -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/plm.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
