[SCM] sweethome3d - Interior 2D design application with 3D preview branch, master, updated. debian/3.4+dfsg-1-7-g393592e

[Gabriele Giacone]

The following commit has been merged in the master branch:
commit ad8b26857fed791170822d9ee7946a19104e77f1
Author: Gabriele Giacone <1o5g4r8o at gmail.com>
Date:   Sat Jun 16 11:23:51 2012 +0000

    Refresh patches.

diff --git a/debian/patches/00build.xml b/debian/patches/00build.xml
index f836302..1ce2f28 100644
--- a/debian/patches/00build.xml
+++ b/debian/patches/00build.xml
@@ -5,7 +5,7 @@ Author: Gabriele Giacone <1o5g4r8o at gmail.com>
 --- a/build.xml
 +++ b/build.xml
 @@ -43,12 +43,14 @@
-            encoding="ISO-8859-1" target="1.5">
+            encoding="ISO-8859-1" target="1.5" source="1.5">
        <!-- Use lib as an extension directory to override default Java 3D libraries -->
        <extdirs>
 -        <pathelement location="lib"/>
diff --git a/debian/patches/01noMacOSX b/debian/patches/01noMacOSX
index 8c91070..a94fbf8 100644
--- a/debian/patches/01noMacOSX
+++ b/debian/patches/01noMacOSX
@@ -4,7 +4,7 @@ Author: Gabriele Giacone <1o5g4r8o at gmail.com>
 
 --- a/src/com/eteks/sweethome3d/tools/OperatingSystem.java
 +++ b/src/com/eteks/sweethome3d/tools/OperatingSystem.java
-@@ -28,7 +28,7 @@
+@@ -29,7 +29,7 @@
  import java.util.TimerTask;
  import java.util.UUID;
  
@@ -13,7 +13,7 @@ Author: Gabriele Giacone <1o5g4r8o at gmail.com>
  import com.eteks.sweethome3d.model.Home;
  
  /**
-@@ -210,9 +210,10 @@
+@@ -216,9 +216,10 @@
     */
    public static File getDefaultApplicationFolder() throws IOException {
      File userApplicationFolder; 
@@ -26,7 +26,7 @@ Author: Gabriele Giacone <1o5g4r8o at gmail.com>
        userApplicationFolder = new File(System.getProperty("user.home"), "Application Data");
        // If user Application Data directory doesn't exist, use user home
        if (!userApplicationFolder.exists()) {
-@@ -233,10 +234,10 @@
+@@ -239,10 +240,10 @@
     * This class requires some classes of <code>com.apple.eio</code> package  
     * to compile.
     */
@@ -41,7 +41,7 @@ Author: Gabriele Giacone <1o5g4r8o at gmail.com>
  }
 --- a/src/com/eteks/sweethome3d/SweetHome3D.java
 +++ b/src/com/eteks/sweethome3d/SweetHome3D.java
-@@ -394,7 +394,6 @@
+@@ -395,7 +395,6 @@
      }
      if (OperatingSystem.isMacOSX()) {
        // Bind to application menu at last
diff --git a/debian/patches/02noadditionalprovisions b/debian/patches/02noadditionalprovisions
index bdfc46d..b3a2146 100644
--- a/debian/patches/02noadditionalprovisions
+++ b/debian/patches/02noadditionalprovisions
@@ -6,7 +6,7 @@ Author: Gabriele Giacone <1o5g4r8o at gmail.com>
 
 --- a/build.xml
 +++ b/build.xml
-@@ -88,6 +88,7 @@
+@@ -89,6 +89,7 @@
      <zip destfile="build/Furniture.jar" basedir="src">
        <include name="com/eteks/sweethome3d/io/*FurnitureCatalog*.properties"/>
        <include name="com/eteks/sweethome3d/io/resources/**"/>
diff --git a/debian/patches/03novideo b/debian/patches/03novideo
index 4607f0d..e866b2d 100644
--- a/debian/patches/03novideo
+++ b/debian/patches/03novideo
@@ -3,7 +3,7 @@ Author: Gabriele Giacone <1o5g4r8o at gmail.com>
 
 --- a/src/com/eteks/sweethome3d/viewcontroller/ViewFactory.java
 +++ b/src/com/eteks/sweethome3d/viewcontroller/ViewFactory.java
-@@ -172,8 +172,8 @@
+@@ -184,8 +184,8 @@
    /**
     * Returns a new view able to compute a 3D video of a home. 
     */
@@ -27,7 +27,7 @@ Author: Gabriele Giacone <1o5g4r8o at gmail.com>
    }
 --- a/src/com/eteks/sweethome3d/swing/SwingViewFactory.java
 +++ b/src/com/eteks/sweethome3d/swing/SwingViewFactory.java
-@@ -52,7 +52,6 @@
+@@ -56,7 +56,6 @@
  import com.eteks.sweethome3d.viewcontroller.ThreadedTaskController;
  import com.eteks.sweethome3d.viewcontroller.ThreadedTaskView;
  import com.eteks.sweethome3d.viewcontroller.UserPreferencesController;
@@ -35,7 +35,7 @@ Author: Gabriele Giacone <1o5g4r8o at gmail.com>
  import com.eteks.sweethome3d.viewcontroller.View;
  import com.eteks.sweethome3d.viewcontroller.ViewFactory;
  import com.eteks.sweethome3d.viewcontroller.WallController;
-@@ -257,11 +256,11 @@
+@@ -280,11 +279,11 @@
    /**
     * Returns a new view able to create 3D videos of the given home. 
     */
@@ -51,7 +51,7 @@ Author: Gabriele Giacone <1o5g4r8o at gmail.com>
     * Returns a new view that displays Sweet Home 3D help.
 --- a/build.xml
 +++ b/build.xml
-@@ -50,6 +50,8 @@
+@@ -51,6 +51,8 @@
          <pathelement location="libtest/jnlp.jar"/>
        </classpath>
  	<exclude name="com/eteks/sweethome3d/MacOSXConfiguration.java"/>
@@ -62,16 +62,16 @@ Author: Gabriele Giacone <1o5g4r8o at gmail.com>
      <!-- Copy resources excepted furniture, textures and help files -->
 --- a/src/com/eteks/sweethome3d/swing/HomePane.java
 +++ b/src/com/eteks/sweethome3d/swing/HomePane.java
-@@ -493,7 +493,7 @@ public class HomePane extends JRootPane implements HomeView {
-       createAction(ActionType.MODIFY_3D_ATTRIBUTES, preferences, 
-           controller.getHomeController3D(), "modifyAttributes");
+@@ -460,7 +460,7 @@
+           homeController3D, "displaySelectedLevel");
+       createAction(ActionType.MODIFY_3D_ATTRIBUTES, preferences, homeController3D, "modifyAttributes");
        createAction(ActionType.CREATE_PHOTO, preferences, controller, "createPhoto");
 -      createAction(ActionType.CREATE_VIDEO, preferences, controller, "createVideo");
 +//      createAction(ActionType.CREATE_VIDEO, preferences, controller, "createVideo");
        createAction(ActionType.EXPORT_TO_OBJ, preferences, controller, "exportToOBJ");
      }
      
-@@ -972,7 +972,7 @@ public class HomePane extends JRootPane implements HomeView {
+@@ -995,7 +995,7 @@
      addActionToMenu(ActionType.MODIFY_3D_ATTRIBUTES, preview3DMenu);
      preview3DMenu.addSeparator();
      addActionToMenu(ActionType.CREATE_PHOTO, preview3DMenu);
@@ -80,7 +80,7 @@ Author: Gabriele Giacone <1o5g4r8o at gmail.com>
      preview3DMenu.addSeparator();
      addActionToMenu(ActionType.EXPORT_TO_OBJ, preview3DMenu);
      
-@@ -1760,7 +1760,7 @@ public class HomePane extends JRootPane implements HomeView {
+@@ -1840,7 +1840,7 @@
      addActionToToolBar(ActionType.ZOOM_OUT, toolBar);
      toolBar.addSeparator();
      addActionToToolBar(ActionType.CREATE_PHOTO, toolBar);
@@ -89,7 +89,7 @@ Author: Gabriele Giacone <1o5g4r8o at gmail.com>
      toolBar.addSeparator();
      
      // Add plugin actions buttons
-@@ -2221,7 +2221,7 @@ public class HomePane extends JRootPane implements HomeView {
+@@ -2508,7 +2508,7 @@
        addActionToPopupMenu(ActionType.MODIFY_3D_ATTRIBUTES, view3DPopup);
        view3DPopup.addSeparator();
        addActionToPopupMenu(ActionType.CREATE_PHOTO, view3DPopup);

-- 
sweethome3d - Interior 2D design application with 3D preview