OSDN > Find Software > Text Editors > Vi/Vim > mitonan > SCM > SVN > Commit

mitonan

R/O
SSH
HTTPS

mitonan: Commit

Commit MetaInfo

Revision	359 (tree)
Time	2012-05-30 01:39:03
Author	kimuraak

Log Message

(empty log message)

Change Summary

modified: plezntesting/trunk/jp.gr.java_conf.mitonan.plezntesting/src/jp/gr/java_conf/mitonan/plezntesting/model/TestData.java (diff)
delete: plezntesting/trunk/jp.gr.java_conf.mitonan.plezntesting/src/jp/gr/java_conf/mitonan/plezntesting/viewers/DataDesignTreeEditingSupport.java
modified: plezntesting/trunk/jp.gr.java_conf.mitonan.plezntesting/src/jp/gr/java_conf/mitonan/plezntesting/viewers/ElementLabelProvider.java (diff)
modified: plezntesting/trunk/jp.gr.java_conf.mitonan.plezntesting/src/jp/gr/java_conf/mitonan/plezntesting/viewers/TestCaseLabelProvider.java (diff)
modified: plezntesting/trunk/jp.gr.java_conf.mitonan.plezntesting/src/jp/gr/java_conf/mitonan/plezntesting/viewers/ValueLabelProvider.java (diff)
modified: plezntesting/trunk/jp.gr.java_conf.mitonan.plezntesting/src/jp/gr/java_conf/mitonan/plezntesting/viewers/DataDesignTab.java (diff)
added: plezntesting/trunk/jp.gr.java_conf.mitonan.plezntesting/src/jp/gr/java_conf/mitonan/plezntesting/viewers/ElementEditingSupport.java (diff)
added: plezntesting/trunk/jp.gr.java_conf.mitonan.plezntesting/src/jp/gr/java_conf/mitonan/plezntesting/viewers/TestCaseEditingSupport.java (diff)
added: plezntesting/trunk/jp.gr.java_conf.mitonan.plezntesting/src/jp/gr/java_conf/mitonan/plezntesting/viewers/ValueEditingSupport.java (diff)

Incremental Difference

--- plezntesting/trunk/jp.gr.java_conf.mitonan.plezntesting/src/jp/gr/java_conf/mitonan/plezntesting/model/TestData.java (revision 358)

+++ plezntesting/trunk/jp.gr.java_conf.mitonan.plezntesting/src/jp/gr/java_conf/mitonan/plezntesting/model/TestData.java (revision 359)

		@@ -33,11 +33,11 @@
33	33	public void setMarkList(List<String> markList) {
34	34	this.markList = markList;
35	35	}
36		- public TestElement getTestElement() {
37		- return testElement;
	36	+ public String getElementStr() {
	37	+ return "";
38	38	}
39	39	public TestElement getParent() {
40		- return getTestElement();
	40	+ return this.testElement;
41	41	}
42	42
43	43	@Override

--- plezntesting/trunk/jp.gr.java_conf.mitonan.plezntesting/src/jp/gr/java_conf/mitonan/plezntesting/viewers/DataDesignTreeEditingSupport.java (revision 358)

+++ plezntesting/trunk/jp.gr.java_conf.mitonan.plezntesting/src/jp/gr/java_conf/mitonan/plezntesting/viewers/DataDesignTreeEditingSupport.java (nonexistent)

		@@ -1,38 +0,0 @@
1		-package jp.gr.java_conf.mitonan.plezntesting.viewers;
2		-
3		-import org.eclipse.jface.viewers.CellEditor;
4		-import org.eclipse.jface.viewers.ColumnViewer;
5		-import org.eclipse.jface.viewers.EditingSupport;
6		-
7		-public class DataDesignTreeEditingSupport extends EditingSupport {
8		-
9		- private CellEditor cellEditor;
10		-
11		- public DataDesignTreeEditingSupport(ColumnViewer viewer, CellEditor cellEditor) {
12		- super(viewer);
13		- this.cellEditor = cellEditor;
14		- }
15		-
16		- @Override
17		- protected CellEditor getCellEditor(Object element) {
18		- return this.cellEditor;
19		- }
20		-
21		- @Override
22		- protected boolean canEdit(Object element) {
23		- return true;
24		- }
25		-
26		- @Override
27		- protected Object getValue(Object element) {
28		- System.out.println(element);
29		- return element;
30		- }
31		-
32		- @Override
33		- protected void setValue(Object element, Object value) {
34		- System.out.println(element);
35		- System.out.println(value);
36		- }
37		-
38		-}

Deleted: svn:mime-type

## -1 +0,0 ##

-text/plain

\ No newline at end of property

--- plezntesting/trunk/jp.gr.java_conf.mitonan.plezntesting/src/jp/gr/java_conf/mitonan/plezntesting/viewers/ElementLabelProvider.java (revision 358)

+++ plezntesting/trunk/jp.gr.java_conf.mitonan.plezntesting/src/jp/gr/java_conf/mitonan/plezntesting/viewers/ElementLabelProvider.java (revision 359)

		@@ -17,4 +17,18 @@
17	17	}
18	18	return super.getText(element);
19	19	}
	20	+
	21	+ public void setText(Object element, Object value) {
	22	+ if (element == null \|\| value == null \|\|
	23	+ !(element instanceof TestElement) \|\| !(value instanceof String)) {
	24	+ return;
	25	+ }
	26	+ TestElement testElement = (TestElement)element;
	27	+ String valueStr = (String)value;
	28	+ int idx = valueStr.indexOf(":");
	29	+ if (0 < idx) {
	30	+ testElement.setName(valueStr.substring(0, idx));
	31	+ testElement.setFqcn(valueStr.substring(idx+1, valueStr.length()));
	32	+ }
	33	+ }
20	34	}

--- plezntesting/trunk/jp.gr.java_conf.mitonan.plezntesting/src/jp/gr/java_conf/mitonan/plezntesting/viewers/TestCaseLabelProvider.java (revision 358)

+++ plezntesting/trunk/jp.gr.java_conf.mitonan.plezntesting/src/jp/gr/java_conf/mitonan/plezntesting/viewers/TestCaseLabelProvider.java (revision 359)

		@@ -32,4 +32,14 @@
32	32	}
33	33	return text;
34	34	}
	35	+
	36	+ public void setText(Object element, Object value) {
	37	+ if (element == null \|\| value == null \|\|
	38	+ !(element instanceof TestData)) {
	39	+ return;
	40	+ }
	41	+ TestData testData = (TestData)element;
	42	+ testData.getMarkList().set(
	43	+ this.columnIdx - START_IDX_TESTCASE, value.toString());
	44	+ }
35	45	}

--- plezntesting/trunk/jp.gr.java_conf.mitonan.plezntesting/src/jp/gr/java_conf/mitonan/plezntesting/viewers/ValueLabelProvider.java (revision 358)

+++ plezntesting/trunk/jp.gr.java_conf.mitonan.plezntesting/src/jp/gr/java_conf/mitonan/plezntesting/viewers/ValueLabelProvider.java (revision 359)

		@@ -17,4 +17,13 @@
17	17	}
18	18	return super.getText(element);
19	19	}
	20	+
	21	+ public void setText(Object element, Object value) {
	22	+ if (element == null \|\| value == null \|\|
	23	+ !(element instanceof TestData)) {
	24	+ return;
	25	+ }
	26	+ TestData testData = (TestData)element;
	27	+ testData.setValue(value.toString());
	28	+ }
20	29	}

--- plezntesting/trunk/jp.gr.java_conf.mitonan.plezntesting/src/jp/gr/java_conf/mitonan/plezntesting/viewers/DataDesignTab.java (revision 358)

+++ plezntesting/trunk/jp.gr.java_conf.mitonan.plezntesting/src/jp/gr/java_conf/mitonan/plezntesting/viewers/DataDesignTab.java (revision 359)

		@@ -71,6 +71,7 @@
71	71	tree.pack();
72	72
73	73	this.treeViewer = new TreeViewer(tree);
	74	+ /*
74	75	TreeViewerFocusCellManager focusCellManager =
75	76	new TreeViewerFocusCellManager(this.treeViewer,
76	77	new FocusCellOwnerDrawHighlighter(this.treeViewer));

		@@ -79,6 +80,7 @@
79	80	protected boolean isEditorActivationEvent(ColumnViewerEditorActivationEvent event) {
80	81	return ((event.eventType == ColumnViewerEditorActivationEvent.KEY_PRESSED) && (event.keyCode == SWT.CR))
81	82	\|\| event.eventType == ColumnViewerEditorActivationEvent.MOUSE_DOUBLE_CLICK_SELECTION
	83	+ \|\| event.eventType == ColumnViewerEditorActivationEvent.MOUSE_CLICK_SELECTION
82	84	\|\| event.eventType == ColumnViewerEditorActivationEvent.PROGRAMMATIC
83	85	\|\| event.eventType == ColumnViewerEditorActivationEvent.TRAVERSAL;
84	86	}

		@@ -90,7 +92,9 @@
90	92	\| ColumnViewerEditor.TABBING_VERTICAL
91	93	\| ColumnViewerEditor.KEYBOARD_ACTIVATION
92	94	);
	95	+ */
93	96
	97	+
94	98
95	99	setTreeViewerColumns(this.treeViewer, 10);
96	100	this.treeViewer.setContentProvider(new DataDesignTreeContentProvider());

		@@ -147,16 +151,15 @@
147	151	*/
148	152
149	153	private void setTreeViewerColumns(TreeViewer treeViewer, int tcNumber) {
150		- TextCellEditor textCellEditor = new TextCellEditor(treeViewer.getTree());
151		- DataDesignTreeEditingSupport editingSupport =
152		- new DataDesignTreeEditingSupport(treeViewer, textCellEditor);
153	154	TreeViewerColumn column = new TreeViewerColumn(treeViewer, SWT.NONE);
154	155	column.getColumn().setMoveable(false);
155	156	column.getColumn().setResizable(true);
156	157	column.getColumn().setWidth(100);
157	158	column.getColumn().setText("Element");
158		- column.setLabelProvider(new ElementLabelProvider());
159		- column.setEditingSupport(editingSupport);
	159	+ ElementLabelProvider elementLabelProvider = new ElementLabelProvider();
	160	+ column.setLabelProvider(elementLabelProvider);
	161	+ column.setEditingSupport(
	162	+ new ElementEditingSupport(treeViewer, elementLabelProvider));
160	163
161	164	column = new TreeViewerColumn(treeViewer, SWT.NONE);
162	165	column.getColumn().setMoveable(false);

		@@ -163,10 +166,12 @@
163	166	column.getColumn().setResizable(true);
164	167	column.getColumn().setWidth(100);
165	168	column.getColumn().setText("Value");
166		- column.setLabelProvider(new ValueLabelProvider());
167		- column.setEditingSupport(editingSupport);
	169	+ ValueLabelProvider valueLabelProvider = new ValueLabelProvider();
	170	+ column.setLabelProvider(valueLabelProvider);
	171	+ column.setEditingSupport(
	172	+ new ValueEditingSupport(treeViewer, valueLabelProvider));
168	173
169		- TestCaseLabelProvider tcLableProvider = new TestCaseLabelProvider();
	174	+ TestCaseLabelProvider tcLabelProvider = new TestCaseLabelProvider();
170	175	for (int i = 0; i < tcNumber; i++) {
171	176	column = new TreeViewerColumn(treeViewer, SWT.NONE);
172	177	column.getColumn().setMoveable(false);

		@@ -174,8 +179,9 @@
174	179	column.getColumn().setWidth(25);
175	180	column.getColumn().setText(String.valueOf(i+1));
176	181	column.getColumn().setAlignment(SWT.CENTER);
177		- column.setLabelProvider(tcLableProvider);
178		- column.setEditingSupport(editingSupport);
	182	+ column.setLabelProvider(tcLabelProvider);
	183	+ column.setEditingSupport(
	184	+ new TestCaseEditingSupport(treeViewer, tcLabelProvider));
179	185	}
180	186	}
181	187

--- plezntesting/trunk/jp.gr.java_conf.mitonan.plezntesting/src/jp/gr/java_conf/mitonan/plezntesting/viewers/ElementEditingSupport.java (nonexistent)

+++ plezntesting/trunk/jp.gr.java_conf.mitonan.plezntesting/src/jp/gr/java_conf/mitonan/plezntesting/viewers/ElementEditingSupport.java (revision 359)

		@@ -0,0 +1,50 @@
	1	+package jp.gr.java_conf.mitonan.plezntesting.viewers;
	2	+
	3	+import jp.gr.java_conf.mitonan.plezntesting.model.TestElement;
	4	+
	5	+import org.eclipse.jface.viewers.CellEditor;
	6	+import org.eclipse.jface.viewers.EditingSupport;
	7	+import org.eclipse.jface.viewers.TextCellEditor;
	8	+import org.eclipse.jface.viewers.TreeViewer;
	9	+
	10	+public class ElementEditingSupport extends EditingSupport {
	11	+
	12	+ private CellEditor cellEditor;
	13	+ private ElementLabelProvider provider;
	14	+
	15	+ public ElementEditingSupport(TreeViewer viewer, ElementLabelProvider provider) {
	16	+ super(viewer);
	17	+ this.provider = provider;
	18	+ this.cellEditor = new TextCellEditor(viewer.getTree());
	19	+ }
	20	+
	21	+ @Override
	22	+ protected CellEditor getCellEditor(Object element) {
	23	+ return this.cellEditor;
	24	+ }
	25	+
	26	+ @Override
	27	+ protected boolean canEdit(Object element) {
	28	+ if (element instanceof TestElement) {
	29	+ return true;
	30	+ } else {
	31	+ return false;
	32	+ }
	33	+ }
	34	+
	35	+ @Override
	36	+ protected Object getValue(Object element) {
	37	+ if (this.provider != null) {
	38	+ return this.provider.getText(element);
	39	+ }
	40	+ return "";
	41	+ }
	42	+
	43	+ @Override
	44	+ protected void setValue(Object element, Object value) {
	45	+ if (this.provider != null) {
	46	+ this.provider.setText(element, value);
	47	+ }
	48	+ }
	49	+
	50	+}

Added: svn:mime-type

## -0,0 +1 ##

+text/plain

\ No newline at end of property

--- plezntesting/trunk/jp.gr.java_conf.mitonan.plezntesting/src/jp/gr/java_conf/mitonan/plezntesting/viewers/TestCaseEditingSupport.java (nonexistent)

+++ plezntesting/trunk/jp.gr.java_conf.mitonan.plezntesting/src/jp/gr/java_conf/mitonan/plezntesting/viewers/TestCaseEditingSupport.java (revision 359)

		@@ -0,0 +1,50 @@
	1	+package jp.gr.java_conf.mitonan.plezntesting.viewers;
	2	+
	3	+import jp.gr.java_conf.mitonan.plezntesting.model.TestData;
	4	+
	5	+import org.eclipse.jface.viewers.CellEditor;
	6	+import org.eclipse.jface.viewers.EditingSupport;
	7	+import org.eclipse.jface.viewers.TextCellEditor;
	8	+import org.eclipse.jface.viewers.TreeViewer;
	9	+
	10	+public class TestCaseEditingSupport extends EditingSupport {
	11	+
	12	+ private CellEditor cellEditor;
	13	+ private TestCaseLabelProvider provider;
	14	+
	15	+ public TestCaseEditingSupport(TreeViewer viewer, TestCaseLabelProvider provider) {
	16	+ super(viewer);
	17	+ this.provider = provider;
	18	+ this.cellEditor = new TextCellEditor(viewer.getTree());
	19	+ }
	20	+
	21	+ @Override
	22	+ protected CellEditor getCellEditor(Object element) {
	23	+ return this.cellEditor;
	24	+ }
	25	+
	26	+ @Override
	27	+ protected boolean canEdit(Object element) {
	28	+ if (element instanceof TestData) {
	29	+ return true;
	30	+ } else {
	31	+ return false;
	32	+ }
	33	+ }
	34	+
	35	+ @Override
	36	+ protected Object getValue(Object element) {
	37	+ if (this.provider != null) {
	38	+ return this.provider.getText(element);
	39	+ }
	40	+ return "";
	41	+ }
	42	+
	43	+ @Override
	44	+ protected void setValue(Object element, Object value) {
	45	+ if (this.provider != null) {
	46	+ this.provider.setText(element, value);
	47	+ }
	48	+ }
	49	+
	50	+}

Added: svn:mime-type

## -0,0 +1 ##

+text/plain

\ No newline at end of property

--- plezntesting/trunk/jp.gr.java_conf.mitonan.plezntesting/src/jp/gr/java_conf/mitonan/plezntesting/viewers/ValueEditingSupport.java (nonexistent)

+++ plezntesting/trunk/jp.gr.java_conf.mitonan.plezntesting/src/jp/gr/java_conf/mitonan/plezntesting/viewers/ValueEditingSupport.java (revision 359)

		@@ -0,0 +1,50 @@
	1	+package jp.gr.java_conf.mitonan.plezntesting.viewers;
	2	+
	3	+import jp.gr.java_conf.mitonan.plezntesting.model.TestData;
	4	+
	5	+import org.eclipse.jface.viewers.CellEditor;
	6	+import org.eclipse.jface.viewers.EditingSupport;
	7	+import org.eclipse.jface.viewers.TextCellEditor;
	8	+import org.eclipse.jface.viewers.TreeViewer;
	9	+
	10	+public class ValueEditingSupport extends EditingSupport {
	11	+
	12	+ private CellEditor cellEditor;
	13	+ private ValueLabelProvider provider;
	14	+
	15	+ public ValueEditingSupport(TreeViewer viewer, ValueLabelProvider provider) {
	16	+ super(viewer);
	17	+ this.provider = provider;
	18	+ this.cellEditor = new TextCellEditor(viewer.getTree());
	19	+ }
	20	+
	21	+ @Override
	22	+ protected CellEditor getCellEditor(Object element) {
	23	+ return this.cellEditor;
	24	+ }
	25	+
	26	+ @Override
	27	+ protected boolean canEdit(Object element) {
	28	+ if (element instanceof TestData) {
	29	+ return true;
	30	+ } else {
	31	+ return false;
	32	+ }
	33	+ }
	34	+
	35	+ @Override
	36	+ protected Object getValue(Object element) {
	37	+ if (this.provider != null) {
	38	+ return this.provider.getText(element);
	39	+ }
	40	+ return "";
	41	+ }
	42	+
	43	+ @Override
	44	+ protected void setValue(Object element, Object value) {
	45	+ if (this.provider != null) {
	46	+ this.provider.setText(element, value);
	47	+ }
	48	+ }
	49	+
	50	+}

Added: svn:mime-type

## -0,0 +1 ##

+text/plain

\ No newline at end of property

Show on old repository browser