Refactoring

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;
 

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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

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

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;
 

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;

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;
 

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;

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;

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;

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

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

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;

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.*;

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;
 
 /**

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;

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;

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;

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;

plugins/android-designer/src/com/intellij/android/designer/model/views-meta-model.xml

@@ -1099,8 +1099,8 @@
     </creation>
   </meta>
 
-  <meta model="com.intellij.android.designer.model.table.RadTableLayoutComponent"
-        layout="com.intellij.android.designer.model.table.RadTableLayout"
+  <meta model="com.intellij.android.designer.model.layout.table.RadTableLayoutComponent"
+        layout="com.intellij.android.designer.model.layout.table.RadTableLayout"
         class="android.widget.TableLayout"
         tag="TableLayout">
 
@@ -1120,7 +1120,7 @@
   </meta>
 
   <meta model="com.intellij.android.designer.model.RadViewContainer"
-        layout="com.intellij.android.designer.model.table.RadTableRowLayout"
+        layout="com.intellij.android.designer.model.layout.table.RadTableRowLayout"
         class="android.widget.TableRow"
         tag="TableRow">
 
@@ -1137,8 +1137,8 @@
     </creation>
   </meta>
 
-  <meta model="com.intellij.android.designer.model.grid.RadGridLayoutComponent"
-        layout="com.intellij.android.designer.model.grid.RadGridLayout"
+  <meta model="com.intellij.android.designer.model.layout.grid.RadGridLayoutComponent"
+        layout="com.intellij.android.designer.model.layout.grid.RadGridLayout"
         class="android.widget.GridLayout"
         tag="GridLayout">