OSDN > Buscar Software > Database > Front-Ends > DBViewer Plugin for Eclipse 開発プロジェクト > SCM > SVN > Commit

DBViewer Plugin for Eclipse 開発プロジェクト

R/O
SSH
HTTPS

dbviewer: Commit

Commit MetaInfo

Revisión	264 (tree)
Tiempo	2013-03-09 15:55:33
Autor	zigen

Log Message

(empty log message)

Cambiar Resumen

modified: DBViewer/branches/2.0.0/src/zigen/plugin/db/ITableSerializeManager.java (diff)
modified: DBViewer/branches/2.0.0/src/zigen/plugin/db/core/rule/AbstractTableInfoSearchFactory.java (diff)
modified: DBViewer/branches/2.0.0/src/zigen/plugin/db/diff/DDLDiffForTableAction.java (diff)
modified: DBViewer/branches/2.0.0/src/zigen/plugin/db/diff/DDLDiffForSchemaAction.java (diff)
modified: DBViewer/branches/2.0.0/src/zigen/plugin/db/diff/DDLDiffForFolderAction.java (diff)
modified: DBViewer/branches/2.0.0/src/zigen/plugin/db/ui/jobs/AbstractLoadColumnJob.java (diff)
modified: DBViewer/branches/2.0.0/src/zigen/plugin/db/ui/views/BindingParamArea.java (diff)

Diferencia incremental

--- DBViewer/branches/2.0.0/src/zigen/plugin/db/ITableSerializeManager.java (revision 263)

+++ DBViewer/branches/2.0.0/src/zigen/plugin/db/ITableSerializeManager.java (revision 264)

		@@ -54,11 +54,11 @@
54	54	String filePath = path.append(getKey(target)).toOSString();
55	55	File f = new File(filePath);
56	56	if(f.exists()){
57		- System.out.println(target.getSqlTableName() + "のキャッシュを削除しました。" + f.delete());
	57	+ System.out.println(target.getSqlTableName() + "'s cash deleted." + f.delete());
58	58	}
59	59
60	60	if(f.getParentFile().exists() && f.getParentFile().list().length == 0){
61		- System.out.println(f.getParentFile().getName() + "フォルダを削除しました。" + f.getParentFile().delete());
	61	+ System.out.println(f.getParentFile().getName() + "'s folder deleted." + f.getParentFile().delete());
62	62	}
63	63
64	64	}

--- DBViewer/branches/2.0.0/src/zigen/plugin/db/core/rule/AbstractTableInfoSearchFactory.java (revision 263)

+++ DBViewer/branches/2.0.0/src/zigen/plugin/db/core/rule/AbstractTableInfoSearchFactory.java (revision 264)

		@@ -113,12 +113,13 @@
113	113	}
114	114
115	115	public List getTableInfoAll(Connection con, String owner, String[] types, Character encloseChar) throws Exception {
116		- List result = null;
	116	+ String query = null;
	117	+ List result = null;
117	118	ResultSet rs = null;
118	119	Statement st = null;
119	120	try {
120	121	st = con.createStatement();
121		- String query = getTableInfoAllSql(owner, types);
	122	+ query = getTableInfoAllSql(owner, types);
122	123	if (query != null) {
123	124	result = new ArrayList();
124	125	rs = st.executeQuery(query);

		@@ -131,7 +132,7 @@
131	132	}
132	133	}
133	134	} catch (Exception e) {
134		- DbPlugin.log(e);
	135	+ DbPlugin.log(e.getMessage() + ", " + query, e);
135	136	throw e;
136	137	} finally {
137	138	ResultSetUtil.close(rs);

--- DBViewer/branches/2.0.0/src/zigen/plugin/db/diff/DDLDiffForTableAction.java (revision 263)

+++ DBViewer/branches/2.0.0/src/zigen/plugin/db/diff/DDLDiffForTableAction.java (revision 264)

		@@ -58,8 +58,8 @@
58	58	}
59	59
60	60	if (index == 2) {
61		- String msg = "DDLを比較します";
62		- String opt = "コメントを無視する";
	61	+ String msg = "difference DDL"; //"DDLを比較します";
	62	+ String opt = "ignore comments"; // "コメントを無視する";
63	63	MessageDialogWithToggle dialog = DbPlugin.getDefault().confirmDialogWithToggle(msg, opt, false);
64	64	final int YES = 2;
65	65	if (dialog.getReturnCode() == YES) {

--- DBViewer/branches/2.0.0/src/zigen/plugin/db/diff/DDLDiffForSchemaAction.java (revision 263)

+++ DBViewer/branches/2.0.0/src/zigen/plugin/db/diff/DDLDiffForSchemaAction.java (revision 264)

		@@ -53,9 +53,8 @@
53	53	}
54	54
55	55	if (index == 2) {
56		-
57		- String msg = "DDLを比較します";
58		- String opt = "コメントを無視する";
	56	+ String msg = "difference DDL"; //"DDLを比較します";
	57	+ String opt = "ignore comments"; // "コメントを無視する";
59	58	MessageDialogWithToggle dialog = DbPlugin.getDefault().confirmDialogWithToggle(msg, opt, false);
60	59	final int YES = 2;
61	60	if (dialog.getReturnCode() == YES) {

--- DBViewer/branches/2.0.0/src/zigen/plugin/db/diff/DDLDiffForFolderAction.java (revision 263)

+++ DBViewer/branches/2.0.0/src/zigen/plugin/db/diff/DDLDiffForFolderAction.java (revision 264)

		@@ -53,10 +53,8 @@
53	53	}
54	54
55	55	if (index == 2) {
56		-
57		-
58		- String msg = "DDLを比較します";
59		- String opt = "コメントを無視する";
	56	+ String msg = "difference DDL"; //"DDLを比較します";
	57	+ String opt = "ignore comments"; // "コメントを無視する";
60	58	MessageDialogWithToggle dialog = DbPlugin.getDefault().confirmDialogWithToggle(msg, opt, false);
61	59	final int YES = 2;
62	60	if (dialog.getReturnCode() == YES) {

--- DBViewer/branches/2.0.0/src/zigen/plugin/db/ui/jobs/AbstractLoadColumnJob.java (revision 263)

+++ DBViewer/branches/2.0.0/src/zigen/plugin/db/ui/jobs/AbstractLoadColumnJob.java (revision 264)

		@@ -46,27 +46,33 @@
46	46
47	47	if(table.getUpdTime() != null){
48	48	ITable obj = DbPlugin.getDefault().getITableSerializeManager().load(table);
49		- if(obj != null){
	49	+ if(obj != null){
	50	+
	51	+
50	52	if(table instanceof Table && obj instanceof Table){
51	53	// 本当は、更新日付が一致しているか確認が必要
52		- Table cache = (Table)obj;
	54	+ //Table cache = (Table)obj;
53	55
54		- if(cache.getUpdTime() != null && table.getUpdTime() != null && cache.getUpdTime().equals(table.getUpdTime())){
	56	+ if(obj.getUpdTime() != null && table.getUpdTime() != null && obj.getUpdTime().equals(table.getUpdTime())){
55	57
56	58	if(!table.isExpanded()){
57		- table.setTablePKColumns(cache.getTablePKColumns());
58		- table.setTableFKColumns(cache.getTableFKColumns());
59		- table.setTableConstraintColumns(cache.getTableConstraintColumns());
60		- table.setTableUIDXColumns(cache.getTableUIDXColumns());
61		- table.setTableNonUIDXColumns(cache.getTableNonUIDXColumns());
	59	+ table.setTablePKColumns(obj.getTablePKColumns());
	60	+ table.setTableFKColumns(obj.getTableFKColumns());
	61	+ table.setTableConstraintColumns(obj.getTableConstraintColumns());
	62	+ table.setTableUIDXColumns(obj.getTableUIDXColumns());
	63	+ table.setTableNonUIDXColumns(obj.getTableNonUIDXColumns());
62	64	table.removeChild(table.getChild(DbPluginConstant.TREE_LEAF_LOADING));
63	65
64		- List chiren = cache.getChildren();
65		- for (Iterator iterator = chiren.iterator(); iterator.hasNext();) {
66		- Column col = (Column) iterator.next();
67		- table.addChild(col);
68		- }
69		- System.out.println("キャッシュを利用しました " + table.getSqlTableName());
	66	+ if(obj instanceof Table){
	67	+ Table cache = (Table)obj;
	68	+ List chiren = cache.getChildren();
	69	+ for (Iterator iterator = chiren.iterator(); iterator.hasNext();) {
	70	+ Column col = (Column) iterator.next();
	71	+ table.addChild(col);
	72	+ }
	73	+ System.out.println("used cash. " + table.getSqlTableName());
	74	+ }
	75	+
70	76	}
71	77
72	78	return true;

--- DBViewer/branches/2.0.0/src/zigen/plugin/db/ui/views/BindingParamArea.java (revision 263)

+++ DBViewer/branches/2.0.0/src/zigen/plugin/db/ui/views/BindingParamArea.java (revision 264)

		@@ -199,7 +199,7 @@
199	199
200	200
201	201
202		- private static final String[] headers = {"", "変数名", "値", "文字型", "備考"};
	202	+ private static final String[] headers = {"", "paramName", "value", "type", "comments"};
203	203
204	204	private void setHeaderColumn(Table table, String[] headers) {
205	205	for (int i = 0; i < headers.length; i++) {

Show on old repository browser