diff --git a/LICENCE.md b/LICENCE.md index ecae99c9d..71870bea6 100644 --- a/LICENCE.md +++ b/LICENCE.md @@ -3,9 +3,7 @@ ### All files in this folder path are covered by the following license terms -Copyright 2016 Jack Mostow - -Copyright 2016 Kevin Willows +Copyright(c) 2016-2017 Kevin Willows Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/app/src/main/assets/tutors/add_subtract/animator_graph.json b/app/src/main/assets/tutors/add_subtract/animator_graph.json index 63aee9cd4..9073cd1ac 100644 --- a/app/src/main/assets/tutors/add_subtract/animator_graph.json +++ b/app/src/main/assets/tutors/add_subtract/animator_graph.json @@ -81,7 +81,7 @@ {"name":"Show Scaffold:", "type": "QUEUEDCOMMAND", "id": "SAddSubtract", "method": "setDotBagsVisible", "parms":"TRUE:Boolean", "features": ""}, {"name":"Adding 3 + 2...", "type": "QUEUEDAUDIO", "command": "PLAY", "soundsource": "Adding 3 things plus 2 things means--.mp3", "soundpackage":"default", "volume": 1.0, "mode":"flow", "features": ""}, - {"name":"Let's Tap...", "type": "QUEUEDAUDIO", "command": "PLAY", "soundsource": "Lets tap on the three things to add them to the two things.mp3", "soundpackage":"default", "volume": 1.0, "mode":"flow", "features": ""} + {"name":"Let's Tap...", "type": "QUEUEDAUDIO", "command": "PLAY", "soundsource": "Please tap on the three things to add them to the two things.mp3", "soundpackage":"default", "volume": 1.0, "mode":"flow", "features": ""} ], "preexit": [], "edges": [ @@ -103,7 +103,7 @@ {"name":"Show Scaffold:", "type": "QUEUEDCOMMAND", "id": "SAddSubtract", "method": "setDotBagsVisible", "parms":"TRUE:Boolean", "features": ""}, {"name":"Adding 3 + 2...", "type": "QUEUEDAUDIO", "command": "PLAY", "soundsource": "Adding 3 things plus 0 things means--.mp3", "soundpackage":"default", "volume": 1.0, "mode":"flow", "features": ""}, - {"name":"Let's Tap...", "type": "QUEUEDAUDIO", "command": "PLAY", "soundsource": "Let's tap on the 3 things.mp3", "soundpackage":"default", "volume": 1.0, "mode":"flow", "features": ""} + {"name":"Let's Tap...", "type": "QUEUEDAUDIO", "command": "PLAY", "soundsource": "Please tap on the 3 things.mp3", "soundpackage":"default", "volume": 1.0, "mode":"flow", "features": ""} ], "preexit": [], "edges": [ @@ -124,7 +124,7 @@ {"name":"Show Scaffold:", "type": "QUEUEDCOMMAND", "id": "SAddSubtract", "method": "setDotBagsVisible", "parms":"TRUE:Boolean", "features": ""}, {"name":"Adding 3 + 2...", "type": "QUEUEDAUDIO", "command": "PLAY", "soundsource": "Adding 0 things plus 3 things means--.mp3", "soundpackage":"default", "volume": 1.0, "mode":"flow", "features": ""}, - {"name":"Let's Tap...", "type": "QUEUEDAUDIO", "command": "PLAY", "soundsource": "Let's tap on the 3 things.mp3", "soundpackage":"default", "volume": 1.0, "mode":"flow", "features": ""} + {"name":"Let's Tap...", "type": "QUEUEDAUDIO", "command": "PLAY", "soundsource": "Please tap on the 3 things.mp3", "soundpackage":"default", "volume": 1.0, "mode":"flow", "features": ""} ], "preexit": [], "edges": [ @@ -146,7 +146,7 @@ {"name":"Show Scaffold:", "type": "QUEUEDCOMMAND", "id": "SAddSubtract", "method": "setDotBagsVisible", "parms":"TRUE:Boolean", "features": ""}, {"name":"Adding 3 + 2...", "type": "QUEUEDAUDIO", "command": "PLAY", "soundsource": "Subtracting 3 things minus 2 things means--.mp3", "soundpackage":"default", "volume": 1.0, "mode":"flow", "features": ""}, - {"name":"Let's Tap...", "type": "QUEUEDAUDIO", "command": "PLAY", "soundsource": "Lets tap on the two things and see how many are left.mp3", "soundpackage":"default", "volume": 1.0, "mode":"flow", "features": ""} + {"name":"Let's Tap...", "type": "QUEUEDAUDIO", "command": "PLAY", "soundsource": "Please tap on the two things and see how many are left.mp3", "soundpackage":"default", "volume": 1.0, "mode":"flow", "features": ""} ], "preexit": [], "edges": [ @@ -580,6 +580,10 @@ "tracks": [ {"name": "LOG_EVENT", "type": "QUEUEDCOMMAND", "id": "SAddSubtract", "method": "logState", "parms": "type#node,value#DEMOCOMPLETE:String", "features":""}, + // Pace the problem highlight / wiggle based on the language + {"name":"Show Scaffold:", "type": "QUEUEDCOMMAND", "id": "SAddSubtract", "method": "animateTutorial", "parms": "600:Integer", "features": "LANG_EN"}, + {"name":"Show Scaffold:", "type": "QUEUEDCOMMAND", "id": "SAddSubtract", "method": "animateTutorial", "parms": "1200:Integer", "features": "LANG_SW"}, + {"type": "AUDIO", "command": "PLAY", "soundsource": "So 3 plus 2 is 5.mp3", "soundpackage":"default", "volume": 1.0, "mode":"flow", "features": "FTR_DEMO_ADD"}, {"type": "AUDIO", "command": "PLAY", "soundsource": "So 0 plus 3 is 3.mp3", "soundpackage":"default", "volume": 1.0, "mode":"flow", "features": "FTR_DEMO_ADD_ZERO"}, diff --git a/app/src/main/java/cmu/xprize/robotutor/RoboTutor.java b/app/src/main/java/cmu/xprize/robotutor/RoboTutor.java index cc57cb1ca..ece7c07f6 100644 --- a/app/src/main/java/cmu/xprize/robotutor/RoboTutor.java +++ b/app/src/main/java/cmu/xprize/robotutor/RoboTutor.java @@ -1,7 +1,6 @@ //********************************************************************************* // -// Copyright(c) 2016 Carnegie Mellon University. All Rights Reserved. -// Copyright(c) Kevin Willows All Rights Reserved +// Copyright(c) 2016-2017 Kevin Willows All Rights Reserved // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/app/src/main/java/cmu/xprize/robotutor/startup/CStartView.java b/app/src/main/java/cmu/xprize/robotutor/startup/CStartView.java index 48083aebf..adb22f342 100644 --- a/app/src/main/java/cmu/xprize/robotutor/startup/CStartView.java +++ b/app/src/main/java/cmu/xprize/robotutor/startup/CStartView.java @@ -1,7 +1,6 @@ //********************************************************************************* // -// Copyright(c) 2016 Carnegie Mellon University. All Rights Reserved. -// Copyright(c) Kevin Willows All Rights Reserved +// Copyright(c) 2016-2017 Kevin Willows All Rights Reserved // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/app/src/main/java/cmu/xprize/robotutor/tutorengine/CMediaManager.java b/app/src/main/java/cmu/xprize/robotutor/tutorengine/CMediaManager.java index 8f62fd944..ca491da32 100644 --- a/app/src/main/java/cmu/xprize/robotutor/tutorengine/CMediaManager.java +++ b/app/src/main/java/cmu/xprize/robotutor/tutorengine/CMediaManager.java @@ -1,7 +1,6 @@ //********************************************************************************* // -// Copyright(c) 2016 Carnegie Mellon University. All Rights Reserved. -// Copyright(c) Kevin Willows All Rights Reserved +// Copyright(c) 2016-2017 Kevin Willows All Rights Reserved // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/app/src/main/java/cmu/xprize/robotutor/tutorengine/CMediaPackage.java b/app/src/main/java/cmu/xprize/robotutor/tutorengine/CMediaPackage.java index e37e8507d..a84125110 100644 --- a/app/src/main/java/cmu/xprize/robotutor/tutorengine/CMediaPackage.java +++ b/app/src/main/java/cmu/xprize/robotutor/tutorengine/CMediaPackage.java @@ -1,7 +1,6 @@ //********************************************************************************* // -// Copyright(c) 2016 Carnegie Mellon University. All Rights Reserved. -// Copyright(c) Kevin Willows All Rights Reserved +// Copyright(c) 2016-2017 Kevin Willows All Rights Reserved // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/app/src/main/java/cmu/xprize/robotutor/tutorengine/CSceneDelegate.java b/app/src/main/java/cmu/xprize/robotutor/tutorengine/CSceneDelegate.java index f116036c1..908ec8bf0 100644 --- a/app/src/main/java/cmu/xprize/robotutor/tutorengine/CSceneDelegate.java +++ b/app/src/main/java/cmu/xprize/robotutor/tutorengine/CSceneDelegate.java @@ -1,7 +1,6 @@ //********************************************************************************* // -// Copyright(c) 2016 Carnegie Mellon University. All Rights Reserved. -// Copyright(c) Kevin Willows All Rights Reserved +// Copyright(c) 2016-2017 Kevin Willows All Rights Reserved // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/app/src/main/java/cmu/xprize/robotutor/tutorengine/CSceneGraph.java b/app/src/main/java/cmu/xprize/robotutor/tutorengine/CSceneGraph.java index 56658406d..c605c9fa2 100644 --- a/app/src/main/java/cmu/xprize/robotutor/tutorengine/CSceneGraph.java +++ b/app/src/main/java/cmu/xprize/robotutor/tutorengine/CSceneGraph.java @@ -1,7 +1,6 @@ //********************************************************************************* // -// Copyright(c) 2016 Carnegie Mellon University. All Rights Reserved. -// Copyright(c) Kevin Willows All Rights Reserved +// Copyright(c) 2016-2017 Kevin Willows All Rights Reserved // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/app/src/main/java/cmu/xprize/robotutor/tutorengine/CTutor.java b/app/src/main/java/cmu/xprize/robotutor/tutorengine/CTutor.java index d57080e36..7d82543b7 100644 --- a/app/src/main/java/cmu/xprize/robotutor/tutorengine/CTutor.java +++ b/app/src/main/java/cmu/xprize/robotutor/tutorengine/CTutor.java @@ -1,7 +1,6 @@ //********************************************************************************* // -// Copyright(c) 2016 Carnegie Mellon University. All Rights Reserved. -// Copyright(c) Kevin Willows All Rights Reserved +// Copyright(c) 2016-2017 Kevin Willows All Rights Reserved // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -621,7 +620,10 @@ private void onCreate(scene_descriptor scenedata) { for (type_action cmd : createCmds) { - cmd.applyNode(); + if(cmd.testFeatures()) { + cmd.applyNode(); + } + } } } diff --git a/app/src/main/java/cmu/xprize/robotutor/tutorengine/CTutorAssetManager.java b/app/src/main/java/cmu/xprize/robotutor/tutorengine/CTutorAssetManager.java index dedac0de4..6f3c88031 100644 --- a/app/src/main/java/cmu/xprize/robotutor/tutorengine/CTutorAssetManager.java +++ b/app/src/main/java/cmu/xprize/robotutor/tutorengine/CTutorAssetManager.java @@ -1,7 +1,6 @@ //********************************************************************************* // -// Copyright(c) 2016 Carnegie Mellon University. All Rights Reserved. -// Copyright(c) Kevin Willows All Rights Reserved +// Copyright(c) 2016-2017 Kevin Willows All Rights Reserved // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/app/src/main/java/cmu/xprize/robotutor/tutorengine/CTutorEngine.java b/app/src/main/java/cmu/xprize/robotutor/tutorengine/CTutorEngine.java index 5f64f5043..a26d900bd 100644 --- a/app/src/main/java/cmu/xprize/robotutor/tutorengine/CTutorEngine.java +++ b/app/src/main/java/cmu/xprize/robotutor/tutorengine/CTutorEngine.java @@ -1,7 +1,6 @@ //********************************************************************************* // -// Copyright(c) 2016 Carnegie Mellon University. All Rights Reserved. -// Copyright(c) Kevin Willows All Rights Reserved +// Copyright(c) 2016-2017 Kevin Willows All Rights Reserved // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/app/src/main/java/cmu/xprize/robotutor/tutorengine/CTutorGraph.java b/app/src/main/java/cmu/xprize/robotutor/tutorengine/CTutorGraph.java index 461ba1819..d536e7cae 100644 --- a/app/src/main/java/cmu/xprize/robotutor/tutorengine/CTutorGraph.java +++ b/app/src/main/java/cmu/xprize/robotutor/tutorengine/CTutorGraph.java @@ -1,7 +1,6 @@ //********************************************************************************* // -// Copyright(c) 2016 Carnegie Mellon University. All Rights Reserved. -// Copyright(c) Kevin Willows All Rights Reserved +// Copyright(c) 2016-2017 Kevin Willows All Rights Reserved // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/app/src/main/java/cmu/xprize/robotutor/tutorengine/IMediaListener.java b/app/src/main/java/cmu/xprize/robotutor/tutorengine/IMediaListener.java index c0125f324..050cd57f9 100644 --- a/app/src/main/java/cmu/xprize/robotutor/tutorengine/IMediaListener.java +++ b/app/src/main/java/cmu/xprize/robotutor/tutorengine/IMediaListener.java @@ -1,7 +1,6 @@ //********************************************************************************* // -// Copyright(c) 2016 Carnegie Mellon University. All Rights Reserved. -// Copyright(c) Kevin Willows All Rights Reserved +// Copyright(c) 2016-2017 Kevin Willows All Rights Reserved // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/app/src/main/java/cmu/xprize/robotutor/tutorengine/ITutorGraph.java b/app/src/main/java/cmu/xprize/robotutor/tutorengine/ITutorGraph.java index 8feb82e97..2c396d0ce 100644 --- a/app/src/main/java/cmu/xprize/robotutor/tutorengine/ITutorGraph.java +++ b/app/src/main/java/cmu/xprize/robotutor/tutorengine/ITutorGraph.java @@ -1,7 +1,6 @@ //********************************************************************************* // -// Copyright(c) 2016 Carnegie Mellon University. All Rights Reserved. -// Copyright(c) Kevin Willows All Rights Reserved +// Copyright(c) 2016-2017 Kevin Willows All Rights Reserved // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/app/src/main/java/cmu/xprize/robotutor/tutorengine/ITutorManager.java b/app/src/main/java/cmu/xprize/robotutor/tutorengine/ITutorManager.java index c16697eb6..b7b9aec2f 100644 --- a/app/src/main/java/cmu/xprize/robotutor/tutorengine/ITutorManager.java +++ b/app/src/main/java/cmu/xprize/robotutor/tutorengine/ITutorManager.java @@ -1,7 +1,6 @@ //********************************************************************************* // -// Copyright(c) 2016 Carnegie Mellon University. All Rights Reserved. -// Copyright(c) Kevin Willows All Rights Reserved +// Copyright(c) 2016-2017 Kevin Willows All Rights Reserved // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/app/src/main/java/cmu/xprize/robotutor/tutorengine/ITutorNavListener.java b/app/src/main/java/cmu/xprize/robotutor/tutorengine/ITutorNavListener.java index 5e975467b..b9db98682 100644 --- a/app/src/main/java/cmu/xprize/robotutor/tutorengine/ITutorNavListener.java +++ b/app/src/main/java/cmu/xprize/robotutor/tutorengine/ITutorNavListener.java @@ -1,7 +1,6 @@ //********************************************************************************* // -// Copyright(c) 2016 Carnegie Mellon University. All Rights Reserved. -// Copyright(c) Kevin Willows All Rights Reserved +// Copyright(c) 2016-2017 Kevin Willows All Rights Reserved // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/app/src/main/java/cmu/xprize/robotutor/tutorengine/ITutorObject.java b/app/src/main/java/cmu/xprize/robotutor/tutorengine/ITutorObject.java index 90db4a188..d695b8a31 100644 --- a/app/src/main/java/cmu/xprize/robotutor/tutorengine/ITutorObject.java +++ b/app/src/main/java/cmu/xprize/robotutor/tutorengine/ITutorObject.java @@ -1,7 +1,6 @@ //********************************************************************************* // -// Copyright(c) 2016 Carnegie Mellon University. All Rights Reserved. -// Copyright(c) Kevin Willows All Rights Reserved +// Copyright(c) 2016-2017 Kevin Willows All Rights Reserved // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/app/src/main/java/cmu/xprize/robotutor/tutorengine/ITutorScene.java b/app/src/main/java/cmu/xprize/robotutor/tutorengine/ITutorScene.java index 16b35693a..738cc6815 100644 --- a/app/src/main/java/cmu/xprize/robotutor/tutorengine/ITutorScene.java +++ b/app/src/main/java/cmu/xprize/robotutor/tutorengine/ITutorScene.java @@ -1,7 +1,6 @@ //********************************************************************************* // -// Copyright(c) 2016 Carnegie Mellon University. All Rights Reserved. -// Copyright(c) Kevin Willows All Rights Reserved +// Copyright(c) 2016-2017 Kevin Willows All Rights Reserved // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/app/src/main/java/cmu/xprize/robotutor/tutorengine/graph/databinding.java b/app/src/main/java/cmu/xprize/robotutor/tutorengine/graph/databinding.java index bdaab9bc3..0b2208952 100644 --- a/app/src/main/java/cmu/xprize/robotutor/tutorengine/graph/databinding.java +++ b/app/src/main/java/cmu/xprize/robotutor/tutorengine/graph/databinding.java @@ -1,7 +1,6 @@ //********************************************************************************* // -// Copyright(c) 2016 Carnegie Mellon University. All Rights Reserved. -// Copyright(c) Kevin Willows All Rights Reserved +// Copyright(c) 2016-2017 Kevin Willows All Rights Reserved // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/app/src/main/java/cmu/xprize/robotutor/tutorengine/graph/defdata_scenes.java b/app/src/main/java/cmu/xprize/robotutor/tutorengine/graph/defdata_scenes.java index 1c3ab614a..908ab843b 100644 --- a/app/src/main/java/cmu/xprize/robotutor/tutorengine/graph/defdata_scenes.java +++ b/app/src/main/java/cmu/xprize/robotutor/tutorengine/graph/defdata_scenes.java @@ -1,7 +1,6 @@ //********************************************************************************* // -// Copyright(c) 2016 Carnegie Mellon University. All Rights Reserved. -// Copyright(c) Kevin Willows All Rights Reserved +// Copyright(c) 2016-2017 Kevin Willows All Rights Reserved // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/app/src/main/java/cmu/xprize/robotutor/tutorengine/graph/defdata_tutor.java b/app/src/main/java/cmu/xprize/robotutor/tutorengine/graph/defdata_tutor.java index 088445621..5447d3b1a 100644 --- a/app/src/main/java/cmu/xprize/robotutor/tutorengine/graph/defdata_tutor.java +++ b/app/src/main/java/cmu/xprize/robotutor/tutorengine/graph/defdata_tutor.java @@ -1,7 +1,6 @@ //********************************************************************************* // -// Copyright(c) 2016 Carnegie Mellon University. All Rights Reserved. -// Copyright(c) Kevin Willows All Rights Reserved +// Copyright(c) 2016-2017 Kevin Willows All Rights Reserved // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/app/src/main/java/cmu/xprize/robotutor/tutorengine/graph/defvar_tutor.java b/app/src/main/java/cmu/xprize/robotutor/tutorengine/graph/defvar_tutor.java index e0d9c4ff4..5172b8957 100644 --- a/app/src/main/java/cmu/xprize/robotutor/tutorengine/graph/defvar_tutor.java +++ b/app/src/main/java/cmu/xprize/robotutor/tutorengine/graph/defvar_tutor.java @@ -1,7 +1,6 @@ //********************************************************************************* // -// Copyright(c) 2016 Carnegie Mellon University. All Rights Reserved. -// Copyright(c) Kevin Willows All Rights Reserved +// Copyright(c) 2016-2017 Kevin Willows All Rights Reserved // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/app/src/main/java/cmu/xprize/robotutor/tutorengine/graph/graph_edge.java b/app/src/main/java/cmu/xprize/robotutor/tutorengine/graph/graph_edge.java index d5f2e5aa6..10d6f6361 100644 --- a/app/src/main/java/cmu/xprize/robotutor/tutorengine/graph/graph_edge.java +++ b/app/src/main/java/cmu/xprize/robotutor/tutorengine/graph/graph_edge.java @@ -1,7 +1,6 @@ //********************************************************************************* // -// Copyright(c) 2016 Carnegie Mellon University. All Rights Reserved. -// Copyright(c) Kevin Willows All Rights Reserved +// Copyright(c) 2016-2017 Kevin Willows All Rights Reserved // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/app/src/main/java/cmu/xprize/robotutor/tutorengine/graph/scene_descriptor.java b/app/src/main/java/cmu/xprize/robotutor/tutorengine/graph/scene_descriptor.java index 1bd7f3b6b..c2727e20e 100644 --- a/app/src/main/java/cmu/xprize/robotutor/tutorengine/graph/scene_descriptor.java +++ b/app/src/main/java/cmu/xprize/robotutor/tutorengine/graph/scene_descriptor.java @@ -1,7 +1,6 @@ //********************************************************************************* // -// Copyright(c) 2016 Carnegie Mellon University. All Rights Reserved. -// Copyright(c) Kevin Willows All Rights Reserved +// Copyright(c) 2016-2017 Kevin Willows All Rights Reserved // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/app/src/main/java/cmu/xprize/robotutor/tutorengine/graph/scene_graph.java b/app/src/main/java/cmu/xprize/robotutor/tutorengine/graph/scene_graph.java index 1def40c9d..7be90bba0 100644 --- a/app/src/main/java/cmu/xprize/robotutor/tutorengine/graph/scene_graph.java +++ b/app/src/main/java/cmu/xprize/robotutor/tutorengine/graph/scene_graph.java @@ -1,7 +1,6 @@ //********************************************************************************* // -// Copyright(c) 2016 Carnegie Mellon University. All Rights Reserved. -// Copyright(c) Kevin Willows All Rights Reserved +// Copyright(c) 2016-2017 Kevin Willows All Rights Reserved // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/app/src/main/java/cmu/xprize/robotutor/tutorengine/graph/scene_initializer.java b/app/src/main/java/cmu/xprize/robotutor/tutorengine/graph/scene_initializer.java index 9fe1a893c..d852670bf 100644 --- a/app/src/main/java/cmu/xprize/robotutor/tutorengine/graph/scene_initializer.java +++ b/app/src/main/java/cmu/xprize/robotutor/tutorengine/graph/scene_initializer.java @@ -1,7 +1,6 @@ //********************************************************************************* // -// Copyright(c) 2016 Carnegie Mellon University. All Rights Reserved. -// Copyright(c) Kevin Willows All Rights Reserved +// Copyright(c) 2016-2017 Kevin Willows All Rights Reserved // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/app/src/main/java/cmu/xprize/robotutor/tutorengine/graph/scene_layout.java b/app/src/main/java/cmu/xprize/robotutor/tutorengine/graph/scene_layout.java index 6ac12c8bc..9de24b01a 100644 --- a/app/src/main/java/cmu/xprize/robotutor/tutorengine/graph/scene_layout.java +++ b/app/src/main/java/cmu/xprize/robotutor/tutorengine/graph/scene_layout.java @@ -1,7 +1,6 @@ //********************************************************************************* // -// Copyright(c) 2016 Carnegie Mellon University. All Rights Reserved. -// Copyright(c) Kevin Willows All Rights Reserved +// Copyright(c) 2016-2017 Kevin Willows All Rights Reserved // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/app/src/main/java/cmu/xprize/robotutor/tutorengine/graph/scene_module.java b/app/src/main/java/cmu/xprize/robotutor/tutorengine/graph/scene_module.java index 02d614bc5..b817faa7c 100644 --- a/app/src/main/java/cmu/xprize/robotutor/tutorengine/graph/scene_module.java +++ b/app/src/main/java/cmu/xprize/robotutor/tutorengine/graph/scene_module.java @@ -1,7 +1,6 @@ //********************************************************************************* // -// Copyright(c) 2016 Carnegie Mellon University. All Rights Reserved. -// Copyright(c) Kevin Willows All Rights Reserved +// Copyright(c) 2016-2017 Kevin Willows All Rights Reserved // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/app/src/main/java/cmu/xprize/robotutor/tutorengine/graph/scene_node.java b/app/src/main/java/cmu/xprize/robotutor/tutorengine/graph/scene_node.java index 9a12d057a..779ca4d3a 100644 --- a/app/src/main/java/cmu/xprize/robotutor/tutorengine/graph/scene_node.java +++ b/app/src/main/java/cmu/xprize/robotutor/tutorengine/graph/scene_node.java @@ -1,7 +1,6 @@ //********************************************************************************* // -// Copyright(c) 2016 Carnegie Mellon University. All Rights Reserved. -// Copyright(c) Kevin Willows All Rights Reserved +// Copyright(c) 2016-2017 Kevin Willows All Rights Reserved // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/app/src/main/java/cmu/xprize/robotutor/tutorengine/graph/tutor_view.java b/app/src/main/java/cmu/xprize/robotutor/tutorengine/graph/tutor_view.java index 6386c634f..4fd1afc54 100644 --- a/app/src/main/java/cmu/xprize/robotutor/tutorengine/graph/tutor_view.java +++ b/app/src/main/java/cmu/xprize/robotutor/tutorengine/graph/tutor_view.java @@ -1,7 +1,6 @@ //********************************************************************************* // -// Copyright(c) 2016 Carnegie Mellon University. All Rights Reserved. -// Copyright(c) Kevin Willows All Rights Reserved +// Copyright(c) 2016-2017 Kevin Willows All Rights Reserved // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/app/src/main/java/cmu/xprize/robotutor/tutorengine/graph/type_action.java b/app/src/main/java/cmu/xprize/robotutor/tutorengine/graph/type_action.java index 76174ac05..6d26618c8 100644 --- a/app/src/main/java/cmu/xprize/robotutor/tutorengine/graph/type_action.java +++ b/app/src/main/java/cmu/xprize/robotutor/tutorengine/graph/type_action.java @@ -1,7 +1,6 @@ //********************************************************************************* // -// Copyright(c) 2016 Carnegie Mellon University. All Rights Reserved. -// Copyright(c) Kevin Willows All Rights Reserved +// Copyright(c) 2016-2017 Kevin Willows All Rights Reserved // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/app/src/main/java/cmu/xprize/robotutor/tutorengine/graph/type_audio.java b/app/src/main/java/cmu/xprize/robotutor/tutorengine/graph/type_audio.java index da5a62c74..dd9044c70 100644 --- a/app/src/main/java/cmu/xprize/robotutor/tutorengine/graph/type_audio.java +++ b/app/src/main/java/cmu/xprize/robotutor/tutorengine/graph/type_audio.java @@ -1,7 +1,6 @@ //********************************************************************************* // -// Copyright(c) 2016 Carnegie Mellon University. All Rights Reserved. -// Copyright(c) Kevin Willows All Rights Reserved +// Copyright(c) 2016-2017 Kevin Willows All Rights Reserved // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/app/src/main/java/cmu/xprize/robotutor/tutorengine/graph/type_choice.java b/app/src/main/java/cmu/xprize/robotutor/tutorengine/graph/type_choice.java index f03bc496e..9eb7cb2e7 100644 --- a/app/src/main/java/cmu/xprize/robotutor/tutorengine/graph/type_choice.java +++ b/app/src/main/java/cmu/xprize/robotutor/tutorengine/graph/type_choice.java @@ -1,7 +1,6 @@ //********************************************************************************* // -// Copyright(c) 2016 Carnegie Mellon University. All Rights Reserved. -// Copyright(c) Kevin Willows All Rights Reserved +// Copyright(c) 2016-2017 Kevin Willows All Rights Reserved // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/app/src/main/java/cmu/xprize/robotutor/tutorengine/graph/type_choiceset.java b/app/src/main/java/cmu/xprize/robotutor/tutorengine/graph/type_choiceset.java index 98c0a5d10..7dee741df 100644 --- a/app/src/main/java/cmu/xprize/robotutor/tutorengine/graph/type_choiceset.java +++ b/app/src/main/java/cmu/xprize/robotutor/tutorengine/graph/type_choiceset.java @@ -1,7 +1,6 @@ //********************************************************************************* // -// Copyright(c) 2016 Carnegie Mellon University. All Rights Reserved. -// Copyright(c) Kevin Willows All Rights Reserved +// Copyright(c) 2016-2017 Kevin Willows All Rights Reserved // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/app/src/main/java/cmu/xprize/robotutor/tutorengine/graph/type_cond.java b/app/src/main/java/cmu/xprize/robotutor/tutorengine/graph/type_cond.java index f5c296986..def8b601e 100644 --- a/app/src/main/java/cmu/xprize/robotutor/tutorengine/graph/type_cond.java +++ b/app/src/main/java/cmu/xprize/robotutor/tutorengine/graph/type_cond.java @@ -1,7 +1,6 @@ //********************************************************************************* // -// Copyright(c) 2016 Carnegie Mellon University. All Rights Reserved. -// Copyright(c) Kevin Willows All Rights Reserved +// Copyright(c) 2016-2017 Kevin Willows All Rights Reserved // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/app/src/main/java/cmu/xprize/robotutor/tutorengine/graph/type_handler.java b/app/src/main/java/cmu/xprize/robotutor/tutorengine/graph/type_handler.java index 67fa0c259..1b41864e9 100644 --- a/app/src/main/java/cmu/xprize/robotutor/tutorengine/graph/type_handler.java +++ b/app/src/main/java/cmu/xprize/robotutor/tutorengine/graph/type_handler.java @@ -1,7 +1,6 @@ //********************************************************************************* // -// Copyright(c) 2016 Carnegie Mellon University. All Rights Reserved. -// Copyright(c) Kevin Willows All Rights Reserved +// Copyright(c) 2016-2017 Kevin Willows All Rights Reserved // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/app/src/main/java/cmu/xprize/robotutor/tutorengine/graph/type_timelineFL.java b/app/src/main/java/cmu/xprize/robotutor/tutorengine/graph/type_timelineFL.java index cc884e147..8eff603c5 100644 --- a/app/src/main/java/cmu/xprize/robotutor/tutorengine/graph/type_timelineFL.java +++ b/app/src/main/java/cmu/xprize/robotutor/tutorengine/graph/type_timelineFL.java @@ -1,7 +1,6 @@ //********************************************************************************* // -// Copyright(c) 2016 Carnegie Mellon University. All Rights Reserved. -// Copyright(c) Kevin Willows All Rights Reserved +// Copyright(c) 2016-2017 Kevin Willows All Rights Reserved // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/app/src/main/java/cmu/xprize/robotutor/tutorengine/graph/type_tts.java b/app/src/main/java/cmu/xprize/robotutor/tutorengine/graph/type_tts.java index df1bc34ae..38957d361 100644 --- a/app/src/main/java/cmu/xprize/robotutor/tutorengine/graph/type_tts.java +++ b/app/src/main/java/cmu/xprize/robotutor/tutorengine/graph/type_tts.java @@ -1,7 +1,6 @@ //********************************************************************************* // -// Copyright(c) 2016 Carnegie Mellon University. All Rights Reserved. -// Copyright(c) Kevin Willows All Rights Reserved +// Copyright(c) 2016-2017 Kevin Willows All Rights Reserved // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/app/src/main/java/cmu/xprize/robotutor/tutorengine/graph/vars/IArraySource.java b/app/src/main/java/cmu/xprize/robotutor/tutorengine/graph/vars/IArraySource.java index cf78e6049..c4398c05b 100644 --- a/app/src/main/java/cmu/xprize/robotutor/tutorengine/graph/vars/IArraySource.java +++ b/app/src/main/java/cmu/xprize/robotutor/tutorengine/graph/vars/IArraySource.java @@ -1,7 +1,6 @@ //********************************************************************************* // -// Copyright(c) 2016 Carnegie Mellon University. All Rights Reserved. -// Copyright(c) Kevin Willows All Rights Reserved +// Copyright(c) 2016-2017 Kevin Willows All Rights Reserved // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/app/src/main/java/cmu/xprize/robotutor/tutorengine/graph/vars/IScriptable2.java b/app/src/main/java/cmu/xprize/robotutor/tutorengine/graph/vars/IScriptable2.java index d629227db..0bd5eee10 100644 --- a/app/src/main/java/cmu/xprize/robotutor/tutorengine/graph/vars/IScriptable2.java +++ b/app/src/main/java/cmu/xprize/robotutor/tutorengine/graph/vars/IScriptable2.java @@ -1,7 +1,6 @@ //********************************************************************************* // -// Copyright(c) 2016 Carnegie Mellon University. All Rights Reserved. -// Copyright(c) Kevin Willows All Rights Reserved +// Copyright(c) 2016-2017 Kevin Willows All Rights Reserved // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/app/src/main/java/cmu/xprize/robotutor/tutorengine/graph/vars/TBoolean.java b/app/src/main/java/cmu/xprize/robotutor/tutorengine/graph/vars/TBoolean.java index c3cef0f93..f96808725 100644 --- a/app/src/main/java/cmu/xprize/robotutor/tutorengine/graph/vars/TBoolean.java +++ b/app/src/main/java/cmu/xprize/robotutor/tutorengine/graph/vars/TBoolean.java @@ -1,7 +1,6 @@ //********************************************************************************* // -// Copyright(c) 2016 Carnegie Mellon University. All Rights Reserved. -// Copyright(c) Kevin Willows All Rights Reserved +// Copyright(c) 2016-2017 Kevin Willows All Rights Reserved // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/app/src/main/java/cmu/xprize/robotutor/tutorengine/graph/vars/TChar.java b/app/src/main/java/cmu/xprize/robotutor/tutorengine/graph/vars/TChar.java index d0edc7871..d5f6060d6 100644 --- a/app/src/main/java/cmu/xprize/robotutor/tutorengine/graph/vars/TChar.java +++ b/app/src/main/java/cmu/xprize/robotutor/tutorengine/graph/vars/TChar.java @@ -1,7 +1,6 @@ //********************************************************************************* // -// Copyright(c) 2016 Carnegie Mellon University. All Rights Reserved. -// Copyright(c) Kevin Willows All Rights Reserved +// Copyright(c) 2016-2017 Kevin Willows All Rights Reserved // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/app/src/main/java/cmu/xprize/robotutor/tutorengine/graph/vars/TFloat.java b/app/src/main/java/cmu/xprize/robotutor/tutorengine/graph/vars/TFloat.java index 5229862b4..da30c2ca6 100644 --- a/app/src/main/java/cmu/xprize/robotutor/tutorengine/graph/vars/TFloat.java +++ b/app/src/main/java/cmu/xprize/robotutor/tutorengine/graph/vars/TFloat.java @@ -1,7 +1,6 @@ //********************************************************************************* // -// Copyright(c) 2016 Carnegie Mellon University. All Rights Reserved. -// Copyright(c) Kevin Willows All Rights Reserved +// Copyright(c) 2016-2017 Kevin Willows All Rights Reserved // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/app/src/main/java/cmu/xprize/robotutor/tutorengine/graph/vars/TInteger.java b/app/src/main/java/cmu/xprize/robotutor/tutorengine/graph/vars/TInteger.java index ad7e1f1bd..693573b28 100644 --- a/app/src/main/java/cmu/xprize/robotutor/tutorengine/graph/vars/TInteger.java +++ b/app/src/main/java/cmu/xprize/robotutor/tutorengine/graph/vars/TInteger.java @@ -1,7 +1,6 @@ //********************************************************************************* // -// Copyright(c) 2016 Carnegie Mellon University. All Rights Reserved. -// Copyright(c) Kevin Willows All Rights Reserved +// Copyright(c) 2016-2017 Kevin Willows All Rights Reserved // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/app/src/main/java/cmu/xprize/robotutor/tutorengine/graph/vars/TReference.java b/app/src/main/java/cmu/xprize/robotutor/tutorengine/graph/vars/TReference.java index 0c2b38349..7aea185dd 100644 --- a/app/src/main/java/cmu/xprize/robotutor/tutorengine/graph/vars/TReference.java +++ b/app/src/main/java/cmu/xprize/robotutor/tutorengine/graph/vars/TReference.java @@ -1,7 +1,6 @@ //********************************************************************************* // -// Copyright(c) 2016 Carnegie Mellon University. All Rights Reserved. -// Copyright(c) Kevin Willows All Rights Reserved +// Copyright(c) 2016-2017 Kevin Willows All Rights Reserved // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/app/src/main/java/cmu/xprize/robotutor/tutorengine/graph/vars/TScope.java b/app/src/main/java/cmu/xprize/robotutor/tutorengine/graph/vars/TScope.java index b4e84bdc3..491e82eee 100644 --- a/app/src/main/java/cmu/xprize/robotutor/tutorengine/graph/vars/TScope.java +++ b/app/src/main/java/cmu/xprize/robotutor/tutorengine/graph/vars/TScope.java @@ -1,7 +1,6 @@ //********************************************************************************* // -// Copyright(c) 2016 Carnegie Mellon University. All Rights Reserved. -// Copyright(c) Kevin Willows All Rights Reserved +// Copyright(c) 2016-2017 Kevin Willows All Rights Reserved // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/app/src/main/java/cmu/xprize/robotutor/tutorengine/graph/vars/TString.java b/app/src/main/java/cmu/xprize/robotutor/tutorengine/graph/vars/TString.java index 3f3a17be4..62c75c731 100644 --- a/app/src/main/java/cmu/xprize/robotutor/tutorengine/graph/vars/TString.java +++ b/app/src/main/java/cmu/xprize/robotutor/tutorengine/graph/vars/TString.java @@ -1,7 +1,6 @@ //********************************************************************************* // -// Copyright(c) 2016 Carnegie Mellon University. All Rights Reserved. -// Copyright(c) Kevin Willows All Rights Reserved +// Copyright(c) 2016-2017 Kevin Willows All Rights Reserved // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/app/src/main/java/cmu/xprize/robotutor/tutorengine/graph/vars/TVarBase.java b/app/src/main/java/cmu/xprize/robotutor/tutorengine/graph/vars/TVarBase.java index dd15c7155..b4d1b03a4 100644 --- a/app/src/main/java/cmu/xprize/robotutor/tutorengine/graph/vars/TVarBase.java +++ b/app/src/main/java/cmu/xprize/robotutor/tutorengine/graph/vars/TVarBase.java @@ -1,7 +1,6 @@ //********************************************************************************* // -// Copyright(c) 2016 Carnegie Mellon University. All Rights Reserved. -// Copyright(c) Kevin Willows All Rights Reserved +// Copyright(c) 2016-2017 Kevin Willows All Rights Reserved // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/app/src/main/java/cmu/xprize/robotutor/tutorengine/graph/vars/type_array.java b/app/src/main/java/cmu/xprize/robotutor/tutorengine/graph/vars/type_array.java index c7725ed2e..f9ce1a2fc 100644 --- a/app/src/main/java/cmu/xprize/robotutor/tutorengine/graph/vars/type_array.java +++ b/app/src/main/java/cmu/xprize/robotutor/tutorengine/graph/vars/type_array.java @@ -1,7 +1,6 @@ //********************************************************************************* // -// Copyright(c) 2016 Carnegie Mellon University. All Rights Reserved. -// Copyright(c) Kevin Willows All Rights Reserved +// Copyright(c) 2016-2017 Kevin Willows All Rights Reserved // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/app/src/main/java/cmu/xprize/robotutor/tutorengine/util/CAssetObject.java b/app/src/main/java/cmu/xprize/robotutor/tutorengine/util/CAssetObject.java index ab1bff4d9..54a169818 100644 --- a/app/src/main/java/cmu/xprize/robotutor/tutorengine/util/CAssetObject.java +++ b/app/src/main/java/cmu/xprize/robotutor/tutorengine/util/CAssetObject.java @@ -1,7 +1,6 @@ //********************************************************************************* // -// Copyright(c) 2016 Carnegie Mellon University. All Rights Reserved. -// Copyright(c) Kevin Willows All Rights Reserved +// Copyright(c) 2016-2017 Kevin Willows All Rights Reserved // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/app/src/main/java/cmu/xprize/robotutor/tutorengine/util/CClassMap2.java b/app/src/main/java/cmu/xprize/robotutor/tutorengine/util/CClassMap2.java index 0f380c26b..d99cbf1df 100644 --- a/app/src/main/java/cmu/xprize/robotutor/tutorengine/util/CClassMap2.java +++ b/app/src/main/java/cmu/xprize/robotutor/tutorengine/util/CClassMap2.java @@ -1,7 +1,6 @@ //********************************************************************************* // -// Copyright(c) 2016 Carnegie Mellon University. All Rights Reserved. -// Copyright(c) Kevin Willows All Rights Reserved +// Copyright(c) 2016-2017 Kevin Willows All Rights Reserved // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/app/src/main/java/cmu/xprize/robotutor/tutorengine/widgets/core/IDataSink.java b/app/src/main/java/cmu/xprize/robotutor/tutorengine/widgets/core/IDataSink.java index f319d8bba..0d726593b 100644 --- a/app/src/main/java/cmu/xprize/robotutor/tutorengine/widgets/core/IDataSink.java +++ b/app/src/main/java/cmu/xprize/robotutor/tutorengine/widgets/core/IDataSink.java @@ -1,7 +1,6 @@ //********************************************************************************* // -// Copyright(c) 2016 Carnegie Mellon University. All Rights Reserved. -// Copyright(c) Kevin Willows All Rights Reserved +// Copyright(c) 2016-2017 Kevin Willows All Rights Reserved // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/app/src/main/java/cmu/xprize/robotutor/tutorengine/widgets/core/TAskComponent.java b/app/src/main/java/cmu/xprize/robotutor/tutorengine/widgets/core/TAskComponent.java index 0e783c267..1602760df 100644 --- a/app/src/main/java/cmu/xprize/robotutor/tutorengine/widgets/core/TAskComponent.java +++ b/app/src/main/java/cmu/xprize/robotutor/tutorengine/widgets/core/TAskComponent.java @@ -1,7 +1,6 @@ //********************************************************************************* // -// Copyright(c) 2016 Carnegie Mellon University. All Rights Reserved. -// Copyright(c) Kevin Willows All Rights Reserved +// Copyright(c) 2016-2017 Kevin Willows All Rights Reserved // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/app/src/main/java/cmu/xprize/robotutor/tutorengine/widgets/core/TBanner.java b/app/src/main/java/cmu/xprize/robotutor/tutorengine/widgets/core/TBanner.java index 4bbccde33..67e67662b 100644 --- a/app/src/main/java/cmu/xprize/robotutor/tutorengine/widgets/core/TBanner.java +++ b/app/src/main/java/cmu/xprize/robotutor/tutorengine/widgets/core/TBanner.java @@ -1,7 +1,6 @@ //********************************************************************************* // -// Copyright(c) 2016 Carnegie Mellon University. All Rights Reserved. -// Copyright(c) Kevin Willows All Rights Reserved +// Copyright(c) 2016-2017 Kevin Willows All Rights Reserved // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/app/src/main/java/cmu/xprize/robotutor/tutorengine/widgets/core/TBpComponent.java b/app/src/main/java/cmu/xprize/robotutor/tutorengine/widgets/core/TBpComponent.java index 1f159736d..abd9c1710 100644 --- a/app/src/main/java/cmu/xprize/robotutor/tutorengine/widgets/core/TBpComponent.java +++ b/app/src/main/java/cmu/xprize/robotutor/tutorengine/widgets/core/TBpComponent.java @@ -1,7 +1,6 @@ //********************************************************************************* // -// Copyright(c) 2016 Carnegie Mellon University. All Rights Reserved. -// Copyright(c) Kevin Willows All Rights Reserved +// Copyright(c) 2016-2017 Kevin Willows All Rights Reserved // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/app/src/main/java/cmu/xprize/robotutor/tutorengine/widgets/core/TButton.java b/app/src/main/java/cmu/xprize/robotutor/tutorengine/widgets/core/TButton.java index 5d11dc816..74751cc93 100644 --- a/app/src/main/java/cmu/xprize/robotutor/tutorengine/widgets/core/TButton.java +++ b/app/src/main/java/cmu/xprize/robotutor/tutorengine/widgets/core/TButton.java @@ -1,7 +1,6 @@ //********************************************************************************* // -// Copyright(c) 2016 Carnegie Mellon University. All Rights Reserved. -// Copyright(c) Kevin Willows All Rights Reserved +// Copyright(c) 2016-2017 Kevin Willows All Rights Reserved // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/app/src/main/java/cmu/xprize/robotutor/tutorengine/widgets/core/TFingerWriter.java b/app/src/main/java/cmu/xprize/robotutor/tutorengine/widgets/core/TFingerWriter.java index f3318a235..7c96ea11c 100644 --- a/app/src/main/java/cmu/xprize/robotutor/tutorengine/widgets/core/TFingerWriter.java +++ b/app/src/main/java/cmu/xprize/robotutor/tutorengine/widgets/core/TFingerWriter.java @@ -1,7 +1,6 @@ //********************************************************************************* // -// Copyright(c) 2016 Carnegie Mellon University. All Rights Reserved. -// Copyright(c) Kevin Willows All Rights Reserved +// Copyright(c) 2016-2017 Kevin Willows All Rights Reserved // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/app/src/main/java/cmu/xprize/robotutor/tutorengine/widgets/core/THandAnimation.java b/app/src/main/java/cmu/xprize/robotutor/tutorengine/widgets/core/THandAnimation.java index d57a47017..58c428bcc 100644 --- a/app/src/main/java/cmu/xprize/robotutor/tutorengine/widgets/core/THandAnimation.java +++ b/app/src/main/java/cmu/xprize/robotutor/tutorengine/widgets/core/THandAnimation.java @@ -1,7 +1,6 @@ //********************************************************************************* // -// Copyright(c) 2016 Carnegie Mellon University. All Rights Reserved. -// Copyright(c) Kevin Willows All Rights Reserved +// Copyright(c) 2016-2017 Kevin Willows All Rights Reserved // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/app/src/main/java/cmu/xprize/robotutor/tutorengine/widgets/core/TImageButton.java b/app/src/main/java/cmu/xprize/robotutor/tutorengine/widgets/core/TImageButton.java index f20bd1d7e..d5786437e 100644 --- a/app/src/main/java/cmu/xprize/robotutor/tutorengine/widgets/core/TImageButton.java +++ b/app/src/main/java/cmu/xprize/robotutor/tutorengine/widgets/core/TImageButton.java @@ -1,7 +1,6 @@ //********************************************************************************* // -// Copyright(c) 2016 Carnegie Mellon University. All Rights Reserved. -// Copyright(c) Kevin Willows All Rights Reserved +// Copyright(c) 2016-2017 Kevin Willows All Rights Reserved // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/app/src/main/java/cmu/xprize/robotutor/tutorengine/widgets/core/TLangToggle.java b/app/src/main/java/cmu/xprize/robotutor/tutorengine/widgets/core/TLangToggle.java index 733e610d3..ed0aa9aae 100644 --- a/app/src/main/java/cmu/xprize/robotutor/tutorengine/widgets/core/TLangToggle.java +++ b/app/src/main/java/cmu/xprize/robotutor/tutorengine/widgets/core/TLangToggle.java @@ -1,7 +1,6 @@ //********************************************************************************* // -// Copyright(c) 2016 Carnegie Mellon University. All Rights Reserved. -// Copyright(c) Kevin Willows All Rights Reserved +// Copyright(c) 2016-2017 Kevin Willows All Rights Reserved // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/app/src/main/java/cmu/xprize/robotutor/tutorengine/widgets/core/TLinkedScrollView.java b/app/src/main/java/cmu/xprize/robotutor/tutorengine/widgets/core/TLinkedScrollView.java index 9b2c89974..19d4a7ae6 100644 --- a/app/src/main/java/cmu/xprize/robotutor/tutorengine/widgets/core/TLinkedScrollView.java +++ b/app/src/main/java/cmu/xprize/robotutor/tutorengine/widgets/core/TLinkedScrollView.java @@ -1,7 +1,6 @@ //********************************************************************************* // -// Copyright(c) 2016 Carnegie Mellon University. All Rights Reserved. -// Copyright(c) Kevin Willows All Rights Reserved +// Copyright(c) 2016-2017 Kevin Willows All Rights Reserved // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/app/src/main/java/cmu/xprize/robotutor/tutorengine/widgets/core/TMasterAnimatorLayout.java b/app/src/main/java/cmu/xprize/robotutor/tutorengine/widgets/core/TMasterAnimatorLayout.java index 50fcb20fa..8b4e23cce 100644 --- a/app/src/main/java/cmu/xprize/robotutor/tutorengine/widgets/core/TMasterAnimatorLayout.java +++ b/app/src/main/java/cmu/xprize/robotutor/tutorengine/widgets/core/TMasterAnimatorLayout.java @@ -1,7 +1,6 @@ //********************************************************************************* // -// Copyright(c) 2016 Carnegie Mellon University. All Rights Reserved. -// Copyright(c) Kevin Willows All Rights Reserved +// Copyright(c) 2016-2017 Kevin Willows All Rights Reserved // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/app/src/main/java/cmu/xprize/robotutor/tutorengine/widgets/core/TNlComponent.java b/app/src/main/java/cmu/xprize/robotutor/tutorengine/widgets/core/TNlComponent.java index 7ef835906..20920335e 100644 --- a/app/src/main/java/cmu/xprize/robotutor/tutorengine/widgets/core/TNlComponent.java +++ b/app/src/main/java/cmu/xprize/robotutor/tutorengine/widgets/core/TNlComponent.java @@ -1,7 +1,6 @@ //********************************************************************************* // -// Copyright(c) 2016 Carnegie Mellon University. All Rights Reserved. -// Copyright(c) Kevin Willows All Rights Reserved +// Copyright(c) 2016-2017 Kevin Willows All Rights Reserved // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/app/src/main/java/cmu/xprize/robotutor/tutorengine/widgets/core/TRtComponent.java b/app/src/main/java/cmu/xprize/robotutor/tutorengine/widgets/core/TRtComponent.java index 156bbea47..26427a5ea 100644 --- a/app/src/main/java/cmu/xprize/robotutor/tutorengine/widgets/core/TRtComponent.java +++ b/app/src/main/java/cmu/xprize/robotutor/tutorengine/widgets/core/TRtComponent.java @@ -1,7 +1,6 @@ //********************************************************************************* // -// Copyright(c) 2016 Carnegie Mellon University. All Rights Reserved. -// Copyright(c) Kevin Willows All Rights Reserved +// Copyright(c) 2016-2017 Kevin Willows All Rights Reserved // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/app/src/main/java/cmu/xprize/robotutor/tutorengine/widgets/core/TSceneAnimatorLayout.java b/app/src/main/java/cmu/xprize/robotutor/tutorengine/widgets/core/TSceneAnimatorLayout.java index 4a53355c9..162172aaf 100644 --- a/app/src/main/java/cmu/xprize/robotutor/tutorengine/widgets/core/TSceneAnimatorLayout.java +++ b/app/src/main/java/cmu/xprize/robotutor/tutorengine/widgets/core/TSceneAnimatorLayout.java @@ -1,7 +1,6 @@ //********************************************************************************* // -// Copyright(c) 2016 Carnegie Mellon University. All Rights Reserved. -// Copyright(c) Kevin Willows All Rights Reserved +// Copyright(c) 2016-2017 Kevin Willows All Rights Reserved // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/app/src/main/java/cmu/xprize/robotutor/tutorengine/widgets/core/TSceneFlipperLayout.java b/app/src/main/java/cmu/xprize/robotutor/tutorengine/widgets/core/TSceneFlipperLayout.java index c7e00803a..96965e2b8 100644 --- a/app/src/main/java/cmu/xprize/robotutor/tutorengine/widgets/core/TSceneFlipperLayout.java +++ b/app/src/main/java/cmu/xprize/robotutor/tutorengine/widgets/core/TSceneFlipperLayout.java @@ -1,7 +1,6 @@ //********************************************************************************* // -// Copyright(c) 2016 Carnegie Mellon University. All Rights Reserved. -// Copyright(c) Kevin Willows All Rights Reserved +// Copyright(c) 2016-2017 Kevin Willows All Rights Reserved // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/app/src/main/java/cmu/xprize/robotutor/tutorengine/widgets/core/TSceneFrameLayout.java b/app/src/main/java/cmu/xprize/robotutor/tutorengine/widgets/core/TSceneFrameLayout.java index cbccb5f07..f1ddb6ccf 100644 --- a/app/src/main/java/cmu/xprize/robotutor/tutorengine/widgets/core/TSceneFrameLayout.java +++ b/app/src/main/java/cmu/xprize/robotutor/tutorengine/widgets/core/TSceneFrameLayout.java @@ -1,7 +1,6 @@ //********************************************************************************* // -// Copyright(c) 2016 Carnegie Mellon University. All Rights Reserved. -// Copyright(c) Kevin Willows All Rights Reserved +// Copyright(c) 2016-2017 Kevin Willows All Rights Reserved // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/app/src/main/java/cmu/xprize/robotutor/tutorengine/widgets/core/TScenePercentLayout.java b/app/src/main/java/cmu/xprize/robotutor/tutorengine/widgets/core/TScenePercentLayout.java index 0b2ce0dd4..660968cb2 100644 --- a/app/src/main/java/cmu/xprize/robotutor/tutorengine/widgets/core/TScenePercentLayout.java +++ b/app/src/main/java/cmu/xprize/robotutor/tutorengine/widgets/core/TScenePercentLayout.java @@ -1,7 +1,6 @@ //********************************************************************************* // -// Copyright(c) 2016 Carnegie Mellon University. All Rights Reserved. -// Copyright(c) Kevin Willows All Rights Reserved +// Copyright(c) 2016-2017 Kevin Willows All Rights Reserved // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/app/src/main/java/cmu/xprize/robotutor/tutorengine/widgets/core/TSceneRelativeLayout.java b/app/src/main/java/cmu/xprize/robotutor/tutorengine/widgets/core/TSceneRelativeLayout.java index 7d9526dcf..931ee05d4 100644 --- a/app/src/main/java/cmu/xprize/robotutor/tutorengine/widgets/core/TSceneRelativeLayout.java +++ b/app/src/main/java/cmu/xprize/robotutor/tutorengine/widgets/core/TSceneRelativeLayout.java @@ -1,7 +1,6 @@ //********************************************************************************* // -// Copyright(c) 2016 Carnegie Mellon University. All Rights Reserved. -// Copyright(c) Kevin Willows All Rights Reserved +// Copyright(c) 2016-2017 Kevin Willows All Rights Reserved // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/app/src/main/java/cmu/xprize/robotutor/tutorengine/widgets/core/TSmComponent.java b/app/src/main/java/cmu/xprize/robotutor/tutorengine/widgets/core/TSmComponent.java index 783dda167..2c68d5d46 100644 --- a/app/src/main/java/cmu/xprize/robotutor/tutorengine/widgets/core/TSmComponent.java +++ b/app/src/main/java/cmu/xprize/robotutor/tutorengine/widgets/core/TSmComponent.java @@ -1,7 +1,6 @@ //********************************************************************************* // -// Copyright(c) 2016 Carnegie Mellon University. All Rights Reserved. -// Copyright(c) Kevin Willows All Rights Reserved +// Copyright(c) 2016-2017 Kevin Willows All Rights Reserved // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/app/src/main/java/cmu/xprize/robotutor/tutorengine/widgets/core/TStimResp.java b/app/src/main/java/cmu/xprize/robotutor/tutorengine/widgets/core/TStimResp.java index ace5ce449..ccefe82f2 100644 --- a/app/src/main/java/cmu/xprize/robotutor/tutorengine/widgets/core/TStimResp.java +++ b/app/src/main/java/cmu/xprize/robotutor/tutorengine/widgets/core/TStimResp.java @@ -1,5 +1,5 @@ /** - Copyright 2015 Kevin Willows + Copyright(c) 2015-2017 Kevin Willows Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at diff --git a/app/src/main/java/cmu/xprize/robotutor/tutorengine/widgets/core/TStimRespBase.java b/app/src/main/java/cmu/xprize/robotutor/tutorengine/widgets/core/TStimRespBase.java index d10952a92..662cefdd6 100644 --- a/app/src/main/java/cmu/xprize/robotutor/tutorengine/widgets/core/TStimRespBase.java +++ b/app/src/main/java/cmu/xprize/robotutor/tutorengine/widgets/core/TStimRespBase.java @@ -1,5 +1,5 @@ /** - Copyright 2015 Kevin Willows + Copyright(c) 2015-2017 Kevin Willows Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at diff --git a/app/src/main/java/cmu/xprize/robotutor/tutorengine/widgets/core/TTextView.java b/app/src/main/java/cmu/xprize/robotutor/tutorengine/widgets/core/TTextView.java index 306289b3f..2ec55aa11 100644 --- a/app/src/main/java/cmu/xprize/robotutor/tutorengine/widgets/core/TTextView.java +++ b/app/src/main/java/cmu/xprize/robotutor/tutorengine/widgets/core/TTextView.java @@ -1,7 +1,6 @@ //********************************************************************************* // -// Copyright(c) 2016 Carnegie Mellon University. All Rights Reserved. -// Copyright(c) Kevin Willows All Rights Reserved +// Copyright(c) 2016-2017 Kevin Willows All Rights Reserved // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/app/src/main/java/cmu/xprize/robotutor/tutorengine/widgets/core/TView.java b/app/src/main/java/cmu/xprize/robotutor/tutorengine/widgets/core/TView.java index c95f7090b..f938d5c4f 100644 --- a/app/src/main/java/cmu/xprize/robotutor/tutorengine/widgets/core/TView.java +++ b/app/src/main/java/cmu/xprize/robotutor/tutorengine/widgets/core/TView.java @@ -1,7 +1,6 @@ //********************************************************************************* // -// Copyright(c) 2016 Carnegie Mellon University. All Rights Reserved. -// Copyright(c) Kevin Willows All Rights Reserved +// Copyright(c) 2016-2017 Kevin Willows All Rights Reserved // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/app/src/main/java/cmu/xprize/robotutor/tutorengine/widgets/core/TWritingComponent.java b/app/src/main/java/cmu/xprize/robotutor/tutorengine/widgets/core/TWritingComponent.java index 04bdffd55..aeb44bfe8 100644 --- a/app/src/main/java/cmu/xprize/robotutor/tutorengine/widgets/core/TWritingComponent.java +++ b/app/src/main/java/cmu/xprize/robotutor/tutorengine/widgets/core/TWritingComponent.java @@ -1,7 +1,6 @@ //********************************************************************************* // -// Copyright(c) 2016 Carnegie Mellon University. All Rights Reserved. -// Copyright(c) Kevin Willows All Rights Reserved +// Copyright(c) 2016-2017 Kevin Willows All Rights Reserved // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/build.gradle b/build.gradle index f97ef35df..dc0e81981 100644 --- a/build.gradle +++ b/build.gradle @@ -36,7 +36,7 @@ allprojects { // Semantic versioning description: // - rtVersionName="0.46.0.1" + rtVersionName="0.46.2.1" } } diff --git a/comp_ask/src/main/java/cmu/xprize/comp_ask/CAskComponent.java b/comp_ask/src/main/java/cmu/xprize/comp_ask/CAskComponent.java index 59e884592..97bf1a835 100644 --- a/comp_ask/src/main/java/cmu/xprize/comp_ask/CAskComponent.java +++ b/comp_ask/src/main/java/cmu/xprize/comp_ask/CAskComponent.java @@ -1,7 +1,6 @@ //********************************************************************************* // -// Copyright(c) 2016 Carnegie Mellon University. All Rights Reserved. -// Copyright(c) Kevin Willows All Rights Reserved +// Copyright(c) 2016-2017 Kevin Willows All Rights Reserved // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/comp_ask/src/main/java/cmu/xprize/comp_ask/CAsk_Data.java b/comp_ask/src/main/java/cmu/xprize/comp_ask/CAsk_Data.java index c868f520c..1f8fd9856 100644 --- a/comp_ask/src/main/java/cmu/xprize/comp_ask/CAsk_Data.java +++ b/comp_ask/src/main/java/cmu/xprize/comp_ask/CAsk_Data.java @@ -1,7 +1,6 @@ //********************************************************************************* // -// Copyright(c) 2016 Carnegie Mellon University. All Rights Reserved. -// Copyright(c) Kevin Willows All Rights Reserved +// Copyright(c) 2016-2017 Kevin Willows All Rights Reserved // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/comp_banner/src/main/java/cmu/xprize/banner/CBanner.java b/comp_banner/src/main/java/cmu/xprize/banner/CBanner.java index 4bda125ea..9dbfb685e 100644 --- a/comp_banner/src/main/java/cmu/xprize/banner/CBanner.java +++ b/comp_banner/src/main/java/cmu/xprize/banner/CBanner.java @@ -1,7 +1,6 @@ //********************************************************************************* // -// Copyright(c) 2016 Carnegie Mellon University. All Rights Reserved. -// Copyright(c) Kevin Willows All Rights Reserved +// Copyright(c) 2016-2017 Kevin Willows All Rights Reserved // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/comp_banner/src/main/java/cmu/xprize/banner/persona/Persona.java b/comp_banner/src/main/java/cmu/xprize/banner/persona/Persona.java index 6852577d7..ffd868b94 100644 --- a/comp_banner/src/main/java/cmu/xprize/banner/persona/Persona.java +++ b/comp_banner/src/main/java/cmu/xprize/banner/persona/Persona.java @@ -1,5 +1,5 @@ /** - Copyright 2015 Kevin Willows + Copyright(c) 2015-2017 Kevin Willows Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at diff --git a/comp_banner/src/main/java/cmu/xprize/banner/persona/PersonaEye.java b/comp_banner/src/main/java/cmu/xprize/banner/persona/PersonaEye.java index 8f7c2148d..ed9103d20 100644 --- a/comp_banner/src/main/java/cmu/xprize/banner/persona/PersonaEye.java +++ b/comp_banner/src/main/java/cmu/xprize/banner/persona/PersonaEye.java @@ -1,5 +1,5 @@ /** - Copyright 2015 Kevin Willows + Copyright(c) 2015-2017 Kevin Willows Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at diff --git a/comp_banner/src/main/java/cmu/xprize/banner/persona/PersonaEyeColor.java b/comp_banner/src/main/java/cmu/xprize/banner/persona/PersonaEyeColor.java index 116324347..6657ecab2 100644 --- a/comp_banner/src/main/java/cmu/xprize/banner/persona/PersonaEyeColor.java +++ b/comp_banner/src/main/java/cmu/xprize/banner/persona/PersonaEyeColor.java @@ -1,5 +1,5 @@ /** - Copyright 2015 Kevin Willows + Copyright(c) 2015-2017 Kevin Willows Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at diff --git a/comp_banner/src/main/java/cmu/xprize/banner/persona/PersonaEyeLid.java b/comp_banner/src/main/java/cmu/xprize/banner/persona/PersonaEyeLid.java index 0403d2722..2586272b2 100644 --- a/comp_banner/src/main/java/cmu/xprize/banner/persona/PersonaEyeLid.java +++ b/comp_banner/src/main/java/cmu/xprize/banner/persona/PersonaEyeLid.java @@ -1,5 +1,5 @@ /** - Copyright 2015 Kevin Willows + Copyright(c) 2015-2017 Kevin Willows Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at diff --git a/comp_bubblepop/src/main/java/cmu/xprize/bp_component/BP_CONST.java b/comp_bubblepop/src/main/java/cmu/xprize/bp_component/BP_CONST.java index ab53492e5..202fbce1e 100644 --- a/comp_bubblepop/src/main/java/cmu/xprize/bp_component/BP_CONST.java +++ b/comp_bubblepop/src/main/java/cmu/xprize/bp_component/BP_CONST.java @@ -1,7 +1,6 @@ //********************************************************************************* // -// Copyright(c) 2016 Carnegie Mellon University. All Rights Reserved. -// Copyright(c) Kevin Willows All Rights Reserved +// Copyright(c) 2016-2017 Kevin Willows All Rights Reserved // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/comp_bubblepop/src/main/java/cmu/xprize/bp_component/CBP_Component.java b/comp_bubblepop/src/main/java/cmu/xprize/bp_component/CBP_Component.java index 8d9970d16..f9605a2d4 100644 --- a/comp_bubblepop/src/main/java/cmu/xprize/bp_component/CBP_Component.java +++ b/comp_bubblepop/src/main/java/cmu/xprize/bp_component/CBP_Component.java @@ -1,7 +1,6 @@ //********************************************************************************* // -// Copyright(c) 2016 Carnegie Mellon University. All Rights Reserved. -// Copyright(c) Kevin Willows All Rights Reserved +// Copyright(c) 2016-2017 Kevin Willows All Rights Reserved // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/comp_bubblepop/src/main/java/cmu/xprize/bp_component/CBP_LetterBoxLayout.java b/comp_bubblepop/src/main/java/cmu/xprize/bp_component/CBP_LetterBoxLayout.java index 5832f3958..ce663e36e 100644 --- a/comp_bubblepop/src/main/java/cmu/xprize/bp_component/CBP_LetterBoxLayout.java +++ b/comp_bubblepop/src/main/java/cmu/xprize/bp_component/CBP_LetterBoxLayout.java @@ -1,7 +1,6 @@ //********************************************************************************* // -// Copyright(c) 2016 Carnegie Mellon University. All Rights Reserved. -// Copyright(c) Kevin Willows All Rights Reserved +// Copyright(c) 2016-2017 Kevin Willows All Rights Reserved // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/comp_bubblepop/src/main/java/cmu/xprize/bp_component/CBpBackground.java b/comp_bubblepop/src/main/java/cmu/xprize/bp_component/CBpBackground.java index af6305e70..f9c8e19c7 100644 --- a/comp_bubblepop/src/main/java/cmu/xprize/bp_component/CBpBackground.java +++ b/comp_bubblepop/src/main/java/cmu/xprize/bp_component/CBpBackground.java @@ -1,7 +1,6 @@ //********************************************************************************* // -// Copyright(c) 2016 Carnegie Mellon University. All Rights Reserved. -// Copyright(c) Kevin Willows All Rights Reserved +// Copyright(c) 2016-2017 Kevin Willows All Rights Reserved // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/comp_bubblepop/src/main/java/cmu/xprize/bp_component/CBp_Data.java b/comp_bubblepop/src/main/java/cmu/xprize/bp_component/CBp_Data.java index a5826ea71..d0fd9c43b 100644 --- a/comp_bubblepop/src/main/java/cmu/xprize/bp_component/CBp_Data.java +++ b/comp_bubblepop/src/main/java/cmu/xprize/bp_component/CBp_Data.java @@ -1,7 +1,6 @@ //********************************************************************************* // -// Copyright(c) 2016 Carnegie Mellon University. All Rights Reserved. -// Copyright(c) Kevin Willows All Rights Reserved +// Copyright(c) 2016-2017 Kevin Willows All Rights Reserved // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/comp_bubblepop/src/main/java/cmu/xprize/bp_component/CBp_Mechanic_Base.java b/comp_bubblepop/src/main/java/cmu/xprize/bp_component/CBp_Mechanic_Base.java index 36885e53c..c0d63759e 100644 --- a/comp_bubblepop/src/main/java/cmu/xprize/bp_component/CBp_Mechanic_Base.java +++ b/comp_bubblepop/src/main/java/cmu/xprize/bp_component/CBp_Mechanic_Base.java @@ -1,7 +1,6 @@ //********************************************************************************* // -// Copyright(c) 2016 Carnegie Mellon University. All Rights Reserved. -// Copyright(c) Kevin Willows All Rights Reserved +// Copyright(c) 2016-2017 Kevin Willows All Rights Reserved // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/comp_bubblepop/src/main/java/cmu/xprize/bp_component/CBp_Mechanic_MC.java b/comp_bubblepop/src/main/java/cmu/xprize/bp_component/CBp_Mechanic_MC.java index 430f50992..513b6f2b9 100644 --- a/comp_bubblepop/src/main/java/cmu/xprize/bp_component/CBp_Mechanic_MC.java +++ b/comp_bubblepop/src/main/java/cmu/xprize/bp_component/CBp_Mechanic_MC.java @@ -1,7 +1,6 @@ //********************************************************************************* // -// Copyright(c) 2016 Carnegie Mellon University. All Rights Reserved. -// Copyright(c) Kevin Willows All Rights Reserved +// Copyright(c) 2016-2017 Kevin Willows All Rights Reserved // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/comp_bubblepop/src/main/java/cmu/xprize/bp_component/CBp_Mechanic_RISE.java b/comp_bubblepop/src/main/java/cmu/xprize/bp_component/CBp_Mechanic_RISE.java index 78072f917..3f843fd8a 100644 --- a/comp_bubblepop/src/main/java/cmu/xprize/bp_component/CBp_Mechanic_RISE.java +++ b/comp_bubblepop/src/main/java/cmu/xprize/bp_component/CBp_Mechanic_RISE.java @@ -1,7 +1,6 @@ //********************************************************************************* // -// Copyright(c) 2016 Carnegie Mellon University. All Rights Reserved. -// Copyright(c) Kevin Willows All Rights Reserved +// Copyright(c) 2016-2017 Kevin Willows All Rights Reserved // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/comp_bubblepop/src/main/java/cmu/xprize/bp_component/CBubble.java b/comp_bubblepop/src/main/java/cmu/xprize/bp_component/CBubble.java index 87ce6693a..344243408 100644 --- a/comp_bubblepop/src/main/java/cmu/xprize/bp_component/CBubble.java +++ b/comp_bubblepop/src/main/java/cmu/xprize/bp_component/CBubble.java @@ -1,7 +1,6 @@ //********************************************************************************* // -// Copyright(c) 2016 Carnegie Mellon University. All Rights Reserved. -// Copyright(c) Kevin Willows All Rights Reserved +// Copyright(c) 2016-2017 Kevin Willows All Rights Reserved // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/comp_bubblepop/src/main/java/cmu/xprize/bp_component/CBubbleStimulus.java b/comp_bubblepop/src/main/java/cmu/xprize/bp_component/CBubbleStimulus.java index 5191ad025..5baec22d8 100644 --- a/comp_bubblepop/src/main/java/cmu/xprize/bp_component/CBubbleStimulus.java +++ b/comp_bubblepop/src/main/java/cmu/xprize/bp_component/CBubbleStimulus.java @@ -1,5 +1,5 @@ /** - Copyright 2015 Kevin Willows + Copyright(c) 2015-2017 Kevin Willows Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at diff --git a/comp_bubblepop/src/main/java/cmu/xprize/bp_component/CClassMap.java b/comp_bubblepop/src/main/java/cmu/xprize/bp_component/CClassMap.java index 5c27aa72f..8a682606d 100644 --- a/comp_bubblepop/src/main/java/cmu/xprize/bp_component/CClassMap.java +++ b/comp_bubblepop/src/main/java/cmu/xprize/bp_component/CClassMap.java @@ -1,7 +1,6 @@ //********************************************************************************* // -// Copyright(c) 2016 Carnegie Mellon University. All Rights Reserved. -// Copyright(c) Kevin Willows All Rights Reserved +// Copyright(c) 2016-2017 Kevin Willows All Rights Reserved // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/comp_bubblepop/src/main/java/cmu/xprize/bp_component/IPrimitive.java b/comp_bubblepop/src/main/java/cmu/xprize/bp_component/IPrimitive.java index bac8e9905..d25b69916 100644 --- a/comp_bubblepop/src/main/java/cmu/xprize/bp_component/IPrimitive.java +++ b/comp_bubblepop/src/main/java/cmu/xprize/bp_component/IPrimitive.java @@ -1,7 +1,6 @@ //********************************************************************************* // -// Copyright(c) 2016 Carnegie Mellon University. All Rights Reserved. -// Copyright(c) Kevin Willows All Rights Reserved +// Copyright(c) 2016-2017 Kevin Willows All Rights Reserved // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/comp_clickmask/src/main/java/cmu/xprize/comp_clickmask/CClickMask.java b/comp_clickmask/src/main/java/cmu/xprize/comp_clickmask/CClickMask.java index b52efcb29..b49941ae4 100644 --- a/comp_clickmask/src/main/java/cmu/xprize/comp_clickmask/CClickMask.java +++ b/comp_clickmask/src/main/java/cmu/xprize/comp_clickmask/CClickMask.java @@ -1,5 +1,5 @@ /** - Copyright 2015 Kevin Willows + Copyright(c) 2015-2017 Kevin Willows Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at diff --git a/comp_clickmask/src/main/java/cmu/xprize/comp_clickmask/CExclusion.java b/comp_clickmask/src/main/java/cmu/xprize/comp_clickmask/CExclusion.java index 3e49fed41..0a7d74ffa 100644 --- a/comp_clickmask/src/main/java/cmu/xprize/comp_clickmask/CExclusion.java +++ b/comp_clickmask/src/main/java/cmu/xprize/comp_clickmask/CExclusion.java @@ -1,5 +1,5 @@ /** - Copyright 2015 Kevin Willows + Copyright(c) 2015-2017 Kevin Willows Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at diff --git a/comp_clickmask/src/main/java/cmu/xprize/comp_clickmask/CM_CONST.java b/comp_clickmask/src/main/java/cmu/xprize/comp_clickmask/CM_CONST.java index e4c37665d..99b294a9f 100644 --- a/comp_clickmask/src/main/java/cmu/xprize/comp_clickmask/CM_CONST.java +++ b/comp_clickmask/src/main/java/cmu/xprize/comp_clickmask/CM_CONST.java @@ -1,5 +1,5 @@ /** - Copyright 2015 Kevin Willows + Copyright(c) 2015-2017 Kevin Willows Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at diff --git a/comp_clickmask/src/main/java/cmu/xprize/comp_clickmask/IMaskOwner.java b/comp_clickmask/src/main/java/cmu/xprize/comp_clickmask/IMaskOwner.java index 8888335ba..65946e1f1 100644 --- a/comp_clickmask/src/main/java/cmu/xprize/comp_clickmask/IMaskOwner.java +++ b/comp_clickmask/src/main/java/cmu/xprize/comp_clickmask/IMaskOwner.java @@ -1,5 +1,5 @@ /** - Copyright 2015 Kevin Willows + Copyright(c) 2015-2017 Kevin Willows Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at diff --git a/comp_listener/src/main/java/edu/cmu/xprize/listener/LCONST.java b/comp_listener/src/main/java/edu/cmu/xprize/listener/LCONST.java index 0bf38bbf6..408ef2a9a 100644 --- a/comp_listener/src/main/java/edu/cmu/xprize/listener/LCONST.java +++ b/comp_listener/src/main/java/edu/cmu/xprize/listener/LCONST.java @@ -1,7 +1,7 @@ //********************************************************************************* // // Copyright(c) 2016 Carnegie Mellon University. All Rights Reserved. -// Copyright(c) Kevin Willows All Rights Reserved +// Copyright(c) 2016-2017 Kevin Willows All Rights Reserved // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/comp_listener/src/main/java/edu/cmu/xprize/listener/ListenerBase.java b/comp_listener/src/main/java/edu/cmu/xprize/listener/ListenerBase.java index 5f99be302..6ffa7e9d1 100644 --- a/comp_listener/src/main/java/edu/cmu/xprize/listener/ListenerBase.java +++ b/comp_listener/src/main/java/edu/cmu/xprize/listener/ListenerBase.java @@ -1,7 +1,7 @@ //********************************************************************************* // // Copyright(c) 2016 Carnegie Mellon University. All Rights Reserved. -// Copyright(c) Kevin Willows All Rights Reserved +// Copyright(c) 2016-2017 Kevin Willows All Rights Reserved // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/comp_listener/src/main/java/edu/cmu/xprize/listener/ListenerJSGF.java b/comp_listener/src/main/java/edu/cmu/xprize/listener/ListenerJSGF.java index d994f63af..bcf12db7f 100644 --- a/comp_listener/src/main/java/edu/cmu/xprize/listener/ListenerJSGF.java +++ b/comp_listener/src/main/java/edu/cmu/xprize/listener/ListenerJSGF.java @@ -1,7 +1,7 @@ //********************************************************************************* // // Copyright(c) 2016 Carnegie Mellon University. All Rights Reserved. -// Copyright(c) Kevin Willows All Rights Reserved +// Copyright(c) 2016-2017 Kevin Willows All Rights Reserved // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/comp_listener/src/main/java/edu/cmu/xprize/listener/ListenerPLRT.java b/comp_listener/src/main/java/edu/cmu/xprize/listener/ListenerPLRT.java index c75439f20..ecae4c8fe 100644 --- a/comp_listener/src/main/java/edu/cmu/xprize/listener/ListenerPLRT.java +++ b/comp_listener/src/main/java/edu/cmu/xprize/listener/ListenerPLRT.java @@ -1,7 +1,7 @@ //********************************************************************************* // // Copyright(c) 2016 Carnegie Mellon University. All Rights Reserved. -// Copyright(c) Kevin Willows All Rights Reserved +// Copyright(c) 2016-2017 Kevin Willows All Rights Reserved // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/comp_logging/src/main/java/cmu/xprize/comp_logging/CErrorManager.java b/comp_logging/src/main/java/cmu/xprize/comp_logging/CErrorManager.java index eea95fe18..62f75845e 100644 --- a/comp_logging/src/main/java/cmu/xprize/comp_logging/CErrorManager.java +++ b/comp_logging/src/main/java/cmu/xprize/comp_logging/CErrorManager.java @@ -1,7 +1,6 @@ //********************************************************************************* // -// Copyright(c) 2016 Carnegie Mellon University. All Rights Reserved. -// Copyright(c) Kevin Willows All Rights Reserved +// Copyright(c) 2016-2017 Kevin Willows All Rights Reserved // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/comp_logging/src/main/java/cmu/xprize/comp_logging/CLogManager.java b/comp_logging/src/main/java/cmu/xprize/comp_logging/CLogManager.java index 631108506..e6786ca9f 100644 --- a/comp_logging/src/main/java/cmu/xprize/comp_logging/CLogManager.java +++ b/comp_logging/src/main/java/cmu/xprize/comp_logging/CLogManager.java @@ -1,7 +1,6 @@ //********************************************************************************* // -// Copyright(c) 2016 Carnegie Mellon University. All Rights Reserved. -// Copyright(c) Kevin Willows All Rights Reserved +// Copyright(c) 2016-2017 Kevin Willows All Rights Reserved // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/comp_ltkplus/src/main/java/cmu/xprize/ltkplus/CAffineXform.java b/comp_ltkplus/src/main/java/cmu/xprize/ltkplus/CAffineXform.java index 78adf1880..772c35db4 100644 --- a/comp_ltkplus/src/main/java/cmu/xprize/ltkplus/CAffineXform.java +++ b/comp_ltkplus/src/main/java/cmu/xprize/ltkplus/CAffineXform.java @@ -1,7 +1,6 @@ //********************************************************************************* // -// Copyright(c) 2016 Carnegie Mellon University. All Rights Reserved. -// Copyright(c) Kevin Willows All Rights Reserved +// Copyright(c) 2016-2017 Kevin Willows All Rights Reserved // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/comp_ltkplus/src/main/java/cmu/xprize/ltkplus/CGlyph.java b/comp_ltkplus/src/main/java/cmu/xprize/ltkplus/CGlyph.java index 7362dac0c..8769f3bcb 100644 --- a/comp_ltkplus/src/main/java/cmu/xprize/ltkplus/CGlyph.java +++ b/comp_ltkplus/src/main/java/cmu/xprize/ltkplus/CGlyph.java @@ -1,7 +1,6 @@ //********************************************************************************* // -// Copyright(c) 2016 Carnegie Mellon University. All Rights Reserved. -// Copyright(c) Kevin Willows All Rights Reserved +// Copyright(c) 2016-2017 Kevin Willows All Rights Reserved // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/comp_ltkplus/src/main/java/cmu/xprize/ltkplus/CGlyphMetricConstraint.java b/comp_ltkplus/src/main/java/cmu/xprize/ltkplus/CGlyphMetricConstraint.java index e88b85344..80e6719ae 100644 --- a/comp_ltkplus/src/main/java/cmu/xprize/ltkplus/CGlyphMetricConstraint.java +++ b/comp_ltkplus/src/main/java/cmu/xprize/ltkplus/CGlyphMetricConstraint.java @@ -1,7 +1,6 @@ //********************************************************************************* // -// Copyright(c) 2016 Carnegie Mellon University. All Rights Reserved. -// Copyright(c) Kevin Willows All Rights Reserved +// Copyright(c) 2016-2017 Kevin Willows All Rights Reserved // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/comp_ltkplus/src/main/java/cmu/xprize/ltkplus/CGlyphMetrics.java b/comp_ltkplus/src/main/java/cmu/xprize/ltkplus/CGlyphMetrics.java index 795d39f5c..807603f91 100644 --- a/comp_ltkplus/src/main/java/cmu/xprize/ltkplus/CGlyphMetrics.java +++ b/comp_ltkplus/src/main/java/cmu/xprize/ltkplus/CGlyphMetrics.java @@ -1,7 +1,6 @@ //********************************************************************************* // -// Copyright(c) 2016 Carnegie Mellon University. All Rights Reserved. -// Copyright(c) Kevin Willows All Rights Reserved +// Copyright(c) 2016-2017 Kevin Willows All Rights Reserved // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/comp_ltkplus/src/main/java/cmu/xprize/ltkplus/CGlyphSet.java b/comp_ltkplus/src/main/java/cmu/xprize/ltkplus/CGlyphSet.java index e5af87d49..dcb7c41e8 100644 --- a/comp_ltkplus/src/main/java/cmu/xprize/ltkplus/CGlyphSet.java +++ b/comp_ltkplus/src/main/java/cmu/xprize/ltkplus/CGlyphSet.java @@ -1,7 +1,6 @@ //********************************************************************************* // -// Copyright(c) 2016 Carnegie Mellon University. All Rights Reserved. -// Copyright(c) Kevin Willows All Rights Reserved +// Copyright(c) 2016-2017 Kevin Willows All Rights Reserved // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/comp_ltkplus/src/main/java/cmu/xprize/ltkplus/CLipiTKJNIInterface.java b/comp_ltkplus/src/main/java/cmu/xprize/ltkplus/CLipiTKJNIInterface.java index 270b3d742..f21fc7daa 100644 --- a/comp_ltkplus/src/main/java/cmu/xprize/ltkplus/CLipiTKJNIInterface.java +++ b/comp_ltkplus/src/main/java/cmu/xprize/ltkplus/CLipiTKJNIInterface.java @@ -1,7 +1,6 @@ //********************************************************************************* // -// Copyright(c) 2016 Carnegie Mellon University. All Rights Reserved. -// Copyright(c) Kevin Willows All Rights Reserved +// Copyright(c) 2016-2017 Kevin Willows All Rights Reserved // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/comp_ltkplus/src/main/java/cmu/xprize/ltkplus/CRecognizerPlus.java b/comp_ltkplus/src/main/java/cmu/xprize/ltkplus/CRecognizerPlus.java index 62912ac84..1ddf9d25e 100644 --- a/comp_ltkplus/src/main/java/cmu/xprize/ltkplus/CRecognizerPlus.java +++ b/comp_ltkplus/src/main/java/cmu/xprize/ltkplus/CRecognizerPlus.java @@ -1,7 +1,6 @@ //********************************************************************************* // -// Copyright(c) 2016 Carnegie Mellon University. All Rights Reserved. -// Copyright(c) Kevin Willows All Rights Reserved +// Copyright(c) 2016-2017 Kevin Willows All Rights Reserved // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/comp_ltkplus/src/main/java/cmu/xprize/ltkplus/CStroke.java b/comp_ltkplus/src/main/java/cmu/xprize/ltkplus/CStroke.java index 07bb4face..ff3313dc6 100644 --- a/comp_ltkplus/src/main/java/cmu/xprize/ltkplus/CStroke.java +++ b/comp_ltkplus/src/main/java/cmu/xprize/ltkplus/CStroke.java @@ -1,7 +1,6 @@ //********************************************************************************* // -// Copyright(c) 2016 Carnegie Mellon University. All Rights Reserved. -// Copyright(c) Kevin Willows All Rights Reserved +// Copyright(c) 2016-2017 Kevin Willows All Rights Reserved // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/comp_ltkplus/src/main/java/cmu/xprize/ltkplus/CStrokeInfo.java b/comp_ltkplus/src/main/java/cmu/xprize/ltkplus/CStrokeInfo.java index 95709c8c2..31578199c 100644 --- a/comp_ltkplus/src/main/java/cmu/xprize/ltkplus/CStrokeInfo.java +++ b/comp_ltkplus/src/main/java/cmu/xprize/ltkplus/CStrokeInfo.java @@ -1,7 +1,6 @@ //********************************************************************************* // -// Copyright(c) 2016 Carnegie Mellon University. All Rights Reserved. -// Copyright(c) Kevin Willows All Rights Reserved +// Copyright(c) 2016-2017 Kevin Willows All Rights Reserved // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/comp_ltkplus/src/main/java/cmu/xprize/ltkplus/IGlyphSink.java b/comp_ltkplus/src/main/java/cmu/xprize/ltkplus/IGlyphSink.java index 004f5efa7..574baf743 100644 --- a/comp_ltkplus/src/main/java/cmu/xprize/ltkplus/IGlyphSink.java +++ b/comp_ltkplus/src/main/java/cmu/xprize/ltkplus/IGlyphSink.java @@ -1,7 +1,6 @@ //********************************************************************************* // -// Copyright(c) 2016 Carnegie Mellon University. All Rights Reserved. -// Copyright(c) Kevin Willows All Rights Reserved +// Copyright(c) 2016-2017 Kevin Willows All Rights Reserved // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/comp_ltkplus/src/main/java/cmu/xprize/ltkplus/IGlyphSource.java b/comp_ltkplus/src/main/java/cmu/xprize/ltkplus/IGlyphSource.java index 1c32dae39..8a01422fc 100644 --- a/comp_ltkplus/src/main/java/cmu/xprize/ltkplus/IGlyphSource.java +++ b/comp_ltkplus/src/main/java/cmu/xprize/ltkplus/IGlyphSource.java @@ -1,7 +1,6 @@ //********************************************************************************* // -// Copyright(c) 2016 Carnegie Mellon University. All Rights Reserved. -// Copyright(c) Kevin Willows All Rights Reserved +// Copyright(c) 2016-2017 Kevin Willows All Rights Reserved // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/comp_math/src/main/java/cmu/xprize/asm_component/CAsm_Component.java b/comp_math/src/main/java/cmu/xprize/asm_component/CAsm_Component.java index 3ecde2fb5..f3ca27a95 100644 --- a/comp_math/src/main/java/cmu/xprize/asm_component/CAsm_Component.java +++ b/comp_math/src/main/java/cmu/xprize/asm_component/CAsm_Component.java @@ -490,50 +490,61 @@ public void setDotBagsVisible(Boolean _dotbagsVisible, int curDigitIndex, int st if (_dotbagsVisible && !hasShown && !isWriting) { - if(curOverheadCol >= 0) { - - if ((allAlleys.get(curOverheadCol).getTextLayout().getTextLayout(digitIndex).getText(0).getText().equals("") - || allAlleys.get(curOverheadCol).getTextLayout().getTextLayout(digitIndex).getText(0).getCurrentTextColor() == Color.RED) && curOverheadCol > 9) { - mechanics.highlightOverheadOrResult(ASM_CONST.HIGHLIGHT_OVERHEAD); - return; - } else if (allAlleys.get(curOverheadCol).getTextLayout().getTextLayout(digitIndex).getText(1).getText().equals("") - || allAlleys.get(curOverheadCol).getTextLayout().getTextLayout(digitIndex).getText(1).getCurrentTextColor() == Color.RED) { - mechanics.highlightOverheadOrResult(ASM_CONST.HIGHLIGHT_OVERHEAD); - return; - } else { - curOverheadCol = -1; - } - } + animateTutorial(curDigitIndex, startRow, 1000); + + } else if(!_dotbagsVisible){ + for (int alley = 0; alley < allAlleys.size(); alley++) + allAlleys.get(alley).getDotBag().setVisibility(INVISIBLE); + } else + return; - hasShown = true; + dotbagsVisible = _dotbagsVisible; + } - int delayTime = 0; + public void animateTutorial(Integer pace) { + animateTutorial(digitIndex, digitIndex, pace); + } - startRow = startRow >= 0? startRow : 0; - int lastRow = operation.equals("x") ? startRow + 3 : allAlleys.size(); - for (int i = startRow; i < lastRow; i++) { + public void animateTutorial(int curDigitIndex, int startRow, int pace) { - final CAsm_Alley curAlley = allAlleys.get(i); - final int _curDigitIndex = curDigitIndex; + if(curOverheadCol >= 0) { - if (curAlley.getDotBag().getVisibility() != VISIBLE) - delayTime = wiggleDigitAndDotbag(curAlley, delayTime, _curDigitIndex, startRow); + if ((allAlleys.get(curOverheadCol).getTextLayout().getTextLayout(digitIndex).getText(0).getText().equals("") + || allAlleys.get(curOverheadCol).getTextLayout().getTextLayout(digitIndex).getText(0).getCurrentTextColor() == Color.RED) && curOverheadCol > 9) { + mechanics.highlightOverheadOrResult(ASM_CONST.HIGHLIGHT_OVERHEAD); + return; + } else if (allAlleys.get(curOverheadCol).getTextLayout().getTextLayout(digitIndex).getText(1).getText().equals("") + || allAlleys.get(curOverheadCol).getTextLayout().getTextLayout(digitIndex).getText(1).getCurrentTextColor() == Color.RED) { + mechanics.highlightOverheadOrResult(ASM_CONST.HIGHLIGHT_OVERHEAD); + return; + } else { + curOverheadCol = -1; } + } - if (!dotbagsVisible) - mechanics.preClickSetup(); + hasShown = true; - } else if(!_dotbagsVisible){ - for (int alley = 0; alley < allAlleys.size(); alley++) - allAlleys.get(alley).getDotBag().setVisibility(INVISIBLE); - } else - return; + int delayTime = 0; - dotbagsVisible = _dotbagsVisible; + startRow = startRow >= 0? startRow : 0; + int lastRow = operation.equals("x") ? startRow + 3 : allAlleys.size(); + + for (int i = startRow; i < lastRow; i++) { + + final CAsm_Alley curAlley = allAlleys.get(i); + final int _curDigitIndex = curDigitIndex; + + delayTime = wiggleDigitAndDotbag(curAlley, delayTime, _curDigitIndex, startRow, pace); + } + + if (!dotbagsVisible) + mechanics.preClickSetup(); } + + /** * TODO: Generalize */ @@ -586,7 +597,7 @@ protected void broadcastLocation(String Action, PointF touchPt) { } - public int wiggleDigitAndDotbag(final CAsm_Alley curAlley, int delayTime, final int curDigitIndex, int startRow) { + public int wiggleDigitAndDotbag(final CAsm_Alley curAlley, int delayTime, final int curDigitIndex, int startRow, int pace) { final CAsm_DotBag curDB = curAlley.getDotBag(); final CAsm_TextLayout curTextLayout; @@ -613,7 +624,7 @@ public void run() { curAlley.getTextLayout().getTextLayout(0).getText(1).wiggle(300, 1, 0, .5f); } }, delayTime); - delayTime += 1000; + delayTime += pace; } else if (allAlleys.indexOf(curAlley) == startRow + 1 && operation.equals("x")) { h.postDelayed(new Runnable() { @Override @@ -622,7 +633,7 @@ public void run() { curAlley.getTextLayout().getTextLayout(numSlots - 1).getText(0).wiggle(300, 1, 0, .3f); } }, delayTime); - delayTime += 1000; + delayTime += pace; } h.postDelayed(new Runnable() { @@ -636,7 +647,7 @@ public void run() { curTextLayout.getText(1).wiggle(300, 1, 0, .3f); } }, delayTime); - delayTime += 1000; + delayTime += pace; } else if (!curText.getIsStruck()) curDB.setVisibility(VISIBLE); diff --git a/comp_math/src/main/java/cmu/xprize/asm_component/CAsm_Data.java b/comp_math/src/main/java/cmu/xprize/asm_component/CAsm_Data.java index daf67318c..1992130f4 100644 --- a/comp_math/src/main/java/cmu/xprize/asm_component/CAsm_Data.java +++ b/comp_math/src/main/java/cmu/xprize/asm_component/CAsm_Data.java @@ -1,7 +1,6 @@ //********************************************************************************* // -// Copyright(c) 2016 Carnegie Mellon University. All Rights Reserved. -// Copyright(c) Kevin Willows All Rights Reserved +// Copyright(c) 2016-2017 Kevin Willows All Rights Reserved // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/comp_math/src/main/java/cmu/xprize/asm_component/CAsm_LetterBoxLayout.java b/comp_math/src/main/java/cmu/xprize/asm_component/CAsm_LetterBoxLayout.java index 76213f277..2d3958cdf 100644 --- a/comp_math/src/main/java/cmu/xprize/asm_component/CAsm_LetterBoxLayout.java +++ b/comp_math/src/main/java/cmu/xprize/asm_component/CAsm_LetterBoxLayout.java @@ -1,7 +1,6 @@ //********************************************************************************* // -// Copyright(c) 2016 Carnegie Mellon University. All Rights Reserved. -// Copyright(c) Kevin Willows All Rights Reserved +// Copyright(c) 2016-2017 Kevin Willows All Rights Reserved // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/comp_pointtap/src/main/java/cmu/xprize/comp_pointtap/CHandAnimation.java b/comp_pointtap/src/main/java/cmu/xprize/comp_pointtap/CHandAnimation.java index 44b98e372..0ed2deede 100644 --- a/comp_pointtap/src/main/java/cmu/xprize/comp_pointtap/CHandAnimation.java +++ b/comp_pointtap/src/main/java/cmu/xprize/comp_pointtap/CHandAnimation.java @@ -1,7 +1,6 @@ //********************************************************************************* // -// Copyright(c) 2016 Carnegie Mellon University. All Rights Reserved. -// Copyright(c) Kevin Willows All Rights Reserved +// Copyright(c) 2016-2017 Kevin Willows All Rights Reserved // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/comp_pointtap/src/main/java/cmu/xprize/comp_pointtap/CRipple.java b/comp_pointtap/src/main/java/cmu/xprize/comp_pointtap/CRipple.java index c4822cdb4..b1909ca77 100644 --- a/comp_pointtap/src/main/java/cmu/xprize/comp_pointtap/CRipple.java +++ b/comp_pointtap/src/main/java/cmu/xprize/comp_pointtap/CRipple.java @@ -1,7 +1,6 @@ //********************************************************************************* // -// Copyright(c) 2016 Carnegie Mellon University. All Rights Reserved. -// Copyright(c) Kevin Willows All Rights Reserved +// Copyright(c) 2016-2017 Kevin Willows All Rights Reserved // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/comp_reading/src/main/java/cmu/xprize/rt_component/CASB_Content.java b/comp_reading/src/main/java/cmu/xprize/rt_component/CASB_Content.java index 4822673f2..75fcc4d53 100644 --- a/comp_reading/src/main/java/cmu/xprize/rt_component/CASB_Content.java +++ b/comp_reading/src/main/java/cmu/xprize/rt_component/CASB_Content.java @@ -1,7 +1,6 @@ //********************************************************************************* // -// Copyright(c) 2016 Carnegie Mellon University. All Rights Reserved. -// Copyright(c) Kevin Willows All Rights Reserved +// Copyright(c) 2016-2017 Kevin Willows All Rights Reserved // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/comp_reading/src/main/java/cmu/xprize/rt_component/CASB_Narration.java b/comp_reading/src/main/java/cmu/xprize/rt_component/CASB_Narration.java index dd9ded548..b2d6612fe 100644 --- a/comp_reading/src/main/java/cmu/xprize/rt_component/CASB_Narration.java +++ b/comp_reading/src/main/java/cmu/xprize/rt_component/CASB_Narration.java @@ -1,7 +1,6 @@ //********************************************************************************* // -// Copyright(c) 2016 Carnegie Mellon University. All Rights Reserved. -// Copyright(c) Kevin Willows All Rights Reserved +// Copyright(c) 2016-2017 Kevin Willows All Rights Reserved // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/comp_reading/src/main/java/cmu/xprize/rt_component/CASB_Seg.java b/comp_reading/src/main/java/cmu/xprize/rt_component/CASB_Seg.java index 389dbebd5..ffced5f17 100644 --- a/comp_reading/src/main/java/cmu/xprize/rt_component/CASB_Seg.java +++ b/comp_reading/src/main/java/cmu/xprize/rt_component/CASB_Seg.java @@ -1,7 +1,6 @@ //********************************************************************************* // -// Copyright(c) 2016 Carnegie Mellon University. All Rights Reserved. -// Copyright(c) Kevin Willows All Rights Reserved +// Copyright(c) 2016-2017 Kevin Willows All Rights Reserved // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/comp_reading/src/main/java/cmu/xprize/rt_component/CASB_data.java b/comp_reading/src/main/java/cmu/xprize/rt_component/CASB_data.java index 35de1762d..aaccb8d12 100644 --- a/comp_reading/src/main/java/cmu/xprize/rt_component/CASB_data.java +++ b/comp_reading/src/main/java/cmu/xprize/rt_component/CASB_data.java @@ -1,7 +1,6 @@ //********************************************************************************* // -// Copyright(c) 2016 Carnegie Mellon University. All Rights Reserved. -// Copyright(c) Kevin Willows All Rights Reserved +// Copyright(c) 2016-2017 Kevin Willows All Rights Reserved // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/comp_reading/src/main/java/cmu/xprize/rt_component/CClassMap.java b/comp_reading/src/main/java/cmu/xprize/rt_component/CClassMap.java index e43eaf0ea..ea1d45986 100644 --- a/comp_reading/src/main/java/cmu/xprize/rt_component/CClassMap.java +++ b/comp_reading/src/main/java/cmu/xprize/rt_component/CClassMap.java @@ -1,7 +1,6 @@ //********************************************************************************* // -// Copyright(c) 2016 Carnegie Mellon University. All Rights Reserved. -// Copyright(c) Kevin Willows All Rights Reserved +// Copyright(c) 2016-2017 Kevin Willows All Rights Reserved // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/comp_reading/src/main/java/cmu/xprize/rt_component/CData_Index.java b/comp_reading/src/main/java/cmu/xprize/rt_component/CData_Index.java index 8d65a53cb..f9f431097 100644 --- a/comp_reading/src/main/java/cmu/xprize/rt_component/CData_Index.java +++ b/comp_reading/src/main/java/cmu/xprize/rt_component/CData_Index.java @@ -1,7 +1,6 @@ //********************************************************************************* // -// Copyright(c) 2016 Carnegie Mellon University. All Rights Reserved. -// Copyright(c) Kevin Willows All Rights Reserved +// Copyright(c) 2016-2017 Kevin Willows All Rights Reserved // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/comp_reading/src/main/java/cmu/xprize/rt_component/CRt_Component.java b/comp_reading/src/main/java/cmu/xprize/rt_component/CRt_Component.java index ca3befceb..cb35a63a9 100644 --- a/comp_reading/src/main/java/cmu/xprize/rt_component/CRt_Component.java +++ b/comp_reading/src/main/java/cmu/xprize/rt_component/CRt_Component.java @@ -1,7 +1,6 @@ //********************************************************************************* // -// Copyright(c) 2016 Carnegie Mellon University. All Rights Reserved. -// Copyright(c) Kevin Willows All Rights Reserved +// Copyright(c) 2016-2017 Kevin Willows All Rights Reserved // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/comp_reading/src/main/java/cmu/xprize/rt_component/CRt_ViewManagerASB.java b/comp_reading/src/main/java/cmu/xprize/rt_component/CRt_ViewManagerASB.java index d6c71ac68..85724ea1e 100644 --- a/comp_reading/src/main/java/cmu/xprize/rt_component/CRt_ViewManagerASB.java +++ b/comp_reading/src/main/java/cmu/xprize/rt_component/CRt_ViewManagerASB.java @@ -1,6 +1,6 @@ //********************************************************************************* // -// Copyright(c) Kevin Willows All Rights Reserved +// Copyright(c) 2016-2017 Kevin Willows All Rights Reserved // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/comp_reading/src/main/java/cmu/xprize/rt_component/CRt_ViewManagerMari.java b/comp_reading/src/main/java/cmu/xprize/rt_component/CRt_ViewManagerMari.java index 46821d56c..32e7d280b 100644 --- a/comp_reading/src/main/java/cmu/xprize/rt_component/CRt_ViewManagerMari.java +++ b/comp_reading/src/main/java/cmu/xprize/rt_component/CRt_ViewManagerMari.java @@ -1,7 +1,6 @@ //********************************************************************************* // -// Copyright(c) 2016 Carnegie Mellon University. All Rights Reserved. -// Copyright(c) Kevin Willows All Rights Reserved +// Copyright(c) 2016-2017 Kevin Willows All Rights Reserved // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/comp_reading/src/main/java/cmu/xprize/rt_component/ICRt_ViewManager.java b/comp_reading/src/main/java/cmu/xprize/rt_component/ICRt_ViewManager.java index 46dc03ed6..bacf1dd5b 100644 --- a/comp_reading/src/main/java/cmu/xprize/rt_component/ICRt_ViewManager.java +++ b/comp_reading/src/main/java/cmu/xprize/rt_component/ICRt_ViewManager.java @@ -1,7 +1,6 @@ //********************************************************************************* // -// Copyright(c) 2016 Carnegie Mellon University. All Rights Reserved. -// Copyright(c) Kevin Willows All Rights Reserved +// Copyright(c) 2016-2017 Kevin Willows All Rights Reserved // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/comp_reading/src/main/java/cmu/xprize/rt_component/IRtComponent.java b/comp_reading/src/main/java/cmu/xprize/rt_component/IRtComponent.java index 6a9cc1227..8edc01aba 100644 --- a/comp_reading/src/main/java/cmu/xprize/rt_component/IRtComponent.java +++ b/comp_reading/src/main/java/cmu/xprize/rt_component/IRtComponent.java @@ -1,7 +1,6 @@ //********************************************************************************* // -// Copyright(c) 2016 Carnegie Mellon University. All Rights Reserved. -// Copyright(c) Kevin Willows All Rights Reserved +// Copyright(c) 2016-2017 Kevin Willows All Rights Reserved // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/comp_scoreboard/src/main/java/cmu/xprize/sb_component/CSb_Data.java b/comp_scoreboard/src/main/java/cmu/xprize/sb_component/CSb_Data.java index 612a56a8b..756d173c0 100644 --- a/comp_scoreboard/src/main/java/cmu/xprize/sb_component/CSb_Data.java +++ b/comp_scoreboard/src/main/java/cmu/xprize/sb_component/CSb_Data.java @@ -1,7 +1,6 @@ //********************************************************************************* // -// Copyright(c) 2016 Carnegie Mellon University. All Rights Reserved. -// Copyright(c) Kevin Willows All Rights Reserved +// Copyright(c) 2016-2017 Kevin Willows All Rights Reserved // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/comp_writing/src/main/java/cmu/xprize/comp_writing/CGlyphController.java b/comp_writing/src/main/java/cmu/xprize/comp_writing/CGlyphController.java index 707d122f1..3fbb9e958 100644 --- a/comp_writing/src/main/java/cmu/xprize/comp_writing/CGlyphController.java +++ b/comp_writing/src/main/java/cmu/xprize/comp_writing/CGlyphController.java @@ -1,7 +1,6 @@ //********************************************************************************* // -// Copyright(c) 2016 Carnegie Mellon University. All Rights Reserved. -// Copyright(c) Kevin Willows All Rights Reserved +// Copyright(c) 2016-2017 Kevin Willows All Rights Reserved // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/comp_writing/src/main/java/cmu/xprize/comp_writing/CGlyphInputContainer.java b/comp_writing/src/main/java/cmu/xprize/comp_writing/CGlyphInputContainer.java index 978d05aa8..569fa94a2 100644 --- a/comp_writing/src/main/java/cmu/xprize/comp_writing/CGlyphInputContainer.java +++ b/comp_writing/src/main/java/cmu/xprize/comp_writing/CGlyphInputContainer.java @@ -1,5 +1,5 @@ /** - Copyright 2015 Kevin Willows + Copyright(c) 2015-2017 Kevin Willows Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at diff --git a/comp_writing/src/main/java/cmu/xprize/comp_writing/CGlyphReplayContainer.java b/comp_writing/src/main/java/cmu/xprize/comp_writing/CGlyphReplayContainer.java index cefb6cd69..0949989e1 100644 --- a/comp_writing/src/main/java/cmu/xprize/comp_writing/CGlyphReplayContainer.java +++ b/comp_writing/src/main/java/cmu/xprize/comp_writing/CGlyphReplayContainer.java @@ -1,7 +1,6 @@ //********************************************************************************* // -// Copyright(c) 2016 Carnegie Mellon University. All Rights Reserved. -// Copyright(c) Kevin Willows All Rights Reserved +// Copyright(c) 2016-2017 Kevin Willows All Rights Reserved // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/comp_writing/src/main/java/cmu/xprize/comp_writing/CStimulusController.java b/comp_writing/src/main/java/cmu/xprize/comp_writing/CStimulusController.java index f410f2937..ce655c207 100644 --- a/comp_writing/src/main/java/cmu/xprize/comp_writing/CStimulusController.java +++ b/comp_writing/src/main/java/cmu/xprize/comp_writing/CStimulusController.java @@ -1,7 +1,6 @@ //********************************************************************************* // -// Copyright(c) 2016 Carnegie Mellon University. All Rights Reserved. -// Copyright(c) Kevin Willows All Rights Reserved +// Copyright(c) 2016-2017 Kevin Willows All Rights Reserved // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/comp_writing/src/main/java/cmu/xprize/comp_writing/CWritingComponent.java b/comp_writing/src/main/java/cmu/xprize/comp_writing/CWritingComponent.java index 545e252dc..0b9d7e8c9 100644 --- a/comp_writing/src/main/java/cmu/xprize/comp_writing/CWritingComponent.java +++ b/comp_writing/src/main/java/cmu/xprize/comp_writing/CWritingComponent.java @@ -1,7 +1,6 @@ //********************************************************************************* // -// Copyright(c) 2016 Carnegie Mellon University. All Rights Reserved. -// Copyright(c) Kevin Willows All Rights Reserved +// Copyright(c) 2016-2017 Kevin Willows All Rights Reserved // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -160,6 +159,10 @@ protected void init(Context context, AttributeSet attrs) { bManager = LocalBroadcastManager.getInstance(getContext()); } + + //!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + //!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + //!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! /** Note: This is used with the writing_tutor_comp layout in the dev project * The resource names are different at the momoent * diff --git a/comp_writing/src/main/java/cmu/xprize/comp_writing/CWritingDevComponent.java b/comp_writing/src/main/java/cmu/xprize/comp_writing/CWritingDevComponent.java index 1f4b98269..20d8740fa 100644 --- a/comp_writing/src/main/java/cmu/xprize/comp_writing/CWritingDevComponent.java +++ b/comp_writing/src/main/java/cmu/xprize/comp_writing/CWritingDevComponent.java @@ -1,7 +1,6 @@ //********************************************************************************* // -// Copyright(c) 2016 Carnegie Mellon University. All Rights Reserved. -// Copyright(c) Kevin Willows All Rights Reserved +// Copyright(c) 2016-2017 Kevin Willows All Rights Reserved // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/fw_component/src/main/java/cmu/xprize/fw_component/CClassMap.java b/fw_component/src/main/java/cmu/xprize/fw_component/CClassMap.java index 1022b775d..913159ae0 100644 --- a/fw_component/src/main/java/cmu/xprize/fw_component/CClassMap.java +++ b/fw_component/src/main/java/cmu/xprize/fw_component/CClassMap.java @@ -1,7 +1,6 @@ //********************************************************************************* // -// Copyright(c) 2016 Carnegie Mellon University. All Rights Reserved. -// Copyright(c) Kevin Willows All Rights Reserved +// Copyright(c) 2016-2017 Kevin Willows All Rights Reserved // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/fw_component/src/main/java/cmu/xprize/fw_component/CFingerWriter.java b/fw_component/src/main/java/cmu/xprize/fw_component/CFingerWriter.java index 001994313..f1ea8455c 100644 --- a/fw_component/src/main/java/cmu/xprize/fw_component/CFingerWriter.java +++ b/fw_component/src/main/java/cmu/xprize/fw_component/CFingerWriter.java @@ -1,7 +1,6 @@ //********************************************************************************* // -// Copyright(c) 2016 Carnegie Mellon University. All Rights Reserved. -// Copyright(c) Kevin Willows All Rights Reserved +// Copyright(c) 2016-2017 Kevin Willows All Rights Reserved // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/fw_component/src/main/java/cmu/xprize/fw_component/CStimResp.java b/fw_component/src/main/java/cmu/xprize/fw_component/CStimResp.java index 4cb278235..7985cb732 100644 --- a/fw_component/src/main/java/cmu/xprize/fw_component/CStimResp.java +++ b/fw_component/src/main/java/cmu/xprize/fw_component/CStimResp.java @@ -1,7 +1,6 @@ //********************************************************************************* // -// Copyright(c) 2016 Carnegie Mellon University. All Rights Reserved. -// Copyright(c) Kevin Willows All Rights Reserved +// Copyright(c) 2016-2017 Kevin Willows All Rights Reserved // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/fw_component/src/main/java/cmu/xprize/fw_component/CStimRespBase.java b/fw_component/src/main/java/cmu/xprize/fw_component/CStimRespBase.java index 3eec81c80..d35f7ea0c 100644 --- a/fw_component/src/main/java/cmu/xprize/fw_component/CStimRespBase.java +++ b/fw_component/src/main/java/cmu/xprize/fw_component/CStimRespBase.java @@ -1,7 +1,6 @@ //********************************************************************************* // -// Copyright(c) 2016 Carnegie Mellon University. All Rights Reserved. -// Copyright(c) Kevin Willows All Rights Reserved +// Copyright(c) 2016-2017 Kevin Willows All Rights Reserved // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/fw_component/src/main/java/cmu/xprize/fw_component/CTextView.java b/fw_component/src/main/java/cmu/xprize/fw_component/CTextView.java index 645681459..8c6b149bf 100644 --- a/fw_component/src/main/java/cmu/xprize/fw_component/CTextView.java +++ b/fw_component/src/main/java/cmu/xprize/fw_component/CTextView.java @@ -1,7 +1,6 @@ //********************************************************************************* // -// Copyright(c) 2016 Carnegie Mellon University. All Rights Reserved. -// Copyright(c) Kevin Willows All Rights Reserved +// Copyright(c) 2016-2017 Kevin Willows All Rights Reserved // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/fw_component/src/main/java/cmu/xprize/fw_component/ISrListener.java b/fw_component/src/main/java/cmu/xprize/fw_component/ISrListener.java index 45f6c8023..80691438b 100644 --- a/fw_component/src/main/java/cmu/xprize/fw_component/ISrListener.java +++ b/fw_component/src/main/java/cmu/xprize/fw_component/ISrListener.java @@ -1,7 +1,6 @@ //********************************************************************************* // -// Copyright(c) 2016 Carnegie Mellon University. All Rights Reserved. -// Copyright(c) Kevin Willows All Rights Reserved +// Copyright(c) 2016-2017 Kevin Willows All Rights Reserved // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/fw_component/src/main/java/cmu/xprize/fw_component/ITextSink.java b/fw_component/src/main/java/cmu/xprize/fw_component/ITextSink.java index b26c138ec..91004d519 100644 --- a/fw_component/src/main/java/cmu/xprize/fw_component/ITextSink.java +++ b/fw_component/src/main/java/cmu/xprize/fw_component/ITextSink.java @@ -1,7 +1,6 @@ //********************************************************************************* // -// Copyright(c) 2016 Carnegie Mellon University. All Rights Reserved. -// Copyright(c) Kevin Willows All Rights Reserved +// Copyright(c) 2016-2017 Kevin Willows All Rights Reserved // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/fw_component/src/main/java/cmu/xprize/fw_component/ReplayComponent.java b/fw_component/src/main/java/cmu/xprize/fw_component/ReplayComponent.java index 006296c2e..1c5e099c4 100644 --- a/fw_component/src/main/java/cmu/xprize/fw_component/ReplayComponent.java +++ b/fw_component/src/main/java/cmu/xprize/fw_component/ReplayComponent.java @@ -1,7 +1,6 @@ //********************************************************************************* // -// Copyright(c) 2016 Carnegie Mellon University. All Rights Reserved. -// Copyright(c) Kevin Willows All Rights Reserved +// Copyright(c) 2016-2017 Kevin Willows All Rights Reserved // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/mn_component/src/main/java/cmu/xprize/mn_component/CClassMap.java b/mn_component/src/main/java/cmu/xprize/mn_component/CClassMap.java index 1484ac979..3eb77dd21 100644 --- a/mn_component/src/main/java/cmu/xprize/mn_component/CClassMap.java +++ b/mn_component/src/main/java/cmu/xprize/mn_component/CClassMap.java @@ -1,7 +1,6 @@ //********************************************************************************* // -// Copyright(c) 2016 Carnegie Mellon University. All Rights Reserved. -// Copyright(c) Kevin Willows All Rights Reserved +// Copyright(c) 2016-2017 Kevin Willows All Rights Reserved // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/mn_component/src/main/java/cmu/xprize/mn_component/CMn_Alley.java b/mn_component/src/main/java/cmu/xprize/mn_component/CMn_Alley.java index 3ce97e98b..51ac9b251 100644 --- a/mn_component/src/main/java/cmu/xprize/mn_component/CMn_Alley.java +++ b/mn_component/src/main/java/cmu/xprize/mn_component/CMn_Alley.java @@ -1,7 +1,6 @@ //********************************************************************************* // -// Copyright(c) 2016 Carnegie Mellon University. All Rights Reserved. -// Copyright(c) Kevin Willows All Rights Reserved +// Copyright(c) 2016-2017 Kevin Willows All Rights Reserved // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/mn_component/src/main/java/cmu/xprize/mn_component/CMn_Component.java b/mn_component/src/main/java/cmu/xprize/mn_component/CMn_Component.java index 09e028f2a..b8f41edb7 100644 --- a/mn_component/src/main/java/cmu/xprize/mn_component/CMn_Component.java +++ b/mn_component/src/main/java/cmu/xprize/mn_component/CMn_Component.java @@ -1,7 +1,6 @@ //********************************************************************************* // -// Copyright(c) 2016 Carnegie Mellon University. All Rights Reserved. -// Copyright(c) Kevin Willows All Rights Reserved +// Copyright(c) 2016-2017 Kevin Willows All Rights Reserved // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/mn_component/src/main/java/cmu/xprize/mn_component/CMn_Data.java b/mn_component/src/main/java/cmu/xprize/mn_component/CMn_Data.java index a26353dba..23c0679c9 100644 --- a/mn_component/src/main/java/cmu/xprize/mn_component/CMn_Data.java +++ b/mn_component/src/main/java/cmu/xprize/mn_component/CMn_Data.java @@ -1,7 +1,6 @@ //********************************************************************************* // -// Copyright(c) 2016 Carnegie Mellon University. All Rights Reserved. -// Copyright(c) Kevin Willows All Rights Reserved +// Copyright(c) 2016-2017 Kevin Willows All Rights Reserved // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/mn_component/src/main/java/cmu/xprize/mn_component/CMn_Icon.java b/mn_component/src/main/java/cmu/xprize/mn_component/CMn_Icon.java index 36d87310e..8272b339d 100644 --- a/mn_component/src/main/java/cmu/xprize/mn_component/CMn_Icon.java +++ b/mn_component/src/main/java/cmu/xprize/mn_component/CMn_Icon.java @@ -1,7 +1,6 @@ //********************************************************************************* // -// Copyright(c) 2016 Carnegie Mellon University. All Rights Reserved. -// Copyright(c) Kevin Willows All Rights Reserved +// Copyright(c) 2016-2017 Kevin Willows All Rights Reserved // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/mn_component/src/main/java/cmu/xprize/mn_component/CMn_IconSet.java b/mn_component/src/main/java/cmu/xprize/mn_component/CMn_IconSet.java index 9cd83c464..72b5375b3 100644 --- a/mn_component/src/main/java/cmu/xprize/mn_component/CMn_IconSet.java +++ b/mn_component/src/main/java/cmu/xprize/mn_component/CMn_IconSet.java @@ -1,7 +1,6 @@ //********************************************************************************* // -// Copyright(c) 2016 Carnegie Mellon University. All Rights Reserved. -// Copyright(c) Kevin Willows All Rights Reserved +// Copyright(c) 2016-2017 Kevin Willows All Rights Reserved // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/mn_component/src/main/java/cmu/xprize/mn_component/CMn_Text.java b/mn_component/src/main/java/cmu/xprize/mn_component/CMn_Text.java index 40f8a3306..fd4a36136 100644 --- a/mn_component/src/main/java/cmu/xprize/mn_component/CMn_Text.java +++ b/mn_component/src/main/java/cmu/xprize/mn_component/CMn_Text.java @@ -1,7 +1,6 @@ //********************************************************************************* // -// Copyright(c) 2016 Carnegie Mellon University. All Rights Reserved. -// Copyright(c) Kevin Willows All Rights Reserved +// Copyright(c) 2016-2017 Kevin Willows All Rights Reserved // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/mn_component/src/main/java/cmu/xprize/mn_component/IValueListener.java b/mn_component/src/main/java/cmu/xprize/mn_component/IValueListener.java index 3829aefe4..44233a678 100644 --- a/mn_component/src/main/java/cmu/xprize/mn_component/IValueListener.java +++ b/mn_component/src/main/java/cmu/xprize/mn_component/IValueListener.java @@ -1,7 +1,6 @@ //********************************************************************************* // -// Copyright(c) 2016 Carnegie Mellon University. All Rights Reserved. -// Copyright(c) Kevin Willows All Rights Reserved +// Copyright(c) 2016-2017 Kevin Willows All Rights Reserved // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/nl_component/src/main/java/cmu/xprize/nl_component/CNl_Component.java b/nl_component/src/main/java/cmu/xprize/nl_component/CNl_Component.java index a088be42e..24d02668c 100644 --- a/nl_component/src/main/java/cmu/xprize/nl_component/CNl_Component.java +++ b/nl_component/src/main/java/cmu/xprize/nl_component/CNl_Component.java @@ -1,7 +1,6 @@ //********************************************************************************* // -// Copyright(c) 2016 Carnegie Mellon University. All Rights Reserved. -// Copyright(c) Kevin Willows All Rights Reserved +// Copyright(c) 2016-2017 Kevin Willows All Rights Reserved // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/nl_component/src/main/java/cmu/xprize/nl_component/CNl_JSGF.java b/nl_component/src/main/java/cmu/xprize/nl_component/CNl_JSGF.java index d3e42c41d..bad4eec76 100644 --- a/nl_component/src/main/java/cmu/xprize/nl_component/CNl_JSGF.java +++ b/nl_component/src/main/java/cmu/xprize/nl_component/CNl_JSGF.java @@ -1,7 +1,6 @@ //********************************************************************************* // -// Copyright(c) 2016 Carnegie Mellon University. All Rights Reserved. -// Copyright(c) Kevin Willows All Rights Reserved +// Copyright(c) 2016-2017 Kevin Willows All Rights Reserved // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/nl_component/src/main/java/cmu/xprize/nl_component/CNl_PLRT.java b/nl_component/src/main/java/cmu/xprize/nl_component/CNl_PLRT.java index f34abf11c..e0b173221 100644 --- a/nl_component/src/main/java/cmu/xprize/nl_component/CNl_PLRT.java +++ b/nl_component/src/main/java/cmu/xprize/nl_component/CNl_PLRT.java @@ -1,7 +1,6 @@ //********************************************************************************* // -// Copyright(c) 2016 Carnegie Mellon University. All Rights Reserved. -// Copyright(c) Kevin Willows All Rights Reserved +// Copyright(c) 2016-2017 Kevin Willows All Rights Reserved // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/nl_component/src/main/java/cmu/xprize/nl_component/CNl_Processor.java b/nl_component/src/main/java/cmu/xprize/nl_component/CNl_Processor.java index ae29ed8e2..457c1bba5 100644 --- a/nl_component/src/main/java/cmu/xprize/nl_component/CNl_Processor.java +++ b/nl_component/src/main/java/cmu/xprize/nl_component/CNl_Processor.java @@ -1,7 +1,6 @@ //********************************************************************************* // -// Copyright(c) 2016 Carnegie Mellon University. All Rights Reserved. -// Copyright(c) Kevin Willows All Rights Reserved +// Copyright(c) 2016-2017 Kevin Willows All Rights Reserved // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/nl_component/src/main/java/cmu/xprize/nl_component/INl_Implementation.java b/nl_component/src/main/java/cmu/xprize/nl_component/INl_Implementation.java index b6e212582..df5a46659 100644 --- a/nl_component/src/main/java/cmu/xprize/nl_component/INl_Implementation.java +++ b/nl_component/src/main/java/cmu/xprize/nl_component/INl_Implementation.java @@ -1,7 +1,6 @@ //********************************************************************************* // -// Copyright(c) 2016 Carnegie Mellon University. All Rights Reserved. -// Copyright(c) Kevin Willows All Rights Reserved +// Copyright(c) 2016-2017 Kevin Willows All Rights Reserved // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/sm_component/src/main/java/cmu/xprize/sm_component/CSm_Button.java b/sm_component/src/main/java/cmu/xprize/sm_component/CSm_Button.java index 6fb334145..ccd65d1a7 100644 --- a/sm_component/src/main/java/cmu/xprize/sm_component/CSm_Button.java +++ b/sm_component/src/main/java/cmu/xprize/sm_component/CSm_Button.java @@ -1,7 +1,6 @@ //********************************************************************************* // -// Copyright(c) 2016 Carnegie Mellon University. All Rights Reserved. -// Copyright(c) Kevin Willows All Rights Reserved +// Copyright(c) 2016-2017 Kevin Willows All Rights Reserved // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/sm_component/src/main/java/cmu/xprize/sm_component/CSm_Class.java b/sm_component/src/main/java/cmu/xprize/sm_component/CSm_Class.java index 3812f3fba..70726e5b3 100644 --- a/sm_component/src/main/java/cmu/xprize/sm_component/CSm_Class.java +++ b/sm_component/src/main/java/cmu/xprize/sm_component/CSm_Class.java @@ -1,7 +1,6 @@ //********************************************************************************* // -// Copyright(c) 2016 Carnegie Mellon University. All Rights Reserved. -// Copyright(c) Kevin Willows All Rights Reserved +// Copyright(c) 2016-2017 Kevin Willows All Rights Reserved // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/sm_component/src/main/java/cmu/xprize/sm_component/CSm_Component.java b/sm_component/src/main/java/cmu/xprize/sm_component/CSm_Component.java index 837331d14..b77686ecd 100644 --- a/sm_component/src/main/java/cmu/xprize/sm_component/CSm_Component.java +++ b/sm_component/src/main/java/cmu/xprize/sm_component/CSm_Component.java @@ -1,7 +1,6 @@ //********************************************************************************* // -// Copyright(c) 2016 Carnegie Mellon University. All Rights Reserved. -// Copyright(c) Kevin Willows All Rights Reserved +// Copyright(c) 2016-2017 Kevin Willows All Rights Reserved // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/sm_component/src/main/java/cmu/xprize/sm_component/CSm_Data.java b/sm_component/src/main/java/cmu/xprize/sm_component/CSm_Data.java index 31f95f597..26dc357e7 100644 --- a/sm_component/src/main/java/cmu/xprize/sm_component/CSm_Data.java +++ b/sm_component/src/main/java/cmu/xprize/sm_component/CSm_Data.java @@ -1,7 +1,6 @@ //********************************************************************************* // -// Copyright(c) 2016 Carnegie Mellon University. All Rights Reserved. -// Copyright(c) Kevin Willows All Rights Reserved +// Copyright(c) 2016-2017 Kevin Willows All Rights Reserved // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/sm_component/src/main/java/cmu/xprize/sm_component/CSm_ImageButton.java b/sm_component/src/main/java/cmu/xprize/sm_component/CSm_ImageButton.java index 5481ef8fc..34467f7f5 100644 --- a/sm_component/src/main/java/cmu/xprize/sm_component/CSm_ImageButton.java +++ b/sm_component/src/main/java/cmu/xprize/sm_component/CSm_ImageButton.java @@ -1,7 +1,6 @@ //********************************************************************************* // -// Copyright(c) 2016 Carnegie Mellon University. All Rights Reserved. -// Copyright(c) Kevin Willows All Rights Reserved +// Copyright(c) 2016-2017 Kevin Willows All Rights Reserved // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/sm_component/src/main/java/cmu/xprize/sm_component/CSm_Launcher.java b/sm_component/src/main/java/cmu/xprize/sm_component/CSm_Launcher.java index b02e3564e..7d7c67d1d 100644 --- a/sm_component/src/main/java/cmu/xprize/sm_component/CSm_Launcher.java +++ b/sm_component/src/main/java/cmu/xprize/sm_component/CSm_Launcher.java @@ -1,7 +1,6 @@ //********************************************************************************* // -// Copyright(c) 2016 Carnegie Mellon University. All Rights Reserved. -// Copyright(c) Kevin Willows All Rights Reserved +// Copyright(c) 2016-2017 Kevin Willows All Rights Reserved // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/sm_component/src/main/java/cmu/xprize/sm_component/CSm_RowContainer.java b/sm_component/src/main/java/cmu/xprize/sm_component/CSm_RowContainer.java index 2cb598301..7d1b47d60 100644 --- a/sm_component/src/main/java/cmu/xprize/sm_component/CSm_RowContainer.java +++ b/sm_component/src/main/java/cmu/xprize/sm_component/CSm_RowContainer.java @@ -1,7 +1,6 @@ //********************************************************************************* // -// Copyright(c) 2016 Carnegie Mellon University. All Rights Reserved. -// Copyright(c) Kevin Willows All Rights Reserved +// Copyright(c) 2016-2017 Kevin Willows All Rights Reserved // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/sm_component/src/main/java/cmu/xprize/sm_component/ILaunchListener.java b/sm_component/src/main/java/cmu/xprize/sm_component/ILaunchListener.java index db953f39e..a23c3f8aa 100644 --- a/sm_component/src/main/java/cmu/xprize/sm_component/ILaunchListener.java +++ b/sm_component/src/main/java/cmu/xprize/sm_component/ILaunchListener.java @@ -1,7 +1,6 @@ //********************************************************************************* // -// Copyright(c) 2016 Carnegie Mellon University. All Rights Reserved. -// Copyright(c) Kevin Willows All Rights Reserved +// Copyright(c) 2016-2017 Kevin Willows All Rights Reserved // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/sm_component/src/main/java/cmu/xprize/sm_component/ILauncherButton.java b/sm_component/src/main/java/cmu/xprize/sm_component/ILauncherButton.java index 3a67fa961..4dd0fd196 100644 --- a/sm_component/src/main/java/cmu/xprize/sm_component/ILauncherButton.java +++ b/sm_component/src/main/java/cmu/xprize/sm_component/ILauncherButton.java @@ -1,7 +1,6 @@ //********************************************************************************* // -// Copyright(c) 2016 Carnegie Mellon University. All Rights Reserved. -// Copyright(c) Kevin Willows All Rights Reserved +// Copyright(c) 2016-2017 Kevin Willows All Rights Reserved // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/util/src/main/java/cmu/xprize/util/CAnimatorUtil.java b/util/src/main/java/cmu/xprize/util/CAnimatorUtil.java index b3ff75902..a32cd32ee 100644 --- a/util/src/main/java/cmu/xprize/util/CAnimatorUtil.java +++ b/util/src/main/java/cmu/xprize/util/CAnimatorUtil.java @@ -1,7 +1,6 @@ //********************************************************************************* // -// Copyright(c) 2016 Carnegie Mellon University. All Rights Reserved. -// Copyright(c) Kevin Willows All Rights Reserved +// Copyright(c) 2016-2017 Kevin Willows All Rights Reserved // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/util/src/main/java/cmu/xprize/util/CAt_Data.java b/util/src/main/java/cmu/xprize/util/CAt_Data.java index 44325f103..60cf457a8 100644 --- a/util/src/main/java/cmu/xprize/util/CAt_Data.java +++ b/util/src/main/java/cmu/xprize/util/CAt_Data.java @@ -1,7 +1,6 @@ //********************************************************************************* // -// Copyright(c) 2016 Carnegie Mellon University. All Rights Reserved. -// Copyright(c) Kevin Willows All Rights Reserved +// Copyright(c) 2016-2017 Kevin Willows All Rights Reserved // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/util/src/main/java/cmu/xprize/util/CDisplayMetrics.java b/util/src/main/java/cmu/xprize/util/CDisplayMetrics.java index 1aa0746db..dc9437232 100644 --- a/util/src/main/java/cmu/xprize/util/CDisplayMetrics.java +++ b/util/src/main/java/cmu/xprize/util/CDisplayMetrics.java @@ -1,5 +1,5 @@ /** - Copyright 2015 Kevin Willows + Copyright(c) 2015-2017 Kevin Willows Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at diff --git a/util/src/main/java/cmu/xprize/util/CErrorDialog.java b/util/src/main/java/cmu/xprize/util/CErrorDialog.java index 34305f171..36f36623f 100644 --- a/util/src/main/java/cmu/xprize/util/CErrorDialog.java +++ b/util/src/main/java/cmu/xprize/util/CErrorDialog.java @@ -1,7 +1,6 @@ //********************************************************************************* // -// Copyright(c) 2016 Carnegie Mellon University. All Rights Reserved. -// Copyright(c) Kevin Willows All Rights Reserved +// Copyright(c) 2016-2017 Kevin Willows All Rights Reserved // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/util/src/main/java/cmu/xprize/util/CEvent.java b/util/src/main/java/cmu/xprize/util/CEvent.java index 4f2c32bc3..09b988537 100644 --- a/util/src/main/java/cmu/xprize/util/CEvent.java +++ b/util/src/main/java/cmu/xprize/util/CEvent.java @@ -1,7 +1,6 @@ //********************************************************************************* // -// Copyright(c) 2016 Carnegie Mellon University. All Rights Reserved. -// Copyright(c) Kevin Willows All Rights Reserved +// Copyright(c) 2016-2017 Kevin Willows All Rights Reserved // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/util/src/main/java/cmu/xprize/util/CLoaderView.java b/util/src/main/java/cmu/xprize/util/CLoaderView.java index bb7f11a25..d36ed35fe 100644 --- a/util/src/main/java/cmu/xprize/util/CLoaderView.java +++ b/util/src/main/java/cmu/xprize/util/CLoaderView.java @@ -1,7 +1,6 @@ //********************************************************************************* // -// Copyright(c) 2016 Carnegie Mellon University. All Rights Reserved. -// Copyright(c) Kevin Willows All Rights Reserved +// Copyright(c) 2016-2017 Kevin Willows All Rights Reserved // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/util/src/main/java/cmu/xprize/util/IEvent.java b/util/src/main/java/cmu/xprize/util/IEvent.java index bad22d22d..dbf96b4ff 100644 --- a/util/src/main/java/cmu/xprize/util/IEvent.java +++ b/util/src/main/java/cmu/xprize/util/IEvent.java @@ -1,7 +1,6 @@ //********************************************************************************* // -// Copyright(c) 2016 Carnegie Mellon University. All Rights Reserved. -// Copyright(c) Kevin Willows All Rights Reserved +// Copyright(c) 2016-2017 Kevin Willows All Rights Reserved // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/util/src/main/java/cmu/xprize/util/IEventDispatcher.java b/util/src/main/java/cmu/xprize/util/IEventDispatcher.java index dcdff3aec..84c8012b4 100644 --- a/util/src/main/java/cmu/xprize/util/IEventDispatcher.java +++ b/util/src/main/java/cmu/xprize/util/IEventDispatcher.java @@ -1,7 +1,6 @@ //********************************************************************************* // -// Copyright(c) 2016 Carnegie Mellon University. All Rights Reserved. -// Copyright(c) Kevin Willows All Rights Reserved +// Copyright(c) 2016-2017 Kevin Willows All Rights Reserved // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/util/src/main/java/cmu/xprize/util/IEventListener.java b/util/src/main/java/cmu/xprize/util/IEventListener.java index cb6f025a7..349266c84 100644 --- a/util/src/main/java/cmu/xprize/util/IEventListener.java +++ b/util/src/main/java/cmu/xprize/util/IEventListener.java @@ -1,7 +1,6 @@ //********************************************************************************* // -// Copyright(c) 2016 Carnegie Mellon University. All Rights Reserved. -// Copyright(c) Kevin Willows All Rights Reserved +// Copyright(c) 2016-2017 Kevin Willows All Rights Reserved // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/util/src/main/java/cmu/xprize/util/IScriptable.java b/util/src/main/java/cmu/xprize/util/IScriptable.java index f94d68cd3..2623f8bf9 100644 --- a/util/src/main/java/cmu/xprize/util/IScriptable.java +++ b/util/src/main/java/cmu/xprize/util/IScriptable.java @@ -1,7 +1,6 @@ //********************************************************************************* // -// Copyright(c) 2016 Carnegie Mellon University. All Rights Reserved. -// Copyright(c) Kevin Willows All Rights Reserved +// Copyright(c) 2016-2017 Kevin Willows All Rights Reserved // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/util/src/main/java/cmu/xprize/util/JSON_Helper.java b/util/src/main/java/cmu/xprize/util/JSON_Helper.java index 454378351..94f0f0cce 100644 --- a/util/src/main/java/cmu/xprize/util/JSON_Helper.java +++ b/util/src/main/java/cmu/xprize/util/JSON_Helper.java @@ -1,7 +1,6 @@ //********************************************************************************* // -// Copyright(c) 2016 Carnegie Mellon University. All Rights Reserved. -// Copyright(c) Kevin Willows All Rights Reserved +// Copyright(c) 2016-2017 Kevin Willows All Rights Reserved // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/util/src/main/java/cmu/xprize/util/TCJSGF.java b/util/src/main/java/cmu/xprize/util/TCJSGF.java index a1bee2869..44d8bb497 100644 --- a/util/src/main/java/cmu/xprize/util/TCJSGF.java +++ b/util/src/main/java/cmu/xprize/util/TCJSGF.java @@ -1,7 +1,6 @@ //********************************************************************************* // -// Copyright(c) 2016 Carnegie Mellon University. All Rights Reserved. -// Copyright(c) Kevin Willows All Rights Reserved +// Copyright(c) 2016-2017 Kevin Willows All Rights Reserved // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/util/src/main/java/cmu/xprize/util/TCONST.java b/util/src/main/java/cmu/xprize/util/TCONST.java index 1eae28dbd..17ac6859f 100644 --- a/util/src/main/java/cmu/xprize/util/TCONST.java +++ b/util/src/main/java/cmu/xprize/util/TCONST.java @@ -1,7 +1,6 @@ //********************************************************************************* // -// Copyright(c) 2016 Carnegie Mellon University. All Rights Reserved. -// Copyright(c) Kevin Willows All Rights Reserved +// Copyright(c) 2016-2017 Kevin Willows All Rights Reserved // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/util/src/main/java/cmu/xprize/util/View_Helper.java b/util/src/main/java/cmu/xprize/util/View_Helper.java index bdfa9f656..46dfb372f 100644 --- a/util/src/main/java/cmu/xprize/util/View_Helper.java +++ b/util/src/main/java/cmu/xprize/util/View_Helper.java @@ -1,5 +1,5 @@ /** - Copyright 2015 Kevin Willows + Copyright(c) 2015-2017 Kevin Willows Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at diff --git a/util/src/main/java/cmu/xprize/util/Word2NumFSM.java b/util/src/main/java/cmu/xprize/util/Word2NumFSM.java index 395bcedf7..087ee0bb8 100644 --- a/util/src/main/java/cmu/xprize/util/Word2NumFSM.java +++ b/util/src/main/java/cmu/xprize/util/Word2NumFSM.java @@ -1,7 +1,6 @@ //********************************************************************************* // -// Copyright(c) 2016 Carnegie Mellon University. All Rights Reserved. -// Copyright(c) Kevin Willows All Rights Reserved +// Copyright(c) 2016-2017 Kevin Willows All Rights Reserved // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License.