Commit d5dfd626a054d1fbbf22d4b3310a9432e89e32b1
1 parent
50c3f52d
Exists in
master
1.提交代码
Showing
2 changed files
with
40 additions
and
49 deletions
Show diff stats
.idea/workspace.xml
| @@ -2,10 +2,8 @@ | @@ -2,10 +2,8 @@ | ||
| 2 | <project version="4"> | 2 | <project version="4"> |
| 3 | <component name="ChangeListManager"> | 3 | <component name="ChangeListManager"> |
| 4 | <list default="true" id="3efc7ab8-4392-46f3-b152-36346d230d70" name="Default Changelist" comment=""> | 4 | <list default="true" id="3efc7ab8-4392-46f3-b152-36346d230d70" name="Default Changelist" comment=""> |
| 5 | - <change beforePath="$PROJECT_DIR$/.gitignore" beforeDir="false" afterPath="$PROJECT_DIR$/.gitignore" afterDir="false" /> | ||
| 6 | <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" /> | 5 | <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" /> |
| 7 | <change beforePath="$PROJECT_DIR$/src/com/taover/ui/EntityGenWindow.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/com/taover/ui/EntityGenWindow.java" afterDir="false" /> | 6 | <change beforePath="$PROJECT_DIR$/src/com/taover/ui/EntityGenWindow.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/com/taover/ui/EntityGenWindow.java" afterDir="false" /> |
| 8 | - <change beforePath="$PROJECT_DIR$/src/erp.default.properties" beforeDir="false" afterPath="$PROJECT_DIR$/src/erp.default.properties" afterDir="false" /> | ||
| 9 | </list> | 7 | </list> |
| 10 | <ignored path="$PROJECT_DIR$/out/" /> | 8 | <ignored path="$PROJECT_DIR$/out/" /> |
| 11 | <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" /> | 9 | <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" /> |
| @@ -21,12 +19,12 @@ | @@ -21,12 +19,12 @@ | ||
| 21 | <favorites_list name="code-generater" /> | 19 | <favorites_list name="code-generater" /> |
| 22 | </component> | 20 | </component> |
| 23 | <component name="FileEditorManager"> | 21 | <component name="FileEditorManager"> |
| 24 | - <leaf> | 22 | + <leaf SIDE_TABS_SIZE_LIMIT_KEY="300"> |
| 25 | <file pinned="false" current-in-tab="false"> | 23 | <file pinned="false" current-in-tab="false"> |
| 26 | <entry file="file://$PROJECT_DIR$/src/com/taover/ui/UiUtils.java"> | 24 | <entry file="file://$PROJECT_DIR$/src/com/taover/ui/UiUtils.java"> |
| 27 | <provider selected="true" editor-type-id="text-editor"> | 25 | <provider selected="true" editor-type-id="text-editor"> |
| 28 | - <state relative-caret-position="-330"> | ||
| 29 | - <caret line="26" column="51" lean-forward="true" selection-start-line="26" selection-start-column="51" selection-end-line="26" selection-end-column="51" /> | 26 | + <state relative-caret-position="286"> |
| 27 | + <caret line="26" column="51" selection-start-line="26" selection-start-column="51" selection-end-line="26" selection-end-column="51" /> | ||
| 30 | <folding> | 28 | <folding> |
| 31 | <element signature="e#407#408#0" expanded="true" /> | 29 | <element signature="e#407#408#0" expanded="true" /> |
| 32 | <element signature="e#461#462#0" expanded="true" /> | 30 | <element signature="e#461#462#0" expanded="true" /> |
| @@ -38,7 +36,7 @@ | @@ -38,7 +36,7 @@ | ||
| 38 | <file pinned="false" current-in-tab="false"> | 36 | <file pinned="false" current-in-tab="false"> |
| 39 | <entry file="file://$PROJECT_DIR$/src/erp.default.properties"> | 37 | <entry file="file://$PROJECT_DIR$/src/erp.default.properties"> |
| 40 | <provider selected="true" editor-type-id="text-editor"> | 38 | <provider selected="true" editor-type-id="text-editor"> |
| 41 | - <state relative-caret-position="242"> | 39 | + <state relative-caret-position="374"> |
| 42 | <caret line="17" column="35" selection-start-line="17" selection-start-column="35" selection-end-line="17" selection-end-column="35" /> | 40 | <caret line="17" column="35" selection-start-line="17" selection-start-column="35" selection-end-line="17" selection-end-column="35" /> |
| 43 | </state> | 41 | </state> |
| 44 | </provider> | 42 | </provider> |
| @@ -48,7 +46,7 @@ | @@ -48,7 +46,7 @@ | ||
| 48 | <entry file="file://$PROJECT_DIR$/src/default.properties"> | 46 | <entry file="file://$PROJECT_DIR$/src/default.properties"> |
| 49 | <provider selected="true" editor-type-id="text-editor"> | 47 | <provider selected="true" editor-type-id="text-editor"> |
| 50 | <state relative-caret-position="396"> | 48 | <state relative-caret-position="396"> |
| 51 | - <caret line="18" column="8" lean-forward="true" selection-start-line="18" selection-start-column="8" selection-end-line="18" selection-end-column="8" /> | 49 | + <caret line="18" column="8" selection-start-line="18" selection-start-column="8" selection-end-line="18" selection-end-column="8" /> |
| 52 | </state> | 50 | </state> |
| 53 | </provider> | 51 | </provider> |
| 54 | </entry> | 52 | </entry> |
| @@ -56,26 +54,17 @@ | @@ -56,26 +54,17 @@ | ||
| 56 | <file pinned="false" current-in-tab="false"> | 54 | <file pinned="false" current-in-tab="false"> |
| 57 | <entry file="jar://C:/Program Files/Java/jdk1.8.0_161/src.zip!/java/sql/DriverManager.java"> | 55 | <entry file="jar://C:/Program Files/Java/jdk1.8.0_161/src.zip!/java/sql/DriverManager.java"> |
| 58 | <provider selected="true" editor-type-id="text-editor"> | 56 | <provider selected="true" editor-type-id="text-editor"> |
| 59 | - <state relative-caret-position="197"> | 57 | + <state relative-caret-position="3806"> |
| 60 | <caret line="204" column="29" selection-start-line="204" selection-start-column="29" selection-end-line="204" selection-end-column="29" /> | 58 | <caret line="204" column="29" selection-start-line="204" selection-start-column="29" selection-end-line="204" selection-end-column="29" /> |
| 61 | </state> | 59 | </state> |
| 62 | </provider> | 60 | </provider> |
| 63 | </entry> | 61 | </entry> |
| 64 | </file> | 62 | </file> |
| 65 | - <file pinned="false" current-in-tab="false"> | ||
| 66 | - <entry file="file://$PROJECT_DIR$/src/com/taover/ui/EntityGenWindow.java"> | ||
| 67 | - <provider selected="true" editor-type-id="text-editor"> | ||
| 68 | - <state relative-caret-position="392"> | ||
| 69 | - <caret line="119" column="38" lean-forward="true" selection-start-line="119" selection-start-column="38" selection-end-line="119" selection-end-column="38" /> | ||
| 70 | - </state> | ||
| 71 | - </provider> | ||
| 72 | - </entry> | ||
| 73 | - </file> | ||
| 74 | <file pinned="false" current-in-tab="true"> | 63 | <file pinned="false" current-in-tab="true"> |
| 75 | - <entry file="file://$PROJECT_DIR$/.gitignore"> | 64 | + <entry file="file://$PROJECT_DIR$/src/com/taover/ui/EntityGenWindow.java"> |
| 76 | <provider selected="true" editor-type-id="text-editor"> | 65 | <provider selected="true" editor-type-id="text-editor"> |
| 77 | - <state relative-caret-position="132"> | ||
| 78 | - <caret line="6" selection-start-line="6" selection-end-line="6" /> | 66 | + <state relative-caret-position="431"> |
| 67 | + <caret line="121" column="11" lean-forward="true" selection-start-line="121" selection-start-column="11" selection-end-line="121" selection-end-column="11" /> | ||
| 79 | </state> | 68 | </state> |
| 80 | </provider> | 69 | </provider> |
| 81 | </entry> | 70 | </entry> |
| @@ -105,8 +94,8 @@ | @@ -105,8 +94,8 @@ | ||
| 105 | <option value="$PROJECT_DIR$/src/local.db.properties" /> | 94 | <option value="$PROJECT_DIR$/src/local.db.properties" /> |
| 106 | <option value="$PROJECT_DIR$/src/com/taover/ui/UiUtils.java" /> | 95 | <option value="$PROJECT_DIR$/src/com/taover/ui/UiUtils.java" /> |
| 107 | <option value="$PROJECT_DIR$/src/erp.default.properties" /> | 96 | <option value="$PROJECT_DIR$/src/erp.default.properties" /> |
| 108 | - <option value="$PROJECT_DIR$/src/com/taover/ui/EntityGenWindow.java" /> | ||
| 109 | <option value="$PROJECT_DIR$/.gitignore" /> | 97 | <option value="$PROJECT_DIR$/.gitignore" /> |
| 98 | + <option value="$PROJECT_DIR$/src/com/taover/ui/EntityGenWindow.java" /> | ||
| 110 | </list> | 99 | </list> |
| 111 | </option> | 100 | </option> |
| 112 | </component> | 101 | </component> |
| @@ -242,12 +231,15 @@ | @@ -242,12 +231,15 @@ | ||
| 242 | <workItem from="1558071853030" duration="1949000" /> | 231 | <workItem from="1558071853030" duration="1949000" /> |
| 243 | <workItem from="1559183094225" duration="50000" /> | 232 | <workItem from="1559183094225" duration="50000" /> |
| 244 | <workItem from="1560395502888" duration="609000" /> | 233 | <workItem from="1560395502888" duration="609000" /> |
| 245 | - <workItem from="1561008621174" duration="1180000" /> | 234 | + <workItem from="1561008621174" duration="1337000" /> |
| 235 | + <workItem from="1561014260328" duration="3000" /> | ||
| 236 | + <workItem from="1561017853508" duration="1333000" /> | ||
| 237 | + <workItem from="1561100245992" duration="646000" /> | ||
| 246 | </task> | 238 | </task> |
| 247 | <servers /> | 239 | <servers /> |
| 248 | </component> | 240 | </component> |
| 249 | <component name="TimeTrackingManager"> | 241 | <component name="TimeTrackingManager"> |
| 250 | - <option name="totallyTimeSpent" value="12761000" /> | 242 | + <option name="totallyTimeSpent" value="14900000" /> |
| 251 | </component> | 243 | </component> |
| 252 | <component name="TodoView"> | 244 | <component name="TodoView"> |
| 253 | <todo-panel id="selected-file"> | 245 | <todo-panel id="selected-file"> |
| @@ -260,9 +252,8 @@ | @@ -260,9 +252,8 @@ | ||
| 260 | </component> | 252 | </component> |
| 261 | <component name="ToolWindowManager"> | 253 | <component name="ToolWindowManager"> |
| 262 | <frame x="-8" y="-8" width="1936" height="1056" extended-state="6" /> | 254 | <frame x="-8" y="-8" width="1936" height="1056" extended-state="6" /> |
| 263 | - <editor active="true" /> | ||
| 264 | <layout> | 255 | <layout> |
| 265 | - <window_info content_ui="combo" id="Project" order="0" sideWeight="0.49838188" visible="true" weight="0.19296375" /> | 256 | + <window_info content_ui="combo" id="Project" order="0" sideWeight="0.49838188" visible="true" weight="0.19936034" /> |
| 266 | <window_info id="Structure" order="1" side_tool="true" weight="0.25" /> | 257 | <window_info id="Structure" order="1" side_tool="true" weight="0.25" /> |
| 267 | <window_info id="Image Layers" order="2" /> | 258 | <window_info id="Image Layers" order="2" /> |
| 268 | <window_info id="Designer" order="3" /> | 259 | <window_info id="Designer" order="3" /> |
| @@ -271,7 +262,7 @@ | @@ -271,7 +262,7 @@ | ||
| 271 | <window_info id="Favorites" order="6" sideWeight="0.50161815" side_tool="true" weight="0.25" /> | 262 | <window_info id="Favorites" order="6" sideWeight="0.50161815" side_tool="true" weight="0.25" /> |
| 272 | <window_info anchor="bottom" id="Message" order="0" /> | 263 | <window_info anchor="bottom" id="Message" order="0" /> |
| 273 | <window_info anchor="bottom" id="Find" order="1" /> | 264 | <window_info anchor="bottom" id="Find" order="1" /> |
| 274 | - <window_info anchor="bottom" id="Run" order="2" weight="0.329718" /> | 265 | + <window_info active="true" anchor="bottom" id="Run" order="2" visible="true" weight="0.329718" /> |
| 275 | <window_info anchor="bottom" id="Debug" order="3" weight="0.22993493" /> | 266 | <window_info anchor="bottom" id="Debug" order="3" weight="0.22993493" /> |
| 276 | <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" /> | 267 | <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" /> |
| 277 | <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" /> | 268 | <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" /> |
| @@ -279,7 +270,7 @@ | @@ -279,7 +270,7 @@ | ||
| 279 | <window_info anchor="bottom" id="Docker" order="7" show_stripe_button="false" /> | 270 | <window_info anchor="bottom" id="Docker" order="7" show_stripe_button="false" /> |
| 280 | <window_info anchor="bottom" id="Version Control" order="8" weight="0.329718" /> | 271 | <window_info anchor="bottom" id="Version Control" order="8" weight="0.329718" /> |
| 281 | <window_info anchor="bottom" id="Database Changes" order="9" /> | 272 | <window_info anchor="bottom" id="Database Changes" order="9" /> |
| 282 | - <window_info active="true" anchor="bottom" id="Terminal" order="10" visible="true" weight="0.3286334" /> | 273 | + <window_info anchor="bottom" id="Terminal" order="10" weight="0.32827735" /> |
| 283 | <window_info anchor="bottom" id="Event Log" order="11" side_tool="true" /> | 274 | <window_info anchor="bottom" id="Event Log" order="11" side_tool="true" /> |
| 284 | <window_info anchor="bottom" id="Messages" order="12" weight="0.329718" /> | 275 | <window_info anchor="bottom" id="Messages" order="12" weight="0.329718" /> |
| 285 | <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" /> | 276 | <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" /> |
| @@ -397,24 +388,17 @@ | @@ -397,24 +388,17 @@ | ||
| 397 | </state> | 388 | </state> |
| 398 | </provider> | 389 | </provider> |
| 399 | </entry> | 390 | </entry> |
| 400 | - <entry file="file://$PROJECT_DIR$/src/default.properties"> | ||
| 401 | - <provider selected="true" editor-type-id="text-editor"> | ||
| 402 | - <state relative-caret-position="396"> | ||
| 403 | - <caret line="18" column="8" lean-forward="true" selection-start-line="18" selection-start-column="8" selection-end-line="18" selection-end-column="8" /> | ||
| 404 | - </state> | ||
| 405 | - </provider> | ||
| 406 | - </entry> | ||
| 407 | - <entry file="file://$PROJECT_DIR$/src/erp.default.properties"> | 391 | + <entry file="file://$PROJECT_DIR$/.gitignore"> |
| 408 | <provider selected="true" editor-type-id="text-editor"> | 392 | <provider selected="true" editor-type-id="text-editor"> |
| 409 | - <state relative-caret-position="242"> | ||
| 410 | - <caret line="17" column="35" selection-start-line="17" selection-start-column="35" selection-end-line="17" selection-end-column="35" /> | 393 | + <state relative-caret-position="132"> |
| 394 | + <caret line="6" selection-start-line="6" selection-end-line="6" /> | ||
| 411 | </state> | 395 | </state> |
| 412 | </provider> | 396 | </provider> |
| 413 | </entry> | 397 | </entry> |
| 414 | <entry file="file://$PROJECT_DIR$/src/com/taover/ui/UiUtils.java"> | 398 | <entry file="file://$PROJECT_DIR$/src/com/taover/ui/UiUtils.java"> |
| 415 | <provider selected="true" editor-type-id="text-editor"> | 399 | <provider selected="true" editor-type-id="text-editor"> |
| 416 | - <state relative-caret-position="-330"> | ||
| 417 | - <caret line="26" column="51" lean-forward="true" selection-start-line="26" selection-start-column="51" selection-end-line="26" selection-end-column="51" /> | 400 | + <state relative-caret-position="286"> |
| 401 | + <caret line="26" column="51" selection-start-line="26" selection-start-column="51" selection-end-line="26" selection-end-column="51" /> | ||
| 418 | <folding> | 402 | <folding> |
| 419 | <element signature="e#407#408#0" expanded="true" /> | 403 | <element signature="e#407#408#0" expanded="true" /> |
| 420 | <element signature="e#461#462#0" expanded="true" /> | 404 | <element signature="e#461#462#0" expanded="true" /> |
| @@ -422,24 +406,31 @@ | @@ -422,24 +406,31 @@ | ||
| 422 | </state> | 406 | </state> |
| 423 | </provider> | 407 | </provider> |
| 424 | </entry> | 408 | </entry> |
| 425 | - <entry file="jar://C:/Program Files/Java/jdk1.8.0_161/src.zip!/java/sql/DriverManager.java"> | 409 | + <entry file="file://$PROJECT_DIR$/src/erp.default.properties"> |
| 426 | <provider selected="true" editor-type-id="text-editor"> | 410 | <provider selected="true" editor-type-id="text-editor"> |
| 427 | - <state relative-caret-position="197"> | ||
| 428 | - <caret line="204" column="29" selection-start-line="204" selection-start-column="29" selection-end-line="204" selection-end-column="29" /> | 411 | + <state relative-caret-position="374"> |
| 412 | + <caret line="17" column="35" selection-start-line="17" selection-start-column="35" selection-end-line="17" selection-end-column="35" /> | ||
| 429 | </state> | 413 | </state> |
| 430 | </provider> | 414 | </provider> |
| 431 | </entry> | 415 | </entry> |
| 432 | - <entry file="file://$PROJECT_DIR$/src/com/taover/ui/EntityGenWindow.java"> | 416 | + <entry file="file://$PROJECT_DIR$/src/default.properties"> |
| 433 | <provider selected="true" editor-type-id="text-editor"> | 417 | <provider selected="true" editor-type-id="text-editor"> |
| 434 | - <state relative-caret-position="392"> | ||
| 435 | - <caret line="119" column="38" lean-forward="true" selection-start-line="119" selection-start-column="38" selection-end-line="119" selection-end-column="38" /> | 418 | + <state relative-caret-position="396"> |
| 419 | + <caret line="18" column="8" selection-start-line="18" selection-start-column="8" selection-end-line="18" selection-end-column="8" /> | ||
| 436 | </state> | 420 | </state> |
| 437 | </provider> | 421 | </provider> |
| 438 | </entry> | 422 | </entry> |
| 439 | - <entry file="file://$PROJECT_DIR$/.gitignore"> | 423 | + <entry file="jar://C:/Program Files/Java/jdk1.8.0_161/src.zip!/java/sql/DriverManager.java"> |
| 440 | <provider selected="true" editor-type-id="text-editor"> | 424 | <provider selected="true" editor-type-id="text-editor"> |
| 441 | - <state relative-caret-position="132"> | ||
| 442 | - <caret line="6" selection-start-line="6" selection-end-line="6" /> | 425 | + <state relative-caret-position="3806"> |
| 426 | + <caret line="204" column="29" selection-start-line="204" selection-start-column="29" selection-end-line="204" selection-end-column="29" /> | ||
| 427 | + </state> | ||
| 428 | + </provider> | ||
| 429 | + </entry> | ||
| 430 | + <entry file="file://$PROJECT_DIR$/src/com/taover/ui/EntityGenWindow.java"> | ||
| 431 | + <provider selected="true" editor-type-id="text-editor"> | ||
| 432 | + <state relative-caret-position="431"> | ||
| 433 | + <caret line="121" column="11" lean-forward="true" selection-start-line="121" selection-start-column="11" selection-end-line="121" selection-end-column="11" /> | ||
| 443 | </state> | 434 | </state> |
| 444 | </provider> | 435 | </provider> |
| 445 | </entry> | 436 | </entry> |
src/com/taover/ui/EntityGenWindow.java
| @@ -107,8 +107,8 @@ public class EntityGenWindow extends JFrame{ | @@ -107,8 +107,8 @@ public class EntityGenWindow extends JFrame{ | ||
| 107 | tableNameList.add(tableNameCommoArr[j]); | 107 | tableNameList.add(tableNameCommoArr[j]); |
| 108 | } | 108 | } |
| 109 | } | 109 | } |
| 110 | + JButton eBtn = (JButton)e.getSource(); | ||
| 110 | try { | 111 | try { |
| 111 | - JButton eBtn = (JButton)e.getSource(); | ||
| 112 | eBtn.setEnabled(false); | 112 | eBtn.setEnabled(false); |
| 113 | UiUtils.generateEntity(EntityGenWindow.this.prop, tf_dbPackage.getText(), tf_outputDir.getText(), tf_dbName.getText(), tableNameList, createAllTable); | 113 | UiUtils.generateEntity(EntityGenWindow.this.prop, tf_dbPackage.getText(), tf_outputDir.getText(), tf_dbName.getText(), tableNameList, createAllTable); |
| 114 | JOptionPane.showMessageDialog(EntityGenWindow.this, "生成完成", "提示信息", JOptionPane.INFORMATION_MESSAGE); | 114 | JOptionPane.showMessageDialog(EntityGenWindow.this, "生成完成", "提示信息", JOptionPane.INFORMATION_MESSAGE); |