diff --git a/plugins/android-designer/src/com/intellij/android/designer/designSurface/feedbacks/TextFeedback.java b/plugins/android-designer/src/com/intellij/android/designer/designSurface/feedbacks/TextFeedback.java new file mode 100644 index 000000000000..c1cd59425344 --- /dev/null +++ b/plugins/android-designer/src/com/intellij/android/designer/designSurface/feedbacks/TextFeedback.java @@ -0,0 +1,28 @@ +package com.intellij.android.designer.designSurface.feedbacks; + +import com.intellij.designer.designSurface.feedbacks.AbstractTextFeedback; +import com.intellij.ui.Colors; +import com.intellij.ui.LightColors; +import com.intellij.ui.SimpleTextAttributes; + +import java.awt.*; + +/** + * @author Alexander Lobas + */ +public class TextFeedback extends AbstractTextFeedback { + private static SimpleTextAttributes DIMENSION_ATTRIBUTES = new SimpleTextAttributes(SimpleTextAttributes.STYLE_BOLD, Color.lightGray); + private static SimpleTextAttributes SNAP_ATTRIBUTES = new SimpleTextAttributes(SimpleTextAttributes.STYLE_BOLD, Colors.DARK_GREEN); + + public TextFeedback() { + setBackground(LightColors.YELLOW); + } + + public void dimension(String text) { + append(text, DIMENSION_ATTRIBUTES); + } + + public void snap(String text) { + append(text, SNAP_ATTRIBUTES); + } +} \ No newline at end of file diff --git a/plugins/android-designer/src/com/intellij/android/designer/designSurface/layout/AbstractFlowBaseOperation.java b/plugins/android-designer/src/com/intellij/android/designer/designSurface/layout/AbstractFlowBaseOperation.java new file mode 100644 index 000000000000..3f501c501e22 --- /dev/null +++ b/plugins/android-designer/src/com/intellij/android/designer/designSurface/layout/AbstractFlowBaseOperation.java @@ -0,0 +1,30 @@ +package com.intellij.android.designer.designSurface.layout; + +import com.intellij.designer.designSurface.OperationContext; +import com.intellij.designer.designSurface.feedbacks.LineInsertFeedback; +import com.intellij.designer.designSurface.feedbacks.RectangleFeedback; +import com.intellij.designer.model.RadComponent; + +import java.awt.*; + +/** + * @author Alexander Lobas + */ +public abstract class AbstractFlowBaseOperation extends com.intellij.designer.designSurface.AbstractFlowBaseOperation { + public AbstractFlowBaseOperation(RadComponent container, + OperationContext context, boolean horizontal) { + super(container, context, horizontal); + } + + @Override + protected void createInsertFeedback() { + myInsertFeedback = new LineInsertFeedback(Color.green, !myHorizontal); + myInsertFeedback.size(myBounds.width, myBounds.height); + } + + @Override + protected void createFirstInsertFeedback() { + myFirstInsertFeedback = new RectangleFeedback(Color.green, 2); + myFirstInsertFeedback.setBounds(myBounds); + } +} \ No newline at end of file diff --git a/plugins/android-designer/src/com/intellij/android/designer/designSurface/layout/FrameLayoutOperation.java b/plugins/android-designer/src/com/intellij/android/designer/designSurface/layout/FrameLayoutOperation.java index 33f33f87db05..c7f44f7c0d45 100644 --- a/plugins/android-designer/src/com/intellij/android/designer/designSurface/layout/FrameLayoutOperation.java +++ b/plugins/android-designer/src/com/intellij/android/designer/designSurface/layout/FrameLayoutOperation.java @@ -17,12 +17,12 @@ package com.intellij.android.designer.designSurface.layout; import com.android.SdkConstants; import com.intellij.android.designer.designSurface.AbstractEditOperation; +import com.intellij.android.designer.designSurface.feedbacks.TextFeedback; import com.intellij.android.designer.model.RadViewComponent; import com.intellij.android.designer.model.layout.Gravity; import com.intellij.designer.designSurface.FeedbackLayer; import com.intellij.designer.designSurface.OperationContext; import com.intellij.designer.designSurface.feedbacks.AlphaFeedback; -import com.intellij.designer.designSurface.feedbacks.TextFeedback; import com.intellij.designer.model.RadComponent; import com.intellij.openapi.application.ApplicationManager; import com.intellij.openapi.util.Pair; diff --git a/plugins/android-designer/src/com/intellij/android/designer/designSurface/layout/LinearLayoutOperation.java b/plugins/android-designer/src/com/intellij/android/designer/designSurface/layout/LinearLayoutOperation.java index 4aef0d13b75d..85d80c1b707c 100644 --- a/plugins/android-designer/src/com/intellij/android/designer/designSurface/layout/LinearLayoutOperation.java +++ b/plugins/android-designer/src/com/intellij/android/designer/designSurface/layout/LinearLayoutOperation.java @@ -16,6 +16,7 @@ package com.intellij.android.designer.designSurface.layout; import com.android.SdkConstants; +import com.intellij.android.designer.designSurface.feedbacks.TextFeedback; import com.intellij.android.designer.designSurface.layout.actions.ResizeOperation; import com.intellij.android.designer.designSurface.layout.flow.FlowBaseOperation; import com.intellij.android.designer.model.ModelParser; @@ -23,7 +24,6 @@ import com.intellij.android.designer.model.RadViewComponent; import com.intellij.android.designer.model.layout.Gravity; import com.intellij.designer.designSurface.FeedbackLayer; import com.intellij.designer.designSurface.OperationContext; -import com.intellij.designer.designSurface.feedbacks.TextFeedback; import com.intellij.designer.model.RadComponent; import com.intellij.openapi.application.ApplicationManager; import com.intellij.openapi.util.Pair; diff --git a/plugins/android-designer/src/com/intellij/android/designer/designSurface/layout/RelativeLayoutOperation.java b/plugins/android-designer/src/com/intellij/android/designer/designSurface/layout/RelativeLayoutOperation.java index 24a0e2f91213..d995688a602d 100644 --- a/plugins/android-designer/src/com/intellij/android/designer/designSurface/layout/RelativeLayoutOperation.java +++ b/plugins/android-designer/src/com/intellij/android/designer/designSurface/layout/RelativeLayoutOperation.java @@ -17,6 +17,7 @@ package com.intellij.android.designer.designSurface.layout; import com.intellij.android.designer.designSurface.AbstractEditOperation; import com.intellij.android.designer.designSurface.RootView; +import com.intellij.android.designer.designSurface.feedbacks.TextFeedback; import com.intellij.android.designer.designSurface.layout.relative.*; import com.intellij.android.designer.model.ModelParser; import com.intellij.android.designer.model.RadViewComponent; @@ -24,7 +25,6 @@ import com.intellij.android.designer.model.layout.relative.RelativeInfo; import com.intellij.designer.designSurface.FeedbackLayer; import com.intellij.designer.designSurface.OperationContext; import com.intellij.designer.designSurface.feedbacks.AlphaFeedback; -import com.intellij.designer.designSurface.feedbacks.TextFeedback; import com.intellij.designer.model.RadComponent; import com.intellij.openapi.application.ApplicationManager; import com.intellij.psi.xml.XmlTag; diff --git a/plugins/android-designer/src/com/intellij/android/designer/designSurface/layout/actions/LayoutMarginOperation.java b/plugins/android-designer/src/com/intellij/android/designer/designSurface/layout/actions/LayoutMarginOperation.java index cdfeeec95bc4..84ffd928a597 100644 --- a/plugins/android-designer/src/com/intellij/android/designer/designSurface/layout/actions/LayoutMarginOperation.java +++ b/plugins/android-designer/src/com/intellij/android/designer/designSurface/layout/actions/LayoutMarginOperation.java @@ -16,6 +16,7 @@ package com.intellij.android.designer.designSurface.layout.actions; import com.android.SdkConstants; +import com.intellij.android.designer.designSurface.feedbacks.TextFeedback; import com.intellij.android.designer.model.ModelParser; import com.intellij.android.designer.model.RadViewComponent; import com.intellij.designer.designSurface.DecorationLayer; @@ -24,7 +25,6 @@ import com.intellij.designer.designSurface.FeedbackLayer; import com.intellij.designer.designSurface.OperationContext; import com.intellij.designer.designSurface.feedbacks.LineMarginBorder; import com.intellij.designer.designSurface.feedbacks.RectangleFeedback; -import com.intellij.designer.designSurface.feedbacks.TextFeedback; import com.intellij.designer.designSurface.selection.DirectionResizePoint; import com.intellij.designer.designSurface.selection.EmptyPoint; import com.intellij.designer.designSurface.selection.ResizeSelectionDecorator; diff --git a/plugins/android-designer/src/com/intellij/android/designer/designSurface/layout/actions/LayoutSpanOperation.java b/plugins/android-designer/src/com/intellij/android/designer/designSurface/layout/actions/LayoutSpanOperation.java index d7fa388229db..9e9a82e55bfb 100644 --- a/plugins/android-designer/src/com/intellij/android/designer/designSurface/layout/actions/LayoutSpanOperation.java +++ b/plugins/android-designer/src/com/intellij/android/designer/designSurface/layout/actions/LayoutSpanOperation.java @@ -16,6 +16,7 @@ package com.intellij.android.designer.designSurface.layout.actions; import com.android.SdkConstants; +import com.intellij.android.designer.designSurface.feedbacks.TextFeedback; import com.intellij.android.designer.designSurface.layout.grid.GridSelectionDecorator; import com.intellij.android.designer.model.ModelParser; import com.intellij.android.designer.model.RadViewComponent; @@ -28,7 +29,6 @@ import com.intellij.designer.designSurface.OperationContext; import com.intellij.designer.designSurface.feedbacks.AlphaFeedback; import com.intellij.designer.designSurface.feedbacks.LineMarginBorder; import com.intellij.designer.designSurface.feedbacks.RectangleFeedback; -import com.intellij.designer.designSurface.feedbacks.TextFeedback; import com.intellij.designer.designSurface.selection.DirectionResizePoint; import com.intellij.designer.model.RadComponent; import com.intellij.designer.utils.Position; diff --git a/plugins/android-designer/src/com/intellij/android/designer/designSurface/layout/actions/RelativeLayoutResizeOperation.java b/plugins/android-designer/src/com/intellij/android/designer/designSurface/layout/actions/RelativeLayoutResizeOperation.java index 3006297bd5f3..37eed5fcead5 100644 --- a/plugins/android-designer/src/com/intellij/android/designer/designSurface/layout/actions/RelativeLayoutResizeOperation.java +++ b/plugins/android-designer/src/com/intellij/android/designer/designSurface/layout/actions/RelativeLayoutResizeOperation.java @@ -16,6 +16,7 @@ package com.intellij.android.designer.designSurface.layout.actions; import com.android.SdkConstants; +import com.intellij.android.designer.designSurface.feedbacks.TextFeedback; import com.intellij.android.designer.designSurface.layout.RelativeLayoutOperation; import com.intellij.android.designer.designSurface.layout.relative.*; import com.intellij.android.designer.model.RadViewComponent; @@ -23,7 +24,6 @@ import com.intellij.designer.designSurface.EditOperation; import com.intellij.designer.designSurface.FeedbackLayer; import com.intellij.designer.designSurface.OperationContext; import com.intellij.designer.designSurface.feedbacks.RectangleFeedback; -import com.intellij.designer.designSurface.feedbacks.TextFeedback; import com.intellij.designer.designSurface.selection.DirectionResizePoint; import com.intellij.designer.designSurface.selection.ResizeSelectionDecorator; import com.intellij.designer.model.RadComponent; diff --git a/plugins/android-designer/src/com/intellij/android/designer/designSurface/layout/actions/ResizeOperation.java b/plugins/android-designer/src/com/intellij/android/designer/designSurface/layout/actions/ResizeOperation.java index 94fff68e5253..af60aae9023f 100644 --- a/plugins/android-designer/src/com/intellij/android/designer/designSurface/layout/actions/ResizeOperation.java +++ b/plugins/android-designer/src/com/intellij/android/designer/designSurface/layout/actions/ResizeOperation.java @@ -16,6 +16,7 @@ package com.intellij.android.designer.designSurface.layout.actions; import com.android.SdkConstants; +import com.intellij.android.designer.designSurface.feedbacks.TextFeedback; import com.intellij.android.designer.model.RadViewComponent; import com.intellij.android.designer.propertyTable.renderers.ResourceRenderer; import com.intellij.designer.designSurface.EditOperation; @@ -23,7 +24,6 @@ import com.intellij.designer.designSurface.FeedbackLayer; import com.intellij.designer.designSurface.OperationContext; import com.intellij.designer.designSurface.feedbacks.LineMarginBorder; import com.intellij.designer.designSurface.feedbacks.RectangleFeedback; -import com.intellij.designer.designSurface.feedbacks.TextFeedback; import com.intellij.designer.designSurface.selection.DirectionResizePoint; import com.intellij.designer.designSurface.selection.ResizeSelectionDecorator; import com.intellij.designer.model.RadComponent; diff --git a/plugins/android-designer/src/com/intellij/android/designer/designSurface/layout/caption/HorizontalCaptionFlowBaseOperation.java b/plugins/android-designer/src/com/intellij/android/designer/designSurface/layout/caption/HorizontalCaptionFlowBaseOperation.java index 5acd3c0fca4d..25c904e247fe 100644 --- a/plugins/android-designer/src/com/intellij/android/designer/designSurface/layout/caption/HorizontalCaptionFlowBaseOperation.java +++ b/plugins/android-designer/src/com/intellij/android/designer/designSurface/layout/caption/HorizontalCaptionFlowBaseOperation.java @@ -15,10 +15,10 @@ */ package com.intellij.android.designer.designSurface.layout.caption; +import com.intellij.android.designer.designSurface.layout.AbstractFlowBaseOperation; import com.intellij.android.designer.model.RadViewComponent; import com.intellij.designer.designSurface.EditableArea; import com.intellij.designer.designSurface.FeedbackLayer; -import com.intellij.designer.designSurface.FlowBaseOperation; import com.intellij.designer.designSurface.OperationContext; import com.intellij.designer.designSurface.feedbacks.LineInsertFeedback; import com.intellij.designer.model.RadComponent; @@ -31,7 +31,7 @@ import java.util.List; /** * @author Alexander Lobas */ -public abstract class HorizontalCaptionFlowBaseOperation extends FlowBaseOperation { +public abstract class HorizontalCaptionFlowBaseOperation extends AbstractFlowBaseOperation { protected final T myMainContainer; private final EditableArea myMainArea; private LineInsertFeedback myMainInsertFeedback; diff --git a/plugins/android-designer/src/com/intellij/android/designer/designSurface/layout/caption/VerticalCaptionFlowBaseOperation.java b/plugins/android-designer/src/com/intellij/android/designer/designSurface/layout/caption/VerticalCaptionFlowBaseOperation.java index d1918a4a4511..73d18d68e367 100644 --- a/plugins/android-designer/src/com/intellij/android/designer/designSurface/layout/caption/VerticalCaptionFlowBaseOperation.java +++ b/plugins/android-designer/src/com/intellij/android/designer/designSurface/layout/caption/VerticalCaptionFlowBaseOperation.java @@ -15,10 +15,10 @@ */ package com.intellij.android.designer.designSurface.layout.caption; +import com.intellij.android.designer.designSurface.layout.AbstractFlowBaseOperation; import com.intellij.android.designer.model.RadViewComponent; import com.intellij.designer.designSurface.EditableArea; import com.intellij.designer.designSurface.FeedbackLayer; -import com.intellij.designer.designSurface.FlowBaseOperation; import com.intellij.designer.designSurface.OperationContext; import com.intellij.designer.designSurface.feedbacks.LineInsertFeedback; import com.intellij.designer.model.RadComponent; @@ -31,7 +31,7 @@ import java.util.List; /** * @author Alexander Lobas */ -public abstract class VerticalCaptionFlowBaseOperation extends FlowBaseOperation { +public abstract class VerticalCaptionFlowBaseOperation extends AbstractFlowBaseOperation { protected final T myMainContainer; private final EditableArea myMainArea; private LineInsertFeedback myMainInsertFeedback; diff --git a/plugins/android-designer/src/com/intellij/android/designer/designSurface/layout/flow/FlowBaseOperation.java b/plugins/android-designer/src/com/intellij/android/designer/designSurface/layout/flow/FlowBaseOperation.java index 98e9a7b8776c..74b8d2a842d3 100644 --- a/plugins/android-designer/src/com/intellij/android/designer/designSurface/layout/flow/FlowBaseOperation.java +++ b/plugins/android-designer/src/com/intellij/android/designer/designSurface/layout/flow/FlowBaseOperation.java @@ -16,6 +16,7 @@ package com.intellij.android.designer.designSurface.layout.flow; import com.intellij.android.designer.designSurface.AbstractEditOperation; +import com.intellij.android.designer.designSurface.layout.AbstractFlowBaseOperation; import com.intellij.android.designer.model.RadViewComponent; import com.intellij.designer.designSurface.FeedbackLayer; import com.intellij.designer.designSurface.OperationContext; @@ -27,7 +28,7 @@ import java.awt.*; /** * @author Alexander Lobas */ -public class FlowBaseOperation extends com.intellij.designer.designSurface.FlowBaseOperation { +public class FlowBaseOperation extends AbstractFlowBaseOperation { public FlowBaseOperation(RadComponent container, OperationContext context, boolean horizontal) { super(container, context, horizontal); } diff --git a/plugins/android-designer/src/com/intellij/android/designer/designSurface/layout/grid/GridOperation.java b/plugins/android-designer/src/com/intellij/android/designer/designSurface/layout/grid/GridOperation.java index a0e85fb3369a..3210db8b2ac7 100644 --- a/plugins/android-designer/src/com/intellij/android/designer/designSurface/layout/grid/GridOperation.java +++ b/plugins/android-designer/src/com/intellij/android/designer/designSurface/layout/grid/GridOperation.java @@ -16,6 +16,7 @@ package com.intellij.android.designer.designSurface.layout.grid; import com.intellij.android.designer.designSurface.AbstractEditOperation; +import com.intellij.android.designer.designSurface.feedbacks.TextFeedback; import com.intellij.android.designer.designSurface.layout.BorderStaticDecorator; import com.intellij.android.designer.model.grid.GridInfo; import com.intellij.android.designer.model.grid.GridInsertType; @@ -24,7 +25,6 @@ import com.intellij.designer.designSurface.FeedbackLayer; import com.intellij.designer.designSurface.OperationContext; import com.intellij.designer.designSurface.feedbacks.AlphaFeedback; import com.intellij.designer.designSurface.feedbacks.InsertFeedback; -import com.intellij.designer.designSurface.feedbacks.TextFeedback; import com.intellij.designer.model.RadComponent; import com.intellij.ui.IdeBorderFactory; import com.intellij.ui.JBColor; diff --git a/plugins/android-designer/src/com/intellij/android/designer/designSurface/layout/relative/AutoResizeSnapPoint.java b/plugins/android-designer/src/com/intellij/android/designer/designSurface/layout/relative/AutoResizeSnapPoint.java index 62b0de63e6c4..0ab02da10ccd 100644 --- a/plugins/android-designer/src/com/intellij/android/designer/designSurface/layout/relative/AutoResizeSnapPoint.java +++ b/plugins/android-designer/src/com/intellij/android/designer/designSurface/layout/relative/AutoResizeSnapPoint.java @@ -16,9 +16,9 @@ package com.intellij.android.designer.designSurface.layout.relative; import com.android.SdkConstants; +import com.intellij.android.designer.designSurface.feedbacks.TextFeedback; import com.intellij.android.designer.model.ModelParser; import com.intellij.android.designer.model.RadViewComponent; -import com.intellij.designer.designSurface.feedbacks.TextFeedback; import com.intellij.designer.model.RadComponent; import com.intellij.openapi.application.ApplicationManager; import com.intellij.psi.xml.XmlTag; diff --git a/plugins/android-designer/src/com/intellij/android/designer/designSurface/layout/relative/AutoSnapPoint.java b/plugins/android-designer/src/com/intellij/android/designer/designSurface/layout/relative/AutoSnapPoint.java index 823b737111e5..4e1f7b988b26 100644 --- a/plugins/android-designer/src/com/intellij/android/designer/designSurface/layout/relative/AutoSnapPoint.java +++ b/plugins/android-designer/src/com/intellij/android/designer/designSurface/layout/relative/AutoSnapPoint.java @@ -16,8 +16,8 @@ package com.intellij.android.designer.designSurface.layout.relative; import com.android.SdkConstants; +import com.intellij.android.designer.designSurface.feedbacks.TextFeedback; import com.intellij.android.designer.model.RadViewComponent; -import com.intellij.designer.designSurface.feedbacks.TextFeedback; import com.intellij.designer.model.RadComponent; import com.intellij.openapi.application.ApplicationManager; import com.intellij.psi.xml.XmlTag; diff --git a/plugins/android-designer/src/com/intellij/android/designer/designSurface/layout/relative/BaselineSnapPoint.java b/plugins/android-designer/src/com/intellij/android/designer/designSurface/layout/relative/BaselineSnapPoint.java index 39a7a29e5f62..f9559e69acae 100644 --- a/plugins/android-designer/src/com/intellij/android/designer/designSurface/layout/relative/BaselineSnapPoint.java +++ b/plugins/android-designer/src/com/intellij/android/designer/designSurface/layout/relative/BaselineSnapPoint.java @@ -16,9 +16,9 @@ package com.intellij.android.designer.designSurface.layout.relative; import com.android.SdkConstants; +import com.intellij.android.designer.designSurface.feedbacks.TextFeedback; import com.intellij.android.designer.model.RadViewComponent; import com.intellij.designer.componentTree.AttributeWrapper; -import com.intellij.designer.designSurface.feedbacks.TextFeedback; import com.intellij.designer.model.RadComponent; import com.intellij.openapi.application.ApplicationManager; import com.intellij.psi.xml.XmlTag; diff --git a/plugins/android-designer/src/com/intellij/android/designer/designSurface/layout/relative/ComponentSnapPoint.java b/plugins/android-designer/src/com/intellij/android/designer/designSurface/layout/relative/ComponentSnapPoint.java index ac0ba972dd21..6df23ce1f84c 100644 --- a/plugins/android-designer/src/com/intellij/android/designer/designSurface/layout/relative/ComponentSnapPoint.java +++ b/plugins/android-designer/src/com/intellij/android/designer/designSurface/layout/relative/ComponentSnapPoint.java @@ -16,9 +16,9 @@ package com.intellij.android.designer.designSurface.layout.relative; import com.android.SdkConstants; +import com.intellij.android.designer.designSurface.feedbacks.TextFeedback; import com.intellij.android.designer.model.RadViewComponent; import com.intellij.designer.componentTree.AttributeWrapper; -import com.intellij.designer.designSurface.feedbacks.TextFeedback; import com.intellij.designer.model.RadComponent; import com.intellij.openapi.application.ApplicationManager; import com.intellij.psi.xml.XmlTag; diff --git a/plugins/android-designer/src/com/intellij/android/designer/designSurface/layout/relative/ContainerSnapPoint.java b/plugins/android-designer/src/com/intellij/android/designer/designSurface/layout/relative/ContainerSnapPoint.java index fe5bcad6e601..ae16b3d57bdb 100644 --- a/plugins/android-designer/src/com/intellij/android/designer/designSurface/layout/relative/ContainerSnapPoint.java +++ b/plugins/android-designer/src/com/intellij/android/designer/designSurface/layout/relative/ContainerSnapPoint.java @@ -16,8 +16,8 @@ package com.intellij.android.designer.designSurface.layout.relative; import com.android.SdkConstants; +import com.intellij.android.designer.designSurface.feedbacks.TextFeedback; import com.intellij.android.designer.model.RadViewComponent; -import com.intellij.designer.designSurface.feedbacks.TextFeedback; import com.intellij.designer.model.RadComponent; import com.intellij.openapi.application.ApplicationManager; import com.intellij.psi.xml.XmlTag; diff --git a/plugins/android-designer/src/com/intellij/android/designer/designSurface/layout/relative/ResizeComponentSnapPoint.java b/plugins/android-designer/src/com/intellij/android/designer/designSurface/layout/relative/ResizeComponentSnapPoint.java index 6143b2497b62..e9bafe79272c 100644 --- a/plugins/android-designer/src/com/intellij/android/designer/designSurface/layout/relative/ResizeComponentSnapPoint.java +++ b/plugins/android-designer/src/com/intellij/android/designer/designSurface/layout/relative/ResizeComponentSnapPoint.java @@ -15,9 +15,9 @@ */ package com.intellij.android.designer.designSurface.layout.relative; +import com.intellij.android.designer.designSurface.feedbacks.TextFeedback; import com.intellij.android.designer.model.ModelParser; import com.intellij.android.designer.model.RadViewComponent; -import com.intellij.designer.designSurface.feedbacks.TextFeedback; import com.intellij.designer.model.RadComponent; import com.intellij.openapi.application.ApplicationManager; import com.intellij.psi.xml.XmlTag; diff --git a/plugins/android-designer/src/com/intellij/android/designer/designSurface/layout/relative/ResizeContainerSnapPoint.java b/plugins/android-designer/src/com/intellij/android/designer/designSurface/layout/relative/ResizeContainerSnapPoint.java index 82d5672b6afe..c0f4c9625453 100644 --- a/plugins/android-designer/src/com/intellij/android/designer/designSurface/layout/relative/ResizeContainerSnapPoint.java +++ b/plugins/android-designer/src/com/intellij/android/designer/designSurface/layout/relative/ResizeContainerSnapPoint.java @@ -15,9 +15,9 @@ */ package com.intellij.android.designer.designSurface.layout.relative; +import com.intellij.android.designer.designSurface.feedbacks.TextFeedback; import com.intellij.android.designer.model.ModelParser; import com.intellij.android.designer.model.RadViewComponent; -import com.intellij.designer.designSurface.feedbacks.TextFeedback; import com.intellij.designer.model.RadComponent; import com.intellij.openapi.application.ApplicationManager; import com.intellij.psi.xml.XmlTag; diff --git a/plugins/android-designer/src/com/intellij/android/designer/designSurface/layout/relative/SnapPoint.java b/plugins/android-designer/src/com/intellij/android/designer/designSurface/layout/relative/SnapPoint.java index d4d276ed5084..7d8c5f028907 100644 --- a/plugins/android-designer/src/com/intellij/android/designer/designSurface/layout/relative/SnapPoint.java +++ b/plugins/android-designer/src/com/intellij/android/designer/designSurface/layout/relative/SnapPoint.java @@ -15,9 +15,9 @@ */ package com.intellij.android.designer.designSurface.layout.relative; +import com.intellij.android.designer.designSurface.feedbacks.TextFeedback; import com.intellij.android.designer.model.RadViewComponent; import com.intellij.designer.componentTree.TreeComponentDecorator; -import com.intellij.designer.designSurface.feedbacks.TextFeedback; import com.intellij.designer.model.RadComponent; import java.awt.*; diff --git a/plugins/android-designer/src/com/intellij/android/designer/designSurface/layout/relative/WrapSizeSnapPoint.java b/plugins/android-designer/src/com/intellij/android/designer/designSurface/layout/relative/WrapSizeSnapPoint.java index bd12082a89f9..890c19658809 100644 --- a/plugins/android-designer/src/com/intellij/android/designer/designSurface/layout/relative/WrapSizeSnapPoint.java +++ b/plugins/android-designer/src/com/intellij/android/designer/designSurface/layout/relative/WrapSizeSnapPoint.java @@ -16,9 +16,9 @@ package com.intellij.android.designer.designSurface.layout.relative; import com.android.SdkConstants; +import com.intellij.android.designer.designSurface.feedbacks.TextFeedback; import com.intellij.android.designer.model.ModelParser; import com.intellij.android.designer.model.RadViewComponent; -import com.intellij.designer.designSurface.feedbacks.TextFeedback; import com.intellij.designer.model.RadComponent; import com.intellij.openapi.application.ApplicationManager; import com.intellij.psi.xml.XmlTag;