Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: oracc/nammu
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: v0.0.3
Choose a base ref
...
head repository: oracc/nammu
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: development
Choose a head ref
Loading
Showing with 11,424 additions and 810 deletions.
  1. +16 −0 .github/ISSUE_TEMPLATE.md
  2. +3 −0 .gitignore
  3. +74 −0 .travis.yml
  4. +674 −0 LICENSE.txt
  5. +272 −4 README.md
  6. BIN doc/diagrams/soap/soap1.png
  7. BIN doc/diagrams/soap/soap2.png
  8. BIN doc/diagrams/soap/soap3.png
  9. BIN doc/diagrams/soap/soap4.png
  10. BIN doc/diagrams/soap/soap5.png
  11. BIN doc/diagrams/soap/soap6.png
  12. BIN doc/mockups/nammu_0.1.png
  13. BIN doc/mockups/nammu_0.5.png
  14. BIN doc/mockups/nammu_0.6.png
  15. BIN doc/mockups/nammu_1.2.2.png
  16. BIN doc/mockups/nammu_1.2.png
  17. BIN doc/mockups/nammu_arabic.png
  18. BIN doc/mockups/settings/pages/general.png
  19. BIN doc/mockups/settings/pages/keystrokes.png
  20. BIN doc/mockups/settings/pages/languages.png
  21. BIN doc/mockups/settings/pages/projects.png
  22. +785 −0 doc/mockups/settings/settings_wireframes.ep
  23. +46 −0 doc/setup/README.md
  24. +54 −0 doc/setup/Vagrantfile
  25. +25 −0 doc/setup/provision.sh
  26. +80 −11 pom.xml
  27. 0 python/__init__.py
  28. +151 −35 python/nammu/SOAPClient/HTTPRequest.py
  29. +135 −31 python/nammu/SOAPClient/SOAPClient.py
  30. +425 −11 python/nammu/controller/AtfAreaController.py
  31. +44 −10 python/nammu/controller/ConsoleController.py
  32. +76 −0 python/nammu/controller/EditSettingsController.py
  33. +228 −0 python/nammu/controller/FindController.py
  34. +42 −34 python/nammu/controller/MenuController.py
  35. +79 −40 python/nammu/controller/ModelController.py
  36. +874 −236 python/nammu/controller/NammuController.py
  37. +42 −0 python/nammu/controller/NewAtfController.py
  38. +29 −36 python/nammu/controller/ToolbarController.py
  39. +36 −0 python/nammu/controller/WelcomeController.py
  40. +20 −12 python/nammu/main.py
  41. +636 −0 python/nammu/test/test_nammu.py
  42. +126 −18 python/nammu/test/test_soap.py
  43. +69 −0 python/nammu/test/test_yaml_update.py
  44. +44 −0 python/nammu/utils/NammuConsoleHandler.py
  45. +395 −0 python/nammu/utils/__init__.py
  46. +463 −128 python/nammu/view/AtfAreaView.py
  47. +119 −0 python/nammu/view/AtfEditArea.py
  48. +119 −32 python/nammu/view/ConsoleView.py
  49. +508 −0 python/nammu/view/EditSettingsView.py
  50. +258 −0 python/nammu/view/FindView.py
  51. +34 −9 python/nammu/view/Menu.py
  52. +84 −31 python/nammu/view/MenuView.py
  53. +97 −74 python/nammu/view/ModelView.py
  54. +103 −25 python/nammu/view/NammuView.py
  55. +500 −0 python/nammu/view/NewAtfView.py
  56. +287 −0 python/nammu/view/SyntaxHighlighter.py
  57. +37 −30 python/nammu/view/ToolbarView.py
  58. +143 −0 python/nammu/view/WelcomeView.py
  59. +9 −0 requirements.txt
  60. +80 −0 resources/config/logging.yaml
  61. +132 −0 resources/config/settings.yaml
  62. +54 −0 resources/fonts/dejavu/AUTHORS
  63. +3 −0 resources/fonts/dejavu/BUGS
  64. +99 −0 resources/fonts/dejavu/LICENSE
  65. +1,373 −0 resources/fonts/dejavu/NEWS
  66. +59 −0 resources/fonts/dejavu/README
  67. +249 −0 resources/fonts/dejavu/langcover-sans.txt
  68. BIN resources/fonts/dejavu/ttf/DejaVuSans.ttf
  69. +226 −0 resources/fonts/dejavu/unicover-sans.txt
  70. BIN resources/images/closefile.png
  71. BIN resources/images/copy.png
  72. BIN resources/images/cut.png
  73. BIN resources/images/displaymodelview.png
  74. BIN resources/images/editsettings.png
  75. BIN resources/images/lemmatise.png
  76. BIN resources/images/newfile.png
  77. BIN resources/images/openfile.png
  78. BIN resources/images/oracc.gif
  79. BIN resources/images/paste.png
  80. BIN resources/images/printfile.png
  81. BIN resources/images/quit.png
  82. BIN resources/images/redo.png
  83. BIN resources/images/saveasfile.png
  84. BIN resources/images/savefile.png
  85. BIN resources/images/showabout.png
  86. BIN resources/images/showhelp.png
  87. BIN resources/images/smallhelp.png
  88. BIN resources/images/undo.png
  89. BIN resources/images/unicode.png
  90. BIN resources/images/validate.png
  91. +15 −0 resources/test/arabic.atf
  92. +14 −0 resources/test/arabic_no_lem.atf
  93. +21 −0 resources/test/english.atf
  94. +21 −0 resources/test/english_broken.atf
  95. +21 −0 resources/test/english_no_lem.atf
  96. +81 −0 resources/test/jar_settings.yaml
  97. +56 −0 resources/test/jcs_48_089_arabic.atf
  98. BIN resources/test/request.zip
  99. +23 −0 resources/test/user_settings.yaml
  100. +10 −0 src/main/java/uk/ac/ucl/rc/development/oracc/ext/LICENSE.txt
  101. +28 −0 src/main/java/uk/ac/ucl/rc/development/oracc/ext/MyFactory.java
  102. +38 −0 src/main/java/uk/ac/ucl/rc/development/oracc/ext/MyLabelView.java
  103. +31 −0 src/main/java/uk/ac/ucl/rc/development/oracc/ext/MyParagraphView.java
  104. +17 −0 src/main/java/uk/ac/ucl/rc/development/oracc/ext/MyStyledEditorKit.java
  105. +488 −0 src/main/java/uk/ac/ucl/rc/development/oracc/ext/TextLineNumber.java
  106. +22 −1 src/main/java/uk/ac/ucl/rc/development/oracc/nammu/{App.java → Nammu.java}
  107. +22 −2 src/test/java/uk/ac/ucl/rc/development/oracc/nammu/{AppTest.java → NammuTest.java}
16 changes: 16 additions & 0 deletions .github/ISSUE_TEMPLATE.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
To help us understand and resolve your issue please check that you have provided
as much of the information below as possible:

* Nammu's version, which you can find in the filename (e.g 0.3.1 for
nammu-0.3.1.jar)
* Java version, which you can find opening a terminal and typing `java -version`.
* Computer Platform: Windows, OSX, Linux, ...
* Please state clearly the steps we should follow to reproduce your problem. We
can help you better if we can reproduce the problem.
* If you are experiencing a problem which involves dialing with a specific file,
you won't be able to attach it to a GitHub issue. You can paste the contents
and filename if possible, or otherwise you can email it to us at
`rc-softdev at ucl.ac.uk`.
* Please, do attach a screenshot if it is helpful to showcase your problem. You
can see how to do that
[here](https://help.github.com/articles/file-attachments-on-issues-and-pull-requests/).
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -14,3 +14,6 @@ parsetab.py
.tags
**/.cache
**/effective-pom*.xml
*.atf
resources/lib
.vagrant/
74 changes: 74 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,74 @@
dist: trusty

matrix:
include:
- python: 2.7
env: PYTEST=1
- jdk: oraclejdk8
env: MVN=1
# - jdk: oraclejdk9
# env: MVN=1
# - jdk: oraclejdk10
# env: MVN=1
- jdk: oraclejdk8
env: PEP8=1

before_install:
- |
if ! [ -z "$PYTEST" ]; then
export JYTHON_URL='http://search.maven.org/remotecontent?filepath=org/python/jython-installer/2.7.0/jython-installer-2.7.0.jar'
wget $JYTHON_URL -O jython_installer.jar; java -jar jython_installer.jar -s -d $HOME/jython; export PATH=$HOME/jython/bin:$PATH
export JYTHONPATH=$HOME/build/$TRAVIS_REPO_SLUG/resources/lib:$JYTHONPATH
mkdir $HOME/.nammu
cp $HOME/build/$TRAVIS_REPO_SLUG/resources/config/*.yaml $HOME/.nammu
fi
install:
- |
if ! [ -z "$PYTEST" ]; then
# Install MarkupSafe separately to make sure the version we want is
# picked up
pip install --user MarkupSafe==1.1.1
pip install --user -r requirements.txt
mkdir $HOME/build/$TRAVIS_REPO_SLUG/resources/lib
javac -d $HOME/build/$TRAVIS_REPO_SLUG/resources/lib $HOME/build/$TRAVIS_REPO_SLUG/src/main/java/uk/ac/ucl/rc/development/oracc/ext/*.java
fi
- |
if ! [ -z "$PEP8" ]; then
pip install --user pep8
fi
before_script:
- |
if ! [ -z "$PYTEST" ]; then
export DISPLAY=:99.0
sh -e /etc/init.d/xvfb start
sleep 3
fi
script:
- |
if ! [ -z "$PYTEST" ]; then
py.test python/nammu/test/
fi
- |
if ! [ -z "$PEP8" ]; then
python -m pep8 python/
fi
- |
if ! [ -z "$MVN" ]; then
mvn clean install -DskipTests
fi
deploy:
provider: releases
api_key:
# Note; this api_key is only valid for oracc/nammu; you need
# to make your own: https://docs.travis-ci.com/user/deployment/releases/
secure: SuiZtkTBUab5dGWE6hcJpzN2y7ZXWLf05YBDSPjxGd3CX6phcbM9HxMRj92PdDPIWCE7QXPWC9+gEl1bxJnObWZzgE59Vdz2gZJY4IsuSQ6fCf3jqbeOZ+KA2VPRS+6/9lgseJySMExARoFcpUKzrU+S5H0m1/JznxjwI1ItAjw=
file_glob: true
file: $HOME/.m2/repository/uk/ac/ucl/rc/development/oracc/nammu/**/nammu*.jar
skip_cleanup: true
on:
repo: oracc/nammu
tags: true
Loading