• R/O
  • SSH

JdbcAcsess2: Commit

全てを再実装したJdbcAcsessです。


Commit MetaInfo

Revision222c1d59e36e92517735c085d88950635d687a67 (tree)
Time2012-02-16 21:21:12
Authorshimakazuro
Commitershimakazuro

Log Message

ICON設定

Change Summary

Incremental Difference

diff -r bee2c1a7b226 -r 222c1d59e36e src/jdbcacsess2/main/JPanelSession.java
--- a/src/jdbcacsess2/main/JPanelSession.java Thu Feb 16 00:53:52 2012 +0900
+++ b/src/jdbcacsess2/main/JPanelSession.java Thu Feb 16 21:21:12 2012 +0900
@@ -32,6 +32,7 @@
3232 import javax.swing.SwingUtilities;
3333 import javax.swing.tree.DefaultTreeCellRenderer;
3434
35+import jdbcacsess2.main.icon.IconImage;
3536 import jdbcacsess2.sqlService.DataBaseConnection;
3637 import jdbcacsess2.sqlService.dbobject.DBObject;
3738 import jdbcacsess2.sqlService.dbobject.DBObjects;
@@ -311,7 +312,7 @@
311312 */
312313 JMenuItem getJMenuTabbedSqlNew() {
313314 if (jMenuTabbedSqlNew == null) {
314- jMenuTabbedSqlNew = new JMenuItem();
315+ jMenuTabbedSqlNew = new JMenuItem(IconImage.TAB_ADD.getValue());
315316 jMenuTabbedSqlNew.setText("New");
316317 }
317318 return jMenuTabbedSqlNew;
@@ -324,7 +325,7 @@
324325 */
325326 JMenuItem getJMenuTabbedSqlClose() {
326327 if (jMenuTabbedSqlClose == null) {
327- jMenuTabbedSqlClose = new JMenuItem();
328+ jMenuTabbedSqlClose = new JMenuItem(IconImage.TAB_DELETE.getValue());
328329 jMenuTabbedSqlClose.setText("Close");
329330 }
330331 return jMenuTabbedSqlClose;
@@ -337,7 +338,7 @@
337338 */
338339 JMenuItem getJMenuTabbedSqlCloseOther() {
339340 if (jMenuTabbedSqlCloseOther == null) {
340- jMenuTabbedSqlCloseOther = new JMenuItem();
341+ jMenuTabbedSqlCloseOther = new JMenuItem(IconImage.TAB_DELETE.getValue());
341342 jMenuTabbedSqlCloseOther.setText("CloseOther");
342343 }
343344 return jMenuTabbedSqlCloseOther;
@@ -456,7 +457,7 @@
456457 */
457458 JMenuItem getJMenuDBobjectsRefresh() {
458459 if (jMenuDBobjectsRefresh == null) {
459- jMenuDBobjectsRefresh = new JMenuItem();
460+ jMenuDBobjectsRefresh = new JMenuItem(IconImage.REFRESH.getValue());
460461 jMenuDBobjectsRefresh.setText("Refresh");
461462 }
462463 return jMenuDBobjectsRefresh;
diff -r bee2c1a7b226 -r 222c1d59e36e src/jdbcacsess2/main/JPanelSql.java
--- a/src/jdbcacsess2/main/JPanelSql.java Thu Feb 16 00:53:52 2012 +0900
+++ b/src/jdbcacsess2/main/JPanelSql.java Thu Feb 16 21:21:12 2012 +0900
@@ -48,9 +48,9 @@
4848 import jdbcacsess2.sqlService.DataBaseTransactionListener;
4949 import jdbcacsess2.sqlService.PropertyResultSetTableModel;
5050 import jdbcacsess2.sqlService.ResultsTableModel;
51-import jdbcacsess2.sqlService.parse.SqlExecuteSentencies.SqlExecuteSentence;
5251 import jdbcacsess2.sqlService.SqlExecuteTask;
5352 import jdbcacsess2.sqlService.SqlExecutedListener;
53+import jdbcacsess2.sqlService.parse.SqlExecuteSentencies.SqlExecuteSentence;
5454
5555 import org.fife.ui.rsyntaxtextarea.RSyntaxTextArea;
5656 import org.fife.ui.rsyntaxtextarea.SyntaxConstants;
@@ -720,7 +720,7 @@
720720 */
721721 JButton getJButtonCommit() {
722722 if (jButtonCommit == null) {
723- jButtonCommit = new JButton();
723+ jButtonCommit = new JButton(IconImage.COMMIT.getValue());
724724 jButtonCommit.setText("Commit");
725725 jButtonCommit.setEnabled(false);
726726 }
diff -r bee2c1a7b226 -r 222c1d59e36e src/jdbcacsess2/main/MainController.java
--- a/src/jdbcacsess2/main/MainController.java Thu Feb 16 00:53:52 2012 +0900
+++ b/src/jdbcacsess2/main/MainController.java Thu Feb 16 21:21:12 2012 +0900
@@ -570,8 +570,11 @@
570570 if (index == -1) {
571571 return;
572572 }
573+ JTabbedPane jTabbedPane = view.getCurrentJPanelSession().getJTabbedPaneSql();
574+ if (jTabbedPane.getComponentAt(index) instanceof JPanelSql) {
575+ jTabbedPane.remove(index);
576+ }
573577
574- view.getCurrentJPanelSession().getJTabbedPaneSql().remove(index);
575578 }
576579 };
577580
diff -r bee2c1a7b226 -r 222c1d59e36e src/jdbcacsess2/main/MainView.java
--- a/src/jdbcacsess2/main/MainView.java Thu Feb 16 00:53:52 2012 +0900
+++ b/src/jdbcacsess2/main/MainView.java Thu Feb 16 21:21:12 2012 +0900
@@ -30,6 +30,7 @@
3030 import javax.swing.table.JTableHeader;
3131 import javax.swing.table.TableColumnModel;
3232
33+import jdbcacsess2.main.icon.IconImage;
3334 import net.java.ao.Entity;
3435 import net.java.ao.Preload;
3536
@@ -490,7 +491,7 @@
490491 */
491492 JMenuItem getJMenuTabbedSessionNew() {
492493 if (jMenuTabbedSessionNew == null) {
493- jMenuTabbedSessionNew = new JMenuItem();
494+ jMenuTabbedSessionNew = new JMenuItem(IconImage.SERVER_ADD.getValue());
494495 jMenuTabbedSessionNew.setText("New connect");
495496 }
496497 return jMenuTabbedSessionNew;
@@ -503,7 +504,7 @@
503504 */
504505 JMenuItem getJMenuTabbedSessionClose() {
505506 if (jMenuTabbedSessionClose == null) {
506- jMenuTabbedSessionClose = new JMenuItem();
507+ jMenuTabbedSessionClose = new JMenuItem(IconImage.SERVER_DELETE.getValue());
507508 jMenuTabbedSessionClose.setText("Close connect");
508509 }
509510 return jMenuTabbedSessionClose;
@@ -516,7 +517,7 @@
516517 */
517518 JMenuItem getJMenuTabbedSessionReNew() {
518519 if (jMenuTabbedSessionReNew == null) {
519- jMenuTabbedSessionReNew = new JMenuItem();
520+ jMenuTabbedSessionReNew = new JMenuItem(IconImage.SERVER_GO.getValue());
520521 jMenuTabbedSessionReNew.setText("Re Connect");
521522 }
522523 return jMenuTabbedSessionReNew;
diff -r bee2c1a7b226 -r 222c1d59e36e src/jdbcacsess2/main/icon/IconImage.java
--- a/src/jdbcacsess2/main/icon/IconImage.java Thu Feb 16 00:53:52 2012 +0900
+++ b/src/jdbcacsess2/main/icon/IconImage.java Thu Feb 16 21:21:12 2012 +0900
@@ -1,15 +1,15 @@
11 /*
22 * Copyright 2011 Kazuhiro Shimada
33 *
4- * Licensed under the Apache License, Version 2.0 (the "License");
5- * you may not use this file except in compliance with the License.
4+ * Licensed under the Apache License, Version 2.0 (the "License");
5+ * you may not use this file except in compliance with the License.
66 * You may obtain a copy of the License at
77 *
8- * http://www.apache.org/licenses/LICENSE-2.0
8+ * http://www.apache.org/licenses/LICENSE-2.0
99 *
10- * Unless required by applicable law or agreed to in writing, software
10+ * Unless required by applicable law or agreed to in writing, software
1111 * distributed under the License is distributed on an "AS IS" BASIS,
12- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
12+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
1313 * See the License for the specific language governing permissions and
1414 * limitations under the License.
1515 */
@@ -20,9 +20,12 @@
2020
2121 public enum IconImage {
2222 CONNECT("connect.png"), DISCONNECT("disconnect.png"), EXECUTE("execute.png"), STOP("list-remove.png"), GO_DOWN(
23- "go-down.png"), ROLLBACK("edit-undo.png")
24- // CONNECT("stock_connect.png"), DISCONNECT("stock_disconnect.png")
25- ;
23+ "go-down.png"), ROLLBACK("edit-undo.png"), COMMIT("database_save.png"), REFRESH("database_refresh.png")
24+ , SERVER_ADD(
25+ "server_add.png"), SERVER_DELETE("server_delete.png"), SERVER_GO("server_go.png")
26+, TAB_ADD("tab_add.png"), TAB_DELETE(
27+ "tab_delete.png")
28+ ;
2629
2730 private final Icon Icon;
2831
diff -r bee2c1a7b226 -r 222c1d59e36e src/jdbcacsess2/main/icon/database_refresh.png
Binary file src/jdbcacsess2/main/icon/database_refresh.png has changed
diff -r bee2c1a7b226 -r 222c1d59e36e src/jdbcacsess2/main/icon/database_save.png
Binary file src/jdbcacsess2/main/icon/database_save.png has changed
diff -r bee2c1a7b226 -r 222c1d59e36e src/jdbcacsess2/main/icon/server_add.png
Binary file src/jdbcacsess2/main/icon/server_add.png has changed
diff -r bee2c1a7b226 -r 222c1d59e36e src/jdbcacsess2/main/icon/server_delete.png
Binary file src/jdbcacsess2/main/icon/server_delete.png has changed
diff -r bee2c1a7b226 -r 222c1d59e36e src/jdbcacsess2/main/icon/server_go.png
Binary file src/jdbcacsess2/main/icon/server_go.png has changed
diff -r bee2c1a7b226 -r 222c1d59e36e src/jdbcacsess2/main/icon/tab_add.png
Binary file src/jdbcacsess2/main/icon/tab_add.png has changed
diff -r bee2c1a7b226 -r 222c1d59e36e src/jdbcacsess2/main/icon/tab_delete.png
Binary file src/jdbcacsess2/main/icon/tab_delete.png has changed
Show on old repository browser