OSDN > Find Software > Database > Front-Ends > JDBCでDBアクセス > SCM > hg > JdbcAcsess2 > Commit

JDBCでDBアクセス
Fork
jdbcacsess2
JdbcAcsess2

JdbcAcsess2: Commit

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

Commit MetaInfo

Revision	0f88dae1c9ae60ce177ebf9f553fbae034b9737b (tree)
Time	2012-03-26 14:02:57
Author	shimakazuro
Commiter	shimakazuro

Log Message

パラメータの保存

Change Summary

modified: .settings/org.eclipse.jdt.core.prefs (diff)
modified: src/jdbcacsess2/connect/ConfigDbms.java (diff)
modified: src/jdbcacsess2/connect/ConnectController.java (diff)
modified: src/jdbcacsess2/connect/ConnectView.java (diff)
modified: src/jdbcacsess2/main/Config.java (diff)
modified: src/jdbcacsess2/main/FontZoom.java (diff)
modified: src/jdbcacsess2/main/GuiDivider.java (diff)
modified: src/jdbcacsess2/main/GuiFont.java (diff)
modified: src/jdbcacsess2/main/GuiWindow.java (diff)
modified: src/jdbcacsess2/main/JPanelSql.java (diff)
modified: src/jdbcacsess2/main/Jdbcacsess2.java (diff)
modified: src/jdbcacsess2/main/MainController.java (diff)
modified: src/jdbcacsess2/main/MainView.java (diff)
add: src/jdbcacsess2/main/ConfigProperty.java (diff)

Incremental Difference

diff -r 8a79cfa3ab0c -r 0f88dae1c9ae .settings/org.eclipse.jdt.core.prefs

--- a/.settings/org.eclipse.jdt.core.prefs Fri Mar 09 00:45:52 2012 +0900

+++ b/.settings/org.eclipse.jdt.core.prefs Mon Mar 26 14:02:57 2012 +0900

		@@ -1,4 +1,4 @@
1		-#Mon Mar 05 00:24:12 JST 2012
	1	+#Mon Mar 12 21:22:36 JST 2012
2	2	eclipse.preferences.version=1
3	3	org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
4	4	org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6

		@@ -22,7 +22,7 @@
22	22	org.eclipse.jdt.core.formatter.alignment_for_compact_if=16
23	23	org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=16
24	24	org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0
25		-org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16
	25	+org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=2
26	26	org.eclipse.jdt.core.formatter.alignment_for_method_declaration=0
27	27	org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16
28	28	org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16

		@@ -75,7 +75,7 @@
75	75	org.eclipse.jdt.core.formatter.comment.preserve_white_space_between_code_and_line_comments=false
76	76	org.eclipse.jdt.core.formatter.compact_else_if=true
77	77	org.eclipse.jdt.core.formatter.continuation_indentation=2
78		-org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=2
	78	+org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=1
79	79	org.eclipse.jdt.core.formatter.disabling_tag=@formatter\:off
80	80	org.eclipse.jdt.core.formatter.enabling_tag=@formatter\:on
81	81	org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line=false

		@@ -98,10 +98,10 @@
98	98	org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter=do not insert
99	99	org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_type=insert
100	100	org.eclipse.jdt.core.formatter.insert_new_line_after_label=do not insert
101		-org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=insert
	101	+org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do not insert
102	102	org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=do not insert
103	103	org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=do not insert
104		-org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer=insert
	104	+org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer=do not insert
105	105	org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement=do not insert
106	106	org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement=do not insert
107	107	org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement=do not insert

		@@ -128,7 +128,7 @@
128	128	org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement=insert
129	129	org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression=insert
130	130	org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation=insert
131		-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer=insert
	131	+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer=do not insert
132	132	org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters=insert
133	133	org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws=insert
134	134	org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments=insert

		@@ -149,7 +149,7 @@
149	149	org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert
150	150	org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert
151	151	org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert
152		-org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer=insert
	152	+org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer=do not insert
153	153	org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression=do not insert
154	154	org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference=do not insert
155	155	org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation=do not insert

		@@ -180,7 +180,7 @@
180	180	org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert
181	181	org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert
182	182	org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert
183		-org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer=insert
	183	+org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer=do not insert
184	184	org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression=do not insert
185	185	org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference=do not insert
186	186	org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation=do not insert

		@@ -228,7 +228,7 @@
228	228	org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert
229	229	org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration=insert
230	230	org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration=insert
231		-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer=insert
	231	+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer=do not insert
232	232	org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block=insert
233	233	org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration=insert
234	234	org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant=insert

diff -r 8a79cfa3ab0c -r 0f88dae1c9ae src/jdbcacsess2/connect/ConfigDbms.java

--- a/src/jdbcacsess2/connect/ConfigDbms.java Fri Mar 09 00:45:52 2012 +0900

+++ b/src/jdbcacsess2/connect/ConfigDbms.java Mon Mar 26 14:02:57 2012 +0900

		@@ -1,15 +1,15 @@
1	1	/*
2	2	* Copyright 2011 Kazuhiro Shimada
3	3	*
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.
6	6	* You may obtain a copy of the License at
7	7	*
8		- * http://www.apache.org/licenses/LICENSE-2.0
	8	+ * http://www.apache.org/licenses/LICENSE-2.0
9	9	*
10		- * Unless required by applicable law or agreed to in writing, software
	10	+ * Unless required by applicable law or agreed to in writing, software
11	11	* 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.
13	13	* See the License for the specific language governing permissions and
14	14	* limitations under the License.
15	15	*/

		@@ -18,6 +18,8 @@
18	18	import net.java.ao.Entity;
19	19	import net.java.ao.OneToMany;
20	20	import net.java.ao.Preload;
	21	+import net.java.ao.schema.Default;
	22	+import net.java.ao.schema.NotNull;
21	23	import net.java.ao.schema.Unique;
22	24
23	25	/**

		@@ -28,34 +30,41 @@
28	30	*/
29	31	@Preload
30	32	public interface ConfigDbms extends Entity {
	33	+ @NotNull
31	34	@Unique
32	35	String getDbmsName();
33		-
34	36	void setDbmsName(String dbmsName);
35	37
	38	+ @NotNull
36	39	String getSubprotocol();
37		-
38	40	void setSubprotocol(String subprotocol);
39	41
	42	+ @NotNull
40	43	String getSubname();
41		-
42	44	void setSubname(String subname);
43	45
	46	+ @NotNull
44	47	String getDriverclass();
45		-
46	48	void setDriverclass(String driverclass);
47	49
	50	+ @NotNull
48	51	String getUrlOption();
49		-
50	52	void setUrlOption(String urlOption);
51	53
	54	+ @NotNull
52	55	@OneToMany
53	56	ConfigConnect[] getConfigConnects();
54	57
	58	+ @NotNull
	59	+ @Default("00.0")
	60	+ String getVersion();
	61	+ void setVersion(String version);
	62	+
55	63	public static String DBMSNAME = "dbmsname";
56	64	public static String SUBPROTOCOL = "subprotocol";
57	65	public static String SUBNAME = "subname";
58	66	public static String DRIVERCLASS = "driverclass";
59	67	public static String URLOPTION = "urloption";
	68	+ public static String VERSION = "version";
60	69
61	70	}

diff -r 8a79cfa3ab0c -r 0f88dae1c9ae src/jdbcacsess2/connect/ConnectController.java

--- a/src/jdbcacsess2/connect/ConnectController.java Fri Mar 09 00:45:52 2012 +0900

+++ b/src/jdbcacsess2/connect/ConnectController.java Mon Mar 26 14:02:57 2012 +0900

		@@ -51,7 +51,7 @@
51	51	import javax.swing.event.ListSelectionListener;
52	52
53	53	import jdbcacsess2.connect.ConnectTableModel.AlreadyExistsException;
54		-import jdbcacsess2.connect.ConnectView.ConfigViewConnect;
	54	+import jdbcacsess2.connect.ConnectView.ViewConnect;
55	55	import jdbcacsess2.main.Config;
56	56	import jdbcacsess2.main.Jdbcacsess2;
57	57	import jdbcacsess2.main.ShowDialog;

		@@ -255,9 +255,9 @@
255	255	public void windowClosing(WindowEvent e) {
256	256	// component保存
257	257	try {
258		- ConfigViewConnect configViewConnect = config.getEntity(ConnectView.ConfigViewConnect.class);
259		- view.collectViewConnect(configViewConnect);
260		- configViewConnect.save();
	258	+ ViewConnect viewConnect = config.getEntity(ConnectView.ViewConnect.class);
	259	+ view.collectViewConnect(viewConnect);
	260	+ viewConnect.save();
261	261	} catch (SQLException ex) {
262	262	ShowDialog.errorMessage(ex);
263	263	}

		@@ -272,9 +272,9 @@
272	272	public void actionPerformed(ActionEvent e) {
273	273	// component保存
274	274	try {
275		- ConfigViewConnect configViewConnect = config.getEntity(ConnectView.ConfigViewConnect.class);
276		- view.collectViewConnect(configViewConnect);
277		- configViewConnect.save();
	275	+ ViewConnect viewConnect = config.getEntity(ConnectView.ViewConnect.class);
	276	+ view.collectViewConnect(viewConnect);
	277	+ viewConnect.save();
278	278	} catch (SQLException ex) {
279	279	ShowDialog.errorMessage(ex);
280	280	}

		@@ -366,10 +366,10 @@
366	366	}
367	367
368	368	ConfigConnect row[] =
369		- config.getEntityManager().find(ConfigConnect.class,
370		- Query.select().where(ConfigConnect.CONNECTNAME + "=?",
371		- view.getJTextFieldConnectName()
372		- .getText()));
	369	+ config.getEntityManager().find(ConfigConnect.class,
	370	+ Query.select().where(ConfigConnect.CONNECTNAME + "=?",
	371	+ view.getJTextFieldConnectName()
	372	+ .getText()));
373	373	ConfigConnect connectedConfigConnect = null;
374	374	for (ConfigConnect element : row) {
375	375	Date lastConnectdate = new Date();

		@@ -380,12 +380,12 @@
380	380	}
381	381
382	382	// component保存
383		- ConfigViewConnect configViewConnect = config.getEntity(ConnectView.ConfigViewConnect.class);
384		- view.collectViewConnect(configViewConnect);
	383	+ ViewConnect viewConnect = config.getEntity(ConnectView.ViewConnect.class);
	384	+ view.collectViewConnect(viewConnect);
385	385	if (connectedConfigConnect != null) {
386		- configViewConnect.setConnect(connectedConfigConnect);
	386	+ viewConnect.setConnect(connectedConfigConnect);
387	387	}
388		- configViewConnect.save();
	388	+ viewConnect.save();
389	389
390	390	} catch (SQLException e) {
391	391	ShowDialog.errorMessage(e);

		@@ -618,7 +618,7 @@
618	618	view.getJTableConnect().getRowSorter().toggleSortOrder(0);
619	619
620	620	// GUIのコンポーネント属性を復元
621		- ConfigViewConnect[] c = config.getEntityManager().find(ConnectView.ConfigViewConnect.class);
	621	+ ViewConnect[] c = config.getEntityManager().find(ConnectView.ViewConnect.class);
622	622	if (c.length != 0) {
623	623	view.setViewConnect(c[0]);
624	624	}

diff -r 8a79cfa3ab0c -r 0f88dae1c9ae src/jdbcacsess2/connect/ConnectView.java

--- a/src/jdbcacsess2/connect/ConnectView.java Fri Mar 09 00:45:52 2012 +0900

+++ b/src/jdbcacsess2/connect/ConnectView.java Mon Mar 26 14:02:57 2012 +0900

		@@ -54,6 +54,7 @@
54	54	import net.java.ao.Entity;
55	55	import net.java.ao.Generator;
56	56	import net.java.ao.Preload;
	57	+import net.java.ao.schema.NotNull;
57	58
58	59	public class ConnectView extends JDialog {
59	60

		@@ -65,20 +66,24 @@
65	66	*
66	67	*/
67	68	@Preload
68		- public interface ConfigViewConnect extends Entity {
	69	+ public interface ViewConnect extends Entity {
69	70
	71	+ @NotNull
70	72	@Generator(WindowGenerator.class)
71	73	GuiWindow getWindow();
72	74	void setWindow(GuiWindow guiWindow);
73	75
	76	+ @NotNull
74	77	@Generator(DividerGenerator.class)
75	78	GuiDivider getDivider();
76	79	void setDivider(GuiDivider guiDivider);
77	80
	81	+ @NotNull
78	82	@Generator(DividerGenerator.class)
79	83	GuiDivider getLastDivider();
80	84	void setLastDivider(GuiDivider guiDivider);
81	85
	86	+ @NotNull
82	87	@Generator(FontGenerator.class)
83	88	GuiFont getFontList();
84	89	void setFontList(GuiFont guiFont);

		@@ -95,7 +100,7 @@
95	100	* 入力値を格納する為のConfigViewConnect。
96	101	* @throws SQLException
97	102	*/
98		- public void collectViewConnect(ConfigViewConnect c) throws SQLException {
	103	+ public void collectViewConnect(ViewConnect c) throws SQLException {
99	104	Point p = getLocationOnScreen();
100	105	GuiWindow guiWindow = c.getWindow();
101	106	guiWindow.setWidth(getWidth());

		@@ -124,7 +129,7 @@
124	129	* 復元するConfigViewConnect
125	130	* @throws SQLException
126	131	*/
127		- public void setViewConnect(final ConfigViewConnect c) throws SQLException {
	132	+ public void setViewConnect(final ViewConnect c) throws SQLException {
128	133
129	134	jSplitPane.setDividerLocation(c.getDivider().getLocation());
130	135	jSplitPane.setLastDividerLocation(c.getLastDivider().getLocation());

		@@ -233,7 +238,7 @@
233	238	// どうも、Linux java7 でバグってないか？
234	239	this.setLocationByPlatform(false);
235	240
236		- this.setSize(new Dimension(500, 550));
	241	+ this.setSize(new Dimension(600, 800));
237	242	this.setModal(true);
238	243	this.setDefaultCloseOperation(WindowConstants.DISPOSE_ON_CLOSE);
239	244	this.setTitle("データベース接続");

		@@ -264,8 +269,8 @@
264	269	jSplitPane = new JSplitPane();
265	270	jSplitPane.setOrientation(JSplitPane.VERTICAL_SPLIT);
266	271	jSplitPane.setOneTouchExpandable(true);
267		- jSplitPane.setDividerSize(15);
268		- jSplitPane.setDividerLocation(80);
	272	+ // jSplitPane.setDividerSize(15);
	273	+ jSplitPane.setDividerLocation(200);
269	274	jSplitPane.setBottomComponent(getJPanelConnectInfo());
270	275	jSplitPane.setTopComponent(getJPanelConnectList());
271	276	}

diff -r 8a79cfa3ab0c -r 0f88dae1c9ae src/jdbcacsess2/main/Config.java

--- a/src/jdbcacsess2/main/Config.java Fri Mar 09 00:45:52 2012 +0900

+++ b/src/jdbcacsess2/main/Config.java Mon Mar 26 14:02:57 2012 +0900

		@@ -21,8 +21,6 @@
21	21	import java.util.ArrayList;
22	22	import java.util.Collections;
23	23	import java.util.Enumeration;
24		-import java.util.HashMap;
25		-import java.util.Map;
26	24	import java.util.Properties;
27	25	import java.util.logging.ConsoleHandler;
28	26	import java.util.logging.FileHandler;

		@@ -47,6 +45,7 @@
47	45	private static final String CONFIG_DB = "config.derby";
48	46	private static final String CONFIG_JDBCURL = "jdbc:derby:" + CONFIG_DIR + System.getProperty("file.separator")
49	47	+ CONFIG_DB + ";create=true";
	48	+
50	49	private static final String CONFIG_JDBCCLASS = "org.apache.derby.jdbc.EmbeddedDriver";
51	50	private static final String USER = "";
52	51	private static final String PASS = "";

		@@ -116,8 +115,8 @@
116	115	Class.forName(CONFIG_JDBCCLASS);
117	116
118	117	this.entityManager = new EntityManager(CONFIG_JDBCURL, USER, PASS);
119		- Jdbcacsess2.loggerActiveObjects.setLevel(Level.WARNING);
120		- // Jdbcacsess2.loggerActiveObjects.setLevel(Level.FINE);
	118	+ // Jdbcacsess2.loggerActiveObjects.setLevel(Level.WARNING);
	119	+ Jdbcacsess2.loggerActiveObjects.setLevel(Level.FINE);
121	120
122	121	migrate();
123	122	Jdbcacsess2.logger.info("Migrate end");

		@@ -140,12 +139,14 @@
140	139	private void migrate() throws SQLException {
141	140	getEntityManager().migrate(ConfigDbms.class,
142	141	ConfigConnect.class,
143		- ConnectView.ConfigViewConnect.class,
144		- MainView.ConfigViewMain.class,
145		- ExecHistory.class,
	142	+ ConnectView.ViewConnect.class,
	143	+ MainView.ViewMain.class,
146	144	GuiFont.class,
147	145	GuiWindow.class,
148		- GuiDivider.class);
	146	+ GuiDivider.class,
	147	+ ExecHistory.class,
	148	+ ConfigProperty.class
	149	+ );
149	150	}
150	151
151	152	/**

		@@ -160,7 +161,6 @@
160	161	ConfigConnect[] configConnects = getEntityManager().find(ConfigConnect.class,
161	162	Query.select().where(ConfigConnect.CONNECTNAME + "=?",
162	163	connectName));
163		-
164	164	ConfigConnect rtn;
165	165	if (configConnects.length == 0l) {
166	166	rtn = getEntityManager().create(ConfigConnect.class, new DBParam(ConfigConnect.CONNECTNAME, connectName));

		@@ -192,100 +192,53 @@
192	192	* @throws SQLException
193	193	*/
194	194	private void setUpConfigDbms() throws SQLException {
195		- String[] colnames = {
196		- ConfigDbms.DBMSNAME, ConfigDbms.SUBPROTOCOL, ConfigDbms.SUBNAME, ConfigDbms.DRIVERCLASS,
197		- ConfigDbms.URLOPTION
198		- };
199		- String[][] rows = {
200		- {
201		- "PostgreSQL", "postgresql", "//%HostName%%PortNumber%/%DataBaseName%",
202		- "org.postgresql.Driver", ""
203		- },
204		- {
205		- "MySQL", "mysql", "//%HostName%%PortNumber%/%DataBaseName%", "org.gjt.mm.mysql.Driver", ""
206		- },
207		- {
208		- "MySQL(com)", "mysql", "//%HostName%%PortNumber%/%DataBaseName%", "com.mysql.jdbc.Driver",
209		- ""
210		- },
211		- {
212		- "HSQL", "hsqldb:hsql", "//%HostName%%PortNumber%/%DataBaseName%", "org.hsqldb.jdbcDriver",
213		- ""
214		- },
215		- {
216		- "Oracle(TYPE4:Pure Java)", "oracle:thin", "@%HostName%%PortNumber%:%DataBaseName%",
217		- "oracle.jdbc.driver.OracleDriver", ""
218		- },
219		- {
220		- "Oracle(TYPE2:NET)", "oracle:oci", "@%DataBaseName%", "oracle.jdbc.driver.OracleDriver",
221		- ""
222		- },
223		- {
224		- "Oracle(TYPE2:NET8)", "oracle:oci8", "@%DataBaseName%", "oracle.jdbc.driver.OracleDriver",
225		- ""
226		- },
227		- {
228		- "DB2(TYPE4:Universal)", "db2", "//%HostName%%PortNumber%/%DataBaseName%",
229		- "com.ibm.db2.jcc.DB2Driver", ""
230		- },
231		- {
232		- "DB2(TYPE2:Universal)", "db2", "%DataBaseName%", "com.ibm.db2.jcc.DB2Driver", ""
233		- },
234		- {
235		- "DB2(TYPE2:App)", "db2", "%DataBaseName%", "COM.ibm.db2.jdbc.app.DB2Driver", ""
236		- },
237		- {
238		- "DB2(TYPE3:Net)", "db2", "//%HostName%%PortNumber%/%DataBaseName%",
239		- "COM.ibm.db2.jdbc.net.DB2Driver", ""
240		- },
241		- {
242		- "SQL Server", "sqlserver", "//%HostName%%PortNumber%;databaseName=%DataBaseName%",
243		- "com.microsoft.sqlserver.jdbc.SQLServerDriver", ""
244		- },
245		- {
246		- "SQL Server(2000)", "microsoft:sqlserver",
247		- "//%HostName%%PortNumber%;databaseName=%DataBaseName%",
248		- "com.microsoft.jdbc.sqlserver.SQLServerDriver", ""
249		- },
250		- {
251		- "Derby(Embedded)", "derby", "%DataBaseName%", "org.apache.derby.jdbc.EmbeddedDriver", ""
252		- },
253		- {
254		- "Derby(Client)", "derby", "%DataBaseName%", "org.apache.derby.jdbc.ClientDriver", ""
255		- },
256		- {
257		- "SQLite", "sqlite", "/%DataBaseName%", "org.sqlite.JDBC", ""
258		- },
259		- {
260		- "Firebird", "firebirdsql", "//%HostName%%PortNumber%/%DataBaseName%",
261		- "org.firebirdsql.jdbc.FBDriver", ""
262		- },
263		- {
264		- "Symfoware", "symford", "//%HostName%%PortNumber%/%DataBaseName%",
265		- "com.fujitsu.symfoware.jdbc.SYMDriver", ""
266		- },
267		- {
268		- "HiRDB", "hitachi:hirdb", "//DBID=%PortNumberRAW%,DBHOST=%HostName%",
269		- "JP.co.Hitachi.soft.HiRDB.JDBC.HiRDBDriver", ""
270		- },
271		- {
272		- "ODBC(TYPE1)", "odbc", "%DataBaseName%", "sun.jdbc.odbc.JdbcOdbcDriver", ""
273		- },
274		- {
275		- "free format", "", "", "", ""
276		- }
277		- };
	195	+ String[][] rows =
	196	+ {
	197	+ {"PostgreSQL","postgresql","//%HostName%%PortNumber%/%DataBaseName%","org.postgresql.Driver","","00.1"},
	198	+ {"MySQL","mysql","//%HostName%%PortNumber%/%DataBaseName%","org.gjt.mm.mysql.Driver","","00.0"},
	199	+ {"MySQL(com)","mysql","//%HostName%%PortNumber%/%DataBaseName%","com.mysql.jdbc.Driver","","00.0"},
	200	+ {"HSQL","hsqldb:hsql","//%HostName%%PortNumber%/%DataBaseName%","org.hsqldb.jdbcDriver","","00.0"},
	201	+ {"Oracle(TYPE4:Pure Java)","oracle:thin","@%HostName%%PortNumber%:%DataBaseName%","oracle.jdbc.driver.OracleDriver","","00.0"},
	202	+ {"Oracle(TYPE2:NET)","oracle:oci","@%DataBaseName%","oracle.jdbc.driver.OracleDriver","","00.0"},
	203	+ {"Oracle(TYPE2:NET8)","oracle:oci8","@%DataBaseName%","oracle.jdbc.driver.OracleDriver","","00.0"},
	204	+ {"DB2(TYPE4:Universal)","db2","//%HostName%%PortNumber%/%DataBaseName%","com.ibm.db2.jcc.DB2Driver","","00.1"},
	205	+ {"DB2(TYPE2:Universal)","db2","%DataBaseName%","com.ibm.db2.jcc.DB2Driver","","00.0"},
	206	+ {"DB2(TYPE2:App)","db2","%DataBaseName%","COM.ibm.db2.jdbc.app.DB2Driver","","00.0"},
	207	+ {"DB2(TYPE3:Net)","db2","//%HostName%%PortNumber%/%DataBaseName%","COM.ibm.db2.jdbc.net.DB2Driver","","00.0"},
	208	+ {"SQL Server","sqlserver","//%HostName%%PortNumber%;databaseName=%DataBaseName%","com.microsoft.sqlserver.jdbc.SQLServerDriver","","00.0"},
	209	+ {"SQL Server(2000)","microsoft:sqlserver","//%HostName%%PortNumber%;databaseName=%DataBaseName%","com.microsoft.jdbc.sqlserver.SQLServerDriver","","00.0"},
	210	+ {"Derby(Embedded)","derby","%DataBaseName%","org.apache.derby.jdbc.EmbeddedDriver","","00.0"},
	211	+ {"Derby(Client)","derby","%DataBaseName%","org.apache.derby.jdbc.ClientDriver","","00.0"},
	212	+ {"SQLite","sqlite","/%DataBaseName%","org.sqlite.JDBC","","00.0"},
	213	+ {"Firebird","firebirdsql","//%HostName%%PortNumber%/%DataBaseName%","org.firebirdsql.jdbc.FBDriver","","00.0"},
	214	+ {"Symfoware","symford","//%HostName%%PortNumber%/%DataBaseName%","com.fujitsu.symfoware.jdbc.SYMDriver","","00.0"},
	215	+ {"HiRDB","hitachi:hirdb","//DBID=%PortNumberRAW%,DBHOST=%HostName%","JP.co.Hitachi.soft.HiRDB.JDBC.HiRDBDriver","","00.0"},
	216	+ {"ODBC(TYPE1)","odbc","%DataBaseName%","sun.jdbc.odbc.JdbcOdbcDriver","","00.0"},
	217	+ {"free format","","","","","00.0"}
	218	+ };
278	219
279	220	for (String[] row : rows) {
280	221	ConfigDbms[] dbms = getEntityManager().find(ConfigDbms.class,
281	222	Query.select().where(ConfigDbms.DBMSNAME + "=?", row[0]));
282	223	if (dbms.length == 0) {
283		- Map<String, Object> m = new HashMap<String, Object>();
284		- for (int j = 0; j < colnames.length; j++) {
285		- m.put(colnames[j], row[j]);
	224	+ ConfigDbms configDbms =
	225	+ getEntityManager().create(ConfigDbms.class, new DBParam(ConfigDbms.DBMSNAME, row[0]));
	226	+ Jdbcacsess2.logger.info("not exists:" + row[0]);
	227	+ configDbms.setSubprotocol(row[1]);
	228	+ configDbms.setSubname(row[2]);
	229	+ configDbms.setDriverclass(row[3]);
	230	+ configDbms.setUrlOption(row[4]);
	231	+ configDbms.setVersion(row[5]);
	232	+ configDbms.save();
	233	+ } else {
	234	+ if (dbms[0].getVersion().compareTo(row[5]) < 0) {
	235	+ dbms[0].setSubprotocol(row[1]);
	236	+ dbms[0].setSubname(row[2]);
	237	+ dbms[0].setDriverclass(row[3]);
	238	+ dbms[0].setUrlOption(row[4]);
	239	+ dbms[0].setVersion(row[5]);
	240	+ dbms[0].save();
286	241	}
287		- getEntityManager().create(ConfigDbms.class, m);
288		- Jdbcacsess2.logger.info("not exists:" + row[0]);
289	242	}
290	243	}
291	244	}

diff -r 8a79cfa3ab0c -r 0f88dae1c9ae src/jdbcacsess2/main/ConfigProperty.java

--- /dev/null Thu Jan 01 00:00:00 1970 +0000

+++ b/src/jdbcacsess2/main/ConfigProperty.java Mon Mar 26 14:02:57 2012 +0900

		@@ -0,0 +1,105 @@
	1	+/*
	2	+ * Copyright 2012 Kazuhiro Shimada
	3	+ *
	4	+ * Licensed under the Apache License, Version 2.0 (the "License");
	5	+ * you may not use this file except in compliance with the License.
	6	+ * You may obtain a copy of the License at
	7	+ *
	8	+ * http://www.apache.org/licenses/LICENSE-2.0
	9	+ *
	10	+ * Unless required by applicable law or agreed to in writing, software
	11	+ * distributed under the License is distributed on an "AS IS" BASIS,
	12	+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
	13	+ * See the License for the specific language governing permissions and
	14	+ * limitations under the License.
	15	+ */
	16	+
	17	+package jdbcacsess2.main;
	18	+
	19	+import jdbcacsess2.main.ConfigProperty.ConfigPropertyImpl;
	20	+import net.java.ao.Entity;
	21	+import net.java.ao.Implementation;
	22	+import net.java.ao.Preload;
	23	+import net.java.ao.schema.Ignore;
	24	+import net.java.ao.schema.Unique;
	25	+
	26	+/**
	27	+ * @author sima
	28	+ *
	29	+ */
	30	+@Preload
	31	+@Implementation(ConfigPropertyImpl.class)
	32	+public interface ConfigProperty extends Entity {
	33	+
	34	+ enum Type {
	35	+ STRING, NUMBER, BOOLEAN
	36	+ }
	37	+
	38	+ @Unique
	39	+ String getName();
	40	+ void setName(String name);
	41	+
	42	+ Type getType();
	43	+ void setType(Type name);
	44	+
	45	+ String getValue();
	46	+ void setValue(String value);
	47	+
	48	+ @Ignore
	49	+ public <T> T readProperty(Class<T> c);
	50	+
	51	+ @Ignore
	52	+ public void writeProperty(String name, String value);
	53	+
	54	+ @Ignore
	55	+ public void writeProperty(String name, Integer value);
	56	+
	57	+ @Ignore
	58	+ public void writeProperty(String name, Boolean value);
	59	+
	60	+ public class ConfigPropertyImpl {
	61	+ private final ConfigProperty configProperty;
	62	+
	63	+ public ConfigPropertyImpl(ConfigProperty configProperty) {
	64	+ this.configProperty = configProperty;
	65	+ }
	66	+
	67	+ @SuppressWarnings("unchecked")
	68	+ public <T> T readProperty(Class<T> c) {
	69	+ switch (configProperty.getType()) {
	70	+ case STRING:
	71	+ return (T) configProperty.getValue();
	72	+ case NUMBER:
	73	+ try {
	74	+ return c.getConstructor().newInstance(configProperty.getValue());
	75	+ } catch (Exception e) {
	76	+ ShowDialog.errorMessage(e);
	77	+ }
	78	+ case BOOLEAN:
	79	+ return (T) Boolean.valueOf(configProperty.getValue());
	80	+ default:
	81	+ break;
	82	+ }
	83	+ return null;
	84	+ }
	85	+
	86	+ public void writeProperty(String name, String value) {
	87	+ writeProperty(name, Type.STRING, value);
	88	+ }
	89	+
	90	+ public void writeProperty(String name, Number value) {
	91	+ writeProperty(name, Type.NUMBER, value.toString());
	92	+ }
	93	+
	94	+ public void writeProperty(String name, Boolean value) {
	95	+ writeProperty(name, Type.BOOLEAN, value.toString());
	96	+ }
	97	+
	98	+ private void writeProperty(String name, Type type, String value) {
	99	+ configProperty.setName(name);
	100	+ configProperty.setType(type);
	101	+ configProperty.setValue(value);
	102	+ configProperty.save();
	103	+ }
	104	+ }
	105	+}

diff -r 8a79cfa3ab0c -r 0f88dae1c9ae src/jdbcacsess2/main/FontZoom.java

--- a/src/jdbcacsess2/main/FontZoom.java Fri Mar 09 00:45:52 2012 +0900

+++ b/src/jdbcacsess2/main/FontZoom.java Mon Mar 26 14:02:57 2012 +0900

		@@ -78,7 +78,11 @@
78	78
79	79	final Font font = c.getFont();
80	80	final float size = font.getSize() + (e.getWheelRotation() * -1);
81		- if (4 < size && size < 30) {
	81	+
	82	+ if (e.getWheelRotation() > 0 && 5f < size) {
	83	+ c.setFont(font.deriveFont(size));
	84	+ }
	85	+ if (e.getWheelRotation() < 0 && size < 29f) {
82	86	c.setFont(font.deriveFont(size));
83	87	}
84	88	e.consume();

diff -r 8a79cfa3ab0c -r 0f88dae1c9ae src/jdbcacsess2/main/GuiDivider.java

--- a/src/jdbcacsess2/main/GuiDivider.java Fri Mar 09 00:45:52 2012 +0900

+++ b/src/jdbcacsess2/main/GuiDivider.java Mon Mar 26 14:02:57 2012 +0900

		@@ -22,6 +22,8 @@
22	22	import net.java.ao.EntityManager;
23	23	import net.java.ao.Preload;
24	24	import net.java.ao.ValueGenerator;
	25	+import net.java.ao.schema.Default;
	26	+import net.java.ao.schema.NotNull;
25	27
26	28	/**
27	29	* @author sima

		@@ -30,9 +32,10 @@
30	32	@Preload
31	33	public interface GuiDivider extends Entity {
32	34
33		- int getLocation();
34		-
35		- void setLocation(int location);
	35	+ @NotNull
	36	+ @Default("0")
	37	+ Integer getLocation();
	38	+ void setLocation(Integer location);
36	39
37	40	public class DividerGenerator implements ValueGenerator<GuiDivider> {
38	41	/*

diff -r 8a79cfa3ab0c -r 0f88dae1c9ae src/jdbcacsess2/main/GuiFont.java

--- a/src/jdbcacsess2/main/GuiFont.java Fri Mar 09 00:45:52 2012 +0900

+++ b/src/jdbcacsess2/main/GuiFont.java Mon Mar 26 14:02:57 2012 +0900

		@@ -25,7 +25,9 @@
25	25	import net.java.ao.Implementation;
26	26	import net.java.ao.Preload;
27	27	import net.java.ao.ValueGenerator;
	28	+import net.java.ao.schema.Default;
28	29	import net.java.ao.schema.Ignore;
	30	+import net.java.ao.schema.NotNull;
29	31
30	32	/**
31	33	* @author sima

		@@ -58,23 +60,24 @@
58	60	}
59	61	}
60	62
	63	+ @NotNull
	64	+ @Default(" ")
61	65	String getName();
62		-
63	66	void setName(String name);
64	67
	68	+ @NotNull
	69	+ @Default("0")
65	70	Style getStyle();
66		-
67	71	void setStyle(Style style);
68	72
69		- int getSize();
70		-
71		- void setSize(int size);
72		-
73		- @Ignore
74		- void setFont(Font font);
	73	+ @NotNull
	74	+ @Default("0")
	75	+ Integer getSize();
	76	+ void setSize(Integer size);
75	77
76	78	@Ignore
77	79	Font getFont();
	80	+ void setFont(Font font);
78	81
79	82	public class FontGenerator implements ValueGenerator<GuiFont> {
80	83	/*

diff -r 8a79cfa3ab0c -r 0f88dae1c9ae src/jdbcacsess2/main/GuiWindow.java

--- a/src/jdbcacsess2/main/GuiWindow.java Fri Mar 09 00:45:52 2012 +0900

+++ b/src/jdbcacsess2/main/GuiWindow.java Mon Mar 26 14:02:57 2012 +0900

		@@ -22,6 +22,8 @@
22	22	import net.java.ao.EntityManager;
23	23	import net.java.ao.Preload;
24	24	import net.java.ao.ValueGenerator;
	25	+import net.java.ao.schema.Default;
	26	+import net.java.ao.schema.NotNull;
25	27
26	28	/**
27	29	* @author sima

		@@ -30,21 +32,25 @@
30	32	@Preload
31	33	public interface GuiWindow extends Entity {
32	34
33		- int getWidth();
34		-
35		- void setWidth(int width);
36		-
37		- int getHeight();
	35	+ @NotNull
	36	+ @Default("0")
	37	+ Integer getWidth();
	38	+ void setWidth(Integer width);
38	39
39		- void setHeight(int height);
40		-
41		- int getX();
	40	+ @NotNull
	41	+ @Default("0")
	42	+ Integer getHeight();
	43	+ void setHeight(Integer height);
42	44
43		- void setX(int X);
	45	+ @NotNull
	46	+ @Default("0")
	47	+ Integer getX();
	48	+ void setX(Integer X);
44	49
45		- int getY();
46		-
47		- void setY(int Y);
	50	+ @NotNull
	51	+ @Default("0")
	52	+ Integer getY();
	53	+ void setY(Integer Y);
48	54
49	55	public class WindowGenerator implements ValueGenerator<GuiWindow> {
50	56	/*

diff -r 8a79cfa3ab0c -r 0f88dae1c9ae src/jdbcacsess2/main/JPanelSql.java

--- a/src/jdbcacsess2/main/JPanelSql.java Fri Mar 09 00:45:52 2012 +0900

+++ b/src/jdbcacsess2/main/JPanelSql.java Mon Mar 26 14:02:57 2012 +0900

		@@ -57,7 +57,7 @@
57	57	import org.fife.ui.rtextarea.RTextScrollPane;
58	58
59	59	public class JPanelSql extends JPanel implements SqlExecutedListener, DataBaseConnectionListener,
60		- DataBaseTransactionListener {
	60	+DataBaseTransactionListener {
61	61
62	62	// -------------------------------------------------------------------------
63	63	// -------------------------------------------------------------------------

		@@ -328,7 +328,7 @@
328	328	}
329	329
330	330	writeGuiLog("\nstart sql\n"
331		- + sqlExecuteSentence.getSqlSentence());
	331	+ + sqlExecuteSentence.getSqlSentence());
332	332	}
333	333	});
334	334	}

		@@ -348,8 +348,8 @@
348	348	public void run() {
349	349	getJToggleButtonExecution().setEnabled(true);
350	350	writeGuiLog("normal end sql" + counrMessage + " "
351		- + Integer.toString(rowCnt) + " row " + sqlExecuteTask.getExecutionTime()
352		- + "ms");
	351	+ + Integer.toString(rowCnt) + " row " + sqlExecuteTask.getExecutionTime()
	352	+ + "ms");
353	353	}
354	354	});
355	355	}

		@@ -369,7 +369,7 @@
369	369	public void run() {
370	370	getJToggleButtonExecution().setEnabled(true);
371	371	writeGuiLog("abnormal end " + counrMessage + "\n "
372		- + t.getLocalizedMessage());
	372	+ + t.getLocalizedMessage());
373	373	}
374	374	});
375	375	ShowDialog.errorMessage(t);

		@@ -381,7 +381,7 @@
381	381	@Override
382	382	public void run() {
383	383	Object[] options = {
384		- "はい、後続のSQL実行を中断", "いいえ、以降の全エラーを無視"
	384	+ "はい、後続のSQL実行を中断", "いいえ、以降の全エラーを無視"
385	385	};
386	386	int n = JOptionPane.showOptionDialog(null,
387	387	"残りのSQL実行は中断しますか？",

diff -r 8a79cfa3ab0c -r 0f88dae1c9ae src/jdbcacsess2/main/Jdbcacsess2.java

--- a/src/jdbcacsess2/main/Jdbcacsess2.java Fri Mar 09 00:45:52 2012 +0900

+++ b/src/jdbcacsess2/main/Jdbcacsess2.java Mon Mar 26 14:02:57 2012 +0900

		@@ -46,6 +46,7 @@
46	46
47	47	public Jdbcacsess2() {
48	48
	49	+ System.setProperty("awt.useSystemAAFontSettings", "on");
49	50	logger.setLevel(Level.FINE);
50	51
51	52	SwingUtilities.invokeLater(new Runnable() {

		@@ -83,7 +84,6 @@
83	84	}
84	85
85	86	private void setLookAndFeel() {
86		- System.setProperty("awt.useSystemAAFontSettings", "on");
87	87	try {
88	88	for (LookAndFeelInfo info : UIManager.getInstalledLookAndFeels()) {
89	89	if ("Nimbus".equals(info.getName())) {

diff -r 8a79cfa3ab0c -r 0f88dae1c9ae src/jdbcacsess2/main/MainController.java

--- a/src/jdbcacsess2/main/MainController.java Fri Mar 09 00:45:52 2012 +0900

+++ b/src/jdbcacsess2/main/MainController.java Mon Mar 26 14:02:57 2012 +0900

		@@ -58,7 +58,7 @@
58	58
59	59	import jdbcacsess2.connect.ConnectController;
60	60	import jdbcacsess2.main.JPanelSql.SentenceSeparator;
61		-import jdbcacsess2.main.MainView.ConfigViewMain;
	61	+import jdbcacsess2.main.MainView.ViewMain;
62	62	import jdbcacsess2.sqlService.CodeAssistModel;
63	63	import jdbcacsess2.sqlService.DataBaseConnection;
64	64	import jdbcacsess2.sqlService.DataBaseConnectionListener;

		@@ -174,9 +174,9 @@
174	174	}
175	175
176	176	SqlAsyncExecute sqlAsyncExecute =
177		- new SqlAsyncExecute(sql,
178		- ((SentenceSeparator) jPanelSql.getJComboBoxSentenceSeparator()
179		- .getSelectedItem()).getRegVal());
	177	+ new SqlAsyncExecute(sql,
	178	+ ((SentenceSeparator) jPanelSql.getJComboBoxSentenceSeparator()
	179	+ .getSelectedItem()).getRegVal());
180	180	if (sqlAsyncExecute.isDuplxSelect()) {
181	181	ShowDialog.warningMessage("複数のSELECT文は実行出来ません", "複数のSELECT文");
182	182	jPanelSql.getJToggleButtonExecution().setSelected(false);

		@@ -315,7 +315,7 @@
315	315	public void windowClosing(WindowEvent e) {
316	316	Jdbcacsess2.logger.info("application termination start:" + e);
317	317	try {
318		- ConfigViewMain row = config.getEntity(MainView.ConfigViewMain.class);
	318	+ ViewMain row = config.getEntity(MainView.ViewMain.class);
319	319	view.collectViewMain(row);
320	320	row.save();
321	321	config.close();

		@@ -405,7 +405,7 @@
405	405	jPanelSession.getJTabbedPaneSql().add(jPanelHIstory, "History", 0);
406	406
407	407	jPanelSession.jLabelStatus.setText("NAME=" + dbc.getConnectName() + " " + "URL=" + dbc.getUrl()
408		- + " " + "USER=" + dbc.getUser());
	408	+ + " " + "USER=" + dbc.getUser());
409	409
410	410	// SQLパネルの表示
411	411	try {

		@@ -422,7 +422,7 @@
422	422	DBObjectsRoot o = new DBObjectsRoot(dbc.getMetaData());
423	423	DBobjectMutableTreeTableNode root = new DBobjectMutableTreeTableNode(o.getDBObjects().get(0), true);
424	424	DefaultTreeTableModel model =
425		- (DefaultTreeTableModel) jPanelSession.getJXTreetableDBObjects().getTreeTableModel();
	425	+ (DefaultTreeTableModel) jPanelSession.getJXTreetableDBObjects().getTreeTableModel();
426	426	model.setRoot(root);
427	427
428	428	jPanelSession.addChildren(root);

		@@ -445,7 +445,7 @@
445	445	@Override
446	446	public void dataBaseConnectionClosed(DataBaseConnection dbc) {
447	447	Jdbcacsess2.logger.info(jPanelSession.getDataBaseConnection() + " "
448		- + jPanelSession.getDataBaseConnection().getUrl());
	448	+ + jPanelSession.getDataBaseConnection().getUrl());
449	449	}
450	450
451	451	@Override

		@@ -505,9 +505,6 @@
505	505	// セル移動のショートカットを登録する
506	506	JTableShortcut.setJTableShortcut(jPanelSql.getJTable());
507	507
508		- // 画面状態の復元
509		- view.setViewMainPanelSql(jPanelSql, getConfigViewMain());
510		-
511	508	// JPanel用JTabbedPaneを取得する。
512	509	JTabbedPane jTabbedPane = view.getCurrentJPanelSession().getJTabbedPaneSql();
513	510

		@@ -523,6 +520,10 @@
523	520	jTabbedPane.setTabComponentAt(jTabbedPane.indexOfComponent(jPanelSql), tabComponent);
524	521
525	522	jPanelSql.addHierarchyListener(eventHierarchyParentChanged);
	523	+
	524	+ // 画面状態の復元
	525	+ view.setViewMainPanelSql(jPanelSql, getConfigViewMain());
	526	+
526	527	}
527	528	};
528	529	}

		@@ -616,9 +617,9 @@
616	617	// 選択中のツリーパス配列を取得
617	618	TreePath tps[] = treeTable.getTreeSelectionModel().getSelectionPaths();
618	619
619		- for (int i = 0; i < tps.length; i++) {
	620	+ for (TreePath tp : tps) {
620	621	// ツリーパスからノードを取得
621		- DBobjectMutableTreeTableNode node = (DBobjectMutableTreeTableNode) tps[i].getLastPathComponent();
	622	+ DBobjectMutableTreeTableNode node = (DBobjectMutableTreeTableNode) tp.getLastPathComponent();
622	623
623	624	Jdbcacsess2.logger.fine("refresh:" + node.getDBObject().getSummary());
624	625

		@@ -645,12 +646,12 @@
645	646	if (tps == null) {
646	647	return;
647	648	}
648		- for (int i = 0; i < tps.length; i++) {
	649	+ for (TreePath tp : tps) {
649	650	// 展開と折畳を反転させる
650		- if (treeTable.isExpanded(tps[i])) {
651		- treeTable.collapsePath(tps[i]);
	651	+ if (treeTable.isExpanded(tp)) {
	652	+ treeTable.collapsePath(tp);
652	653	} else {
653		- treeTable.expandPath(tps[i]);
	654	+ treeTable.expandPath(tp);
654	655	}
655	656	}
656	657	}

		@@ -741,8 +742,8 @@
741	742	}
742	743
743	744	StringConncat s = new StringConncat(", ");
744		- for (int i = 0; i < tps.length; i++) {
745		- DBObject o = (DBObject) ((DBobjectMutableTreeTableNode) tps[i].getLastPathComponent()).getUserObject();
	745	+ for (TreePath tp : tps) {
	746	+ DBObject o = (DBObject) ((DBobjectMutableTreeTableNode) tp.getLastPathComponent()).getUserObject();
746	747	if (o.getName() != null) {
747	748	s.append(o.getName());
748	749	}

		@@ -820,9 +821,9 @@
820	821	/**
821	822	* main view のcommponent属性保持データを検索する
822	823	*/
823		- private ConfigViewMain getConfigViewMain() {
	824	+ private ViewMain getConfigViewMain() {
824	825	try {
825		- ConfigViewMain[] c = config.getEntityManager().find(MainView.ConfigViewMain.class);
	826	+ ViewMain[] c = config.getEntityManager().find(MainView.ViewMain.class);
826	827	if (c.length != 0) {
827	828	return c[0];
828	829	}

diff -r 8a79cfa3ab0c -r 0f88dae1c9ae src/jdbcacsess2/main/MainView.java

--- a/src/jdbcacsess2/main/MainView.java Fri Mar 09 00:45:52 2012 +0900

+++ b/src/jdbcacsess2/main/MainView.java Mon Mar 26 14:02:57 2012 +0900

		@@ -38,6 +38,8 @@
38	38	import net.java.ao.Entity;
39	39	import net.java.ao.Generator;
40	40	import net.java.ao.Preload;
	41	+import net.java.ao.schema.Default;
	42	+import net.java.ao.schema.NotNull;
41	43
42	44	public class MainView extends JFrame {
43	45

		@@ -51,63 +53,83 @@
51	53	*
52	54	*/
53	55	@Preload
54		- public interface ConfigViewMain extends Entity {
	56	+ public interface ViewMain extends Entity {
	57	+ @NotNull
55	58	@Generator(WindowGenerator.class)
56	59	GuiWindow getWindow();
57	60	void setWindow(GuiWindow guiWindow);
58	61
59	62	// Tree
	63	+ @NotNull
60	64	@Generator(FontGenerator.class)
61	65	GuiFont getTreeFont();
62	66	void setTreeFont(GuiFont guiFont);
63	67
	68	+ @NotNull
64	69	@Generator(DividerGenerator.class)
65	70	GuiDivider getTreeDivider();
66	71	void setTreeDivider(GuiDivider guiDivider);
67	72
	73	+ @NotNull
68	74	@Generator(DividerGenerator.class)
69	75	GuiDivider getTreeLastDivider();
70	76	void setTreeLastDivider(GuiDivider guiDivider);
71	77
	78	+ @NotNull
72	79	@Generator(DividerGenerator.class)
73	80	GuiDivider getDBObjectsDivider();
74	81	void setDBObjectsDivider(GuiDivider guiDivider);
75	82
	83	+ @NotNull
76	84	@Generator(DividerGenerator.class)
77	85	GuiDivider getDBObjectsLastDivider();
78	86	void setDBObjectsLastDivider(GuiDivider guiDivider);
79	87
80	88	// Table
	89	+ @NotNull
81	90	@Generator(FontGenerator.class)
82	91	GuiFont getTableFont();
83	92	void setTableFont(GuiFont guiFont);
84	93
	94	+ @NotNull
85	95	@Generator(DividerGenerator.class)
86	96	GuiDivider getTableDivider();
87	97	void setTableDivider(GuiDivider guiDivider);
88	98
	99	+ @NotNull
89	100	@Generator(DividerGenerator.class)
90	101	GuiDivider getTableLastDivider();
91	102	void setTableLastDivider(GuiDivider guiDivider);
92	103
93	104	// Sql
	105	+ @NotNull
94	106	@Generator(FontGenerator.class)
95	107	GuiFont getSqlFont();
96	108	void setSqlFont(GuiFont guiFont);
97	109
98	110	// Other
99		- boolean getAutoCommit();
	111	+ @NotNull
	112	+ @Default("true")
	113	+ Boolean getAutoCommit();
100	114	void setAutoCommit(boolean autoCommit);
101	115
	116	+ @NotNull
	117	+ @Default("0")
102	118	Integer getTreeTableColumnWidth0();
103	119	void setTreeTableColumnWidth0(Integer treeTableColumnWidth0);
104	120
	121	+ @NotNull
	122	+ @Default("0")
105	123	Integer getTreeTableColumnWidth1();
106	124	void setTreeTableColumnWidth1(Integer treeTableColumnWidth1);
107	125
	126	+ @NotNull
	127	+ @Default("0")
108	128	Integer getTreeTableColumnWidth2();
109	129	void setTreeTableColumnWidth2(Integer treeTableColumnWidth2);
110	130
	131	+ @NotNull
	132	+ @Default("0")
111	133	Integer getTreeTableColumnWidth3();
112	134	void setTreeTableColumnWidth3(Integer treeTableColumnWidth3);
113	135

		@@ -131,7 +153,7 @@
131	153	* @param c
132	154	* component属性を格納する為のConfigViewMain。
133	155	*/
134		- public void collectViewMain(ConfigViewMain c) {
	156	+ public void collectViewMain(ViewMain c) {
135	157	Point p = getLocationOnScreen();
136	158	GuiWindow guiWindow = c.getWindow();
137	159	guiWindow.setWidth(getWidth());

		@@ -208,9 +230,9 @@
208	230	* Viewのcomponent属性を復元する。
209	231	*
210	232	* @param c
211		- * 復元する{@link ConfigViewMain}
	233	+ * 復元する{@link ViewMain}
212	234	*/
213		- public void setViewMain(ConfigViewMain c) {
	235	+ public void setViewMain(ViewMain c) {
214	236	if (c != null) {
215	237	GuiWindow guiWindow = c.getWindow();
216	238	if (guiWindow != null) {

		@@ -226,29 +248,15 @@
226	248	* @param jPanelSession
227	249	*
228	250	* @param c
229		- * 復元する{@link ConfigViewMain}
	251	+ * 復元する{@link ViewMain}
230	252	*/
231		- public void setViewMainPanelSesion(JPanelSession jPanelSession, ConfigViewMain c) {
	253	+ public void setViewMainPanelSesion(JPanelSession jPanelSession, ViewMain c) {
232	254	if (c != null) {
233		- if (c.getTreeDivider() != null) {
234		- jPanelSession.getJSplitPaneTree().setDividerLocation(c.getTreeDivider().getLocation());
235		- }
236		- if (c.getTreeLastDivider() != null) {
237		- jPanelSession.getJSplitPaneTree().setLastDividerLocation(c.getTreeLastDivider().getLocation());
238		- }
239		-
240		- if (c.getDBObjectsDivider() != null) {
241		- jPanelSession.getJSplitPaneDBObjects().setDividerLocation(c.getDBObjectsDivider().getLocation());
242		- }
243		- if (c.getDBObjectsLastDivider() != null) {
244		- jPanelSession.getJSplitPaneDBObjects()
245		- .setLastDividerLocation(c.getDBObjectsLastDivider().getLocation());
246		- }
247		- GuiFont guiFont;
248		- guiFont = c.getTreeFont();
249		- if(guiFont!=null){
250		- jPanelSession.getJXTreetableDBObjects().setFont(guiFont.getFont());
251		- }
	255	+ jPanelSession.getJSplitPaneTree().setDividerLocation(c.getTreeDivider().getLocation());
	256	+ jPanelSession.getJSplitPaneTree().setLastDividerLocation(c.getTreeLastDivider().getLocation());
	257	+ jPanelSession.getJSplitPaneDBObjects().setDividerLocation(c.getDBObjectsDivider().getLocation());
	258	+ jPanelSession.getJSplitPaneDBObjects().setLastDividerLocation(c.getDBObjectsLastDivider().getLocation());
	259	+ jPanelSession.getJXTreetableDBObjects().setFont(c.getTreeFont().getFont());
252	260	}
253	261	}
254	262

		@@ -258,27 +266,17 @@
258	266	* @param jPanelSql
259	267	*
260	268	* @param c
261		- * 復元する{@link ConfigViewMain}
	269	+ * 復元する{@link ViewMain}
262	270	*/
263		- public void setViewMainPanelSql(JPanelSql jPanelSql, ConfigViewMain c) {
	271	+ public void setViewMainPanelSql(JPanelSql jPanelSql, ViewMain c) {
264	272	if (c != null) {
265		- if (c.getTableDivider() != null) {
266		- jPanelSql.getJSplitPaneTable().setDividerLocation(c.getTableDivider().getLocation());
267		- }
268		- if (c.getTableLastDivider() != null) {
269		- jPanelSql.getJSplitPaneTable().setLastDividerLocation(c.getTableLastDivider().getLocation());
270		- }
	273	+ jPanelSql.getJSplitPaneTable().setDividerLocation(c.getTableDivider().getLocation());
	274	+ jPanelSql.getJSplitPaneTable().setLastDividerLocation(c.getTableLastDivider().getLocation());
	275	+
271	276	jPanelSql.getJCheckBoxAutoCommit().setSelected(c.getAutoCommit());
272	277
273		- GuiFont guiFont;
274		- guiFont = c.getSqlFont();
275		- if (guiFont != null) {
276		- jPanelSql.getRSyntaxTextAreaSql().setFont(guiFont.getFont());
277		- }
278		- guiFont = c.getTableFont();
279		- if (guiFont != null) {
280		- jPanelSql.getJTable().setFont(guiFont.getFont());
281		- }
	278	+ jPanelSql.getRSyntaxTextAreaSql().setFont(c.getSqlFont().getFont());
	279	+ jPanelSql.getJTable().setFont(c.getTableFont().getFont());
282	280	}
283	281	}
284	282

		@@ -286,9 +284,9 @@
286	284	* Viewのcomponent属性を復元する。
287	285	*
288	286	* @param c
289		- * 復元する{@link ConfigViewMain}
	287	+ * 復元する{@link ViewMain}
290	288	*/
291		- public void setTreeTableColumnWidth(JPanelSession jPanelSession, ConfigViewMain c) {
	289	+ public void setTreeTableColumnWidth(JPanelSession jPanelSession, ViewMain c) {
292	290	if (c != null) {
293	291	TableColumnModel model = getTableColumnModel(jPanelSession);
294	292	if (model != null) {

Show on old repository browser