Merge pull request Catrobat#56 from Catrobat/develop

Release v0.9

LICENSE.txt

@@ -1,6 +1,6 @@
 Licenses of the Catrobat system
 
-The following licenses, terms, and conditions apply to your use of the Catrobat system: 
+The following licenses, terms, and conditions apply to your use of the Catrobat system:
 Version 3.5, 28 January 2015
 All source code of software constituting the Catrobat system, e.g., the integrated development environments (with all associated parts such as tutorial programs) and the interpreters and compilers for the Catrobat programming language, the image editing programs, the source code of software we wrote to run the Catrobat websites and other Internet resources, and all our own source code related to the Catrobat system, are free software: you can redistribute them and/or modify them under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version when it becomes available.
 
@@ -18,12 +18,12 @@ Catrobat additionally contains third party code and resources as follows:
 
 libGDX: <http://libgdx.badlogicgames.com>
 License information: Apache 2 License <https://raw.github.com/libgdx/libgdx/master/gdx/LICENSE>
-Copyright � 2011-2012 See <https://github.com/libgdx/libgdx/tree/master/gdx>
+Copyright © 2011-2012 See <https://github.com/libgdx/libgdx/tree/master/gdx>
 
 XStream: <http://xstream.codehaus.org>
 License information: <http://xstream.codehaus.org/license.html>
-Copyright � 2003-2006, Joe Walnes
-Copyright � 2006-2009, 2011 XStream Committers
+Copyright © 2003-2006, Joe Walnes
+Copyright © 2006-2009, 2011 XStream Committers
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
@@ -36,11 +36,11 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
 
 Toolbar custom icons 1.0 facilities from Gentleface custom icon design: <http://gentleface.com/free_icon_set.html>
 License information: Creative Commons Attribution-NonCommercial 3.0: <https://creativecommons.org/licenses/by-nc-nd/3.0/>
-Copyright � 2006-2011 Gentleface.
+Copyright © 2006-2011 Gentleface.
 
 MINDdroid: <https://github.com/NXT/LEGO-MINDSTORMS-MINDdroid>
-Copyright � 2010/11 Guenther Hoelzl, Shawn Brown
-Copyright � 2010/11 LEGO System A/S, Aastvej 1, DK-7190 Billund, Denmark
+Copyright © 2010/11 Guenther Hoelzl, Shawn Brown
+Copyright © 2010/11 LEGO System A/S, Aastvej 1, DK-7190 Billund, Denmark
 MINDdroid is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.
 MINDdroid is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 See the GNU General Public License for more details <http://www.gnu.org/licenses/>
@@ -104,21 +104,21 @@ Check back here from time-to-time, because we are always trying to improve our l
 Please mail any suggestions regarding these licenses to webmaster@catrobat.org.
 
 
-Licenses of all used 3rd party libraries
+Licenses of all used 3rd party libraries in ScratchToCatrobat
 
 Libraries of our converter tool:
 Batik 1.7   Apache License Version 2.0
-jsoup       under MIT license, Copyright � 2009 - 2013 Jonathan Hedle(jonathan@hedley.net)
+jsoup       under MIT license, Copyright © 2009 - 2016 Jonathan Hedley (jonathan@hedley.net)
 xmlpull     Initial authors: Stefan Haustein and Aleksander Slominski
 xpp3_min    Copyright 2002 Extreme! Lab, Indiana University. All rights reserved.
 xstream     Copyright by the BSD license
 
-Web libraries:	
-bootstrap   Copyright by the MIT license
-jquery      Copyright by the MIT license
-qrcode      Copyright by the MIT license
+Web libraries:
+bootstrap   released under the MIT license and copyright 2017 Twitter
+jquery      released under the MIT license
+qrcode      released under the MIT license
 
-Libraries used in Sourcecode filter:	
+Libraries used in Sourcecode filter:
 Guava       Apache License Version 2.0
 SnakeYAML   Licensed by APL 2.0.
 Commons-io  Apache License Version 2.0

README.md

@@ -1,6 +1,6 @@
 <img title="Scratch2Catrobat" src="https://cloud.githubusercontent.com/assets/3843968/9567706/5a084d76-4f35-11e5-9e3b-5a49256fde86.png" width=595 />
 
-[![Version](https://img.shields.io/badge/version-0.8.1b-blue.svg)](https://img.shields.io/badge/version-0.8.1b-blue.svg)
+[![Version](https://img.shields.io/badge/version-0.9.0b-blue.svg)](https://img.shields.io/badge/version-0.9.0b-blue.svg)
 
 A tool for converting Scratch projects into Catrobat programs.
 
@@ -17,7 +17,7 @@ The Following License Header should be used for all python and java source files
 ## License Header for Python source files
 <pre lang="python"><code>
 #  ScratchToCatrobat: A tool for converting Scratch projects into Catrobat programs.
-#  Copyright (C) 2013-2015 The Catrobat Team
+#  Copyright (C) 2013-2017 The Catrobat Team
 #  (http://developer.catrobat.org/credits)
 #
 #  This program is free software: you can redistribute it and/or modify
@@ -42,7 +42,7 @@ The Following License Header should be used for all python and java source files
 <pre lang="java"><code>
 /*
  * ScratchToCatrobat: A tool for converting Scratch projects into Catrobat programs.
- * Copyright (C) 2013-2015 The Catrobat Team
+ * Copyright (C) 2013-2017 The Catrobat Team
  * (http://developer.catrobat.org/credits)
  *
  * This program is free software: you can redistribute it and/or modify

config/default.ini

@@ -2,14 +2,14 @@
 [APPLICATION]
 name:          Scratch2Catrobat Converter
 short_name:    S2CC
-version:       0.8.1
+version:       0.9.0
 build_name:    Aegean cat
-build_number:  823-master
+build_number:  911-develop
 
 ;-------------------------------------------------------------------------------
 [CATROBAT]
 ; TODO: update this field manually every time the hierarchy changes
-catrobat_language_version:       0.992
+catrobat_language_version:       0.994
 file_extension:                  .catrobat
 automatic_screenshot_file_name:  automatic_screenshot.png
 media_license_url:               http://developer.catrobat.org/ccbysa_v3 ; used for XML Header
@@ -23,7 +23,7 @@ repository_api_show_tags_url:    https://api.github.com/repos/%(repository_owner
 
 ; TODO: update this field manually every time the hierarchy changes
 ; => should be updated automatically by SourceCodeFilter in future times
-tag_name_of_used_hierarchy:      v0.9.27
+tag_name_of_used_hierarchy:      v0.9.29
 
 ;-------------------------------------------------------------------------------
 [SCRATCH]

docs/ManualFilterChanges.txt

@@ -0,0 +1,207 @@
+Issues:
+--------------------------------------------------------------------------------
+1) Folgende Zeile in org.catrobat.catroid.content.Look.java ersetzen:
+public class Look extends Image {
+
+mit:
+public class Look {
+
+--------------------------------------------------------------------------------
+3) Folgende Zeile in org.catrobat.catroid.content.bricks.UserBrick.java (direkt in die Klasse) ersetzen:
+		try {
+			for (Formula formula : formulas) {
+				variables.add(new UserVariable(element.getText(), formula.interpretDouble(sprite)));
+			}
+		} catch (InterpretationException e) {
+		}
+
+mit:
+	for (Formula formula : formulas) {
+		variables.add(new UserVariable(element.getText()));
+	}
+
+--------------------------------------------------------------------------------
+4) Folgende Zeilen in org.catrobat.catroid.io.BackwardCompatibleCatrobatLanguageXStream.java loeschen:
+
+	public void updateCollisionReceiverBrickMessage(File file) {
+		final String collisionTag = "CollisionScript";
+		final String receivedTag = "receivedMessage";
+		Document originalDocument = getDocument(file);
+
+		if (originalDocument != null) {
+			NodeList scripts = originalDocument.getElementsByTagName("script");
+			for (int i = 0; i < scripts.getLength(); i++) {
+				Node script = scripts.item(i);
+				NamedNodeMap attr = script.getAttributes();
+				if (attr.getLength() > 0) {
+					for (int j = 0; j < attr.getLength(); j++) {
+						if (attr.item(j).getNodeValue().equals(collisionTag)) {
+							NodeList messages = script.getChildNodes();
+							for (int k = 0; k < messages.getLength(); k++) {
+								Node message = messages.item(k);
+								if (message.getNodeName().equals(receivedTag)) {
+									String broadcastMessage = message.getTextContent();
+									String[] broadcastMessages = broadcastMessage.split("<(\\W)*-(\\W)*>");
+
+									if (broadcastMessages[1].matches("(\\W)*ANYTHING(\\W)*")) {
+										broadcastMessages[1] = PhysicsCollision.COLLISION_WITH_ANYTHING_IDENTIFIER;
+									}
+									broadcastMessage = broadcastMessages[0] + PhysicsCollision
+											.COLLISION_MESSAGE_CONNECTOR + broadcastMessages[1];
+
+									message.setTextContent(broadcastMessage);
+								}
+							}
+						}
+					}
+				}
+			}
+		}
+		saveDocument(originalDocument, file);
+	}
+
+5) UNBEDINGT FOLGENDES KONTROLLIEREN:
+   CatroidFieldKeySorter.java oeffnen und alle equals()-Aufrufe in Methode sortProjectFields() anschauen.
+   JEDER (!) Equals-Vergleich MUSS in Project.java als Field/Membervariable vorkommen!!
+   zum Beispiel:
+         wenn fieldKey.getFieldName().equals("xmlHeader") in sortProjectFields() vorkommt, heißt das
+         dass es ein "xmlHeader"-Field/Membervariable in der Project-Klasse in Project.java geben MUSS!
+		 Ist dies nicht der Fall mÃŒssen die Regeln in config.yml angepasst werden, sodass dieses Feld
+		 nicht vom SourceCodeFilter weggefiltert wird.
+
+6) UNBEDINGT FOLGENDES KONTROLLIEREN:
+   CatroidFieldKeySorter.java oeffnen und alle equals()-Aufrufe in Methode sortSpriteFields() anschauen.
+   JEDER (!) Equals-Vergleich MUSS in Sprite.java als Field/Membervariable vorkommen!!
+   zum Beispiel:
+         wenn fieldKey.getFieldName().equals("look") in sortProjectFields() vorkommt, heißt das
+         dass es ein "xmlHeader"-Field/Membervariable in der Sprite-Klasse in Sprite.java geben MUSS!
+		 Ist dies nicht der Fall mÃŒssen die Regeln in config.yml angepasst werden, sodass dieses Feld
+		 nicht vom SourceCodeFilter weggefiltert wird.
+
+
+Zusatzregeln
+
+-----------------------------------------------------------------------------------------------------------
+
+In Look.java folgendes löschen:
+
+boolean isBackgroundLook = getZIndex() == Constants.Z_INDEX_BACKGROUND;
+
+-----------------------------------------------------------------------------------------------------------
+
+In Project.java  
+
+		Scene scene; 
+		try {
+			scene = new Scene(context, context.getString(R.string.default_scene_name, 1), this);
+		} catch (Resources.NotFoundException e) {
+			//Because in test project we can't find the string
+			scene = new Scene(context, "Scene 1", this);
+		}
+
+ersetzen durch
+
+Scene scene = new Scene(null, "Scene 1", this);
+
+-----------------------------------------------------------------------------------------------------------
+
+In Project.java folgendes loeschen:
+		if (isCastProject) {
+			setChromecastFields();
+		}
+// [...]
+		removeInvalidVariablesAndLists(oldProject.dataContainer);
+
+-----------------------------------------------------------------------------------------------------------
+
+In Project.java folgendes ändern:
+	public Project(Context context, String name, boolean landscapeMode, boolean isCastProject) {
+zu:
+	public Project(Scene.Context context, String name, boolean landscapeMode, boolean isCastProject) {
+
+und:
+	public Project(Context context, String name, boolean landscapeMode) {
+zu:
+	public Project(Scene.Context context, String name, boolean landscapeMode) {
+
+und:
+	public Project(Context context, String name) {
+zu:
+	public Project(Scene.Context context, String name) {
+
+und:
+	public Project(SupportProject oldProject, Context context) {
+zu:
+	public Project(SupportProject oldProject, Scene.Context context) {
+
+-----------------------------------------------------------------------------------------------------------
+
+In Scene.java folgendes löschen:
+		import org.catrobat.catroid.content.bricks.BrickWithSpriteReference;
+
+In Scene.java folgendes hinzufügen:
+
+public class Context{};
+
+-----------------------------------------------------------------------------------------------------------
+
+In Scene.java folgendes einfügen:
+
+background = new SingleSprite("Background");
+
+und folgendes löschen:
+
+background.look.setZIndex(0)
+
+-----------------------------------------------------------------------------------------------------------
+
+In UserScriptDefinitionBrick.java folgendes ersetzen:
+	@Override
+	public Script getScriptSafe() {
+mit:
+	public Script getScriptSafe() {
+
+-----------------------------------------------------------------------------------------------------------
+In SpriteDataBehaviour folgende Methode löschen:
+	protected abstract boolean isClone(K key);
+
+und:
+
+	Map<Sprite, List<V>> cloneForScene(Scene scene, Map<K, List<V>> dataMap) {
+		// [...]
+	}
+
+und:
+
+	void removeCloneData() {
+		// [...]
+	}
+
+-----------------------------------------------------------------------------------------------------------
+In SpriteListBehaviour.java folgende Methode löschen:
+	protected boolean isClone(Sprite key) {
+		// [...]
+	}
+
+-----------------------------------------------------------------------------------------------------------
+In SpriteVariableBehaviour.java folgende Methode löschen:
+	@Override
+	Map<Sprite, List<UserVariable>> cloneForScene(Scene scene, Map<Sprite, List<UserVariable>> originalData) {
+		removeIllegalSpriteVariableEntries(null);
+		return super.cloneForScene(scene, originalData);
+	}
+
+und:
+
+	@Override
+	protected boolean isClone(Sprite key) {
+		return key.isClone();
+	}
+
+-----------------------------------------------------------------------------------------------------------
+In UserBrickVariableBehaviour.java folgende Methode löschen:
+	@Override
+	protected boolean isClone(UserBrick key) {
+		return false;
+	}
+

run

@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 #
 #  ScratchToCatrobat: A tool for converting Scratch projects into Catrobat programs.
-#  Copyright (C) 2013-2015 The Catrobat Team
+#  Copyright (C) 2013-2017 The Catrobat Team
 #  (<http://developer.catrobat.org/credits>)
 #
 #  This program is free software: you can redistribute it and/or modify

run_tests

@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 #
 #  ScratchToCatrobat: A tool for converting Scratch projects into Catrobat programs.
-#  Copyright (C) 2013-2015 The Catrobat Team
+#  Copyright (C) 2013-2017 The Catrobat Team
 #  (<http://developer.catrobat.org/credits>)
 #
 #  This program is free software: you can redistribute it and/or modify
@@ -52,14 +52,15 @@ for subdir, dirs, files in os.walk(helpers.SRC_PATH):
                 relative_subdir_path = relative_subdir_path[1:]
             if relative_subdir_path.endswith(os.sep):
                 relative_subdir_path = relative_subdir_path[:-1]
-            test_module_name = relative_subdir_path.replace(os.sep, ".") + "." + file[:-3]
+            test_module_name = relative_subdir_path.replace(os.sep, ".") + "." + file
             modules_under_test.add(test_module_name)
 
 if len(sys.argv) >= 2 and sys.argv[1] != "all":
     if (isinstance(sys.argv[1], str) or isinstance(sys.argv[1], unicode)) and sys.argv[1].startswith("test_"):
-        modules_under_test = filter(lambda m: sys.argv[1] in m, modules_under_test)
+        argument = sys.argv[1] if sys.argv[1].endswith('.py') else sys.argv[1] + ".py"
+        modules_under_test = filter(lambda m: m.endswith(argument), modules_under_test)
         if len(modules_under_test) == 0:
-            helpers.error("Module %s not found" % sys.argv[1])
+            helpers.error("Module %s not found" % argument)
     else:
         helpers.error("Invalid input given! Module name must always start with 'test_' (e.g. 'test_scratch')")
 else:
@@ -69,7 +70,7 @@ for module in modules_under_test:
     print("-"*80)
     print("Testing '%s':" % module)
     print("-"*80)
-    exec_args = [jython_exec_path, "-m", module]
+    exec_args = [jython_exec_path, "-m", module[:-3]]
 
     if len(sys.argv) >= 3:
         exec_args += [sys.argv[2]]