Merge branch 'master' into feat/move_canvas_to_printabledata-22
Conflicts: src/main/java/de/tudresden/inf/mci/brailleplot/rendering/MasterRenderer.java
No related branches found
No related tags found
Showing
- .gitignore 1 addition, 0 deletions.gitignore
- build.gradle 11 additions, 4 deletionsbuild.gradle
- integrationTest.gradle 17 additions, 0 deletionsintegrationTest.gradle
- src/integrationTest/java/PrintableDataExporterIntegTest.java 206 additions, 0 deletionssrc/integrationTest/java/PrintableDataExporterIntegTest.java
- src/integrationTest/resources/config/correct.properties 69 additions, 0 deletionssrc/integrationTest/resources/config/correct.properties
- src/integrationTest/resources/config/default.properties 55 additions, 0 deletionssrc/integrationTest/resources/config/default.properties
- src/integrationTest/resources/config/false.properties 69 additions, 0 deletionssrc/integrationTest/resources/config/false.properties
- src/integrationTest/resources/config/false2.properties 69 additions, 0 deletionssrc/integrationTest/resources/config/false2.properties
- src/integrationTest/resources/mapping/eurobraille.properties 146 additions, 0 deletionssrc/integrationTest/resources/mapping/eurobraille.properties
- src/main/java/de/tudresden/inf/mci/brailleplot/App.java 66 additions, 3 deletionssrc/main/java/de/tudresden/inf/mci/brailleplot/App.java
- src/main/java/de/tudresden/inf/mci/brailleplot/brailleparser/AbstractBrailleTableParser.java 15 additions, 0 deletions...brailleplot/brailleparser/AbstractBrailleTableParser.java
- src/main/java/de/tudresden/inf/mci/brailleplot/brailleparser/JsonParser.java 28 additions, 0 deletions...dresden/inf/mci/brailleplot/brailleparser/JsonParser.java
- src/main/java/de/tudresden/inf/mci/brailleplot/brailleparser/PropertiesParser.java 45 additions, 0 deletions...n/inf/mci/brailleplot/brailleparser/PropertiesParser.java
- src/main/java/de/tudresden/inf/mci/brailleplot/brailleparser/XmlParser.java 31 additions, 0 deletions...udresden/inf/mci/brailleplot/brailleparser/XmlParser.java
- src/main/java/de/tudresden/inf/mci/brailleplot/brailleparser/package-info.java 4 additions, 0 deletions...esden/inf/mci/brailleplot/brailleparser/package-info.java
- src/main/java/de/tudresden/inf/mci/brailleplot/configparser/JavaPropertiesConfigurationValidator.java 30 additions, 2 deletions...ot/configparser/JavaPropertiesConfigurationValidator.java
- src/main/java/de/tudresden/inf/mci/brailleplot/csvparser/Constants.java 17 additions, 0 deletions...de/tudresden/inf/mci/brailleplot/csvparser/Constants.java
- src/main/java/de/tudresden/inf/mci/brailleplot/csvparser/CsvDotParser.java 154 additions, 0 deletions...tudresden/inf/mci/brailleplot/csvparser/CsvDotParser.java
- src/main/java/de/tudresden/inf/mci/brailleplot/csvparser/CsvOrientation.java 45 additions, 0 deletions...dresden/inf/mci/brailleplot/csvparser/CsvOrientation.java
- src/main/java/de/tudresden/inf/mci/brailleplot/csvparser/CsvParseAlgorithm.java 73 additions, 0 deletions...sden/inf/mci/brailleplot/csvparser/CsvParseAlgorithm.java
Loading
Please register or sign in to comment