Skip to content

Commit

Permalink
修复 Mapper 为空 不能跳转 Xml 的问题
Browse files Browse the repository at this point in the history
  • Loading branch information
liuzhihang committed Jul 31, 2020
1 parent 8741247 commit ad37fbb
Show file tree
Hide file tree
Showing 20 changed files with 102 additions and 202 deletions.
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -39,9 +39,9 @@ Toolkit

更新
----
## [v1.0.8](https://github.com/liuzhihangs/toolkit/releases/tag/v1.0.8) (2020-07-29)
## [v1.0.9](https://github.com/liuzhihangs/toolkit/releases/tag/v1.0.9) (2020-07-31)

- 修改使用包装类型
- 修复 Mapper 为空 不能跳转 Xml 的问题

[查看更多历史更新记录](./doc/ChangeNotes.md)

Expand Down
5 changes: 3 additions & 2 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ plugins {
}

group 'com.liuzhihang.toolkit'
version '1.0.8'
version '1.0.9'

sourceCompatibility = 1.8

Expand All @@ -24,7 +24,8 @@ dependencies {

// See https://github.com/JetBrains/gradle-intellij-plugin/
intellij {
version '2018.3'
version '2020.2'
plugins = ['java']
pluginName 'Toolkit'
updateSinceUntilBuild false
sameSinceUntilBuild false
Expand Down
4 changes: 4 additions & 0 deletions doc/ChangeNotes.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
# ChangeNotes

## [v1.0.8](https://github.com/liuzhihangs/toolkit/releases/tag/v1.0.9) (2020-07-31)

- 修复 Mapper 为空 不能跳转 Xml 的问题

## [v1.0.8](https://github.com/liuzhihangs/toolkit/releases/tag/v1.0.8) (2020-07-29)

- 修复复制为 JSON 字段丢失问题
Expand Down
10 changes: 4 additions & 6 deletions parts/changeNotes.html
Original file line number Diff line number Diff line change
Expand Up @@ -3,20 +3,18 @@

<h4>English introduction</h4>
<ul>
<li>1.0.8
<li>1.0.9
<ol>
<li>Fix the bug that some fields are missing</li>
<li>Modified support 2018.3 and above</li>
<li>Fix the problem that Mapper is empty and cannot jump to Xml</li>
</ol>
</li>
<li><a href="https://github.com/liuzhihangs/toolkit/blob/master/doc/ChangeNotes.md">More records</a></li>
</ul>
<h4>中文介绍</h4>
<ul>
<li>1.0.8
<li>1.0.9
<ol>
<li>修复部分字段丢失的bug</li>
<li>修改支持 2018.3 及以上版本</li>
<li>修复 Mapper 为空 不能跳转 Xml 的问题</li>
</ol>
</li>
<li><a href="https://github.com/liuzhihangs/toolkit/blob/master/doc/ChangeNotes.md">更多记录</a></li>
Expand Down
13 changes: 8 additions & 5 deletions src/main/java/com/liuzhihang/toolkit/model/Delete.java
Original file line number Diff line number Diff line change
@@ -1,10 +1,13 @@
package com.liuzhihang.toolkit.model;


/**
* Created with IntelliJ IDEA.
* User: mishchenko
* Date: 26.05.12
* Time: 15:55
* 只需要跳转功能
*
* @link https://jetbrains.org/intellij/sdk/docs/reference_guide/frameworks_and_external_apis/xml_dom_api.html
*
* @author liuzhihang
* @date 2020/7/31 19:20
*/
public interface Delete extends MapperIdentifiableStatement {
public interface Delete extends Statement {
}
18 changes: 0 additions & 18 deletions src/main/java/com/liuzhihang/toolkit/model/Include.java

This file was deleted.

13 changes: 8 additions & 5 deletions src/main/java/com/liuzhihang/toolkit/model/Insert.java
Original file line number Diff line number Diff line change
@@ -1,10 +1,13 @@
package com.liuzhihang.toolkit.model;


/**
* Created with IntelliJ IDEA.
* User: mishchenko
* Date: 26.05.12
* Time: 15:55
* 只需要跳转功能
*
* @link https://jetbrains.org/intellij/sdk/docs/reference_guide/frameworks_and_external_apis/xml_dom_api.html
*
* @author liuzhihang
* @date 2020/7/31 19:20
*/
public interface Insert extends MapperIdentifiableStatement {
public interface Insert extends Statement {
}
32 changes: 19 additions & 13 deletions src/main/java/com/liuzhihang/toolkit/model/Mapper.java
Original file line number Diff line number Diff line change
Expand Up @@ -5,24 +5,31 @@
import java.util.List;

/**
* Created by IntelliJ IDEA.
* User: Max
* Date: 01.01.12
* Time: 18:37
* 只需要跳转功能
*
* @link https://jetbrains.org/intellij/sdk/docs/reference_guide/frameworks_and_external_apis/xml_dom_api.html
*
* @author liuzhihang
* @date 2020/7/31 19:20
*/
public interface Mapper extends DomElement {

/**
* namespace
*
* @return
*/
@Attribute("namespace")
GenericAttributeValue<String> getNamespace();

@SubTagsList({"sql", "select", "insert", "update", "delete"})
List<MapperIdentifiableStatement> getIdentifiableStatements();

@SubTagList("resultMap")
List<ResultMap> getResultMaps();

@SubTagList("sql")
List<MapperIdentifiableStatement> getSqls();
/**
*
* 增删改查对应的节点
*
* @return
*/
@SubTagsList({"select", "insert", "update", "delete"})
List<Statement> getStatements();

@SubTagList("select")
List<Select> getSelects();
Expand All @@ -36,5 +43,4 @@ public interface Mapper extends DomElement {
@SubTagList("delete")
List<Delete> getDeletes();


}
23 changes: 0 additions & 23 deletions src/main/java/com/liuzhihang/toolkit/model/ResultMap.java

This file was deleted.

13 changes: 8 additions & 5 deletions src/main/java/com/liuzhihang/toolkit/model/Select.java
Original file line number Diff line number Diff line change
@@ -1,10 +1,13 @@
package com.liuzhihang.toolkit.model;


/**
* Created with IntelliJ IDEA.
* User: mishchenko
* Date: 26.05.12
* Time: 15:50
* 只需要跳转功能
*
* @link https://jetbrains.org/intellij/sdk/docs/reference_guide/frameworks_and_external_apis/xml_dom_api.html
*
* @author liuzhihang
* @date 2020/7/31 19:20
*/
public interface Select extends MapperIdentifiableStatement, WithParameterMap, WithParameterType, WithResultMap, WithResultType {
public interface Select extends Statement {
}
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,19 @@
import com.intellij.util.xml.NameValue;

/**
* Created by IntelliJ IDEA.
* User: Max
* Date: 23.12.11
* Time: 23:43
* 只需要跳转功能
*
* @author liuzhihang
* @date 2020/7/31 19:25
*/
public interface MapperIdentifiableStatement extends DomElement, WithIncludes {
public interface Statement extends DomElement {


/**
* id 属性
*
* @return
*/
@NameValue
@Attribute("id")
GenericAttributeValue<String> getId();
Expand Down
12 changes: 7 additions & 5 deletions src/main/java/com/liuzhihang/toolkit/model/Update.java
Original file line number Diff line number Diff line change
@@ -1,10 +1,12 @@
package com.liuzhihang.toolkit.model;

/**
* Created with IntelliJ IDEA.
* User: mishchenko
* Date: 26.05.12
* Time: 15:55
* 只需要跳转功能
*
* @link https://jetbrains.org/intellij/sdk/docs/reference_guide/frameworks_and_external_apis/xml_dom_api.html
*
* @author liuzhihang
* @date 2020/7/31 19:20
*/
public interface Update extends MapperIdentifiableStatement {
public interface Update extends Statement {
}
19 changes: 0 additions & 19 deletions src/main/java/com/liuzhihang/toolkit/model/WithIncludes.java

This file was deleted.

13 changes: 0 additions & 13 deletions src/main/java/com/liuzhihang/toolkit/model/WithParameterMap.java

This file was deleted.

13 changes: 0 additions & 13 deletions src/main/java/com/liuzhihang/toolkit/model/WithParameterType.java

This file was deleted.

18 changes: 0 additions & 18 deletions src/main/java/com/liuzhihang/toolkit/model/WithResultMap.java

This file was deleted.

13 changes: 0 additions & 13 deletions src/main/java/com/liuzhihang/toolkit/model/WithResultType.java

This file was deleted.

Loading

0 comments on commit ad37fbb

Please sign in to comment.