Character encoding fixes in build.xml file. #6
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…ctical point graphics. Changed color of point graphic svg files to white so that color multiplication will work correctly. git-svn-id: http://worldwind31.arc.nasa.gov/svn/trunk/@346 1c351a6f-456c-4935-88af-207f26c224cf
… color, and the fill remains yellow. git-svn-id: http://worldwind31.arc.nasa.gov/svn/trunk/@347 1c351a6f-456c-4935-88af-207f26c224cf
git-svn-id: http://worldwind31.arc.nasa.gov/svn/trunk/@348 1c351a6f-456c-4935-88af-207f26c224cf
git-svn-id: http://worldwind31.arc.nasa.gov/svn/trunk/@349 1c351a6f-456c-4935-88af-207f26c224cf
…d GPGPRI for a graphical artifact during png conversion. git-svn-id: http://worldwind31.arc.nasa.gov/svn/trunk/@350 1c351a6f-456c-4935-88af-207f26c224cf
git-svn-id: http://worldwind31.arc.nasa.gov/svn/trunk/@351 1c351a6f-456c-4935-88af-207f26c224cf
git-svn-id: http://worldwind31.arc.nasa.gov/svn/trunk/@352 1c351a6f-456c-4935-88af-207f26c224cf
…behave the same as tactical symbols when the opacity is changed. git-svn-id: http://worldwind31.arc.nasa.gov/svn/trunk/@353 1c351a6f-456c-4935-88af-207f26c224cf
…graphic. This eliminates the need to trim the rasterized images, and eliminates an alignment error that occurs when the outline and fill images are trimmed to different sizes. Modified resources build script to not trim CBRN graphics or fill graphics. The following graphics are affected by this change: - Nuclear Detonation Ground Zero (2.X.3.4.2) - Biological Release Event (2.X.3.4.7.1) - Chemical Release Event ( 2.X.3.4.7.2) git-svn-id: http://worldwind31.arc.nasa.gov/svn/trunk/@354 1c351a6f-456c-4935-88af-207f26c224cf
git-svn-id: http://worldwind31.arc.nasa.gov/svn/trunk/@355 1c351a6f-456c-4935-88af-207f26c224cf
git-svn-id: http://worldwind31.arc.nasa.gov/svn/trunk/@356 1c351a6f-456c-4935-88af-207f26c224cf
…flags control the display of the implicit location and hostile/enemy modifiers. git-svn-id: http://worldwind31.arc.nasa.gov/svn/trunk/@357 1c351a6f-456c-4935-88af-207f26c224cf
…nd each graphic. This eliminates the need to trim whitespace from the images after they have been rasterized. (And eliminates a dependence on ImageMagick for generating the rasterized images.) git-svn-id: http://worldwind31.arc.nasa.gov/svn/trunk/@358 1c351a6f-456c-4935-88af-207f26c224cf
git-svn-id: http://worldwind31.arc.nasa.gov/svn/trunk/@359 1c351a6f-456c-4935-88af-207f26c224cf
…direction of movement indicator and location field. git-svn-id: http://worldwind31.arc.nasa.gov/svn/trunk/@360 1c351a6f-456c-4935-88af-207f26c224cf
…ergency Management). git-svn-id: http://worldwind31.arc.nasa.gov/svn/trunk/@361 1c351a6f-456c-4935-88af-207f26c224cf
…by the graphic attributes changes. git-svn-id: http://worldwind31.arc.nasa.gov/svn/trunk/@362 1c351a6f-456c-4935-88af-207f26c224cf
…5 into a more general base class: AbstractTacticalGraphic. git-svn-id: http://worldwind31.arc.nasa.gov/svn/trunk/@363 1c351a6f-456c-4935-88af-207f26c224cf
git-svn-id: http://worldwind31.arc.nasa.gov/svn/trunk/@364 1c351a6f-456c-4935-88af-207f26c224cf
… to control the size of tactical point graphics. git-svn-id: http://worldwind31.arc.nasa.gov/svn/trunk/@365 1c351a6f-456c-4935-88af-207f26c224cf
…ue for interior or outline material, and indicates that the graphic should use the default color determined by the graphic identifier. git-svn-id: http://worldwind31.arc.nasa.gov/svn/trunk/@366 1c351a6f-456c-4935-88af-207f26c224cf
git-svn-id: http://worldwind31.arc.nasa.gov/svn/trunk/@367 1c351a6f-456c-4935-88af-207f26c224cf
…o the Server page at goworldwind.org. git-svn-id: http://worldwind31.arc.nasa.gov/svn/trunk/@368 1c351a6f-456c-4935-88af-207f26c224cf
…an and SectorRangeFan to allow an application to provide an SIDC for the symbol at the center of the range fan instead of the symbol itself. git-svn-id: http://worldwind31.arc.nasa.gov/svn/trunk/@369 1c351a6f-456c-4935-88af-207f26c224cf
- Battle Position (2.X.2.4.3.1) - Battle Position, Prepared But Not Occupied (2.X.2.4.3.1.1) git-svn-id: http://worldwind31.arc.nasa.gov/svn/trunk/@370 1c351a6f-456c-4935-88af-207f26c224cf
…cons. Reorganized the fills and frames into 'tacsym' folders to clarify their purpose. git-svn-id: http://worldwind31.arc.nasa.gov/svn/trunk/@371 1c351a6f-456c-4935-88af-207f26c224cf
…-2525 symbol icons ZIP archive for all symbols. Added the Apache Batik SVG rasterizer JAR files to the folder build/lib/batik. git-svn-id: http://worldwind31.arc.nasa.gov/svn/trunk/@372 1c351a6f-456c-4935-88af-207f26c224cf
…tion to worldwind.jnlp and worldwindx.jnlp. git-svn-id: http://worldwind31.arc.nasa.gov/svn/trunk/@373 1c351a6f-456c-4935-88af-207f26c224cf
…eld. git-svn-id: http://worldwind31.arc.nasa.gov/svn/trunk/@374 1c351a6f-456c-4935-88af-207f26c224cf
…orrect ordering problems with, at least, symbology. git-svn-id: http://worldwind31.arc.nasa.gov/svn/trunk/@375 1c351a6f-456c-4935-88af-207f26c224cf
…tions in readme. git-svn-id: http://worldwind31.arc.nasa.gov/svn/trunk/@568 1c351a6f-456c-4935-88af-207f26c224cf
git-svn-id: http://worldwind31.arc.nasa.gov/svn/trunk/@569 1c351a6f-456c-4935-88af-207f26c224cf
…sa.gov/milstd2525c/rev1/. git-svn-id: http://worldwind31.arc.nasa.gov/svn/trunk/@571 1c351a6f-456c-4935-88af-207f26c224cf
Was producing javac error "unmappable character for encoding UTF8"
- The source files contains characters in the ISO-8859-1 character set. If the environment is configured with a different default character set, then javadoc will produce warnings during its compilation phase. To fix it, this patch sets the correct character encoding in the javadocs build target.
Fixed the permissions for the image and source files. Images and sources should not have executable file permissions.
Changed file permissions of commons-deamon.jar file as well as libgdalalljni.jnilib file by removing executable flags.
Removed the jackson embedded source and changed the build.xml file to reference the external jackson jar during the compilation process.
- Removed as many main methods as possible in the tests. If the new junit-annotation are used, ant can pick up which test methods to run. In cases where tests are nested, the temporary fix is to use the @RunWith(Enclosed.class)-annotation at the top of the class to indicate that nested static classes should be scanned for test methods. Also, removed "extends from TestCase" clauses as this is not needed anymore. The side-effect of this is that a lot of static imports were added for assertEquals, assertFalse, etc. - Reformatted import statements to conform to java best practices (i.e. do not use star imports). Then, replaced org.junit.Test with Test, and added import statements where needed. Also, removed java.util. prefixes and added necessary imports. - Currently, three tests are being ignored. The first two: ShapeAttributesTest and IconLayerTest are failing. While MilStd2525IconRetrievalTest is taking too long to execute (it is downloading the interwebs). Some upcoming commits will hopefully address these issues.
- Renamed some of the tests to follow a consistent structure. - Sorted out the import statements of these tests (replaced star imports with corresponding imports for specific classes). - Also, since these tests are to be executed manually, all three of them should be ignored by junit. Thus, added the @ignore annotation at the top of the class declarations.
Removed unnecessary inner test classes by moving tests out into top-most class. This resulted in the removal of @RunWith(Enclosed.class) annotation for these tests.
The nested BalloonAttributeTests class was missing a call to setMaximumSize. This resulted in a NullPointerException inside the BasicBalloonAttributes.getRestorableState (on line 414). However, this is probably not a very good fix. It allows the unit test to pass, but some additional error handling needs to be added to the BasicBalloonAttributes class to prevent this from happening.
Removed the Assert.fail() calls as well as the try-catch blocks and replaced it with a much cleaner (and easier to understand) @test(expected=ExpectedException) clause. However, here and there a call to fail() remains that needs further investigation to see if it can be replaced.
Removed platform specific native libraries. This will be added as mavenized jar-dependencies at a later stage.
- Moved all source code to fall under the src/main/java directory. The test sources were moved to src/test/java. - The images and config resources were moved to the src/main/resources folder.
- Added new lib folder to contain all 3rd party libraries needed to compile WorldWind. - Moved webview folder from lib-external to be located in lib folder. - Removed gdal folder from lib-external. Added new set of gdal files to lib folder. This includes gdal.jar as well as platform specific native libraries (i.e. dll and so files). - Removed jogl and gluegen jars. Added jogl and gluegen sub-folders to lib directory containing jars as well as platform specific native library files. - Moved jackson dependency files from lib-external directory to lib directory. - Removed plugin.jar. Will be handled separately in an upcoming commit.
The MessageStrings properties resource bundle files were moved to a new package, namely config.i18n. The Logging utility class were changed to point to this new configuration location.
- Replaced star-imports with expanded import statements. Star-imports are not considered good practice. - Removed some Assert.fail statements as a result of the new @test(expected...) clauses. - Cleaned-up some of the main-methods in the various test-classes. Also replaced the TestCase.assertEqual methods with the more standard jorg.junit.Assert.assertEqual methods (added as static imports). - For the time-being we are ignoring the PointGraphicRetrievalTest because it is taking sooo long to execute. - Replaced some of the jorg.junt.Test annotation clauses with @test and adding the appropriate import.
- Added initial pom.xml file. Harvested some of the parts of this pom from this forum thread: http://forum.worldwindcentral.com/showthread.php?t=21381 Note: It will probably be best if this project is split into a couple of maven sub-modules. The reason for this is that it will allow the exclusion of the example classes from the final jar (almost like the worldindx jar is currently built in a different manner when compared to the standard worldwind jar).
- Removed the .idea folder. This is not needed with the maven build since all of Maven's settings is controled via the pom.xml file. - Added a .gitignore file to ignore the target directory that will contain the final artifacts.
Replaced the standard README.txt with a markdown-formatted README.md file. This file can now be parsed by github for a nice HTML-enriched README page.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
The build.xml file needs to specify the character encoding for both javac and javadoc or else compilation errors will be present. The first fix has already been provided with pull request #1. My additional patch fixes the javadoc issue.