Changeset 151:c76ed455316b

Timestamp:

08/13/2008 02:17:34 PM (4 months ago)

Author:

marc@f1.local

branch:

default

Message:

workaround for #95?

Files:

• development/java/field/core/plugins/drawing/BasicDrawingPlugin.java (modified) (1 diff)
• development/java/field/core/plugins/history/Templating.java (modified) (2 diffs)
• development/java/field/core/plugins/python/OutputInsertsOnSheet.java (modified) (4 diffs)
• development/java/field/core/windowing/components/DraggableComponent.java (modified) (3 diffs)

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

@@ -212 +212 @@
-                        } else if (prop == frameManipulationEnd) {
-
-
+
+
-                        } else if (prop == iVisualElement.hasFocusLock) {
-                                if (((Ref<Boolean>) to).get()) {

development/java/field/core/plugins/history/Templating.java

@@ -29 +29 @@
-import field.core.persistance.FluidCopyPastePersistence;
-import field.core.plugins.drawing.SplineComputingOverride;
+import field.core.plugins.python.OutputInsertsOnSheet;
-import field.core.plugins.python.PythonPlugin;
-import field.core.plugins.python.PythonPluginEditor;
@@ -240 +241 @@
-
-                        Object v = e.getValue();
-
+ && shouldCopy(p)
-                                performCopy(source, newElement, p, v);
-                }
-
-                return newElement;
+        }
+
+        /**
+         * TODO: this needs rearchitecting
+         */
+        private static boolean shouldCopy(VisualElementProperty p) {
+                System.out.println(" should copy ? "+p);
+                if (p.equals(OutputInsertsOnSheet.outputInsertsOnSheet_knownComponents)) return false;
+                if (p.equals(OutputInsertsOnSheet.outputInsertsOnSheet)) return false;
+
+                return true;
-        }
-

development/java/field/core/plugins/python/OutputInsertsOnSheet.java

@@ -162 +162 @@
-                OutputInsertsOnSheet oi = outputInsertsOnSheet.get(inside);
-
+                System.out.println(" inside print slider for <"+inside+"> got <"+oi+">");
+
-
-                iVisualElement alreadyCreated = findAlreadyCreated(oi, inside, name);
@@ -171 +173 @@
-                        tuple = (MinimalSlider.Component) alreadyCreated.getProperty(outputInsertsOnSheet_providedComponent);
-                        lastWasNew = false;
+                        System.out.println(" already there");
-                } else {
+
+                        System.out.println(" genuinely new");
-
-                        map.remove(name);
@@ -180 +185 @@
-
-                        map.put(name, alreadyCreated.getUniqueID());
+                        System.out.println(" created, map now <"+map+">");
-                        lastWasNew = true;
-                }
@@ -398 +404 @@
-                this.root = root;
-                root.setProperty(outputInsertsOnSheet, this);
+
+                System.out.println("                    oios is :"+this+" for "+root);
-        }
-

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

@@ -177 +177 @@
-
-                        System.out.println(" computing currentResize :"+arg0.getX()+" "+arg0.getY()+" (( "+bounds+" ))");
-
+
-                        currentResize.clear();
-                        if (arg0.getX() - getX() < zone)
@@ -204 +204 @@
-
-                        if (!first) {
+
+                                System.out.println(" finalizing rect <"+arg0+"> <"+arg0.getModifiersEx()+">");
+
-                                finalizeRect(element, currentResize, arg0.getModifiersEx());
-
@@ -490 +493 @@
-                                }
-                        } else {
-
+
-
-                                dragger.mousePressed(arg0);