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 | 2 | <project version="4"> |
| 3 | 3 | <component name="ChangeListManager"> |
| 4 | 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 | 5 | <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" /> |
| 7 | 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 | 7 | </list> |
| 10 | 8 | <ignored path="$PROJECT_DIR$/out/" /> |
| 11 | 9 | <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" /> |
| ... | ... | @@ -21,12 +19,12 @@ |
| 21 | 19 | <favorites_list name="code-generater" /> |
| 22 | 20 | </component> |
| 23 | 21 | <component name="FileEditorManager"> |
| 24 | - <leaf> | |
| 22 | + <leaf SIDE_TABS_SIZE_LIMIT_KEY="300"> | |
| 25 | 23 | <file pinned="false" current-in-tab="false"> |
| 26 | 24 | <entry file="file://$PROJECT_DIR$/src/com/taover/ui/UiUtils.java"> |
| 27 | 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 | 28 | <folding> |
| 31 | 29 | <element signature="e#407#408#0" expanded="true" /> |
| 32 | 30 | <element signature="e#461#462#0" expanded="true" /> |
| ... | ... | @@ -38,7 +36,7 @@ |
| 38 | 36 | <file pinned="false" current-in-tab="false"> |
| 39 | 37 | <entry file="file://$PROJECT_DIR$/src/erp.default.properties"> |
| 40 | 38 | <provider selected="true" editor-type-id="text-editor"> |
| 41 | - <state relative-caret-position="242"> | |
| 39 | + <state relative-caret-position="374"> | |
| 42 | 40 | <caret line="17" column="35" selection-start-line="17" selection-start-column="35" selection-end-line="17" selection-end-column="35" /> |
| 43 | 41 | </state> |
| 44 | 42 | </provider> |
| ... | ... | @@ -48,7 +46,7 @@ |
| 48 | 46 | <entry file="file://$PROJECT_DIR$/src/default.properties"> |
| 49 | 47 | <provider selected="true" editor-type-id="text-editor"> |
| 50 | 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 | 50 | </state> |
| 53 | 51 | </provider> |
| 54 | 52 | </entry> |
| ... | ... | @@ -56,26 +54,17 @@ |
| 56 | 54 | <file pinned="false" current-in-tab="false"> |
| 57 | 55 | <entry file="jar://C:/Program Files/Java/jdk1.8.0_161/src.zip!/java/sql/DriverManager.java"> |
| 58 | 56 | <provider selected="true" editor-type-id="text-editor"> |
| 59 | - <state relative-caret-position="197"> | |
| 57 | + <state relative-caret-position="3806"> | |
| 60 | 58 | <caret line="204" column="29" selection-start-line="204" selection-start-column="29" selection-end-line="204" selection-end-column="29" /> |
| 61 | 59 | </state> |
| 62 | 60 | </provider> |
| 63 | 61 | </entry> |
| 64 | 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 | 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 | 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 | 68 | </state> |
| 80 | 69 | </provider> |
| 81 | 70 | </entry> |
| ... | ... | @@ -105,8 +94,8 @@ |
| 105 | 94 | <option value="$PROJECT_DIR$/src/local.db.properties" /> |
| 106 | 95 | <option value="$PROJECT_DIR$/src/com/taover/ui/UiUtils.java" /> |
| 107 | 96 | <option value="$PROJECT_DIR$/src/erp.default.properties" /> |
| 108 | - <option value="$PROJECT_DIR$/src/com/taover/ui/EntityGenWindow.java" /> | |
| 109 | 97 | <option value="$PROJECT_DIR$/.gitignore" /> |
| 98 | + <option value="$PROJECT_DIR$/src/com/taover/ui/EntityGenWindow.java" /> | |
| 110 | 99 | </list> |
| 111 | 100 | </option> |
| 112 | 101 | </component> |
| ... | ... | @@ -242,12 +231,15 @@ |
| 242 | 231 | <workItem from="1558071853030" duration="1949000" /> |
| 243 | 232 | <workItem from="1559183094225" duration="50000" /> |
| 244 | 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 | 238 | </task> |
| 247 | 239 | <servers /> |
| 248 | 240 | </component> |
| 249 | 241 | <component name="TimeTrackingManager"> |
| 250 | - <option name="totallyTimeSpent" value="12761000" /> | |
| 242 | + <option name="totallyTimeSpent" value="14900000" /> | |
| 251 | 243 | </component> |
| 252 | 244 | <component name="TodoView"> |
| 253 | 245 | <todo-panel id="selected-file"> |
| ... | ... | @@ -260,9 +252,8 @@ |
| 260 | 252 | </component> |
| 261 | 253 | <component name="ToolWindowManager"> |
| 262 | 254 | <frame x="-8" y="-8" width="1936" height="1056" extended-state="6" /> |
| 263 | - <editor active="true" /> | |
| 264 | 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 | 257 | <window_info id="Structure" order="1" side_tool="true" weight="0.25" /> |
| 267 | 258 | <window_info id="Image Layers" order="2" /> |
| 268 | 259 | <window_info id="Designer" order="3" /> |
| ... | ... | @@ -271,7 +262,7 @@ |
| 271 | 262 | <window_info id="Favorites" order="6" sideWeight="0.50161815" side_tool="true" weight="0.25" /> |
| 272 | 263 | <window_info anchor="bottom" id="Message" order="0" /> |
| 273 | 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 | 266 | <window_info anchor="bottom" id="Debug" order="3" weight="0.22993493" /> |
| 276 | 267 | <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" /> |
| 277 | 268 | <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" /> |
| ... | ... | @@ -279,7 +270,7 @@ |
| 279 | 270 | <window_info anchor="bottom" id="Docker" order="7" show_stripe_button="false" /> |
| 280 | 271 | <window_info anchor="bottom" id="Version Control" order="8" weight="0.329718" /> |
| 281 | 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 | 274 | <window_info anchor="bottom" id="Event Log" order="11" side_tool="true" /> |
| 284 | 275 | <window_info anchor="bottom" id="Messages" order="12" weight="0.329718" /> |
| 285 | 276 | <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" /> |
| ... | ... | @@ -397,24 +388,17 @@ |
| 397 | 388 | </state> |
| 398 | 389 | </provider> |
| 399 | 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 | 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 | 395 | </state> |
| 412 | 396 | </provider> |
| 413 | 397 | </entry> |
| 414 | 398 | <entry file="file://$PROJECT_DIR$/src/com/taover/ui/UiUtils.java"> |
| 415 | 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 | 402 | <folding> |
| 419 | 403 | <element signature="e#407#408#0" expanded="true" /> |
| 420 | 404 | <element signature="e#461#462#0" expanded="true" /> |
| ... | ... | @@ -422,24 +406,31 @@ |
| 422 | 406 | </state> |
| 423 | 407 | </provider> |
| 424 | 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 | 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 | 413 | </state> |
| 430 | 414 | </provider> |
| 431 | 415 | </entry> |
| 432 | - <entry file="file://$PROJECT_DIR$/src/com/taover/ui/EntityGenWindow.java"> | |
| 416 | + <entry file="file://$PROJECT_DIR$/src/default.properties"> | |
| 433 | 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 | 420 | </state> |
| 437 | 421 | </provider> |
| 438 | 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 | 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 | 434 | </state> |
| 444 | 435 | </provider> |
| 445 | 436 | </entry> | ... | ... |
src/com/taover/ui/EntityGenWindow.java
| ... | ... | @@ -107,8 +107,8 @@ public class EntityGenWindow extends JFrame{ |
| 107 | 107 | tableNameList.add(tableNameCommoArr[j]); |
| 108 | 108 | } |
| 109 | 109 | } |
| 110 | + JButton eBtn = (JButton)e.getSource(); | |
| 110 | 111 | try { |
| 111 | - JButton eBtn = (JButton)e.getSource(); | |
| 112 | 112 | eBtn.setEnabled(false); |
| 113 | 113 | UiUtils.generateEntity(EntityGenWindow.this.prop, tf_dbPackage.getText(), tf_outputDir.getText(), tf_dbName.getText(), tableNameList, createAllTable); |
| 114 | 114 | JOptionPane.showMessageDialog(EntityGenWindow.this, "生成完成", "提示信息", JOptionPane.INFORMATION_MESSAGE); | ... | ... |