Skip to content

Commit 5fa1791

Browse files
committed
Fix capitalization of "Dao" to "DAO" in documentation and properties files for consistency
1 parent 8fdf287 commit 5fa1791

File tree

6 files changed

+12
-12
lines changed

6 files changed

+12
-12
lines changed

src/main/resources/META-INF/plugin.xml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -104,19 +104,19 @@
104104
id="org.domaframework.doma.intellij.action.JumpToSQLFromDao"
105105
class="org.domaframework.doma.intellij.action.dao.JumpToSQLFromDaoAction"
106106
text="Jump to SQL"
107-
description="Jump from Dao file to SQL file">
107+
description="Jump from DAO file to SQL file">
108108
<keyboard-shortcut keymap="$default" first-keystroke="alt D"/>
109109
</action>
110110
<action id="org.domaframework.doma.intellij.JumpToDaoFromSQL"
111111
class="org.domaframework.doma.intellij.action.sql.JumpToDaoFromSQLAction"
112-
text="Jump to Dao"
113-
description="Jump from SQL file to Dao method definition">
112+
text="Jump to DAO"
113+
description="Jump from SQL file to DAO method definition">
114114
<keyboard-shortcut keymap="$default" first-keystroke="alt D"/>
115115
</action>
116116
<action id="org.domaframework.doma.intellij.GenerateSqlAction"
117117
class="org.domaframework.doma.intellij.action.dao.GenerateSqlAction"
118118
text="Generate SQL"
119-
description="Generate SQL file from Dao method">
119+
description="Generate SQL file from DAO method">
120120
<keyboard-shortcut keymap="$default" first-keystroke="control alt G"/>
121121
</action>
122122
</group>

src/main/resources/inspectionDescriptions/org.domaframework.doma.intellij.existsqlchecker.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<html lang="en">
22
<body>
33
<p>
4-
Dao method inspection by Doma Tools.
4+
DAO method inspection by Doma Tools.
55
Displays warnings or errors for missing method definitions in SQL files.
66
A quick fix for SQL generation is suggested for the target.
77
</p>
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<html lang="en">
22
<body>
33
<p>
4-
Doma Tools checks whether bind variables used in SQL exist in Dao method arguments or classes.
4+
Doma Tools checks whether bind variables used in SQL exist in DAO method arguments or classes.
55
</p>
66
</body>
77
</html>

src/main/resources/messages/DomaToolsBundle.properties

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
jump.to.sql.tooltip.title=Open SQL file
2-
jump.to.dao.tooltip.title=Jump to Dao method definition
2+
jump.to.dao.tooltip.title=Jump to DAO method definition
33
generate.sql.quickfix.title=Create SQL file
44
config.enable.sql.format=Enable auto-indent for SQL
55
inspection.invalid.dao.notExistSql=SQL file does not exist
66
inspection.invalid.sql.property=The field or method [{1}] does not exist in the class [{0}]
77
inspection.invalid.dao.paramUse=There are unused parameters in the SQL [{0}]
8-
inspection.invalid.dao.parameter=The bind variable [{1}] does not exist in the Dao method [{0}]
8+
inspection.invalid.dao.parameter=The bind variable [{1}] does not exist in the DAO method [{0}]
99
inspection.invalid.sql.topType=Can't get type of first element
1010
inspection.invalid.sql.staticProperty=[{0}] is not a public or static property in the class [{1}]
1111
inspection.invalid.sql.testdata=Test data is required after a bind variable directive or a literal variable directive

src/main/resources/messages/DomaToolsBundle_ja.properties

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
jump.to.sql.tooltip.title=SQL\u30D5\u30A1\u30A4\u30EB\u3092\u958B\u304F
2-
jump.to.dao.tooltip.title=Dao\u30E1\u30BD\u30C3\u30C9\u5B9A\u7FA9\u306B\u9077\u79FB\u3059\u308B
2+
jump.to.dao.tooltip.title=DAO\u30E1\u30BD\u30C3\u30C9\u5B9A\u7FA9\u306B\u9077\u79FB\u3059\u308B
33
generate.sql.quickfix.title=SQL\u30D5\u30A1\u30A4\u30EB\u3092\u4F5C\u6210
44
config.enable.sql.format=\u6539\u884c\u6642\u306e\u81ea\u52d5\u30a4\u30f3\u30c7\u30f3\u30c8\u6a5f\u80fd\u6709\u52b9\u5316
55
inspection.invalid.dao.notExistSql=SQL\u30D5\u30A1\u30A4\u30EB\u304C\u5B58\u5728\u3057\u307E\u305B\u3093
66
inspection.invalid.sql.property=\u30AF\u30E9\u30B9[{0}]\u306B\u5B58\u5728\u3057\u306A\u3044\u30D5\u30A3\u30FC\u30EB\u30C9\u3001\u307E\u305F\u306F\u30E1\u30BD\u30C3\u30C9\u304C\u4F7F\u7528\u3055\u308C\u3066\u3044\u307E\u3059:[{1}]
77
inspection.invalid.dao.paramUse=SQL\u3067\u4F7F\u7528\u3055\u308C\u3066\u3044\u306A\u3044\u5F15\u6570\u304C\u3042\u308A\u307E\u3059:[{0}]
8-
inspection.invalid.dao.parameter=Dao\u30E1\u30BD\u30C3\u30C9[{0}]\u306B\u5B58\u5728\u3057\u306A\u3044\u30D0\u30A4\u30F3\u30C9\u5909\u6570\u304C\u4F7F\u7528\u3055\u308C\u3066\u3044\u307E\u3059:[{1}]
8+
inspection.invalid.dao.parameter=DAO\u30E1\u30BD\u30C3\u30C9[{0}]\u306B\u5B58\u5728\u3057\u306A\u3044\u30D0\u30A4\u30F3\u30C9\u5909\u6570\u304C\u4F7F\u7528\u3055\u308C\u3066\u3044\u307E\u3059:[{1}]
99
inspection.invalid.sql.topType=\u6700\u521D\u306E\u8981\u7D20\u306E\u578B\u304C\u53D6\u5F97\u3067\u304D\u307E\u305B\u3093
1010
inspection.invalid.sql.staticProperty=[{0}]\u0020\u306F\u30AF\u30E9\u30B9\u0020[{1}]\u0020\u306E\u0020\u0070\u0075\u0062\u006C\u0069\u0063\u0020\u307E\u305F\u0020\u0073\u0074\u0061\u0074\u0069\u0063\u0020\u30D7\u30ED\u30D1\u30C6\u30A3\u3067\u306F\u3042\u308A\u307E\u305B\u3093
1111
inspection.invalid.sql.testdata=\u30D0\u30A4\u30F3\u30C9\u5909\u6570\u30C7\u30A3\u30EC\u30AF\u30C6\u30A3\u30D6\u3001\u30EA\u30C6\u30E9\u30EB\u5909\u6570\u30C7\u30A3\u30EC\u30AF\u30C6\u30A3\u30D6\u306E\u5F8C\u308D\u306B\u306F\u30C6\u30B9\u30C8\u30C7\u30FC\u30BF\u304C\u5FC5\u8981\u3067\u3059

src/test/testData/src/main/resources/META-INF/doma/example/dao/EmployeeSummaryDao/bindVariableInFunctionParameters.sql

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ SELECT
55
, u.user_name
66
FROM user u
77
WHERE p.employee_id = /* employee.employeeParam(employee.<error descr="The field or method [dist] does not exist in the class [Employee]">dist</error>, employee.employeeId) */0
8-
AND p.base_rank = /* employee.employeeParam(user.userId, <error descr="The bind variable [count] does not exist in the Dao method [bindVariableInFunctionParameters]">count</error>) */0
8+
AND p.base_rank = /* employee.employeeParam(user.userId, <error descr="The bind variable [count] does not exist in the DAO method [bindVariableInFunctionParameters]">count</error>) */0
99
/*%if employee != null && (employee.employeeId > 100 || employee.employeeId < 50) */
10-
AND p.employee_id = /* employee.employeeParam(employee.<error descr="The field or method [dist] does not exist in the class [Employee]">dist</error>, <error descr="The bind variable [rank] does not exist in the Dao method [bindVariableInFunctionParameters]">rank</error>) */0
10+
AND p.employee_id = /* employee.employeeParam(employee.<error descr="The field or method [dist] does not exist in the class [Employee]">dist</error>, <error descr="The bind variable [rank] does not exist in the DAO method [bindVariableInFunctionParameters]">rank</error>) */0
1111
OR flag = /* @isNotBlank() */false
1212
/*%end */

0 commit comments

Comments
 (0)