Ticket #2276: book-window-location-lost-on-save-as-2.patch

modules/org.sophie2.base.layout/src/main/java/org/sophie2/base/layout/testing/DummyDocumentView.java

@@ -3 +3 @@
 import javax.swing.JDesktopPane;
 
 import org.sophie2.base.commons.util.ImmImage;
+import org.sophie2.base.commons.util.position.ImmPoint;
 import org.sophie2.base.commons.util.position.ImmSize;
 import org.sophie2.base.layout.model.DocView;
 import org.sophie2.base.visual.BaseSwingVisualElement;
@@ -65 +66 @@
         public RwProp<ImmSize> preferredDimensions() {
                 return getBean().makeValueProp("preferredDimensions", ImmSize.class);
         }
+        
+        public RwProp<ImmPoint> preferredLocation() {
+                return getBean().makeValueProp("preferredLocation", ImmPoint.class, null);
+        }
 }

modules/org.sophie2.extra.func.scripting/src/main/java/org/sophie2/extra/func/scripting/view/ScriptDocView.java

@@ -12 +12 @@
 import org.sophie2.base.commons.structures.ImmTreeList;
 import org.sophie2.base.commons.util.ImmImage;
 import org.sophie2.base.commons.util.ImmList;
+import org.sophie2.base.commons.util.position.ImmPoint;
 import org.sophie2.base.commons.util.position.ImmSize;
 import org.sophie2.base.layout.LogicR3Button;
 import org.sophie2.base.model.resources.r4.access.ResourceAccess;
@@ -288 +289 @@
         public RwProp<ImmSize> preferredDimensions() {
                 return getBean().makeValueProp("preferredDimensions", ImmSize.class, ImmSize.ZERO);
         }
+        
+        public RwProp<ImmPoint> preferredLocation() {
+                return getBean().makeValueProp("preferredLocation", ImmPoint.class, null);
+        }
 }

modules/org.sophie2.main.layout.mydoggy/src/main/java/org/sophie2/main/layout/mydoggy/MDDocumentWindow.java

@@ -16 +16 @@
 
 import org.noos.xing.mydoggy.ToolWindowAnchor;
 import org.sophie2.base.commons.util.ImmImage;
+import org.sophie2.base.commons.util.position.ImmPoint;
 import org.sophie2.base.commons.util.position.ImmSize;
 import org.sophie2.base.layout.impl.DefaultDocView;
 import org.sophie2.base.layout.model.DocView;
@@ -108 +109 @@
                                         }
 
                                         public void componentMoved(ComponentEvent e) {
-                                                //nothing.
+                                                JInternalFrame internalFrame = (JInternalFrame) e.getComponent();
+                                                ImmPoint location = new ImmPoint(internalFrame.getLocation());
+                                                model().get().preferredLocation().set(location);
                                         }
 
                                         public void componentHidden(ComponentEvent e) {
@@ -254 +257 @@
                                         res.pack();
                                 }
                         }
+                        
+                        @SuppressWarnings("unused")
+                        @Setup
+                        protected void setLocation(JInternalFrame res) {
+                                
+                                if (model().get() != null && 
+                                                model().get().preferredLocation().get() != null) {
+                                        
+                                        res.setLocation(model().get().preferredLocation().get().toPoint());
+                                }
+                        }
 
                         /**
                          * Defines whether the JInternalFrame representing the

modules/org.sophie2.main.app.commons/src/main/java/org/sophie2/main/app/commons/book/BookDocView.java

@@ -8 +8 @@
 import javax.swing.ScrollPaneConstants;
 
 import org.sophie2.base.commons.util.ImmImage;
+import org.sophie2.base.commons.util.position.ImmPoint;
 import org.sophie2.base.commons.util.position.ImmSize;
 import org.sophie2.base.layout.impl.DefaultDocView;
 import org.sophie2.base.layout.model.DocView;
@@ -189 +190 @@
                 mainWindow.documents().add(newView);
                 
                 newView.preferredDimensions().set(preferredDimensions().get());
+                newView.preferredLocation().set(preferredLocation().get());
                 
                 DefaultDocView.setCurrent(newView);
         }
@@ -353 +355 @@
         public RwProp<ImmSize> preferredDimensions() {
                 return getBean().makeValueProp("preferredDimensions", ImmSize.class, ImmSize.ZERO);
         }
+        
+        public RwProp<ImmPoint> preferredLocation() {
+                return getBean().makeValueProp("preferredLocation", ImmPoint.class, null);
+        }
 
         public boolean shouldWarnOnClose() {
                 // When we develop sophie the confirmation dialog is slowing us.

modules/org.sophie2.base.model.text/src/main/java/org/sophie2/base/model/text/mvc/TextFlowLogic.java

@@ -200 +200 @@
                 public boolean handle(EventR3 event) {
                         TextView source = event.getSource(TextView.class);
                         TextViewFlow flow = source.textFlow().get();
-                        if (flow == null) {
+                        if (flow == null || !flow.isEditable()) {
                                 //This TextView is no longer in the flow. 
                                 return true;
                         }

modules/org.sophie2.base.layout/src/main/java/org/sophie2/base/layout/model/DocView.java

@@ -3 +3 @@
 import javax.swing.JComponent;
 
 import org.sophie2.base.commons.util.ImmImage;
+import org.sophie2.base.commons.util.position.ImmPoint;
 import org.sophie2.base.commons.util.position.ImmSize;
 import org.sophie2.base.visual.SwingVisualElement;
 import org.sophie2.core.prolib.interfaces.Prop;
@@ -49 +50 @@
          */
         RwProp<ImmSize> preferredDimensions();
         
+        /**
+         * When re-opening a window, its location should not change. This prop's purpose is to 
+         * keep the last location set by the user, so that it can be transferred from window to window.
+         * 
+         * @return
+         *                      The last location, defined by the user.
+         */
+        RwProp<ImmPoint> preferredLocation();
+        
 }