Changeset 140:44f93e6d9f2d

Timestamp:

08/01/2008 11:49:34 AM (5 months ago)

Author:

marc@f1.local

branch:

default

Message:

Fix for #86

Files:

• development/java/field/core/DragDuplicator.java (modified) (3 diffs)
• development/java/field/core/persistance/FluidPersistence.java (modified) (6 diffs)
• development/java/field/core/plugins/drawing/BasicDrawingPlugin.java (modified) (1 diff)
• development/java/field/core/windowing/components/DraggableComponent.java (modified) (4 diffs)

development/java/field/core/DragDuplicator.java

@@ -80 +80 @@
-                at.x = event.getX();
-                at.y = event.getY();
-
+
-                out.println(" output <"+ongoing+">");
-        }
@@ -92 +92 @@
-
-                out.println(" delta <"+deltaX+", "+deltaY+">");
-
+
-                at.x = event.getX();
-                at.y = event.getY();
@@ -107 +107 @@
-                if (!isDragging)
-                        return;
-
+
-        }
-

development/java/field/core/persistance/FluidPersistence.java

@@ -35 +35 @@
-import com.thoughtworks.xstream.mapper.MapperWrapper;
-
+import field.core.StandardFluidSheet;
-import field.core.dispatch.Mixins;
-import field.core.dispatch.VisualElement;
@@ -41 +42 @@
-import field.core.dispatch.Mixins.iMixinProxy;
-import field.core.dispatch.iVisualElement.Rect;
+import field.core.dispatch.iVisualElement.VisualElementProperty;
-import field.core.dispatch.iVisualElementOverrides.iDefaultOverride;
-import field.core.plugins.drawing.opengl.CachedLine;
-import field.core.plugins.drawing.opengl.CachedLineCompression;
+import field.core.util.FieldPyObjectAdaptor.PyVisualElement;
-import field.core.windowing.components.iComponent;
-import field.namespace.generic.ReflectionTools;
@@ -490 +493 @@
-                                public void marshal(Object source, HierarchicalStreamWriter writer, MarshallingContext context) {
-                                        writer.startNode("requiredserialization");
-
+
-                                        bos.reset();
-                                        try{
@@ -497 +500 @@
-                                                oos.close();
-                                                writer.setValue(new Base64().encode(bos.toByteArray()));
-      
+
-                                        catch(IOException x)
-                                        {
@@ -510 +513 @@
-                                                String value = reader.getValue();
-                                                reader.moveUp();
-
+
-                                                //Object dc = CachedLineCompression.decompress(value);
-                                                ObjectInputStream ois = new ObjectInputStream(new ByteArrayInputStream(new Base64().decode(value)));
-                                                Object o = ois.readObject();
-                                                ois.close();
-
+
-                                                return o;
-                                        } catch (Throwable t) {
@@ -581 +584 @@
-                        return false;
-                }
+                if (e.getValue() instanceof PyVisualElement)
+                {
+                        return checkVisualElementReference((VisualElementProperty) e.getKey(), element, (iVisualElement)((PyVisualElement)e.getValue()).__tojava__(VisualElement.class));
+                }
+                if (e.getValue() instanceof iVisualElement)
+                {
+                        return checkVisualElementReference((VisualElementProperty) e.getKey(),  element, (iVisualElement)e.getValue());
+                }
-                return true;
-        }
-
+        private boolean checkVisualElementReference(VisualElementProperty p, iVisualElement inside, iVisualElement potential) {
+                List<iVisualElement> possible = StandardFluidSheet.allVisualElements(inside);
+                if (!possible.contains(potential))
+                {
+                        warnings.add("warning: property " + p+ " inside " + inside.payload().get(iVisualElement.name) + " is persistent, yet holds a cross sheet reference to " + potential.payload().get(iVisualElement.name));
+                        return false;
+                }
+                return true;
+        }
+
-}

development/java/field/core/plugins/drawing/BasicDrawingPlugin.java

@@ -211 +211 @@
-                                dragParticipants_list.beginDrag(((FrameManipulation) to.get()).resizeType, source, ((FrameManipulation) to.get()).originalFrame, ((FrameManipulation) to.get()).modifersDown);
-                        } else if (prop == frameManipulationEnd) {
-
+
+
-                        } else if (prop == iVisualElement.hasFocusLock) {
-                                if (((Ref<Boolean>) to).get()) {

development/java/field/core/windowing/components/DraggableComponent.java

@@ -500 +500 @@
-                                                        d.deselectAll();
-                                        }
+                                        System.out.println(" adding to selection");
-                                        for (SelectionGroup<iComponent> d : getSelectionGroups())
-                                                d.addToSelection(DraggableComponent.this);
-
+
-                                        DraggableComponent.this.setSelected(true);
-                                        justSelected = true;
@@ -643 +644 @@
-                        if (getInside() != null)
-                                getInside().requestRedisplay();
-
+
-                        for (SelectionGroup g : getMarkingGroups()) {
-                                g.register(this);
@@ -664 +665 @@
-                        if (getInside() != null)
-                                getInside().requestRedisplay();
-
+
-                        for (SelectionGroup g : getSelectionGroups()) {
-                                g.register(this);
@@ -716 +717 @@
-        }
-
-
+
-        @CachedPerUpdate
-        protected List<SelectionGroup<iComponent>> getMarkingGroups() {