This is an automated email from the git hooks/post-receive script. mquinson pushed a commit to branch debian-debian in repository jlm.
commit 0c03c5740c4e6e9b410ab9a701a4bfe5b779d7a4 Author: Martin Quinson <[email protected]> Date: Wed Sep 4 15:46:41 2013 +0200 fix the no-scala patch --- debian/patches/no-scala | 27 ++++++++++++++------------- 1 file changed, 14 insertions(+), 13 deletions(-) diff --git a/debian/patches/no-scala b/debian/patches/no-scala index 93f3ba5..3875325 100644 --- a/debian/patches/no-scala +++ b/debian/patches/no-scala @@ -1,8 +1,9 @@ ---- - src/plm/core/CompilerScala.java | 143 ---------------------------------------- - src/plm/core/model/Game.java | 2 - 2 files changed, 3 insertions(+), 142 deletions(-) - +--- + src/plm/core/CompilerScala.java | 143 ---------------------------------- + src/plm/core/model/Game.java | 2 + src/plm/core/ui/PlmHtmlEditorKit.java | 16 ++- + 3 files changed, 13 insertions(+), 148 deletions(-) + Index: b/src/plm/core/CompilerScala.java =================================================================== --- a/src/plm/core/CompilerScala.java @@ -182,19 +183,19 @@ Index: b/src/plm/core/model/Game.java public static final ProgrammingLanguage LIGHTBOT = new ProgrammingLanguage("lightbot","ignored",ResourcesCache.getIcon("img/lightbot_light.png")); public static final ProgrammingLanguage[] programmingLanguages = new ProgrammingLanguage[] { - JAVA, PYTHON, SCALA, RUBY, LIGHTBOT // TODO: re-add JAVASCRIPT to this list once it works at least a bit -+ JAVA, PYTHON, RUBY, LIGHTBOT // TODO: re-add JAVASCRIPT to this list once it works at least a bit ++ JAVA, PYTHON, RUBY, LIGHTBOT // TODO: re-add JAVASCRIPT to this list once it works at least a bit }; private ProgrammingLanguage programmingLanguage = JAVA; -diff --git a/src/plm/core/ui/PlmHtmlEditorKit.java b/src/plm/core/ui/PlmHtmlEditorKit.java -index a305498..0d50209 100644 +Index: b/src/plm/core/ui/PlmHtmlEditorKit.java +=================================================================== --- a/src/plm/core/ui/PlmHtmlEditorKit.java +++ b/src/plm/core/ui/PlmHtmlEditorKit.java -@@ -68,18 +68,22 @@ public class PlmHtmlEditorKit extends HTMLEditorKit { +@@ -68,18 +68,22 @@ String res = in.replaceAll("\\[!thelang/?\\]", "[!java]Java[/!][!python]python[/!][!scala]Scala[/!]"); res = res.replaceAll("\\[!configfile/?\\]", Game.getSavingLocation()+File.separator+"plm.properties"); -+ String []theProgLangs = new String[Game.getProgrammingLanguages().length+1]; ++ ProgrammingLanguage []theProgLangs = new ProgrammingLanguage[Game.getProgrammingLanguages().length+1]; + for (int i=0; i<Game.getProgrammingLanguages().length;i++) + theProgLangs[i] = Game.getProgrammingLanguages()[i]; + theProgLangs[theProgLangs.length-1] = Game.SCALA; @@ -216,7 +217,7 @@ index a305498..0d50209 100644 if (!lang2.equals(lang)) { String l2 = lang2.getLang().toLowerCase(); res = res.replaceAll("(?s)\\[!"+l+"\\|"+l2+"\\](.*?)\\[/!\\]", -@@ -98,7 +102,7 @@ public class PlmHtmlEditorKit extends HTMLEditorKit { +@@ -98,7 +102,7 @@ // Process any block with one language first so that they can be nested in blocks with more than one language. res = res.replaceAll( "(?s)\\[!"+cl+"\\](.*?)\\[/!\\]","$1"); //System.out.println("Keep "+"(?s)\\[!"+cl+"\\](.*?)\\[/!\\]"); @@ -225,7 +226,7 @@ index a305498..0d50209 100644 if (!lang.equals(currLang)) { String l = lang.getLang().toLowerCase(); -@@ -106,7 +110,7 @@ public class PlmHtmlEditorKit extends HTMLEditorKit { +@@ -106,7 +110,7 @@ //System.out.println("Kill "+"(?s)\\[!"+l+"\\](.*?)\\[/!\\]"); } } @@ -234,7 +235,7 @@ index a305498..0d50209 100644 if (!lang.equals(currLang)) { String l = lang.getLang().toLowerCase(); -@@ -115,7 +119,7 @@ public class PlmHtmlEditorKit extends HTMLEditorKit { +@@ -115,7 +119,7 @@ res = res.replaceAll( "(?s)\\[!"+cl+"\\|"+l +"\\](.*?)\\[/!\\]", "$1"); //System.out.println("Keep "+"(?s)\\[!"+cl+"\\|"+l +"\\](.*?)\\[/!\\]"); -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/jlm.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
