Skip to content

Commit f231e91

Browse files
author
Yanglin
committed
Update Class::MybatisSetting
1 parent 1b4d299 commit f231e91

File tree

2 files changed

+10
-2
lines changed

2 files changed

+10
-2
lines changed

META-INF/plugin.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<idea-plugin version="2" url="https://github.com/seventh7/intellij-mybatis-plugin">
22
<id>com.seventh7.plugin.mybatis</id>
33
<name>MyBatis plugin</name>
4-
<version>2.2</version>
4+
<version>2.21</version>
55
<vendor email="insist.day@gmail.com" url="https://github.com/seventh7">Yanglin</vendor>
66

77
<description><![CDATA[
@@ -10,7 +10,7 @@
1010
]]></description>
1111

1212
<change-notes><![CDATA[
13-
<h4>2.2</h4>
13+
<h4>2.21</h4>
1414
<ul>
1515
<li>Rebuild mapper model</li>
1616
<li>Support more completion popup</li>

src/com/seventh7/mybatis/setting/MybatisSetting.java

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,10 +53,17 @@ public Element getState() {
5353
element.setAttribute(UPDATE_GENERATOR.getId(), gson.toJson(UPDATE_GENERATOR.getPatterns()));
5454
element.setAttribute(SELECT_GENERATOR.getId(), gson.toJson(SELECT_GENERATOR.getPatterns()));
5555
element.setAttribute(STATEMENT_GENERATE_MODEL_SETTING_ID, String.valueOf(statementGenerateModel.getIdentifier()));
56+
setDefaultDataSourceIdIfNull();
5657
element.setAttribute(DEFAULT_SOURCE_SETTING_ID, defaultDataSourceId);
5758
return element;
5859
}
5960

61+
private void setDefaultDataSourceIdIfNull() {
62+
if (this.defaultDataSourceId == null) {
63+
this.defaultDataSourceId = "";
64+
}
65+
}
66+
6067
@Override
6168
public void loadState(Element state) {
6269
loadState(state, INSERT_GENERATOR);
@@ -66,6 +73,7 @@ public void loadState(Element state) {
6673
final String model = state.getAttributeValue(STATEMENT_GENERATE_MODEL_SETTING_ID);
6774
statementGenerateModel = GenerateModel.getInstance(model);
6875
this.defaultDataSourceId = state.getAttributeValue(DEFAULT_SOURCE_SETTING_ID);
76+
setDefaultDataSourceIdIfNull();
6977
}
7078

7179
public String getDefaultDataSourceId() {

0 commit comments

Comments
 (0)