[sweethome3d] 02/04: Merge tag 'upstream/4.4+dfsg'
Gabriele Giacone
gg0-guest at moszumanska.debian.org
Wed Jul 9 13:19:25 UTC 2014
This is an automated email from the git hooks/post-receive script.
gg0-guest pushed a commit to branch master
in repository sweethome3d.
commit 82bc02d81601962067c8c346cbe3ce527865098e
Merge: c0ce203 f826923
Author: Gabriele Giacone <1o5g4r8o at gmail.com>
Date: Wed Jul 9 14:24:56 2014 +0200
Merge tag 'upstream/4.4+dfsg'
Upstream version 4.4+dfsg
.classpath | 2 +-
ChangeLog | 85 +-
README.TXT | 8 +-
build.xml | 89 +-
deploy/SweetHome3D.jnlp | 31 +-
deploy/deleteHome.php | 31 +
install/linux/SweetHome3D | 2 +-
install/macosx/Sweet Home 3D/Contents/Info.plist | 8 +-
install/windows/SweetHome3D.ico | Bin 12830 -> 60594 bytes
install/windows/installerInnoSetup.iss | 10 +-
install/windows/installerLaunch4j.xml | 10 +-
install/windows/signedInstallerInnoSetup.iss | 14 +-
src/com/eteks/sweethome3d/HomeFramePane.java | 4 +
src/com/eteks/sweethome3d/SweetHome3D.java | 6 +-
.../eteks/sweethome3d/SweetHome3DBootstrap.java | 14 +-
.../sweethome3d/applet/AppletApplication.java | 92 +-
.../sweethome3d/applet/AppletContentManager.java | 127 +-
.../sweethome3d/applet/AppletUserPreferences.java | 1 -
.../sweethome3d/applet/HomeAppletController.java | 205 +++-
.../sweethome3d/applet/HomeAppletRecorder.java | 101 +-
.../sweethome3d/applet/SweetHome3DApplet.java | 20 +-
.../sweethome3d/applet/SweetHome3DViewer.java | 25 +-
src/com/eteks/sweethome3d/applet/ViewerHelper.java | 160 ++-
.../eteks/sweethome3d/applet/package.properties | 31 +-
.../eteks/sweethome3d/applet/package_bg.properties | 26 +
.../eteks/sweethome3d/applet/package_de.properties | 32 +-
.../eteks/sweethome3d/applet/package_el.properties | 30 +-
.../eteks/sweethome3d/applet/package_es.properties | 28 +-
.../eteks/sweethome3d/applet/package_fr.properties | 34 +-
.../eteks/sweethome3d/applet/package_hu.properties | 29 +-
.../eteks/sweethome3d/applet/package_it.properties | 31 +-
.../eteks/sweethome3d/applet/package_ja.properties | 30 +-
.../eteks/sweethome3d/applet/package_pl.properties | 31 +-
.../eteks/sweethome3d/applet/package_pt.properties | 31 +-
.../eteks/sweethome3d/applet/package_ru.properties | 31 +-
.../eteks/sweethome3d/applet/package_sv.properties | 29 +-
.../eteks/sweethome3d/applet/package_vi.properties | 29 +-
.../sweethome3d/applet/package_zh_CN.properties | 43 +-
.../applet/resources/document-import-sh3d.png | Bin 0 -> 561 bytes
src/com/eteks/sweethome3d/io/Base64.java | 1216 ++++++++++++++++++++
.../eteks/sweethome3d/io/ContentDigestManager.java | 336 ++++++
.../io/ContributedFurnitureCatalog.properties | 15 +
.../sweethome3d/io/DamagedHomeIOException.java | 61 +
.../sweethome3d/io/DefaultFurnitureCatalog.java | 66 +-
.../io/DefaultFurnitureCatalog.properties | 59 +-
.../io/DefaultFurnitureCatalog_fr.properties | 6 +-
.../sweethome3d/io/DefaultHomeInputStream.java | 466 +++++++-
.../sweethome3d/io/DefaultHomeOutputStream.java | 95 +-
.../sweethome3d/io/DefaultTexturesCatalog.java | 25 +-
.../io/DefaultTexturesCatalog.properties | 26 +
.../io/DefaultTexturesCatalog_bg.properties | 2 +-
.../io/DefaultTexturesCatalog_it.properties | 2 +-
.../sweethome3d/io/DefaultUserPreferences.java | 2 -
.../eteks/sweethome3d/io/FileUserPreferences.java | 5 +-
src/com/eteks/sweethome3d/io/HomeFileRecorder.java | 67 +-
.../eteks/sweethome3d/io/resources/spotlight.obj | 6 +
.../eteks/sweethome3d/j3d/Component3DManager.java | 37 +-
src/com/eteks/sweethome3d/j3d/DAELoader.java | 2 +-
src/com/eteks/sweethome3d/j3d/Ground3D.java | 43 +-
.../sweethome3d/j3d/HomePieceOfFurniture3D.java | 168 +--
src/com/eteks/sweethome3d/j3d/ModelManager.java | 67 +-
src/com/eteks/sweethome3d/j3d/PhotoRenderer.java | 20 +-
src/com/eteks/sweethome3d/j3d/Room3D.java | 28 +-
src/com/eteks/sweethome3d/j3d/TextureManager.java | 280 +++--
src/com/eteks/sweethome3d/j3d/Wall3D.java | 38 +-
.../sweethome3d/model/CatalogDoorOrWindow.java | 51 +-
...ptedRecorderException.java => CatalogItem.java} | 28 +-
src/com/eteks/sweethome3d/model/CatalogLight.java | 48 +
.../sweethome3d/model/CatalogPieceOfFurniture.java | 70 +-
.../eteks/sweethome3d/model/CatalogTexture.java | 119 +-
.../model/DamagedHomeRecorderException.java | 70 ++
.../eteks/sweethome3d/model/FurnitureCatalog.java | 34 +-
.../eteks/sweethome3d/model/FurnitureCategory.java | 21 +-
src/com/eteks/sweethome3d/model/Home.java | 47 +-
.../sweethome3d/model/HomeFurnitureGroup.java | 17 +
.../sweethome3d/model/HomePieceOfFurniture.java | 14 +-
src/com/eteks/sweethome3d/model/HomeTexture.java | 46 +-
.../model/InterruptedRecorderException.java | 2 +-
src/com/eteks/sweethome3d/model/LengthUnit.java | 98 +-
.../eteks/sweethome3d/model/LengthUnit.properties | 3 +-
...n.java => NotEnoughSpaceRecorderException.java} | 25 +-
.../eteks/sweethome3d/model/PieceOfFurniture.java | 8 +
.../eteks/sweethome3d/model/TexturesCatalog.java | 34 +-
.../eteks/sweethome3d/model/TexturesCategory.java | 21 +-
.../eteks/sweethome3d/model/UserPreferences.java | 29 +-
src/com/eteks/sweethome3d/package.properties | 3 +-
src/com/eteks/sweethome3d/package_bg.properties | 3 +-
src/com/eteks/sweethome3d/package_cs.properties | 1 +
src/com/eteks/sweethome3d/package_de.properties | 2 +-
src/com/eteks/sweethome3d/package_el.properties | 5 +-
src/com/eteks/sweethome3d/package_es.properties | 3 +-
src/com/eteks/sweethome3d/package_fr.properties | 1 +
src/com/eteks/sweethome3d/package_hu.properties | 1 +
src/com/eteks/sweethome3d/package_it.properties | 1 +
src/com/eteks/sweethome3d/package_ja.properties | 5 +-
src/com/eteks/sweethome3d/package_pl.properties | 3 +-
src/com/eteks/sweethome3d/package_pt.properties | 5 +-
src/com/eteks/sweethome3d/package_ru.properties | 5 +-
src/com/eteks/sweethome3d/package_sv.properties | 1 +
src/com/eteks/sweethome3d/package_vi.properties | 4 +-
src/com/eteks/sweethome3d/package_zh_CN.properties | 5 +-
.../eteks/sweethome3d/swing/AutoCommitSpinner.java | 120 +-
.../sweethome3d/swing/CatalogItemToolTip.java | 223 ++++
src/com/eteks/sweethome3d/swing/CompassPanel.java | 26 +-
.../sweethome3d/swing/FileContentManager.java | 16 +-
.../swing/FurnitureCatalogListPanel.java | 81 +-
.../sweethome3d/swing/FurnitureCatalogTree.java | 42 +-
.../eteks/sweethome3d/swing/FurnitureTable.java | 19 +-
.../eteks/sweethome3d/swing/FurnitureToolTip.java | 178 ---
src/com/eteks/sweethome3d/swing/HelpPane.java | 11 +-
.../eteks/sweethome3d/swing/HomeComponent3D.java | 78 +-
.../sweethome3d/swing/HomeFurniturePanel.java | 12 +-
src/com/eteks/sweethome3d/swing/HomePane.java | 84 +-
.../swing/ImportedFurnitureWizardStepsPanel.java | 37 +-
.../sweethome3d/swing/ModelMaterialsComponent.java | 85 +-
.../sweethome3d/swing/ModelPreviewComponent.java | 44 +-
.../sweethome3d/swing/MultipleLevelsPlanPanel.java | 73 +-
.../eteks/sweethome3d/swing/NullableSpinner.java | 75 +-
.../sweethome3d/swing/ObserverCameraPanel.java | 6 +-
src/com/eteks/sweethome3d/swing/PhotoPanel.java | 1 +
src/com/eteks/sweethome3d/swing/PlanComponent.java | 158 ++-
src/com/eteks/sweethome3d/swing/SwingTools.java | 69 +-
.../sweethome3d/swing/TextureChoiceComponent.java | 643 +++++++++--
.../sweethome3d/swing/UserPreferencesPanel.java | 94 +-
src/com/eteks/sweethome3d/swing/VideoPanel.java | 13 +-
src/com/eteks/sweethome3d/swing/package.properties | 39 +-
.../eteks/sweethome3d/swing/package_bg.properties | 34 +-
.../eteks/sweethome3d/swing/package_cs.properties | 16 +-
.../eteks/sweethome3d/swing/package_de.properties | 33 +-
.../eteks/sweethome3d/swing/package_el.properties | 30 +-
.../eteks/sweethome3d/swing/package_es.properties | 37 +-
.../eteks/sweethome3d/swing/package_fr.properties | 28 +-
.../eteks/sweethome3d/swing/package_hu.properties | 36 +-
.../eteks/sweethome3d/swing/package_it.properties | 32 +-
.../eteks/sweethome3d/swing/package_ja.properties | 30 +-
.../eteks/sweethome3d/swing/package_pl.properties | 39 +-
.../eteks/sweethome3d/swing/package_pt.properties | 42 +-
.../eteks/sweethome3d/swing/package_ru.properties | 45 +-
.../eteks/sweethome3d/swing/package_sv.properties | 36 +-
.../eteks/sweethome3d/swing/package_vi.properties | 31 +-
.../sweethome3d/swing/package_zh_CN.properties | 109 +-
.../eteks/sweethome3d/tools/OperatingSystem.java | 17 +-
.../viewcontroller/FurnitureController.java | 158 ++-
.../viewcontroller/Home3DAttributesController.java | 1 +
.../sweethome3d/viewcontroller/HomeController.java | 299 ++++-
.../viewcontroller/HomeController3D.java | 18 +
.../viewcontroller/HomeFurnitureController.java | 46 +-
.../eteks/sweethome3d/viewcontroller/HomeView.java | 16 +-
.../ImportedFurnitureWizardController.java | 25 +-
.../viewcontroller/LabelController.java | 14 +-
.../sweethome3d/viewcontroller/PlanController.java | 333 ++++--
.../viewcontroller/TextureChoiceController.java | 50 +-
.../sweethome3d/viewcontroller/package.properties | 9 +-
.../viewcontroller/package_bg.properties | 9 +-
.../viewcontroller/package_cs.properties | 1 +
.../viewcontroller/package_de.properties | 7 +-
.../viewcontroller/package_el.properties | 6 +-
.../viewcontroller/package_es.properties | 19 +-
.../viewcontroller/package_fr.properties | 7 +-
.../viewcontroller/package_hu.properties | 7 +-
.../viewcontroller/package_it.properties | 9 +-
.../viewcontroller/package_ja.properties | 8 +-
.../viewcontroller/package_pl.properties | 11 +-
.../viewcontroller/package_pt.properties | 11 +-
.../viewcontroller/package_ru.properties | 17 +-
.../viewcontroller/package_sv.properties | 7 +-
.../viewcontroller/package_vi.properties | 6 +-
.../viewcontroller/package_zh_CN.properties | 18 +-
.../resources/help/bg/addingLevels.html | 12 +
.../resources/help/bg/editing3DView.html | 7 +-
.../resources/help/bg/editingFurniture.html | 21 +-
.../resources/help/bg/editingPreferences.html | 6 +-
.../resources/help/bg/importingFurniture.html | 2 +-
.../viewcontroller/resources/help/bg/tips.html | 19 +-
.../resources/help/cs/importingFurniture.html | 2 +-
.../resources/help/de/addingLevels.html | 7 +
.../resources/help/de/editing3DView.html | 4 +-
.../resources/help/de/editingFurniture.html | 33 +-
.../resources/help/de/editingPreferences.html | 4 +-
.../resources/help/de/importingFurniture.html | 2 +-
.../viewcontroller/resources/help/de/tips.html | 15 +-
.../resources/help/el/importingFurniture.html | 2 +-
.../resources/help/en/addingLevels.html | 7 +-
.../resources/help/en/editing3DView.html | 4 +-
.../resources/help/en/editingFurniture.html | 48 +-
.../resources/help/en/editingPreferences.html | 6 +-
.../resources/help/en/importingFurniture.html | 4 +-
.../resources/help/en/savingHome.html | 2 -
.../viewcontroller/resources/help/en/tips.html | 9 +-
.../resources/help/es/editing3DView.html | 4 +-
.../resources/help/es/editingFurniture.html | 56 +-
.../resources/help/es/importingFurniture.html | 2 +-
.../viewcontroller/resources/help/es/tips.html | 15 +-
.../resources/help/fr/addingLevels.html | 12 +-
.../resources/help/fr/editing3DView.html | 5 +-
.../resources/help/fr/editingFurniture.html | 10 +-
.../resources/help/fr/editingPreferences.html | 6 +-
.../resources/help/fr/importingFurniture.html | 2 +-
.../viewcontroller/resources/help/fr/tips.html | 10 +-
.../resources/help/hu/addingLevels.html | 13 +
.../resources/help/hu/editing3DView.html | 3 +-
.../resources/help/hu/editingFurniture.html | 39 +-
.../resources/help/hu/editingPreferences.html | 2 +-
.../resources/help/hu/importingFurniture.html | 2 +-
.../viewcontroller/resources/help/hu/tips.html | 622 +++++-----
.../resources/help/it/importingFurniture.html | 2 +-
.../resources/help/ja/importingFurniture.html | 2 +-
.../resources/help/pl/importingFurniture.html | 2 +-
.../resources/help/pt/editing3DView.html | 6 +-
.../resources/help/pt/importingFurniture.html | 2 +-
.../resources/help/ru/editing3DView.html | 2 +-
.../resources/help/ru/importingFurniture.html | 2 +-
.../resources/help/sv/addingLevels.html | 15 +-
.../resources/help/sv/editing3DView.html | 2 +-
.../resources/help/sv/editingFurniture.html | 15 +-
.../resources/help/sv/editingPreferences.html | 2 +-
.../resources/help/sv/importingFurniture.html | 2 +-
.../viewcontroller/resources/help/sv/tips.html | 641 ++++++-----
.../resources/help/zh_CN/importingFurniture.html | 2 +-
.../resources/importedFurnitureWizard.png | Bin 12362 -> 12248 bytes
.../viewcontroller/resources/repairedIcon.png | Bin 0 -> 303 bytes
.../viewcontroller/resources/repairedImage.png | Bin 0 -> 126 bytes
.../viewcontroller/resources/repairedModel.obj | 23 +
.../eteks/sweethome3d/junit/HomeCameraTest.java | 8 +-
.../sweethome3d/junit/HomeControllerTest.java | 91 ++
.../sweethome3d/junit/HomeFileRecorderTest.java | 27 +
.../sweethome3d/junit/HomeFurniturePanelTest.java | 19 +-
test/com/eteks/sweethome3d/junit/LevelTest.java | 32 +-
.../com/eteks/sweethome3d/junit/OBJWriterTest.java | 2 +-
.../junit/UserPreferencesPanelTest.java | 15 +-
.../sweethome3d/junit/resources/damagedHome.sh3d | Bin 0 -> 20480 bytes
.../resources/damagedHomeWithContentDigests.sh3d | Bin 0 -> 20480 bytes
232 files changed, 9038 insertions(+), 2310 deletions(-)
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/sweethome3d.git
More information about the pkg-java-commits
mailing list