diff --git a/plugins/android-designer/src/com/intellij/android/designer/designSurface/layout/GridLayoutOperation.java b/plugins/android-designer/src/com/intellij/android/designer/designSurface/layout/GridLayoutOperation.java index 45c2cf373dfd..1048cfa3ab1e 100644 --- a/plugins/android-designer/src/com/intellij/android/designer/designSurface/layout/GridLayoutOperation.java +++ b/plugins/android-designer/src/com/intellij/android/designer/designSurface/layout/GridLayoutOperation.java @@ -15,6 +15,7 @@ */ package com.intellij.android.designer.designSurface.layout; +import com.intellij.android.designer.designSurface.layout.grid.GridOperation; import com.intellij.designer.designSurface.OperationContext; import com.intellij.designer.model.RadComponent; 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 a789c5db3bf7..f943ed3dba1b 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 @@ -15,6 +15,8 @@ */ package com.intellij.android.designer.designSurface.layout; +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; import com.intellij.android.designer.model.RadViewComponent; import com.intellij.android.designer.model.layout.Gravity; diff --git a/plugins/android-designer/src/com/intellij/android/designer/designSurface/layout/TableLayoutOperation.java b/plugins/android-designer/src/com/intellij/android/designer/designSurface/layout/TableLayoutOperation.java index 686bf2460137..f248b0273ff3 100644 --- a/plugins/android-designer/src/com/intellij/android/designer/designSurface/layout/TableLayoutOperation.java +++ b/plugins/android-designer/src/com/intellij/android/designer/designSurface/layout/TableLayoutOperation.java @@ -15,13 +15,14 @@ */ package com.intellij.android.designer.designSurface.layout; +import com.intellij.android.designer.designSurface.layout.grid.GridOperation; import com.intellij.android.designer.model.ModelParser; import com.intellij.android.designer.model.RadViewComponent; import com.intellij.android.designer.model.ViewsMetaManager; -import com.intellij.android.designer.model.agrid.GridInfo; -import com.intellij.android.designer.model.agrid.GridInsertType; -import com.intellij.android.designer.model.table.RadTableLayoutComponent; -import com.intellij.android.designer.model.table.RadTableRowLayout; +import com.intellij.android.designer.model.grid.GridInfo; +import com.intellij.android.designer.model.grid.GridInsertType; +import com.intellij.android.designer.model.layout.table.RadTableLayoutComponent; +import com.intellij.android.designer.model.layout.table.RadTableRowLayout; import com.intellij.designer.designSurface.OperationContext; import com.intellij.designer.model.MetaManager; import com.intellij.designer.model.MetaModel; diff --git a/plugins/android-designer/src/com/intellij/android/designer/designSurface/layout/LayoutMarginOperation.java b/plugins/android-designer/src/com/intellij/android/designer/designSurface/layout/actions/LayoutMarginOperation.java similarity index 99% rename from plugins/android-designer/src/com/intellij/android/designer/designSurface/layout/LayoutMarginOperation.java rename to plugins/android-designer/src/com/intellij/android/designer/designSurface/layout/actions/LayoutMarginOperation.java index 153ed19e140b..9153d87e2c51 100644 --- a/plugins/android-designer/src/com/intellij/android/designer/designSurface/layout/LayoutMarginOperation.java +++ b/plugins/android-designer/src/com/intellij/android/designer/designSurface/layout/actions/LayoutMarginOperation.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.intellij.android.designer.designSurface.layout; +package com.intellij.android.designer.designSurface.layout.actions; import com.intellij.android.designer.model.ModelParser; import com.intellij.android.designer.model.RadViewComponent; diff --git a/plugins/android-designer/src/com/intellij/android/designer/designSurface/layout/LayoutSpanOperation.java b/plugins/android-designer/src/com/intellij/android/designer/designSurface/layout/actions/LayoutSpanOperation.java similarity index 97% rename from plugins/android-designer/src/com/intellij/android/designer/designSurface/layout/LayoutSpanOperation.java rename to plugins/android-designer/src/com/intellij/android/designer/designSurface/layout/actions/LayoutSpanOperation.java index 1672f8528781..280a594b5e54 100644 --- a/plugins/android-designer/src/com/intellij/android/designer/designSurface/layout/LayoutSpanOperation.java +++ b/plugins/android-designer/src/com/intellij/android/designer/designSurface/layout/actions/LayoutSpanOperation.java @@ -13,12 +13,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.intellij.android.designer.designSurface.layout; +package com.intellij.android.designer.designSurface.layout.actions; import com.intellij.android.designer.model.ModelParser; import com.intellij.android.designer.model.RadViewComponent; -import com.intellij.android.designer.model.agrid.GridInfo; -import com.intellij.android.designer.model.table.RadTableLayoutComponent; +import com.intellij.android.designer.model.grid.GridInfo; +import com.intellij.android.designer.model.layout.table.RadTableLayoutComponent; import com.intellij.designer.designSurface.EditOperation; import com.intellij.designer.designSurface.FeedbackLayer; import com.intellij.designer.designSurface.OperationContext; diff --git a/plugins/android-designer/src/com/intellij/android/designer/designSurface/layout/LayoutWeightOperation.java b/plugins/android-designer/src/com/intellij/android/designer/designSurface/layout/actions/LayoutWeightOperation.java similarity index 98% rename from plugins/android-designer/src/com/intellij/android/designer/designSurface/layout/LayoutWeightOperation.java rename to plugins/android-designer/src/com/intellij/android/designer/designSurface/layout/actions/LayoutWeightOperation.java index 5f3bc35e69ac..bd583b0bc88c 100644 --- a/plugins/android-designer/src/com/intellij/android/designer/designSurface/layout/LayoutWeightOperation.java +++ b/plugins/android-designer/src/com/intellij/android/designer/designSurface/layout/actions/LayoutWeightOperation.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.intellij.android.designer.designSurface.layout; +package com.intellij.android.designer.designSurface.layout.actions; import com.intellij.android.designer.model.ModelParser; import com.intellij.designer.designSurface.OperationContext; diff --git a/plugins/android-designer/src/com/intellij/android/designer/designSurface/layout/ResizeOperation.java b/plugins/android-designer/src/com/intellij/android/designer/designSurface/layout/actions/ResizeOperation.java similarity index 99% rename from plugins/android-designer/src/com/intellij/android/designer/designSurface/layout/ResizeOperation.java rename to plugins/android-designer/src/com/intellij/android/designer/designSurface/layout/actions/ResizeOperation.java index a2efd0920c95..32605ebb346c 100644 --- a/plugins/android-designer/src/com/intellij/android/designer/designSurface/layout/ResizeOperation.java +++ b/plugins/android-designer/src/com/intellij/android/designer/designSurface/layout/actions/ResizeOperation.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.intellij.android.designer.designSurface.layout; +package com.intellij.android.designer.designSurface.layout.actions; import com.intellij.android.designer.model.RadViewComponent; import com.intellij.android.designer.propertyTable.renderers.ResourceRenderer; diff --git a/plugins/android-designer/src/com/intellij/android/designer/designSurface/layout/HorizontalCaptionFlowBaseOperation.java b/plugins/android-designer/src/com/intellij/android/designer/designSurface/layout/caption/HorizontalCaptionFlowBaseOperation.java similarity index 94% rename from plugins/android-designer/src/com/intellij/android/designer/designSurface/layout/HorizontalCaptionFlowBaseOperation.java rename to plugins/android-designer/src/com/intellij/android/designer/designSurface/layout/caption/HorizontalCaptionFlowBaseOperation.java index b12944f7bf59..fe25bcb7ccb9 100644 --- a/plugins/android-designer/src/com/intellij/android/designer/designSurface/layout/HorizontalCaptionFlowBaseOperation.java +++ b/plugins/android-designer/src/com/intellij/android/designer/designSurface/layout/caption/HorizontalCaptionFlowBaseOperation.java @@ -13,13 +13,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.intellij.android.designer.designSurface.layout; +package com.intellij.android.designer.designSurface.layout.caption; import com.intellij.android.designer.model.ModelParser; import com.intellij.android.designer.model.RadViewComponent; -import com.intellij.android.designer.model.table.RadCaptionTableColumn; -import com.intellij.android.designer.model.table.RadTableLayoutComponent; -import com.intellij.android.designer.model.table.RadTableRowLayout; +import com.intellij.android.designer.model.layout.table.RadCaptionTableColumn; +import com.intellij.android.designer.model.layout.table.RadTableLayoutComponent; +import com.intellij.android.designer.model.layout.table.RadTableRowLayout; import com.intellij.designer.designSurface.EditableArea; import com.intellij.designer.designSurface.FeedbackLayer; import com.intellij.designer.designSurface.FlowBaseOperation; diff --git a/plugins/android-designer/src/com/intellij/android/designer/designSurface/layout/VerticalCaptionFlowBaseOperation.java b/plugins/android-designer/src/com/intellij/android/designer/designSurface/layout/caption/VerticalCaptionFlowBaseOperation.java similarity index 94% rename from plugins/android-designer/src/com/intellij/android/designer/designSurface/layout/VerticalCaptionFlowBaseOperation.java rename to plugins/android-designer/src/com/intellij/android/designer/designSurface/layout/caption/VerticalCaptionFlowBaseOperation.java index 006fd4e8bba5..c51d7fda924e 100644 --- a/plugins/android-designer/src/com/intellij/android/designer/designSurface/layout/VerticalCaptionFlowBaseOperation.java +++ b/plugins/android-designer/src/com/intellij/android/designer/designSurface/layout/caption/VerticalCaptionFlowBaseOperation.java @@ -13,12 +13,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.intellij.android.designer.designSurface.layout; +package com.intellij.android.designer.designSurface.layout.caption; import com.intellij.android.designer.designSurface.AbstractEditOperation; import com.intellij.android.designer.model.RadViewComponent; -import com.intellij.android.designer.model.table.RadCaptionTableRow; -import com.intellij.android.designer.model.table.RadTableLayoutComponent; +import com.intellij.android.designer.model.layout.table.RadCaptionTableRow; +import com.intellij.android.designer.model.layout.table.RadTableLayoutComponent; import com.intellij.designer.designSurface.EditableArea; import com.intellij.designer.designSurface.FlowBaseOperation; import com.intellij.designer.designSurface.OperationContext; diff --git a/plugins/android-designer/src/com/intellij/android/designer/designSurface/layout/FlowBaseOperation.java b/plugins/android-designer/src/com/intellij/android/designer/designSurface/layout/flow/FlowBaseOperation.java similarity index 96% rename from plugins/android-designer/src/com/intellij/android/designer/designSurface/layout/FlowBaseOperation.java rename to plugins/android-designer/src/com/intellij/android/designer/designSurface/layout/flow/FlowBaseOperation.java index bb4c2555f7a8..98e9a7b8776c 100644 --- a/plugins/android-designer/src/com/intellij/android/designer/designSurface/layout/FlowBaseOperation.java +++ b/plugins/android-designer/src/com/intellij/android/designer/designSurface/layout/flow/FlowBaseOperation.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.intellij.android.designer.designSurface.layout; +package com.intellij.android.designer.designSurface.layout.flow; import com.intellij.android.designer.designSurface.AbstractEditOperation; import com.intellij.android.designer.model.RadViewComponent; diff --git a/plugins/android-designer/src/com/intellij/android/designer/designSurface/layout/FlowStaticDecorator.java b/plugins/android-designer/src/com/intellij/android/designer/designSurface/layout/flow/FlowStaticDecorator.java similarity index 93% rename from plugins/android-designer/src/com/intellij/android/designer/designSurface/layout/FlowStaticDecorator.java rename to plugins/android-designer/src/com/intellij/android/designer/designSurface/layout/flow/FlowStaticDecorator.java index 61a50302748e..4839553c1ca4 100644 --- a/plugins/android-designer/src/com/intellij/android/designer/designSurface/layout/FlowStaticDecorator.java +++ b/plugins/android-designer/src/com/intellij/android/designer/designSurface/layout/flow/FlowStaticDecorator.java @@ -13,8 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.intellij.android.designer.designSurface.layout; +package com.intellij.android.designer.designSurface.layout.flow; +import com.intellij.android.designer.designSurface.layout.BorderStaticDecorator; import com.intellij.android.designer.model.RadViewComponent; import com.intellij.designer.designSurface.DecorationLayer; import com.intellij.designer.designSurface.StaticDecorator; diff --git a/plugins/android-designer/src/com/intellij/android/designer/designSurface/layout/GridDecorator.java b/plugins/android-designer/src/com/intellij/android/designer/designSurface/layout/grid/GridDecorator.java similarity index 83% rename from plugins/android-designer/src/com/intellij/android/designer/designSurface/layout/GridDecorator.java rename to plugins/android-designer/src/com/intellij/android/designer/designSurface/layout/grid/GridDecorator.java index a98727888bcf..0166c0c74f37 100644 --- a/plugins/android-designer/src/com/intellij/android/designer/designSurface/layout/GridDecorator.java +++ b/plugins/android-designer/src/com/intellij/android/designer/designSurface/layout/grid/GridDecorator.java @@ -13,10 +13,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.intellij.android.designer.designSurface.layout; +package com.intellij.android.designer.designSurface.layout.grid; -import com.intellij.android.designer.model.agrid.GridInfo; -import com.intellij.android.designer.model.agrid.IGridProvider; +import com.intellij.android.designer.designSurface.layout.BorderStaticDecorator; +import com.intellij.android.designer.designSurface.layout.flow.FlowStaticDecorator; +import com.intellij.android.designer.model.grid.GridInfo; +import com.intellij.android.designer.model.grid.IGridProvider; import com.intellij.designer.designSurface.DecorationLayer; import com.intellij.designer.designSurface.StaticDecorator; import com.intellij.designer.model.RadComponent; diff --git a/plugins/android-designer/src/com/intellij/android/designer/designSurface/layout/GridOperation.java b/plugins/android-designer/src/com/intellij/android/designer/designSurface/layout/grid/GridOperation.java similarity index 97% rename from plugins/android-designer/src/com/intellij/android/designer/designSurface/layout/GridOperation.java rename to plugins/android-designer/src/com/intellij/android/designer/designSurface/layout/grid/GridOperation.java index ea799d5d2f80..4e519cbf4dca 100644 --- a/plugins/android-designer/src/com/intellij/android/designer/designSurface/layout/GridOperation.java +++ b/plugins/android-designer/src/com/intellij/android/designer/designSurface/layout/grid/GridOperation.java @@ -13,12 +13,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.intellij.android.designer.designSurface.layout; +package com.intellij.android.designer.designSurface.layout.grid; import com.intellij.android.designer.designSurface.AbstractEditOperation; -import com.intellij.android.designer.model.agrid.GridInfo; -import com.intellij.android.designer.model.agrid.GridInsertType; -import com.intellij.android.designer.model.agrid.IGridProvider; +import com.intellij.android.designer.designSurface.layout.BorderStaticDecorator; +import com.intellij.android.designer.model.grid.GridInfo; +import com.intellij.android.designer.model.grid.GridInsertType; +import com.intellij.android.designer.model.grid.IGridProvider; import com.intellij.designer.designSurface.FeedbackLayer; import com.intellij.designer.designSurface.OperationContext; import com.intellij.designer.designSurface.feedbacks.AlphaFeedback; diff --git a/plugins/android-designer/src/com/intellij/android/designer/model/agrid/GridInfo.java b/plugins/android-designer/src/com/intellij/android/designer/model/grid/GridInfo.java similarity index 97% rename from plugins/android-designer/src/com/intellij/android/designer/model/agrid/GridInfo.java rename to plugins/android-designer/src/com/intellij/android/designer/model/grid/GridInfo.java index 4ac7bbc9f6cd..5820c87e3405 100644 --- a/plugins/android-designer/src/com/intellij/android/designer/model/agrid/GridInfo.java +++ b/plugins/android-designer/src/com/intellij/android/designer/model/grid/GridInfo.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.intellij.android.designer.model.agrid; +package com.intellij.android.designer.model.grid; import com.intellij.designer.model.RadComponent; import com.intellij.util.ArrayUtil; diff --git a/plugins/android-designer/src/com/intellij/android/designer/model/agrid/GridInsertType.java b/plugins/android-designer/src/com/intellij/android/designer/model/grid/GridInsertType.java similarity index 94% rename from plugins/android-designer/src/com/intellij/android/designer/model/agrid/GridInsertType.java rename to plugins/android-designer/src/com/intellij/android/designer/model/grid/GridInsertType.java index 85031d642f36..b1da02239180 100644 --- a/plugins/android-designer/src/com/intellij/android/designer/model/agrid/GridInsertType.java +++ b/plugins/android-designer/src/com/intellij/android/designer/model/grid/GridInsertType.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.intellij.android.designer.model.agrid; +package com.intellij.android.designer.model.grid; /** * @author Alexander Lobas diff --git a/plugins/android-designer/src/com/intellij/android/designer/model/agrid/IGridProvider.java b/plugins/android-designer/src/com/intellij/android/designer/model/grid/IGridProvider.java similarity index 93% rename from plugins/android-designer/src/com/intellij/android/designer/model/agrid/IGridProvider.java rename to plugins/android-designer/src/com/intellij/android/designer/model/grid/IGridProvider.java index cf1b97c00cea..b345b55da96b 100644 --- a/plugins/android-designer/src/com/intellij/android/designer/model/agrid/IGridProvider.java +++ b/plugins/android-designer/src/com/intellij/android/designer/model/grid/IGridProvider.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.intellij.android.designer.model.agrid; +package com.intellij.android.designer.model.grid; /** * @author Alexander Lobas diff --git a/plugins/android-designer/src/com/intellij/android/designer/model/agrid/RadCaptionColumn.java b/plugins/android-designer/src/com/intellij/android/designer/model/grid/RadCaptionColumn.java similarity index 96% rename from plugins/android-designer/src/com/intellij/android/designer/model/agrid/RadCaptionColumn.java rename to plugins/android-designer/src/com/intellij/android/designer/model/grid/RadCaptionColumn.java index 254037d30b46..3a9b085382eb 100644 --- a/plugins/android-designer/src/com/intellij/android/designer/model/agrid/RadCaptionColumn.java +++ b/plugins/android-designer/src/com/intellij/android/designer/model/grid/RadCaptionColumn.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.intellij.android.designer.model.agrid; +package com.intellij.android.designer.model.grid; import com.intellij.android.designer.model.RadViewComponent; diff --git a/plugins/android-designer/src/com/intellij/android/designer/model/agrid/RadCaptionComponent.java b/plugins/android-designer/src/com/intellij/android/designer/model/grid/RadCaptionComponent.java similarity index 97% rename from plugins/android-designer/src/com/intellij/android/designer/model/agrid/RadCaptionComponent.java rename to plugins/android-designer/src/com/intellij/android/designer/model/grid/RadCaptionComponent.java index 5c3d87d801a6..237478c1327f 100644 --- a/plugins/android-designer/src/com/intellij/android/designer/model/agrid/RadCaptionComponent.java +++ b/plugins/android-designer/src/com/intellij/android/designer/model/grid/RadCaptionComponent.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.intellij.android.designer.model.agrid; +package com.intellij.android.designer.model.grid; import com.intellij.android.designer.designSurface.layout.CaptionStaticDecorator; import com.intellij.android.designer.model.RadViewComponent; diff --git a/plugins/android-designer/src/com/intellij/android/designer/model/agrid/RadCaptionRow.java b/plugins/android-designer/src/com/intellij/android/designer/model/grid/RadCaptionRow.java similarity index 96% rename from plugins/android-designer/src/com/intellij/android/designer/model/agrid/RadCaptionRow.java rename to plugins/android-designer/src/com/intellij/android/designer/model/grid/RadCaptionRow.java index 04443bf3e2ee..ec46463d6dbf 100644 --- a/plugins/android-designer/src/com/intellij/android/designer/model/agrid/RadCaptionRow.java +++ b/plugins/android-designer/src/com/intellij/android/designer/model/grid/RadCaptionRow.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.intellij.android.designer.model.agrid; +package com.intellij.android.designer.model.grid; import com.intellij.android.designer.model.RadViewComponent; diff --git a/plugins/android-designer/src/com/intellij/android/designer/model/layout/RadAbsoluteLayout.java b/plugins/android-designer/src/com/intellij/android/designer/model/layout/RadAbsoluteLayout.java index bea6245f5eac..5c710364f13c 100644 --- a/plugins/android-designer/src/com/intellij/android/designer/model/layout/RadAbsoluteLayout.java +++ b/plugins/android-designer/src/com/intellij/android/designer/model/layout/RadAbsoluteLayout.java @@ -17,7 +17,7 @@ package com.intellij.android.designer.model.layout; import com.intellij.android.designer.designSurface.TreeDropToOperation; import com.intellij.android.designer.designSurface.layout.AbsoluteLayoutOperation; -import com.intellij.android.designer.designSurface.layout.ResizeOperation; +import com.intellij.android.designer.designSurface.layout.actions.ResizeOperation; import com.intellij.android.designer.model.RadViewLayoutWithData; import com.intellij.designer.componentTree.TreeEditOperation; import com.intellij.designer.designSurface.ComponentDecorator; diff --git a/plugins/android-designer/src/com/intellij/android/designer/model/layout/RadFrameLayout.java b/plugins/android-designer/src/com/intellij/android/designer/model/layout/RadFrameLayout.java index 6e87f7fda5fc..da511cf7b3e4 100644 --- a/plugins/android-designer/src/com/intellij/android/designer/model/layout/RadFrameLayout.java +++ b/plugins/android-designer/src/com/intellij/android/designer/model/layout/RadFrameLayout.java @@ -17,8 +17,8 @@ package com.intellij.android.designer.model.layout; import com.intellij.android.designer.designSurface.TreeDropToOperation; import com.intellij.android.designer.designSurface.layout.FrameLayoutOperation; -import com.intellij.android.designer.designSurface.layout.LayoutMarginOperation; -import com.intellij.android.designer.designSurface.layout.ResizeOperation; +import com.intellij.android.designer.designSurface.layout.actions.LayoutMarginOperation; +import com.intellij.android.designer.designSurface.layout.actions.ResizeOperation; import com.intellij.android.designer.model.RadViewComponent; import com.intellij.android.designer.model.RadViewLayoutWithData; import com.intellij.designer.componentTree.TreeEditOperation; diff --git a/plugins/android-designer/src/com/intellij/android/designer/model/layout/RadLinearLayout.java b/plugins/android-designer/src/com/intellij/android/designer/model/layout/RadLinearLayout.java index a7187af65c15..97cbff9c4e52 100644 --- a/plugins/android-designer/src/com/intellij/android/designer/model/layout/RadLinearLayout.java +++ b/plugins/android-designer/src/com/intellij/android/designer/model/layout/RadLinearLayout.java @@ -17,6 +17,10 @@ package com.intellij.android.designer.model.layout; import com.intellij.android.designer.designSurface.TreeDropToOperation; import com.intellij.android.designer.designSurface.layout.*; +import com.intellij.android.designer.designSurface.layout.actions.LayoutMarginOperation; +import com.intellij.android.designer.designSurface.layout.actions.LayoutWeightOperation; +import com.intellij.android.designer.designSurface.layout.actions.ResizeOperation; +import com.intellij.android.designer.designSurface.layout.flow.FlowStaticDecorator; import com.intellij.android.designer.model.RadViewComponent; import com.intellij.android.designer.model.RadViewLayoutWithData; import com.intellij.designer.componentTree.TreeEditOperation; diff --git a/plugins/android-designer/src/com/intellij/android/designer/model/grid/RadCaptionGridColumn.java b/plugins/android-designer/src/com/intellij/android/designer/model/layout/grid/RadCaptionGridColumn.java similarity index 87% rename from plugins/android-designer/src/com/intellij/android/designer/model/grid/RadCaptionGridColumn.java rename to plugins/android-designer/src/com/intellij/android/designer/model/layout/grid/RadCaptionGridColumn.java index b250e4124cf9..81a4a767414f 100644 --- a/plugins/android-designer/src/com/intellij/android/designer/model/grid/RadCaptionGridColumn.java +++ b/plugins/android-designer/src/com/intellij/android/designer/model/layout/grid/RadCaptionGridColumn.java @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.intellij.android.designer.model.grid; +package com.intellij.android.designer.model.layout.grid; -import com.intellij.android.designer.model.agrid.RadCaptionColumn; +import com.intellij.android.designer.model.grid.RadCaptionColumn; /** * @author Alexander Lobas diff --git a/plugins/android-designer/src/com/intellij/android/designer/model/grid/RadCaptionGridRow.java b/plugins/android-designer/src/com/intellij/android/designer/model/layout/grid/RadCaptionGridRow.java similarity index 87% rename from plugins/android-designer/src/com/intellij/android/designer/model/grid/RadCaptionGridRow.java rename to plugins/android-designer/src/com/intellij/android/designer/model/layout/grid/RadCaptionGridRow.java index 0e6b45016e81..9653054a30cd 100644 --- a/plugins/android-designer/src/com/intellij/android/designer/model/grid/RadCaptionGridRow.java +++ b/plugins/android-designer/src/com/intellij/android/designer/model/layout/grid/RadCaptionGridRow.java @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.intellij.android.designer.model.grid; +package com.intellij.android.designer.model.layout.grid; -import com.intellij.android.designer.model.agrid.RadCaptionRow; +import com.intellij.android.designer.model.grid.RadCaptionRow; /** * @author Alexander Lobas diff --git a/plugins/android-designer/src/com/intellij/android/designer/model/grid/RadGridLayout.java b/plugins/android-designer/src/com/intellij/android/designer/model/layout/grid/RadGridLayout.java similarity index 94% rename from plugins/android-designer/src/com/intellij/android/designer/model/grid/RadGridLayout.java rename to plugins/android-designer/src/com/intellij/android/designer/model/layout/grid/RadGridLayout.java index 8161cbec0546..ca9e1f8bd6c1 100644 --- a/plugins/android-designer/src/com/intellij/android/designer/model/grid/RadGridLayout.java +++ b/plugins/android-designer/src/com/intellij/android/designer/model/layout/grid/RadGridLayout.java @@ -13,16 +13,16 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.intellij.android.designer.model.grid; +package com.intellij.android.designer.model.layout.grid; import com.intellij.android.designer.designSurface.TreeDropToOperation; -import com.intellij.android.designer.designSurface.layout.GridDecorator; +import com.intellij.android.designer.designSurface.layout.grid.GridDecorator; import com.intellij.android.designer.designSurface.layout.GridLayoutOperation; -import com.intellij.android.designer.designSurface.layout.LayoutSpanOperation; -import com.intellij.android.designer.designSurface.layout.ResizeOperation; +import com.intellij.android.designer.designSurface.layout.actions.LayoutSpanOperation; +import com.intellij.android.designer.designSurface.layout.actions.ResizeOperation; import com.intellij.android.designer.model.RadViewLayout; import com.intellij.android.designer.model.RadViewLayoutWithData; -import com.intellij.android.designer.model.agrid.GridInfo; +import com.intellij.android.designer.model.grid.GridInfo; import com.intellij.designer.componentTree.TreeEditOperation; import com.intellij.designer.designSurface.*; import com.intellij.designer.designSurface.selection.ResizeSelectionDecorator; diff --git a/plugins/android-designer/src/com/intellij/android/designer/model/grid/RadGridLayoutComponent.java b/plugins/android-designer/src/com/intellij/android/designer/model/layout/grid/RadGridLayoutComponent.java similarity index 97% rename from plugins/android-designer/src/com/intellij/android/designer/model/grid/RadGridLayoutComponent.java rename to plugins/android-designer/src/com/intellij/android/designer/model/layout/grid/RadGridLayoutComponent.java index ecb598719528..4b722d4e0fec 100644 --- a/plugins/android-designer/src/com/intellij/android/designer/model/grid/RadGridLayoutComponent.java +++ b/plugins/android-designer/src/com/intellij/android/designer/model/layout/grid/RadGridLayoutComponent.java @@ -13,13 +13,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.intellij.android.designer.model.grid; +package com.intellij.android.designer.model.layout.grid; import com.android.ide.common.rendering.api.ViewInfo; import com.intellij.android.designer.model.RadViewComponent; import com.intellij.android.designer.model.RadViewContainer; -import com.intellij.android.designer.model.agrid.GridInfo; -import com.intellij.android.designer.model.agrid.IGridProvider; +import com.intellij.android.designer.model.grid.GridInfo; +import com.intellij.android.designer.model.grid.IGridProvider; import com.intellij.designer.model.RadComponent; import java.awt.*; diff --git a/plugins/android-designer/src/com/intellij/android/designer/model/table/RadCaptionTableColumn.java b/plugins/android-designer/src/com/intellij/android/designer/model/layout/table/RadCaptionTableColumn.java similarity index 89% rename from plugins/android-designer/src/com/intellij/android/designer/model/table/RadCaptionTableColumn.java rename to plugins/android-designer/src/com/intellij/android/designer/model/layout/table/RadCaptionTableColumn.java index 88e3bfffd99c..48bf5c11e4c0 100644 --- a/plugins/android-designer/src/com/intellij/android/designer/model/table/RadCaptionTableColumn.java +++ b/plugins/android-designer/src/com/intellij/android/designer/model/layout/table/RadCaptionTableColumn.java @@ -13,10 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.intellij.android.designer.model.table; +package com.intellij.android.designer.model.layout.table; -import com.intellij.android.designer.model.agrid.GridInfo; -import com.intellij.android.designer.model.agrid.RadCaptionColumn; +import com.intellij.android.designer.model.grid.GridInfo; +import com.intellij.android.designer.model.grid.RadCaptionColumn; import com.intellij.designer.model.RadComponent; /** diff --git a/plugins/android-designer/src/com/intellij/android/designer/model/table/RadCaptionTableRow.java b/plugins/android-designer/src/com/intellij/android/designer/model/layout/table/RadCaptionTableRow.java similarity index 97% rename from plugins/android-designer/src/com/intellij/android/designer/model/table/RadCaptionTableRow.java rename to plugins/android-designer/src/com/intellij/android/designer/model/layout/table/RadCaptionTableRow.java index d4b7c8012953..62a4ce6bc757 100644 --- a/plugins/android-designer/src/com/intellij/android/designer/model/table/RadCaptionTableRow.java +++ b/plugins/android-designer/src/com/intellij/android/designer/model/layout/table/RadCaptionTableRow.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.intellij.android.designer.model.table; +package com.intellij.android.designer.model.layout.table; import com.intellij.android.designer.designSurface.layout.CaptionStaticDecorator; import com.intellij.android.designer.model.RadViewComponent; diff --git a/plugins/android-designer/src/com/intellij/android/designer/model/table/RadTableLayout.java b/plugins/android-designer/src/com/intellij/android/designer/model/layout/table/RadTableLayout.java similarity index 93% rename from plugins/android-designer/src/com/intellij/android/designer/model/table/RadTableLayout.java rename to plugins/android-designer/src/com/intellij/android/designer/model/layout/table/RadTableLayout.java index 99ff2662c568..2537cf108c79 100644 --- a/plugins/android-designer/src/com/intellij/android/designer/model/table/RadTableLayout.java +++ b/plugins/android-designer/src/com/intellij/android/designer/model/layout/table/RadTableLayout.java @@ -13,14 +13,18 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.intellij.android.designer.model.table; +package com.intellij.android.designer.model.layout.table; import com.intellij.android.designer.designSurface.TreeDropToOperation; import com.intellij.android.designer.designSurface.layout.*; +import com.intellij.android.designer.designSurface.layout.actions.ResizeOperation; +import com.intellij.android.designer.designSurface.layout.caption.HorizontalCaptionFlowBaseOperation; +import com.intellij.android.designer.designSurface.layout.caption.VerticalCaptionFlowBaseOperation; +import com.intellij.android.designer.designSurface.layout.grid.GridDecorator; import com.intellij.android.designer.model.RadViewComponent; import com.intellij.android.designer.model.RadViewLayout; import com.intellij.android.designer.model.RadViewLayoutWithData; -import com.intellij.android.designer.model.agrid.GridInfo; +import com.intellij.android.designer.model.grid.GridInfo; import com.intellij.designer.componentTree.TreeEditOperation; import com.intellij.designer.designSurface.*; import com.intellij.designer.designSurface.selection.ResizeSelectionDecorator; diff --git a/plugins/android-designer/src/com/intellij/android/designer/model/table/RadTableLayoutComponent.java b/plugins/android-designer/src/com/intellij/android/designer/model/layout/table/RadTableLayoutComponent.java similarity index 97% rename from plugins/android-designer/src/com/intellij/android/designer/model/table/RadTableLayoutComponent.java rename to plugins/android-designer/src/com/intellij/android/designer/model/layout/table/RadTableLayoutComponent.java index 96686eb9a271..a2e15ceac8c3 100644 --- a/plugins/android-designer/src/com/intellij/android/designer/model/table/RadTableLayoutComponent.java +++ b/plugins/android-designer/src/com/intellij/android/designer/model/layout/table/RadTableLayoutComponent.java @@ -13,14 +13,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.intellij.android.designer.model.table; +package com.intellij.android.designer.model.layout.table; import com.android.ide.common.rendering.api.ViewInfo; import com.intellij.android.designer.model.ModelParser; import com.intellij.android.designer.model.RadViewComponent; import com.intellij.android.designer.model.RadViewContainer; -import com.intellij.android.designer.model.agrid.GridInfo; -import com.intellij.android.designer.model.agrid.IGridProvider; +import com.intellij.android.designer.model.grid.GridInfo; +import com.intellij.android.designer.model.grid.IGridProvider; 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/model/table/RadTableRowLayout.java b/plugins/android-designer/src/com/intellij/android/designer/model/layout/table/RadTableRowLayout.java similarity index 98% rename from plugins/android-designer/src/com/intellij/android/designer/model/table/RadTableRowLayout.java rename to plugins/android-designer/src/com/intellij/android/designer/model/layout/table/RadTableRowLayout.java index 8e3ebb0b6c4e..32d06a199ba9 100644 --- a/plugins/android-designer/src/com/intellij/android/designer/model/table/RadTableRowLayout.java +++ b/plugins/android-designer/src/com/intellij/android/designer/model/layout/table/RadTableRowLayout.java @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.intellij.android.designer.model.table; +package com.intellij.android.designer.model.layout.table; -import com.intellij.android.designer.designSurface.layout.LayoutSpanOperation; +import com.intellij.android.designer.designSurface.layout.actions.LayoutSpanOperation; import com.intellij.android.designer.model.ModelParser; import com.intellij.android.designer.model.RadViewComponent; import com.intellij.android.designer.model.layout.AbstractGravityAction; diff --git a/plugins/android-designer/src/com/intellij/android/designer/model/views-meta-model.xml b/plugins/android-designer/src/com/intellij/android/designer/model/views-meta-model.xml index cd85637140ed..ab501ad6539b 100644 --- a/plugins/android-designer/src/com/intellij/android/designer/model/views-meta-model.xml +++ b/plugins/android-designer/src/com/intellij/android/designer/model/views-meta-model.xml @@ -1099,8 +1099,8 @@ - @@ -1120,7 +1120,7 @@ @@ -1137,8 +1137,8 @@ -