Skip to content

Commit 63ef611

Browse files
877: Enhanced error outputting for new Magento 2 db schema generation
1 parent d890d83 commit 63ef611

File tree

2 files changed

+15
-5
lines changed

2 files changed

+15
-5
lines changed

src/com/magento/idea/magento2plugin/actions/generation/dialog/NewDbSchemaDialog.form

Lines changed: 13 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@
5656
<properties/>
5757
<border type="none"/>
5858
<children>
59-
<grid id="40126" layout-manager="GridLayoutManager" row-count="2" column-count="4" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
59+
<grid id="40126" layout-manager="GridLayoutManager" row-count="3" column-count="4" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
6060
<margin top="0" left="0" bottom="0" right="0"/>
6161
<constraints>
6262
<grid row="0" column="0" row-span="1" col-span="1" vsize-policy="3" hsize-policy="3" anchor="0" fill="3" indent="0" use-parent-layout="false"/>
@@ -92,7 +92,7 @@
9292
</component>
9393
<component id="a42c4" class="javax.swing.JLabel" binding="tableEngineLabel">
9494
<constraints>
95-
<grid row="1" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
95+
<grid row="2" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
9696
</constraints>
9797
<properties>
9898
<labelFor value="21a4a"/>
@@ -101,7 +101,7 @@
101101
</component>
102102
<component id="d636e" class="javax.swing.JLabel" binding="tableCommentLabel">
103103
<constraints>
104-
<grid row="1" column="2" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
104+
<grid row="2" column="2" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
105105
</constraints>
106106
<properties>
107107
<labelFor value="dd0b9"/>
@@ -110,15 +110,15 @@
110110
</component>
111111
<component id="dd0b9" class="javax.swing.JTextField" binding="tableComment">
112112
<constraints>
113-
<grid row="1" column="3" row-span="1" col-span="1" vsize-policy="0" hsize-policy="6" anchor="8" fill="1" indent="0" use-parent-layout="false">
113+
<grid row="2" column="3" row-span="1" col-span="1" vsize-policy="0" hsize-policy="6" anchor="8" fill="1" indent="0" use-parent-layout="false">
114114
<preferred-size width="150" height="-1"/>
115115
</grid>
116116
</constraints>
117117
<properties/>
118118
</component>
119119
<component id="21a4a" class="javax.swing.JComboBox" binding="tableEngine">
120120
<constraints>
121-
<grid row="1" column="1" row-span="1" col-span="1" vsize-policy="0" hsize-policy="2" anchor="8" fill="1" indent="0" use-parent-layout="false"/>
121+
<grid row="2" column="1" row-span="1" col-span="1" vsize-policy="0" hsize-policy="2" anchor="8" fill="1" indent="0" use-parent-layout="false"/>
122122
</constraints>
123123
<properties/>
124124
</component>
@@ -128,6 +128,14 @@
128128
</constraints>
129129
<properties/>
130130
</component>
131+
<component id="e5139" class="javax.swing.JLabel" binding="tableNameErrorMessage">
132+
<constraints>
133+
<grid row="1" column="1" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
134+
</constraints>
135+
<properties>
136+
<text value=""/>
137+
</properties>
138+
</component>
131139
</children>
132140
</grid>
133141
<component id="4443e" class="javax.swing.JLabel" binding="tableColumnsLabel">

src/com/magento/idea/magento2plugin/actions/generation/dialog/NewDbSchemaDialog.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,7 @@
4646

4747
@SuppressWarnings({"PMD.TooManyFields", "PMD.ExcessiveImports"})
4848
public class NewDbSchemaDialog extends AbstractDialog {
49+
4950
private static final String TABLE_NAME = "Table Name";
5051

5152
private final Project project;
@@ -85,6 +86,7 @@ public class NewDbSchemaDialog extends AbstractDialog {
8586
private JLabel tableResourceLabel;//NOPMD
8687
private JLabel tableCommentLabel;//NOPMD
8788
private JLabel tableColumnsLabel;//NOPMD
89+
private JLabel tableNameErrorMessage;//NOPMD
8890

8991
/**
9092
* Constructor.

0 commit comments

Comments
 (0)