Factoring out MarkupDesignBean refs.
1.1 --- a/visualweb.designer/src/org/netbeans/modules/visualweb/designer/Dragger.java Wed Feb 07 23:08:03 2007 +0000
1.2 +++ b/visualweb.designer/src/org/netbeans/modules/visualweb/designer/Dragger.java Fri Feb 09 00:03:06 2007 +0000
1.3 @@ -327,7 +327,7 @@
1.4 }
1.5
1.6 if ((pos != Position.NONE) || (grid && hasMoved(prevX, prevY))) {
1.7 - gm.move(pane, beans, selections, boxes, pos, prevX, prevY,
1.8 + gm.move(pane, /*beans,*/ selections, boxes, pos, prevX, prevY,
1.9 action == DRAG_FREE);
1.10 } // else: didn't really move ...
1.11 }
2.1 --- a/visualweb.designer/src/org/netbeans/modules/visualweb/text/actions/NextVisualPositionAction.java Wed Feb 07 23:08:03 2007 +0000
2.2 +++ b/visualweb.designer/src/org/netbeans/modules/visualweb/text/actions/NextVisualPositionAction.java Fri Feb 09 00:03:06 2007 +0000
2.3 @@ -24,12 +24,12 @@
2.4 */
2.5 package org.netbeans.modules.visualweb.text.actions;
2.6
2.7 +import java.util.List;
2.8 import org.netbeans.modules.visualweb.css2.CssBox;
2.9 import org.netbeans.modules.visualweb.css2.ModelViewMapper;
2.10 import org.netbeans.modules.visualweb.designer.GridHandler;
2.11 import org.netbeans.modules.visualweb.designer.SelectionManager;
2.12 import org.netbeans.modules.visualweb.designer.WebForm;
2.13 -import com.sun.rave.designtime.DesignBean;
2.14 import java.awt.Point;
2.15 import java.awt.Rectangle;
2.16 import java.awt.event.ActionEvent;
2.17 @@ -137,16 +137,16 @@
2.18 }
2.19
2.20 int numSelected = sm.getNumSelected();
2.21 - ArrayList beans = new ArrayList(numSelected);
2.22 - ArrayList rectangles = new ArrayList(numSelected);
2.23 - ArrayList boxes = new ArrayList(numSelected);
2.24 +// ArrayList beans = new ArrayList(numSelected);
2.25 + List<Rectangle> rectangles = new ArrayList<Rectangle>(numSelected);
2.26 + List<CssBox> boxes = new ArrayList<CssBox>(numSelected);
2.27 // Iterator it = sm.iterator();
2.28 //// ModelViewMapper mapper = webform.getMapper();
2.29 //
2.30 // while (it.hasNext()) {
2.31 // DesignBean bean = (DesignBean)it.next();
2.32 for (Element componentRootElement : sm.getSelectedComponentRootElements()) {
2.33 - DesignBean bean = WebForm.getHtmlDomProviderService().getMarkupDesignBeanForElement(componentRootElement);
2.34 +// DesignBean bean = WebForm.getHtmlDomProviderService().getMarkupDesignBeanForElement(componentRootElement);
2.35 // CssBox box = mapper.findBox(bean);
2.36 CssBox box = ModelViewMapper.findBoxForComponentRootElement(webform.getPane().getPageBox(), componentRootElement);
2.37
2.38 @@ -158,7 +158,7 @@
2.39 continue;
2.40 }
2.41
2.42 - beans.add(bean);
2.43 +// beans.add(bean);
2.44
2.45 //elements.add(box.getElement());
2.46 boxes.add(box);
2.47 @@ -217,7 +217,7 @@
2.48 break;
2.49 }
2.50
2.51 - gm.move(webform.getPane(), beans, rectangles, boxes, Position.NONE, offsetX, offsetY,
2.52 + gm.move(webform.getPane(), /*beans,*/ rectangles, boxes, Position.NONE, offsetX, offsetY,
2.53 snapDisabled);
2.54 }
2.55 }