Skip to content

Commit 4a0391f

Browse files
author
Vitaliy Boyko
committed
3.1.0 changelog, fixed forms
1 parent f3be742 commit 4a0391f

File tree

4 files changed

+101
-104
lines changed

4 files changed

+101
-104
lines changed

‎CHANGELOG.md‎

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,17 @@
22

33
All notable changes to this project will be documented in this file.
44

5-
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0).
6-
7-
## 3.1.1
5+
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0).
86

97
## 3.1.0
108

9+
### Added
10+
11+
- Code generation for message queue in [#411](https://github.com/magento/magento2-phpstorm-plugin/pull/411)
12+
- Code generation for declarative schema [#453](https://github.com/magento/magento2-phpstorm-plugin/pull/453)
13+
- Inspection warning for disabled observer [#432](https://github.com/magento/magento2-phpstorm-plugin/pull/432)
14+
- The action item to the context menu to copy file path in the Magento format [#451](https://github.com/magento/magento2-phpstorm-plugin/pull/451)
15+
1116
## 3.0.4
1217

1318
### Fixed

‎src/com/magento/idea/magento2plugin/actions/generation/NewDbSchemaAction.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
import org.jetbrains.annotations.NotNull;
1919

2020
public class NewDbSchemaAction extends AnAction {
21-
public static final String ACTION_NAME = "Declarative Schema XML";
21+
public static final String ACTION_NAME = "Magento 2 Declarative Schema XML";
2222
public static final String ACTION_DESCRIPTION = "Create a new declarative schema XML";
2323

2424
/**

‎src/com/magento/idea/magento2plugin/actions/generation/dialog/NewMessageQueueDialog.form‎

Lines changed: 91 additions & 98 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,17 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<form xmlns="http://www.intellij.com/uidesigner/form/" version="1" bind-to-class="com.magento.idea.magento2plugin.actions.generation.dialog.NewMessageQueueDialog">
3-
<grid id="27dc6" binding="contentPanel" layout-manager="GridLayoutManager" row-count="2" column-count="1" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
3+
<grid id="27dc6" binding="contentPanel" layout-manager="GridLayoutManager" row-count="2" column-count="2" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
44
<margin top="10" left="10" bottom="10" right="10"/>
55
<constraints>
6-
<xy x="70" y="43" width="419" height="573"/>
6+
<xy x="70" y="43" width="649" height="573"/>
77
</constraints>
88
<properties>
99
<opaque value="true"/>
10-
<preferredSize width="420" height="900"/>
1110
<requestFocusEnabled value="true"/>
1211
</properties>
1312
<border type="none"/>
1413
<children>
15-
<grid id="90a70" layout-manager="GridLayoutManager" row-count="11" column-count="2" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
14+
<grid id="90a70" layout-manager="GridLayoutManager" row-count="5" column-count="2" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
1615
<margin top="0" left="0" bottom="0" right="0"/>
1716
<constraints>
1817
<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"/>
@@ -89,14 +88,6 @@
8988
<text value="Consumer Name"/>
9089
</properties>
9190
</component>
92-
<component id="62069" class="javax.swing.JLabel">
93-
<constraints>
94-
<grid row="10" 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-
</constraints>
96-
<properties>
97-
<text value="Binding Topic"/>
98-
</properties>
99-
</component>
10091
<component id="77ae8" class="javax.swing.JLabel">
10192
<constraints>
10293
<grid row="4" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
@@ -105,38 +96,6 @@
10596
<text value="Consumer Type"/>
10697
</properties>
10798
</component>
108-
<component id="ee88a" class="javax.swing.JLabel">
109-
<constraints>
110-
<grid row="6" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
111-
</constraints>
112-
<properties>
113-
<text value="Max Messages"/>
114-
</properties>
115-
</component>
116-
<component id="9fc09" class="javax.swing.JLabel">
117-
<constraints>
118-
<grid row="7" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
119-
</constraints>
120-
<properties>
121-
<text value="Connection Name"/>
122-
</properties>
123-
</component>
124-
<component id="c4614" class="javax.swing.JLabel">
125-
<constraints>
126-
<grid row="8" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
127-
</constraints>
128-
<properties>
129-
<text value="Exchange Name"/>
130-
</properties>
131-
</component>
132-
<component id="35f81" class="javax.swing.JLabel">
133-
<constraints>
134-
<grid row="9" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
135-
</constraints>
136-
<properties>
137-
<text value="Binding ID"/>
138-
</properties>
139-
</component>
14099
<component id="6eaf2" class="javax.swing.JTextField" binding="consumerName">
141100
<constraints>
142101
<grid row="3" column="1" row-span="1" col-span="1" vsize-policy="0" hsize-policy="6" anchor="8" fill="1" indent="0" use-parent-layout="false">
@@ -153,103 +112,137 @@
153112
</constraints>
154113
<properties/>
155114
</component>
156-
<component id="2351b" class="javax.swing.JTextField" binding="maxMessages">
115+
</children>
116+
</grid>
117+
<grid id="9ad5" layout-manager="GridLayoutManager" row-count="1" column-count="2" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
118+
<margin top="0" left="0" bottom="0" right="0"/>
119+
<constraints>
120+
<grid row="1" column="0" row-span="1" col-span="2" vsize-policy="1" hsize-policy="3" anchor="0" fill="3" indent="0" use-parent-layout="false"/>
121+
</constraints>
122+
<properties/>
123+
<border type="none"/>
124+
<children>
125+
<hspacer id="4aa6d">
126+
<constraints>
127+
<grid row="0" column="0" row-span="1" col-span="1" vsize-policy="1" hsize-policy="6" anchor="0" fill="1" indent="0" use-parent-layout="false"/>
128+
</constraints>
129+
</hspacer>
130+
<grid id="f892c" layout-manager="GridLayoutManager" row-count="1" column-count="2" same-size-horizontally="true" same-size-vertically="false" hgap="-1" vgap="-1">
131+
<margin top="0" left="0" bottom="0" right="0"/>
132+
<constraints>
133+
<grid row="0" column="1" row-span="1" col-span="1" vsize-policy="3" hsize-policy="3" anchor="0" fill="3" indent="0" use-parent-layout="false"/>
134+
</constraints>
135+
<properties/>
136+
<border type="none"/>
137+
<children>
138+
<component id="20801" class="javax.swing.JButton" binding="buttonOK">
139+
<constraints>
140+
<grid row="0" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="0" fill="1" indent="0" use-parent-layout="false"/>
141+
</constraints>
142+
<properties>
143+
<text resource-bundle="magento2/common" key="common.ok"/>
144+
</properties>
145+
</component>
146+
<component id="1b860" class="javax.swing.JButton" binding="buttonCancel">
147+
<constraints>
148+
<grid row="0" column="1" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="0" fill="1" indent="0" use-parent-layout="false"/>
149+
</constraints>
150+
<properties>
151+
<text resource-bundle="magento2/common" key="common.cancel"/>
152+
</properties>
153+
</component>
154+
</children>
155+
</grid>
156+
</children>
157+
</grid>
158+
<grid id="e8701" layout-manager="GridLayoutManager" row-count="5" column-count="2" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
159+
<margin top="0" left="0" bottom="0" right="0"/>
160+
<constraints>
161+
<grid row="0" column="1" row-span="1" col-span="1" vsize-policy="3" hsize-policy="3" anchor="0" fill="3" indent="0" use-parent-layout="false"/>
162+
</constraints>
163+
<properties/>
164+
<border type="none"/>
165+
<children>
166+
<component id="77307" class="javax.swing.JTextField" binding="bindingId">
157167
<constraints>
158-
<grid row="6" column="1" row-span="1" col-span="1" vsize-policy="0" hsize-policy="6" anchor="8" fill="1" indent="0" use-parent-layout="false">
168+
<grid row="1" column="1" row-span="1" col-span="1" vsize-policy="0" hsize-policy="6" anchor="8" fill="1" indent="0" use-parent-layout="false">
159169
<preferred-size width="150" height="-1"/>
160170
</grid>
161171
</constraints>
162172
<properties/>
163173
</component>
174+
<component id="35f81" class="javax.swing.JLabel">
175+
<constraints>
176+
<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"/>
177+
</constraints>
178+
<properties>
179+
<text value="Binding ID"/>
180+
</properties>
181+
</component>
164182
<component id="19d67" class="javax.swing.JTextField" binding="connectionName">
165183
<constraints>
166-
<grid row="7" column="1" row-span="1" col-span="1" vsize-policy="0" hsize-policy="6" anchor="8" fill="1" indent="0" use-parent-layout="false">
184+
<grid row="3" column="1" row-span="1" col-span="1" vsize-policy="0" hsize-policy="6" anchor="8" fill="1" indent="0" use-parent-layout="false">
167185
<preferred-size width="150" height="-1"/>
168186
</grid>
169187
</constraints>
170188
<properties/>
171189
</component>
190+
<component id="c4614" class="javax.swing.JLabel">
191+
<constraints>
192+
<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"/>
193+
</constraints>
194+
<properties>
195+
<text value="Exchange Name"/>
196+
</properties>
197+
</component>
172198
<component id="1b8cf" class="javax.swing.JTextField" binding="exchangeName">
173199
<constraints>
174-
<grid row="8" column="1" row-span="1" col-span="1" vsize-policy="0" hsize-policy="6" anchor="8" fill="1" indent="0" use-parent-layout="false">
200+
<grid row="2" column="1" row-span="1" col-span="1" vsize-policy="0" hsize-policy="6" anchor="8" fill="1" indent="0" use-parent-layout="false">
175201
<preferred-size width="150" height="-1"/>
176202
</grid>
177203
</constraints>
178204
<properties/>
179205
</component>
180-
<component id="77307" class="javax.swing.JTextField" binding="bindingId">
206+
<component id="9fc09" class="javax.swing.JLabel">
181207
<constraints>
182-
<grid row="9" column="1" row-span="1" col-span="1" vsize-policy="0" hsize-policy="6" anchor="8" fill="1" indent="0" use-parent-layout="false">
183-
<preferred-size width="150" height="-1"/>
184-
</grid>
208+
<grid row="3" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
185209
</constraints>
186-
<properties/>
210+
<properties>
211+
<text value="Connection Name"/>
212+
</properties>
187213
</component>
188-
<component id="990f4" class="javax.swing.JTextField" binding="bindingTopic">
214+
<component id="2351b" class="javax.swing.JTextField" binding="maxMessages">
189215
<constraints>
190-
<grid row="10" column="1" row-span="1" col-span="1" vsize-policy="0" hsize-policy="6" anchor="8" fill="1" indent="0" use-parent-layout="false">
216+
<grid row="4" column="1" row-span="1" col-span="1" vsize-policy="0" hsize-policy="6" anchor="8" fill="1" indent="0" use-parent-layout="false">
191217
<preferred-size width="150" height="-1"/>
192218
</grid>
193219
</constraints>
194220
<properties/>
195221
</component>
196-
<component id="7c3ab" class="javax.swing.JLabel">
222+
<component id="ee88a" class="javax.swing.JLabel">
197223
<constraints>
198-
<grid row="5" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
224+
<grid row="4" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
199225
</constraints>
200226
<properties>
201-
<text value="Queue Name"/>
227+
<text value="Max Messages"/>
202228
</properties>
203229
</component>
204230
<component id="59ae9" class="javax.swing.JTextField" binding="queueName">
205231
<constraints>
206-
<grid row="5" column="1" row-span="1" col-span="1" vsize-policy="0" hsize-policy="6" anchor="8" fill="1" indent="0" use-parent-layout="false">
232+
<grid row="0" column="1" row-span="1" col-span="1" vsize-policy="0" hsize-policy="6" anchor="8" fill="1" indent="0" use-parent-layout="false">
207233
<preferred-size width="150" height="-1"/>
208234
</grid>
209235
</constraints>
210236
<properties/>
211237
</component>
212-
</children>
213-
</grid>
214-
<grid id="9ad5" layout-manager="GridLayoutManager" row-count="1" column-count="2" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
215-
<margin top="0" left="0" bottom="0" right="0"/>
216-
<constraints>
217-
<grid row="1" column="0" row-span="1" col-span="1" vsize-policy="1" hsize-policy="3" anchor="0" fill="3" indent="0" use-parent-layout="false"/>
218-
</constraints>
219-
<properties/>
220-
<border type="none"/>
221-
<children>
222-
<hspacer id="4aa6d">
223-
<constraints>
224-
<grid row="0" column="0" row-span="1" col-span="1" vsize-policy="1" hsize-policy="6" anchor="0" fill="1" indent="0" use-parent-layout="false"/>
225-
</constraints>
226-
</hspacer>
227-
<grid id="f892c" layout-manager="GridLayoutManager" row-count="1" column-count="2" same-size-horizontally="true" same-size-vertically="false" hgap="-1" vgap="-1">
228-
<margin top="0" left="0" bottom="0" right="0"/>
238+
<component id="7c3ab" class="javax.swing.JLabel">
229239
<constraints>
230-
<grid row="0" column="1" row-span="1" col-span="1" vsize-policy="3" hsize-policy="3" anchor="0" fill="3" indent="0" use-parent-layout="false"/>
240+
<grid row="0" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
231241
</constraints>
232-
<properties/>
233-
<border type="none"/>
234-
<children>
235-
<component id="20801" class="javax.swing.JButton" binding="buttonOK">
236-
<constraints>
237-
<grid row="0" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="0" fill="1" indent="0" use-parent-layout="false"/>
238-
</constraints>
239-
<properties>
240-
<text resource-bundle="magento2/common" key="common.ok"/>
241-
</properties>
242-
</component>
243-
<component id="1b860" class="javax.swing.JButton" binding="buttonCancel">
244-
<constraints>
245-
<grid row="0" column="1" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="0" fill="1" indent="0" use-parent-layout="false"/>
246-
</constraints>
247-
<properties>
248-
<text resource-bundle="magento2/common" key="common.cancel"/>
249-
</properties>
250-
</component>
251-
</children>
252-
</grid>
242+
<properties>
243+
<text value="Queue Name"/>
244+
</properties>
245+
</component>
253246
</children>
254247
</grid>
255248
</children>

‎src/com/magento/idea/magento2plugin/actions/generation/dialog/NewMessageQueueDialog.java‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77

88
import com.intellij.openapi.project.Project;
99
import com.intellij.psi.PsiDirectory;
10-
import com.magento.idea.magento2plugin.actions.generation.NewDataModelAction;
1110
import com.magento.idea.magento2plugin.actions.generation.NewMessageQueueAction;
1211
import com.magento.idea.magento2plugin.actions.generation.data.QueueCommunicationData;
1312
import com.magento.idea.magento2plugin.actions.generation.data.QueueConsumerData;
@@ -143,7 +142,7 @@ public NewMessageQueueDialog(final Project project, final PsiDirectory directory
143142

144143
setContentPane(contentPanel);
145144
setModal(true);
146-
setTitle(NewDataModelAction.ACTION_DESCRIPTION);
145+
setTitle(NewMessageQueueAction.ACTION_DESCRIPTION);
147146
getRootPane().setDefaultButton(buttonOK);
148147

149148
buttonOK.addActionListener((final ActionEvent event) -> onOK());

0 commit comments

Comments
 (0)