From 84a0b6dc9e99a5ef0fb31b6794e608cee7d79402 Mon Sep 17 00:00:00 2001 From: "gyeongmin.ju" Date: Mon, 12 May 2014 19:59:44 +0900 Subject: [PATCH] UIB : rename Part.getPosition to Part.getPositionProperty Signed-off-by: gyeongmin.ju Change-Id: Ib06d3e53aea2f88dd7d5fe59fb2fc4c78790c4a5 --- .../gef/policies/AnimatorDragEditPolicy.java | 4 +- .../animator/model/AnimationPathModel.java | 8 +-- .../webuibuilder/animator/model/AnimatorFrame.java | 4 +- .../animator/model/AnimatorWidget.java | 4 +- .../webuibuilder/animator/model/EventManager.java | 13 +++- .../gef/commands/DesignerChangeLayoutCommand.java | 4 +- .../gef/commands/DesignerMoveLayoutCommand.java | 2 +- .../gef/commands/DesignerResizeLayoutCommand.java | 2 +- .../gef/commands/MoveAbsolutePartCommand.java | 2 +- .../gef/commands/ResizeAbsolutePartCommand.java | 2 +- .../policies/DesignerAbsoluteDragEditPolicy.java | 12 ++-- .../gef/policies/DesignerDragEditPolicy.java | 14 ++-- .../src/org/tizen/webuibuilder/model/Part.java | 83 ++++++++++++---------- .../tizen/webuibuilder/model/page/PageData.java | 2 +- .../ui/editor/ruler/commands/MoveGuideCommand.java | 4 +- .../ui/views/properties/style/CssStyleTab.java | 10 +-- 16 files changed, 91 insertions(+), 79 deletions(-) diff --git a/org.tizen.webuibuilder/src/org/tizen/webuibuilder/animator/gef/policies/AnimatorDragEditPolicy.java b/org.tizen.webuibuilder/src/org/tizen/webuibuilder/animator/gef/policies/AnimatorDragEditPolicy.java index d94c2ea..1e6b422 100644 --- a/org.tizen.webuibuilder/src/org/tizen/webuibuilder/animator/gef/policies/AnimatorDragEditPolicy.java +++ b/org.tizen.webuibuilder/src/org/tizen/webuibuilder/animator/gef/policies/AnimatorDragEditPolicy.java @@ -271,8 +271,8 @@ public class AnimatorDragEditPolicy extends ResizableEditPolicy { int top = 0; if (part.getPositionMode() == Part.PositionMode.ABSOLUTE_POSITION) { - left = layout.x; - top = layout.y; + left = layout.x - originalRect.x; + top = layout.y - originalRect.y; } else if (part.getPositionMode() == Part.PositionMode.RELATIVE_POSITION) { left = layout.x - originalRect.x; top = layout.y - originalRect.y; diff --git a/org.tizen.webuibuilder/src/org/tizen/webuibuilder/animator/model/AnimationPathModel.java b/org.tizen.webuibuilder/src/org/tizen/webuibuilder/animator/model/AnimationPathModel.java index c5bd11f..e2e553b 100644 --- a/org.tizen.webuibuilder/src/org/tizen/webuibuilder/animator/model/AnimationPathModel.java +++ b/org.tizen.webuibuilder/src/org/tizen/webuibuilder/animator/model/AnimationPathModel.java @@ -297,8 +297,8 @@ public class AnimationPathModel implements IPropertySource { int left = translateInDesigner.width; int top = translateInDesigner.height; - int width = selector.getPartLink().getPosition().width; - int height = selector.getPartLink().getPosition().height; + int width = selector.getPartLink().getPositionProperty().width; + int height = selector.getPartLink().getPositionProperty().height; /* * Hard coding origin origin is displayed in css : ex) -webkit-transform-origin:-35% 50%; @@ -521,10 +521,10 @@ public class AnimationPathModel implements IPropertySource { top = 0; } if (width == null) { - width = targetPart.getPosition().width; + width = targetPart.getWidgetPosition().width; } if (height == null) { - height = targetPart.getPosition().height; + height = targetPart.getWidgetPosition().height; } return new CssValueForLocation(left, top, width, height, originX, originY); diff --git a/org.tizen.webuibuilder/src/org/tizen/webuibuilder/animator/model/AnimatorFrame.java b/org.tizen.webuibuilder/src/org/tizen/webuibuilder/animator/model/AnimatorFrame.java index 518dedb..7f40b60 100644 --- a/org.tizen.webuibuilder/src/org/tizen/webuibuilder/animator/model/AnimatorFrame.java +++ b/org.tizen.webuibuilder/src/org/tizen/webuibuilder/animator/model/AnimatorFrame.java @@ -607,9 +607,9 @@ public class AnimatorFrame extends AnimatorModel { int ratio = Integer.parseInt(new CSSProperty(key, getProperty(key)).getValue()); int position = 0; if(key.equals("translateX")) { - position = getParent().getParent().getParent().getPartLink().getPosition().width; + position = getParent().getParent().getParent().getPartLink().getPositionProperty().width; } else if(key.equals("trnaslateY")) { - position = getParent().getParent().getParent().getPartLink().getPosition().height; + position = getParent().getParent().getParent().getPartLink().getPositionProperty().height; } return (int)(ratio / 100 * position); diff --git a/org.tizen.webuibuilder/src/org/tizen/webuibuilder/animator/model/AnimatorWidget.java b/org.tizen.webuibuilder/src/org/tizen/webuibuilder/animator/model/AnimatorWidget.java index 9aae82e..b490ac0 100644 --- a/org.tizen.webuibuilder/src/org/tizen/webuibuilder/animator/model/AnimatorWidget.java +++ b/org.tizen.webuibuilder/src/org/tizen/webuibuilder/animator/model/AnimatorWidget.java @@ -196,8 +196,8 @@ public class AnimatorWidget extends AnimatorModel { public Map getWidgetProperties(Set propertiesUsed, String selector) { Map properties = new HashMap(); initializeWithDefault(properties); - properties.put("width", getPartLink().getPosition().width + "px"); - properties.put("height", getPartLink().getPosition().height + "px"); + properties.put("width", getPartLink().getPositionProperty().width + "px"); + properties.put("height", getPartLink().getPositionProperty().height + "px"); AnimatorWidgetPart widgetPart = (AnimatorWidgetPart)getPartLink(); AnimatorPagePart pagePart = (AnimatorPagePart)widgetPart.getOwnerPage(); if(!(pagePart.getOwnerRef() instanceof PageData)) { diff --git a/org.tizen.webuibuilder/src/org/tizen/webuibuilder/animator/model/EventManager.java b/org.tizen.webuibuilder/src/org/tizen/webuibuilder/animator/model/EventManager.java index e47aec9..0758567 100644 --- a/org.tizen.webuibuilder/src/org/tizen/webuibuilder/animator/model/EventManager.java +++ b/org.tizen.webuibuilder/src/org/tizen/webuibuilder/animator/model/EventManager.java @@ -35,7 +35,7 @@ import org.tizen.webuibuilder.model.app.AppManager; * A EventManager class */ public class EventManager implements EventFireDelegate { - AppManager appManager; + AppManager appManager; /** * Constructor @@ -45,6 +45,7 @@ public class EventManager implements EventFireDelegate { public EventManager(AppManager appManager) { this.appManager = appManager; } + /** * Fire event from rootPart * @@ -53,7 +54,12 @@ public class EventManager implements EventFireDelegate { * @param model */ public void fireEvent(EventType event, Origin origin, AnimatorModel model) { - ((AnimatorPart)appManager.getPageDataSet().getBaseRootPart()).fireEvent(new AnimatorModelEvent(event, origin, model)); + if (appManager.getPageDataSet().getBaseRootPart() == null) { + return; + } + + ((AnimatorPart) appManager.getPageDataSet().getBaseRootPart()) + .fireEvent(new AnimatorModelEvent(event, origin, model)); } /** @@ -66,7 +72,8 @@ public class EventManager implements EventFireDelegate { */ public void fireEvent(EventType event, Origin origin, AnimatorModel model, AnimatorProperty animatorProperty) { - ((AnimatorPart)appManager.getPageDataSet().getBaseRootPart()).fireEvent(new AnimatorModelEvent(event, origin, model, animatorProperty)); + ((AnimatorPart) appManager.getPageDataSet().getBaseRootPart()) + .fireEvent(new AnimatorModelEvent(event, origin, model, animatorProperty)); } /** diff --git a/org.tizen.webuibuilder/src/org/tizen/webuibuilder/gef/commands/DesignerChangeLayoutCommand.java b/org.tizen.webuibuilder/src/org/tizen/webuibuilder/gef/commands/DesignerChangeLayoutCommand.java index abf4f6a..c61ae12 100644 --- a/org.tizen.webuibuilder/src/org/tizen/webuibuilder/gef/commands/DesignerChangeLayoutCommand.java +++ b/org.tizen.webuibuilder/src/org/tizen/webuibuilder/gef/commands/DesignerChangeLayoutCommand.java @@ -52,10 +52,10 @@ public class DesignerChangeLayoutCommand extends Command { @Override public void execute() { if (model.getPositionMode() == Part.PositionMode.ABSOLUTE_POSITION) { - oldLayout = new Rectangle(model.getPosition()); + oldLayout = new Rectangle(model.getPositionProperty()); model.setPosition(layout); } else if (model.getPositionMode() == Part.PositionMode.RELATIVE_POSITION) { - oldLayout = new Rectangle(model.getPosition()); + oldLayout = new Rectangle(model.getPositionProperty()); model.setSize(new Point(layout.width, layout.height)); } diff --git a/org.tizen.webuibuilder/src/org/tizen/webuibuilder/gef/commands/DesignerMoveLayoutCommand.java b/org.tizen.webuibuilder/src/org/tizen/webuibuilder/gef/commands/DesignerMoveLayoutCommand.java index 074b96c..87de000 100644 --- a/org.tizen.webuibuilder/src/org/tizen/webuibuilder/gef/commands/DesignerMoveLayoutCommand.java +++ b/org.tizen.webuibuilder/src/org/tizen/webuibuilder/gef/commands/DesignerMoveLayoutCommand.java @@ -50,7 +50,7 @@ public class DesignerMoveLayoutCommand extends Command { @Override public void execute() { - oldPosition = new Point(model.getPosition().x, model.getPosition().y); + oldPosition = new Point(model.getPositionProperty().x, model.getPositionProperty().y); model.setPosition(new Point(oldPosition.x + delta.x, oldPosition.y + delta.y)); } diff --git a/org.tizen.webuibuilder/src/org/tizen/webuibuilder/gef/commands/DesignerResizeLayoutCommand.java b/org.tizen.webuibuilder/src/org/tizen/webuibuilder/gef/commands/DesignerResizeLayoutCommand.java index 4a2343b..544d186 100644 --- a/org.tizen.webuibuilder/src/org/tizen/webuibuilder/gef/commands/DesignerResizeLayoutCommand.java +++ b/org.tizen.webuibuilder/src/org/tizen/webuibuilder/gef/commands/DesignerResizeLayoutCommand.java @@ -51,7 +51,7 @@ public class DesignerResizeLayoutCommand extends Command { @Override public void execute() { - oldSize = new Dimension(model.getPosition().width, model.getPosition().height); + oldSize = new Dimension(model.getPositionProperty().width, model.getPositionProperty().height); model.setSize(new Point(oldSize.width + delta.width, oldSize.height + delta.height)); } diff --git a/org.tizen.webuibuilder/src/org/tizen/webuibuilder/gef/commands/MoveAbsolutePartCommand.java b/org.tizen.webuibuilder/src/org/tizen/webuibuilder/gef/commands/MoveAbsolutePartCommand.java index 8519162..5214e22 100644 --- a/org.tizen.webuibuilder/src/org/tizen/webuibuilder/gef/commands/MoveAbsolutePartCommand.java +++ b/org.tizen.webuibuilder/src/org/tizen/webuibuilder/gef/commands/MoveAbsolutePartCommand.java @@ -46,7 +46,7 @@ public class MoveAbsolutePartCommand extends Command { * @param layout */ public MoveAbsolutePartCommand(Part model, Rectangle delta) { - oldLayout = model.getPosition(); + oldLayout = model.getPositionProperty(); this.model = model; this.delta = delta; diff --git a/org.tizen.webuibuilder/src/org/tizen/webuibuilder/gef/commands/ResizeAbsolutePartCommand.java b/org.tizen.webuibuilder/src/org/tizen/webuibuilder/gef/commands/ResizeAbsolutePartCommand.java index 21b3ee3..723bf96 100644 --- a/org.tizen.webuibuilder/src/org/tizen/webuibuilder/gef/commands/ResizeAbsolutePartCommand.java +++ b/org.tizen.webuibuilder/src/org/tizen/webuibuilder/gef/commands/ResizeAbsolutePartCommand.java @@ -46,7 +46,7 @@ public class ResizeAbsolutePartCommand extends Command { * @param layout */ public ResizeAbsolutePartCommand(Part model, Rectangle delta) { - oldLayout = model.getPosition(); + oldLayout = model.getPositionProperty(); this.model = model; this.delta = delta; diff --git a/org.tizen.webuibuilder/src/org/tizen/webuibuilder/gef/policies/DesignerAbsoluteDragEditPolicy.java b/org.tizen.webuibuilder/src/org/tizen/webuibuilder/gef/policies/DesignerAbsoluteDragEditPolicy.java index f9ff7e1..08243ce 100644 --- a/org.tizen.webuibuilder/src/org/tizen/webuibuilder/gef/policies/DesignerAbsoluteDragEditPolicy.java +++ b/org.tizen.webuibuilder/src/org/tizen/webuibuilder/gef/policies/DesignerAbsoluteDragEditPolicy.java @@ -201,7 +201,7 @@ public class DesignerAbsoluteDragEditPolicy extends ResizableEditPolicy { switch (relation.getRelation()) { case FREE: if (((Part) relation.getTarget()).getParent() != null) { - parentBlur.setBounds(((Part) relation.getTarget()).getParent().getPosition()); + parentBlur.setBounds(((Part) relation.getTarget()).getParent().getVisualPosition()); if (type == 0) { parentBlur.setBackgroundColor(new Color(null, 0x00, 0x00, 0xff)); } else { @@ -212,7 +212,7 @@ public class DesignerAbsoluteDragEditPolicy extends ResizableEditPolicy { break; case PREV_SIBLING: if (((Part) relation.getTarget()).getParent() != null) { - parentBlur.setBounds(((Part) relation.getTarget()).getParent().getPosition()); + parentBlur.setBounds(((Part) relation.getTarget()).getParent().getVisualPosition()); if (type == 0) { parentBlur.setBackgroundColor(new Color(null, 0x00, 0x00, 0xff)); } else { @@ -223,7 +223,7 @@ public class DesignerAbsoluteDragEditPolicy extends ResizableEditPolicy { break; case NEXT_SIBLING: if (((Part) relation.getTarget()).getParent() != null) { - parentBlur.setBounds(((Part) relation.getTarget()).getParent().getPosition()); + parentBlur.setBounds(((Part) relation.getTarget()).getParent().getVisualPosition()); if (type == 0) { parentBlur.setBackgroundColor(new Color(null, 0x00, 0x00, 0xff)); } else { @@ -234,7 +234,7 @@ public class DesignerAbsoluteDragEditPolicy extends ResizableEditPolicy { break; case CHILD: if (((Part) relation.getTarget()) != null) { - parentBlur.setBounds(((Part) relation.getTarget()).getPosition()); + parentBlur.setBounds(((Part) relation.getTarget()).getVisualPosition()); if (type == 0) { parentBlur.setBackgroundColor(new Color(null, 0x00, 0x00, 0xff)); } else { @@ -245,7 +245,7 @@ public class DesignerAbsoluteDragEditPolicy extends ResizableEditPolicy { break; case DENY: if (((Part) relation.getTarget()) != null) { - parentBlur.setBounds(((Part) relation.getTarget()).getPosition()); + parentBlur.setBounds(((Part) relation.getTarget()).getVisualPosition()); parentBlur.setBackgroundColor(new Color(null, 0xff, 0x00, 0x00)); parentBlur.setVisible(true); } @@ -270,7 +270,7 @@ public class DesignerAbsoluteDragEditPolicy extends ResizableEditPolicy { if (rel.getTarget() instanceof Part) { Part part = (Part) rel.getTarget(); if (part.isWidgetPart()) { - /* Rectangle rect = */getCursor(rel, part.getPosition(), 0); + /* Rectangle rect = */getCursor(rel, part.getVisualPosition(), 0); } } } diff --git a/org.tizen.webuibuilder/src/org/tizen/webuibuilder/gef/policies/DesignerDragEditPolicy.java b/org.tizen.webuibuilder/src/org/tizen/webuibuilder/gef/policies/DesignerDragEditPolicy.java index 802c0e8..dc860ad 100644 --- a/org.tizen.webuibuilder/src/org/tizen/webuibuilder/gef/policies/DesignerDragEditPolicy.java +++ b/org.tizen.webuibuilder/src/org/tizen/webuibuilder/gef/policies/DesignerDragEditPolicy.java @@ -417,7 +417,7 @@ public class DesignerDragEditPolicy extends ResizableEditPolicy { if (rel.getTarget() instanceof Part) { Part part = (Part) rel.getTarget(); if (part.isWidgetPart()) { - Rectangle rect = getCursor(rel, part.getPosition(), 0); + Rectangle rect = getCursor(rel, part.getVisualPosition(), 0); if (rect != null) { mouseOverBorder.setBounds(rect); mouseOverBorder.setVisible(true); @@ -432,12 +432,12 @@ public class DesignerDragEditPolicy extends ResizableEditPolicy { break; case ITemplate.DATABINDING: if (hasProperty(targetEditPart, BuilderConstants.ATTRIBUTE_DATA_BIND)) { - parentBlur.setBounds(targetModel.getPosition()); + parentBlur.setBounds(targetModel.getVisualPosition()); parentBlur.setForegroundColor(ColorConstants.blue); parentBlur.setBackgroundColor(ColorConstants.blue); parentBlur.setVisible(true); } else { - parentBlur.setBounds(targetModel.getPosition()); + parentBlur.setBounds(targetModel.getVisualPosition()); parentBlur.setForegroundColor(ColorConstants.red); parentBlur.setBackgroundColor(ColorConstants.red); parentBlur.setVisible(true); @@ -446,19 +446,19 @@ public class DesignerDragEditPolicy extends ResizableEditPolicy { case ITemplate.RESOURCE: PartProperty property = (PartProperty) createRequest.getNewObject(); if (hasProperty(targetEditPart, property.getName())) { - parentBlur.setBounds(targetModel.getPosition()); + parentBlur.setBounds(targetModel.getVisualPosition()); parentBlur.setForegroundColor(ColorConstants.blue); parentBlur.setBackgroundColor(ColorConstants.blue); parentBlur.setVisible(true); } else { - parentBlur.setBounds(targetModel.getPosition()); + parentBlur.setBounds(targetModel.getVisualPosition()); parentBlur.setForegroundColor(ColorConstants.red); parentBlur.setBackgroundColor(ColorConstants.red); parentBlur.setVisible(true); } break; case ITemplate.DUMMY: - parentBlur.setBounds(targetModel.getPosition()); + parentBlur.setBounds(targetModel.getVisualPosition()); parentBlur.setForegroundColor(ColorConstants.black); parentBlur.setBackgroundColor(ColorConstants.black); parentBlur.setVisible(true); @@ -474,7 +474,7 @@ public class DesignerDragEditPolicy extends ResizableEditPolicy { if (rel.getTarget() instanceof Part) { Part part = (Part) rel.getTarget(); if (part.isWidgetPart()) { - Rectangle rect = getCursor(rel, part.getPosition(), 0); + Rectangle rect = getCursor(rel, part.getVisualPosition(), 0); if (rect != null) { mouseOverBorder.setBounds(rect); mouseOverBorder.setVisible(true); diff --git a/org.tizen.webuibuilder/src/org/tizen/webuibuilder/model/Part.java b/org.tizen.webuibuilder/src/org/tizen/webuibuilder/model/Part.java index be4b0ad..bd90334 100644 --- a/org.tizen.webuibuilder/src/org/tizen/webuibuilder/model/Part.java +++ b/org.tizen.webuibuilder/src/org/tizen/webuibuilder/model/Part.java @@ -571,7 +571,7 @@ public class Part implements ISerializer { * * @return position */ - public Rectangle getPosition() { + public Rectangle getPositionProperty() { if (getPositionMode() == PositionMode.ABSOLUTE_POSITION) { // return position; Part page = getOwnerPage(); @@ -593,7 +593,7 @@ public class Part implements ISerializer { rect.y = HtmlNumber.parseInt(top); rect.width = HtmlNumber.parseInt(width); rect.height = HtmlNumber.parseInt(height); - + return rect; } else if (getPositionMode() == PositionMode.RELATIVE_POSITION) { // return position; @@ -616,7 +616,7 @@ public class Part implements ISerializer { rect.y = HtmlNumber.parseInt(top); rect.width = HtmlNumber.parseInt(width); rect.height = HtmlNumber.parseInt(height); - + return rect; } else { // return position; @@ -637,6 +637,11 @@ public class Part implements ISerializer { return widgetPosition; } + public Rectangle getVisualPosition() { + return new Rectangle(widgetPosition.x, widgetPosition.y, widgetPosition.width, + widgetPosition.height); + } + public void setVisualPosition(Rectangle position) { // if (this.position == null) { // this.position = new Rectangle(position); @@ -846,9 +851,9 @@ public class Part implements ISerializer { * a position delta */ public void setPositionDelta(Rectangle delta) { -// if (position == null) { -// return; -// } + // if (position == null) { + // return; + // } Rectangle newPosition = new Rectangle(); @@ -897,9 +902,9 @@ public class Part implements ISerializer { * a size */ public void setSize(Point size) { -// if (position == null) { -// return; -// } + // if (position == null) { + // return; + // } lockRefresh(); Part page = getOwnerPage(); @@ -1657,21 +1662,21 @@ public class Part implements ISerializer { String key = style.getKey(); String value = style.getStringValue(); -// if (key.equals(POSITION)) { -// isPosition = true; -// } else if (key.equals(LEFT)) { -// position.x = HtmlNumber.parseInt(value); -// isPosition = true; -// } else if (key.equals(TOP)) { -// position.y = HtmlNumber.parseInt(value); -// isPosition = true; -// } else if (key.equals(WIDTH)) { -// position.width = HtmlNumber.parseInt(value); -// isPosition = true; -// } else if (key.equals(HEIGHT)) { -// position.height = HtmlNumber.parseInt(value); -// isPosition = true; -// } + // if (key.equals(POSITION)) { + // isPosition = true; + // } else if (key.equals(LEFT)) { + // position.x = HtmlNumber.parseInt(value); + // isPosition = true; + // } else if (key.equals(TOP)) { + // position.y = HtmlNumber.parseInt(value); + // isPosition = true; + // } else if (key.equals(WIDTH)) { + // position.width = HtmlNumber.parseInt(value); + // isPosition = true; + // } else if (key.equals(HEIGHT)) { + // position.height = HtmlNumber.parseInt(value); + // isPosition = true; + // } } fireEvent(new CssEvent(EventType.CSS_NEED_REFRESH, this, selectorName, null, null)); @@ -1707,9 +1712,9 @@ public class Part implements ISerializer { selector.setPropertyValue(propertyKey, value); -// if (position == null) { -// position = new Rectangle(0, 0, 0, 0); -// } + // if (position == null) { + // position = new Rectangle(0, 0, 0, 0); + // } boolean isPosition = false; if (propertyKey.equals(POSITION)) { @@ -1720,18 +1725,18 @@ public class Part implements ISerializer { selector.setPropertyValue(HEIGHT, null); } isPosition = true; -// } else if (propertyKey.equals(LEFT)) { -// position.x = HtmlNumber.parseInt(value); -// isPosition = true; -// } else if (propertyKey.equals(TOP)) { -// position.y = HtmlNumber.parseInt(value); -// isPosition = true; -// } else if (propertyKey.equals(WIDTH)) { -// position.width = HtmlNumber.parseInt(value); -// isPosition = true; -// } else if (propertyKey.equals(HEIGHT)) { -// position.height = HtmlNumber.parseInt(value); -// isPosition = true; + // } else if (propertyKey.equals(LEFT)) { + // position.x = HtmlNumber.parseInt(value); + // isPosition = true; + // } else if (propertyKey.equals(TOP)) { + // position.y = HtmlNumber.parseInt(value); + // isPosition = true; + // } else if (propertyKey.equals(WIDTH)) { + // position.width = HtmlNumber.parseInt(value); + // isPosition = true; + // } else if (propertyKey.equals(HEIGHT)) { + // position.height = HtmlNumber.parseInt(value); + // isPosition = true; } if (parentName != null) { diff --git a/org.tizen.webuibuilder/src/org/tizen/webuibuilder/model/page/PageData.java b/org.tizen.webuibuilder/src/org/tizen/webuibuilder/model/page/PageData.java index ddbfe95..a9cd70f 100644 --- a/org.tizen.webuibuilder/src/org/tizen/webuibuilder/model/page/PageData.java +++ b/org.tizen.webuibuilder/src/org/tizen/webuibuilder/model/page/PageData.java @@ -679,7 +679,7 @@ public class PageData implements IPartListener, ICssListener { Part.PositionMode.ABSOLUTE_POSITION)) { return; } else if (selector != null) { - Rectangle rect = part.getPosition(); + Rectangle rect = part.getPositionProperty(); selector.setStyle("left", rect.x + "px"); selector.setStyle("top", rect.y + "px"); selector.setStyle("width", rect.width + "px"); diff --git a/org.tizen.webuibuilder/src/org/tizen/webuibuilder/ui/editor/ruler/commands/MoveGuideCommand.java b/org.tizen.webuibuilder/src/org/tizen/webuibuilder/ui/editor/ruler/commands/MoveGuideCommand.java index 5f46f9f..d41c0f4 100644 --- a/org.tizen.webuibuilder/src/org/tizen/webuibuilder/ui/editor/ruler/commands/MoveGuideCommand.java +++ b/org.tizen.webuibuilder/src/org/tizen/webuibuilder/ui/editor/ruler/commands/MoveGuideCommand.java @@ -48,7 +48,7 @@ public class MoveGuideCommand extends Command { Iterator iter = guide.getParts().iterator(); while (iter.hasNext()) { Part element = (Part) iter.next(); - Rectangle layout = element.getPosition().getCopy(); + Rectangle layout = element.getPositionProperty().getCopy(); if (guide.isHorizontal()) { layout.y += pDelta; } else { @@ -64,7 +64,7 @@ public class MoveGuideCommand extends Command { Iterator iter = guide.getParts().iterator(); while (iter.hasNext()) { Part element = (Part) iter.next(); - Rectangle layout = element.getPosition().getCopy(); + Rectangle layout = element.getPositionProperty().getCopy(); if (guide.isHorizontal()) { layout.y -= pDelta; } else { diff --git a/org.tizen.webuibuilder/src/org/tizen/webuibuilder/ui/views/properties/style/CssStyleTab.java b/org.tizen.webuibuilder/src/org/tizen/webuibuilder/ui/views/properties/style/CssStyleTab.java index d74f851..7cf9c98 100644 --- a/org.tizen.webuibuilder/src/org/tizen/webuibuilder/ui/views/properties/style/CssStyleTab.java +++ b/org.tizen.webuibuilder/src/org/tizen/webuibuilder/ui/views/properties/style/CssStyleTab.java @@ -677,10 +677,10 @@ public class CssStyleTab extends PropertiesTabItem implements IPageDataListener public void refreshPositionMethods() { Part model = getModel(); - if (model.getPosition() != null) { + if (model.getPositionProperty() != null) { String width , height; - width = model.getPosition().width + "px"; - height = model.getPosition().height + "px"; + width = model.getPositionProperty().width + "px"; + height = model.getPositionProperty().height + "px"; if (checkMethod(widthMethod)) { widthMethod.refreshValue(widthMethod.getMethodName(), width); @@ -1138,10 +1138,10 @@ public class CssStyleTab extends PropertiesTabItem implements IPageDataListener String methodName = method.getMethodName(); if (methodName.equals("width") && (value == null || value.isEmpty())) { Part model = getModel(); - value = model.getPosition().width + "px"; + value = model.getPositionProperty().width + "px"; } else if (methodName.equals("height") && (value == null || value.isEmpty())) { Part model = getModel(); - value = model.getPosition().height + "px"; + value = model.getPositionProperty().height + "px"; } category.setBriefMessage(key, value); -- 2.7.4