This is an automated email from the git hooks/post-receive script. apo pushed a commit to branch master in repository sweethome3d.
commit 60c6a3c6779b129345a35de50a3e8dbd7deeae3a Merge: 30efd6a 9a3ec4d Author: Markus Koschany <[email protected]> Date: Mon Nov 28 23:36:20 2016 +0100 Merge tag 'upstream/5.3+dfsg' Upstream version 5.3+dfsg # gpg: Signatur vom Mo 28 Nov 2016 23:36:19 CET # gpg: mittels RSA-Schlüssel ACF3D088EF32EDEF6A1A835FD9AD14B9513B51E4 # gpg: Korrekte Signatur von "Markus Koschany <[email protected]>" [ultimativ] # gpg: alias "Markus Koschany <[email protected]>" [ultimativ] # gpg: alias "Markus Koschany <[email protected]>" [ultimativ] .settings/org.eclipse.core.resources.prefs | 2 +- ChangeLog | 37 + README.TXT | 8 +- THIRDPARTY-LICENSE-JAVA3D.TXT | 4 +- build.xml | 309 ++-- deploy/SweetHome3D.jnlp | 2 +- install/linux/SweetHome3D | 2 +- install/linux/SweetHome3D-Java3D-1_5_2 | 11 + install/macosx/Sweet Home 3D/Contents/Info.plist | 7 +- install/portable/Info.plist | 7 +- install/portable/README.TXT | 2 +- install/portable/SweetHome3D-linux-x64 | 2 +- install/portable/SweetHome3D-linux-x86 | 2 +- install/portable/SweetHome3D-windows-x64.xml | 18 +- install/portable/SweetHome3D-windows-x86.xml | 18 +- install/viewer/README.TXT | 2 +- install/windows/installerInnoSetup.iss | 20 +- install/windows/installerLaunch4j-x64.xml | 18 +- install/windows/installerLaunch4j-x86.xml | 18 +- install/windows/signedInstallerInnoSetup.iss | 22 +- src/com/eteks/sweethome3d/HomeFramePane.java | 61 +- src/com/eteks/sweethome3d/SweetHome3D.java | 50 +- .../eteks/sweethome3d/SweetHome3DBootstrap.java | 163 +- .../sweethome3d/applet/HomeAppletController.java | 2 +- .../sweethome3d/applet/HomeAppletRecorder.java | 11 +- .../sweethome3d/applet/SweetHome3DApplet.java | 47 +- .../sweethome3d/applet/SweetHome3DViewer.java | 47 +- .../eteks/sweethome3d/applet/package.properties | 2 +- .../io/ContributedFurnitureCatalog.properties | 2 +- .../io/ContributedFurnitureCatalog_fr.properties | 2 +- .../io/DefaultFurnitureCatalog.properties | 10 +- .../io/DefaultFurnitureCatalog_fr.properties | 22 +- .../io/DefaultFurnitureCatalog_it.properties | 2 +- .../sweethome3d/io/DefaultHomeInputStream.java | 410 ++--- .../sweethome3d/io/DefaultHomeOutputStream.java | 220 ++- .../eteks/sweethome3d/io/HomeContentContext.java | 264 ++++ src/com/eteks/sweethome3d/io/HomeFileRecorder.java | 60 +- src/com/eteks/sweethome3d/io/HomeXMLExporter.java | 803 ++++++++++ src/com/eteks/sweethome3d/io/HomeXMLHandler.java | 1658 ++++++++++++++++++++ .../eteks/sweethome3d/io/ObjectXMLExporter.java | 69 + src/com/eteks/sweethome3d/io/XMLWriter.java | 231 +++ .../eteks/sweethome3d/j3d/Component3DManager.java | 52 +- src/com/eteks/sweethome3d/j3d/DAELoader.java | 3 +- src/com/eteks/sweethome3d/j3d/Ground3D.java | 18 +- .../sweethome3d/j3d/HomePieceOfFurniture3D.java | 32 +- src/com/eteks/sweethome3d/j3d/Label3D.java | 173 +- src/com/eteks/sweethome3d/j3d/ModelManager.java | 35 +- src/com/eteks/sweethome3d/j3d/OBJLoader.java | 29 +- src/com/eteks/sweethome3d/j3d/OBJWriter.java | 139 +- src/com/eteks/sweethome3d/j3d/Object3DBranch.java | 24 +- src/com/eteks/sweethome3d/j3d/PhotoRenderer.java | 43 +- src/com/eteks/sweethome3d/j3d/Room3D.java | 41 +- src/com/eteks/sweethome3d/j3d/TextureManager.java | 11 +- src/com/eteks/sweethome3d/j3d/Wall3D.java | 20 +- .../eteks/sweethome3d/model/BackgroundImage.java | 4 +- src/com/eteks/sweethome3d/model/Camera.java | 45 +- .../sweethome3d/model/CatalogDoorOrWindow.java | 53 +- src/com/eteks/sweethome3d/model/CatalogLight.java | 51 +- .../sweethome3d/model/CatalogPieceOfFurniture.java | 67 +- .../sweethome3d/model/CollectionChangeSupport.java | 8 + .../eteks/sweethome3d/model/CollectionEvent.java | 9 +- src/com/eteks/sweethome3d/model/Compass.java | 29 +- src/com/eteks/sweethome3d/model/DimensionLine.java | 29 +- src/com/eteks/sweethome3d/model/Home.java | 110 +- .../eteks/sweethome3d/model/HomeEnvironment.java | 8 +- .../sweethome3d/model/HomeFurnitureGroup.java | 52 +- src/com/eteks/sweethome3d/model/HomeMaterial.java | 21 + src/com/eteks/sweethome3d/model/HomeObject.java | 106 ++ .../sweethome3d/model/HomePieceOfFurniture.java | 20 +- src/com/eteks/sweethome3d/model/HomeTexture.java | 17 +- src/com/eteks/sweethome3d/model/Label.java | 57 +- src/com/eteks/sweethome3d/model/Level.java | 29 +- src/com/eteks/sweethome3d/model/Polyline.java | 16 +- src/com/eteks/sweethome3d/model/Room.java | 57 +- .../eteks/sweethome3d/model/UserPreferences.java | 8 +- src/com/eteks/sweethome3d/model/Wall.java | 68 +- src/com/eteks/sweethome3d/package.properties | 2 +- src/com/eteks/sweethome3d/plugin/PluginAction.java | 2 +- .../swing/BackgroundImageWizardStepsPanel.java | 49 +- .../sweethome3d/swing/FileContentManager.java | 30 +- .../swing/FurnitureCatalogListPanel.java | 151 +- .../sweethome3d/swing/FurnitureCatalogTree.java | 110 +- .../eteks/sweethome3d/swing/HomeComponent3D.java | 26 +- src/com/eteks/sweethome3d/swing/HomePane.java | 108 +- .../eteks/sweethome3d/swing/NullableCheckBox.java | 20 +- src/com/eteks/sweethome3d/swing/PlanComponent.java | 309 +++- .../eteks/sweethome3d/swing/ResourceAction.java | 1 - src/com/eteks/sweethome3d/swing/package.properties | 4 +- .../eteks/sweethome3d/swing/package_bg.properties | 1 + .../eteks/sweethome3d/swing/package_cs.properties | 1 + .../eteks/sweethome3d/swing/package_de.properties | 17 +- .../eteks/sweethome3d/swing/package_el.properties | 1 + .../eteks/sweethome3d/swing/package_es.properties | 1 + .../eteks/sweethome3d/swing/package_fr.properties | 35 +- .../eteks/sweethome3d/swing/package_hu.properties | 1 + .../eteks/sweethome3d/swing/package_it.properties | 3 +- .../eteks/sweethome3d/swing/package_ja.properties | 1 + .../eteks/sweethome3d/swing/package_nl.properties | 1 + .../eteks/sweethome3d/swing/package_pl.properties | 1 + .../eteks/sweethome3d/swing/package_pt.properties | 1 + .../eteks/sweethome3d/swing/package_ru.properties | 3 +- .../eteks/sweethome3d/swing/package_sv.properties | 1 + .../eteks/sweethome3d/swing/package_vi.properties | 1 + .../sweethome3d/swing/package_zh_CN.properties | 1 + .../sweethome3d/swing/package_zh_TW.properties | 1 + .../sweethome3d/tools/ExtensionsClassLoader.java | 2 +- .../BackgroundImageWizardController.java | 48 +- .../viewcontroller/FurnitureController.java | 9 +- .../sweethome3d/viewcontroller/HomeController.java | 33 +- .../viewcontroller/HomeController3D.java | 8 + .../sweethome3d/viewcontroller/PlanController.java | 254 ++- .../resources/help/de/savingHome.html | 2 +- .../resources/help/en/creatingPhotos.html | 2 +- .../resources/help/en/editingFurniture.html | 2 +- .../resources/help/en/savingHome.html | 4 +- .../resources/help/fr/savingHome.html | 4 +- .../eteks/sweethome3d/junit/HomeCameraTest.java | 24 +- .../sweethome3d/junit/HomeFileRecorderTest.java | 102 +- test/com/eteks/sweethome3d/junit/HomeTest.java | 25 +- .../sweethome3d/junit/PackageDependenciesTest.java | 56 +- .../junit/PlanComponentWithFurnitureTest.java | 16 +- test/com/eteks/sweethome3d/junit/RoomTest.java | 34 + .../eteks/sweethome3d/junit/resources/home1.sh3d | Bin 157778 -> 81314 bytes 123 files changed, 6117 insertions(+), 1522 deletions(-) -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/sweethome3d.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
