Changeset 7238

branches/private/pav/NEW_JAVA_5/sophie2-platform/dev-tools/server.TrueServerMain.launch

r6880	r7238
17	17	<stringAttribute key="org.eclipse.jdt.launching.WORKING_DIRECTORY" value="${workspace_loc:org.sophie2.server}"/>
18	18	</launchConfiguration>
	19

branches/private/pav/NEW_JAVA_5/sophie2-platform/modules/org.sophie2.author/.classpath

r2604	r7238
5	5	<classpathentry kind="src" output="target/test-classes" path="src/test/java"/>
6	6	<classpathentry excluding="**" kind="src" output="target/test-classes" path="src/test/resources"/>
7		~~<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>~~
8	7	<classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
	8	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/jdk1.5.0_21"/>
9	9	<classpathentry kind="output" path="target/classes"/>
10	10	</classpath>

branches/private/pav/NEW_JAVA_5/sophie2-platform/modules/org.sophie2.author/.settings/org.eclipse.jdt.core.prefs

r115	r7238
1		#~~Thu Sep 18 21:11:04 EEST 2008~~
	1	#Mon Oct 05 13:35:56 AFT 2009
2	2	eclipse.preferences.version=1
3	3	org.eclipse.jdt.core.builder.cleanOutputFolder=clean
…	…
18	18	org.eclipse.jdt.core.codeComplete.staticFieldSuffixes=
19	19	org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
20		org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
	20	org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
21	21	org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
22		org.eclipse.jdt.core.compiler.compliance=1.6
	22	org.eclipse.jdt.core.compiler.compliance=1.5
23	23	org.eclipse.jdt.core.compiler.debug.lineNumber=generate
24	24	org.eclipse.jdt.core.compiler.debug.localVariable=generate
…	…
97	97	org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
98	98	org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
99		org.eclipse.jdt.core.compiler.source=1.6
	99	org.eclipse.jdt.core.compiler.source=1.5
100	100	org.eclipse.jdt.core.compiler.taskCaseSensitive=enabled
101	101	org.eclipse.jdt.core.compiler.taskPriorities=NORMAL,HIGH,NORMAL

branches/private/pav/NEW_JAVA_5/sophie2-platform/modules/org.sophie2.base.bound/.classpath

r1402	r7238
5	5	<classpathentry kind="src" output="target/test-classes" path="src/test/java"/>
6	6	<classpathentry excluding="**" kind="src" output="target/test-classes" path="src/test/resources"/>
7		<classpathentry kind="con"
8		path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6" />
9		<classpathentry kind="con"
10		path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER" />
11		<classpathentry kind="output" path="target/classes" />
	7	<classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
	8	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/jdk1.5.0_21"/>
	9	<classpathentry kind="output" path="target/classes"/>
12	10	</classpath>

branches/private/pav/NEW_JAVA_5/sophie2-platform/modules/org.sophie2.base.bound/.settings/org.eclipse.jdt.core.prefs

r1162	r7238
1		#~~Thu Sep 18 21:11:04 EEST 2008~~
	1	#Mon Oct 05 13:36:03 AFT 2009
2	2	eclipse.preferences.version=1
3	3	org.eclipse.jdt.core.builder.cleanOutputFolder=clean
…	…
18	18	org.eclipse.jdt.core.codeComplete.staticFieldSuffixes=
19	19	org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
20		org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
	20	org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
21	21	org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
22		org.eclipse.jdt.core.compiler.compliance=1.6
	22	org.eclipse.jdt.core.compiler.compliance=1.5
23	23	org.eclipse.jdt.core.compiler.debug.lineNumber=generate
24	24	org.eclipse.jdt.core.compiler.debug.localVariable=generate
…	…
97	97	org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
98	98	org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
99		org.eclipse.jdt.core.compiler.source=1.6
	99	org.eclipse.jdt.core.compiler.source=1.5
100	100	org.eclipse.jdt.core.compiler.taskCaseSensitive=enabled
101	101	org.eclipse.jdt.core.compiler.taskPriorities=NORMAL,HIGH,NORMAL

branches/private/pav/NEW_JAVA_5/sophie2-platform/modules/org.sophie2.base.bound/src/main/java/org/sophie2/base/bound/BoundCheckBox.java

r6407	r7238
27	27	final JCheckBox res = new JCheckBox();
28	28	res.addItemListener(new ItemListener() {
29		~~@Override~~
30	29	public void itemStateChanged(ItemEvent e) {
31	30	syncInputToModel(res.isSelected());

branches/private/pav/NEW_JAVA_5/sophie2-platform/modules/org.sophie2.base.bound/src/main/java/org/sophie2/base/bound/BoundComboBox.java

r7037	r7238
116	116
117	117	@SuppressWarnings({ "synthetic-access", "unchecked" })
118		~~@Override~~
119	118	public void itemStateChanged(ItemEvent e) {
120	119	Object input = res.getSelectedItem();
…	…
127	126	comboField.getDocument().addDocumentListener(new DocumentListener() {
128	127
129		~~@Override~~
130	128	public void changedUpdate(DocumentEvent e) {
131	129	onUpdate();
132	130	}
133	131
134		~~@Override~~
135	132	public void insertUpdate(DocumentEvent e) {
136	133	onUpdate();
137	134	}
138	135
139		~~@Override~~
140	136	public void removeUpdate(DocumentEvent e) {
141	137	onUpdate();
…	…
155	151	comboField.addFocusListener(new FocusListener() {
156	152
157		~~@Override~~
158	153	public void focusGained(FocusEvent e) {
159	154	// nothing
…	…
161	156
162	157	@SuppressWarnings("unchecked")
163		~~@Override~~
164	158	public void focusLost(FocusEvent e) {
165	159	syncInputToModel(new ComboInput(null, modelData().get().getSelectedItem()));

branches/private/pav/NEW_JAVA_5/sophie2-platform/modules/org.sophie2.base.bound/src/main/java/org/sophie2/base/bound/BoundGroupCheckBox.java

r7106	r7238
122	122	ON_SUBMIT {
123	123
124		~~@Override~~
125	124	public void defineFilter(EventFilterBuilder filter) {
126	125	filter.setEventId(BoundControl.EventIds.SUBMIT);
…	…
128	127	}
129	128
130		~~@Override~~
131	129	public boolean handle(EventR3 event) {
132	130	BoundGroupCheckBox source = event.getSource(BoundGroupCheckBox.class);

branches/private/pav/NEW_JAVA_5/sophie2-platform/modules/org.sophie2.base.bound/src/main/java/org/sophie2/base/bound/BoundSlider.java

r5317	r7238
160	160	validationVisible().set(false);
161	161	res.addChangeListener(new ChangeListener() {
162		~~@Override~~
163	162	public void stateChanged(ChangeEvent arg0) {
164	163	syncInputToModel(res.getValue());

branches/private/pav/NEW_JAVA_5/sophie2-platform/modules/org.sophie2.base.bound/src/main/java/org/sophie2/base/bound/BoundSpinner.java

r5628	r7238
29	29	res.addChangeListener(new ChangeListener() {
30	30
31		~~@Override~~
32	31	public void stateChanged(ChangeEvent e) {
33	32	syncInputToModel(Integer.parseInt(res.getModel().getValue().toString()));
…	…
37	36	res.addFocusListener(new FocusListener() {
38	37
39		~~@Override~~
40	38	public void focusLost(FocusEvent e) {
41	39	syncInputToModel(Integer.parseInt(res.getModel().getValue().toString()));
42	40	}
43	41
44		~~@Override~~
45	42	public void focusGained(FocusEvent e) {
46	43	syncInputToModel(Integer.parseInt(res.getModel().getValue().toString()));

branches/private/pav/NEW_JAVA_5/sophie2-platform/modules/org.sophie2.base.bound/src/main/java/org/sophie2/base/bound/BoundTextField.java

r6238	r7238
33	33	res.getDocument().addDocumentListener(new DocumentListener() {
34	34
35		~~@Override~~
36	35	public void changedUpdate(DocumentEvent e) {
37	36	syncInputToModel(res.getText());
38	37	}
39	38
40		~~@Override~~
41	39	public void insertUpdate(DocumentEvent e) {
42	40	syncInputToModel(res.getText());
43	41	}
44	42
45		~~@Override~~
46	43	public void removeUpdate(DocumentEvent e) {
47	44	syncInputToModel(res.getText());
…	…
50	47	res.addFocusListener(new FocusListener() {
51	48
52		~~@Override~~
53	49	public void focusGained(FocusEvent e) {
54	50	hasFocus().set(true);
55	51	}
56	52
57		~~@Override~~
58	53	public void focusLost(FocusEvent e) {
59	54	if (!res.getText().equals(dataInputControl.this.lastModelText)) {

branches/private/pav/NEW_JAVA_5/sophie2-platform/modules/org.sophie2.base.bound/src/test/java/org/sophie2/base/bound/BoundComboBoxTest.java

r6546	r7238
142	142	*/
143	143	ON_COMBO_SUBMIT {
144		~~@Override~~
145	144	public void defineFilter(EventFilterBuilder filter) {
146	145	filter.setEventId(BoundControl.EventIds.SUBMIT);
…	…
149	148
150	149	@SuppressWarnings("unchecked")
151		~~@Override~~
152	150	public boolean handle(EventR3 event) {
153	151	MinimalBoundComboBox source = event.getSource(MinimalBoundComboBox.class);
…	…
195	193
196	194	SwingUtilities.invokeLater(new Runnable() {
197		~~@Override~~
198	195	public void run() {
199	196	JFrame frame = new JFrame("BoundComboBox Demo");

branches/private/pav/NEW_JAVA_5/sophie2-platform/modules/org.sophie2.base.bound/src/test/java/org/sophie2/base/bound/BoundControlsDemo.java

r6508	r7238
230	230	JButton button = new JButton("+");
231	231	button.addActionListener(new ActionListener() {
232		~~@Override~~
233	232	public void actionPerformed(ActionEvent e) {
234	233	textField.value().set(textField.value().get() + 1);
…	…
270	269	SwingUtilities.invokeLater(new Runnable() {
271	270	@SuppressWarnings("synthetic-access")
272		~~@Override~~
273	271	public void run() {
274	272	BoundControlsDemo demo = new BoundControlsDemo();
…	…
289	287	ON_TEXT_SUBMIT {
290	288
291		~~@Override~~
292	289	public void defineFilter(EventFilterBuilder filter) {
293	290	filter.setEventId(BoundControl.EventIds.SUBMIT);
…	…
295	292	}
296	293
297		~~@Override~~
298	294	public boolean handle(EventR3 event) {
299	295	BoundTextFieldDemo source = event.getSource(BoundTextFieldDemo.class);
…	…
311	307	ON_SLIDER_SUBMIT {
312	308
313		~~@Override~~
314	309	public void defineFilter(EventFilterBuilder filter) {
315	310	filter.setEventId(BoundControl.EventIds.SUBMIT);
…	…
318	313
319	314	@SuppressWarnings("synthetic-access")
320		~~@Override~~
321	315	public boolean handle(EventR3 event) {
322	316	BoundSliderDemo source = event.getSource(BoundSliderDemo.class);
…	…
337	331	ON_SPINNER_SUBMIT {
338	332
339		~~@Override~~
340	333	public void defineFilter(EventFilterBuilder filter) {
341	334	filter.setEventId(BoundControl.EventIds.SUBMIT);
…	…
343	336	}
344	337
345		~~@Override~~
346	338	public boolean handle(EventR3 event) {
347	339	BoundSpinnerDemo source = event.getSource(BoundSpinnerDemo.class);
…	…
358	350	ON_COMBO_SUBMIT {
359	351
360		~~@Override~~
361	352	public void defineFilter(EventFilterBuilder filter) {
362	353	filter.setEventId(BoundControl.EventIds.SUBMIT);
…	…
365	356
366	357	@SuppressWarnings("unchecked")
367		~~@Override~~
368	358	public boolean handle(EventR3 event) {
369	359	BoundComboBoxDemo source = event.getSource(BoundComboBoxDemo.class);

branches/private/pav/NEW_JAVA_5/sophie2-platform/modules/org.sophie2.base.bound/src/test/java/org/sophie2/base/bound/BoundGroupCheckBoxDemo.java

r7106	r7238
89	89	*/
90	90	ON_SUBMIT {
91		~~@Override~~
92	91	public void defineFilter(EventFilterBuilder filter) {
93	92	filter.setEventId(BoundControl.EventIds.SUBMIT);
…	…
95	94	}
96	95
97		~~@Override~~
98	96	public boolean handle(EventR3 event) {
99	97	SubCheckBox source = event.getSource(SubCheckBox.class);
…	…
138	136
139	137	SwingUtilities.invokeLater(new Runnable() {
140		~~@Override~~
141	138	public void run() {
142	139	SophieLog.setMinLevel("", LogLevel.ERROR);

branches/private/pav/NEW_JAVA_5/sophie2-platform/modules/org.sophie2.base.bound/src/test/java/org/sophie2/base/bound/BoundSpinnerTest.java

r5739	r7238
124	124	ON_SPINNER_SUBMIT {
125	125
126		~~@Override~~
127	126	public void defineFilter(EventFilterBuilder filter) {
128	127	filter.setEventId(BoundControl.EventIds.SUBMIT);
…	…
130	129	}
131	130
132		~~@Override~~
133	131	public boolean handle(EventR3 event) {
134	132	MinimalBoundSpinner source = event

branches/private/pav/NEW_JAVA_5/sophie2-platform/modules/org.sophie2.base.bound/src/test/java/org/sophie2/base/bound/BoundTextFieldTest.java

r5739	r7238
135	135	ON_TEXT_SUBMIT {
136	136
137		~~@Override~~
138	137	public void defineFilter(EventFilterBuilder filter) {
139	138	filter.setEventId(BoundControl.EventIds.SUBMIT);
…	…
141	140	}
142	141
143		~~@Override~~
144	142	public boolean handle(EventR3 event) {
145	143	MinimalBoundTextField source = event

branches/private/pav/NEW_JAVA_5/sophie2-platform/modules/org.sophie2.base.commons/.classpath

r115	r7238
5	5	<classpathentry kind="src" output="target/test-classes" path="src/test/java"/>
6	6	<classpathentry excluding="**" kind="src" output="target/test-classes" path="src/test/resources"/>
7		~~<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>~~
8	7	<classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
	8	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/jdk1.5.0_21"/>
9	9	<classpathentry kind="output" path="target/classes"/>
10	10	</classpath>

branches/private/pav/NEW_JAVA_5/sophie2-platform/modules/org.sophie2.base.commons/.settings/org.eclipse.jdt.core.prefs

r115	r7238
1		#~~Thu Sep 18 21:11:04 EEST 2008~~
	1	#Mon Oct 05 13:36:09 AFT 2009
2	2	eclipse.preferences.version=1
3	3	org.eclipse.jdt.core.builder.cleanOutputFolder=clean
…	…
17	17	org.eclipse.jdt.core.codeComplete.staticFieldPrefixes=
18	18	org.eclipse.jdt.core.codeComplete.staticFieldSuffixes=
	19	org.eclipse.jdt.core.codeComplete.staticFinalFieldPrefixes=
	20	org.eclipse.jdt.core.codeComplete.staticFinalFieldSuffixes=
19	21	org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
20		org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
	22	org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
21	23	org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
22		org.eclipse.jdt.core.compiler.compliance=1.6
	24	org.eclipse.jdt.core.compiler.compliance=1.5
23	25	org.eclipse.jdt.core.compiler.debug.lineNumber=generate
24	26	org.eclipse.jdt.core.compiler.debug.localVariable=generate
…	…
97	99	org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
98	100	org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
99		org.eclipse.jdt.core.compiler.source=1.6
	101	org.eclipse.jdt.core.compiler.source=1.5
100	102	org.eclipse.jdt.core.compiler.taskCaseSensitive=enabled
101	103	org.eclipse.jdt.core.compiler.taskPriorities=NORMAL,HIGH,NORMAL
…	…
103	105	org.eclipse.jdt.core.incompatibleJDKLevel=ignore
104	106	org.eclipse.jdt.core.incompleteClasspath=error
105

branches/private/pav/NEW_JAVA_5/sophie2-platform/modules/org.sophie2.base.commons/src/main/java/org/sophie2/base/commons/gui/LogicR3Button.java

r5739	r7238
37	37	}
38	38
39		~~@Override~~
40	39	public void actionPerformed(ActionEvent arg0) {
41	40	for (EventR3 event : this.events) {

branches/private/pav/NEW_JAVA_5/sophie2-platform/modules/org.sophie2.base.commons/src/main/java/org/sophie2/base/commons/gui/MouseCapture.java

r4155	r7238
2	2
3	3	import java.awt.AWTEvent;
	4	import java.awt.Point;
4	5	import java.awt.Toolkit;
5	6	import java.awt.event.AWTEventListener;
…	…
31	32	this.initCompX = initCompX;
32	33	this.initCompY = initCompY;
	34
	35	Point componentPoint = e.getComponent().getLocationOnScreen();
	36
33	37	if(!isInTestMode()) {
34		this.initMouseX = ~~e.getXOnScreen~~();
35		this.initMouseY = ~~e.getYOnScreen~~();
	38	this.initMouseX = componentPoint.x + e.getX();
	39	this.initMouseY = componentPoint.y + e.getY();
36	40	Toolkit.getDefaultToolkit().addAWTEventListener(this, AWTEvent.MOUSE_MOTION_EVENT_MASK \| AWTEvent.MOUSE_EVENT_MASK);
37	41	} else {
…	…
56	60	public abstract void released();
57	61
58		~~@Override~~
59	62	public final void eventDispatched(AWTEvent event) {
60	63	MouseEvent m = (MouseEvent)event;
	64	Point componentPoint = m.getComponent().getLocationOnScreen();
	65
61	66	m.consume();
62		int newX = this.initCompX + ~~m.getXOnScreen~~() - this.initMouseX;
63		int newY = this.initCompY + ~~m.getYOnScreen~~() - this.initMouseY;
	67	int newX = this.initCompX + componentPoint.x + m.getX() - this.initMouseX;
	68	int newY = this.initCompY + componentPoint.y + m.getY() - this.initMouseY;
64	69	this.shouldMove(newX, newY);
65	70	SophieLog.debug("eventDispatched:" +event);

branches/private/pav/NEW_JAVA_5/sophie2-platform/modules/org.sophie2.base.commons/src/main/java/org/sophie2/base/commons/skin/IconId.java

r6518	r7238
44	44	}
45	45
46		~~@Override~~
47	46	public String getSkinId() {
48	47	return this.skinId;

branches/private/pav/NEW_JAVA_5/sophie2-platform/modules/org.sophie2.base.commons/src/main/java/org/sophie2/base/commons/structures/ImmDosTree.java

r6880	r7238
905	905	private final int size = end;
906	906
907		~~@Override~~
908	907	public boolean hasNext() {
909	908	return this.current < this.size;
910	909	}
911	910
912		~~@Override~~
913	911	public E next() {
914	912	Node<E> res = findNext(ImmDosTree.this.root, this.current++);
…	…
933	931	}
934	932
935		~~@Override~~
936	933	public void remove() {
937	934	throw new UnsupportedOperationException(

branches/private/pav/NEW_JAVA_5/sophie2-platform/modules/org.sophie2.base.commons/src/main/java/org/sophie2/base/commons/structures/ImmHashingTree.java

r6880	r7238
71	71	}
72	72
73		~~@Override~~
74	73	public Hash getHash() {
75	74	if (this.hash == null) {
…	…
231	230	}
232	231
233		~~@Override~~
234	232	public Hash getHash() {
235	233	return getRoot().getHash();

branches/private/pav/NEW_JAVA_5/sophie2-platform/modules/org.sophie2.base.commons/src/main/java/org/sophie2/base/commons/structures/ImmTreeCollection.java

r6880	r7238
69	69	}
70	70
71		~~@Override~~
72	71	public final ImmDosTree<E> getTree() {
73	72	return this.tree;
74	73	}
75	74
76		~~@Override~~
77	75	public final int getTreeBegin() {
78	76	return this.treeBegin;
79	77	}
80	78
81		~~@Override~~
82	79	public final int getTreeEnd() {
83	80	return this.treeEnd;
84	81	}
85	82
86		~~@Override~~
87	83	public final E get(int index) {
88	84	int realIndex = calcIndex(index);
…	…
90	86	}
91	87
92		~~@Override~~
93	88	public Iterator<E> iterator() {
94	89	return getTree().iterator(getTreeBegin(), getTreeEnd());
…	…
99	94
100	95
101		~~@Override~~
102	96	public final List<E> asList() {
103	97	if (this.listCache == null) {
…	…
140	134	}
141	135
142		~~@Override~~
143	136	public final int size() {
144	137	return this.size;
145	138	}
146	139
147		~~@Override~~
148	140	public final boolean isEmpty() {
149	141	return size() == 0;

branches/private/pav/NEW_JAVA_5/sophie2-platform/modules/org.sophie2.base.commons/src/main/java/org/sophie2/base/commons/structures/ImmTreeList.java

r6933	r7238
47	47	}
48	48
49		~~@Override~~
50	49	public ImmTreeList<T> add(int index, T element) {
51	50	int realIndex = calcIndex(index);
…	…
55	54	}
56	55
57		~~@Override~~
58	56	public ImmTreeList<T> remove(int index) {
59	57	int realIndex = calcIndex(index);
…	…
64	62	}
65	63
66		~~@Override~~
67	64	public ImmTreeList<T> set(int index, T element) {
68	65	int realIndex = calcIndex(index);
…	…
73	70	}
74	71
75		~~@Override~~
76	72	public ImmList<T> subList(int from, int to) {
77	73	int subSize = to - from;
…	…
96	92
97	93	@Override
	94	public Iterator<T> iterator() {
	95	return getTree().iterator(getTreeBegin(), getTreeEnd());
	96	}
	97
98	98	public ImmTreeList<T> add(T value) {
99	99	return add(size(), value);
100	100	}
101	101
102		~~@Override~~
103	102	public ImmList<T> concat(ImmList<T> immList) {
104	103	ImmTreeList<T> newData = this;
…	…
110	109	}
111	110
112		~~@Override~~
113	111	public boolean contains(T element) {
114	112	for (T iterElement : this) {
…	…
120	118	}
121	119
122		~~@Override~~
123	120	public ImmList<T> remove(T value) {
124	121	return remove(getIndex(value));

branches/private/pav/NEW_JAVA_5/sophie2-platform/modules/org.sophie2.base.commons/src/main/java/org/sophie2/base/commons/structures/ImmTreeMap.java

r6933	r7238
25	25	private final Comparator<K> DEFAULT_KEY_COMPARATOR = new Comparator<K>() {
26	26	@SuppressWarnings("unchecked")
27		~~@Override~~
28	27	public int compare(K o1, K o2) {
29	28	return ((Comparable<K>) o1).compareTo(o2);
…	…
52	51	}
53	52
54		~~@Override~~
55	53	public int compare(ImmEntry<K, V> o1, ImmEntry<K, V> o2) {
56	54	return this.keyComaprator.compare(o1.getKey(), o2.getKey());
…	…
143	141	}
144	142
145		~~@Override~~
146	143	public boolean contains(K key) {
147	144	return contains(getTree().getRoot(), getTreeBegin(), getTreeEnd(), key);
148	145	}
149	146
150		~~@Override~~
151	147	public V get(K key) {
152	148	if (!contains(key)) {
…	…
159	155	}
160	156
161		~~@Override~~
162	157	public Comparator<K> getComparator() {
163	158	return this.comparator.getKeyComparator();
164	159	}
165	160
166		~~@Override~~
167	161	public ImmTreeMap<K, V> put(K key, V value) {
168	162	int index = getIndex(key);
…	…
187	181	}
188	182
189		~~@Override~~
190	183	public ImmTreeMap<K, V> remove(K key) {
191	184	if (!contains(key)) {
…	…
199	192	}
200	193
201		~~@Override~~
202	194	public ImmTreeMap<K, V> subMap(K fromKey, K toKey) {
203	195	int begin = getIndex(fromKey);
…	…
280	272	}
281	273
282		~~@Override~~
283	274	public int find(ImmFind query, K key) {
284	275	// TODO implement better

branches/private/pav/NEW_JAVA_5/sophie2-platform/modules/org.sophie2.base.commons/src/main/java/org/sophie2/base/commons/structures/ImmTreeSet.java

r6880	r7238
22	22
23	23	private final Comparator<E> DEFAULT_COMPARATOR = new Comparator<E>() {
24		~~@Override~~
25	24	@SuppressWarnings("unchecked")
26	25	public int compare(E o1, E o2) {
…	…
96	95	private Set<E> setCache = null;
97	96
98		~~@Override~~
99	97	public Set<E> asSet() {
100	98	if (this.setCache == null) {
…	…
115	113	}
116	114
117		~~@Override~~
118	115	public boolean contains(E element) {
119	116	return this.contains(getTree().getRoot(), getTreeBegin(), getTreeEnd(),
…	…
121	118	}
122	119
123		~~@Override~~
124	120	public Comparator<E> getComparator() {
125	121	return this.comparator;
126	122	}
127	123
128		~~@Override~~
129	124	public ImmSet<E> put(E element) {
130	125	int index = getIndex(element);
…	…
147	142	}
148	143
149		~~@Override~~
150	144	public ImmSet<E> remove(E element) {
151	145	if (!contains(element)) {
…	…
203	197	}
204	198
205		~~@Override~~
206	199	public ImmTreeSet<E> subSet(E begin, E end) {
207	200	int beginIndex = getIndex(begin);

branches/private/pav/NEW_JAVA_5/sophie2-platform/modules/org.sophie2.base.commons/src/main/java/org/sophie2/base/commons/util/BinData.java

r6933	r7238
11	11	import java.io.Writer;
12	12	import java.nio.ByteBuffer;
13		~~import java.util.Arrays;~~
14	13
15	14	import org.sophie2.core.logging.SophieLog;
…	…
50	49	public BinData(byte[] data) {
51	50	assert data != null;
52		this.data = Arrays.copyOf(data, data.length);
	51	this.data = new byte[data.length];
	52	System.arraycopy(data, 0, this.data, 0, data.length);
53	53	}
54	54
…	…
135	135	*/
136	136	public BinData(byte[] data, int begin, int end) {
137		this.data = Arrays.copyOfRange(data, begin, end);
	137	this.data = new byte[end - begin];
	138	System.arraycopy(data, begin, this.data, 0, end - begin);
	139
138	140	}
139	141
…	…
144	146	*/
145	147	public byte[] getBytes() {
146		return Arrays.copyOf(this.data, this.data.length);
	148	byte[] copyOfData = new byte[this.data.length];
	149	System.arraycopy(this.data, 0, copyOfData, 0, this.data.length);
	150	return copyOfData;
147	151	}
148	152
…	…
258	262	assert begin == end \|\| end <= this.data.length : String.format("from=%d, to=%d, size=%d",
259	263	begin, end, this.data.length);
260
261		return Arrays.copyOfRange(this.data, begin, end);
	264	byte[] copyOfData = new byte[end - begin];
	265	System.arraycopy(this.data, begin, copyOfData, 0, end - begin);
	266	return copyOfData;
262	267	}
263	268

branches/private/pav/NEW_JAVA_5/sophie2-platform/modules/org.sophie2.base.commons/src/main/java/org/sophie2/base/commons/util/Hash.java

r6482	r7238
113	113	}
114	114
115		~~@Override~~
116	115	public int compareTo(Hash o) {
117	116	if (this.count != o.count) {

branches/private/pav/NEW_JAVA_5/sophie2-platform/modules/org.sophie2.base.commons/src/main/java/org/sophie2/base/commons/util/ImmColor.java

r5735	r7238
301	301	}
302	302
303		~~@Override~~
304	303	public void fill(Graphics2D g2d, Shape shape) {
305	304	g2d.setPaint(this.toAwtColor());
…	…
307	306	}
308	307
309		~~@Override~~
310	308	public ImmFilling transform(ImmColor immColor) {
311	309	return multiply(immColor);
…	…
337	335	}
338	336
339		~~@Override~~
340	337	public Hash getHash() {
341	338	Hasher h = new Hasher();

branches/private/pav/NEW_JAVA_5/sophie2-platform/modules/org.sophie2.base.commons/src/main/java/org/sophie2/base/commons/util/ImmGradient.java

r6172	r7238
135	135	this.gradientType = gradientType;
136	136	this.cycle = cycle;
137		this.fractions = Arrays.copyOf(fracts, fracts.length);
	137	this.fractions = new float[fracts.length];
	138	System.arraycopy(fracts, 0, this.fractions, 0, fracts.length);
138	139	this.colors = new ImmColor[colors.length];
139	140	for (int i = 0; i < colors.length; i++) {
…	…
180	181	*/
181	182	public float[] getFractions() {
182		return Arrays.copyOf(this.fractions, this.fractions.length);
	183	float[] copyOfFractions = new float[this.fractions.length];
	184	System.arraycopy(this.fractions, 0, copyOfFractions, 0, this.fractions.length);
	185	return copyOfFractions;
183	186	}
184	187
…	…
189	192	*/
190	193	public ImmColor[] getColors() {
191		return Arrays.copyOf(this.colors, this.colors.length);
	194	ImmColor[] copyOfColors = new ImmColor[this.colors.length];
	195	System.arraycopy(this.colors, 0, copyOfColors, 0, this.colors.length);
	196	return copyOfColors;
192	197	}
193	198
…	…
217	222	this.gradientType = GradientType.LINEAR;
218	223	this.cycle = lgp.getCycleMethod();
219		this.fractions = ~~Arrays.copyOf(lgp.getFractions(),~~
220		lgp.getFractions().length);
	224	this.fractions = new float[lgp.getFractions().length];
	225	System.arraycopy(lgp.getFractions(), 0, this.fractions, 0, lgp.getFractions().length);
221	226	Color[] lgpColors = lgp.getColors();
222	227	this.colors = new ImmColor[lgpColors.length];
…	…
234	239	this.gradientType = GradientType.RADIAL;
235	240	this.cycle = rgp.getCycleMethod();
236		this.fractions = ~~Arrays.copyOf(rgp.getFractions(),~~
237		rgp.getFractions().length);
	241	this.fractions = new float[rgp.getFractions().length];
	242	System.arraycopy(rgp.getFractions(), 0, this.fractions, 0, rgp.getFractions().length);
238	243	Color[] rgpColors = rgp.getColors();
239	244	this.colors = new ImmColor[rgpColors.length];
…	…
250	255	*/
251	256	public MultipleGradientPaint getGradientPaint() {
252		float[] fracts = Arrays.copyOf(this.fractions, this.fractions.length);
	257	float[] fracts = new float[this.fractions.length];
	258	System.arraycopy(this.fractions, 0, fracts, 0, this.fractions.length);
	259
253	260	Color[] awtColors = new Color[this.colors.length];
254	261	for (int i = 0; i < this.colors.length; i++) {
…	…
269	276	}
270	277
271		~~@Override~~
272	278	public void fill(Graphics2D g2d, Shape shape) {
273	279	g2d.setPaint(getGradientPaint());
…	…
275	281	}
276	282
277		~~@Override~~
278	283	public ImmFilling transform(ImmColor immColor) {
279	284	ImmColor[] multipliedColors = new ImmColor[this.colors.length];
…	…
323	328	}
324	329
325		~~@Override~~
326	330	public Hash getHash() {
327	331

branches/private/pav/NEW_JAVA_5/sophie2-platform/modules/org.sophie2.base.commons/src/main/java/org/sophie2/base/commons/util/ImmImage.java

r6933	r7238
186	186	}
187	187
188		~~@Override~~
189	188	public void fill(Graphics2D g2d, Shape shape) {
190	189	Rectangle rec = shape.getBounds();
…	…
193	192	}
194	193
195		~~@Override~~
196	194	public ImmFilling transform(ImmColor immColor) {
197	195	BufferedImage bi = this.toBufferedImage();
…	…
248	246	* Hashes the image passing pixels with a fixed step on the x and y axis.
249	247	*/
250		~~@Override~~
251	248	public Hash getHash() {
252	249

branches/private/pav/NEW_JAVA_5/sophie2-platform/modules/org.sophie2.base.commons/src/main/java/org/sophie2/base/commons/util/ImmPattern.java

r6172	r7238
42	42	}
43	43
44		~~@Override~~
45	44	public void fill(Graphics2D g2d, Shape shape) {
46	45	g2d.setPaint(this.paint);
…	…
48	47	}
49	48
50		~~@Override~~
51	49	public ImmFilling transform(ImmColor immColor) {
52	50	return new ImmPattern((ImmImage) this.pattern.transform(immColor));
…	…
63	61	}
64	62
65		~~@Override~~
66	63	public Hash getHash() {
67	64	Hasher h = new Hasher();

branches/private/pav/NEW_JAVA_5/sophie2-platform/modules/org.sophie2.base.commons/src/main/java/org/sophie2/base/commons/util/NaiveImmList.java

r6880	r7238
82	82	// in addition to List's observer's may contain
83	83	// producers
84		~~@Override~~
85	84	public NaiveImmList<E> set(int index, E value) {
86	85	ArrayList<E> newData = new ArrayList<E>(asList());
…	…
89	88	}
90	89
91		~~@Override~~
92	90	public NaiveImmList<E> remove(int index) {
93	91	ArrayList<E> newData = new ArrayList<E>(asList());
…	…
97	95	}
98	96
99		~~@Override~~
100	97	public NaiveImmList<E> remove(E value) {
101	98	ArrayList<E> newData = new ArrayList<E>(asList());
…	…
104	101	}
105	102
106		~~@Override~~
107	103	public NaiveImmList<E> add(int index, E value) {
108	104	ArrayList<E> newData = new ArrayList<E>(asList());
…	…
124	120	}
125	121
126		~~@Override~~
127	122	public NaiveImmList<E> add(E value) {
128	123	return add(size(), value);
129	124	}
130	125
131		~~@Override~~
132	126	public E get(int index) {
133	127	return this.data.get(index);
134	128	}
135	129
136		~~@Override~~
137	130	public int size() {
138	131	return this.data.size();
…	…
140	133
141	134	@SuppressWarnings("unchecked")
142		~~@Override~~
143	135	public List<E> asList() {
144	136
…	…
173	165	private int current = -1;
174	166
175		~~@Override~~
176	167	public void add(E e) {
177	168	NaiveImmList.this.add(e);
178	169	}
179	170
180		~~@Override~~
181	171	public boolean hasNext() {
182	172	return this.current < size() - 1;
183	173	}
184	174
185		~~@Override~~
186	175	public boolean hasPrevious() {
187	176	return this.current > 0;
188	177	}
189	178
190		~~@Override~~
191	179	public E next() {
192	180	if (!hasNext()) {
…	…
200	188	}
201	189
202		~~@Override~~
203	190	public int nextIndex() {
204	191	return hasNext() ? this.current + 1 : size();
205	192	}
206	193
207		~~@Override~~
208	194	public E previous() {
209	195	if (!hasPrevious()) {
…	…
218	204	}
219	205
220		~~@Override~~
221	206	public int previousIndex() {
222	207	return this.current;
223	208	}
224	209
225		~~@Override~~
226	210	public void remove() {
227	211	NaiveImmList.this.remove(this.current);
228	212	}
229	213
230		~~@Override~~
231	214	public void set(E e) {
232	215	NaiveImmList.this.set(this.current, e);
…	…
234	217	}
235	218
236		~~@Override~~
237	219	public Iterator<E> iterator() {
238	220	return new NaiveImmListIterator();
239	221	}
240	222
241		~~@Override~~
242	223	public ImmList<E> concat(ImmList<E> immList) {
243	224	ArrayList<E> newData = new ArrayList<E>(asList());
…	…
264	245	}
265	246
266		~~@Override~~
267	247	public boolean contains(E element) {
268	248	return this.data.contains(element);
…	…
311	291	* @see org.sophie2.base.commons.util.ImmCollection#getTree()
312	292	*/
313		~~@Override~~
314	293	public ImmDosTree<E> getTree() {
315	294	throw new UnsupportedOperationException();
316	295	}
317	296
318		~~@Override~~
319	297	public int getTreeBegin() {
320	298	throw new UnsupportedOperationException();
321	299	}
322	300
323		~~@Override~~
324	301	public int getTreeEnd() {
325	302	throw new UnsupportedOperationException();
326	303	}
327	304
328		~~@Override~~
329	305	public boolean isEmpty() {
330	306	return size() == 0;
331	307	}
332	308
333		~~@Override~~
334	309	public ImmList<E> subList(int from, int to) {
335	310	// TODO Auto-generated method stub

branches/private/pav/NEW_JAVA_5/sophie2-platform/modules/org.sophie2.base.commons/src/main/java/org/sophie2/base/commons/util/position/ImmArea.java

r6704	r7238
242	242	* The Hash code value.
243	243	*/
244		~~@Override~~
245	244	public Hash getHash() {
246	245	if (this.hash == null) {
…	…
273	272	TRANSFORM;
274	273
275		~~@Override~~
276	274	public Hash getHash() {
277	275	Hasher h = new Hasher();

branches/private/pav/NEW_JAVA_5/sophie2-platform/modules/org.sophie2.base.commons/src/main/java/org/sophie2/base/commons/util/position/ImmMatrix.java

r6466	r7238
7	7	import org.sophie2.base.commons.util.Hashable;
8	8	import org.sophie2.base.commons.util.Hasher;
	9	import org.sophie2.core.logging.SophieLog;
9	10	import org.sophie2.core.prolib.annot.Immutable;
10	11
…	…
95	96
96	97	if(this.inverseCache == null) {
97		AffineTransform inverse = new AffineTransform(this.transform);
	98	AffineTransform transformToInverse = new AffineTransform(this.transform);
98	99	try {
99		~~inverse.invert(~~);
	100	this.inverseCache = new ImmMatrix(transformToInverse.createInverse());
100	101	} catch (NoninvertibleTransformException e) {
	102	SophieLog.errorf("Exception while inverting a matrix to itself: ", e);
101	103	throw new RuntimeException(e);
	104
102	105	}
103		~~this.inverseCache = new ImmMatrix(inverse);~~
104	106	}
105	107	return this.inverseCache;
…	…
279	281	}
280	282
281		~~@Override~~
282	283	public Hash getHash() {
283	284

branches/private/pav/NEW_JAVA_5/sophie2-platform/modules/org.sophie2.base.config/.classpath

r3228	r7238
5	5	<classpathentry kind="src" output="target/test-classes" path="src/test/java"/>
6	6	<classpathentry excluding="**" kind="src" output="target/test-classes" path="src/test/resources"/>
7		<classpathentry kind="con"
8		path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6" />
9		<classpathentry kind="con"
10		path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER" />
11		<classpathentry kind="output" path="target/classes" />
	7	<classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
	8	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/jdk1.5.0_21"/>
	9	<classpathentry kind="output" path="target/classes"/>
12	10	</classpath>

branches/private/pav/NEW_JAVA_5/sophie2-platform/modules/org.sophie2.base.config/.settings/org.eclipse.jdt.core.prefs

r3228	r7238
1		#~~Thu Sep 18 21:11:04 EEST 2008~~
	1	#Mon Oct 05 13:36:15 AFT 2009
2	2	eclipse.preferences.version=1
3	3	org.eclipse.jdt.core.builder.cleanOutputFolder=clean
…	…
18	18	org.eclipse.jdt.core.codeComplete.staticFieldSuffixes=
19	19	org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
20		org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
	20	org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
21	21	org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
22		org.eclipse.jdt.core.compiler.compliance=1.6
	22	org.eclipse.jdt.core.compiler.compliance=1.5
23	23	org.eclipse.jdt.core.compiler.debug.lineNumber=generate
24	24	org.eclipse.jdt.core.compiler.debug.localVariable=generate
…	…
97	97	org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
98	98	org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
99		org.eclipse.jdt.core.compiler.source=1.6
	99	org.eclipse.jdt.core.compiler.source=1.5
100	100	org.eclipse.jdt.core.compiler.taskCaseSensitive=enabled
101	101	org.eclipse.jdt.core.compiler.taskPriorities=NORMAL,HIGH,NORMAL

branches/private/pav/NEW_JAVA_5/sophie2-platform/modules/org.sophie2.base.config/src/main/java/org/sophie2/base/config/persistence/ConfigurationFilePersister.java

r5432	r7238
26	26	import org.sophie2.base.persistence.storage.Storage;
27	27	import org.sophie2.base.persistence.storage.StorageUtils;
	28	import org.sophie2.core.logging.SophieLog;
28	29	import org.w3c.dom.DOMImplementation;
29	30	import org.w3c.dom.Document;
…	…
117	118	docBuilder = dbFactory.newDocumentBuilder();
118	119	} catch (ParserConfigurationException e) {
	120	SophieLog.error("ParserConfigurationException during document initialization", e);
119	121	throw new IOException("ParserConfigurationException "
120		+ "during document initialization"~~, e~~);
	122	+ "during document initialization");
121	123	}
122	124

branches/private/pav/NEW_JAVA_5/sophie2-platform/modules/org.sophie2.base.connectivity/.classpath

r2021	r7238
5	5	<classpathentry kind="src" output="target/test-classes" path="src/test/java"/>
6	6	<classpathentry excluding="**" kind="src" output="target/test-classes" path="src/test/resources"/>
7		<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J~~avaSE-1.6~~"/>
	7	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
8	8	<classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
9	9	<classpathentry kind="output" path="target/classes"/>

branches/private/pav/NEW_JAVA_5/sophie2-platform/modules/org.sophie2.base.connectivity/pom.xml

r6436	r7238
43	43	</dependency>
44	44	<dependency>
	45	<groupId>javax.xml.bind</groupId>
	46	<artifactId>jaxb-api</artifactId>
	47	<version>2.0</version>
	48	</dependency>
	49	<dependency>
	50	<groupId>com.sun.xml.bind</groupId>
	51	<artifactId>jaxb-impl</artifactId>
	52	<version>2.0.2</version>
	53	</dependency>
	54	<dependency>
	55	<groupId>stax-utils</groupId>
	56	<artifactId>stax</artifactId>
	57	<version>1.2.0</version>
	58	</dependency>
	59	<dependency>
45	60	<groupId>junit</groupId>
46	61	<artifactId>junit</artifactId>

branches/private/pav/NEW_JAVA_5/sophie2-platform/modules/org.sophie2.base.connectivity/.settings/org.eclipse.jdt.core.prefs

r6466	r7238
1		#~~Thu Sep 18 21:11:04 EEST 2008~~
	1	#Mon Oct 05 13:36:40 AFT 2009
2	2	eclipse.preferences.version=1
3	3	org.eclipse.jdt.core.builder.cleanOutputFolder=clean
…	…
18	18	org.eclipse.jdt.core.codeComplete.staticFieldSuffixes=
19	19	org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
20		org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
	20	org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
21	21	org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
22		org.eclipse.jdt.core.compiler.compliance=1.6
	22	org.eclipse.jdt.core.compiler.compliance=1.5
23	23	org.eclipse.jdt.core.compiler.debug.lineNumber=generate
24	24	org.eclipse.jdt.core.compiler.debug.localVariable=generate
…	…
97	97	org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
98	98	org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
99		org.eclipse.jdt.core.compiler.source=1.6
	99	org.eclipse.jdt.core.compiler.source=1.5
100	100	org.eclipse.jdt.core.compiler.taskCaseSensitive=enabled
101	101	org.eclipse.jdt.core.compiler.taskPriorities=NORMAL,HIGH,NORMAL

branches/private/pav/NEW_JAVA_5/sophie2-platform/modules/org.sophie2.base.connectivity/src/main/java/org/sophie2/base/connectivity/resources/DelegatingServerAccess.java

r6343	r7238
33	33	}
34	34
35		~~@Override~~
36	35	public SyncInfo getSyncInfo() {
37	36	return ((MasterServerAccess)this.masterAccess).getSyncInfo();
38	37	}
39	38
40		~~@Override~~
41	39	public SyncOptions getSyncOptions() {
42	40	return ((MasterServerAccess)this.masterAccess).getSyncOptions();
43	41	}
44	42
45		~~@Override~~
46	43	public void save(PersistenceOptions options) throws IOException {
47	44	((MasterServerAccess)this.masterAccess).save(options);
48	45	}
49	46
50		~~@Override~~
51	47	public void syncToRemoteMaster() {
52	48	((MasterServerAccess)this.masterAccess).syncToRemoteMaster();

branches/private/pav/NEW_JAVA_5/sophie2-platform/modules/org.sophie2.base.connectivity/src/main/java/org/sophie2/base/connectivity/resources/MasterServerAccess.java

r6466	r7238
54	54	SwingUtilities.invokeAndWait( new Runnable() {
55	55
56		~~@Override~~
57	56	public void run() {
58	57	if (MasterServerAccess.this.syncronizing.compareAndSet(false, true)) {
…	…
115	114	}
116	115
117		~~@Override~~
118	116	public SyncInfo getSyncInfo() {
119	117	return this.syncInfo;
120	118	}
121	119
122		~~@Override~~
123	120	public SyncOptions getSyncOptions() {
124	121	return this.syncOptions;
125	122	}
126	123
127		~~@Override~~
128	124	public void save(PersistenceOptions options) {
129	125	throw new UnsupportedOperationException();
130	126	}
131	127
132		~~@Override~~
133	128	public void syncToRemoteMaster() {
134	129	ResourceRevision revision = this.headRevision;

branches/private/pav/NEW_JAVA_5/sophie2-platform/modules/org.sophie2.base.connectivity/src/main/java/org/sophie2/base/connectivity/resources/RemoteResourceModel.java

r6466	r7238
241	241	}
242	242
243		~~@Override~~
244	243	public String getKey() {
245	244	return this.originalEntry.getKey();
…	…
247	246
248	247	@SuppressWarnings("synthetic-access")
249		~~@Override~~
250	248	public Node getValue() {
251	249	if (this.loadedValue != null) {
…	…
265	263	}
266	264
267		~~@Override~~
268	265	public Node setValue(Node value) {
269	266	throw new UnsupportedOperationException();

branches/private/pav/NEW_JAVA_5/sophie2-platform/modules/org.sophie2.base.connectivity/src/main/java/org/sophie2/base/connectivity/XmlPersister.java

r6466	r7238
20	20	import javax.xml.stream.XMLStreamWriter;
21	21
	22
22	23	import org.sophie2.base.commons.util.Base64;
23	24	import org.sophie2.base.commons.util.BinData;
…	…
28	29	import org.sophie2.base.persistence.ref.ValueRef;
29	30	import org.sophie2.base.persistence.storage.Storage;
	31	import org.sophie2.core.logging.SophieLog;
30	32
31	33	/**
…	…
93	95	}
94	96	} catch (XMLStreamException e) {
95		throw new IOException(e);
	97	SophieLog.error("IOException while saving/loading objects: ", e);
	98	throw new IOException("IOException while saving/loading objects!");
96	99	}
97	100
…	…
121	124	stream.close();
122	125	}
123		document.set(new String(stream.toByteArray(), options.get(CHARSET)));
	126	document.set(new String(stream.toByteArray(), options.get(CHARSET).name()));
124	127	}
125	128
…	…
270	273	.get(A_BASE64_ENCODE_OPTIONS));
271	274	} catch (NumberFormatException e) {
	275	SophieLog.error("Options must be integer at " + reader.getLocation(), e);
272	276	throw new IncorrectFormatException(
273		"Options must be integer at " + reader.getLocation()~~, e~~);
	277	"Options must be integer at " + reader.getLocation());
274	278	}
275	279	BinData data = new BinData(attributes.get(A_VALUE), options);

branches/private/pav/NEW_JAVA_5/sophie2-platform/modules/org.sophie2.base.connectivity/src/test/java/org/sophie2/base/connectivity/ResponsePersisterTest.java

r6466	r7238
36	36	public static final ResponseProducer<ImmList<String>> LIST_PRODUCER = new ResponseProducer<ImmList<String>>() {
37	37
38		~~@Override~~
39	38	public ImmList<String> produce() throws ResponseExcpetion {
40	39	return NaiveImmList.<String>create("One" ,"Two");

branches/private/pav/NEW_JAVA_5/sophie2-platform/modules/org.sophie2.base.dialogs/.classpath

r4768	r7238
5	5	<classpathentry kind="src" output="target/test-classes" path="src/test/java"/>
6	6	<classpathentry excluding="**" kind="src" output="target/test-classes" path="src/test/resources"/>
7		~~<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>~~
8	7	<classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
	8	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/jdk1.5.0_21"/>
9	9	<classpathentry kind="output" path="target/classes"/>
10	10	</classpath>

branches/private/pav/NEW_JAVA_5/sophie2-platform/modules/org.sophie2.base.dialogs/.settings/org.eclipse.jdt.core.prefs

r115	r7238
1		#~~Thu Sep 18 21:11:04 EEST 2008~~
	1	#Mon Oct 05 13:36:45 AFT 2009
2	2	eclipse.preferences.version=1
3	3	org.eclipse.jdt.core.builder.cleanOutputFolder=clean
…	…
18	18	org.eclipse.jdt.core.codeComplete.staticFieldSuffixes=
19	19	org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
20		org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
	20	org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
21	21	org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
22		org.eclipse.jdt.core.compiler.compliance=1.6
	22	org.eclipse.jdt.core.compiler.compliance=1.5
23	23	org.eclipse.jdt.core.compiler.debug.lineNumber=generate
24	24	org.eclipse.jdt.core.compiler.debug.localVariable=generate
…	…
97	97	org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
98	98	org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
99		org.eclipse.jdt.core.compiler.source=1.6
	99	org.eclipse.jdt.core.compiler.source=1.5
100	100	org.eclipse.jdt.core.compiler.taskCaseSensitive=enabled
101	101	org.eclipse.jdt.core.compiler.taskPriorities=NORMAL,HIGH,NORMAL

branches/private/pav/NEW_JAVA_5/sophie2-platform/modules/org.sophie2.base.dialogs/src/main/java/org/sophie2/base/dialogs/TestingDialogManager.java

r114	r7238
1	1	package org.sophie2.base.dialogs;
2	2
3		~~import java.util.ArrayDeque;~~
4	3	import java.util.Queue;
5	4
6		import org.sophie2.~~base.dialogs.DialogInput~~;
	5	import org.sophie2.core.prolib.util.Stack;
7	6
8	7	/**
…	…
74	73	* The queue of expected dialogs (package visible for testing).
75	74	*/
76		Queue<Expected> expected = new ~~ArrayDeque~~<Expected>();
	75	Queue<Expected> expected = new Stack.StackImpl<Expected>();
77	76
78	77	/**

branches/private/pav/NEW_JAVA_5/sophie2-platform/modules/org.sophie2.base.dialogs/src/test/java/org/sophie2/base/dialogs/DialogManagerTest.java

r5668	r7238
56	56	}
57	57
58		~~@Override~~
59	58	public boolean like(DialogInput<?> input) {
60	59	if (input instanceof KindMockDialog.Input) {

branches/private/pav/NEW_JAVA_5/sophie2-platform/modules/org.sophie2.base.dnd/.classpath

r2819	r7238
5	5	<classpathentry kind="src" output="target/test-classes" path="src/test/java"/>
6	6	<classpathentry excluding="**" kind="src" output="target/test-classes" path="src/test/resources"/>
7		~~<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>~~
8	7	<classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
	8	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/jdk1.5.0_21"/>
9	9	<classpathentry kind="output" path="target/classes"/>
10	10	</classpath>

branches/private/pav/NEW_JAVA_5/sophie2-platform/modules/org.sophie2.base.dnd/.settings/org.eclipse.jdt.core.prefs

r2928	r7238
1		#~~Thu Sep 18 21:11:04 EEST 2008~~
	1	#Mon Oct 05 13:36:51 AFT 2009
2	2	eclipse.preferences.version=1
3	3	org.eclipse.jdt.core.builder.cleanOutputFolder=clean
…	…
18	18	org.eclipse.jdt.core.codeComplete.staticFieldSuffixes=
19	19	org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
20		org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
	20	org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
21	21	org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
22		org.eclipse.jdt.core.compiler.compliance=1.6
	22	org.eclipse.jdt.core.compiler.compliance=1.5
23	23	org.eclipse.jdt.core.compiler.debug.lineNumber=generate
24	24	org.eclipse.jdt.core.compiler.debug.localVariable=generate
…	…
97	97	org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
98	98	org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
99		org.eclipse.jdt.core.compiler.source=1.6
	99	org.eclipse.jdt.core.compiler.source=1.5
100	100	org.eclipse.jdt.core.compiler.taskCaseSensitive=enabled
101	101	org.eclipse.jdt.core.compiler.taskPriorities=NORMAL,HIGH,NORMAL

branches/private/pav/NEW_JAVA_5/sophie2-platform/modules/org.sophie2.base.dnd/src/main/java/org/sophie2/base/dnd/AwtTransferable.java

r4453	r7238
29	29	}
30	30
31		~~@Override~~
32	31	public Transferable getAwtTransferable() {
33	32	return this.transferable;

branches/private/pav/NEW_JAVA_5/sophie2-platform/modules/org.sophie2.base.dnd/src/main/java/org/sophie2/base/dnd/BaseDndTransferable.java

r6410	r7238
15	15	public abstract class BaseDndTransferable implements DndTransferable {
16	16
17		~~@Override~~
18	17	public boolean isDndDataSupported(Class<? extends DndData> type) {
19	18	for (DndData data : getDataList()) {
…	…
26	25	}
27	26
28		~~@Override~~
29	27	public <T extends DndData> T getDndData(Class<T> type) {
30	28	for (DndData data : getDataList()) {
…	…
38	36	private List<DndData> dndDataList = null;
39	37
40		~~@Override~~
41	38	public List<DndData> getDataList() {
42	39	if (this.dndDataList == null) {

branches/private/pav/NEW_JAVA_5/sophie2-platform/modules/org.sophie2.base.dnd/src/main/java/org/sophie2/base/dnd/ClipboardManager.java

r6508	r7238
72	72	}
73	73
74		~~@Override~~
75	74	public void lostOwnership(Clipboard clipboard, Transferable oldContents) {
76	75	// do nothing. The operation of releasing the DnDTransferable

branches/private/pav/NEW_JAVA_5/sophie2-platform/modules/org.sophie2.base.dnd/src/main/java/org/sophie2/base/dnd/dnddata/ImageData.java

r6405	r7238
53	53	public static class ImageDndProvider implements DndProvider {
54	54
55		~~@Override~~
56	55	public DndData createDndData(final AwtTransferable awtTransferable) {
57	56	return new ImageData(awtTransferable) {
…	…
64	63	}
65	64
66		~~@Override~~
67	65	public Class<? extends DndData> getProvidedData() {
68	66	return ImageData.class;
69	67	}
70	68
71		~~@Override~~
72	69	public DataFlavor getSupportedFlavor() {
73	70	return FLAVOR;

branches/private/pav/NEW_JAVA_5/sophie2-platform/modules/org.sophie2.base.dnd/src/main/java/org/sophie2/base/dnd/dnddata/StringData.java

r6405	r7238
57	57	public static class StringDndProvider implements DndProvider {
58	58
59		~~@Override~~
60	59	public DndData createDndData(final AwtTransferable awtTransferable) {
61	60	return new StringData(awtTransferable) {
…	…
68	67	}
69	68
70		~~@Override~~
71	69	public Class<? extends DndData> getProvidedData() {
72	70	return StringData.class;
73	71	}
74	72
75		~~@Override~~
76	73	public DataFlavor getSupportedFlavor() {
77	74	return FLAVOR;

branches/private/pav/NEW_JAVA_5/sophie2-platform/modules/org.sophie2.base.dnd/src/main/java/org/sophie2/base/dnd/SophieDragDropHandler.java

r6433	r7238
263	263	}
264	264
265		~~@Override~~
266	265	public void dragGestureRecognized(DragGestureEvent dge) {
267	266
…	…
285	284	}
286	285
287		~~@Override~~
288	286	public void dragDropEnd(DragSourceDropEvent dsde) {
289	287	// nothing
290	288	}
291	289
292		~~@Override~~
293	290	public void dragEnter(DragSourceDragEvent dsde) {
294	291	// nothing
295	292	}
296	293
297		~~@Override~~
298	294	public void dragExit(DragSourceEvent dse) {
299	295	// nothing
…	…
301	297	}
302	298
303		~~@Override~~
304	299	public void dragOver(DragSourceDragEvent dsde) {
305	300	// nothing
…	…
307	302	}
308	303
309		~~@Override~~
310	304	public void dropActionChanged(DragSourceDragEvent dsde) {
311	305	// nothing
…	…
313	307	}
314	308
315		~~@Override~~
316	309	public void dragEnter(DropTargetDragEvent dtde) {
317	310	// nothing
318	311	}
319	312
320		~~@Override~~
321	313	public void dragExit(DropTargetEvent dte) {
322	314	// nothing
…	…
324	316	}
325	317
326		~~@Override~~
327	318	public void dragOver(DropTargetDragEvent dtde) {
328	319
…	…
346	337	}
347	338
348		~~@Override~~
349	339	public void drop(DropTargetDropEvent dtde) {
350	340
…	…
366	356	}
367	357
368		~~@Override~~
369	358	public void dropActionChanged(DropTargetDragEvent dtde) {
370	359	// nothing

branches/private/pav/NEW_JAVA_5/sophie2-platform/modules/org.sophie2.base.dnd/src/main/java/org/sophie2/base/dnd/SophieTransferable.java

r4453	r7238
14	14	public abstract class SophieTransferable extends BaseDndTransferable {
15	15
16		~~@Override~~
17	16	public Transferable getAwtTransferable() {
18	17	return new Transferable() {
19	18
20		~~@Override~~
21	19	public boolean isDataFlavorSupported(DataFlavor flavor) {
22	20	for (DndData data : getDataList()) {
…	…
29	27	}
30	28
31		~~@Override~~
32	29	public DataFlavor[] getTransferDataFlavors() {
33	30
…	…
42	39	}
43	40
44		~~@Override~~
45	41	public Object getTransferData(DataFlavor flavor)
46	42	throws UnsupportedFlavorException, IOException {

branches/private/pav/NEW_JAVA_5/sophie2-platform/modules/org.sophie2.base.dnd/src/main/java/org/sophie2/base/dnd/util/DataFlavorRecognizer.java

r4453	r7238
5	5	import java.awt.Toolkit;
6	6	import java.awt.datatransfer.DataFlavor;
	7	import java.awt.datatransfer.Transferable;
7	8	import java.awt.event.ActionEvent;
8	9	import java.awt.event.ActionListener;
9	10	import java.awt.event.KeyEvent;
	11	import java.io.InputStream;
10	12
	13	import javax.swing.JComponent;
11	14	import javax.swing.JFrame;
12	15	import javax.swing.JScrollPane;
…	…
15	18	import javax.swing.ScrollPaneConstants;
16	19	import javax.swing.TransferHandler;
	20
	21	import org.sophie2.base.commons.util.BinData;
17	22
18	23	/**
…	…
73	78
74	79	@Override
75		public boolean canImport(TransferSupport support) {
	80	public boolean canImport(JComponent comp,
	81	DataFlavor[] transferFlavors) {
76	82	return true;
77	83	}
78	84
79	85	@Override
80		public boolean importData(~~TransferSupport suppor~~t) {
81		DataFlavor flavors[] = ~~support.get~~DataFlavors();
	86	public boolean importData(JComponent comp, Transferable t) {
	87	DataFlavor flavors[] = t.getTransferDataFlavors();
82	88
83	89	StringBuilder stringBuilder = new StringBuilder();
84	90
85	91	for (DataFlavor flavor : flavors) {
86		stringBuilder.append(flavor.toString() + "\n");
	92	stringBuilder.append(" --" + flavor.toString() + "\n");
	93	try {
	94	Object data = t.getTransferData(flavor);
	95	stringBuilder.append(data + "\n");
	96	if(data instanceof InputStream) {
	97	BinData bin = new BinData((InputStream)data);
	98	stringBuilder.append(new String(bin.getBytes(), "utf8") + "\n");
	99	stringBuilder.append(new String(bin.getBytes(), "utf16") + "\n");
	100	}
	101	if(data instanceof byte[]) {
	102	byte[] bin = (byte[])data;
	103	stringBuilder.append(new String(bin, "utf8") + "\n");
	104	stringBuilder.append(new String(bin, "UTF-16LE") + "\n");
	105	stringBuilder.append(new String(bin, "UTF-16BE") + "\n");
	106	}
	107	} catch (Exception e) {
	108	stringBuilder.append(e + "\n");
	109	}
	110	stringBuilder.append("\n\n");
87	111	}
88	112
89	113	textArea.setText(new String(stringBuilder));
	114	System.out.println(stringBuilder);
90	115
91	116	return true;
…	…
99	124	textArea.registerKeyboardAction(new ActionListener() {
100	125
101		~~@Override~~
102	126	public void actionPerformed(ActionEvent e) {
103	127	DataFlavor flavors[] =

branches/private/pav/NEW_JAVA_5/sophie2-platform/modules/org.sophie2.base.dnd/src/test/java/org/sophie2/base/dnd/AwtTransferableTest.java

r3966	r7238
37	37	this.transferable = new AwtTransferable(new Transferable() {
38	38
39		~~@Override~~
40	39	public boolean isDataFlavorSupported(DataFlavor flavor) {
41	40	if (flavor.equals(DataFlavor.stringFlavor)) {
…	…
48	47	}
49	48
50		~~@Override~~
51	49	public DataFlavor[] getTransferDataFlavors() {
52	50
…	…
56	54
57	55	@SuppressWarnings("synthetic-access")
58		~~@Override~~
59	56	public Object getTransferData(DataFlavor flavor)
60	57	throws UnsupportedFlavorException, IOException {

branches/private/pav/NEW_JAVA_5/sophie2-platform/modules/org.sophie2.base.dnd/src/test/java/org/sophie2/base/dnd/BaseDndTransferableTest.java

r5668	r7238
60	60	}
61	61
62		~~@Override~~
63	62	public Transferable getAwtTransferable() {
64	63	return new Transferable() {
65	64
66		~~@Override~~
67	65	public boolean isDataFlavorSupported(DataFlavor flavor) {
68	66	return false;
69	67	}
70	68
71		~~@Override~~
72	69	public DataFlavor[] getTransferDataFlavors() {
73	70	return null;
74	71	}
75	72
76		~~@Override~~
77	73	public Object getTransferData(DataFlavor flavor)
78	74	throws UnsupportedFlavorException, IOException {

branches/private/pav/NEW_JAVA_5/sophie2-platform/modules/org.sophie2.base.dnd/src/test/java/org/sophie2/base/dnd/ClipboardManagerTest.java

r6405	r7238
35	35
36	36	@SuppressWarnings("synthetic-access")
37		~~@Override~~
38	37	public Object getTransferData(DataFlavor flavor)
39	38	throws UnsupportedFlavorException, IOException {
…	…
46	45	}
47	46
48		~~@Override~~
49	47	public DataFlavor[] getTransferDataFlavors() {
50	48	return new DataFlavor[] { DataFlavor.stringFlavor };
51	49	}
52	50
53		~~@Override~~
54	51	public boolean isDataFlavorSupported(DataFlavor flavor) {
55	52	if (flavor.equals(DataFlavor.stringFlavor)) {

branches/private/pav/NEW_JAVA_5/sophie2-platform/modules/org.sophie2.base.dnd/src/test/java/org/sophie2/base/dnd/DndDataTest.java

r3966	r7238
51	51	public static class DummyDndTransferable implements DndTransferable {
52	52
53		~~@Override~~
54	53	public Transferable getAwtTransferable() {
55	54	return null;
56	55	}
57	56
58		~~@Override~~
59	57	public List<DndData> getDataList() {
60	58	return null;
61	59	}
62	60
63		~~@Override~~
64	61	public <T extends DndData> T getDndData(Class<T> dataClass) {
65	62	return null;
66	63	}
67	64
68		~~@Override~~
69	65	public boolean isDndDataSupported(Class<? extends DndData> type) {
70	66	return false;
…	…
146	142	AwtTransferable transferable = new AwtTransferable(new Transferable() {
147	143
148		~~@Override~~
149	144	public boolean isDataFlavorSupported(DataFlavor flavor) {
150	145	return false;
151	146	}
152	147
153		~~@Override~~
154	148	public DataFlavor[] getTransferDataFlavors() {
155	149	return null;
156	150	}
157	151
158		~~@Override~~
159	152	public Object getTransferData(DataFlavor flavor)
160	153	throws UnsupportedFlavorException, IOException {
…	…
189	182	this.dndData = new DummyDndData(new AwtTransferable(new Transferable() {
190	183
191		~~@Override~~
192	184	public boolean isDataFlavorSupported(DataFlavor flavor) {
193	185
…	…
199	191	}
200	192
201		~~@Override~~
202	193	public DataFlavor[] getTransferDataFlavors() {
203	194	return new DataFlavor[] {DataFlavor.stringFlavor};
204	195	}
205	196
206		~~@Override~~
207	197	public Object getTransferData(DataFlavor flavor)
208	198	throws UnsupportedFlavorException, IOException {

branches/private/pav/NEW_JAVA_5/sophie2-platform/modules/org.sophie2.base.dnd/src/test/java/org/sophie2/base/dnd/StringDndDataTest.java

r3966	r7238
22	22	private final static AwtTransferable AWT_DND_TRANSFERABLE = new AwtTransferable(new Transferable() {
23	23
24		~~@Override~~
25	24	public boolean isDataFlavorSupported(DataFlavor flavor) {
26	25
…	…
32	31	}
33	32
34		~~@Override~~
35	33	public DataFlavor[] getTransferDataFlavors() {
36	34	return new DataFlavor[]{DataFlavor.stringFlavor};
37	35	}
38	36
39		~~@Override~~
40	37	public Object getTransferData(DataFlavor flavor)
41	38	throws UnsupportedFlavorException, IOException {

branches/private/pav/NEW_JAVA_5/sophie2-platform/modules/org.sophie2.base.halos/.classpath

r963	r7238
5	5	<classpathentry kind="src" output="target/test-classes" path="src/test/java"/>
6	6	<classpathentry excluding="**" kind="src" output="target/test-classes" path="src/test/resources"/>
7		~~<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>~~
8	7	<classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
	8	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/jdk1.5.0_21"/>
9	9	<classpathentry kind="output" path="target/classes"/>
10	10	</classpath>

branches/private/pav/NEW_JAVA_5/sophie2-platform/modules/org.sophie2.base.halos/.settings/org.eclipse.jdt.core.prefs

r963	r7238
1		#~~Thu Sep 18 21:11:04 EEST 2008~~
	1	#Mon Oct 05 13:36:58 AFT 2009
2	2	eclipse.preferences.version=1
3	3	org.eclipse.jdt.core.builder.cleanOutputFolder=clean
…	…
18	18	org.eclipse.jdt.core.codeComplete.staticFieldSuffixes=
19	19	org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
20		org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
	20	org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
21	21	org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
22		org.eclipse.jdt.core.compiler.compliance=1.6
	22	org.eclipse.jdt.core.compiler.compliance=1.5
23	23	org.eclipse.jdt.core.compiler.debug.lineNumber=generate
24	24	org.eclipse.jdt.core.compiler.debug.localVariable=generate
…	…
97	97	org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
98	98	org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
99		org.eclipse.jdt.core.compiler.source=1.6
	99	org.eclipse.jdt.core.compiler.source=1.5
100	100	org.eclipse.jdt.core.compiler.taskCaseSensitive=enabled
101	101	org.eclipse.jdt.core.compiler.taskPriorities=NORMAL,HIGH,NORMAL

branches/private/pav/NEW_JAVA_5/sophie2-platform/modules/org.sophie2.base.halos/src/main/java/org/sophie2/base/halos/HaloButton.java

r6690	r7238
103	103
104	104	@SuppressWarnings("synthetic-access")
105		~~@Override~~
106	105	public Prop<JButton> swingComponent() {
107	106	class swingComponent extends ResourceProperty<JButton> {
…	…
112	111	res.addActionListener(new ActionListener() {
113	112
114		~~@Override~~
115	113	public void actionPerformed(final ActionEvent e) {
116	114	res.setSelected(!res.isSelected());
…	…
121	119	res.addMouseListener(new MouseListener() {
122	120
123		~~@Override~~
124	121	public void mouseClicked(MouseEvent arg0) {
125	122	if(res.isSelected()) {
…	…
130	127	}
131	128
132		~~@Override~~
133	129	public void mouseEntered(MouseEvent arg0) {
134	130	LogicR3.fire(new EventR3(HaloButton.this, null, null, null, EventIds.HALO_MOUSE_OVER));
…	…
136	132	}
137	133
138		~~@Override~~
139	134	public void mouseExited(MouseEvent arg0) {
140	135	LogicR3.fire(new EventR3(HaloButton.this, null, null, null, EventIds.HALO_MOUSE_EXITED));
…	…
146	141	}
147	142
148		~~@Override~~
149	143	public void mousePressed(MouseEvent arg0) {
150	144	setUpSize(IconId.PRESSED);
151	145	}
152	146
153		~~@Override~~
154	147	public void mouseReleased(MouseEvent arg0) {
155	148	setUpSize(IconId.DEFAULT);

branches/private/pav/NEW_JAVA_5/sophie2-platform/modules/org.sophie2.base.halos/src/main/java/org/sophie2/base/halos/HudDialog.java

r6206	r7238
66	66	private static final int HGAP = 5;
67	67
68		~~@Override~~
69	68	public final Prop<JPanel> swingComponent() {
70	69	class swingComponent extends ResourceProperty<JPanel> {
…	…
375	374	ON_SHOW_EXTENSION {
376	375
377		~~@Override~~
378	376	public void defineFilter(EventFilterBuilder filter) {
379	377	filter.setSourceClass(HudDialog.class);
…	…
381	379	}
382	380
383		~~@Override~~
384	381	public boolean handle(EventR3 event) {
385	382	HudDialog source = event.getSource(HudDialog.class);
…	…
397	394	ON_HIDE_EXTENSION {
398	395
399		~~@Override~~
400	396	public void defineFilter(EventFilterBuilder filter) {
401	397	filter.setSourceClass(HudDialog.class);
…	…
403	399	}
404	400
405		~~@Override~~
406	401	public boolean handle(EventR3 event) {
407	402	HudDialog source = event.getSource(HudDialog.class);

branches/private/pav/NEW_JAVA_5/sophie2-platform/modules/org.sophie2.base.halos/src/main/java/org/sophie2/base/halos/HudHaloButton.java

r5371	r7238
70	70	ON_HALO_CLICK {
71	71
72		~~@Override~~
73	72	public void defineFilter(EventFilterBuilder filter) {
74	73	filter.setSourceClass(HudHaloButton.class);
…	…
76	75	}
77	76
78		~~@Override~~
79	77	public boolean handle(EventR3 event) {
80	78	HudHaloButton halo = event.getSource(HudHaloButton.class);

branches/private/pav/NEW_JAVA_5/sophie2-platform/modules/org.sophie2.base.halos/src/main/java/org/sophie2/base/halos/MoveHaloButton.java

r4922	r7238
29	29	MouseListener res = new MouseListener() {
30	30
31		~~@Override~~
32	31	public void mouseReleased(MouseEvent e) {
33	32	//empty
34
35	33	}
36	34
37		~~@Override~~
38	35	public void mousePressed(MouseEvent e) {
39	36	captureClick(e);
40	37	}
41	38
42		~~@Override~~
43	39	public void mouseExited(MouseEvent e) {
44	40	//do nothing
45	41	}
46	42
47		~~@Override~~
48	43	public void mouseEntered(MouseEvent e) {
49	44	//do nothing
50	45	}
51	46
52		~~@Override~~
53	47	public void mouseClicked(MouseEvent e) {
54	48	//do nothing

branches/private/pav/NEW_JAVA_5/sophie2-platform/modules/org.sophie2.base.halos/src/test/java/org/sophie2/base/halos/HalosDemo.java

r7002	r7238
148	148	res.addComponentListener(new ComponentListener() {
149	149
150		~~@Override~~
151	150	public void componentShown(ComponentEvent e) {
152	151	// nothing.
153	152	}
154	153
155		~~@Override~~
156	154	public void componentResized(ComponentEvent e) {
157	155	// nothing.
…	…
160	158
161	159	@SuppressWarnings("synthetic-access")
162		~~@Override~~
163	160	public void componentMoved(ComponentEvent e) {
164	161	Point componentLocation = swingComponentToUseForDemo()
…	…
172	169	}
173	170
174		~~@Override~~
175	171	public void componentHidden(ComponentEvent e) {
176	172	// nothing.
…	…
512	508	ON_SWITCH_HALO_CLICK {
513	509
514		~~@Override~~
515	510	public void defineFilter(EventFilterBuilder filter) {
516	511	filter.setSourceClass(DemoSwitchHaloButton.class);
…	…
518	513	}
519	514
520		~~@Override~~
521	515	public boolean handle(EventR3 event) {
522	516	DemoSwitchHaloButton halo = event.getSource(DemoSwitchHaloButton.class);
…	…
542	536	ON_CLICK_HALO_CLICK {
543	537
544		~~@Override~~
545	538	public void defineFilter(EventFilterBuilder filter) {
546	539	filter.setSourceClass(DemoClickHaloButton.class);
…	…
548	541	}
549	542
550		~~@Override~~
551	543	public boolean handle(EventR3 event) {
552	544	SophieLog.debug("User clicked the DemoClickHaloButton.");

branches/private/pav/NEW_JAVA_5/sophie2-platform/modules/org.sophie2.base.halos/src/test/java/org/sophie2/base/halos/HudDialogTest.java

r4922	r7238
75	75	static class DummyPanel1 extends BaseSwingVisualElement {
76	76
77		~~@Override~~
78	77	public Prop<JPanel> swingComponent() {
79	78	class swingComponent extends ResourceProperty<JPanel> {
…	…
107	106	static class DummyPanel2 extends BaseSwingVisualElement {
108	107
109		~~@Override~~
110	108	public Prop<JPanel> swingComponent() {
111	109	class swingComponent extends ResourceProperty<JPanel> {

branches/private/pav/NEW_JAVA_5/sophie2-platform/modules/org.sophie2.base.halos/src/test/java/org/sophie2/base/halos/SwitchHaloButtonTest.java

r6518	r7238
140	140	ON_HALO_CLICK {
141	141
142		~~@Override~~
143	142	public void defineFilter(EventFilterBuilder filter) {
144	143	filter.setSourceClass(DummySwitchHaloButton.class);
…	…
146	145	}
147	146
148		~~@Override~~
149	147	public boolean handle(EventR3 event) {
150	148	DummySwitchHaloButton halo = event.getSource(DummySwitchHaloButton.class);

branches/private/pav/NEW_JAVA_5/sophie2-platform/modules/org.sophie2.base.layout/.classpath

r366	r7238
5	5	<classpathentry kind="src" output="target/test-classes" path="src/test/java"/>
6	6	<classpathentry excluding="**" kind="src" output="target/test-classes" path="src/test/resources"/>
7		~~<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>~~
8	7	<classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
	8	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/jdk1.5.0_21"/>
9	9	<classpathentry kind="output" path="target/classes"/>
10	10	</classpath>

branches/private/pav/NEW_JAVA_5/sophie2-platform/modules/org.sophie2.base.layout/.settings/org.eclipse.jdt.core.prefs

r115	r7238
1		#~~Thu Sep 18 21:11:04 EEST 2008~~
	1	#Mon Oct 05 13:37:03 AFT 2009
2	2	eclipse.preferences.version=1
3	3	org.eclipse.jdt.core.builder.cleanOutputFolder=clean
…	…
18	18	org.eclipse.jdt.core.codeComplete.staticFieldSuffixes=
19	19	org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
20		org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
	20	org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
21	21	org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
22		org.eclipse.jdt.core.compiler.compliance=1.6
	22	org.eclipse.jdt.core.compiler.compliance=1.5
23	23	org.eclipse.jdt.core.compiler.debug.lineNumber=generate
24	24	org.eclipse.jdt.core.compiler.debug.localVariable=generate
…	…
97	97	org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
98	98	org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
99		org.eclipse.jdt.core.compiler.source=1.6
	99	org.eclipse.jdt.core.compiler.source=1.5
100	100	org.eclipse.jdt.core.compiler.taskCaseSensitive=enabled
101	101	org.eclipse.jdt.core.compiler.taskPriorities=NORMAL,HIGH,NORMAL

branches/private/pav/NEW_JAVA_5/sophie2-platform/modules/org.sophie2.base.layout/src/main/java/org/sophie2/base/layout/impl/BaseLayoutEngine.java

r6284	r7238
21	21
22	22	@Own
23		~~@Override~~
24	23	public RwListProp<MainWindow> mainWindows() {
25	24	return getBean().makeListProp("mainWindows", MainWindow.class);

branches/private/pav/NEW_JAVA_5/sophie2-platform/modules/org.sophie2.base.layout/src/main/java/org/sophie2/base/layout/impl/DefaultDocView.java

r6473	r7238
77	77	* resource.
78	78	*/
79		~~@Override~~
80	79	public final Prop<JPanel> swingComponent() {
81	80	class swingComponent extends ResourceProperty<JPanel> {
…	…
86	85	res.addComponentListener(new ComponentListener() {
87	86
88		~~@Override~~
89	87	public void componentHidden(ComponentEvent e) {
90	88	// nothing for now
91	89	}
92	90
93		~~@Override~~
94	91	public void componentMoved(ComponentEvent e) {
95	92	// nothing for now
96	93	}
97	94
98		~~@Override~~
99	95	public void componentResized(ComponentEvent e) {
100	96	EventR3 ev = new EventR3(DefaultDocView.this, null, null,
…	…
103	99	}
104	100
105		~~@Override~~
106	101	public void componentShown(ComponentEvent e) {
107	102	// nothing for now
…	…
181	176	}
182	177
183		~~@Override~~
184	178	public Prop<ImmImage> documentIcon() {
185	179	class documentIcon extends AutoProperty<ImmImage> {

branches/private/pav/NEW_JAVA_5/sophie2-platform/modules/org.sophie2.base.layout/src/main/java/org/sophie2/base/layout/impl/DefaultMainWindow.java

r6310	r7238
65	65	public static final String LOOK_AND_FEEL_ID = "LookAndFeel";
66	66
67		~~@Override~~
68	67	@Own
69	68	public Prop<? extends Flap> leftFlap() {
…	…
81	80	}
82	81
83		~~@Override~~
84	82	@Own
85	83	public Prop<? extends Flap> rightFlap() {
…	…
97	95	}
98	96
99		~~@Override~~
100	97	@Own
101	98	public Prop<? extends Flap> bottomFlap() {
…	…
114	111	}
115	112
116		~~@Override~~
117	113	@Own
118	114	public Prop<? extends MenuBar> menuBar() {
…	…
129	125	}
130	126
131		~~@Override~~
132	127	@Own
133	128	public Prop<TabBar> tabBar() {
…	…
145	140	}
146	141
147		~~@Override~~
148	142	public RwProp<MainWindowOptions> mainWindowOptions() {
149	143	return getBean().makeValueProp("mainWindowOptions", MainWindowOptions.class,
…	…
151	145	}
152	146
153		~~@Override~~
154	147	@Own
155	148	public RwListProp<DocView> documents() {
…	…
157	150	}
158	151
159		~~@Override~~
160	152	public RwProp<DocView> currentDocument() {
161	153	return getBean().makeValueProp("currentDocument", DocView.class, null);
162	154	}
163	155
164		~~@Override~~
165	156	@Own
166	157	public RwProp<DocView> desktopDocument() {

branches/private/pav/NEW_JAVA_5/sophie2-platform/modules/org.sophie2.base.layout/src/main/java/org/sophie2/base/layout/model/ListPalette.java

r6690	r7238
281	281	res.addKeyListener(new KeyListener() {
282	282
283		~~@Override~~
284	283	public void keyPressed(KeyEvent e) {
285	284
…	…
291	290	}
292	291
293		~~@Override~~
294	292	public void keyReleased(KeyEvent e) {
295	293	// nothing
296	294	}
297	295
298		~~@Override~~
299	296	public void keyTyped(KeyEvent e) {
300	297	// nothing
…	…
305	302	res.getSelectionModel().addListSelectionListener(new ListSelectionListener() {
306	303
307		~~@Override~~
308	304	public void valueChanged(ListSelectionEvent ev) {
309	305	ListSelectionModel lsm = (ListSelectionModel) ev.getSource();
…	…
354	350	private static final ProListFilter<Object> acceptingFilter = new ProListFilter<Object>() {
355	351
356		~~@Override~~
357	352	public boolean accepts(Object item) {
358	353	return true;

branches/private/pav/NEW_JAVA_5/sophie2-platform/modules/org.sophie2.base.layout/src/main/java/org/sophie2/base/layout/testing/DummyDocumentView.java

r6508	r7238
17	17	public class DummyDocumentView extends BaseProObject implements DocView {
18	18
19		~~@Override~~
20	19	public RwProp<String> title() {
21	20	return getBean().makeValueProp("title", String.class, "DummyDocumentView");
22	21	}
23	22
24		~~@Override~~
25	23	public RwProp<String> toolTip() {
26	24	return getBean().makeValueProp("toolTip", String.class, "DummyDocumentView");
27	25	}
28	26
29		~~@Override~~
30	27	public Prop<JDesktopPane> swingComponent() {
31	28	class swingComponent extends ResourceProperty<JDesktopPane> {
…	…
50	47	}
51	48
52		~~@Override~~
53	49	public Prop<DummyMainWindow> parent() {
54	50	return getBean().makeParentProp(DummyMainWindow.class);
55	51	}
56	52
57		~~@Override~~
58	53	public Prop<ImmImage> documentIcon() {
59	54	return getBean().makeValueProp("documentIcon", ImmImage.class, ImmImage.DUMMY_IMAGE);

branches/private/pav/NEW_JAVA_5/sophie2-platform/modules/org.sophie2.base.layout/src/main/java/org/sophie2/base/layout/testing/DummyMainWindow.java

r5960	r7238
31	31
32	32
33		~~@Override~~
34	33	public RwProp<Flap> leftFlap() {
35	34	return getBean().makeValueProp("leftFlap", Flap.class);
36	35	}
37	36
38		~~@Override~~
39	37	public RwProp<Flap> rightFlap() {
40	38	return getBean().makeValueProp("rightFlap", Flap.class);
41	39	}
42	40
43		~~@Override~~
44	41	public RwProp<Flap> bottomFlap() {
45	42	return getBean().makeValueProp("bottomFlap", Flap.class);
46	43	}
47	44
48		~~@Override~~
49	45	public RwProp<MenuBar> menuBar() {
50	46	return getBean().makeValueProp("menuBar", MenuBar.class);
51	47	}
52	48
53		~~@Override~~
54	49	public RwProp<TabBar> tabBar() {
55	50	return getBean().makeValueProp("tabBar", TabBar.class);
56	51	}
57	52
58		~~@Override~~
59	53	public RwProp<MainWindowOptions> mainWindowOptions() {
60	54	return getBean().makeValueProp("mainWindowOptions", MainWindowOptions.class);
61	55	}
62	56
63		~~@Override~~
64	57	public RwListProp<DocView> documents() {
65	58	return getBean().makeListProp("documents", DocView.class);
66	59	}
67	60
68		~~@Override~~
69	61	public RwProp<DocView> currentDocument() {
70	62	return getBean().makeValueProp("currentDocument", DocView.class);
71	63	}
72	64
73		~~@Override~~
74	65	public RwProp<DocView> desktopDocument() {
75	66	return getBean().makeValueProp("desktopDocument", DocView.class);

branches/private/pav/NEW_JAVA_5/sophie2-platform/modules/org.sophie2.base.layout/src/main/java/org/sophie2/base/layout/testing/DummyTabBar.java

r2624	r7238
17	17	public class DummyTabBar extends TabBar {
18	18
19		~~@Override~~
20	19	public Prop<JPanel> swingComponent() {
21	20	class swingComponent extends AutoProperty<JPanel> {

branches/private/pav/NEW_JAVA_5/sophie2-platform/modules/org.sophie2.base.media/.classpath

r1877	r7238
5	5	<classpathentry kind="src" output="target/test-classes" path="src/test/java"/>
6	6	<classpathentry excluding="**" kind="src" output="target/test-classes" path="src/test/resources"/>
7		<classpathentry kind="con"
8		path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6" />
9		<classpathentry kind="con"
10		path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER" />
11		<classpathentry kind="output" path="target/classes" />
	7	<classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
	8	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/jdk1.5.0_21"/>
	9	<classpathentry kind="output" path="target/classes"/>
12	10	</classpath>

branches/private/pav/NEW_JAVA_5/sophie2-platform/modules/org.sophie2.base.media/.settings/org.eclipse.jdt.core.prefs

r1877	r7238
1		#~~Thu Sep 18 21:11:04 EEST 2008~~
	1	#Mon Oct 05 13:37:09 AFT 2009
2	2	eclipse.preferences.version=1
3	3	org.eclipse.jdt.core.builder.cleanOutputFolder=clean
…	…
18	18	org.eclipse.jdt.core.codeComplete.staticFieldSuffixes=
19	19	org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
20		org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
	20	org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
21	21	org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
22		org.eclipse.jdt.core.compiler.compliance=1.6
	22	org.eclipse.jdt.core.compiler.compliance=1.5
23	23	org.eclipse.jdt.core.compiler.debug.lineNumber=generate
24	24	org.eclipse.jdt.core.compiler.debug.localVariable=generate
…	…
97	97	org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
98	98	org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
99		org.eclipse.jdt.core.compiler.source=1.6
	99	org.eclipse.jdt.core.compiler.source=1.5
100	100	org.eclipse.jdt.core.compiler.taskCaseSensitive=enabled
101	101	org.eclipse.jdt.core.compiler.taskPriorities=NORMAL,HIGH,NORMAL

branches/private/pav/NEW_JAVA_5/sophie2-platform/modules/org.sophie2.base.media/src/main/java/org/sophie2/base/media/TimePos.java

r6933	r7238
161	161	}
162	162
163		~~@Override~~
164	163	public int compareTo(TimePos o) {
165	164	int res = this.getPhase().compareTo(o.getPhase());

branches/private/pav/NEW_JAVA_5/sophie2-platform/modules/org.sophie2.base.menus/.classpath

r1402	r7238
5	5	<classpathentry kind="src" output="target/test-classes" path="src/test/java"/>
6	6	<classpathentry excluding="**" kind="src" output="target/test-classes" path="src/test/resources"/>
7		<classpathentry kind="con"
8		path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6" />
9		<classpathentry kind="con"
10		path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER" />
11		<classpathentry kind="output" path="target/classes" />
	7	<classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
	8	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/jdk1.5.0_21"/>
	9	<classpathentry kind="output" path="target/classes"/>
12	10	</classpath>

branches/private/pav/NEW_JAVA_5/sophie2-platform/modules/org.sophie2.base.menus/.settings/org.eclipse.jdt.core.prefs

r1162	r7238
1		#~~Thu Sep 18 21:11:04 EEST 2008~~
	1	#Mon Oct 05 13:37:15 AFT 2009
2	2	eclipse.preferences.version=1
3	3	org.eclipse.jdt.core.builder.cleanOutputFolder=clean
…	…
18	18	org.eclipse.jdt.core.codeComplete.staticFieldSuffixes=
19	19	org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
20		org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
	20	org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
21	21	org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
22		org.eclipse.jdt.core.compiler.compliance=1.6
	22	org.eclipse.jdt.core.compiler.compliance=1.5
23	23	org.eclipse.jdt.core.compiler.debug.lineNumber=generate
24	24	org.eclipse.jdt.core.compiler.debug.localVariable=generate
…	…
97	97	org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
98	98	org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
99		org.eclipse.jdt.core.compiler.source=1.6
	99	org.eclipse.jdt.core.compiler.source=1.5
100	100	org.eclipse.jdt.core.compiler.taskCaseSensitive=enabled
101	101	org.eclipse.jdt.core.compiler.taskPriorities=NORMAL,HIGH,NORMAL

branches/private/pav/NEW_JAVA_5/sophie2-platform/modules/org.sophie2.base.menus/src/main/java/org/sophie2/base/menus/MenuBar.java

r1876	r7238
56	56	}
57	57
58		~~@Override~~
59	58	@Own
60	59	public ListProp<MenuMember> items() {

branches/private/pav/NEW_JAVA_5/sophie2-platform/modules/org.sophie2.base.menus/src/main/java/org/sophie2/base/menus/MenuItem.java

r5991	r7238
43	43	res.addActionListener(new ActionListener() {
44	44
45		~~@Override~~
46	45	public void actionPerformed(ActionEvent e) {
47	46	clicked();

branches/private/pav/NEW_JAVA_5/sophie2-platform/modules/org.sophie2.base.menus/src/main/java/org/sophie2/base/menus/Menu.java

r2856	r7238
27	27	public static final MenuMember SEPARATOR = null;
28	28
29		~~@Override~~
30	29	@Own
31	30	public ListProp<MenuMember> items() {

branches/private/pav/NEW_JAVA_5/sophie2-platform/modules/org.sophie2.base.menus/src/main/java/org/sophie2/base/menus/testing/DummyMenuItem.java

r5644	r7238
31	31	ON_CLICK {
32	32
33		~~@Override~~
34	33	public void defineFilter(EventFilterBuilder filter) {
35	34	filter.setSourceClass(DummyMenuItem.class);
…	…
37	36	}
38	37
39		~~@Override~~
40	38	public boolean handle(EventR3 event) {
41	39	SophieLog.info("Dummy menu item clicked.");

branches/private/pav/NEW_JAVA_5/sophie2-platform/modules/org.sophie2.base.model.book/.classpath

r334	r7238
5	5	<classpathentry kind="src" output="target/test-classes" path="src/test/java"/>
6	6	<classpathentry excluding="**" kind="src" output="target/test-classes" path="src/test/resources"/>
7		~~<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>~~
8	7	<classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
	8	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/jdk1.5.0_21"/>
9	9	<classpathentry kind="output" path="target/classes"/>
10	10	</classpath>

branches/private/pav/NEW_JAVA_5/sophie2-platform/modules/org.sophie2.base.model.book/.settings/org.eclipse.jdt.core.prefs

r1061	r7238
1		#~~Thu Sep 18 21:11:04 EEST 2008~~
	1	#Mon Oct 05 13:37:24 AFT 2009
2	2	eclipse.preferences.version=1
3	3	org.eclipse.jdt.core.builder.cleanOutputFolder=clean
…	…
18	18	org.eclipse.jdt.core.codeComplete.staticFieldSuffixes=
19	19	org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
20		org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
	20	org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
21	21	org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
22		org.eclipse.jdt.core.compiler.compliance=1.6
	22	org.eclipse.jdt.core.compiler.compliance=1.5
23	23	org.eclipse.jdt.core.compiler.debug.lineNumber=generate
24	24	org.eclipse.jdt.core.compiler.debug.localVariable=generate
…	…
97	97	org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
98	98	org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
99		org.eclipse.jdt.core.compiler.source=1.6
	99	org.eclipse.jdt.core.compiler.source=1.5
100	100	org.eclipse.jdt.core.compiler.taskCaseSensitive=enabled
101	101	org.eclipse.jdt.core.compiler.taskPriorities=NORMAL,HIGH,NORMAL

branches/private/pav/NEW_JAVA_5/sophie2-platform/modules/org.sophie2.base.model.book/src/main/java/org/sophie2/base/model/book/FrameLinkTriggers.java

r6408	r7238
17	17	FRAME_SHOWN {
18	18
19		~~@Override~~
20	19	public String getDescription() {
21	20	return "Frame shows";
…	…
29	28	FRAME_HIDDEN {
30	29
31		~~@Override~~
32	30	public String getDescription() {
33	31	return "Frame hides";
…	…
41	39	FRAME_MOUSE_ENTER {
42	40
43		~~@Override~~
44	41	public String getDescription() {
45	42	return "Mouse enter";
…	…
53	50	FRAME_MOUSE_LEAVE {
54	51
55		~~@Override~~
56	52	public String getDescription() {
57	53	return "Mouse leave";
…	…
66	62	FRAME_MOUSE_DOUBLE_CLICK {
67	63
68		~~@Override~~
69	64	public String getDescription() {
70	65	return "Double click";
…	…
79	74	FRAME_MOUSE_PRESSED {
80	75
81		~~@Override~~
82	76	public String getDescription() {
83	77	return "Frame pressed";
…	…
92	86	FRAME_MOUSE_RELEASED {
93	87
94		~~@Override~~
95	88	public String getDescription() {
96	89	return "Frame released";

branches/private/pav/NEW_JAVA_5/sophie2-platform/modules/org.sophie2.base.model.book/src/main/java/org/sophie2/base/model/book/PageLinkTriggers.java

r6412	r7238
17	17	PAGE_SHOWN {
18	18
19		~~@Override~~
20	19	public String getDescription() {
21	20	return "Page shows";
…	…
29	28	PAGE_HIDDEN {
30	29
31		~~@Override~~
32	30	public String getDescription() {
33	31	return "Page hides";

branches/private/pav/NEW_JAVA_5/sophie2-platform/modules/org.sophie2.base.model.resources.r4/.classpath

r4941	r7238
5	5	<classpathentry kind="src" output="target/test-classes" path="src/test/java"/>
6	6	<classpathentry excluding="**" kind="src" output="target/test-classes" path="src/test/resources"/>
7		<classpathentry kind="con"
8		path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6" />
9		<classpathentry kind="con"
10		path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER" />
11		<classpathentry kind="output" path="target/classes" />
	7	<classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
	8	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/jdk1.5.0_21"/>
	9	<classpathentry kind="output" path="target/classes"/>
12	10	</classpath>

branches/private/pav/NEW_JAVA_5/sophie2-platform/modules/org.sophie2.base.model.resources.r4/.settings/org.eclipse.jdt.core.prefs

r4939	r7238
1		#~~Thu Sep 18 21:11:04 EEST 2008~~
	1	#Mon Oct 05 13:37:31 AFT 2009
2	2	eclipse.preferences.version=1
3	3	org.eclipse.jdt.core.builder.cleanOutputFolder=clean
…	…
18	18	org.eclipse.jdt.core.codeComplete.staticFieldSuffixes=
19	19	org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
20		org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
	20	org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
21	21	org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
22		org.eclipse.jdt.core.compiler.compliance=1.6
	22	org.eclipse.jdt.core.compiler.compliance=1.5
23	23	org.eclipse.jdt.core.compiler.debug.lineNumber=generate
24	24	org.eclipse.jdt.core.compiler.debug.localVariable=generate
…	…
97	97	org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
98	98	org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
99		org.eclipse.jdt.core.compiler.source=1.6
	99	org.eclipse.jdt.core.compiler.source=1.5
100	100	org.eclipse.jdt.core.compiler.taskCaseSensitive=enabled
101	101	org.eclipse.jdt.core.compiler.taskPriorities=NORMAL,HIGH,NORMAL

branches/private/pav/NEW_JAVA_5/sophie2-platform/modules/org.sophie2.base.model.resources.r4/src/main/java/org/sophie2/base/model/resources/r4/access/AppLocator.java

r6291	r7238
27	27	private final AccessOptions accessOptions = AccessOptions.DEFAULT_ACCESS_OPTIONS;
28	28
29		~~@Override~~
30	29	public AccessOptions getAccessOptions() {
31	30	return this.accessOptions;
32	31	}
33	32
34		~~@Override~~
35	33	public ResourceAccess create(ResourceRefR4 target, AccessOptions options,
36	34	ResourceRevision head) {
…	…
57	55	}
58	56
59		~~@Override~~
60	57	public ResourceAccess open(ResourceRefR4 ref, AccessOptions options) {
61	58	assert ref.isAbsolute();
…	…
80	77	}
81	78
82		~~@Override~~
83	79	public void close() {
84	80	throw new UnsupportedOperationException(

branches/private/pav/NEW_JAVA_5/sophie2-platform/modules/org.sophie2.base.model.resources.r4/src/main/java/org/sophie2/base/model/resources/r4/access/BaseLocator.java

r6751	r7238
42	42	new HashMap<CacheKey, MasterTopAccess>();
43	43
44		~~@Override~~
45	44	public ResourceAccess create(ResourceRefR4 target,
46	45	AccessOptions options, ResourceRevision head) {
…	…
53	52	}
54	53
55		~~@Override~~
56	54	public void close() {
57	55	throw new RuntimeException("You should not close the RootAccess!");
58	56	}
59	57
60		~~@Override~~
61	58	public AccessOptions getAccessOptions() {
62	59	return this.accessOptions;
63	60	}
64	61
65		~~@Override~~
66	62	public ResourceAccess open(ResourceRefR4 ref, AccessOptions options) {
67	63	AccessOptions optionsToSet = (options == null) ? getAccessOptions():options;

branches/private/pav/NEW_JAVA_5/sophie2-platform/modules/org.sophie2.base.model.resources.r4/src/main/java/org/sophie2/base/model/resources/r4/access/BaseResourceAccess.java

r6751	r7238
35	35	}
36	36
37		~~@Override~~
38	37	public AccessOptions getAccessOptions() {
39	38	return this.accessOptions;
40	39	}
41	40
42		~~@Override~~
43	41	public ResourceRefR4 getRef() {
44	42	return this.location;

branches/private/pav/NEW_JAVA_5/sophie2-platform/modules/org.sophie2.base.model.resources.r4/src/main/java/org/sophie2/base/model/resources/r4/access/DelegatingAccess.java

r6751	r7238
42	42	}
43	43
44		~~@Override~~
45	44	public ResourceAccess open(ResourceRefR4 ref, AccessOptions options) {
46	45	ResourceRefR4 toOpen = ref;
…	…
53	52	}
54	53
55		~~@Override~~
56	54	public void close() {
57	55	DelegatingAccessCacheKey key =
…	…
64	62	}
65	63
66		~~@Override~~
67	64	public List<Change> syncFromSlave(RevisionId lastSync,
68	65	List<Change> slaveChanges) {
…	…
71	68	}
72	69
73		~~@Override~~
74	70	public <T> T getRaw(Key<T> key) {
75	71	// security
…	…
77	73	}
78	74
79		~~@Override~~
80	75	public void registerChange(Change change) {
81	76	// security
…	…
83	78	}
84	79
85		~~@Override~~
86	80	public ResourceRevision getHead() {
87	81	return this.masterAccess.getHead();

branches/private/pav/NEW_JAVA_5/sophie2-platform/modules/org.sophie2.base.model.resources.r4/src/main/java/org/sophie2/base/model/resources/r4/access/MasterTopAccess.java

r6434	r7238
86	86	}
87	87
88		~~@Override~~
89	88	public ResourceAccess open(ResourceRefR4 ref, AccessOptions options) {
90	89
…	…
117	116	}
118	117
119		~~@Override~~
120	118	public void close() {
121	119	// FIXME This should not be done this way.
…	…
124	122	}
125	123
126		~~@Override~~
127	124	public <T> T getRaw(Key<T> key) {
128	125	if (!this.readAspects.containsKey(key)) {
…	…
137	134
138	135
139		~~@Override~~
140	136	public ResourceRevision getHead() {
141	137	// Track read:
…	…
145	141	}
146	142
147		~~@Override~~
148	143	public void registerChange(Change change) {
149	144	registerChange(change, null);
…	…
202	197
203	198	}
204		~~@Override~~
205	199	public List<Change> syncFromSlave(RevisionId lastSync,
206	200	List<Change> slaveChanges) {

branches/private/pav/NEW_JAVA_5/sophie2-platform/modules/org.sophie2.base.model.resources.r4/src/main/java/org/sophie2/base/model/resources/r4/access/server/ServerLocator.java

r6310	r7238
44	44	}
45	45
46		~~@Override~~
47	46	public ResourceAccess create(ResourceRefR4 target, AccessOptions options,
48	47	ResourceRevision head) {
…	…
65	64	}
66	65
67		~~@Override~~
68	66	public void close() {
69	67	// TODO Auto-generated method stub
70	68	}
71	69
72		~~@Override~~
73	70	public AccessOptions getAccessOptions() {
74	71	return this.accessOptions;
75	72	}
76	73
77		~~@Override~~
78	74	public ResourceAccess open(ResourceRefR4 ref, AccessOptions options) {
79	75	// if already created, return.

branches/private/pav/NEW_JAVA_5/sophie2-platform/modules/org.sophie2.base.model.resources.r4/src/main/java/org/sophie2/base/model/resources/r4/changes/ModelResourceChanger.java

r6751	r7238
84	84
85	85	@SuppressWarnings("unchecked")
86		~~@Override~~
87	86	public <T> T getRaw(Key<T> key) {
88	87	if (!this.reads.contains(key)) {

branches/private/pav/NEW_JAVA_5/sophie2-platform/modules/org.sophie2.base.model.resources.r4/src/main/java/org/sophie2/base/model/resources/r4/changes/SubResourceChanger.java

r6466	r7238
44	44
45	45
46		~~@Override~~
47	46	public <T> T getRaw(Key<T> key) {
48	47	return this.parent.getRaw(

branches/private/pav/NEW_JAVA_5/sophie2-platform/modules/org.sophie2.base.model.resources.r4/src/main/java/org/sophie2/base/model/resources/r4/file/DelegatingFileAccess.java

r6237	r7238
35	35	}
36	36
37		~~@Override~~
38	37	public void save(PersistenceOptions options) {
39	38	// for now the whole book is always saved.
…	…
41	40	}
42	41
43		~~@Override~~
44	42	public SyncInfo getSyncInfo() {
45	43	throw new UnsupportedOperationException("Syncronization logic is still" +
…	…
47	45	}
48	46
49		~~@Override~~
50	47	public SyncOptions getSyncOptions() {
51	48	throw new UnsupportedOperationException("Syncronization logic is still" +
…	…
53	50	}
54	51
55		~~@Override~~
56	52	public void syncToRemoteMaster() {
57	53	throw new UnsupportedOperationException("Snapshots logic is still" +

branches/private/pav/NEW_JAVA_5/sophie2-platform/modules/org.sophie2.base.model.resources.r4/src/main/java/org/sophie2/base/model/resources/r4/file/MasterFileAccess.java

r6237	r7238
50	50	}
51	51
52		~~@Override~~
53	52	public SyncOptions getSyncOptions() {
54	53	return this.syncOptions;
55	54	}
56	55
57		~~@Override~~
58	56	public void save(PersistenceOptions options) {
59	57	PersistenceOptions actualOptions = (options == null)?
…	…
83	81	}
84	82
85		~~@Override~~
86	83	public void syncToRemoteMaster() {
87	84	throw new UnsupportedOperationException();
88	85	}
89	86
90		~~@Override~~
91	87	public SyncInfo getSyncInfo() {
92	88	// TODO Auto-generated method stub

branches/private/pav/NEW_JAVA_5/sophie2-platform/modules/org.sophie2.base.model.resources.r4/src/main/java/org/sophie2/base/model/resources/r4/model/ResourceModel.java

r7112	r7238
289	289
290	290
291		~~@Override~~
292	291	public <T> T getRaw(Key<T> key) {
293	292	Node node = findNode(key);

branches/private/pav/NEW_JAVA_5/sophie2-platform/modules/org.sophie2.base.model.resources.r4/src/main/java/org/sophie2/base/model/resources/r4/model/RevisionId.java

r6466	r7238
50	50	"9999-12-31T23:59:59.999+2300--0zzzzzzzz");
51	51
52		~~@Override~~
53	52	public int compareTo(RevisionId otherRevisionId) {
54	53	if (this == otherRevisionId) {

branches/private/pav/NEW_JAVA_5/sophie2-platform/modules/org.sophie2.base.model.resources.r4/src/main/java/org/sophie2/base/model/resources/r4/ResourceRefList.java

r6226	r7238
39	39	}
40	40
41		~~@Override~~
42	41	public ResourceRefList fixReferences(Map<ResourceRefR4, ResourceRefR4> replaces) {
43	42	List<ResourceRefR4> references = new ArrayList<ResourceRefR4>();
…	…
48	47	}
49	48
50		~~@Override~~
51	49	public List<ResourceRefR4> getReferences() {
52	50	return this.asList();

branches/private/pav/NEW_JAVA_5/sophie2-platform/modules/org.sophie2.base.model.resources.r4/src/main/java/org/sophie2/base/model/resources/r4/ResourceRefR4.java

r7116	r7238
363	363	}
364	364
365		~~@Override~~
366	365	public ResourceRefR4 fixReferences(Map<ResourceRefR4, ResourceRefR4> replaces) {
367	366	// TODO Temporary implementation, think of a use case for that!
…	…
372	371	}
373	372
374		~~@Override~~
375	373	public List<ResourceRefR4> getReferences() {
376	374	// TODO Implement properly after implementing the accesses.
…	…
556	554	}
557	555
558		~~@Override~~
559	556	public int compareTo(ResourceRefR4 o) {
560	557	return this.location.compareTo(o.location);

branches/private/pav/NEW_JAVA_5/sophie2-platform/modules/org.sophie2.base.model.resources.r4/src/main/java/org/sophie2/base/model/resources/r4/resources/URIPersister.java

r6226	r7238
8	8	import org.sophie2.base.persistence.ref.ValueRef;
9	9	import org.sophie2.base.persistence.storage.Storage;
	10	import org.sophie2.core.logging.SophieLog;
10	11
11	12	/**
…	…
31	32	URI.create(stringURI);
32	33	} catch (IllegalArgumentException e) {
33		throw new IncorrectFormatException("Cannot save the non absolute URI (" + stringURI + ").", e);
	34	SophieLog.error("Cannot save the non absolute URI (" + stringURI + ").", e);
	35	throw new IncorrectFormatException("Cannot save the non absolute URI ("
	36	+ stringURI + ").");
34	37	}
35	38	storage.setTextContent(stringURI);
…	…
42	45	ref.set(uri);
43	46	} catch (IllegalArgumentException e) {
	47	SophieLog.error("Give url content " + uriContent + " violates RFC 2396 "
	48	+ "and cannot be loaded.", e);
	49
44	50	throw new IncorrectFormatException(
45	51	"Give url content " + uriContent + " violates RFC 2396 "
46		+ "and cannot be loaded."~~, e~~);
	52	+ "and cannot be loaded.");
47	53	}
48	54	}

branches/private/pav/NEW_JAVA_5/sophie2-platform/modules/org.sophie2.base.model.security/.classpath

r1402	r7238
5	5	<classpathentry kind="src" output="target/test-classes" path="src/test/java"/>
6	6	<classpathentry excluding="**" kind="src" output="target/test-classes" path="src/test/resources"/>
7		<classpathentry kind="con"
8		path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6" />
9		<classpathentry kind="con"
10		path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER" />
11		<classpathentry kind="output" path="target/classes" />
	7	<classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
	8	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/jdk1.5.0_21"/>
	9	<classpathentry kind="output" path="target/classes"/>
12	10	</classpath>

branches/private/pav/NEW_JAVA_5/sophie2-platform/modules/org.sophie2.base.model.security/.settings/org.eclipse.jdt.core.prefs

r1162	r7238
1		#~~Thu Sep 18 21:11:04 EEST 2008~~
	1	#Mon Oct 05 13:37:37 AFT 2009
2	2	eclipse.preferences.version=1
3	3	org.eclipse.jdt.core.builder.cleanOutputFolder=clean
…	…
18	18	org.eclipse.jdt.core.codeComplete.staticFieldSuffixes=
19	19	org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
20		org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
	20	org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
21	21	org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
22		org.eclipse.jdt.core.compiler.compliance=1.6
	22	org.eclipse.jdt.core.compiler.compliance=1.5
23	23	org.eclipse.jdt.core.compiler.debug.lineNumber=generate
24	24	org.eclipse.jdt.core.compiler.debug.localVariable=generate
…	…
97	97	org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
98	98	org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
99		org.eclipse.jdt.core.compiler.source=1.6
	99	org.eclipse.jdt.core.compiler.source=1.5
100	100	org.eclipse.jdt.core.compiler.taskCaseSensitive=enabled
101	101	org.eclipse.jdt.core.compiler.taskPriorities=NORMAL,HIGH,NORMAL

branches/private/pav/NEW_JAVA_5/sophie2-platform/modules/org.sophie2.base.model.text/.classpath

r1402	r7238
5	5	<classpathentry kind="src" output="target/test-classes" path="src/test/java"/>
6	6	<classpathentry excluding="**" kind="src" output="target/test-classes" path="src/test/resources"/>
7		<classpathentry kind="con"
8		path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6" />
9		<classpathentry kind="con"
10		path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER" />
11		<classpathentry kind="output" path="target/classes" />
	7	<classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
	8	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/jdk1.5.0_21"/>
	9	<classpathentry kind="output" path="target/classes"/>
12	10	</classpath>

branches/private/pav/NEW_JAVA_5/sophie2-platform/modules/org.sophie2.base.model.text/.settings/org.eclipse.jdt.core.prefs

r1162	r7238
1		#~~Thu Sep 18 21:11:04 EEST 2008~~
	1	#Fri Oct 02 18:00:28 AFT 2009
2	2	eclipse.preferences.version=1
3	3	org.eclipse.jdt.core.builder.cleanOutputFolder=clean
…	…
18	18	org.eclipse.jdt.core.codeComplete.staticFieldSuffixes=
19	19	org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
20		org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
	20	org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
21	21	org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
22		org.eclipse.jdt.core.compiler.compliance=1.6
	22	org.eclipse.jdt.core.compiler.compliance=1.5
23	23	org.eclipse.jdt.core.compiler.debug.lineNumber=generate
24	24	org.eclipse.jdt.core.compiler.debug.localVariable=generate
…	…
97	97	org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
98	98	org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
99		org.eclipse.jdt.core.compiler.source=1.6
	99	org.eclipse.jdt.core.compiler.source=1.5
100	100	org.eclipse.jdt.core.compiler.taskCaseSensitive=enabled
101	101	org.eclipse.jdt.core.compiler.taskPriorities=NORMAL,HIGH,NORMAL

branches/private/pav/NEW_JAVA_5/sophie2-platform/modules/org.sophie2.base.model.text/src/main/java/org/sophie2/base/model/text/HotAttr.java

r7177	r7238
104	104	}
105	105
106		~~@Override~~
107	106	public Hash getHash() {
108	107	Hasher hasher = new Hasher();

branches/private/pav/NEW_JAVA_5/sophie2-platform/modules/org.sophie2.base.model.text/src/main/java/org/sophie2/base/model/text/HotTextData.java

r6995	r7238
83	83	public static class HotTextDndProvider implements DndProvider {
84	84
85		~~@Override~~
86	85	public DndData createDndData(final AwtTransferable awtTransferable) {
87	86	return new HotTextData(awtTransferable) {
…	…
112	111	}
113	112
114		~~@Override~~
115	113	public Class<? extends DndData> getProvidedData() {
116	114	return HotTextData.class;
117	115	}
118	116
119		~~@Override~~
120	117	public DataFlavor getSupportedFlavor() {
121	118	return FLAVOR;

branches/private/pav/NEW_JAVA_5/sophie2-platform/modules/org.sophie2.base.model.text/src/main/java/org/sophie2/base/model/text/mvc/swing/SimpleSwingTextView.java

r6426	r7238
35	35	*/
36	36	public class SimpleSwingTextView extends SwingTextView {
37		~~@Override~~
38	37	public Prop<JComponent> swingComponent() {
39	38	class swingComponent extends ResourceProperty<JComponent> {

branches/private/pav/NEW_JAVA_5/sophie2-platform/modules/org.sophie2.base.model.text/src/main/java/org/sophie2/base/model/text/mvc/swing/SimpleTextLogic.java

r6135	r7238
19	19	ON_SET_TEXT {
20	20
21		~~@Override~~
22	21	public void defineFilter(EventFilterBuilder filter) {
23	22	filter.setSourceClass(SimpleSwingTextView.class);
…	…
25	24	}
26	25
27		~~@Override~~
28	26	public boolean handle(EventR3 event) {
29	27	ImmHotText text = event.getEventParam(TextView.EventIds.TEXT_PARAM_INDEX,

branches/private/pav/NEW_JAVA_5/sophie2-platform/modules/org.sophie2.base.model.text/src/main/java/org/sophie2/base/model/text/mvc/TextFlowLogic.java

r7177	r7238
47	47	ON_MOUSE_OP {
48	48
49		~~@Override~~
50	49	public void defineFilter(EventFilterBuilder filter) {
51	50	filter.setEventIdClass(InputEventR3.class);
…	…
53	52	}
54	53
55		~~@Override~~
56	54	public boolean handle(EventR3 event) {
57	55	SophieLog.trace("FLOW_MOUSE_OPERATION.handle");
…	…
103	101	ON_GO_OP {
104	102
105		~~@Override~~
106	103	public void defineFilter(EventFilterBuilder filter) {
107	104	filter.setSourceClass(TextView.class);
…	…
109	106	}
110	107
111		~~@Override~~
112	108	public boolean handle(EventR3 event) {
113	109	TextView source = event.getSource(TextView.class);
…	…
135	131	ON_SELECT {
136	132
137		~~@Override~~
138	133	public void defineFilter(EventFilterBuilder filter) {
139	134	filter.setSourceClass(TextView.class);
…	…
141	136	}
142	137
143		~~@Override~~
144	138	public boolean handle(EventR3 event) {
145	139	TextView source = event.getSource(TextView.class);
…	…
168	162	ON_INSERT {
169	163
170		~~@Override~~
171	164	public void defineFilter(EventFilterBuilder filter) {
172	165	filter.setSourceClass(TextView.class);
…	…
174	167	}
175	168
176		~~@Override~~
177	169	public boolean handle(EventR3 event) {
178	170
…	…
215	207	ON_DELETE {
216	208
217		~~@Override~~
218	209	public void defineFilter(EventFilterBuilder filter) {
219	210	filter.setSourceClass(TextView.class);
…	…
221	212	}
222	213
223		~~@Override~~
224	214	public boolean handle(EventR3 event) {
225	215	TextView source = event.getSource(TextView.class);
…	…
269	259	ON_COPY {
270	260
271		~~@Override~~
272	261	public void defineFilter(EventFilterBuilder filter) {
273	262	filter.setSourceClass(TextView.class);
…	…
275	264	}
276	265
277		~~@Override~~
278	266	public boolean handle(EventR3 event) {
279	267	TextView source = event.getSource(TextView.class);
…	…
301	289	ON_PASTE {
302	290
303		~~@Override~~
304	291	public void defineFilter(EventFilterBuilder filter) {
305	292	filter.setSourceClass(TextView.class);
…	…
307	294	}
308	295
309		~~@Override~~
310	296	public boolean handle(EventR3 event) {
311	297	TextView source = event.getSource(TextView.class);
…	…
342	328	ON_CUT {
343	329
344		~~@Override~~
345	330	public void defineFilter(EventFilterBuilder filter) {
346	331	filter.setSourceClass(TextView.class);
…	…
348	333	}
349	334
350		~~@Override~~
351	335	public boolean handle(EventR3 event) {
352	336	TextView source = event.getSource(TextView.class);
…	…
380	364	ON_STYLE_OP {
381	365
382		~~@Override~~
383	366	public void defineFilter(EventFilterBuilder filter) {
384	367	filter.setSourceClass(TextView.class);
…	…
386	369	}
387	370
388		~~@Override~~
389	371	public boolean handle(EventR3 event) {
390	372	TextView view = event.getSource(TextView.class);

branches/private/pav/NEW_JAVA_5/sophie2-platform/modules/org.sophie2.base.model.text/src/main/java/org/sophie2/base/model/text/smart/elements/Breaks.java

r7177	r7238
22	22	WORD_BREAK {
23	23
24		~~@Override~~
25	24	public HotPos getNextBreakPos(ImmHotText text,
26	25	HotPos currentPosition) {
…	…
30	29	}
31	30
32		~~@Override~~
33	31	public HotPos getPreviousBreakPos(ImmHotText text,
34	32	HotPos currentPosition) {

branches/private/pav/NEW_JAVA_5/sophie2-platform/modules/org.sophie2.base.model.text/src/main/java/org/sophie2/base/model/text/smart/HotPos.java

r7177	r7238
116	116	}
117	117
118		~~@Override~~
119	118	public Hash getHash() {
120	119	Hasher hasher = new Hasher();
…	…
162	161	public static Comparator<HotPos> getDummyComparator() {
163	162	return new Comparator<HotPos>() {
164		~~@Override~~
165	163	public int compare(HotPos pos1, HotPos pos2) {
166	164	return pos1.getIndex() - pos2.getIndex();

branches/private/pav/NEW_JAVA_5/sophie2-platform/modules/org.sophie2.base.model.text/src/main/java/org/sophie2/base/model/text/smart/ImmHotText.java

r7177	r7238
470	470	return new CharSequence() {
471	471
472		~~@Override~~
473	472	public char charAt(int index) {
474	473	return ImmHotText.this.chars.get(start + index);
475	474	}
476	475
477		~~@Override~~
478	476	public int length() {
479	477	return end - start;
…	…
481	479
482	480	@SuppressWarnings("hiding")
483		~~@Override~~
484	481	public CharSequence subSequence(int start, int end) {
485	482	return toSequence(start, end);
…	…
688	685	public Comparator<HotPos> getPosComparator() {
689	686	return new Comparator<HotPos>() {
690		~~@Override~~
691	687	public int compare(HotPos pos1, HotPos pos2) {
692	688	if (ImmHotText.this.getId().compareTo(pos1.getText().getId()) >= 0 &&
…	…
745	741	static Comparator<HotAttr<?>> getAttrComparator() {
746	742	return new Comparator<HotAttr<?>>() {
747		~~@Override~~
748	743	public int compare(HotAttr<?> attr1, HotAttr<?> attr2) {
749	744	return attr1.getId().compareTo(attr2.getId());

branches/private/pav/NEW_JAVA_5/sophie2-platform/modules/org.sophie2.base.model.text/src/main/java/org/sophie2/base/model/text/smart/layout/HorizontalInterval.java

r7177	r7238
47	47	}
48	48
49		~~@Override~~
50	49	public int compareTo(HorizontalInterval other) {
51	50	return (int) (this.xPosition - other.xPosition);

branches/private/pav/NEW_JAVA_5/sophie2-platform/modules/org.sophie2.base.model.text/src/main/java/org/sophie2/base/model/text/smart/layout/HotAreaLayout.java

r7177	r7238
256	256	}
257	257
258		~~@Override~~
259	258	public ImmHotText getConsumedText() {
260	259	return this.consumedText;
261	260	}
262	261
263		~~@Override~~
264	262	public HotPartialLayout improve() {
265	263	// TODO Implement improve functionality.

branches/private/pav/NEW_JAVA_5/sophie2-platform/modules/org.sophie2.base.model.text/src/main/java/org/sophie2/base/model/text/smart/layout/HotLineLayout.java

r7177	r7238
116	116	}
117	117
118		~~@Override~~
119	118	public ImmHotText getConsumedText() {
120	119	return this.consumedText;
121	120	}
122	121
123		~~@Override~~
124	122	public HotPartialLayout improve() {
125	123	// TODO Implement improve functionality.

branches/private/pav/NEW_JAVA_5/sophie2-platform/modules/org.sophie2.base.model.text/src/main/java/org/sophie2/base/model/text/smart/layout/HotSegmentLayout.java

r7177	r7238
3	3	import java.awt.Color;
4	4	import java.awt.Graphics2D;
5		~~import java.awt.Point;~~
6	5	import java.awt.Shape;
7	6	import java.awt.font.LineBreakMeasurer;
…	…
69	68	}
70	69
71		~~@Override~~
72	70	public HotPartialLayout improve() {
73	71	return null;
…	…
162	160	}
163	161
164		~~@Override~~
165	162	public ImmHotText getConsumedText() {
166	163	return this.text;
…	…
179	176
180	177	TextLayout awtLayout = toAwtLayout();
181		~~Point point = new Point();~~
182	178	int offset = TextUtils.getIndex(this.text, pos);
183	179	if (offset < 0) {
…	…
185	181	}
186	182	TextHitInfo hit = TextHitInfo.afterOffset(offset);
187		awtLayout.hitToPoint(hit, point);
188		return new ImmPoint(point);
	183
	184	// TextLayout layout = TextUtils.createAwtLayout(this.text.subText(new HotInterval(this.text.getBegin(), pos)), size.getWidth());
	185	// float advance = layout.getAdvance();
	186	return new ImmPoint(awtLayout.getCaretInfo(hit)[0], 0f);
189	187	}
190	188

branches/private/pav/NEW_JAVA_5/sophie2-platform/modules/org.sophie2.base.model.text/src/main/java/org/sophie2/base/model/text/smart/layout/HotTextLayout.java

r7177	r7238
103	103	}
104	104
105		~~@Override~~
106	105	public ImmHotText getConsumedText() {
107	106	return this.consumedText;
108	107	}
109	108
110		~~@Override~~
111	109	public HotPartialLayout improve() {
112	110	// TODO Implement improve functionality.

branches/private/pav/NEW_JAVA_5/sophie2-platform/modules/org.sophie2.base.model.text/src/main/java/org/sophie2/base/model/text/smart/position/HotInterval.java

r7177	r7238
123	123	return new Comparator<HotInterval>() {
124	124
125		~~@Override~~
126	125	public int compare(HotInterval i1, HotInterval i2) {
127	126	return posComparator.compare(i1.getBegin(), i2.getBegin());

branches/private/pav/NEW_JAVA_5/sophie2-platform/modules/org.sophie2.base.model.text/src/main/java/org/sophie2/base/model/text/smart/style/HotStyleValue.java

r7177	r7238
53	53	}
54	54
55		~~@Override~~
56	55	public Hash getHash() {
57	56	Hasher hasher = new Hasher();

branches/private/pav/NEW_JAVA_5/sophie2-platform/modules/org.sophie2.base.model.text/src/main/java/org/sophie2/base/model/text/smart/style/StyleValueSet.java

r7177	r7238
53	53	final Comparator<HotPos> posComparator) {
54	54	return new Comparator<HotStyleValue<T>>() {
55		~~@Override~~
56	55	public int compare(HotStyleValue<T> value1, HotStyleValue<T> value2) {
57	56	return posComparator.compare(value1.getPos(), value2.getPos());
…	…
160	159	}
161	160
162		~~@Override~~
163	161	public Hash getHash() {
164	162	Hasher hasher = new Hasher();

branches/private/pav/NEW_JAVA_5/sophie2-platform/modules/org.sophie2.base.model.text/src/test/java/org/sophie2/base/model/text/HotTextDemoTest.java

r7177	r7238
125	125	long startTime = System.currentTimeMillis();
126	126	SwingUtilities.invokeAndWait(new Runnable() {
127		~~@Override~~
128	127	public void run() {
129	128	demo();
…	…
137	136
138	137	@SuppressWarnings("synthetic-access")
139		~~@Override~~
140	138	public void run() {
141	139	ImmHotText oldText = HotTextDemoTest.this.flow.getText();
…	…
156	154	SwingUtilities.invokeAndWait(new Runnable() {
157	155	@SuppressWarnings("synthetic-access")
158		~~@Override~~
159	156	public void run() {
160	157	HotTextDemoTest.this.frame.dispose();

branches/private/pav/NEW_JAVA_5/sophie2-platform/modules/org.sophie2.base.model.text/src/test/java/org/sophie2/base/model/text/layout/LineEndsDemoTest.java

r7177	r7238
111	111	SwingUtilities.invokeLater(new Runnable() {
112	112	@SuppressWarnings("unchecked")
113		~~@Override~~
114	113	public void run() {
115	114	FakeModuleRegistry.start(BaseVisualModule.class,

branches/private/pav/NEW_JAVA_5/sophie2-platform/modules/org.sophie2.base.model.text/src/test/java/org/sophie2/base/model/text/SwingDemoTest.java

r6466	r7238
103	103	SwingUtilities.invokeLater(new Runnable() {
104	104	@SuppressWarnings("unchecked")
105		~~@Override~~
106	105	public void run() {
107	106	FakeModuleRegistry.start(BaseVisualModule.class,

branches/private/pav/NEW_JAVA_5/sophie2-platform/modules/org.sophie2.base.natlib/.classpath

r1402	r7238
5	5	<classpathentry kind="src" output="target/test-classes" path="src/test/java"/>
6	6	<classpathentry excluding="**" kind="src" output="target/test-classes" path="src/test/resources"/>
7		<classpathentry kind="con"
8		path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6" />
9		<classpathentry kind="con"
10		path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER" />
11		<classpathentry kind="output" path="target/classes" />
	7	<classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
	8	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/jdk1.5.0_21"/>
	9	<classpathentry kind="output" path="target/classes"/>
12	10	</classpath>

branches/private/pav/NEW_JAVA_5/sophie2-platform/modules/org.sophie2.base.natlib/.settings/org.eclipse.jdt.core.prefs

r1162	r7238
1		#~~Thu Sep 18 21:11:04 EEST 2008~~
	1	#Mon Oct 05 13:38:00 AFT 2009
2	2	eclipse.preferences.version=1
3	3	org.eclipse.jdt.core.builder.cleanOutputFolder=clean
…	…
18	18	org.eclipse.jdt.core.codeComplete.staticFieldSuffixes=
19	19	org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
20		org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
	20	org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
21	21	org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
22		org.eclipse.jdt.core.compiler.compliance=1.6
	22	org.eclipse.jdt.core.compiler.compliance=1.5
23	23	org.eclipse.jdt.core.compiler.debug.lineNumber=generate
24	24	org.eclipse.jdt.core.compiler.debug.localVariable=generate
…	…
97	97	org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
98	98	org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
99		org.eclipse.jdt.core.compiler.source=1.6
	99	org.eclipse.jdt.core.compiler.source=1.5
100	100	org.eclipse.jdt.core.compiler.taskCaseSensitive=enabled
101	101	org.eclipse.jdt.core.compiler.taskPriorities=NORMAL,HIGH,NORMAL

branches/private/pav/NEW_JAVA_5/sophie2-platform/modules/org.sophie2.base.natlib/src/main/java/org/sophie2/base/natlib/NativeBridge.java

r6933	r7238
176	176
177	177	// //Release version:
178		return FileEntryManager.get().getExecutableFileEntry("natives/" + path);
	178	File nativeFile = FileEntryManager.get().getWritableFileEntry("natives/" + path);
	179	String[] commands = new String[] {"chmod", "+x", nativeFile.getAbsolutePath()};
	180	if (!System.getProperty("os.name").contains("Win")) {
	181	try {
	182	Runtime.getRuntime().exec(commands);
	183	} catch (IOException e) {
	184	SophieLog.error("Exception while making native file executable!", e);
	185	throw new RuntimeException(e);
	186	}
	187	}
	188	return nativeFile;
179	189
180	190	}

branches/private/pav/NEW_JAVA_5/sophie2-platform/modules/org.sophie2.base.persistence/.classpath

r333	r7238
5	5	<classpathentry kind="src" output="target/test-classes" path="src/test/java"/>
6	6	<classpathentry excluding="**" kind="src" output="target/test-classes" path="src/test/resources"/>
7		~~<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>~~
8	7	<classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
	8	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/jdk1.5.0_21"/>
9	9	<classpathentry kind="output" path="target/classes"/>
10	10	</classpath>

branches/private/pav/NEW_JAVA_5/sophie2-platform/modules/org.sophie2.base.persistence/.settings/org.eclipse.jdt.core.prefs

r115	r7238
1		#~~Thu Sep 18 21:11:04 EEST 2008~~
	1	#Mon Oct 05 13:38:42 AFT 2009
2	2	eclipse.preferences.version=1
3	3	org.eclipse.jdt.core.builder.cleanOutputFolder=clean
…	…
18	18	org.eclipse.jdt.core.codeComplete.staticFieldSuffixes=
19	19	org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
20		org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
	20	org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
21	21	org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
22		org.eclipse.jdt.core.compiler.compliance=1.6
	22	org.eclipse.jdt.core.compiler.compliance=1.5
23	23	org.eclipse.jdt.core.compiler.debug.lineNumber=generate
24	24	org.eclipse.jdt.core.compiler.debug.localVariable=generate
…	…
97	97	org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
98	98	org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
99		org.eclipse.jdt.core.compiler.source=1.6
	99	org.eclipse.jdt.core.compiler.source=1.5
100	100	org.eclipse.jdt.core.compiler.taskCaseSensitive=enabled
101	101	org.eclipse.jdt.core.compiler.taskPriorities=NORMAL,HIGH,NORMAL

branches/private/pav/NEW_JAVA_5/sophie2-platform/modules/org.sophie2.base.persistence/src/main/java/org/sophie2/base/persistence/commons/PersistenceUtil.java

r6933	r7238
51	51	String kind = ProUtil.getImmutableKing(clazz);
52	52	if (kind != null) {
53		assert ~~!kind.isEmpty()~~ : "class " + clazz.getName()
	53	assert kind.length() != 0 : "class " + clazz.getName()
54	54	+ " has an invalid @Immutable kind.";
55	55	return kind;

branches/private/pav/NEW_JAVA_5/sophie2-platform/modules/org.sophie2.base.persistence/src/main/java/org/sophie2/base/persistence/persister/impl/ClassPersister.java

r6880	r7238
54	54	source.set(null);
55	55	} catch (NullPointerException e) {
	56	SophieLog.error("Storage text content must contain non null value.", e);
56	57	throw new IncorrectFormatException("Storage text content must" +
57		" contain non null value."~~, e~~);
	58	" contain non null value.");
58	59	}
59	60	}

branches/private/pav/NEW_JAVA_5/sophie2-platform/modules/org.sophie2.base.persistence/src/main/java/org/sophie2/base/persistence/persister/impl/EnumPersister.java

r6466	r7238
14	14	import org.sophie2.base.persistence.ref.ValueRef;
15	15	import org.sophie2.base.persistence.storage.Storage;
	16	import org.sophie2.core.logging.SophieLog;
16	17	import org.sophie2.core.prolib.annot.Immutable;
17	18
…	…
84	85	source.set(value);
85	86	} catch (IllegalArgumentException e) {
	87	SophieLog.error("Value of '" + name + "' is not a name of constant"
	88	+ " in enumeration " + getRefValueClass(), e);
86	89	throw new IncorrectFormatException("Value of '" + name + "' is not a name of constant"
87		+ " in enumeration " + getRefValueClass()~~, e~~);
	90	+ " in enumeration " + getRefValueClass());
88	91	}
89	92	}

branches/private/pav/NEW_JAVA_5/sophie2-platform/modules/org.sophie2.base.persistence/src/main/java/org/sophie2/base/persistence/persister/impl/ZipPackagePersister.java

r6995	r7238
119	119
120	120	} catch (ParserConfigurationException e) {
121		~~// TODO maybe this should be runtime exception? --milo~~
122		throw new IOException(e);
	121	SophieLog.error("ParserConfigurationException while unpacking XML of the binary data into the Storage: ", e);
	122	throw new RuntimeException(e);
123	123	} catch (SAXException e) {
124		throw new IOException(e);
	124	SophieLog.error("SAXException while unpacking XML of the binary data into the Storage: ", e);
	125	throw new IOException("SAXException while unpacking XML of the binary data into the Storage");
125	126	}
126	127	}
…	…
246	247	serializer = tf.newTransformer();
247	248	} catch (TransformerConfigurationException e) {
248		throw new IOException("Saving error.", e);
	249	SophieLog.error("Saving error.", e);
	250	throw new IOException();
249	251	}
250	252	serializer.setOutputProperty(OutputKeys.ENCODING, "UTF-8");
…	…
259	261	serializer.transform(domSource, streamResult);
260	262	} catch (TransformerException e) {
261		throw new IOException("Saving error. ", e);
	263	SophieLog.error("Saving error. ", e);
	264	throw new IOException();
262	265	}
263	266	}
…	…
325	328	docBuilder = dbFactory.newDocumentBuilder();
326	329	} catch (ParserConfigurationException e) {
	330	SophieLog.error("ParserConfigurationException "
	331	+ "during document initialization", e);
327	332	throw new IOException("ParserConfigurationException "
328		+ "during document initialization"~~, e~~);
	333	+ "during document initialization");
329	334	}
330	335

branches/private/pav/NEW_JAVA_5/sophie2-platform/modules/org.sophie2.base.persistence/src/main/java/org/sophie2/base/persistence/persister/IncorrectFormatException.java

r3893	r7238
22	22	super(msg);
23	23	}
24
25		/**
26		* Constructor
27		*
28		* @param msg
29		* The message of the exception.
30		* @param t
31		* The cause of the exception.
32		*/
33		~~public IncorrectFormatException(final String msg, final Throwable t) {~~
34		~~super(msg, t);~~
35		}
36	24	}

branches/private/pav/NEW_JAVA_5/sophie2-platform/modules/org.sophie2.base.persistence/src/main/java/org/sophie2/base/persistence/storage/StorageUtils.java

r6013	r7238
2	2
3	3	import java.awt.Color;
4		~~import java.awt.MultipleGradientPaint;~~
5	4
	5	import org.apache.batik.ext.awt.MultipleGradientPaint;
6	6	import org.sophie2.base.persistence.persister.IncorrectFormatException;
7	7	import org.sophie2.core.logging.SophieLog;
…	…
175	175	attribute.setTextContent(value);
176	176	}
177
178		/**
179		* Creates a new attribute to a given node and sets its text content to the
180		* given value (given its type)
181		*
182		* @param <T>
183		* @param valueClass
184		* @param node
185		* @param attrName
186		* @param value
187		*/
188		~~public static <T> void writeAttribute(Class<T> valueClass, Storage node,~~
189		~~String attrName, T value) {~~
190		~~if (valueClass == Color.class) {~~
191		~~writeAttribute(Integer.class, node, attrName, ((Color) value)~~
192		~~.getRGB());~~
193		~~} else if (valueClass == MultipleGradientPaint.class) {~~
194		~~throw new UnsupportedOperationException(~~
195		~~"MultipleGradientPaint to String "~~
196		~~+ "is not implemented (to be)");~~
197		~~} else {~~
198		~~writeAttribute(node, attrName, value.toString());~~
199		}
200		}
201	177	}

branches/private/pav/NEW_JAVA_5/sophie2-platform/modules/org.sophie2.base.scene/.classpath

r5753	r7238
5	5	<classpathentry kind="src" output="target/test-classes" path="src/test/java"/>
6	6	<classpathentry excluding="**" kind="src" output="target/test-classes" path="src/test/resources"/>
7		~~<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>~~
8	7	<classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
	8	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/jdk1.5.0_21"/>
9	9	<classpathentry kind="output" path="target/classes"/>
10	10	</classpath>

branches/private/pav/NEW_JAVA_5/sophie2-platform/modules/org.sophie2.base.scene/.settings/org.eclipse.jdt.core.prefs

r456	r7238
1		#~~Thu Sep 18 21:11:04 EEST 2008~~
	1	#Mon Oct 05 13:38:48 AFT 2009
2	2	eclipse.preferences.version=1
3	3	org.eclipse.jdt.core.builder.cleanOutputFolder=clean
…	…
18	18	org.eclipse.jdt.core.codeComplete.staticFieldSuffixes=
19	19	org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
20		org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
	20	org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
21	21	org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
22		org.eclipse.jdt.core.compiler.compliance=1.6
	22	org.eclipse.jdt.core.compiler.compliance=1.5
23	23	org.eclipse.jdt.core.compiler.debug.lineNumber=generate
24	24	org.eclipse.jdt.core.compiler.debug.localVariable=generate
…	…
97	97	org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
98	98	org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
99		org.eclipse.jdt.core.compiler.source=1.6
	99	org.eclipse.jdt.core.compiler.source=1.5
100	100	org.eclipse.jdt.core.compiler.taskCaseSensitive=enabled
101	101	org.eclipse.jdt.core.compiler.taskPriorities=NORMAL,HIGH,NORMAL

branches/private/pav/NEW_JAVA_5/sophie2-platform/modules/org.sophie2.base.scene/src/main/java/org/sophie2/base/scene/BaseSceneVisual.java

r6997	r7238
55	55	private static final int DEFAULT_PADDING = 40;
56	56
57		~~@Override~~
58	57	public RwProp<ImmRect> wantedViewRect() {
59	58	return getBean().makeValueProp("wantedViewRect", ImmRect.class, null);
60	59	}
61	60
62		~~@Override~~
63	61	public RwProp<ImmRect> minimalViewRect() {
64	62	return getBean().makeValueProp("minimalViewRect", ImmRect.class, null);
65	63	}
66	64
67		~~@Override~~
68	65	public RwProp<ImmRect> actualViewRectCache() {
69	66	return getBean().makeValueProp("actualViewRectCache", ImmRect.class, null);
70	67	}
71	68
72		~~@Override~~
73	69	public RwProp<Scene> scene() {
74	70	return getBean().makeValueProp("scene", Scene.class);
…	…
136	132	new ImmRect(0, 0, 256, 256);
137	133
138		~~@Override~~
139	134	public Prop<ImmRect> actualViewRect() {
140	135	class actualViewRect extends AutoProperty<ImmRect> {

branches/private/pav/NEW_JAVA_5/sophie2-platform/modules/org.sophie2.base.scene/src/main/java/org/sophie2/base/scene/effects/ClipEffect.java

r6704	r7238
36	36	}
37	37
38		~~@Override~~
39	38	public Sprite applyTo(Sprite source) {
40	39	return ClipSprite.createClip(source, this.clipArea);
41	40	}
42	41
43		~~@Override~~
44	42	public ImmArea getResponsibleArea(ImmArea sourceArea) {
45	43	if (this.clipArea == null) {
…	…
51	49
52	50
53		~~@Override~~
54	51	public ImmArea getVisibleArea(ImmArea sourceArea) {
55	52	if (this.clipArea == null) {
…	…
69	66	}
70	67
71		~~@Override~~
72	68	public void applyTo(FBO fbo, ElementHelper<? extends SceneElement> helper) {
73	69	final GL2 gl = fbo.getGL();

branches/private/pav/NEW_JAVA_5/sophie2-platform/modules/org.sophie2.base.scene/src/main/java/org/sophie2/base/scene/effects/ColorEffect.java

r6488	r7238
32	32	}
33	33
34		~~@Override~~
35	34	public Sprite applyTo(Sprite source) {
36	35	if (this.color.equals(ImmColor.WHITE)) {
…	…
41	40	}
42	41
43		~~@Override~~
44	42	public ImmArea getResponsibleArea(ImmArea sourceArea) {
45	43	return sourceArea;
46	44	}
47	45
48		~~@Override~~
49	46	public ImmArea getVisibleArea(ImmArea sourceArea) {
50	47	return sourceArea;
…	…
61	58	}
62	59
63		~~@Override~~
64	60	public void applyTo(FBO fbo, ElementHelper<? extends SceneElement> helper) {
65	61	final GL2 gl = fbo.getGL();

branches/private/pav/NEW_JAVA_5/sophie2-platform/modules/org.sophie2.base.scene/src/main/java/org/sophie2/base/scene/effects/ShadowEffect.java

r6429	r7238
44	44	}
45	45
46		~~@Override~~
47	46	public ImmArea getResponsibleArea(ImmArea sourceArea) {
48	47	return sourceArea;
49	48	}
50	49
51		~~@Override~~
52	50	public ImmArea getVisibleArea(ImmArea sourceArea) {
53	51	Area shadowArea = (Area)sourceArea.toShape().clone();
…	…
59	57	}
60	58
61		~~@Override~~
62	59	public Sprite applyTo(Sprite source) {
63	60	// copy source sprite to an image sprite
…	…
94	91	}
95	92
96		~~@Override~~
97	93	public void applyTo(FBO fbo, ElementHelper<? extends SceneElement> helper) {
98	94	// TODO Auto-generated method stub

branches/private/pav/NEW_JAVA_5/sophie2-platform/modules/org.sophie2.base.scene/src/main/java/org/sophie2/base/scene/events/SceneInteractionLogic.java

r7080	r7238
41	41	ON_SCENE_INPUT_OPERATION {
42	42
43		~~@Override~~
44	43	public void defineFilter(EventFilterBuilder filter) {
45	44	filter.setEventIdClass(InputEventR3.class);
…	…
47	46	}
48	47
49		~~@Override~~
50	48	public boolean handle(EventR3 event) {
51	49	SceneVisual source = event.getSource(SceneVisual.class);
…	…
222	220	SCENE_DND_OPERATION {
223	221
224		~~@Override~~
225	222	public void defineFilter(EventFilterBuilder filter) {
226	223	filter.setEventIdClass(SophieDragDropHandler.TransferEventIds.class);
…	…
228	225	}
229	226
230		~~@Override~~
231	227	public boolean handle(EventR3 event) {
232	228

branches/private/pav/NEW_JAVA_5/sophie2-platform/modules/org.sophie2.base.scene/src/main/java/org/sophie2/base/scene/helpers/ElementHelper.java

r7177	r7238
155	155	}
156	156
157		~~@Override~~
158	157	public int compareTo(ElementHelper<?> o) {
159	158	// paint order... (bottom most first) event processing should be

branches/private/pav/NEW_JAVA_5/sophie2-platform/modules/org.sophie2.base.scene/src/main/java/org/sophie2/base/scene/impl/DefaultContourSceneElement.java

r5735	r7238
17	17	ContourSceneElement {
18	18
19		~~@Override~~
20	19	public RwProp<ImmArea> shape() {
21	20	return getBean().makeValueProp("shape", ImmArea.class, ImmArea.EMPTY);
22	21	}
23	22
24		~~@Override~~
25	23	public RwProp<LineStyle> lineStyle() {
26	24	return getBean().makeValueProp("lineStyle", LineStyle.class, LineStyle.LINE);
27	25	}
28	26
29		~~@Override~~
30	27	public RwProp<ImmColor> color() {
31	28	return getBean().makeValueProp("color", ImmColor.class, ImmColor.BLACK);

branches/private/pav/NEW_JAVA_5/sophie2-platform/modules/org.sophie2.base.scene/src/main/java/org/sophie2/base/scene/impl/DefaultHotTextSceneElement.java

r6264	r7238
67	67	// }
68	68
69		~~@Override~~
70	69	public Prop<Integer> chainIndex() {
71	70	return getBean().makeValueProp("chainIndex", Integer.class, 0);

branches/private/pav/NEW_JAVA_5/sophie2-platform/modules/org.sophie2.base.scene/src/main/java/org/sophie2/base/scene/impl/DefaultImageSceneElement.java

r2057	r7238
14	14	ImageSceneElement {
15	15
16		~~@Override~~
17	16	public RwProp<ImmImage> image() {
18	17	return getBean().makeValueProp("image", ImmImage.class);

branches/private/pav/NEW_JAVA_5/sophie2-platform/modules/org.sophie2.base.scene/src/main/java/org/sophie2/base/scene/impl/DefaultSceneElement.java

r6992	r7238
21	21	public class DefaultSceneElement extends BaseProObject implements SceneElement {
22	22
23		~~@Override~~
24	23	public RwProp<ImmMatrix> space() {
25	24	return getBean().makeValueProp("space", ImmMatrix.class,
…	…
27	26	}
28	27
29		~~@Override~~
30	28	public RwListProp<SceneElement> subElements() {
31	29	return getBean().makeListProp("subElements", SceneElement.class);
32	30	}
33	31
34		~~@Override~~
35	32	public RwListProp<SceneEffect> effects() {
36	33	return getBean().makeListProp("effects", SceneEffect.class);
37	34	}
38	35
39		~~@Override~~
40	36	public RwProp<Object> eventSource() {
41	37	return getBean().makeValueProp("eventSource", Object.class,

branches/private/pav/NEW_JAVA_5/sophie2-platform/modules/org.sophie2.base.scene/src/main/java/org/sophie2/base/scene/impl/DefaultShapeSceneElement.java

r2974	r7238
16	16	implements ShapeSceneElement {
17	17
18		~~@Override~~
19	18	public RwProp<ImmArea> shape() {
20	19	return getBean().makeValueProp("shape", ImmArea.class, ImmArea.EMPTY);
21	20	}
22	21
23		~~@Override~~
24	22	public RwProp<ImmFilling> filling() {
25	23	return getBean().makeValueProp("filling", ImmFilling.class, ImmColor.WHITE);

branches/private/pav/NEW_JAVA_5/sophie2-platform/modules/org.sophie2.base.scene/src/main/java/org/sophie2/base/scene/impl/DefaultSwingSceneElement.java

r1707	r7238
16	16	SwingSceneElement {
17	17
18		~~@Override~~
19	18	public RwProp<JComponent> swingComponent() {
20	19	return getBean().makeValueProp("swingComponent", JComponent.class, null);

branches/private/pav/NEW_JAVA_5/sophie2-platform/modules/org.sophie2.base.scene/src/main/java/org/sophie2/base/scene/impl/DefaultTextSceneElement.java

r5735	r7238
15	15	TextSceneElement {
16	16
17		~~@Override~~
18	17	public RwProp<SceneTextRun> textRun() {
19	18	return getBean().makeValueProp("textRun", SceneTextRun.class, SceneTextRun.EMPTY_RUN);
20	19	}
21	20
22		~~@Override~~
23	21	public RwProp<ImmColor> color() {
24	22	return getBean().makeValueProp("color", ImmColor.class, ImmColor.BLACK);

branches/private/pav/NEW_JAVA_5/sophie2-platform/modules/org.sophie2.base.scene/src/main/java/org/sophie2/base/scene/sprites/Sprite.java

r6172	r7238
75	75
76	76
77		~~@Override~~
78	77	public final Hash getHash() {
79	78	if(this.hash == null) {

branches/private/pav/NEW_JAVA_5/sophie2-platform/modules/org.sophie2.base.scene/src/main/java/org/sophie2/base/scene/sprites/TilePos.java

r5735	r7238
91	91	}
92	92
93		~~@Override~~
94	93	public Hash getHash() {
95	94	Hasher h = new Hasher();

branches/private/pav/NEW_JAVA_5/sophie2-platform/modules/org.sophie2.base.scene/src/test/java/org/sophie2/base/scene/SceneDemo.java

r6508	r7238
445	445	}
446	446
447		~~@Override~~
448	447	public Prop<ImmRect> actualViewRect() {
449	448	return getBean().makeValueProp("actualViewRect", ImmRect.class,
…	…
451	450	}
452	451
453		~~@Override~~
454	452	public RwProp<Scene> scene() {
455	453	return getBean().makeValueProp("scene", Scene.class);
…	…
468	466	}
469	467
470		~~@Override~~
471	468	public RwProp<ImmRect> wantedViewRect() {
472	469	return getBean().makeValueProp("wantedViewRect", ImmRect.class,
…	…
474	471	}
475	472
476		~~@Override~~
477	473	public RwProp<ImmRect> minimalViewRect() {
478	474	return getBean().makeValueProp("minimalViewRect", ImmRect.class, null);
479	475	}
480	476
481		~~@Override~~
482	477	public RwProp<ImmRect> actualViewRectCache() {
483	478	return getBean().makeValueProp("actualViewRectCache", ImmRect.class, null);
…	…
525	520	SwingUtilities.invokeLater(new Runnable() {
526	521	@SuppressWarnings("unchecked")
527		~~@Override~~
528	522	public void run() {
529	523	try {

branches/private/pav/NEW_JAVA_5/sophie2-platform/modules/org.sophie2.base.skins/.classpath

r1402	r7238
5	5	<classpathentry kind="src" output="target/test-classes" path="src/test/java"/>
6	6	<classpathentry excluding="**" kind="src" output="target/test-classes" path="src/test/resources"/>
7		<classpathentry kind="con"
8		path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6" />
9		<classpathentry kind="con"
10		path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER" />
11		<classpathentry kind="output" path="target/classes" />
	7	<classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
	8	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/jdk1.5.0_21"/>
	9	<classpathentry kind="output" path="target/classes"/>
12	10	</classpath>

branches/private/pav/NEW_JAVA_5/sophie2-platform/modules/org.sophie2.base.skins/.settings/org.eclipse.jdt.core.prefs

r1162	r7238
1		#~~Thu Sep 18 21:11:04 EEST 2008~~
	1	#Mon Oct 05 13:38:54 AFT 2009
2	2	eclipse.preferences.version=1
3	3	org.eclipse.jdt.core.builder.cleanOutputFolder=clean
…	…
18	18	org.eclipse.jdt.core.codeComplete.staticFieldSuffixes=
19	19	org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
20		org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
	20	org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
21	21	org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
22		org.eclipse.jdt.core.compiler.compliance=1.6
	22	org.eclipse.jdt.core.compiler.compliance=1.5
23	23	org.eclipse.jdt.core.compiler.debug.lineNumber=generate
24	24	org.eclipse.jdt.core.compiler.debug.localVariable=generate
…	…
97	97	org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
98	98	org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
99		org.eclipse.jdt.core.compiler.source=1.6
	99	org.eclipse.jdt.core.compiler.source=1.5
100	100	org.eclipse.jdt.core.compiler.taskCaseSensitive=enabled
101	101	org.eclipse.jdt.core.compiler.taskPriorities=NORMAL,HIGH,NORMAL

branches/private/pav/NEW_JAVA_5/sophie2-platform/modules/org.sophie2.base.skins/src/main/java/org/sophie2/base/skins/BaseSkinPart.java

r6508	r7238
32	32	}
33	33
34		~~@Override~~
35	34	public RwListProp<ListEntry> records() {
36	35	return getBean().makeListProp("records", ListEntry.class);
37	36	}
38	37
39		~~@Override~~
40	38	public RwProp<String> skinName() {
41	39	return getBean().makeValueProp("skinName", String.class,

branches/private/pav/NEW_JAVA_5/sophie2-platform/modules/org.sophie2.base.visual/.classpath

r1402	r7238
5	5	<classpathentry kind="src" output="target/test-classes" path="src/test/java"/>
6	6	<classpathentry excluding="**" kind="src" output="target/test-classes" path="src/test/resources"/>
7		<classpathentry kind="con"
8		path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6" />
9		<classpathentry kind="con"
10		path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER" />
11		<classpathentry kind="output" path="target/classes" />
	7	<classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
	8	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/jdk1.5.0_21"/>
	9	<classpathentry kind="output" path="target/classes"/>
12	10	</classpath>

branches/private/pav/NEW_JAVA_5/sophie2-platform/modules/org.sophie2.base.visual/.settings/org.eclipse.jdt.core.prefs

r1162	r7238
1		#~~Thu Sep 18 21:11:04 EEST 2008~~
	1	#Mon Oct 05 13:39:00 AFT 2009
2	2	eclipse.preferences.version=1
3	3	org.eclipse.jdt.core.builder.cleanOutputFolder=clean
…	…
18	18	org.eclipse.jdt.core.codeComplete.staticFieldSuffixes=
19	19	org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
20		org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
	20	org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
21	21	org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
22		org.eclipse.jdt.core.compiler.compliance=1.6
	22	org.eclipse.jdt.core.compiler.compliance=1.5
23	23	org.eclipse.jdt.core.compiler.debug.lineNumber=generate
24	24	org.eclipse.jdt.core.compiler.debug.localVariable=generate
…	…
97	97	org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
98	98	org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
99		org.eclipse.jdt.core.compiler.source=1.6
	99	org.eclipse.jdt.core.compiler.source=1.5
100	100	org.eclipse.jdt.core.compiler.taskCaseSensitive=enabled
101	101	org.eclipse.jdt.core.compiler.taskPriorities=NORMAL,HIGH,NORMAL

branches/private/pav/NEW_JAVA_5/sophie2-platform/modules/org.sophie2.base.visual/src/main/java/org/sophie2/base/visual/BaseVisualElement.java

r6508	r7238
1	1	package org.sophie2.base.visual;
2	2
3		~~import java.util.ArrayDeque;~~
4	3	import java.util.ArrayList;
5	4	import java.util.HashMap;
…	…
23	22	import org.sophie2.core.prolib.list.ProListTransformer;
24	23	import org.sophie2.core.prolib.list.TrackingProList;
	24	import org.sophie2.core.prolib.util.Stack;
25	25
26	26	/**
…	…
57	57	public static final String TOOL_TIP_PROP_ID = "tool-tip";
58	58
59		~~@Override~~
60	59	public Prop<String> title() {
61	60	class title extends AutoProperty<String> {
…	…
79	78	}
80	79
81		~~@Override~~
82	80	public Prop<String> toolTip() {
83	81	class toolTip extends AutoProperty<String> {
…	…
94	92	* Override this one to a more specific class if you need.
95	93	*/
96		~~@Override~~
97	94	public Prop<? extends VisualElement> parent() {
98	95	return getBean().makeParentProp(VisualElement.class);
…	…
126	123	// assert skip == null \|\| skip.owner() == this;
127	124	HashSet<VisualElement> passed = new HashSet<VisualElement>();
128		~~ArrayDeque<VisualElement> q = new ArrayDeque~~<VisualElement>();
	125	Stack<VisualElement> q = new Stack.StackImpl<VisualElement>();
129	126	q.add(this);
130	127	while (!q.isEmpty()) {
…	…
483	480	}.filter(new ProListFilter<SophieExtension<VisualProvider>>() {
484	481
485		~~@Override~~
486	482	public boolean accepts(SophieExtension<VisualProvider> item) {
487	483	VisualProvider p = item.getObject();

branches/private/pav/NEW_JAVA_5/sophie2-platform/modules/org.sophie2.base.visual/src/main/java/org/sophie2/base/visual/BaseVisualModule.java

r5432	r7238
60	60	protected Comparator<SophieExtension<VisualProvider>> getSorter() {
61	61	return new Comparator<SophieExtension<VisualProvider>>() {
62		~~@Override~~
63	62	public int compare(SophieExtension<VisualProvider> o1,
64	63	SophieExtension<VisualProvider> o2) {

branches/private/pav/NEW_JAVA_5/sophie2-platform/modules/org.sophie2.base.visual/src/main/java/org/sophie2/base/visual/interaction/InteractionLogic.java

r6997	r7238
22	22	ON_VISUAL_INPUT_OPERATION {
23	23
24		~~@Override~~
25	24	public void defineFilter(EventFilterBuilder filter) {
26	25	filter.setSourceClass(VisualElement.class);
…	…
28	27	}
29	28
30		~~@Override~~
31	29	public boolean handle(EventR3 event) {
32	30	VisualElement view = event.getSource(VisualElement.class);

branches/private/pav/NEW_JAVA_5/sophie2-platform/modules/org.sophie2.base.visual/src/main/java/org/sophie2/base/visual/interaction/SwingEventAdapter.java

r5998	r7238
104	104	MouseMotionListener, MouseWheelListener, KeyListener {
105	105
106		~~@Override~~
107	106	public void focusGained(FocusEvent e) {
108	107	// TODO Auto-generated method stub
…	…
110	109	}
111	110
112		~~@Override~~
113	111	public void focusLost(FocusEvent e) {
114	112	// TODO Auto-generated method stub
…	…
116	114	}
117	115
118		~~@Override~~
119	116	public void mouseClicked(MouseEvent e) {
120	117	forward(e, InputEventR3.MOUSE_CLICKED, getModifiers(e),
…	…
122	119	}
123	120
124		~~@Override~~
125	121	public void mouseEntered(MouseEvent e) {
126	122	forward(e, InputEventR3.MOUSE_ENTERED, getModifiers(e), getPoint(e));
127	123	}
128	124
129		~~@Override~~
130	125	public void mouseExited(MouseEvent e) {
131	126	forward(e, InputEventR3.MOUSE_EXITED, getModifiers(e), getPoint(e));
132	127	}
133	128
134		~~@Override~~
135	129	public void mousePressed(MouseEvent e) {
136	130	forward(e, InputEventR3.MOUSE_PRESSED, getModifiers(e),
…	…
138	132	}
139	133
140		~~@Override~~
141	134	public void mouseReleased(MouseEvent e) {
142	135	forward(e, InputEventR3.MOUSE_RELEASED, getModifiers(e),
…	…
145	138	}
146	139
147		~~@Override~~
148	140	public void keyPressed(KeyEvent e) {
149	141	forward(e, InputEventR3.KEY_PRESSED, getModifiers(e), getKey(e));
150	142	}
151	143
152		~~@Override~~
153	144	public void keyReleased(KeyEvent e) {
154	145	forward(e, InputEventR3.KEY_RELEASED, getModifiers(e), getKey(e));
…	…
156	147	}
157	148
158		~~@Override~~
159	149	public void keyTyped(KeyEvent e) {
160	150	forward(e, InputEventR3.KEY_TYPED, getModifiers(e), getChar(e));
…	…
162	152	}
163	153
164		~~@Override~~
165	154	public void mouseDragged(MouseEvent e) {
166	155	forward(e, InputEventR3.MOUSE_DRAGGED, getModifiers(e), getPoint(e));
…	…
168	157	}
169	158
170		~~@Override~~
171	159	public void mouseMoved(MouseEvent e) {
172	160	forward(e, InputEventR3.MOUSE_MOVED, getModifiers(e), getPoint(e));
173	161	}
174	162
175		~~@Override~~
176	163	public void mouseWheelMoved(MouseWheelEvent e) {
177	164	forward(e, InputEventR3.MOUSE_WHEEL, getModifiers(e), getPoint(e),

branches/private/pav/NEW_JAVA_5/sophie2-platform/modules/org.sophie2.base.visual/src/main/java/org/sophie2/base/visual/InternalSkinPart.java

r4155	r7238
58	58
59	59	ElementSkinPart esp = new ElementSkinPart() {
60		~~@Override~~
61	60	public void add(String propId, Object value) {
62	61	InternalSkinPart.this.add(elementId, propId, value);
63	62	}
64	63
65		~~@Override~~
66	64	public void addInteraction(String interactionDef,
67	65	Enum<?> eventId, Object... eventArgs) {

branches/private/pav/NEW_JAVA_5/sophie2-platform/modules/org.sophie2.base.visual/src/main/java/org/sophie2/base/visual/NullVisualProvider.java

r6264	r7238
41	41	}
42	42
43		~~@Override~~
44	43	public <T extends VisualElement> T create(Class<T> elementClass) {
45	44	SophieLog.info("Creating instance of " + this.providedClass.getName());
…	…
47	46	}
48	47
49		~~@Override~~
50	48	public Class<? extends VisualElement> getParentClass() {
51	49	return this.parentClass;
52	50	}
53	51
54		~~@Override~~
55	52	public Class<? extends VisualElement> getProvidedClass() {
56	53	return this.providedClass;
57	54	}
58	55
59		~~@Override~~
60	56	public String getRole() {
61	57	return this.role;
62	58	}
63	59
64		~~@Override~~
65	60	public String getSortKey() {
66	61	return this.sortKey;

branches/private/pav/NEW_JAVA_5/sophie2-platform/modules/org.sophie2.base.visual/src/main/java/org/sophie2/base/visual/SimpleVisualProvider.java

r5813	r7238
41	41	}
42	42
43		~~@Override~~
44	43	public <T extends VisualElement> T create(Class<T> elementClass) {
45	44	try {
…	…
54	53	}
55	54
56		~~@Override~~
57	55	public Class<? extends VisualElement> getParentClass() {
58	56	return this.parentClass;
59	57	}
60	58
61		~~@Override~~
62	59	public Class<? extends VisualElement> getProvidedClass() {
63	60	return this.providedClass;
64	61	}
65	62
66		~~@Override~~
67	63	public String getRole() {
68	64	return this.role;
69	65	}
70	66
71		~~@Override~~
72	67	public String getSortKey() {
73	68	return this.sortKey;

branches/private/pav/NEW_JAVA_5/sophie2-platform/modules/org.sophie2.base.visual/src/test/java/org/sophie2/base/visual/interaction/InteractionDemoTest.java

r5739	r7238
146	146	*/
147	147	OP1 {
148		~~@Override~~
149	148	public void defineFilter(EventFilterBuilder filter) {
150	149	filter.setSourceClass(SampleView.class);
…	…
152	151	}
153	152
154		~~@Override~~
155	153	public boolean handle(EventR3 event) {
156	154	SampleView view = event.getSource(SampleView.class);
…	…
164	162	*/
165	163	OP2 {
166		~~@Override~~
167	164	public void defineFilter(EventFilterBuilder filter) {
168	165	filter.setSourceClass(SampleView.class);
…	…
170	167	}
171	168
172		~~@Override~~
173	169	public boolean handle(EventR3 event) {
174	170	SampleView view = event.getSource(SampleView.class);

branches/private/pav/NEW_JAVA_5/sophie2-platform/modules/org.sophie2.core/.classpath

r689	r7238
5	5	<classpathentry kind="src" output="target/test-classes" path="src/test/java"/>
6	6	<classpathentry excluding="**" kind="src" output="target/test-classes" path="src/test/resources"/>
7		~~<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>~~
8	7	<classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
	8	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/jdk1.5.0_21"/>
9	9	<classpathentry kind="output" path="target/classes"/>
10	10	</classpath>

branches/private/pav/NEW_JAVA_5/sophie2-platform/modules/org.sophie2.core.logging/.classpath

r3705	r7238
5	5	<classpathentry kind="src" output="target/test-classes" path="src/test/java"/>
6	6	<classpathentry excluding="**" kind="src" output="target/test-classes" path="src/test/resources"/>
7		<classpathentry kind="con"
8		path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6" />
9		<classpathentry kind="con"
10		path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER" />
11		<classpathentry kind="output" path="target/classes" />
	7	<classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
	8	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/jdk1.5.0_21"/>
	9	<classpathentry kind="output" path="target/classes"/>
12	10	</classpath>

branches/private/pav/NEW_JAVA_5/sophie2-platform/modules/org.sophie2.core.logging/.settings/org.eclipse.jdt.core.prefs

r3705	r7238
1		#~~Thu Sep 18 21:11:04 EEST 2008~~
	1	#Mon Oct 05 13:39:12 AFT 2009
2	2	eclipse.preferences.version=1
3	3	org.eclipse.jdt.core.builder.cleanOutputFolder=clean
…	…
18	18	org.eclipse.jdt.core.codeComplete.staticFieldSuffixes=
19	19	org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
20		org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
	20	org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
21	21	org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
22		org.eclipse.jdt.core.compiler.compliance=1.6
	22	org.eclipse.jdt.core.compiler.compliance=1.5
23	23	org.eclipse.jdt.core.compiler.debug.lineNumber=generate
24	24	org.eclipse.jdt.core.compiler.debug.localVariable=generate
…	…
97	97	org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
98	98	org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
99		org.eclipse.jdt.core.compiler.source=1.6
	99	org.eclipse.jdt.core.compiler.source=1.5
100	100	org.eclipse.jdt.core.compiler.taskCaseSensitive=enabled
101	101	org.eclipse.jdt.core.compiler.taskPriorities=NORMAL,HIGH,NORMAL

branches/private/pav/NEW_JAVA_5/sophie2-platform/modules/org.sophie2.core.logging/src/main/java/org/sophie2/core/logging/LogFilter.java

r6880	r7238
72	72	}
73	73
74		~~@Override~~
75	74	public int compareTo(FilterEntry o) {
76	75	return this.compareTo(o.prefix);

branches/private/pav/NEW_JAVA_5/sophie2-platform/modules/org.sophie2.core.logging/src/main/java/org/sophie2/core/logging/MemLogTarget.java

r7093	r7238
80	80	}
81	81
82		~~@Override~~
83	82	public synchronized void putEntry(LogEntry entry) {
84	83	if (this.filter.accepts(entry)) {
…	…
93	92	}
94	93
95		~~@Override~~
96	94	public synchronized void close(boolean wait) {
97	95	this.memLog.clear();

branches/private/pav/NEW_JAVA_5/sophie2-platform/modules/org.sophie2.core.logging/src/main/java/org/sophie2/core/logging/Profiler.java

r6004	r7238
57	57	singles.entrySet());
58	58	Collections.sort(items, new Comparator<Map.Entry<StackTraceElement, Integer>>() {
59		~~@Override~~
60	59	public int compare(Entry<StackTraceElement, Integer> o1,
61	60	Entry<StackTraceElement, Integer> o2) {

branches/private/pav/NEW_JAVA_5/sophie2-platform/modules/org.sophie2.core.logging/src/main/java/org/sophie2/core/logging/StreamLogTarget.java

r6466	r7238
48	48	}
49	49
50		~~@Override~~
51	50	public void close(boolean wait) {
52	51	putEntry(new CloseEntry());
…	…
61	60	}
62	61
63		~~@Override~~
64	62	public void putEntry(LogEntry entry) {
65	63	if (this.filter.accepts(entry)) {

branches/private/pav/NEW_JAVA_5/sophie2-platform/modules/org.sophie2.core.modularity/.classpath

r117	r7238
5	5	<classpathentry kind="src" output="target/test-classes" path="src/test/java"/>
6	6	<classpathentry excluding="**" kind="src" output="target/test-classes" path="src/test/resources"/>
7		~~<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>~~
8	7	<classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
	8	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/jdk1.5.0_21"/>
9	9	<classpathentry kind="output" path="target/classes"/>
10	10	</classpath>

branches/private/pav/NEW_JAVA_5/sophie2-platform/modules/org.sophie2.core.modularity/.settings/org.eclipse.jdt.core.prefs

r117	r7238
1		#~~Thu Sep 18 21:11:04 EEST 2008~~
	1	#Mon Oct 05 13:33:14 AFT 2009
2	2	eclipse.preferences.version=1
3	3	org.eclipse.jdt.core.builder.cleanOutputFolder=clean
…	…
18	18	org.eclipse.jdt.core.codeComplete.staticFieldSuffixes=
19	19	org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
20		org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
	20	org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
21	21	org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
22		org.eclipse.jdt.core.compiler.compliance=1.6
	22	org.eclipse.jdt.core.compiler.compliance=1.5
23	23	org.eclipse.jdt.core.compiler.debug.lineNumber=generate
24	24	org.eclipse.jdt.core.compiler.debug.localVariable=generate
…	…
97	97	org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
98	98	org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
99		org.eclipse.jdt.core.compiler.source=1.6
	99	org.eclipse.jdt.core.compiler.source=1.5
100	100	org.eclipse.jdt.core.compiler.taskCaseSensitive=enabled
101	101	org.eclipse.jdt.core.compiler.taskPriorities=NORMAL,HIGH,NORMAL

branches/private/pav/NEW_JAVA_5/sophie2-platform/modules/org.sophie2.core.modularity/src/main/java/org/sophie2/core/modularity/FakeModuleRegistry.java

r6944	r7238
45	45
46	46	@SuppressWarnings("synthetic-access")
47		~~@Override~~
48	47	public void run() {
49	48	assert get() == null;
…	…
84	83	Runnable r = new Runnable() {
85	84	@SuppressWarnings("synthetic-access")
86		~~@Override~~
87	85	public void run() {
88	86	if(get() != null) {

branches/private/pav/NEW_JAVA_5/sophie2-platform/modules/org.sophie2.core.modularity/src/main/java/org/sophie2/core/modularity/FileEntryManager.java

r7131	r7238
161	161	}
162	162
163		/**
164		* Gets an executable file of an application resource located on a given path.
165		* @param entryPath The given path where the resource entry should be. For example
166		* icons/about.png
167		* @return The app resource as file, copied in tmp-distrib folder(when
168		* launched from Eclipse) or the distributed-edition folder
169		* otherwise.
170		*/
171		public File getExecutableFileEntry(String entryPath) {
172		File res = getWritableFileEntry(entryPath);
173		res.setExecutable(true, false);
174		return res;
175		}
	163	// /**
	164	// * Gets an executable file of an application resource located on a given path.
	165	// * @param entryPath The given path where the resource entry should be. For example
	166	// * icons/about.png
	167	// * @return The app resource as file, copied in tmp-distrib folder(when
	168	// * launched from Eclipse) or the distributed-edition folder
	169	// * otherwise.
	170	// */
	171	// public File getExecutableFileEntry(String entryPath) {
	172	// File res = getWritableFileEntry(entryPath);
	173	// res.setExecutable(true, false);
	174	// return res;
	175	// }
176	176
177	177	/**

branches/private/pav/NEW_JAVA_5/sophie2-platform/modules/org.sophie2.core.modularity/src/main/java/org/sophie2/core/modularity/SophieExtensionPoint.java

r6508	r7238
93	93	ServiceListener sl = new ServiceListener() {
94	94
95		~~@Override~~
96	95	public void serviceChanged(final ServiceEvent event) {
97	96	SwingUtilities.invokeLater(new Runnable(){
98	97
99	98
100		~~@Override~~
101	99	public void run() {
102	100	ServiceReference sr = event.getServiceReference();

branches/private/pav/NEW_JAVA_5/sophie2-platform/modules/org.sophie2.core.modularity/src/main/java/org/sophie2/core/modularity/SophieModule.java

r6880	r7238
32	32	}
33	33
34		~~@Override~~
35	34	public final void start(final BundleContext context) throws Exception {
36	35
…	…
40	39	SwingUtilities.invokeLater(new Runnable() {
41	40
42		~~@Override~~
43	41	public void run() {
44	42	doStart();
…	…
48	46	SwingUtilities.invokeLater(new Runnable() {
49	47
50		~~@Override~~
51	48	public void run() {
52	49	List<SophieExtensionPoint<?>> l = new ArrayList<SophieExtensionPoint<?>>();
…	…
60	57
61	58	@SuppressWarnings("synthetic-access")
62		~~@Override~~
63	59	public void run() {
64	60	Hashtable<String, String> empty = new Hashtable<String, String>();
…	…
79	75	}
80	76
81		~~@Override~~
82	77	public final void stop(BundleContext context) throws Exception {
83	78	// TODO Auto-generated method stub

branches/private/pav/NEW_JAVA_5/sophie2-platform/modules/org.sophie2.core.modularity/src/test/java/org/sophie2/core/modularity/FakeExtender.java

r1707	r7238
30	30	}
31	31
32		~~@Override~~
33	32	public String getTranslation() {
34	33	return this.translation;
35	34	}
36		~~@Override~~
37	35	public String getWord() {
38	36	return this.word;

branches/private/pav/NEW_JAVA_5/sophie2-platform/modules/org.sophie2.core.modularity/src/test/java/org/sophie2/core/modularity/FileSearchUtilTest.java

r6945	r7238
29	29	public void setUp() throws Exception {
30	30	super.setUp();
	31	System.out.println(System.getProperty("os.name"));
31	32	System.setProperty("bundlesConfigFile", FileEntryManagerTest.class.getResource("/distrib/author.bundles.config").toString());
32	33	this.fileSearchUtil = FileSearchUtil.get();
33	34	SwingUtilities.invokeAndWait(new Runnable() {
34	35
35		~~@Override~~
36	36	public void run() {
37	37	FakeModuleRegistry.start(CoreModularityModule.class);
…	…
54	54	@Test
55	55	public void testFindBundlesConfigFile() {
56
57	56	File authorConfigFile = this.fileSearchUtil.findConfigFile();
58	57	assertNotNull(authorConfigFile);

branches/private/pav/NEW_JAVA_5/sophie2-platform/modules/org.sophie2.core.mvc/.classpath

r1402	r7238
5	5	<classpathentry kind="src" output="target/test-classes" path="src/test/java"/>
6	6	<classpathentry excluding="**" kind="src" output="target/test-classes" path="src/test/resources"/>
7		<classpathentry kind="con"
8		path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6" />
9		<classpathentry kind="con"
10		path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER" />
11		<classpathentry kind="output" path="target/classes" />
	7	<classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
	8	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/jdk1.5.0_21"/>
	9	<classpathentry kind="output" path="target/classes"/>
12	10	</classpath>

branches/private/pav/NEW_JAVA_5/sophie2-platform/modules/org.sophie2.core.mvc/.settings/org.eclipse.jdt.core.prefs

r1162	r7238
1		#~~Thu Sep 18 21:11:04 EEST 2008~~
	1	#Mon Oct 05 13:39:47 AFT 2009
2	2	eclipse.preferences.version=1
3	3	org.eclipse.jdt.core.builder.cleanOutputFolder=clean
…	…
18	18	org.eclipse.jdt.core.codeComplete.staticFieldSuffixes=
19	19	org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
20		org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
	20	org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
21	21	org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
22		org.eclipse.jdt.core.compiler.compliance=1.6
	22	org.eclipse.jdt.core.compiler.compliance=1.5
23	23	org.eclipse.jdt.core.compiler.debug.lineNumber=generate
24	24	org.eclipse.jdt.core.compiler.debug.localVariable=generate
…	…
97	97	org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
98	98	org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
99		org.eclipse.jdt.core.compiler.source=1.6
	99	org.eclipse.jdt.core.compiler.source=1.5
100	100	org.eclipse.jdt.core.compiler.taskCaseSensitive=enabled
101	101	org.eclipse.jdt.core.compiler.taskPriorities=NORMAL,HIGH,NORMAL

branches/private/pav/NEW_JAVA_5/sophie2-platform/modules/org.sophie2.core.mvc/src/main/java/org/sophie2/core/mvc/SimpleOperation.java

r5614	r7238
34	34	}
35	35
36		~~@Override~~
37	36	public String getSortKey() {
38	37	String sortKey = "kkk-default-sort-key";
…	…
58	57	}
59	58
60		~~@Override~~
61	59	public EventFilter getFilter() {
62	60	return this.filter;
63	61	}
64	62
65		~~@Override~~
66	63	public boolean handle(EventR3 event) {
67	64	return this.opDef.handle(event);

branches/private/pav/NEW_JAVA_5/sophie2-platform/modules/org.sophie2.core.mvc/src/test/java/org/sophie2/core/mvc/LogicDemoTest.java

r6508	r7238
208	208	ON_ADD_ITEM {
209	209
210		~~@Override~~
211	210	public void defineFilter(EventFilterBuilder filter) {
212	211	filter.setEventId(SampleView.EventIds.ADD_ITEM);
…	…
214	213	}
215	214
216		~~@Override~~
217	215	public boolean handle(EventR3 event) {
218	216	SampleView view = event.getSource(SampleView.class);
…	…
233	231	ON_REMOVE_FIRST_OR_LAST {
234	232
235		~~@Override~~
236	233	public void defineFilter(EventFilterBuilder filter) {
237	234	filter.setEventId(SampleView.EventIds.REMOVE_ITEM);
…	…
239	236	}
240	237
241		~~@Override~~
242	238	public boolean handle(EventR3 event) {
243	239	SampleView view = event.getSource(SampleView.class);
…	…
270	266	ON_REMOVE_ALL {
271	267
272		~~@Override~~
273	268	public void defineFilter(EventFilterBuilder filter) {
274	269	filter.setEventId(SampleView.EventIds.REMOVE_ITEM);
…	…
277	272	}
278	273
279		~~@Override~~
280	274	public boolean handle(EventR3 event) {
281	275	SampleView view = event.getSource(SampleView.class);

branches/private/pav/NEW_JAVA_5/sophie2-platform/modules/org.sophie2.core.mvc/src/test/java/org/sophie2/core/mvc/LogicPriorityTest.java

r5020	r7238
97	97	OPERATION_1 {
98	98
99		~~@Override~~
100	99	public void defineFilter(EventFilterBuilder filter) {
101	100	filter.setEventId(EventIds.TEST);
102	101	}
103	102
104		~~@Override~~
105	103	public boolean handle(EventR3 event) {
106	104	LogicPriorityTest.results.add(1);
…	…
117	115	OPERATION_2 {
118	116
119		~~@Override~~
120	117	public void defineFilter(EventFilterBuilder filter) {
121	118	filter.setEventId(EventIds.TEST);
122	119	}
123	120
124		~~@Override~~
125	121	public boolean handle(EventR3 event) {
126	122	LogicPriorityTest.results.add(2);
…	…
137	133	OPERATION_3 {
138	134
139		~~@Override~~
140	135	public void defineFilter(EventFilterBuilder filter) {
141	136	filter.setEventId(EventIds.TEST);
142	137	}
143	138
144		~~@Override~~
145	139	public boolean handle(EventR3 event) {
146	140	LogicPriorityTest.results.add(3);

branches/private/pav/NEW_JAVA_5/sophie2-platform/modules/org.sophie2.core/.settings/org.eclipse.jdt.core.prefs

r115	r7238
1		#~~Thu Sep 18 21:11:04 EEST 2008~~
	1	#Mon Oct 05 13:39:06 AFT 2009
2	2	eclipse.preferences.version=1
3	3	org.eclipse.jdt.core.builder.cleanOutputFolder=clean
…	…
18	18	org.eclipse.jdt.core.codeComplete.staticFieldSuffixes=
19	19	org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
20		org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
	20	org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
21	21	org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
22		org.eclipse.jdt.core.compiler.compliance=1.6
	22	org.eclipse.jdt.core.compiler.compliance=1.5
23	23	org.eclipse.jdt.core.compiler.debug.lineNumber=generate
24	24	org.eclipse.jdt.core.compiler.debug.localVariable=generate
…	…
97	97	org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
98	98	org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
99		org.eclipse.jdt.core.compiler.source=1.6
	99	org.eclipse.jdt.core.compiler.source=1.5
100	100	org.eclipse.jdt.core.compiler.taskCaseSensitive=enabled
101	101	org.eclipse.jdt.core.compiler.taskPriorities=NORMAL,HIGH,NORMAL

branches/private/pav/NEW_JAVA_5/sophie2-platform/modules/org.sophie2.core/src/main/java/org/sophie2/core/prolib/Aspect.java

r4943	r7238
39	39	}
40	40
41		~~@Override~~
42	41	public String debugId() {
43	42	return "aspect@" + this;
…	…
93	92	}
94	93
95		~~@Override~~
96	94	public ChangeManager getChangeManager() {
97	95	// All {@link Aspect} {@link Changes} are side effects.

branches/private/pav/NEW_JAVA_5/sophie2-platform/modules/org.sophie2.core/src/main/java/org/sophie2/core/prolib/BasePro.java

r5614	r7238
38	38	* @return the lifetime state of the property
39	39	*/
40		~~@Override~~
41	40	public ProStatus getState() {
42	41	Registry.get().registerRead(this);
…	…
97	96	}
98	97
99		~~@Override~~
100	98	public final void addListener(ProListener listener) {
101	99	assert !getListeners().contains(listener);
…	…
104	102	}
105	103
106		~~@Override~~
107	104	public final void removeListener(ProListener listener) {
108	105	if (!getListeners().contains(listener)) {

branches/private/pav/NEW_JAVA_5/sophie2-platform/modules/org.sophie2.core/src/main/java/org/sophie2/core/prolib/bean/CollectingBeanData.java

r4155	r7238
42	42	}
43	43
44		~~@Override~~
45	44	public Property<?> getProperty(String id) {
46	45	return null;
47	46	}
48	47
49		~~@Override~~
50	48	public <T extends Property<?>> T makeProp(Class<T> propertyClass) {
51	49	consume(ReflectionUtil.classToId(propertyClass), PropMetaInfo.create(getBean(), getCurMethod(), propertyClass));
…	…
53	51	}
54	52
55		~~@Override~~
56	53	public <T> RwProp<T> makeValueProp(String id, Class<T> valueClass) {
57	54	consume(id, PropMetaInfo.createValue(getBean(), getCurMethod(),
…	…
60	57	}
61	58
62		~~@Override~~
63	59	public <T> RwProp<T> makeValueProp(String id, Class<T> valueClass,
64	60	T initValue) {
…	…
69	65	}
70	66
71		~~@Override~~
72	67	public Collection<Property<?>> getProperties() {
73	68	// we don't have properties yet.
…	…
75	70	}
76	71
77		~~@Override~~
78	72	public <T> Prop<T> makeFinalProp(String id, Class<T> valueClass) {
79	73	consume(id, PropMetaInfo.createFinal(getBean(), getCurMethod(),
…	…
82	76	}
83	77
84		~~@Override~~
85	78	public <T> RwListProp<T> makeListProp(String id, Class<T> elementClass) {
86	79	consume(id, PropMetaInfo.createList(getBean(), getCurMethod(),
…	…
89	82	}
90	83
91		~~@Override~~
92	84	public <T extends ProObject> ParentProperty<T> makeParentProp(
93	85	Class<T> parentClass) {
…	…
97	89	}
98	90
99		~~@Override~~
100	91	public ChangeProperty makeChangeProperty() {
101	92	consume(ProBean.CHANGE_MANAGER_ID, PropMetaInfo.createChange(getBean(),

branches/private/pav/NEW_JAVA_5/sophie2-platform/modules/org.sophie2.core/src/main/java/org/sophie2/core/prolib/bean/DestroyedBeanData.java

r4308	r7238
28	28	}
29	29
30		~~@Override~~
31	30	public Property<?> getProperty(String id) {
32	31	throw new NotAvailableException("Already destroyed!", null);
…	…
46	45	}
47	46
48		~~@Override~~
49	47	public Collection<Property<?>> getProperties() {
50	48	throw new IllegalStateException("Already destroyed!");
51	49	}
52	50
53		~~@Override~~
54	51	public <T> Prop<T> makeFinalProp(String id, Class<T> valueClass) {
55	52	throw new IllegalStateException("Already destroyed!");
56	53	}
57	54
58		~~@Override~~
59	55	public <T> RwListProp<T> makeListProp(String id, Class<T> elementClass) {
60	56	throw new IllegalStateException("Already destroyed!");
61	57	}
62	58
63		~~@Override~~
64	59	public <T extends ProObject> ParentProperty<T> makeParentProp(
65	60	Class<T> parentClass) {
…	…
67	62	}
68	63
69		~~@Override~~
70	64	public <T extends Property<?>> T makeProp(Class<T> propertyClass) {
71	65	throw new IllegalStateException("Already destroyed!");
72	66	}
73	67
74		~~@Override~~
75	68	public ChangeProperty makeChangeProperty() {
76	69	throw new IllegalStateException("Already destroyed!");
77	70	}
78	71
79		~~@Override~~
80	72	public <T> RwProp<T> makeValueProp(String id, Class<T> valueClass) {
81	73	throw new IllegalStateException("Already destroyed!");
82	74	}
83	75
84		~~@Override~~
85	76	public <T> RwProp<T> makeValueProp(String id, Class<T> valueClass,
86	77	T initValue) {

branches/private/pav/NEW_JAVA_5/sophie2-platform/modules/org.sophie2.core/src/main/java/org/sophie2/core/prolib/bean/InitializingBeanData.java

r5670	r7238
48	48	}
49	49
50		~~@Override~~
51	50	public Property<?> getProperty(String id) {
52	51	// SophieLog.debug("InitializingBeanData.getProperty(): "+id);
…	…
195	194	}
196	195
197		~~@Override~~
198	196	@SuppressWarnings("unchecked")
199	197	public <T> Prop<T> makeFinalProp(String id, Class<T> valueClass) {
…	…
201	199	}
202	200
203		~~@Override~~
204	201	@SuppressWarnings("unchecked")
205	202	public <T> RwListProp<T> makeListProp(String id, Class<T> elementClass) {
…	…
207	204	}
208	205
209		~~@Override~~
210	206	@SuppressWarnings("unchecked")
211	207	public <T extends ProObject> ParentProperty<T> makeParentProp(
…	…
214	210	}
215	211
216		~~@Override~~
217	212	@SuppressWarnings("unchecked")
218	213	public <T extends Property<?>> T makeProp(Class<T> propertyClass) {
…	…
220	215	}
221	216
222		~~@Override~~
223	217	public ChangeProperty makeChangeProperty() {
224	218	return (ChangeProperty) getExistingProperty(ProBean.CHANGE_MANAGER_ID);
225	219	}
226	220
227		~~@Override~~
228	221	@SuppressWarnings("unchecked")
229	222	public <T> RwProp<T> makeValueProp(String id, Class<T> valueClass) {
…	…
231	224	}
232	225
233		~~@Override~~
234	226	@SuppressWarnings("unchecked")
235	227	public <T> RwProp<T> makeValueProp(String id, Class<T> valueClass,
…	…
250	242	}
251	243
252		~~@Override~~
253	244	public Collection<Property<?>> getProperties() {
254	245	return Collections.unmodifiableCollection(this.properties.values());

branches/private/pav/NEW_JAVA_5/sophie2-platform/modules/org.sophie2.core/src/main/java/org/sophie2/core/prolib/bean/ProBean.java

r6508	r7238
56	56	}
57	57
58		~~@Override~~
59	58	public Collection<Property<?>> getProperties() {
60	59	return getData().getProperties();
61	60	}
62	61
63		~~@Override~~
64	62	public Property getProperty(String id) {
65	63	return getData().getProperty(id);
…	…
99	97	}
100	98
101		~~@Override~~
102	99	public <T extends Property<?>> T makeProp(Class<T> propertyClass) {
103	100	return getData().makeProp(propertyClass);
104	101	}
105	102
106		~~@Override~~
107	103	public <T> RwProp<T> makeValueProp(String id, Class<T> valueClass) {
108	104	return getData().makeValueProp(id, valueClass);
109	105	}
110	106
111		~~@Override~~
112	107	public <T> RwProp<T> makeValueProp(String id, Class<T> valueClass,
113	108	T initValue) {
…	…
270	265	}
271	266
272		~~@Override~~
273	267	public ChangeManager getChangeManager() {
274	268	return DefaultChangeManager.get();
…	…
296	290	}
297	291
298		~~@Override~~
299	292	public String debugId() {
300	293	return "pro-bean(" + getObject().getClass();

branches/private/pav/NEW_JAVA_5/sophie2-platform/modules/org.sophie2.core/src/main/java/org/sophie2/core/prolib/bean/ReadyBeanData.java

r3795	r7238
40	40	}
41	41
42		~~@Override~~
43	42	public Collection<Property<?>> getProperties() {
44	43	return Collections.unmodifiableCollection(this.properties.values());
45	44	}
46	45
47		~~@Override~~
48	46	public Property<?> getProperty(String id) {
49	47	return this.properties.get(id);
50	48	}
51	49
52		~~@Override~~
53	50	@SuppressWarnings("unchecked")
54	51	public <T> Prop<T> makeFinalProp(String id, Class<T> valueClass) {
…	…
56	53	}
57	54
58		~~@Override~~
59	55	@SuppressWarnings("unchecked")
60	56	public <T> RwListProp<T> makeListProp(String id, Class<T> elementClass) {
…	…
62	58	}
63	59
64		~~@Override~~
65	60	@SuppressWarnings("unchecked")
66	61	public <T extends ProObject> ParentProperty<T> makeParentProp(
…	…
69	64	}
70	65
71		~~@Override~~
72	66	@SuppressWarnings("unchecked")
73	67	public <T extends Property<?>> T makeProp(Class<T> propertyClass) {
…	…
75	69	}
76	70
77		~~@Override~~
78	71	public ChangeProperty makeChangeProperty() {
79	72	return (ChangeProperty) getExistingProperty(ProBean.CHANGE_MANAGER_ID);
80	73	}
81	74
82		~~@Override~~
83	75	@SuppressWarnings("unchecked")
84	76	public <T> RwProp<T> makeValueProp(String id, Class<T> valueClass) {
…	…
86	78	}
87	79
88		~~@Override~~
89	80	@SuppressWarnings("unchecked")
90	81	public <T> RwProp<T> makeValueProp(String id, Class<T> valueClass,

branches/private/pav/NEW_JAVA_5/sophie2-platform/modules/org.sophie2.core/src/main/java/org/sophie2/core/prolib/impl/AutoTracker.java

r5614	r7238
28	28	private ProListener listener = new ProListener() {
29	29
30		~~@Override~~
31	30	public void changed(ProChange p) {
32	31	doUpdate(p);

branches/private/pav/NEW_JAVA_5/sophie2-platform/modules/org.sophie2.core/src/main/java/org/sophie2/core/prolib/impl/BaseProObject.java

r6508	r7238
14	14	private ProBean bean;
15	15
16		~~@Override~~
17	16	public ProBean getBean() {
18	17	if (this.bean == null) {

branches/private/pav/NEW_JAVA_5/sophie2-platform/modules/org.sophie2.core/src/main/java/org/sophie2/core/prolib/impl/ChildrenProperty.java

r697	r7238
26	26
27	27	@SuppressWarnings("unchecked")
28		~~@Override~~
29	28	public void changed(ProChange change) {
30	29	if (change instanceof ProListChange) {

branches/private/pav/NEW_JAVA_5/sophie2-platform/modules/org.sophie2.core/src/main/java/org/sophie2/core/prolib/impl/ListProperty.java

r4155	r7238
170	170	protected abstract ProList<T> createList(PropMetaInfo info);
171	171
172		~~@Override~~
173	172	public T get(int index) {
174	173	return get().get(index);
175	174	}
176	175
177		~~@Override~~
178	176	public int size() {
179	177	return get().size();
…	…
216	214
217	215	@SuppressWarnings( { "unchecked" })
218		~~@Override~~
219	216	public void changed(ProChange change) {
220	217	ProObject owner = owner();

branches/private/pav/NEW_JAVA_5/sophie2-platform/modules/org.sophie2.core/src/main/java/org/sophie2/core/prolib/impl/ObjectProperty.java

r5670	r7238
71	71	}
72	72
73		~~@Override~~
74	73	public void set(T value) {
75	74	throw new UnsupportedOperationException("Property " + debugId()
…	…
306	305	ProObject oldOwned = null;
307	306
308		~~@Override~~
309	307	public void changed(ProChange change) {
310	308	ProObject newOwned = null;

branches/private/pav/NEW_JAVA_5/sophie2-platform/modules/org.sophie2.core/src/main/java/org/sophie2/core/prolib/impl/Property.java

r4308	r7238
37	37	private PropMetaInfo metaInfo = null;
38	38
39		~~@Override~~
40	39	public PropMetaInfo getMetaInfo() {
41	40	return this.metaInfo;
…	…
78	77	protected abstract void initOwnAnnotation(PropMetaInfo info);
79	78
80		~~@Override~~
81	79	public final String id() {
82	80	return getMetaInfo().getStaticInfo().getId();
…	…
84	82
85	83	@SuppressWarnings("unchecked")
86		~~@Override~~
87	84	public final Class<T> valueClass() {
88	85	return (Class<T>)getMetaInfo().getValueClass();
…	…
94	91	}
95	92
96		~~@Override~~
97	93	public final ProObject owner() {
98	94	assert getMetaInfo() != null;
…	…
101	97	}
102	98
103		~~@Override~~
104	99	public T get() {
105	100	throw new UnsupportedOperationException("Property " + debugId() + " can not be read!");
106	101	}
107	102
108		~~@Override~~
109	103	public String debugId() {
110	104	if(getMetaInfo() == null) {
…	…
164	158	protected abstract PropMetaInfo computeMetaInfo(ProObject owner, Method method);
165	159
166		~~@Override~~
167	160	public ChangeManager getChangeManager() {
168	161	if(getMetaInfo() == null) {

branches/private/pav/NEW_JAVA_5/sophie2-platform/modules/org.sophie2.core/src/main/java/org/sophie2/core/prolib/impl/ValueListProperty.java

r1707	r7238
66	66	//their purpose.
67	67
68		~~@Override~~
69	68	public final void add(T element) {
70	69	get().add(element);
71	70	}
72	71
73		~~@Override~~
74	72	public final void remove(int index) {
75	73	get().remove(index);
76	74	}
77	75
78		~~@Override~~
79	76	public final void set(int index, T element) {
80	77	get().set(index, element);

branches/private/pav/NEW_JAVA_5/sophie2-platform/modules/org.sophie2.core/src/main/java/org/sophie2/core/prolib/inspector/Inspector.java

r6508	r7238
102	102	frame.addMouseListener(new MouseListener() {
103	103
104		~~@Override~~
105	104	public void mouseClicked(MouseEvent e) {
106	105	SophieLog.info(getBean().toString());
107
108		}
109
110		@Override
	106	}
	107
111	108	public void mouseEntered(MouseEvent e) {
112	109	// do nothing
113	110	}
114	111
115		~~@Override~~
116	112	public void mouseExited(MouseEvent e) {
117	113	// do nothing
118	114	}
119	115
120		~~@Override~~
121	116	public void mousePressed(MouseEvent e) {
122	117	// do nothing
123	118	}
124	119
125		~~@Override~~
126	120	public void mouseReleased(MouseEvent e) {
127	121	// do nothing
…	…
154	148	protected void setup(JButton resource) {
155	149	resource.addActionListener(new ActionListener() {
156		~~@Override~~
157	150	public void actionPerformed(ActionEvent e) {
158	151	refresh();
…	…
409	402	resource.addKeyListener(new KeyListener() {
410	403
411		~~@Override~~
412	404	public void keyTyped(KeyEvent e) {
413	405	// empty
414	406	}
415	407
416		~~@Override~~
417	408	public void keyReleased(KeyEvent e) {
418	409	// empty
419	410	}
420	411
421		~~@Override~~
422	412	public void keyPressed(KeyEvent e) {
423	413	if (e.getKeyCode() == KeyEvent.VK_RIGHT) {

branches/private/pav/NEW_JAVA_5/sophie2-platform/modules/org.sophie2.core/src/main/java/org/sophie2/core/prolib/inspector/InspectorModel.java

r4155	r7238
353	353	}
354	354
355		~~@Override~~
356	355	public int getChildCount(Object parent) {
357	356	return ((Node) parent).getChildren().size();
358	357	}
359	358
360		~~@Override~~
361	359	public Class<?> getColumnClass(int column) {
362	360	return COLUMN_CLASSES.get(column);
363	361	}
364	362
365		~~@Override~~
366	363	public int getColumnCount() {
367	364	return COLUMN_NAMES.size();
368	365	}
369	366
370		~~@Override~~
371	367	public String getColumnName(int column) {
372	368	return COLUMN_NAMES.get(column);
373	369	}
374	370
375		~~@Override~~
376	371	public Object getValueAt(Object node, int column) {
377	372	return ((Node) node).getCells().get(column);
378	373	}
379	374
380		~~@Override~~
381	375	public int getIndexOfChild(Object parent, Object child) {
382	376	return ((Node) parent).getCells().indexOf(child);

branches/private/pav/NEW_JAVA_5/sophie2-platform/modules/org.sophie2.core/src/main/java/org/sophie2/core/prolib/inspector/InspectorSettingsPanel.java

r6508	r7238
169	169	res.addChangeListener(new ChangeListener() {
170	170	@SuppressWarnings("synthetic-access")
171		~~@Override~~
172	171	public void stateChanged(ChangeEvent e) {
173	172	if(fieldsCheckBox().get().isSelected()) {
…	…
211	210
212	211	checkBox.addChangeListener(new ChangeListener() {
213		~~@Override~~
214	212	public void stateChanged(ChangeEvent e) {
215	213	TableFields.setIsEnabled(checkBox.getText(), checkBox.isSelected());

branches/private/pav/NEW_JAVA_5/sophie2-platform/modules/org.sophie2.core/src/main/java/org/sophie2/core/prolib/list/BaseProList.java

r6429	r7238
737	737	}
738	738
739		~~@Override~~
740	739	public <T> ProList<T> transform(ProListTransformer<E, T> transformer) {
741	740	return transform(null, transformer);
…	…
743	742
744	743	@SuppressWarnings("unchecked")
745		~~@Override~~
746	744	public <T> ProList<T> transform(Class<T> targetCl,
747	745	ProListTransformer<E, T> transformer) {
…	…
763	761
764	762	@SuppressWarnings("unchecked")
765		~~@Override~~
766	763	public ProList<E> filter(ProListFilter<E> filter) {
767	764	Class<E> elemClass = (Class<E>) ReflectionUtil
…	…
772	769	// /after here... are the delegating list methods...
773	770
774		~~@Override~~
775	771	public int size() {
776	772	return getPublicCache().size();
777	773	}
778	774
779		~~@Override~~
780	775	public E get(int index) {
781	776	return getPublicCache().get(index);
782	777	}
783	778
784		~~@Override~~
785	779	public boolean add(E e) {
786	780	return getPublicCache().add(e);
787	781	}
788	782
789		~~@Override~~
790	783	public void add(int index, E element) {
791	784	getPublicCache().add(index, element);
792	785	}
793	786
794		~~@Override~~
795	787	public boolean addAll(Collection<? extends E> c) {
796	788	return getPublicCache().addAll(c);
797	789	}
798	790
799		~~@Override~~
800	791	public boolean addAll(int index, Collection<? extends E> c) {
801	792	return getPublicCache().addAll(index, c);
802	793	}
803	794
804		~~@Override~~
805	795	public void clear() {
806	796	getPublicCache().clear();
…	…
808	798	}
809	799
810		~~@Override~~
811	800	public boolean contains(Object o) {
812	801	return getPublicCache().contains(o);
813	802	}
814	803
815		~~@Override~~
816	804	public boolean containsAll(Collection<?> c) {
817	805	return getPublicCache().containsAll(c);
818	806	}
819	807
820		~~@Override~~
821	808	public int indexOf(Object o) {
822	809	return getPublicCache().indexOf(o);
823	810	}
824	811
825		~~@Override~~
826	812	public boolean isEmpty() {
827	813	return getPublicCache().isEmpty();
828	814	}
829	815
830		~~@Override~~
831	816	public Iterator<E> iterator() {
832	817	return getPublicCache().iterator();
833	818	}
834	819
835		~~@Override~~
836	820	public int lastIndexOf(Object o) {
837	821	return getPublicCache().lastIndexOf(o);
…	…
916	900	}
917	901
918		~~@Override~~
919	902	public void setOwner(Pro owner) {
920	903	assert owner != null;
…	…
933	916	}
934	917
935		~~@Override~~
936	918	public List<E> findAll(Object key) {
937	919	return getMultimap().get(key);
938	920	}
939	921
940		~~@Override~~
941	922	public E findOne(Object key) {
942	923	List<E> elements = findAll(key);

branches/private/pav/NEW_JAVA_5/sophie2-platform/modules/org.sophie2.core/src/main/java/org/sophie2/core/prolib/list/ComposingProList.java

r4155	r7238
86	86	protected abstract List<? extends E> computeData();
87	87
88		~~@Override~~
89	88	public String debugId() {
90	89	return "composing-list@" + getOwnerId();
91	90	}
92	91
93		~~@Override~~
94	92	public ChangeManager getChangeManager() {
95	93	// Not undoable.

branches/private/pav/NEW_JAVA_5/sophie2-platform/modules/org.sophie2.core/src/main/java/org/sophie2/core/prolib/list/EmptyProList.java

r3795	r7238
20	20	}
21	21
22		~~@Override~~
23	22	public String debugId() {
24	23	return "empty-pro-list";
25	24	}
26	25
27		~~@Override~~
28	26	public ChangeManager getChangeManager() {
29	27	// not undoable

branches/private/pav/NEW_JAVA_5/sophie2-platform/modules/org.sophie2.core/src/main/java/org/sophie2/core/prolib/list/FilteringProList.java

r4155	r7238
52	52
53	53	@SuppressWarnings( { "unchecked", "synthetic-access" })
54		~~@Override~~
55	54	public void changed(ProChange change) {
56	55	SophieLog.trace(change);
…	…
168	167	}
169	168
170		~~@Override~~
171	169	public String debugId() {
172	170	return "filtering-list@" + getOwnerId();
173	171	}
174	172
175		~~@Override~~
176	173	public ChangeManager getChangeManager() {
177	174	// not undoable

branches/private/pav/NEW_JAVA_5/sophie2-platform/modules/org.sophie2.core/src/main/java/org/sophie2/core/prolib/list/TrackingProList.java

r6880	r7238
80	80
81	81	@SuppressWarnings("unchecked")
82		~~@Override~~
83	82	public void changed(ProChange change) {
84	83	assert change.getSource() == TrackingProList.this.currentSource :
…	…
133	132	protected abstract ProList<? extends E> computeSource();
134	133
135		~~@Override~~
136	134	public String debugId() {
137	135	return "tracking-list@" + getOwnerId();
…	…
143	141	}
144	142
145		~~@Override~~
146	143	public ChangeManager getChangeManager() {
147	144	// not undoable

branches/private/pav/NEW_JAVA_5/sophie2-platform/modules/org.sophie2.core/src/main/java/org/sophie2/core/prolib/list/TransformingProList.java

r6880	r7238
35	35
36	36	@SuppressWarnings({ "unchecked", "synthetic-access" })
37		~~@Override~~
38	37	public void changed(ProChange change) {
39	38	SophieLog.trace(change);
…	…
130	129	}
131	130
132		~~@Override~~
133	131	public String debugId() {
134	132	return "transforming-list@" + getOwnerId();
135	133	}
136	134
137		~~@Override~~
138	135	public ChangeManager getChangeManager() {
139	136	// not undoable

branches/private/pav/NEW_JAVA_5/sophie2-platform/modules/org.sophie2.core/src/main/java/org/sophie2/core/prolib/list/ValueProList.java

r3795	r7238
64	64	}
65	65
66		~~@Override~~
67	66	public String debugId() {
68	67	return "value-list@" + getOwnerId();
69	68	}
70	69
71		~~@Override~~
72	70	public ChangeManager getChangeManager() {
73	71	if(this.getOwner() == null) {

branches/private/pav/NEW_JAVA_5/sophie2-platform/modules/org.sophie2.core/src/main/java/org/sophie2/core/prolib/util/DefaultChangeManager.java

r3795	r7238
31	31	}
32	32
33		~~@Override~~
34	33	public void register(Change change) {
35	34	change.execute();

branches/private/pav/NEW_JAVA_5/sophie2-platform/modules/org.sophie2.core/src/main/java/org/sophie2/core/prolib/util/Registry.java

r6466	r7238
1	1	package org.sophie2.core.prolib.util;
2	2
3		~~import java.util.ArrayDeque;~~
4	3	import java.util.ArrayList;
5		~~import java.util.Deque;~~
6	4	import java.util.IdentityHashMap;
7	5	import java.util.List;
…	…
63	61
64	62	private IdentityHashMap<Object, TrackData> readMap;
65		private ~~Deque~~<Object> keyStack;
	63	private Stack<Object> keyStack;
66	64
67	65	private IdentityHashMap<Object, TrackData> getReadMap() {
…	…
72	70	}
73	71
74		private ~~Deque~~<Object> getKeyStack() {
	72	private Stack<Object> getKeyStack() {
75	73	if (this.keyStack == null) {
76		this.keyStack = new ~~ArrayDeque~~<Object>();
	74	this.keyStack = new Stack.StackImpl<Object>();
77	75	}
78	76	return this.keyStack;

branches/private/pav/NEW_JAVA_5/sophie2-platform/modules/org.sophie2.core/src/main/java/org/sophie2/core/prolib/util/SwingBean.java

r4155	r7238
47	47
48	48	@SuppressWarnings("unchecked")
49		~~@Override~~
50	49	public void propertyChange(PropertyChangeEvent evt) {
51	50	// SophieLog.debug(("propertyChange:
…	…
76	75
77	76	@SuppressWarnings("unchecked")
78		~~@Override~~
79	77	public void changed(ProChange pc) {
80	78	try {

branches/private/pav/NEW_JAVA_5/sophie2-platform/modules/org.sophie2.core/src/test/java/org/sophie2/core/prolib/AutoTest.java

r6508	r7238
63	63	}
64	64	}.transform(new ProListTransformer<Integer, String>() {
65		~~@Override~~
66	65	public String translate(Integer source) {
67	66	SophieLog.trace("translateSourceToTarget");

branches/private/pav/NEW_JAVA_5/sophie2-platform/modules/org.sophie2.core/src/test/java/org/sophie2/core/prolib/BaseProTest.java

r4155	r7238
32	32	class DummyPro extends BasePro {
33	33
34		~~@Override~~
35	34	public String debugId() {
36	35	return "dummy-pro@" + this;
37	36	}
38	37
39		~~@Override~~
40	38	public ChangeManager getChangeManager() {
41	39	return DefaultChangeManager.get();
…	…
73	71	}
74	72
75		~~@Override~~
76	73	public void changed(ProChange change) {
77	74	if (this.output != null) {

branches/private/pav/NEW_JAVA_5/sophie2-platform/modules/org.sophie2.core/src/test/java/org/sophie2/core/prolib/DummyListener.java

r1162	r7238
28	28	}
29	29
30		~~@Override~~
31	30	public void changed(ProChange change) {
32	31	if (this.output != null) {

branches/private/pav/NEW_JAVA_5/sophie2-platform/modules/org.sophie2.core/src/test/java/org/sophie2/core/prolib/GeneralTest.java

r6508	r7238
28	28	private ProBean bean;
29	29
30		~~@Override~~
31	30	public ProBean getBean() {
32	31	if(this.bean == null) {
…	…
35	34	return this.bean;
36	35	}
37
	36
38	37	public static class Name extends ValueProperty<String> {
39	38
…	…
197	196	}
198	197
199		~~@Override~~
200	198	public ProBean getBean() {
201	199	return ProBean.getObjectBean(this);
202	200	}
203
204	201	}
205	202

branches/private/pav/NEW_JAVA_5/sophie2-platform/modules/org.sophie2.core/src/test/java/org/sophie2/core/prolib/impl/AutoTrackerTest.java

r4308	r7238
37	37	int count = 0;
38	38
39		~~@Override~~
40	39	public String debugId() {
41	40	// TODO Auto-generated method stub
…	…
43	42	}
44	43
45		~~@Override~~
46	44	public ChangeManager getChangeManager() {
47	45	return DefaultChangeManager.get();

branches/private/pav/NEW_JAVA_5/sophie2-platform/modules/org.sophie2.core/src/test/java/org/sophie2/core/prolib/impl/PropertyTest.java

r6508	r7238
97	97	};
98	98
99		~~@Override~~
100	99	public ProBean getBean() {
101	100	return this.bean;

branches/private/pav/NEW_JAVA_5/sophie2-platform/modules/org.sophie2.core/src/test/java/org/sophie2/core/prolib/list/BaseProListAspectsTest.java

r6508	r7238
92	92	}
93	93
94		~~@Override~~
95	94	public String debugId() {
96	95	return "TestProList";
97	96	}
98	97
99		~~@Override~~
100	98	public ChangeManager getChangeManager() {
101	99	return DefaultChangeManager.get();

branches/private/pav/NEW_JAVA_5/sophie2-platform/modules/org.sophie2.core/src/test/java/org/sophie2/core/prolib/list/BaseProListTest.java

r3795	r7238
195	195	}
196	196
197		~~@Override~~
198	197	public String debugId() {
199	198	// TODO Auto-generated method stub
…	…
201	200	}
202	201
203		~~@Override~~
204	202	public ChangeManager getChangeManager() {
205	203	// TODO Auto-generated method stub
…	…
211	209	class MyPro extends BasePro {
212	210
213		~~@Override~~
214	211	public String debugId() {
215	212	// TODO Auto-generated method stub
…	…
217	214	}
218	215
219		~~@Override~~
220	216	public ChangeManager getChangeManager() {
221	217	return DefaultChangeManager.get();

branches/private/pav/NEW_JAVA_5/sophie2-platform/modules/org.sophie2.core/src/test/java/org/sophie2/core/prolib/list/ComposingListTest.java

r6508	r7238
143	143	h.allData().get().addListener(new ProListener() {
144	144
145		~~@Override~~
146	145	public void changed(ProChange change) {
147	146	if (change instanceof ProListChange) {

branches/private/pav/NEW_JAVA_5/sophie2-platform/modules/org.sophie2.core/src/test/java/org/sophie2/core/prolib/ListenerTest.java

r6508	r7238
39	39	private ProBean bean;
40	40
41		~~@Override~~
42	41	public ProBean getBean() {
43	42	if(this.bean == null) {
…	…
101	100	age().set(age().get() + 1);
102	101	}
103
104	102	}
105	103
…	…
137	135	}
138	136
139		~~@Override~~
140	137	public ProBean getBean() {
141	138	return ProBean.getObjectBean(this);
…	…
165	162	ProListener l = new ProListener() {
166	163
167		~~@Override~~
168	164	public void changed(ProChange change) {
169	165	changes.add(change);

branches/private/pav/NEW_JAVA_5/sophie2-platform/modules/org.sophie2.core/src/test/java/org/sophie2/core/prolib/list/FilteringProListTest.java

r6508	r7238
59	59	}.filter(new ProListFilter<String>() {
60	60
61		~~@Override~~
62	61	public boolean accepts(String item) {
63	62	// accept only items longer than 3 characters.
…	…
77	76	h.parsed().get().addListener(new ProListener() {
78	77
79		~~@Override~~
80	78	public void changed(ProChange change) {
81	79	if (change instanceof ProListChange) {

branches/private/pav/NEW_JAVA_5/sophie2-platform/modules/org.sophie2.core/src/test/java/org/sophie2/core/prolib/list/testDebugId.java

r6508	r7238
39	39	class DummyPro extends BasePro implements ProObject {
40	40
41		~~@Override~~
42	41	public String debugId() {
43	42	return "dummy-pro";
44	43	}
45	44
46		~~@Override~~
47	45	public ChangeManager getChangeManager() {
48	46	return testDebugId.this.changeManager;
…	…
59	57	}
60	58
61		~~@Override~~
62	59	public ProBean getBean() {
63	60	// no bean.

branches/private/pav/NEW_JAVA_5/sophie2-platform/modules/org.sophie2.core/src/test/java/org/sophie2/core/prolib/list/TrackingProListTest.java

r6508	r7238
67	67	h.allData().get().addListener(new ProListener() {
68	68
69		~~@Override~~
70	69	public void changed(ProChange change) {
71	70	if (change instanceof ProListChange) {
…	…
384	383	h.parsed().get().addListener(new ProListener() {
385	384
386		~~@Override~~
387	385	public void changed(ProChange change) {
388	386	if (change instanceof ProListChange) {

branches/private/pav/NEW_JAVA_5/sophie2-platform/modules/org.sophie2.core/src/test/java/org/sophie2/core/prolib/list/TransformingProListTest.java

r6508	r7238
54	54	}.transform(new ProListTransformer<String, Integer>() {
55	55
56		~~@Override~~
57	56	public Integer translate(String source) {
58	57	++calls;
…	…
87	86	h.parsed().get().addListener(new ProListener() {
88	87
89		~~@Override~~
90	88	public void changed(ProChange change) {
91	89	if (change instanceof ProListChange) {
…	…
173	171	}.transform(new ProListTransformer<String, Integer>() {
174	172
175		~~@Override~~
176	173	public Integer translate(String source) {
177	174	++calls;
…	…
206	203	h.parsed().get().addListener(new ProListener() {
207	204
208		~~@Override~~
209	205	public void changed(ProChange change) {
210	206	if (change instanceof ProListChange) {
…	…
268	264	}.transform(new ProListTransformer<String, Integer>() {
269	265
270		~~@Override~~
271	266	public Integer translate(String source) {
272	267	++calls;
…	…
301	296	h.parsed().get().addListener(new ProListener() {
302	297
303		~~@Override~~
304	298	public void changed(ProChange change) {
305	299	if (change instanceof ProListChange) {
…	…
403	397	}
404	398	}.transform(new ProListTransformer<FakeBook, FakeBookView>() {
405		~~@Override~~
406	399	public FakeBookView translate(
407	400	FakeBook source) {

branches/private/pav/NEW_JAVA_5/sophie2-platform/modules/org.sophie2.core/src/test/java/org/sophie2/core/prolib/ownannot/OwnPropertyTest5.java

r6508	r7238
140	140	}.transform(new ProListTransformer<DummyFrame, DummyFrameView>() {
141	141
142		~~@Override~~
143	142	public DummyFrameView translate(DummyFrame source) {
144	143	return new DummyFrameView(source);

branches/private/pav/NEW_JAVA_5/sophie2-platform/modules/org.sophie2.core/src/test/java/org/sophie2/core/prolib/ProBeanTest.java

r6508	r7238
42	42	}
43	43
44		~~@Override~~
45	44	public ProBean getBean() {
46	45	return ProBean.getObjectBean(this);

branches/private/pav/NEW_JAVA_5/sophie2-platform/modules/org.sophie2.core/src/test/java/org/sophie2/core/prolib/SwingTest.java

r6508	r7238
43	43	private ProBean bean;
44	44
45		~~@Override~~
46	45	public ProBean getBean() {
47	46	if(this.bean == null) {
…	…
67	66	frame.addMouseListener(new MouseListener(){
68	67
69		~~@Override~~
70	68	public void mouseClicked(MouseEvent e) {
71	69	System.err.println(getBean().toString());
72
73		}
74
75		@Override
	70	}
	71
76	72	public void mouseEntered(MouseEvent e) {
77	73	//do nothing
78
79		}
80
81		@Override
	74	}
	75
82	76	public void mouseExited(MouseEvent e) {
83	77	//do nothing
84
85		}
86
87		@Override
	78	}
	79
88	80	public void mousePressed(MouseEvent e) {
89	81	//do nothing
90
91		}
92
93		@Override
	82	}
	83
94	84	public void mouseReleased(MouseEvent e) {
95	85	//do nothing
…	…
138	128	res.addPropertyChangeListener(new PropertyChangeListener() {
139	129
140		~~@Override~~
141	130	public void propertyChange(PropertyChangeEvent evt) {
142	131	System.err.println("propertyChange: "+evt);
…	…
224	213	res.addActionListener(new ActionListener() {
225	214
226		~~@Override~~
227	215	public void actionPerformed(ActionEvent e) {
228	216	String text = text().get();

branches/private/pav/NEW_JAVA_5/sophie2-platform/modules/org.sophie2.dev/.classpath

r6497	r7238
5	5	<classpathentry kind="src" output="target/test-classes" path="src/test/java"/>
6	6	<classpathentry excluding="**" kind="src" output="target/test-classes" path="src/test/resources"/>
7		<classpathentry kind="con"
8		path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6" />
9		<classpathentry kind="con"
10		path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER" />
11		<classpathentry kind="output" path="target/classes" />
	7	<classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
	8	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/jdk1.5.0_21"/>
	9	<classpathentry kind="output" path="target/classes"/>
12	10	</classpath>

branches/private/pav/NEW_JAVA_5/sophie2-platform/modules/org.sophie2.dev/.settings/org.eclipse.jdt.core.prefs

r6497	r7238
1		#~~Thu Sep 18 21:11:04 EEST 2008~~
	1	#Mon Oct 05 13:39:53 AFT 2009
2	2	eclipse.preferences.version=1
3	3	org.eclipse.jdt.core.builder.cleanOutputFolder=clean
…	…
18	18	org.eclipse.jdt.core.codeComplete.staticFieldSuffixes=
19	19	org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
20		org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
	20	org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
21	21	org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
22		org.eclipse.jdt.core.compiler.compliance=1.6
	22	org.eclipse.jdt.core.compiler.compliance=1.5
23	23	org.eclipse.jdt.core.compiler.debug.lineNumber=generate
24	24	org.eclipse.jdt.core.compiler.debug.localVariable=generate
…	…
97	97	org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
98	98	org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
99		org.eclipse.jdt.core.compiler.source=1.6
	99	org.eclipse.jdt.core.compiler.source=1.5
100	100	org.eclipse.jdt.core.compiler.taskCaseSensitive=enabled
101	101	org.eclipse.jdt.core.compiler.taskPriorities=NORMAL,HIGH,NORMAL

branches/private/pav/NEW_JAVA_5/sophie2-platform/modules/org.sophie2.dev/src/main/java/org/sophie2/dev/author/FakeAuthorMain.java

r7094	r7238
121	121	try {
122	122	SwingUtilities.invokeAndWait(new Runnable() {
123		~~@Override~~
124	123	public void run() {
125	124

branches/private/pav/NEW_JAVA_5/sophie2-platform/modules/org.sophie2.dev/src/main/java/org/sophie2/dev/reader/FakeReaderMain.java

r6944	r7238
100	100
101	101	SwingUtilities.invokeLater(new Runnable() {
102		~~@Override~~
103	102	public void run() {
104	103	FakeModuleRegistry.start(CoreModularityModule.class,
…	…
117	116	PdfModule.class, CoreMvcModule.class, TextFuncModule.class,
118	117	BaseSceneModule.class, PrintModule.class,
119		BaseConnectivityModule.class, BaseModelTextModule.class,
	118	BaseConnectivityModule.class,
	119	BaseModelTextModule.class,
120	120	MainFuncServersModule.class, WSConnectorModule.class,
121	121	HelpModule.class, BaseModelBookModule.class,
…	…
131	131
132	132	AppMainWindow mainWindow = new AppMainWindow();
133
134		FakeReaderMain.createDevelopersBook(mainWindow);
	133	FakeReaderMain.createDevelopersBook(mainWindow);
135	134
136	135	engine.mainWindows().add(mainWindow);

branches/private/pav/NEW_JAVA_5/sophie2-platform/modules/org.sophie2.dev/src/test/java/org/sophie2/dev/author/BookDocViewDemo.java

r6933	r7238
205	205	SwingUtilities.invokeAndWait(new Runnable() {
206	206
207		~~@Override~~
208	207	public void run() {
209	208	try {
…	…
221	220	SwingUtilities.invokeAndWait(new Runnable() {
222	221
223		~~@Override~~
224	222	public void run() {
225	223	new AutoAction("Changing page border", true) {
…	…
240	238	SwingUtilities.invokeAndWait(new Runnable() {
241	239
242		~~@Override~~
243	240	public void run() {
244	241	new AutoAction("Changing frame border", true) {
…	…
257	254	SwingUtilities.invokeAndWait(new Runnable() {
258	255
259		~~@Override~~
260	256	public void run() {
261	257	demo.window.dispose();

branches/private/pav/NEW_JAVA_5/sophie2-platform/modules/org.sophie2.dev/src/test/java/org/sophie2/dev/author/EmbeddedBookTest.java

r6933	r7238
80	80	SwingUtilities.invokeAndWait(new Runnable() {
81	81
82		~~@Override~~
83	82	@SuppressWarnings("synthetic-access")
84	83	public void run() {

branches/private/pav/NEW_JAVA_5/sophie2-platform/modules/org.sophie2.dev/src/test/java/org/sophie2/dev/author/ResourcePreviewSystemTest.java

r6880	r7238
128	128	ResourcePreviewProvider {
129	129
130		~~@Override~~
131	130	public String filterKind() {
132	131	return "TestingResource";
133	132	}
134	133
135		~~@Override~~
136	134	public String getResourceKind() {
137	135	return DummyResourceH.DUMMY_RESOURCE_KIND;
138	136	}
139	137
140		~~@Override~~
141	138	public SwingVisualElement getVisualElement(ResourceH element) {
142	139	assert element instanceof DummyResourceH;
…	…
155	152	SwingVisualElement {
156	153
157		~~@Override~~
158	154	public Prop<JLabel> swingComponent() {
159	155	class swingComponent extends ResourceProperty<JLabel> {
…	…
178	174	}
179	175
180		~~@Override~~
181	176	public Prop<? extends VisualElement> parent() {
182	177	return getBean().makeParentProp(VisualElement.class);
183	178	}
184	179
185		~~@Override~~
186	180	public Prop<String> title() {
187	181	class title extends AutoProperty<String> {
…	…
196	190	}
197	191
198		~~@Override~~
199	192	public Prop<String> toolTip() {
200	193	class toolTip extends AutoProperty<String> {

branches/private/pav/NEW_JAVA_5/sophie2-platform/modules/org.sophie2.dev/src/test/java/org/sophie2/dev/author/SceneDemoTest.java

r6933	r7238
116	116	SELECT() {
117	117
118		~~@Override~~
119	118	public void defineFilter(EventFilterBuilder filter) {
120	119	filter.setEventId(InputEventR3.MOUSE_PRESSED);
…	…
123	122	}
124	123
125		~~@Override~~
126	124	public boolean handle(EventR3 event) {
127	125	SceneDemoTest source = event.getSource(SceneDemoTest.class);
…	…
137	135	TO_BE_MOVED {
138	136
139		~~@Override~~
140	137	public void defineFilter(EventFilterBuilder filter) {
141	138	filter.setEventIdClass(InputEventR3.class);
…	…
143	140	}
144	141
145		~~@Override~~
146	142	public boolean handle(EventR3 event) {
147	143	if(event.getEventId(InputEventR3.class) == InputEventR3.MOUSE_PRESSED) {
…	…
367	363	long lastTime = System.currentTimeMillis();
368	364
369		~~@Override~~
370	365	public void run() {
371	366	++this.count;
…	…
432	427	SwingUtilities.invokeLater(new Runnable() {
433	428	@SuppressWarnings("unchecked")
434		~~@Override~~
435	429	public void run() {
436	430	FakeModuleRegistry.start(BaseSkinsModule.class, BaseVisualModule.class,

branches/private/pav/NEW_JAVA_5/sophie2-platform/modules/org.sophie2.dev/src/test/java/org/sophie2/dev/author/ShadowEffectDemoTest.java

r6497	r7238
110	110	final HotTextSceneElement text = new DefaultHotTextSceneElement() {
111	111
112		~~@Override~~
113	112	public RwProp<TextViewFlow> textFlow() {
114	113	return getBean().makeValueProp("textFlow", TextViewFlow.class);
…	…
176	175	double rotAngle = 0;
177	176
178		~~@Override~~
179	177	public void run() {
180	178	++this.count;
…	…
224	222	SwingUtilities.invokeLater(new Runnable() {
225	223	@SuppressWarnings("unchecked")
226		~~@Override~~
227	224	public void run() {
228	225	FakeModuleRegistry.start(BaseSkinsModule.class,

branches/private/pav/NEW_JAVA_5/sophie2-platform/modules/org.sophie2.dev/src/test/java/org/sophie2/dev/author/TextDemo.java

r6497	r7238
48	48	SwingUtilities.invokeLater(new Runnable() {
49	49	@SuppressWarnings("unchecked")
50		~~@Override~~
51	50	public void run() {
52	51	long beginStartupTime = System.currentTimeMillis();

branches/private/pav/NEW_JAVA_5/sophie2-platform/modules/org.sophie2.extra.comment/.classpath

r6538	r7238
5	5	<classpathentry kind="src" output="target/test-classes" path="src/test/java"/>
6	6	<classpathentry excluding="**" kind="src" output="target/test-classes" path="src/test/resources"/>
7		~~<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>~~
8	7	<classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
	8	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/jdk1.5.0_21"/>
9	9	<classpathentry kind="output" path="target/classes"/>
10	10	</classpath>

branches/private/pav/NEW_JAVA_5/sophie2-platform/modules/org.sophie2.extra.comment/.settings/org.eclipse.jdt.core.prefs

r6538	r7238
1		#~~Wed Sep 09 11:33:16 CD~~T 2009
	1	#Mon Oct 05 13:40:12 AFT 2009
2	2	eclipse.preferences.version=1
3		org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
4		org.eclipse.jdt.core.compiler.compliance=1.6
5		org.eclipse.jdt.core.compiler.source=1.6
	3	org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
	4	org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
	5	org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
	6	org.eclipse.jdt.core.compiler.compliance=1.5
	7	org.eclipse.jdt.core.compiler.debug.lineNumber=generate
	8	org.eclipse.jdt.core.compiler.debug.localVariable=generate
	9	org.eclipse.jdt.core.compiler.debug.sourceFile=generate
	10	org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
	11	org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
	12	org.eclipse.jdt.core.compiler.source=1.5

branches/private/pav/NEW_JAVA_5/sophie2-platform/modules/org.sophie2.extra.comment/src/main/java/org/sophie2/extra/comment/logic/CommentHudLogic.java

r6604	r7238
25	25	*/
26	26	ON_SUBMIT_DATA {
27		~~@Override~~
28	27	public void defineFilter(EventFilterBuilder filter) {
29	28	filter.setEventId(EventIds.SUBMIT);
…	…
31	30	}
32	31
33		~~@Override~~
34	32	public boolean handle(EventR3 event) {
35	33	addressInput address = event.getSource(addressInput.class);

branches/private/pav/NEW_JAVA_5/sophie2-platform/modules/org.sophie2.extra.comment/src/main/java/org/sophie2/extra/comment/logic/CommentLogic.java

r6993	r7238
53	53	ON_ADD_COMMENT_FRAME {
54	54
55		~~@Override~~
56	55	public void defineFilter(EventFilterBuilder filter) {
57	56	filter.setEventId(MenuItem.EventIds.CLICKED);
…	…
59	58	}
60	59
61		~~@Override~~
62	60	public boolean handle(EventR3 event) {
63	61	InsertCommentItem insertCommentItem = event.getSource(
…	…
127	125	ON_SCROLL_CONTENT_UP {
128	126
129		~~@Override~~
130	127	public void defineFilter(EventFilterBuilder filter) {
131	128	filter.setSourceClass(ScrollUpView.class);
…	…
133	130	}
134	131
135		~~@Override~~
136	132	public boolean handle(EventR3 event) {
137	133
…	…
167	163	ON_SCROLL_CONTENT_DOWN {
168	164
169		~~@Override~~
170	165	public void defineFilter(EventFilterBuilder filter) {
171	166	filter.setSourceClass(ScrollDownView.class);
…	…
173	168	}
174	169
175		~~@Override~~
176	170	public boolean handle(EventR3 event) {
177	171	ScrollDownView source = event.getSource(ScrollDownView.class);
…	…
203	197	ON_REPLY_COMMENT {
204	198
205		~~@Override~~
206	199	public void defineFilter(EventFilterBuilder filter) {
207	200	filter.setSourceClass(ReplyCommentView.class);
…	…
209	202	}
210	203
211		~~@Override~~
212	204	public boolean handle(EventR3 event) {
213	205
…	…
258	250	ON_ADD_COMMENT {
259	251
260		~~@Override~~
261	252	public void defineFilter(EventFilterBuilder filter) {
262	253	filter.setSourceClass(AddCommentView.class);
…	…
264	255	}
265	256
266		~~@Override~~
267	257	public boolean handle(EventR3 event) {
268	258

branches/private/pav/NEW_JAVA_5/sophie2-platform/modules/org.sophie2.extra.comment/src/main/java/org/sophie2/extra/comment/view/CommentStreamView.java

r6933	r7238
61	61	}
62	62
63		~~@Override~~
64	63	public ResourceAccess getAccess() {
65	64	return access().get();
…	…
67	66
68	67
69		~~@Override~~
70	68	public void initAccess(ResourceAccess access) {
71	69	getBean().init(access(), access);
…	…
77	75
78	76
79		~~@Override~~
80	77	public Prop<CommentStreamH> model() {
81	78	class model extends AutoProperty<CommentStreamH> {
…	…
191	188	}
192	189
193		~~@Override~~
194	190	public void dispose() {
195	191	// do nothing

branches/private/pav/NEW_JAVA_5/sophie2-platform/modules/org.sophie2.extra.func.annotations/.classpath

r1663	r7238
5	5	<classpathentry kind="src" output="target/test-classes" path="src/test/java"/>
6	6	<classpathentry excluding="**" kind="src" output="target/test-classes" path="src/test/resources"/>
7		~~<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>~~
8	7	<classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
	8	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/jdk1.5.0_21"/>
9	9	<classpathentry kind="output" path="target/classes"/>
10	10	</classpath>

branches/private/pav/NEW_JAVA_5/sophie2-platform/modules/org.sophie2.extra.func.annotations/.settings/org.eclipse.jdt.core.prefs

r1734	r7238
1		#~~Thu Sep 18 21:11:04 EEST 2008~~
	1	#Mon Oct 05 13:40:19 AFT 2009
2	2	eclipse.preferences.version=1
3	3	org.eclipse.jdt.core.builder.cleanOutputFolder=clean
…	…
18	18	org.eclipse.jdt.core.codeComplete.staticFieldSuffixes=
19	19	org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
20		org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
	20	org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
21	21	org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
22		org.eclipse.jdt.core.compiler.compliance=1.6
	22	org.eclipse.jdt.core.compiler.compliance=1.5
23	23	org.eclipse.jdt.core.compiler.debug.lineNumber=generate
24	24	org.eclipse.jdt.core.compiler.debug.localVariable=generate
…	…
97	97	org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
98	98	org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
99		org.eclipse.jdt.core.compiler.source=1.6
	99	org.eclipse.jdt.core.compiler.source=1.5
100	100	org.eclipse.jdt.core.compiler.taskCaseSensitive=enabled
101	101	org.eclipse.jdt.core.compiler.taskPriorities=NORMAL,HIGH,NORMAL

branches/private/pav/NEW_JAVA_5/sophie2-platform/modules/org.sophie2.extra.func.annotations/src/main/java/org/sophie2/extra/func/annotations/logic/AnnotationsLogic.java

r6933	r7238
4	4
5	5	import javax.swing.filechooser.FileFilter;
6		~~import javax.swing.filechooser.FileNameExtensionFilter;~~
7	6
8	7	import org.sophie2.base.commons.util.ImmSet;
…	…
25	24	import org.sophie2.main.dialogs.input.DialogUtils;
26	25	import org.sophie2.main.dialogs.input.FileDialogInput;
	26	import org.sophie2.main.dialogs.input.FileExtensionFilter;
27	27
28	28	/**
…	…
39	39	ON_IMPORT_ANNOTATIONS {
40	40
41		~~@Override~~
42	41	public void defineFilter(EventFilterBuilder filter) {
43	42	filter
…	…
46	45	}
47	46
48		~~@Override~~
49	47	public boolean handle(EventR3 event) {
50	48	AllAnnotationsPalette source = event
…	…
102	100	ON_EXPORT_ANNOTATIONS {
103	101
104		~~@Override~~
105	102	public void defineFilter(EventFilterBuilder filter) {
106	103	filter
…	…
109	106	}
110	107
111		~~@Override~~
112	108	public boolean handle(EventR3 event) {
113	109	AllAnnotationsPalette source = event
…	…
153	149	ON_CREATE_NEW_ANNOTATION_SET {
154	150
155		~~@Override~~
156	151	public void defineFilter(EventFilterBuilder filter) {
157	152	filter
…	…
160	155	}
161	156
162		~~@Override~~
163	157	public boolean handle(EventR3 event) {
164	158	AllAnnotationsPalette view = event
…	…
183	177	ON_SET_ANNOTATION_SET_AS_CURRENT {
184	178
185		~~@Override~~
186	179	public void defineFilter(EventFilterBuilder filter) {
187	180	filter
…	…
190	183	}
191	184
192		~~@Override~~
193	185	public boolean handle(EventR3 event) {
194	186	AllAnnotationsPalette source = event
…	…
222	214	* File filter used when importing/exporting annotation sets.
223	215	*/
224		public static final FileFilter ANNOTATION_FILTER = new File~~Name~~ExtensionFilter(
	216	public static final FileFilter ANNOTATION_FILTER = new FileExtensionFilter(
225	217	"Annotations (*.zip)", "zip");
226	218

branches/private/pav/NEW_JAVA_5/sophie2-platform/modules/org.sophie2.extra.func.annotations/src/main/java/org/sophie2/extra/func/annotations/logic/BookExtrasLogic.java

r6933	r7238
27	27	ON_OPEN {
28	28
29		~~@Override~~
30	29	public void defineFilter(EventFilterBuilder filter) {
31	30	filter.setEventId(BookExtrasPalette.EventIds.OPEN);
…	…
33	32	}
34	33
35		~~@Override~~
36	34	public boolean handle(EventR3 event) {
37	35	// TODO (R4) No dummy implementations...
…	…
56	54	ON_SHOW_HIDE {
57	55
58		~~@Override~~
59	56	public void defineFilter(EventFilterBuilder filter) {
60	57	filter.setEventId(BookExtrasPalette.EventIds.SHOW_HIDE);
…	…
62	59	}
63	60
64		~~@Override~~
65	61	public boolean handle(EventR3 event) {
66	62	BookExtrasPalette source = event.getSource(BookExtrasPalette.class);
…	…
85	81	ON_CLOSE {
86	82
87		~~@Override~~
88	83	public void defineFilter(EventFilterBuilder filter) {
89	84	filter.setEventId(BookExtrasPalette.EventIds.CLOSE);
…	…
91	86	}
92	87
93		~~@Override~~
94	88	public boolean handle(EventR3 event) {
95	89	BookExtrasPalette source = event.getSource(BookExtrasPalette.class);
…	…
111	105	ON_ADD_REMOVE_FROM_RESOURCE {
112	106
113		~~@Override~~
114	107	public void defineFilter(EventFilterBuilder filter) {
115	108	filter
…	…
118	111	}
119	112
120		~~@Override~~
121	113	public boolean handle(EventR3 event) {
122	114	BookExtrasPalette source = event.getSource(BookExtrasPalette.class);

branches/private/pav/NEW_JAVA_5/sophie2-platform/modules/org.sophie2.extra.func.annotations/src/main/java/org/sophie2/extra/func/annotations/logic/StickiesLogic.java

r6751	r7238
40	40	"There is no selected annotation set. Do you want to create a new set?";
41	41
42		~~@Override~~
43	42	public void defineFilter(EventFilterBuilder filter) {
44	43	filter.setEventId(StickiesPalette.EventIds.NEW_STICKY);
…	…
46	45	}
47	46
48		~~@Override~~
49	47	public boolean handle(EventR3 event) {
50	48	StickiesPalette view = event.getSource(StickiesPalette.class);
…	…
117	115	ON_STICKY_REMOVE {
118	116
119		~~@Override~~
120	117	public void defineFilter(EventFilterBuilder filter) {
121	118	filter.setSourceClass(StickyRemoveHaloButton.class);
…	…
123	120	}
124	121
125		~~@Override~~
126	122	public boolean handle(EventR3 event) {
127	123	StickyRemoveHaloButton halo = event.getSource(StickyRemoveHaloButton.class);

branches/private/pav/NEW_JAVA_5/sophie2-platform/modules/org.sophie2.extra.func.browser/.classpath

r3451	r7238
5	5	<classpathentry kind="src" output="target/test-classes" path="src/test/java"/>
6	6	<classpathentry excluding="**" kind="src" output="target/test-classes" path="src/test/resources"/>
7		~~<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>~~
8	7	<classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
	8	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/jdk1.5.0_21"/>
9	9	<classpathentry kind="output" path="target/classes"/>
10	10	</classpath>

branches/private/pav/NEW_JAVA_5/sophie2-platform/modules/org.sophie2.extra.func.browser/.settings/org.eclipse.jdt.core.prefs

r3451	r7238
1		#~~Thu Sep 18 21:11:04 EEST 2008~~
	1	#Mon Oct 05 13:40:27 AFT 2009
2	2	eclipse.preferences.version=1
3	3	org.eclipse.jdt.core.builder.cleanOutputFolder=clean
…	…
18	18	org.eclipse.jdt.core.codeComplete.staticFieldSuffixes=
19	19	org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
20		org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
	20	org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
21	21	org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
22		org.eclipse.jdt.core.compiler.compliance=1.6
	22	org.eclipse.jdt.core.compiler.compliance=1.5
23	23	org.eclipse.jdt.core.compiler.debug.lineNumber=generate
24	24	org.eclipse.jdt.core.compiler.debug.localVariable=generate
…	…
97	97	org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
98	98	org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
99		org.eclipse.jdt.core.compiler.source=1.6
	99	org.eclipse.jdt.core.compiler.source=1.5
100	100	org.eclipse.jdt.core.compiler.taskCaseSensitive=enabled
101	101	org.eclipse.jdt.core.compiler.taskPriorities=NORMAL,HIGH,NORMAL

branches/private/pav/NEW_JAVA_5/sophie2-platform/modules/org.sophie2.extra.func.browser/src/main/java/org/sophie2/extra/func/browser/flash/view/FlashFrameView.java

r6845	r7238
190	190	SwingUtilities.invokeLater(new Runnable() {
191	191
192		~~@Override~~
193	192	public void run() {
194	193	update(image);

branches/private/pav/NEW_JAVA_5/sophie2-platform/modules/org.sophie2.extra.func.browser/src/main/java/org/sophie2/extra/func/browser/flash/view/FlashLogic.java

r7117	r7238
4	4
5	5	import javax.swing.filechooser.FileFilter;
6		~~import javax.swing.filechooser.FileNameExtensionFilter;~~
7	6
8	7	import org.sophie2.base.commons.util.ImmList;
…	…
28	27	import org.sophie2.main.app.commons.util.AppViewUtil;
29	28	import org.sophie2.main.dialogs.input.FileDialogInput;
	29	import org.sophie2.main.dialogs.input.FileExtensionFilter;
30	30
31	31	/**
…	…
41	41	ON_INSERT_FLASH {
42	42
43		~~@Override~~
44	43	public void defineFilter(EventFilterBuilder filter) {
45	44	filter.setEventId(MenuItem.EventIds.CLICKED);
…	…
47	46	}
48	47
49		~~@Override~~
50	48	public boolean handle(EventR3 event) {
51	49	InsertFlashItem insertItem = event.getSource(InsertFlashItem.class);
…	…
91	89	ON_HALO_CLICK {
92	90
93		~~@Override~~
94	91	public void defineFilter(EventFilterBuilder filter) {
95	92	filter.setSourceClass(FlashHaloButton.class);
…	…
97	94	}
98	95
99		~~@Override~~
100	96	public boolean handle(EventR3 event) {
101	97	FlashHaloButton source = event.getSource(FlashHaloButton.class);
…	…
130	126	*/
131	127	String browseFlash(PageWorkArea workArea) {
132		final FileFilter swfFilter = new File~~Name~~ExtensionFilter("SWF (*.swf)",
	128	final FileFilter swfFilter = new FileExtensionFilter("SWF (*.swf)",
133	129	"swf");
134	130	FileDialogInput fdi = new FileDialogInput(workArea.swingComponent()

branches/private/pav/NEW_JAVA_5/sophie2-platform/modules/org.sophie2.extra.func.browser/src/main/java/org/sophie2/extra/func/browser/view/BrowserFrameView.java

r6700	r7238
140	140	final Runnable redrawBrowser = new Runnable() {
141	141
142		~~@Override~~
143	142	public void run() {
144	143	PageWorkArea pwa = findParentElement(PageWorkArea.class);

branches/private/pav/NEW_JAVA_5/sophie2-platform/modules/org.sophie2.extra.func.browser/src/main/java/org/sophie2/extra/func/browser/view/BrowserLogic.java

r7002	r7238
45	45	ON_ADD_BROWSER_FRAME {
46	46
47		~~@Override~~
48	47	public void defineFilter(EventFilterBuilder filter) {
49	48	filter.setEventId(MenuItem.EventIds.CLICKED);
…	…
51	50	}
52	51
53		~~@Override~~
54	52	public boolean handle(EventR3 event) {
55	53	InsertBrowserItem insertItem = event.getSource(InsertBrowserItem.class);
…	…
101	99	ON_REMOVE_BROWSER_FRAME {
102	100
103		~~@Override~~
104	101	public void defineFilter(EventFilterBuilder filter) {
105	102	filter.setEventId(HaloButton.EventIds.HALO_CLICK);
…	…
107	104	}
108	105
109		~~@Override~~
110	106	public boolean handle(EventR3 event) {
111	107	FrameRemoveHaloButton source = event.getSource(FrameRemoveHaloButton.class);
…	…
129	125	ON_MOUSE_CLICKED {
130	126
131		~~@Override~~
132	127	public void defineFilter(EventFilterBuilder filter) {
133	128	filter.setEventId(InputEventR3.MOUSE_CLICKED);
…	…
135	130	}
136	131
137		~~@Override~~
138	132	public boolean handle(EventR3 event) {
139	133	NativeBrowserFrameView view = event.getSource(NativeBrowserFrameView.class);
…	…
154	148	*/
155	149	ON_MOUSE_PRESSED {
156		~~@Override~~
157	150	public void defineFilter(EventFilterBuilder filter) {
158	151	filter.setEventId(InputEventR3.MOUSE_PRESSED);
…	…
160	153	}
161	154
162		~~@Override~~
163	155	public boolean handle(EventR3 event) {
164	156	NativeBrowserFrameView view = event.getSource(NativeBrowserFrameView.class);
…	…
179	171	*/
180	172	ON_MOUSE_RELEASED {
181		~~@Override~~
182	173	public void defineFilter(EventFilterBuilder filter) {
183	174	filter.setEventId(InputEventR3.MOUSE_RELEASED);
…	…
185	176	}
186	177
187		~~@Override~~
188	178	public boolean handle(EventR3 event) {
189	179	NativeBrowserFrameView view = event.getSource(NativeBrowserFrameView.class);
…	…
205	195	ON_MOUSE_MOVED {
206	196
207		~~@Override~~
208	197	public void defineFilter(EventFilterBuilder filter) {
209	198	filter.setEventId(InputEventR3.MOUSE_MOVED);
…	…
211	200	}
212	201
213		~~@Override~~
214	202	public boolean handle(EventR3 event) {
215	203	NativeBrowserFrameView view = event.getSource(NativeBrowserFrameView.class);
…	…
230	218	*/
231	219	ON_MOUSE_DRAGGED {
232		~~@Override~~
233	220	public void defineFilter(EventFilterBuilder filter) {
234	221	filter.setEventId(InputEventR3.MOUSE_DRAGGED);
…	…
236	223	}
237	224
238		~~@Override~~
239	225	public boolean handle(EventR3 event) {
240	226	NativeBrowserFrameView view = event.getSource(NativeBrowserFrameView.class);
…	…
254	240	ON_ADDRESS_BAR_SUBMIT {
255	241
256		~~@Override~~
257	242	public void defineFilter(EventFilterBuilder filter) {
258	243	filter.setEventId(EventIds.SUBMIT);
…	…
260	245	}
261	246
262		~~@Override~~
263	247	public boolean handle(EventR3 event) {
264	248	AddressBar addressBar = event.getSource(AddressBar.class);

branches/private/pav/NEW_JAVA_5/sophie2-platform/modules/org.sophie2.extra.func.browser/src/test/java/org/sophie2/extra/func/browser/BrowserDemo.java

r6858	r7238
56	56
57	57	@SuppressWarnings("synthetic-access")
58		~~@Override~~
59	58	public void keyPressed(KeyEvent e) {
60	59	if (e.getKeyCode() == KeyEvent.VK_ENTER) {
…	…
63	62	}
64	63
65		~~@Override~~
66	64	public void keyReleased(KeyEvent e) {
67	65	// nothing
68	66	}
69	67
70		~~@Override~~
71	68	public void keyTyped(KeyEvent e) {
72	69	// nothing
…	…
91	88
92	89	@SuppressWarnings("synthetic-access")
93		~~@Override~~
94	90	public void mouseClicked(MouseEvent e) {
95	91	BrowserDemo.this.sendMouseEvent(e);
…	…
99	95	}
100	96
101		~~@Override~~
102	97	public void mouseEntered(MouseEvent e) {
103	98	// nothing
…	…
105	100	}
106	101
107		~~@Override~~
108	102	public void mouseExited(MouseEvent e) {
109	103	// nothing
…	…
112	106
113	107	@SuppressWarnings("synthetic-access")
114		~~@Override~~
115	108	public void mousePressed(MouseEvent e) {
116	109	BrowserDemo.this.sendMouseEvent(e);
…	…
121	114
122	115	@SuppressWarnings("synthetic-access")
123		~~@Override~~
124	116	public void mouseReleased(MouseEvent e) {
125	117	BrowserDemo.this.sendMouseEvent(e);
…	…
131	123
132	124	@SuppressWarnings("synthetic-access")
133		~~@Override~~
134	125	public void mouseDragged(MouseEvent e) {
135	126	BrowserDemo.this.sendMouseEvent(e);
…	…
137	128
138	129	@SuppressWarnings("synthetic-access")
139		~~@Override~~
140	130	public void mouseMoved(MouseEvent e) {
141	131	BrowserDemo.this.sendMouseEvent(e);
…	…
147	137
148	138	@SuppressWarnings("synthetic-access")
149		~~@Override~~
150	139	public void keyPressed(KeyEvent e) {
151	140	BrowserDemo.this.sendKeyEvent(e);
…	…
153	142
154	143	@SuppressWarnings("synthetic-access")
155		~~@Override~~
156	144	public void keyReleased(KeyEvent e) {
157	145	BrowserDemo.this.sendKeyEvent(e);
158	146	}
159	147
160		~~@Override~~
161	148	public void keyTyped(KeyEvent e) {
162	149	// nothing
…	…
167	154
168	155	@SuppressWarnings("synthetic-access")
169		~~@Override~~
170	156	public void mouseWheelMoved(MouseWheelEvent e) {
171	157	BrowserDemo.this.sendWheelEvent(e);
…	…
174	160	});
175	161	browserPane.addComponentListener(new ComponentListener() {
176		~~@Override~~
177	162	public void componentHidden(ComponentEvent e) {
178	163	// nothing
179	164	}
180	165
181		~~@Override~~
182	166	public void componentMoved(ComponentEvent e) {
183	167	// nothing
…	…
185	169
186	170	@SuppressWarnings("synthetic-access")
187		~~@Override~~
188	171	public void componentResized(ComponentEvent e) {
189	172	BrowserDemo.this.resize(e.getComponent().getWidth(), e.getComponent().getHeight());
190	173	}
191	174
192		~~@Override~~
193	175	public void componentShown(ComponentEvent e) {
194	176	// nothing

branches/private/pav/NEW_JAVA_5/sophie2-platform/modules/org.sophie2.extra.func.browser/src/test/java/org/sophie2/extra/func/browser/nat/bridge/NativeBrowserBridgeTest.java

r6858	r7238
147	147
148	148	Thread t1 = new Thread(new Runnable() {
149		~~@Override~~
150	149	public void run() {
151	150	try {
…	…
174	173
175	174	Thread t2 = new Thread(new Runnable() {
176		~~@Override~~
177	175	public void run() {
178	176	try {
…	…
198	196
199	197	Thread t3 = new Thread(new Runnable() {
200		~~@Override~~
201	198	public void run() {
202	199	try {

branches/private/pav/NEW_JAVA_5/sophie2-platform/modules/org.sophie2.extra.func.embedded/.classpath

r1402	r7238
5	5	<classpathentry kind="src" output="target/test-classes" path="src/test/java"/>
6	6	<classpathentry excluding="**" kind="src" output="target/test-classes" path="src/test/resources"/>
7		<classpathentry kind="con"
8		path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6" />
9		<classpathentry kind="con"
10		path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER" />
11		<classpathentry kind="output" path="target/classes" />
	7	<classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
	8	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/jdk1.5.0_21"/>
	9	<classpathentry kind="output" path="target/classes"/>
12	10	</classpath>

branches/private/pav/NEW_JAVA_5/sophie2-platform/modules/org.sophie2.extra.func.embedded/.settings/org.eclipse.jdt.core.prefs

r1162	r7238
1		#~~Thu Sep 18 21:11:04 EEST 2008~~
	1	#Mon Oct 05 13:40:34 AFT 2009
2	2	eclipse.preferences.version=1
3	3	org.eclipse.jdt.core.builder.cleanOutputFolder=clean
…	…
18	18	org.eclipse.jdt.core.codeComplete.staticFieldSuffixes=
19	19	org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
20		org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
	20	org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
21	21	org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
22		org.eclipse.jdt.core.compiler.compliance=1.6
	22	org.eclipse.jdt.core.compiler.compliance=1.5
23	23	org.eclipse.jdt.core.compiler.debug.lineNumber=generate
24	24	org.eclipse.jdt.core.compiler.debug.localVariable=generate
…	…
97	97	org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
98	98	org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
99		org.eclipse.jdt.core.compiler.source=1.6
	99	org.eclipse.jdt.core.compiler.source=1.5
100	100	org.eclipse.jdt.core.compiler.taskCaseSensitive=enabled
101	101	org.eclipse.jdt.core.compiler.taskPriorities=NORMAL,HIGH,NORMAL

branches/private/pav/NEW_JAVA_5/sophie2-platform/modules/org.sophie2.extra.func.embedded/src/main/java/org/sophie2/extra/func/embedded/view/EmbeddedBookLogic.java

r7002	r7238
49	49	ON_ADD_LINKED_BOOK_FRAME {
50	50
51		~~@Override~~
52	51	public void defineFilter(EventFilterBuilder filter) {
53	52	filter.setEventId(MenuItem.EventIds.CLICKED);
…	…
55	54	}
56	55
57		~~@Override~~
58	56	public boolean handle(EventR3 event) {
59	57	return insertBookFrame(event.getSource(InsertLinkedBook.class), true);
…	…
66	64	ON_ADD_EMBEDDED_BOOK_FRAME {
67	65
68		~~@Override~~
69	66	public void defineFilter(EventFilterBuilder filter) {
70	67	filter.setEventId(MenuItem.EventIds.CLICKED);
…	…
72	69	}
73	70
74		~~@Override~~
75	71	public boolean handle(EventR3 event) {
76	72	return insertBookFrame(event.getSource(InsertEmbeddedBook.class), false);
…	…
83	79	ON_GO_TO_NEXT_PAGE {
84	80
85		~~@Override~~
86	81	public void defineFilter(EventFilterBuilder filter) {
87	82	filter.setSourceClass(NextPageControlView.class);
…	…
89	84	}
90	85
91		~~@Override~~
92	86	public boolean handle(EventR3 event) {
93	87	NextPageControlView view = event.getSource(NextPageControlView.class);
…	…
105	99	ON_GO_TO_PREVIOUS_PAGE {
106	100
107		~~@Override~~
108	101	public void defineFilter(EventFilterBuilder filter) {
109	102	filter.setSourceClass(PrevPageControlView.class);
…	…
111	104	}
112	105
113		~~@Override~~
114	106	public boolean handle(EventR3 event) {
115	107	PrevPageControlView view = event.getSource(PrevPageControlView.class);

branches/private/pav/NEW_JAVA_5/sophie2-platform/modules/org.sophie2.extra.func.html/.classpath

r3099	r7238
5	5	<classpathentry kind="src" output="target/test-classes" path="src/test/java"/>
6	6	<classpathentry excluding="**" kind="src" output="target/test-classes" path="src/test/resources"/>
7		<classpathentry kind="con"
8		path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6" />
9		<classpathentry kind="con"
10		path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER" />
11		<classpathentry kind="output" path="target/classes" />
	7	<classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
	8	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/jdk1.5.0_21"/>
	9	<classpathentry kind="output" path="target/classes"/>
12	10	</classpath>

branches/private/pav/NEW_JAVA_5/sophie2-platform/modules/org.sophie2.extra.func.html/.settings/org.eclipse.jdt.core.prefs

r3099	r7238
1		#~~Thu Sep 18 21:11:04 EEST 2008~~
	1	#Mon Oct 05 13:40:41 AFT 2009
2	2	eclipse.preferences.version=1
3	3	org.eclipse.jdt.core.builder.cleanOutputFolder=clean
…	…
18	18	org.eclipse.jdt.core.codeComplete.staticFieldSuffixes=
19	19	org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
20		org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
	20	org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
21	21	org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
22		org.eclipse.jdt.core.compiler.compliance=1.6
	22	org.eclipse.jdt.core.compiler.compliance=1.5
23	23	org.eclipse.jdt.core.compiler.debug.lineNumber=generate
24	24	org.eclipse.jdt.core.compiler.debug.localVariable=generate
…	…
97	97	org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
98	98	org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
99		org.eclipse.jdt.core.compiler.source=1.6
	99	org.eclipse.jdt.core.compiler.source=1.5
100	100	org.eclipse.jdt.core.compiler.taskCaseSensitive=enabled
101	101	org.eclipse.jdt.core.compiler.taskPriorities=NORMAL,HIGH,NORMAL

branches/private/pav/NEW_JAVA_5/sophie2-platform/modules/org.sophie2.extra.func.html/src/main/java/org/sophie2/extra/func/html/persister/HtmlPersister.java

r4951	r7238
25	25	import org.sophie2.base.persistence.persister.Persister;
26	26	import org.sophie2.base.persistence.storage.Storage;
	27	import org.sophie2.core.logging.SophieLog;
27	28	import org.w3c.dom.DOMImplementation;
28	29	import org.w3c.dom.Document;
…	…
88	89	serializer = tf.newTransformer();
89	90	} catch (TransformerConfigurationException e) {
90		throw new IOException("Saving error.", e);
	91	SophieLog.error("Saving error.", e);
	92	throw new IOException();
91	93	}
92	94	serializer.setOutputProperty(OutputKeys.ENCODING, "UTF-8");
…	…
95	97	serializer.transform(domSource, streamResult);
96	98	} catch (TransformerException e) {
97		throw new IOException("Saving error. ", e);
	99	SophieLog.error("Saving error.", e);
	100	throw new IOException();
98	101	}
99	102
…	…
225	228	docBuilder = dbFactory.newDocumentBuilder();
226	229	} catch (ParserConfigurationException e) {
	230	SophieLog.error("ParserConfigurationException "
	231	+ "during document initialization", e);
227	232	throw new IOException("ParserConfigurationException "
228		+ "during document initialization"~~, e~~);
	233	+ "during document initialization");
229	234	}
230	235

branches/private/pav/NEW_JAVA_5/sophie2-platform/modules/org.sophie2.extra.func.html/src/main/java/org/sophie2/extra/func/html/view/HtmlLogic.java

r7002	r7238
8	8	import javax.swing.JTextPane;
9	9	import javax.swing.filechooser.FileFilter;
10		~~import javax.swing.filechooser.FileNameExtensionFilter;~~
11	10	import javax.swing.text.BadLocationException;
12	11	import javax.swing.text.View;
…	…
31	30	import org.sophie2.main.app.commons.util.AppViewUtil;
32	31	import org.sophie2.main.dialogs.input.FileDialogInput;
	32	import org.sophie2.main.dialogs.input.FileExtensionFilter;
33	33	import org.sophie2.main.func.text.model.HeadTextFrameH;
34	34
…	…
47	47	ON_EXPORT_AS_HTML {
48	48
49		~~@Override~~
50	49	public void defineFilter(EventFilterBuilder filter) {
51	50	filter.setSourceClass(ExportAsHtmlItem.class);
…	…
53	52	}
54	53
55		~~@Override~~
56	54	public boolean handle(EventR3 event) {
57	55	ExportAsHtmlItem source = event.getSource(ExportAsHtmlItem.class);
…	…
84	82	*/
85	83	ON_INSERT_HTML {
86		~~@Override~~
87	84	public void defineFilter(EventFilterBuilder filter) {
88	85	filter.setEventId(MenuItem.EventIds.CLICKED);
…	…
90	87	}
91	88
92		~~@Override~~
93	89	public boolean handle(EventR3 event) {
94	90	InsertHtmlItem source = event.getSource(InsertHtmlItem.class);
…	…
148	144	* FileFilter used when user export Sophie2 book to Html file.
149	145	*/
150		public static final FileFilter HTML_FILTER = new File~~Name~~ExtensionFilter(
	146	public static final FileFilter HTML_FILTER = new FileExtensionFilter(
151	147	"HTML (.html, .htm)", "html", "htm");
152	148	}

branches/private/pav/NEW_JAVA_5/sophie2-platform/modules/org.sophie2.extra.func.pdf/.classpath

r1761	r7238
5	5	<classpathentry kind="src" output="target/test-classes" path="src/test/java"/>
6	6	<classpathentry excluding="**" kind="src" output="target/test-classes" path="src/test/resources"/>
7		<classpathentry kind="con"
8		path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6" />
9		<classpathentry kind="con"
10		path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER" />
11		<classpathentry kind="output" path="target/classes" />
	7	<classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
	8	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/jdk1.5.0_21"/>
	9	<classpathentry kind="output" path="target/classes"/>
12	10	</classpath>

branches/private/pav/NEW_JAVA_5/sophie2-platform/modules/org.sophie2.extra.func.pdf/.settings/org.eclipse.jdt.core.prefs

r1761	r7238
1		#~~Thu Sep 18 21:11:04 EEST 2008~~
	1	#Mon Oct 05 13:40:47 AFT 2009
2	2	eclipse.preferences.version=1
3	3	org.eclipse.jdt.core.builder.cleanOutputFolder=clean
…	…
18	18	org.eclipse.jdt.core.codeComplete.staticFieldSuffixes=
19	19	org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
20		org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
	20	org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
21	21	org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
22		org.eclipse.jdt.core.compiler.compliance=1.6
	22	org.eclipse.jdt.core.compiler.compliance=1.5
23	23	org.eclipse.jdt.core.compiler.debug.lineNumber=generate
24	24	org.eclipse.jdt.core.compiler.debug.localVariable=generate
…	…
97	97	org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
98	98	org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
99		org.eclipse.jdt.core.compiler.source=1.6
	99	org.eclipse.jdt.core.compiler.source=1.5
100	100	org.eclipse.jdt.core.compiler.taskCaseSensitive=enabled
101	101	org.eclipse.jdt.core.compiler.taskPriorities=NORMAL,HIGH,NORMAL

branches/private/pav/NEW_JAVA_5/sophie2-platform/modules/org.sophie2.extra.func.pdf/src/main/java/org/sophie2/extra/func/pdf/view/logic/PdfLogic.java

r7002	r7238
3	3	import java.io.File;
4	4	import java.io.IOException;
5
6		~~import javax.swing.filechooser.FileNameExtensionFilter;~~
7	5
8	6	import org.sophie2.base.commons.util.BinData;
…	…
34	32	import org.sophie2.main.dialogs.input.DialogUtils;
35	33	import org.sophie2.main.dialogs.input.FileDialogInput;
	34	import org.sophie2.main.dialogs.input.FileExtensionFilter;
36	35
37	36	import com.sun.pdfview.PDFFile;
…	…
47	46	*/
48	47	ON_ADD_PDF_FRAME {
49		~~@Override~~
50	48	public void defineFilter(EventFilterBuilder filter) {
51	49	filter.setEventId(MenuItem.EventIds.CLICKED);
…	…
53	51	}
54	52
55		~~@Override~~
56	53	public boolean handle(EventR3 event) {
57	54	InsertPDFItem insertPDFItem = event.getSource(InsertPDFItem.class);
…	…
148	145	protected BinData getPDFdata(PageWorkArea pageView, BookH book) {
149	146	FileDialogInput fdi = new FileDialogInput(pageView.swingComponent().get(),
150		new File~~Name~~ExtensionFilter("PDF (*.pdf)", "pdf"),
	147	new FileExtensionFilter("PDF (*.pdf)", "pdf"),
151	148	FileDialogInput.Kind.OPEN);
152	149

branches/private/pav/NEW_JAVA_5/sophie2-platform/modules/org.sophie2.extra.func.pdf/src/main/java/org/sophie2/extra/func/pdf/view/PdfResourcePreviewProvider.java

r7002	r7238
38	38	public class PdfResourcePreviewProvider implements ResourcePreviewProvider {
39	39
40		~~@Override~~
41	40	public String getResourceKind() {
42	41	return PdfResourceR4.KIND;
43	42	}
44	43
45		~~@Override~~
46	44	public SwingVisualElement getVisualElement(ResourceH element) {
47	45	assert element instanceof PdfResourceH;
…	…
50	48	}
51	49
52		~~@Override~~
53	50	public String filterKind() {
54	51	return "PDF";
…	…
92	89	private PdfResourceH resource;
93	90
94		~~@Override~~
95	91	public Prop<? extends VisualElement> parent() {
96	92	return getBean().makeParentProp(VisualElement.class);
97	93	}
98	94
99		~~@Override~~
100	95	public Prop<String> title() {
101	96	class title extends AutoProperty<String> {
…	…
110	105	}
111	106
112		~~@Override~~
113	107	public Prop<String> toolTip() {
114	108	class toolTip extends AutoProperty<String> {
…	…
138	132	}
139	133
140		~~@Override~~
141	134	public Prop<JPanel> swingComponent() {
142	135	class swingComponent extends ResourceProperty<JPanel> {
…	…
227	220	this.prev.addActionListener(new ActionListener() {
228	221
229		~~@Override~~
230	222	public void actionPerformed(ActionEvent e) {
231	223	int pageNumber = displayPageNumber().get() - 1;
…	…
243	235
244	236	@SuppressWarnings("synthetic-access")
245		~~@Override~~
246	237	public void actionPerformed(ActionEvent e) {
247	238	int pageNumber = displayPageNumber().get() + 1;

branches/private/pav/NEW_JAVA_5/sophie2-platform/modules/org.sophie2.extra.func.plain/.classpath

r4399	r7238
5	5	<classpathentry kind="src" output="target/test-classes" path="src/test/java"/>
6	6	<classpathentry excluding="**" kind="src" output="target/test-classes" path="src/test/resources"/>
7		<classpathentry kind="con"
8		path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6" />
9		<classpathentry kind="con"
10		path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER" />
11		<classpathentry kind="output" path="target/classes" />
	7	<classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
	8	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/jdk1.5.0_21"/>
	9	<classpathentry kind="output" path="target/classes"/>
12	10	</classpath>

branches/private/pav/NEW_JAVA_5/sophie2-platform/modules/org.sophie2.extra.func.plain/.settings/org.eclipse.jdt.core.prefs

r4399	r7238
1		#~~Thu Sep 18 21:11:04 EEST 2008~~
	1	#Mon Oct 05 13:40:53 AFT 2009
2	2	eclipse.preferences.version=1
3	3	org.eclipse.jdt.core.builder.cleanOutputFolder=clean
…	…
18	18	org.eclipse.jdt.core.codeComplete.staticFieldSuffixes=
19	19	org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
20		org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
	20	org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
21	21	org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
22		org.eclipse.jdt.core.compiler.compliance=1.6
	22	org.eclipse.jdt.core.compiler.compliance=1.5
23	23	org.eclipse.jdt.core.compiler.debug.lineNumber=generate
24	24	org.eclipse.jdt.core.compiler.debug.localVariable=generate
…	…
97	97	org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
98	98	org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
99		org.eclipse.jdt.core.compiler.source=1.6
	99	org.eclipse.jdt.core.compiler.source=1.5
100	100	org.eclipse.jdt.core.compiler.taskCaseSensitive=enabled
101	101	org.eclipse.jdt.core.compiler.taskPriorities=NORMAL,HIGH,NORMAL

branches/private/pav/NEW_JAVA_5/sophie2-platform/modules/org.sophie2.extra.func.plain/src/main/java/org/sophie2/extra/func/plain/PlainTextLogic.java

r7002	r7238
5	5	import java.io.FileReader;
6	6	import java.io.IOException;
7
8		~~import javax.swing.filechooser.FileNameExtensionFilter;~~
9	7
10	8	import org.sophie2.base.dialogs.DialogManager;
…	…
21	19	import org.sophie2.main.dialogs.input.DialogUtils;
22	20	import org.sophie2.main.dialogs.input.FileDialogInput;
	21	import org.sophie2.main.dialogs.input.FileExtensionFilter;
23	22	import org.sophie2.main.func.text.model.HeadTextFrameH;
24	23
…	…
36	35	ON_IMPORT_PLAIN_TEXT {
37	36
38		~~@Override~~
39	37	public void defineFilter(EventFilterBuilder filter) {
40	38	filter.setEventId(MenuItem.EventIds.CLICKED);
…	…
42	40	}
43	41
44		~~@Override~~
45	42	public boolean handle(EventR3 event) {
46	43	InsertPlainTextItem source = event.getSource(InsertPlainTextItem.class);
…	…
52	49
53	50	FileDialogInput fdi = new FileDialogInput(source.swingMenu().get(),
54		new File~~Name~~ExtensionFilter("TXT file", "txt"), FileDialogInput.Kind.OPEN);
	51	new FileExtensionFilter("TXT file", "txt"), FileDialogInput.Kind.OPEN);
55	52	File txtFile = DialogManager.get().showDialog(fdi).getSelectedFile();
56	53

branches/private/pav/NEW_JAVA_5/sophie2-platform/modules/org.sophie2.extra.func.print/.classpath

r2017	r7238
5	5	<classpathentry kind="src" output="target/test-classes" path="src/test/java"/>
6	6	<classpathentry excluding="**" kind="src" output="target/test-classes" path="src/test/resources"/>
7		~~<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>~~
8	7	<classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
	8	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/jdk1.5.0_21"/>
9	9	<classpathentry kind="output" path="target/classes"/>
10	10	</classpath>

branches/private/pav/NEW_JAVA_5/sophie2-platform/modules/org.sophie2.extra.func.print/.settings/org.eclipse.jdt.core.prefs

r2345	r7238
1		#~~Thu Sep 18 21:11:04 EEST 2008~~
	1	#Mon Oct 05 13:40:58 AFT 2009
2	2	eclipse.preferences.version=1
3	3	org.eclipse.jdt.core.builder.cleanOutputFolder=clean
…	…
18	18	org.eclipse.jdt.core.codeComplete.staticFieldSuffixes=
19	19	org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
20		org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
	20	org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
21	21	org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
22		org.eclipse.jdt.core.compiler.compliance=1.6
	22	org.eclipse.jdt.core.compiler.compliance=1.5
23	23	org.eclipse.jdt.core.compiler.debug.lineNumber=generate
24	24	org.eclipse.jdt.core.compiler.debug.localVariable=generate
…	…
97	97	org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
98	98	org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
99		org.eclipse.jdt.core.compiler.source=1.6
	99	org.eclipse.jdt.core.compiler.source=1.5
100	100	org.eclipse.jdt.core.compiler.taskCaseSensitive=enabled
101	101	org.eclipse.jdt.core.compiler.taskPriorities=NORMAL,HIGH,NORMAL

branches/private/pav/NEW_JAVA_5/sophie2-platform/modules/org.sophie2.extra.func.print/src/main/java/org/sophie2/extra/func/print/logic/PrintLogic.java

r7154	r7238
9	9	import javax.print.PrintService;
10	10	import javax.swing.JOptionPane;
11		~~import javax.swing.filechooser.FileNameExtensionFilter;~~
12	11
13	12	import org.sophie2.base.commons.util.position.ImmRect;
…	…
30	29	import org.sophie2.main.app.commons.page.RootPageView;
31	30	import org.sophie2.main.dialogs.input.FileDialogInput;
	31	import org.sophie2.main.dialogs.input.FileExtensionFilter;
32	32
33	33	import com.lowagie.text.Document;
…	…
49	49	ON_PRINT {
50	50
51		~~@Override~~
52	51	public void defineFilter(EventFilterBuilder filter) {
53	52	filter.setSourceClass(AbstractPrintItem.class);
…	…
55	54	}
56	55
57		~~@Override~~
58	56	public boolean handle(EventR3 event) {
59	57	AbstractPrintItem printItem = event.getSource(AbstractPrintItem.class);
…	…
85	83	ON_EXPORT_TO_PDF {
86	84
87		~~@Override~~
88	85	public void defineFilter(EventFilterBuilder filter) {
89	86	filter.setSourceClass(ExportToPDFItem.class);
…	…
91	88	}
92	89
93		~~@Override~~
94	90	public boolean handle(EventR3 event) {
95	91	BookDocView bookDocView = event.getSource(
…	…
183	179	public static File getFile(BookDocView view) {
184	180	FileDialogInput input = new FileDialogInput(view.workArea().get().swingComponent().get(),
185		"Export", new File~~Name~~ExtensionFilter("PDF (*.pdf)", "pdf"), FileDialogInput.Kind.SAVE);
	181	"Export", new FileExtensionFilter("PDF (*.pdf)", "pdf"), FileDialogInput.Kind.SAVE);
186	182	File bookFile = DialogManager.get().showDialog(input).getSelectedFile();
187	183

branches/private/pav/NEW_JAVA_5/sophie2-platform/modules/org.sophie2.extra.func.print/src/main/java/org/sophie2/extra/func/print/presentations/DefaultSophiePrintable.java

r5369	r7238
44	44	}
45	45
46		~~@Override~~
47	46	public String getId() {
48	47	return this.id;
49	48	}
50	49
51		~~@Override~~
52	50	public boolean isTypeSupported(Class<? extends ResourceH> cl) {
53	51	return this.resourceClass.equals(cl);
54	52	}
55	53
56		~~@Override~~
57	54	public void setResource(ResourceH res) {
58	55	this.resource = res;
59	56	}
60	57
61		~~@Override~~
62	58	public void setBounds(ImmRect bounds) {
63	59	this.bounds = bounds;

branches/private/pav/NEW_JAVA_5/sophie2-platform/modules/org.sophie2.extra.func.print/src/main/java/org/sophie2/extra/func/print/presentations/HotTextSophiePrintable.java

r6426	r7238
46	46	}
47	47
48		~~@Override~~
49	48	public int print(Graphics graphics, PageFormat pageFormat, int pageIndex)
50	49	throws PrinterException {
…	…
81	80	}
82	81
83		~~@Override~~
84	82	public SophiePrintable createPrintable() {
85	83	return new HotTextSophiePrintable(HotTextResourceH.class, this.id);

branches/private/pav/NEW_JAVA_5/sophie2-platform/modules/org.sophie2.extra.func.print/src/main/java/org/sophie2/extra/func/print/presentations/ImageSophiePrintable.java

r5744	r7238
29	29	}
30	30
31		~~@Override~~
32	31	public int print(Graphics graphics, PageFormat pageFormat, int pageIndex)
33	32	throws PrinterException {
…	…
45	44	}
46	45
47		~~@Override~~
48	46	public SophiePrintable createPrintable() {
49	47	return new ImageSophiePrintable (ImageResourceH.class, this.id);

branches/private/pav/NEW_JAVA_5/sophie2-platform/modules/org.sophie2.extra.func.print/src/main/java/org/sophie2/extra/func/print/presentations/PageSophiePrintable.java

r6933	r7238
46	46	}
47	47
48		~~@Override~~
49	48	public int print(Graphics graphics, PageFormat pageFormat, int pageIndex)
50	49	throws PrinterException {
…	…
139	138	}
140	139
141		~~@Override~~
142	140	public SophiePrintable createPrintable() {
143	141	return new PageSophiePrintable(PageH.class, this.id);

branches/private/pav/NEW_JAVA_5/sophie2-platform/modules/org.sophie2.extra.func.rtf/.classpath

r4399	r7238
5	5	<classpathentry kind="src" output="target/test-classes" path="src/test/java"/>
6	6	<classpathentry excluding="**" kind="src" output="target/test-classes" path="src/test/resources"/>
7		<classpathentry kind="con"
8		path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6" />
9		<classpathentry kind="con"
10		path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER" />
11		<classpathentry kind="output" path="target/classes" />
	7	<classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
	8	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/jdk1.5.0_21"/>
	9	<classpathentry kind="output" path="target/classes"/>
12	10	</classpath>

branches/private/pav/NEW_JAVA_5/sophie2-platform/modules/org.sophie2.extra.func.rtf/.settings/org.eclipse.jdt.core.prefs

r4399	r7238
1		#~~Thu Sep 18 21:11:04 EEST 2008~~
	1	#Mon Oct 05 13:41:06 AFT 2009
2	2	eclipse.preferences.version=1
3	3	org.eclipse.jdt.core.builder.cleanOutputFolder=clean
…	…
18	18	org.eclipse.jdt.core.codeComplete.staticFieldSuffixes=
19	19	org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
20		org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
	20	org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
21	21	org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
22		org.eclipse.jdt.core.compiler.compliance=1.6
	22	org.eclipse.jdt.core.compiler.compliance=1.5
23	23	org.eclipse.jdt.core.compiler.debug.lineNumber=generate
24	24	org.eclipse.jdt.core.compiler.debug.localVariable=generate
…	…
97	97	org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
98	98	org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
99		org.eclipse.jdt.core.compiler.source=1.6
	99	org.eclipse.jdt.core.compiler.source=1.5
100	100	org.eclipse.jdt.core.compiler.taskCaseSensitive=enabled
101	101	org.eclipse.jdt.core.compiler.taskPriorities=NORMAL,HIGH,NORMAL

branches/private/pav/NEW_JAVA_5/sophie2-platform/modules/org.sophie2.extra.func.rtf/src/main/java/org/sophie2/extra/func/rtf/RtfLogic.java

r7002	r7238
6	6	import java.io.Reader;
7	7
8		~~import javax.swing.filechooser.FileNameExtensionFilter;~~
9	8	import javax.swing.text.BadLocationException;
10	9	import javax.swing.text.StyledDocument;
…	…
24	23	import org.sophie2.main.app.commons.util.AppViewUtil;
25	24	import org.sophie2.main.dialogs.input.FileDialogInput;
	25	import org.sophie2.main.dialogs.input.FileExtensionFilter;
26	26	import org.sophie2.main.func.text.model.HeadTextFrameH;
27	27
…	…
37	37	*/
38	38	ON_INSERT_RTF {
39		~~@Override~~
40	39	public void defineFilter(EventFilterBuilder filter) {
41	40	filter.setEventId(MenuItem.EventIds.CLICKED);
…	…
43	42	}
44	43
45		~~@Override~~
46	44	public boolean handle(EventR3 event) {
47	45	InsertRtfItem source = event.getSource(InsertRtfItem.class);
…	…
50	48
51	49	FileDialogInput fdi = new FileDialogInput(source.swingMenu().get(),
52		new File~~Name~~ExtensionFilter("RTF (.rtf, .rtfd)", "rtf", "rtfd"),
	50	new FileExtensionFilter("RTF (.rtf, .rtfd)", "rtf", "rtfd"),
53	51	FileDialogInput.Kind.OPEN);
54	52	final File rtfFile = DialogManager.get().showDialog(fdi).getSelectedFile();

branches/private/pav/NEW_JAVA_5/sophie2-platform/modules/org.sophie2.extra.func.scripting/.classpath

r4037	r7238
5	5	<classpathentry kind="src" output="target/test-classes" path="src/test/java"/>
6	6	<classpathentry excluding="**" kind="src" output="target/test-classes" path="src/test/resources"/>
7		<classpathentry kind="con"
8		path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6" />
9		<classpathentry kind="con"
10		path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER" />
11		<classpathentry kind="output" path="target/classes" />
	7	<classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
	8	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/jdk1.5.0_21"/>
	9	<classpathentry kind="output" path="target/classes"/>
12	10	</classpath>

branches/private/pav/NEW_JAVA_5/sophie2-platform/modules/org.sophie2.extra.func.scripting/.settings/org.eclipse.jdt.core.prefs

r4037	r7238
1		#~~Thu Sep 18 21:11:04 EEST 2008~~
	1	#Mon Oct 05 13:41:12 AFT 2009
2	2	eclipse.preferences.version=1
3	3	org.eclipse.jdt.core.builder.cleanOutputFolder=clean
…	…
18	18	org.eclipse.jdt.core.codeComplete.staticFieldSuffixes=
19	19	org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
20		org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
	20	org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
21	21	org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
22		org.eclipse.jdt.core.compiler.compliance=1.6
	22	org.eclipse.jdt.core.compiler.compliance=1.5
23	23	org.eclipse.jdt.core.compiler.debug.lineNumber=generate
24	24	org.eclipse.jdt.core.compiler.debug.localVariable=generate
…	…
97	97	org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
98	98	org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
99		org.eclipse.jdt.core.compiler.source=1.6
	99	org.eclipse.jdt.core.compiler.source=1.5
100	100	org.eclipse.jdt.core.compiler.taskCaseSensitive=enabled
101	101	org.eclipse.jdt.core.compiler.taskPriorities=NORMAL,HIGH,NORMAL

branches/private/pav/NEW_JAVA_5/sophie2-platform/modules/org.sophie2.extra.func.scripting/src/main/java/org/sophie2/extra/func/scripting/facade/JSPage.java

r6995	r7238
97	97	String frameText = null;
98	98
99		if (text == null \|\| text instanceof Undefined \|\|
100		text.toString().isEmpty()
	99	if (text == null \|\| text instanceof Undefined \|\| (text.toString() == null)
101	100	) {
102	101	frameText = "Text frame from script.";

branches/private/pav/NEW_JAVA_5/sophie2-platform/modules/org.sophie2.extra.func.scripting/src/main/java/org/sophie2/extra/func/scripting/links/RunScriptConfigurationPanel.java

r6980	r7238
50	50	implements ActionConfigurationPanel {
51	51
52		~~@Override~~
53	52	public Class<? extends LinkAction> getActionClass() {
54	53	return RunScriptAction.class;
…	…
75	74	}
76	75
77		~~@Override~~
78	76	public Prop<JPanel> swingComponent() {
79	77	class swingComponent extends ResourceProperty<JPanel> {

branches/private/pav/NEW_JAVA_5/sophie2-platform/modules/org.sophie2.extra.func.scripting/src/main/java/org/sophie2/extra/func/scripting/links/RunScriptProvider.java

r6408	r7238
11	11	public class RunScriptProvider implements LinkActionProvider{
12	12
13		~~@Override~~
14	13	public LinkAction create() {
15	14	return new RunScriptAction(null);
16	15	}
17	16
18		~~@Override~~
19	17	public String getDescription() {
20	18	return "Run script...";
21	19	}
22	20
23		~~@Override~~
24	21	public Class<? extends LinkAction> getProvidedClass() {
25	22	return RunScriptAction.class;

branches/private/pav/NEW_JAVA_5/sophie2-platform/modules/org.sophie2.extra.func.scripting/src/main/java/org/sophie2/extra/func/scripting/logic/RunScriptLogic.java

r6700	r7238
50	50	ON_RUN_SCRIPT {
51	51
52		~~@Override~~
53	52	public void defineFilter(EventFilterBuilder filter) {
54	53	filter.setEventId(ScriptDocView.EventIds.RUN_SCRIPT);
…	…
57	56
58	57	@SuppressWarnings("synthetic-access")
59		~~@Override~~
60	58	public boolean handle(EventR3 event) {
61	59
…	…
122	120	ON_RUN_SCRIPT_ACTION {
123	121
124		~~@Override~~
125	122	public void defineFilter(EventFilterBuilder filter) {
126	123	filter.setEventId(LinkProcessorLogic.LinkEvent.LINK_ACTION_TRIGGERED);
…	…
130	127
131	128	@SuppressWarnings("synthetic-access")
132		~~@Override~~
133	129	public boolean handle(EventR3 event) {
134	130
…	…
172	168	*/
173	169	static final ClassShutter DEFAULT_CLASS_SHUTTER = new ClassShutter() {
174		~~@Override~~
175	170	public boolean visibleToScripts(String fullClassName) {
176	171	return fullClassName.startsWith("org.mozilla.javascript")

branches/private/pav/NEW_JAVA_5/sophie2-platform/modules/org.sophie2.extra.func.scripting/src/main/java/org/sophie2/extra/func/scripting/logic/ScriptingLogic.java

r6933	r7238
8	8	import java.io.InputStreamReader;
9	9	import java.io.Reader;
10
11		~~import javax.swing.filechooser.FileNameExtensionFilter;~~
12	10
13	11	import org.sophie2.base.dialogs.DialogManager;
…	…
31	29	import org.sophie2.main.dialogs.input.DialogUtils;
32	30	import org.sophie2.main.dialogs.input.FileDialogInput;
	31	import org.sophie2.main.dialogs.input.FileExtensionFilter;
33	32
34	33	/**
…	…
46	45	ON_INSERT_SCRIPT {
47	46
48		~~@Override~~
49	47	public void defineFilter(EventFilterBuilder filter) {
50	48	filter.setSourceClass(InsertScriptItem.class);
…	…
52	50	}
53	51
54		~~@Override~~
55	52	public boolean handle(EventR3 event) {
56	53	InsertScriptItem source = event.getSource(InsertScriptItem.class);
…	…
88	85	ON_INSERT_SCRIPT_FROM_FILE {
89	86
90		~~@Override~~
91	87	public void defineFilter(EventFilterBuilder filter) {
92	88	filter.setSourceClass(InsertScriptFileItem.class);
…	…
94	90	}
95	91
96		~~@Override~~
97	92	public boolean handle(EventR3 event) {
98	93	InsertScriptFileItem source = event.getSource(InsertScriptFileItem.class);
…	…
145	140	final ResourceRefR4 scriptRef) {
146	141
147		FileDialogInput fdi = new FileDialogInput(parentComponent, new File~~Name~~ExtensionFilter(
	142	FileDialogInput fdi = new FileDialogInput(parentComponent, new FileExtensionFilter(
148	143	"JavaScript (*.js)", "js"), FileDialogInput.Kind.OPEN);
149	144	File scriptFile = DialogManager.get().showDialog(fdi).getSelectedFile();
…	…
179	174	ON_TEXT_CHANGED {
180	175
181		~~@Override~~
182	176	public void defineFilter(EventFilterBuilder filter) {
183	177	filter.setEventId(ScriptDocView.EventIds.TEXT_CHANGED);
…	…
185	179	}
186	180
187		~~@Override~~
188	181	public boolean handle(EventR3 event) {
189	182	ScriptDocView window = event.getSource(ScriptDocView.class);
…	…
213	206	ON_OPEN_WINDOW {
214	207
215		~~@Override~~
216	208	public void defineFilter(EventFilterBuilder filter) {
217	209	filter.setEventId(ScriptResourcePreview.EventIds.OPEN_WINDOW);
…	…
219	211	}
220	212
221		~~@Override~~
222	213	public boolean handle(EventR3 event) {
223	214

branches/private/pav/NEW_JAVA_5/sophie2-platform/modules/org.sophie2.extra.func.scripting/src/main/java/org/sophie2/extra/func/scripting/view/ScriptDocView.java

r6700	r7238
97	97	textArea.getDocument().addDocumentListener(new DocumentListener() {
98	98
99		~~@Override~~
100	99	public void changedUpdate(DocumentEvent e) {
101	100	syncInputToModel();
102	101	}
103	102
104		~~@Override~~
105	103	public void insertUpdate(DocumentEvent e) {
106	104	syncInputToModel();
107	105	}
108	106
109		~~@Override~~
110	107	public void removeUpdate(DocumentEvent e) {
111	108	syncInputToModel();

branches/private/pav/NEW_JAVA_5/sophie2-platform/modules/org.sophie2.extra.func.scripting/src/main/java/org/sophie2/extra/func/scripting/view/ScriptResourcePreviewProvider.java

r5644	r7238
35	35	implements ResourcePreviewProvider {
36	36
37		~~@Override~~
38	37	public String getResourceKind() {
39	38	return ScriptResourceR4.KIND;
40	39	}
41	40
42		~~@Override~~
43	41	public String filterKind() {
44	42	return "Script";
45	43	}
46	44
47		~~@Override~~
48	45	public SwingVisualElement getVisualElement(ResourceH element) {
49	46	assert element instanceof ScriptResourceH;
…	…
138	135
139	136
140		~~@Override~~
141	137	public Prop<JPanel> swingComponent() {
142	138	class swingComponent extends ResourceProperty<JPanel> {

branches/private/pav/NEW_JAVA_5/sophie2-platform/modules/org.sophie2.launcher/.classpath

r575	r7238
5	5	<classpathentry kind="src" output="target/test-classes" path="src/test/java"/>
6	6	<classpathentry excluding="**" kind="src" output="target/test-classes" path="src/test/resources"/>
7		<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J~~avaSE-1.6~~"/>
	7	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
8	8	<classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
9	9	<classpathentry kind="output" path="target/classes"/>

branches/private/pav/NEW_JAVA_5/sophie2-platform/modules/org.sophie2.launcher/.settings/org.eclipse.jdt.core.prefs

r575	r7238
1		#~~Thu Sep 18 21:11:04 EEST 2008~~
	1	#Mon Oct 05 13:41:19 AFT 2009
2	2	eclipse.preferences.version=1
3	3	org.eclipse.jdt.core.builder.cleanOutputFolder=clean
…	…
18	18	org.eclipse.jdt.core.codeComplete.staticFieldSuffixes=
19	19	org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
20		org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
	20	org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
21	21	org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
22		org.eclipse.jdt.core.compiler.compliance=1.6
	22	org.eclipse.jdt.core.compiler.compliance=1.5
23	23	org.eclipse.jdt.core.compiler.debug.lineNumber=generate
24	24	org.eclipse.jdt.core.compiler.debug.localVariable=generate
…	…
97	97	org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
98	98	org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
99		org.eclipse.jdt.core.compiler.source=1.6
	99	org.eclipse.jdt.core.compiler.source=1.5
100	100	org.eclipse.jdt.core.compiler.taskCaseSensitive=enabled
101	101	org.eclipse.jdt.core.compiler.taskPriorities=NORMAL,HIGH,NORMAL

branches/private/pav/NEW_JAVA_5/sophie2-platform/modules/org.sophie2.launcher/src/main/java/org/sophie2/launcher/JavaWebStartMain.java

r6944	r7238
55	55	public static void main(String[] args) throws IOException {
56	56
57		checkAssertions();
	57	// checkAssertions();
58	58
59	59	assert args.length == 3;
…	…
78	78
79	79	String bundleName = null;
80		~~String bundleLocationFormat;~~
81	80
82	81	StringBuilder started = new StringBuilder();
83	82	StringBuilder notStarted = new StringBuilder();
84		~~bundleLocationFormat = bundlesUrlPrefix + "/modules/%s-2.0-SNAPSHOT.jar";~~
85	83
86	84	while ((inLine = stream.readLine()) != null) {
87	85	bundleName = inLine.substring(0, inLine.indexOf(" "));
88		String bundleLocation = ~~String.format(bundleLocationFormat, bundleName)~~;
	86	String bundleLocation = bundlesUrlPrefix + "/modules/" + bundleName + "-2.0-SNAPSHOT.jar";
89	87	if (inLine.substring(bundleName.length() + 1).equals("started")) {
90	88	started.append(bundleLocation);

branches/private/pav/NEW_JAVA_5/sophie2-platform/modules/org.sophie2.launcher/src/main/java/org/sophie2/launcher/Main.java

r6944	r7238
78	78	String inLine = null;
79	79	String bundleName = null;
80		String bundleLocationFormat;
81		if (Boolean.valueOf(System.getProperty("sophie2.development"))) {
82		bundleLocationFormat = "file:../%1$s/target/%1$s-2.0-SNAPSHOT.jar";
83		} else {
84		bundleLocationFormat = "file:./modules/%s-2.0-SNAPSHOT.jar";
85		}
	80	String bundleLocation;
	81
86	82	while ((inLine = stream.readLine()) != null) {
87	83	bundleName = inLine.substring(0, inLine.indexOf(" "));
88		String bundleLocation = String.format(bundleLocationFormat, bundleName);
	84	if (Boolean.valueOf(System.getProperty("sophie2.development"))) {
	85	bundleLocation = "file:../" + bundleName + "/target/" + bundleName + "-2.0-SNAPSHOT.jar";
	86	} else {
	87	bundleLocation = "file:./modules/" + bundleName + "-2.0-SNAPSHOT.jar";
	88	}
89	89	if (inLine.substring(bundleName.length() + 1).equals("started")) {
90	90	started.append(bundleLocation);

branches/private/pav/NEW_JAVA_5/sophie2-platform/modules/org.sophie2.main.app.commons/.classpath

r2057	r7238
5	5	<classpathentry kind="src" output="target/test-classes" path="src/test/java"/>
6	6	<classpathentry excluding="**" kind="src" output="target/test-classes" path="src/test/resources"/>
7		~~<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>~~
8	7	<classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
	8	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/jdk1.5.0_21"/>
9	9	<classpathentry kind="output" path="target/classes"/>
10	10	</classpath>

branches/private/pav/NEW_JAVA_5/sophie2-platform/modules/org.sophie2.main.app.commons/.settings/org.eclipse.jdt.core.prefs

r2057	r7238
1		#~~Thu Sep 18 21:11:04 EEST 2008~~
	1	#Mon Oct 05 13:41:26 AFT 2009
2	2	eclipse.preferences.version=1
3	3	org.eclipse.jdt.core.builder.cleanOutputFolder=clean
…	…
18	18	org.eclipse.jdt.core.codeComplete.staticFieldSuffixes=
19	19	org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
20		org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
	20	org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
21	21	org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
22		org.eclipse.jdt.core.compiler.compliance=1.6
	22	org.eclipse.jdt.core.compiler.compliance=1.5
23	23	org.eclipse.jdt.core.compiler.debug.lineNumber=generate
24	24	org.eclipse.jdt.core.compiler.debug.localVariable=generate
…	…
97	97	org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
98	98	org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
99		org.eclipse.jdt.core.compiler.source=1.6
	99	org.eclipse.jdt.core.compiler.source=1.5
100	100	org.eclipse.jdt.core.compiler.taskCaseSensitive=enabled
101	101	org.eclipse.jdt.core.compiler.taskPriorities=NORMAL,HIGH,NORMAL

branches/private/pav/NEW_JAVA_5/sophie2-platform/modules/org.sophie2.main.app.commons/src/main/java/org/sophie2/main/app/commons/app/AppTabBar.java

r6813	r7238
94	94	}
95	95
96		~~@Override~~
97	96	public Prop<JPanel> swingComponent() {
98	97	class swingComponent extends ResourceProperty<JPanel> {
…	…
225	224	}
226	225	}.transform(new ProListTransformer<DocView, TabBarButton>() {
227		~~@Override~~
228	226	public TabBarButton translate(DocView source) {
229	227	return new TabBarButton(source);
…	…
314	312	res.addActionListener(new ActionListener() {
315	313
316		~~@Override~~
317	314	public void actionPerformed(ActionEvent e) {
318	315	// LogicR3.fire(AppTabBar.this, null, null, null, EventIds.SHOW_DESKTOP);

branches/private/pav/NEW_JAVA_5/sophie2-platform/modules/org.sophie2.main.app.commons/src/main/java/org/sophie2/main/app/commons/app/DocumentsLogic.java

r6690	r7238
25	25	ON_SELECT {
26	26
27		~~@Override~~
28	27	public void defineFilter(EventFilterBuilder filter) {
29	28	filter.setSourceClass(DefaultDocView.class);
…	…
31	30	}
32	31
33		~~@Override~~
34	32	public boolean handle(EventR3 event) {
35	33	DefaultDocView documentWindow = event.getSource(DefaultDocView.class);
…	…
45	43	ON_DESELECT {
46	44
47		~~@Override~~
48	45	public void defineFilter(EventFilterBuilder filter) {
49	46	filter.setEventId(DefaultDocView.EventIds.DESELECT);
…	…
51	48	}
52	49
53		~~@Override~~
54	50	public boolean handle(EventR3 event) {
55	51	DefaultDocView source = event.getSource(DefaultDocView.class);
…	…
69	65	ON_CLOSE {
70	66
71		~~@Override~~
72	67	public void defineFilter(EventFilterBuilder filter) {
73	68	filter.setSourceClass(ResourceDocView.class);
…	…
75	70	}
76	71
77		~~@Override~~
78	72	public boolean handle(EventR3 event) {
79	73	// TODO Ask for confirmation about saving changes before closing.
…	…
122	116	ON_RESIZE {
123	117
124		~~@Override~~
125	118	public void defineFilter(EventFilterBuilder filter) {
126	119	filter.setEventId(DefaultDocView.EventIds.RESIZE);
…	…
128	121	}
129	122
130		~~@Override~~
131	123	public boolean handle(EventR3 event) {
132	124	// FIXME (R4) Reimplement page centering. This might need to go down to the layout.

branches/private/pav/NEW_JAVA_5/sophie2-platform/modules/org.sophie2.main.app.commons/src/main/java/org/sophie2/main/app/commons/app/MainWindowLogic.java

r6944	r7238
36	36	ON_SET_SCREEN_MODE {
37	37
38		~~@Override~~
39	38	public void defineFilter(EventFilterBuilder filter) {
40	39	filter.setEventId(DefaultMainWindow.EventIds.SET_SCREEN_MODE);
…	…
42	41	}
43	42
44		~~@Override~~
45	43	public boolean handle(EventR3 event) {
46	44	DefaultMainWindow main = event.getSource(DefaultMainWindow.class);
…	…
66	64	ON_ARRANGE_WINDOWS {
67	65
68		~~@Override~~
69	66	public void defineFilter(EventFilterBuilder filter) {
70	67	filter.setEventId(DefaultMainWindow.EventIds.ARRANGE_WINDOWS);
…	…
72	69	}
73	70
74		~~@Override~~
75	71	public boolean handle(EventR3 event) {
76	72	DefaultMainWindow main = event.getSource(DefaultMainWindow.class);
…	…
99	95	ON_CLOSE {
100	96
101		~~@Override~~
102	97	public void defineFilter(EventFilterBuilder filter) {
103	98	filter.setEventId(DefaultMainWindow.EventIds.CLOSE);
…	…
105	100	}
106	101
107		~~@Override~~
108	102	public boolean handle(EventR3 event) {
109	103	// TODO Reuse this when the desktop book is present again.

branches/private/pav/NEW_JAVA_5/sophie2-platform/modules/org.sophie2.main.app.commons/src/main/java/org/sophie2/main/app/commons/app/ResourceDocView.java

r6933	r7238
30	30	}
31	31
32		~~@Override~~
33	32	public void initAccess(ResourceAccess access) {
34	33	getBean().init(access(), access);
35	34	}
36	35
37		~~@Override~~
38	36	public void dispose() {
39	37	getBean().destroy();
40	38	}
41	39
42		~~@Override~~
43	40	public ResourceAccess getAccess() {
44	41	return access().get();
45	42	}
46	43
47		~~@Override~~
48	44	public Prop<? extends ResourceH> model() {
49	45	class model extends AutoProperty<ResourceH> {

branches/private/pav/NEW_JAVA_5/sophie2-platform/modules/org.sophie2.main.app.commons/src/main/java/org/sophie2/main/app/commons/app/TabBarButton.java

r6335	r7238
81	81	res.addActionListener(new ActionListener() {
82	82
83		~~@Override~~
84	83	public void actionPerformed(ActionEvent e) {
85	84	if (view instanceof DefaultDocView) {

branches/private/pav/NEW_JAVA_5/sophie2-platform/modules/org.sophie2.main.app.commons/src/main/java/org/sophie2/main/app/commons/book/BookDocView.java

r6933	r7238
209	209	}
210	210
211		~~@Override~~
212	211	public void setTime(TimePos time) {
213	212	if(bookView().get().getViewOptions().isPreviewMode()) {
…	…
216	215	}
217	216
218		~~@Override~~
219	217	public void getAudioChunks(List<AudioChunk> res, TimePos time) {
220	218	if(bookView().get().getViewOptions().isPreviewMode()) {

branches/private/pav/NEW_JAVA_5/sophie2-platform/modules/org.sophie2.main.app.commons/src/main/java/org/sophie2/main/app/commons/book/BookView.java

r7089	r7238
69	69	}
70	70
71		~~@Override~~
72	71	public void initAccess(ResourceAccess access) {
73	72	getBean().init(access(), access);
…	…
76	75	}
77	76
78		~~@Override~~
79	77	public void dispose() {
80	78	getBean().destroy();
…	…
85	83	}
86	84
87		~~@Override~~
88	85	public ResourceAccess getAccess() {
89	86	return access().get();
90	87	}
91	88
92		~~@Override~~
93	89	public Prop<BookH> model() {
94	90	class model extends AutoProperty<BookH> {
…	…
146	142	}
147	143
148		~~@Override~~
149	144	public void setTime(TimePos time) {
150	145	setTimeState(getFuture(time));
…	…
216	211	}
217	212
218		~~@Override~~
219	213	public void getAudioChunks(List<AudioChunk> res, TimePos time) {
220	214	// book is always in MAIN

branches/private/pav/NEW_JAVA_5/sophie2-platform/modules/org.sophie2.main.app.commons/src/main/java/org/sophie2/main/app/commons/book/panels/BookPanelElement.java

r5739	r7238
18	18	* The parent of this element (should be {@link BookPanel}
19	19	*/
20		~~@Override~~
21	20	Prop<? extends BookPanel> parent();
22	21

branches/private/pav/NEW_JAVA_5/sophie2-platform/modules/org.sophie2.main.app.commons/src/main/java/org/sophie2/main/app/commons/book/panels/BookPanelLogic.java

r7089	r7238
48	48	ON_ZOOM_CHANGE {
49	49
50		~~@Override~~
51	50	public void defineFilter(EventFilterBuilder filter) {
52	51	filter.setSourceClass(ZoomPercentagePanel.class);
…	…
55	54
56	55	@SuppressWarnings("unchecked")
57		~~@Override~~
58	56	public boolean handle(EventR3 event) {
59	57	ZoomPercentagePanel source = event.getSource(ZoomPercentagePanel.class);
…	…
96	94	ON_GO_TO_PAGE {
97	95
98		~~@Override~~
99	96	public void defineFilter(EventFilterBuilder filter) {
100	97	filter.setSourceClass(NavigationPanel.class);
…	…
102	99	}
103	100
104		~~@Override~~
105	101	public boolean handle(EventR3 event) {
106	102	NavigationPanel source = event.getSource(NavigationPanel.class);
…	…
144	140	ON_GO_TO_PREV_PAGE {
145	141
146		~~@Override~~
147	142	public void defineFilter(EventFilterBuilder filter) {
148	143	filter.setSourceClass(NavigationPanel.class);
…	…
150	145	}
151	146
152		~~@Override~~
153	147	public boolean handle(EventR3 event) {
154	148	NavigationPanel source = event.getSource(NavigationPanel.class);
…	…
176	170	ON_GO_TO_NEXT_PAGE {
177	171
178		~~@Override~~
179	172	public void defineFilter(EventFilterBuilder filter) {
180	173	filter.setSourceClass(NavigationPanel.class);
…	…
182	175	}
183	176
184		~~@Override~~
185	177	public boolean handle(EventR3 event) {
186	178	NavigationPanel source = event.getSource(NavigationPanel.class);
…	…
203	195	ON_TOGGLE_OUTLINE_FRAMES {
204	196
205		~~@Override~~
206	197	public void defineFilter(EventFilterBuilder filter) {
207	198	filter.setSourceClass(ShowFramesCheckBoxPanel.class);
…	…
209	200	}
210	201
211		~~@Override~~
212	202	public boolean handle(EventR3 event) {
213	203	boolean outlinesShown = event.getEventParam(BoundControl.EventIds.INPUT_PARAM_INDEX,
…	…
240	230	ON_OPEN_PREVIEW_MODE {
241	231
242		~~@Override~~
243	232	public void defineFilter(EventFilterBuilder filter) {
244	233	filter.setEventId(PreviewModePanel.EventIds.OPEN_PREVIEW);
…	…
246	235	}
247	236
248		~~@Override~~
249	237	public boolean handle(EventR3 event) {
250	238	PreviewModePanel source = event.getSource(PreviewModePanel.class);
…	…
285	273	ON_CLOSE_PREVIEW_MODE {
286	274
287		~~@Override~~
288	275	public void defineFilter(EventFilterBuilder filter) {
289	276	filter.setEventId(PreviewModePanel.EventIds.CLOSE_PREVIEW);
…	…
291	278	}
292	279
293		~~@Override~~
294	280	public boolean handle(EventR3 event) {
295	281	PreviewModePanel source = event.getSource(PreviewModePanel.class);

branches/private/pav/NEW_JAVA_5/sophie2-platform/modules/org.sophie2.main.app.commons/src/main/java/org/sophie2/main/app/commons/book/panels/NavigationPanel.java

r6700	r7238
145	145	* @return The property.
146	146	*/
147		~~@Override~~
148	147	public Prop<JPanel> swingComponent() {
149	148	class swingComponent extends ResourceProperty<JPanel> {
…	…
367	366	res.addFocusListener(new FocusListener() {
368	367
369		~~@Override~~
370	368	public void focusGained(FocusEvent e) {
371	369	// nothing
…	…
373	371
374	372	@SuppressWarnings("synthetic-access")
375		~~@Override~~
376	373	public void focusLost(FocusEvent e) {
377	374	res.setText(getModelPageContent());
…	…
415	412	}
416	413
417		~~@Override~~
418	414	public Boolean computeVisible() {
419	415	return true;

branches/private/pav/NEW_JAVA_5/sophie2-platform/modules/org.sophie2.main.app.commons/src/main/java/org/sophie2/main/app/commons/book/panels/PreviewModePanel.java

r7002	r7238
121	121	}
122	122
123		~~@Override~~
124	123	public Boolean computeVisible() {
125	124	MainWindow window = findParentElement(MainWindow.class);

branches/private/pav/NEW_JAVA_5/sophie2-platform/modules/org.sophie2.main.app.commons/src/main/java/org/sophie2/main/app/commons/book/panels/QuickSearchPanel.java

r6518	r7238
149	149	}
150	150
151		~~@Override~~
152	151	public Prop<JPanel> swingComponent() {
153	152	class swingComponent extends ResourceProperty<JPanel> {
…	…
359	358	}
360	359
361		~~@Override~~
362	360	public Boolean computeVisible() {
363	361	return true;

branches/private/pav/NEW_JAVA_5/sophie2-platform/modules/org.sophie2.main.app.commons/src/main/java/org/sophie2/main/app/commons/book/panels/ShowFramesCheckBoxPanel.java

r6408	r7238
45	45	}
46	46
47		~~@Override~~
48	47	public Boolean computeVisible() {
49	48	BookDocView bdv = findParentElement(BookDocView.class);

branches/private/pav/NEW_JAVA_5/sophie2-platform/modules/org.sophie2.main.app.commons/src/main/java/org/sophie2/main/app/commons/book/panels/ZoomPercentagePanel.java

r6988	r7238
138	138	}
139	139
140		~~@Override~~
141	140	public Boolean computeVisible() {
142	141	return true;

branches/private/pav/NEW_JAVA_5/sophie2-platform/modules/org.sophie2.main.app.commons/src/main/java/org/sophie2/main/app/commons/dialogs/AudioCaptureDialog.java

r6933	r7238
52	52
53	53	record.addActionListener(new ActionListener() {
54		~~@Override~~
55	54	public void actionPerformed(ActionEvent e) {
56	55	stop.setEnabled(true);
…	…
61	60
62	61	stop.addActionListener(new ActionListener() {
63		~~@Override~~
64	62	public void actionPerformed(ActionEvent e) {
65	63	AudioCaptureDialog.this.recordedData = MediaUtil.stopCapture();
…	…
73	71
74	72	close.addActionListener(new ActionListener() {
75		~~@Override~~
76	73	public void actionPerformed(ActionEvent e) {
77	74	AudioCaptureDialog.this.recordedData = null;

branches/private/pav/NEW_JAVA_5/sophie2-platform/modules/org.sophie2.main.app.commons/src/main/java/org/sophie2/main/app/commons/dialogs/BookPropertiesDialog.java

r7005	r7238
230	230	return;
231	231	}
232		if (title.~~isEmpty()~~) {
	232	if (title.length() == 0) {
233	233	SwingDialog.this.verificationLabel.setText(NOT_CORRECT_TITLE);
234	234	return;

branches/private/pav/NEW_JAVA_5/sophie2-platform/modules/org.sophie2.main.app.commons/src/main/java/org/sophie2/main/app/commons/dialogs/TemplateDialog.java

r7106	r7238
496	496	*/
497	497	ON_SUBMIT {
498		~~@Override~~
499	498	public void defineFilter(EventFilterBuilder filter) {
500	499	filter.setEventId(BoundControl.EventIds.SUBMIT);
…	…
502	501	}
503	502
504		~~@Override~~
505	503	public boolean handle(EventR3 event) {
506	504	SubCheckBox source = event.getSource(SubCheckBox.class);

branches/private/pav/NEW_JAVA_5/sophie2-platform/modules/org.sophie2.main.app.commons/src/main/java/org/sophie2/main/app/commons/element/ElementView.java

r7035	r7238
60	60	}
61	61	}
62
63
64		~~@Override~~
65	62	public void initAccess(ResourceAccess access) {
66	63	getBean().init(access(), access);
67	64	}
68	65
69		~~@Override~~
70	66	public void dispose() {
71	67	getBean().destroy();
…	…
87	83	* @return The model class.
88	84	*/
89		~~@Override~~
90	85	public Prop<? extends ElementH> model() {
91	86	class model extends AutoProperty<ElementH> {
…	…
100	95	}
101	96
102
103		~~@Override~~
104	97	public ResourceAccess getAccess() {
105	98	return access().get();
…	…
153	146
154	147	// media views should override this one
155		~~@Override~~
156	148	public void getAudioChunks(List<AudioChunk> res, TimePos time) {
157	149	if (time.isOn()) {
…	…
163	155	}
164	156
165		~~@Override~~
166	157	public void setTime(TimePos time) {
167	158	localTime().set(time);

branches/private/pav/NEW_JAVA_5/sophie2-platform/modules/org.sophie2.main.app.commons/src/main/java/org/sophie2/main/app/commons/frame/FrameLogic.java

r7106	r7238
42	42	ON_RESIZE {
43	43
44		~~@Override~~
45	44	public void defineFilter(EventFilterBuilder filter) {
46	45	filter.setEventId(InputEventR3.MOUSE_PRESSED);
…	…
49	48	}
50	49
51		~~@Override~~
52	50	public boolean handle(EventR3 event) {
53	51
…	…
189	187	ON_CLICK {
190	188
191		~~@Override~~
192	189	public void defineFilter(EventFilterBuilder filter) {
193	190	filter.setEventId(InputEventR3.MOUSE_PRESSED);
…	…
195	192	}
196	193
197		~~@Override~~
198	194	public boolean handle(EventR3 event) {
199	195	FrameView frameView = event.getSource(FrameView.class);

branches/private/pav/NEW_JAVA_5/sophie2-platform/modules/org.sophie2.main.app.commons/src/main/java/org/sophie2/main/app/commons/MainAppModule.java

r7094	r7238
106	106	return new Comparator<SophieExtension<ResourceViewProvider>>() {
107	107
108		~~@Override~~
109	108	public int compare(SophieExtension<ResourceViewProvider> o1,
110	109	SophieExtension<ResourceViewProvider> o2) {

branches/private/pav/NEW_JAVA_5/sophie2-platform/modules/org.sophie2.main.app.commons/src/main/java/org/sophie2/main/app/commons/page/LinkProcessorLogic.java

r7002	r7238
39	39	ON_FRAME_SHOWN {
40	40
41		~~@Override~~
42	41	public void defineFilter(EventFilterBuilder filter) {
43	42	filter.setSourceClass(FrameView.class);
…	…
45	44	}
46	45
47		~~@Override~~
48	46	public boolean handle(EventR3 event) {
49	47	FrameH frame = event.getEventParam(
…	…
65	63	ON_FRAME_HIDDEN {
66	64
67		~~@Override~~
68	65	public void defineFilter(EventFilterBuilder filter) {
69	66	filter.setSourceClass(FrameView.class);
…	…
71	68	}
72	69
73		~~@Override~~
74	70	public boolean handle(EventR3 event) {
75	71	FrameH frame = event.getEventParam(
…	…
92	88	ON_FRAME_ENTERED {
93	89
94		~~@Override~~
95	90	public void defineFilter(EventFilterBuilder filter) {
96	91	filter.setSourceClass(FrameView.class);
…	…
98	93	}
99	94
100		~~@Override~~
101	95	public boolean handle(EventR3 event) {
102	96	FrameH frame = event.getSource(FrameView.class).model().get();
…	…
117	111	ON_FRAME_EXITED {
118	112
119		~~@Override~~
120	113	public void defineFilter(EventFilterBuilder filter) {
121	114	filter.setSourceClass(FrameView.class);
…	…
123	116	}
124	117
125		~~@Override~~
126	118	public boolean handle(EventR3 event) {
127	119	boolean handled = false;
…	…
145	137	ON_FRAME_MOUSE_PRESSED {
146	138
147		~~@Override~~
148	139	public void defineFilter(EventFilterBuilder filter) {
149	140	filter.setSourceClass(FrameView.class);
…	…
151	142	}
152	143
153		~~@Override~~
154	144	public boolean handle(EventR3 event) {
155	145	FrameH frame = event.getSource(FrameView.class).model().get();
…	…
170	160	ON_FRAME_MOUSE_RELEASED {
171	161
172		~~@Override~~
173	162	public void defineFilter(EventFilterBuilder filter) {
174	163	filter.setSourceClass(FrameView.class);
…	…
176	165	}
177	166
178		~~@Override~~
179	167	public boolean handle(EventR3 event) {
180	168	FrameH frame = event.getSource(FrameView.class).model().get();
…	…
195	183	ON_FRAME_DOUBLE_CLICKED {
196	184
197		~~@Override~~
198	185	public void defineFilter(EventFilterBuilder filter) {
199	186	filter.setSourceClass(FrameView.class);
…	…
203	190	}
204	191
205		~~@Override~~
206	192	public boolean handle(EventR3 event) {
207	193	FrameH frame = event.getSource(FrameView.class).model().get();
…	…
222	208	ON_PAGE_HIDDEN {
223	209
224		~~@Override~~
225	210	public void defineFilter(EventFilterBuilder filter) {
226	211	filter.setSourceClass(BookDocView.class);
…	…
229	214	}
230	215
231		~~@Override~~
232	216	public boolean handle(EventR3 event) {
233	217	PageH page = event.getEventParam(
…	…
250	234	ON_PAGE_SHOWN {
251	235
252		~~@Override~~
253	236	public void defineFilter(EventFilterBuilder filter) {
254	237	filter.setSourceClass(BookDocView.class);
…	…
257	240	}
258	241
259		~~@Override~~
260	242	public boolean handle(EventR3 event) {
261	243	PageH page = event.getEventParam(

branches/private/pav/NEW_JAVA_5/sophie2-platform/modules/org.sophie2.main.app.commons/src/main/java/org/sophie2/main/app/commons/page/ScenePageLogic.java

r6997	r7238
53	53	ON_SELECT_PAGE_ELEMENT {
54	54
55		~~@Override~~
56	55	public void defineFilter(EventFilterBuilder filter) {
57	56	filter.setSourceClass(ElementView.class);
…	…
59	58	}
60	59
61		@Override
62		public boolean handle(EventR3 event) {
63
	60	public boolean handle(EventR3 event) {
64	61	ElementView pwa = event.getSource(ElementView.class);
65	62	DocView docView = BaseVisualElement.findParentElement(pwa, DocView.class);
…	…
79	76	ON_SELECT_PAGE {
80	77
81		~~@Override~~
82	78	public void defineFilter(EventFilterBuilder filter) {
83	79	filter.setSourceClass(PageWorkArea.class);
…	…
87	83	}
88	84
89		~~@Override~~
90	85	public boolean handle(EventR3 event) {
91	86	SophieLog.debug(event);
…	…
113	108	DRAG_TO_SELECT_PAGE_ELEMENTS() {
114	109
115		~~@Override~~
116	110	public void defineFilter(EventFilterBuilder filter) {
117	111	filter.setSourceClass(PageWorkArea.class);
…	…
120	114	}
121	115
122		~~@Override~~
123	116	public boolean handle(EventR3 event) {
124	117
…	…
187	180	ON_SELECT_ALL {
188	181
189		~~@Override~~
190	182	public void defineFilter(EventFilterBuilder filter) {
191	183	filter.setSourceClass(BaseSceneVisual.class);
…	…
194	186	}
195	187
196		~~@Override~~
197	188	public boolean handle(EventR3 event) {
198	189	BaseSceneVisual sceneVisual = event.getSource(BaseSceneVisual.class);
…	…
214	205	ON_DND_PRE_IMPORT {
215	206
216		~~@Override~~
217	207	public void defineFilter(EventFilterBuilder filter) {
218	208	filter.setSourceClass(PageWorkArea.class);
…	…
221	211
222	212	@SuppressWarnings("unchecked")
223		~~@Override~~
224	213	public boolean handle(EventR3 event) {
225	214

branches/private/pav/NEW_JAVA_5/sophie2-platform/modules/org.sophie2.main.app.commons/src/main/java/org/sophie2/main/app/commons/util/DropShadowInternalFrame.java

r6508	r7238
25	25	private ProBean bean;
26	26
27		~~@Override~~
28	27	public ProBean getBean() {
29	28	if (this.bean == null) {
…	…
140	139	this.repaint();
141	140	}
142
143	141	}

branches/private/pav/NEW_JAVA_5/sophie2-platform/modules/org.sophie2.main.app.commons/src/main/java/org/sophie2/main/app/commons/util/SimpleResourceViewProvider.java

r6500	r7238
59	59	}
60	60
61		~~@Override~~
62	61	public <T extends VisualElement> T create(Class<T> viewClass,
63	62	ResourceAccess access) {
…	…
78	77	}
79	78
80		~~@Override~~
81	79	public Class<? extends VisualElement> getParentClass() {
82	80	return this.parentClass;
83	81	}
84	82
85		~~@Override~~
86	83	public Class<? extends VisualElement> getProvidedClass() {
87	84	return this.providedClass;
88	85	}
89	86
90		~~@Override~~
91	87	public String getSupportedKind() {
92	88	return this.supportedKind;
93	89	}
94	90
95		~~@Override~~
96	91	public String getSortKey() {
97	92	return this.sortKey;

branches/private/pav/NEW_JAVA_5/sophie2-platform/modules/org.sophie2.main.app.commons/src/test/java/org/sophie2/main/app/commons/dialogs/TemplateDialogDemo.java

r7106	r7238
41	41	BaseModelResourcesR4Module.class, BaseModelBookModule.class);
42	42	SwingUtilities.invokeLater(new Runnable() {
43		~~@Override~~
44	43	public void run() {
45	44	new SwingDialog(new TemplateInfo("Template test",

branches/private/pav/NEW_JAVA_5/sophie2-platform/modules/org.sophie2.main.app.halos/.classpath

r1402	r7238
5	5	<classpathentry kind="src" output="target/test-classes" path="src/test/java"/>
6	6	<classpathentry excluding="**" kind="src" output="target/test-classes" path="src/test/resources"/>
7		<classpathentry kind="con"
8		path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6" />
9		<classpathentry kind="con"
10		path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER" />
11		<classpathentry kind="output" path="target/classes" />
	7	<classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
	8	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/jdk1.5.0_21"/>
	9	<classpathentry kind="output" path="target/classes"/>
12	10	</classpath>

branches/private/pav/NEW_JAVA_5/sophie2-platform/modules/org.sophie2.main.app.halos/.settings/org.eclipse.jdt.core.prefs

r1162	r7238
1		#~~Thu Sep 18 21:11:04 EEST 2008~~
	1	#Mon Oct 05 13:41:32 AFT 2009
2	2	eclipse.preferences.version=1
3	3	org.eclipse.jdt.core.builder.cleanOutputFolder=clean
…	…
18	18	org.eclipse.jdt.core.codeComplete.staticFieldSuffixes=
19	19	org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
20		org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
	20	org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
21	21	org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
22		org.eclipse.jdt.core.compiler.compliance=1.6
	22	org.eclipse.jdt.core.compiler.compliance=1.5
23	23	org.eclipse.jdt.core.compiler.debug.lineNumber=generate
24	24	org.eclipse.jdt.core.compiler.debug.localVariable=generate
…	…
97	97	org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
98	98	org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
99		org.eclipse.jdt.core.compiler.source=1.6
	99	org.eclipse.jdt.core.compiler.source=1.5
100	100	org.eclipse.jdt.core.compiler.taskCaseSensitive=enabled
101	101	org.eclipse.jdt.core.compiler.taskPriorities=NORMAL,HIGH,NORMAL

branches/private/pav/NEW_JAVA_5/sophie2-platform/modules/org.sophie2.main.app.halos/src/main/java/org/sophie2/main/app/halos/align/AlignElementsButton.java

r5809	r7238
38	38	}
39	39
40		~~@Override~~
41	40	public Prop<? extends JComponent> swingComponent() {
42	41	class swingComponent extends ResourceProperty<JButton> {
…	…
47	46	res.addActionListener(new ActionListener() {
48	47
49		~~@Override~~
50	48	public void actionPerformed(ActionEvent e) {
51	49	clicked();

branches/private/pav/NEW_JAVA_5/sophie2-platform/modules/org.sophie2.main.app.halos/src/main/java/org/sophie2/main/app/halos/align/AlignElementsLogic.java

r6933	r7238
37	37	ON_ALIGN {
38	38
39		~~@Override~~
40	39	public void defineFilter(EventFilterBuilder filter) {
41	40	filter.setSourceClass(AlignElementsButton.class);
…	…
43	42	}
44	43
45		~~@Override~~
46	44	public boolean handle(EventR3 event) {
47	45	AlignElementsButton button = event.getSource(AlignElementsButton.class);

branches/private/pav/NEW_JAVA_5/sophie2-platform/modules/org.sophie2.main.app.halos/src/main/java/org/sophie2/main/app/halos/common/ChangeColorButton.java

r5783	r7238
37	37	ON_HALO_CLICK {
38	38
39		~~@Override~~
40	39	public void defineFilter(EventFilterBuilder filter) {
41	40	filter.setSourceClass(ChangeColorButton.class);
…	…
44	43
45	44	@SuppressWarnings("synthetic-access")
46		~~@Override~~
47	45	public boolean handle(EventR3 event) {
48	46	ChangeColorButton halo = event.getSource(ChangeColorButton.class);

branches/private/pav/NEW_JAVA_5/sophie2-platform/modules/org.sophie2.main.app.halos/src/main/java/org/sophie2/main/app/halos/frame/FrameHalosLogic.java

r6751	r7238
36	36	ON_USE_TEMPLATE {
37	37
38		~~@Override~~
39	38	public void defineFilter(EventFilterBuilder filter) {
40	39	filter.setSourceClass(FrameContentUseTemplateHaloButton.class);
…	…
42	41	}
43	42
44		~~@Override~~
45	43	public boolean handle(EventR3 event) {
46	44	FrameContentUseTemplateHaloButton source = event.getSource(FrameContentUseTemplateHaloButton.class);
…	…
65	63	ON_Z_ORDER_DOWN {
66	64
67		~~@Override~~
68	65	public void defineFilter(EventFilterBuilder filter) {
69	66	filter.setSourceClass(FrameZOrderDownHaloButton.class);
…	…
71	68	}
72	69
73		~~@Override~~
74	70	public boolean handle(EventR3 event) {
75	71	FrameZOrderDownHaloButton halo =
…	…
86	82	ON_Z_ORDER_UP {
87	83
88		~~@Override~~
89	84	public void defineFilter(EventFilterBuilder filter) {
90	85	filter.setSourceClass(FrameZOrderUpHaloButton.class);
…	…
92	87	}
93	88
94		~~@Override~~
95	89	public boolean handle(EventR3 event) {
96	90	FrameZOrderUpHaloButton halo =
…	…
108	102	ON_FRAME_REMOVE {
109	103
110		~~@Override~~
111	104	public void defineFilter(EventFilterBuilder filter) {
112	105	filter.setSourceClass(FrameRemoveHaloButton.class);
…	…
114	107	}
115	108
116		~~@Override~~
117	109	public boolean handle(EventR3 event) {
118	110	FrameRemoveHaloButton halo =

branches/private/pav/NEW_JAVA_5/sophie2-platform/modules/org.sophie2.main.app.halos/src/main/java/org/sophie2/main/app/halos/frame/MainTitleBarHalo.java

r6933	r7238
120	120	}
121	121
122		~~@Override~~
123	122	public Prop<? extends JComponent> swingComponent() {
124	123	class swingComponent extends ResourceProperty<JPanel> {
…	…
203	202	MouseListener res = new MouseListener() {
204	203
205		~~@Override~~
206	204	public void mouseReleased(MouseEvent e) {
207	205	// empty
208
209		}
210
211		@Override
	206	}
	207
212	208	public void mousePressed(MouseEvent e) {
213	209	captureClick(e);
…	…
215	211
216	212	@SuppressWarnings("synthetic-access")
217		~~@Override~~
218	213	public void mouseExited(MouseEvent e) {
219	214	color().set(BASIC_COLOR);
…	…
221	216
222	217	@SuppressWarnings("synthetic-access")
223		~~@Override~~
224	218	public void mouseEntered(MouseEvent e) {
225	219	color().set(SELECTED_COLOR);
226	220	}
227	221
228		~~@Override~~
229	222	public void mouseClicked(MouseEvent e) {
230	223	// do nothing

branches/private/pav/NEW_JAVA_5/sophie2-platform/modules/org.sophie2.main.app.halos/src/main/java/org/sophie2/main/app/halos/frame/rotate/FrameRotationPropertiesHud.java

r6933	r7238
187	187	rbTopLeft.addActionListener(new ActionListener() {
188	188
189		~~@Override~~
190	189	public void actionPerformed(ActionEvent e) {
191	190	getHud(RotationCenter.this).rotationPosition().set(Position.TOP_LEFT);
…	…
200	199	rbTopMiddle.addActionListener(new ActionListener() {
201	200
202		~~@Override~~
203	201	public void actionPerformed(ActionEvent e) {
204	202	getHud(RotationCenter.this).rotationPosition().set(Position.TOP_MIDDLE);
…	…
214	212	rbTopRight.addActionListener(new ActionListener() {
215	213
216		~~@Override~~
217	214	public void actionPerformed(ActionEvent e) {
218	215	getHud(RotationCenter.this).rotationPosition().set(Position.TOP_RIGHT);
…	…
228	225	rbMiddleLeft.addActionListener(new ActionListener() {
229	226
230		~~@Override~~
231	227	public void actionPerformed(ActionEvent e) {
232	228	getHud(RotationCenter.this).rotationPosition().set(Position.MIDDLE_LEFT);
…	…
242	238	rbCenter.addActionListener(new ActionListener() {
243	239
244		~~@Override~~
245	240	public void actionPerformed(ActionEvent e) {
246	241	getHud(RotationCenter.this).rotationPosition().set(Position.CENTER);
…	…
256	251	rbMiddleRight.addActionListener(new ActionListener() {
257	252
258		~~@Override~~
259	253	public void actionPerformed(ActionEvent e) {
260	254	getHud(RotationCenter.this).rotationPosition().set(Position.MIDDLE_RIGHT);
…	…
270	264	rbBottomLeft.addActionListener(new ActionListener() {
271	265
272		~~@Override~~
273	266	public void actionPerformed(ActionEvent e) {
274	267	getHud(RotationCenter.this).rotationPosition().set(Position.BOTTOM_LEFT);
…	…
284	277	rbBottomMiddle.addActionListener(new ActionListener() {
285	278
286		~~@Override~~
287	279	public void actionPerformed(ActionEvent e) {
288	280	getHud(RotationCenter.this).rotationPosition().set(Position.BOTTOM_MIDDLE);
…	…
298	290	rbBottomRight.addActionListener(new ActionListener() {
299	291
300		~~@Override~~
301	292	public void actionPerformed(ActionEvent e) {
302	293	getHud(RotationCenter.this).rotationPosition().set(Position.BOTTOM_RIGHT);
…	…
422	413	ON_ANGLE_SUBMIT {
423	414
424		~~@Override~~
425	415	public void defineFilter(EventFilterBuilder filter) {
426	416	filter.setEventId(BoundControl.EventIds.SUBMIT);
…	…
428	418	}
429	419
430		~~@Override~~
431	420	public boolean handle(EventR3 event) {
432	421	VisualElement source = event.getSource(RotationAngle.class);

branches/private/pav/NEW_JAVA_5/sophie2-platform/modules/org.sophie2.main.app.halos/src/main/java/org/sophie2/main/app/halos/grouping/GroupHalosLogic.java

r6751	r7238
38	38	ON_ENTER_GROUP {
39	39
40		~~@Override~~
41	40	public void defineFilter(EventFilterBuilder filter) {
42	41	filter.setSourceClass(EnterGroupButton.class);
…	…
44	43	}
45	44
46		~~@Override~~
47	45	public boolean handle(EventR3 event) {
48	46	EnterGroupButton halo = event.getSource(EnterGroupButton.class);
…	…
65	63	EXIT_GROUP {
66	64
67		~~@Override~~
68	65	public void defineFilter(EventFilterBuilder filter) {
69	66	filter.setSourceClass(ExitGroupButton.class);
…	…
71	68	}
72	69
73		~~@Override~~
74	70	public boolean handle(EventR3 event) {
75	71	ExitGroupButton halo = event.getSource(ExitGroupButton.class);
…	…
90	86	ON_GROUP_PAGE_ELEMENTS {
91	87
92		~~@Override~~
93	88	public void defineFilter(EventFilterBuilder filter) {
94	89	filter.setSourceClass(GroupPageElementsButton.class);
…	…
96	91	}
97	92
98		~~@Override~~
99	93	public boolean handle(EventR3 event) {
100	94	GroupPageElementsButton halo = event.getSource(GroupPageElementsButton.class);
…	…
152	146	ON_UNGROUP_PAGE_ELEMENTS {
153	147
154		~~@Override~~
155	148	public void defineFilter(EventFilterBuilder filter) {
156	149	filter.setSourceClass(UngroupPageElementsButton.class);
…	…
158	151	}
159	152
160		~~@Override~~
161	153	public boolean handle(EventR3 event) {
162	154	UngroupPageElementsButton halo = event.getSource(

branches/private/pav/NEW_JAVA_5/sophie2-platform/modules/org.sophie2.main.app.halos/src/main/java/org/sophie2/main/app/halos/huds/BackgroundAndBorderHud.java

r6933	r7238
409	409	}
410	410
411		~~@Override~~
412	411	public Prop<JPanel> swingComponent() {
413	412	class swingComponent extends ResourceProperty<JPanel> {
…	…
594	593	ON_TOP_BORDER_SUBMIT {
595	594
596		~~@Override~~
597	595	public void defineFilter(EventFilterBuilder filter) {
598	596	filter.setEventId(BoundControl.EventIds.SUBMIT);
…	…
600	598	}
601	599
602		~~@Override~~
603	600	public boolean handle(EventR3 event) {
604	601	VisualElement source = event.getSource(BorderInsetsTop.class);
…	…
616	613	ON_RIGHT_BORDER_SUBMIT {
617	614
618		~~@Override~~
619	615	public void defineFilter(EventFilterBuilder filter) {
620	616	filter.setEventId(BoundControl.EventIds.SUBMIT);
…	…
622	618	}
623	619
624		~~@Override~~
625	620	public boolean handle(EventR3 event) {
626	621	VisualElement source = event.getSource(BorderInsetsRight.class);
…	…
638	633	ON_BOTTOM_BORDER_SUBMIT {
639	634
640		~~@Override~~
641	635	public void defineFilter(EventFilterBuilder filter) {
642	636	filter.setEventId(BoundControl.EventIds.SUBMIT);
…	…
644	638	}
645	639
646		~~@Override~~
647	640	public boolean handle(EventR3 event) {
648	641	VisualElement source = event.getSource(BorderInsetsBottom.class);
…	…
660	653	ON_LEFT_BORDER_SUBMIT {
661	654
662		~~@Override~~
663	655	public void defineFilter(EventFilterBuilder filter) {
664	656	filter.setEventId(BoundControl.EventIds.SUBMIT);
…	…
666	658	}
667	659
668		~~@Override~~
669	660	public boolean handle(EventR3 event) {
670	661	VisualElement source = event.getSource(BorderInsetsLeft.class);
…	…
682	673	ON_BORDER_COLOR_SUBMIT {
683	674
684		~~@Override~~
685	675	public void defineFilter(EventFilterBuilder filter) {
686	676	filter.setEventId(BoundControl.EventIds.SUBMIT);
…	…
688	678	}
689	679
690		~~@Override~~
691	680	public boolean handle(EventR3 event) {
692	681	VisualElement source = event.getSource(BorderColorField.class);
…	…
710	699	ON_BORDER_USE_TEMPLATE_SUBMIT {
711	700
712		~~@Override~~
713	701	public void defineFilter(EventFilterBuilder filter) {
714	702	filter.setEventId(BoundControl.EventIds.SUBMIT);
…	…
716	704	}
717	705
718		~~@Override~~
719	706	public boolean handle(EventR3 event) {
720	707
…	…
734	721	ON_BORDER_LOCKED_SUBMIT {
735	722
736		~~@Override~~
737	723	public void defineFilter(EventFilterBuilder filter) {
738	724	filter.setEventId(BoundControl.EventIds.SUBMIT);
…	…
740	726	}
741	727
742		~~@Override~~
743	728	public boolean handle(EventR3 event) {
744	729	VisualElement source = event.getSource(BorderLocked.class);
…	…
760	745	ON_BACKGROUND_TYPE_SUBMIT {
761	746
762		~~@Override~~
763	747	public void defineFilter(EventFilterBuilder filter) {
764	748	filter.setEventId(BoundControl.EventIds.SUBMIT);
…	…
767	751
768	752	@SuppressWarnings("unchecked")
769		~~@Override~~
770	753	public boolean handle(EventR3 event) {
771	754	VisualElement source = event.getSource(BackgroundTypeMenu.class);
…	…
789	772	ON_BACKGROUND_USE_TEMPLATE_SUBMIT {
790	773
791		~~@Override~~
792	774	public void defineFilter(EventFilterBuilder filter) {
793	775	filter.setEventId(BoundControl.EventIds.SUBMIT);
…	…
795	777	}
796	778
797		~~@Override~~
798	779	public boolean handle(EventR3 event) {
799	780	Boolean input = event.getEventParam(BoundControl.EventIds.INPUT_PARAM_INDEX,
…	…
812	793	ON_BACKGROUND_LOCKED_SUBMIT {
813	794
814		~~@Override~~
815	795	public void defineFilter(EventFilterBuilder filter) {
816	796	filter.setEventId(BoundControl.EventIds.SUBMIT);
…	…
818	798	}
819	799
820		~~@Override~~
821	800	public boolean handle(EventR3 event) {
822	801	VisualElement source = event.getSource(BackgroundLocked.class);
…	…
837	816	ON_FRAME_VISIBLE_SUBMIT {
838	817
839		~~@Override~~
840	818	public void defineFilter(EventFilterBuilder filter) {
841	819	filter.setEventId(BoundControl.EventIds.SUBMIT);
…	…
844	822	}
845	823
846		~~@Override~~
847	824	public boolean handle(EventR3 event) {
848	825	VisualElement source = event.getSource(FrameVisibleCheck.class);

branches/private/pav/NEW_JAVA_5/sophie2-platform/modules/org.sophie2.main.app.halos/src/main/java/org/sophie2/main/app/halos/huds/BackgroundColorField.java

r6206	r7238
57	57	}
58	58
59		~~@Override~~
60	59	public BackgroundType getBgType() {
61	60	return BackgroundType.SOLID;
…	…
88	87	ON_COLOR_SUBMIT {
89	88
90		~~@Override~~
91	89	public void defineFilter(EventFilterBuilder filter) {
92	90	filter.setEventId(BoundControl.EventIds.SUBMIT);
…	…
94	92	}
95	93
96		~~@Override~~
97	94	public boolean handle(EventR3 event) {
98	95	VisualElement source =

branches/private/pav/NEW_JAVA_5/sophie2-platform/modules/org.sophie2.main.app.halos/src/main/java/org/sophie2/main/app/halos/huds/BackgroundGradientField.java

r6020	r7238
48	48	}
49	49
50		~~@Override~~
51	50	public BackgroundType getBgType() {
52	51	return BackgroundType.GRADIENT;
…	…
78	77	ON_GRADIENT_SUBMIT {
79	78
80		~~@Override~~
81	79	public void defineFilter(EventFilterBuilder filter) {
82	80	filter.setEventId(BoundControl.EventIds.SUBMIT);
…	…
84	82	}
85	83
86		~~@Override~~
87	84	public boolean handle(EventR3 event) {
88	85	VisualElement source =

branches/private/pav/NEW_JAVA_5/sophie2-platform/modules/org.sophie2.main.app.halos/src/main/java/org/sophie2/main/app/halos/huds/BackgroundImageField.java

r7065	r7238
48	48	}
49	49
50		~~@Override~~
51	50	public BackgroundType getBgType() {
52	51	return BackgroundType.IMAGE;
…	…
73	72	ON_IMAGE_SUBMIT {
74	73
75		~~@Override~~
76	74	public void defineFilter(EventFilterBuilder filter) {
77	75	filter.setEventId(BoundControl.EventIds.SUBMIT);
…	…
79	77	}
80	78
81		~~@Override~~
82	79	public boolean handle(EventR3 event) {
83	80	VisualElement source = event

branches/private/pav/NEW_JAVA_5/sophie2-platform/modules/org.sophie2.main.app.halos/src/main/java/org/sophie2/main/app/halos/huds/BackgroundPatternField.java

r7065	r7238
39	39	}
40	40
41		~~@Override~~
42	41	public BackgroundType getBgType() {
43	42	return BackgroundType.PATTERN;
…	…
69	68	ON_PATTERN_SUBMIT {
70	69
71		~~@Override~~
72	70	public void defineFilter(EventFilterBuilder filter) {
73	71	filter.setEventId(BoundControl.EventIds.SUBMIT);
…	…
75	73	}
76	74
77		~~@Override~~
78	75	public boolean handle(EventR3 event) {
79	76	VisualElement source = event

branches/private/pav/NEW_JAVA_5/sophie2-platform/modules/org.sophie2.main.app.halos/src/main/java/org/sophie2/main/app/halos/huds/color/ColorPicker.java

r5739	r7238
349	349	}
350	350
351		~~@Override~~
352	351	public Prop<JPanel> swingComponent() {
353	352	class swingComponent extends ResourceProperty<JPanel> {
…	…
394	393
395	394	save.addActionListener(new ActionListener() {
396		~~@Override~~
397	395	public void actionPerformed(ActionEvent arg0) {
398	396	saveColor(model().get());
…	…
957	955	ON_RGB_SUBMIT {
958	956
959		~~@Override~~
960	957	public void defineFilter(EventFilterBuilder filter) {
961	958	filter.setEventId(BoundControl.EventIds.SUBMIT);
…	…
963	960	}
964	961
965		~~@Override~~
966	962	public boolean handle(EventR3 event) {
967	963	VisualElement source = event.getSource(RGBValue.class);
…	…
983	979	ON_RED_HEX_SUBMIT {
984	980
985		~~@Override~~
986	981	public void defineFilter(EventFilterBuilder filter) {
987	982	filter.setEventId(BoundControl.EventIds.SUBMIT);
…	…
989	984	}
990	985
991		~~@Override~~
992	986	public boolean handle(EventR3 event) {
993	987	VisualElement source = event.getSource(RedValueHex.class);
…	…
1011	1005	ON_GREEN_HEX_SUBMIT {
1012	1006
1013		~~@Override~~
1014	1007	public void defineFilter(EventFilterBuilder filter) {
1015	1008	filter.setEventId(BoundControl.EventIds.SUBMIT);
…	…
1017	1010	}
1018	1011
1019		~~@Override~~
1020	1012	public boolean handle(EventR3 event) {
1021	1013	VisualElement source = event.getSource(GreenValueHex.class);
…	…
1038	1030	ON_BLUE_HEX_SUBMIT {
1039	1031
1040		~~@Override~~
1041	1032	public void defineFilter(EventFilterBuilder filter) {
1042	1033	filter.setEventId(BoundControl.EventIds.SUBMIT);
…	…
1044	1035	}
1045	1036
1046		~~@Override~~
1047	1037	public boolean handle(EventR3 event) {
1048	1038	VisualElement source = event.getSource(BlueValueHex.class);
…	…
1066	1056	ON_ALPHA_HEX_SUBMIT {
1067	1057
1068		~~@Override~~
1069	1058	public void defineFilter(EventFilterBuilder filter) {
1070	1059	filter.setEventId(BoundControl.EventIds.SUBMIT);
…	…
1072	1061	}
1073	1062
1074		~~@Override~~
1075	1063	public boolean handle(EventR3 event) {
1076	1064	VisualElement source = event.getSource(AlphaValueHex.class);
…	…
1093	1081	ON_RED_DEC_SUBMIT {
1094	1082
1095		~~@Override~~
1096	1083	public void defineFilter(EventFilterBuilder filter) {
1097	1084	filter.setEventId(BoundControl.EventIds.SUBMIT);
…	…
1099	1086	}
1100	1087
1101		~~@Override~~
1102	1088	public boolean handle(EventR3 event) {
1103	1089	VisualElement source = event.getSource(RedValueDec.class);
…	…
1120	1106	ON_GREEN_DEC_SUBMIT {
1121	1107
1122		~~@Override~~
1123	1108	public void defineFilter(EventFilterBuilder filter) {
1124	1109	filter.setEventId(BoundControl.EventIds.SUBMIT);
…	…
1126	1111	}
1127	1112
1128		~~@Override~~
1129	1113	public boolean handle(EventR3 event) {
1130	1114	VisualElement source = event.getSource(GreenValueDec.class);
…	…
1147	1131	ON_BLUE_DEC_SUBMIT {
1148	1132
1149		~~@Override~~
1150	1133	public void defineFilter(EventFilterBuilder filter) {
1151	1134	filter.setEventId(BoundControl.EventIds.SUBMIT);
…	…
1153	1136	}
1154	1137
1155		~~@Override~~
1156	1138	public boolean handle(EventR3 event) {
1157	1139	VisualElement source = event.getSource(BlueValueDec.class);
…	…
1175	1157	ON_ALPHA_DEC_SUBMIT {
1176	1158
1177		~~@Override~~
1178	1159	public void defineFilter(EventFilterBuilder filter) {
1179	1160	filter.setEventId(BoundControl.EventIds.SUBMIT);
…	…
1181	1162	}
1182	1163
1183		~~@Override~~
1184	1164	public boolean handle(EventR3 event) {
1185	1165	VisualElement source = event.getSource(AlphaValueDec.class);

branches/private/pav/NEW_JAVA_5/sophie2-platform/modules/org.sophie2.main.app.halos/src/main/java/org/sophie2/main/app/halos/huds/gradient/GradientPicker.java

r5739	r7238
215	215	res.setTrackRenderer(new GradientTrackRenderer());
216	216	res.addMultiThumbListener(new ThumbListener() {
217		~~@Override~~
218	217	public void thumbMoved(int thumb, float pos) {
219	218	updatePreview();
…	…
225	224	}
226	225
227		~~@Override~~
228	226	public void thumbSelected(int thumb) {
229	227	selectedThumbIndex().set(thumb);
…	…
235	233	}
236	234
237		~~@Override~~
238	235	public void mousePressed(MouseEvent arg0) {
239	236	// nothing
…	…
882	879	}
883	880
884		~~@Override~~
885	881	public Prop<JPanel> swingComponent() {
886	882
…	…
1221	1217	ON_COLOR_HEX_SUBMIT {
1222	1218
1223		~~@Override~~
1224	1219	public void defineFilter(EventFilterBuilder filter) {
1225	1220	filter.setEventId(BoundControl.EventIds.SUBMIT);
…	…
1227	1222	}
1228	1223
1229		~~@Override~~
1230	1224	public boolean handle(EventR3 event) {
1231	1225	VisualElement source = event.getSource(VisualElement.class);
…	…
1251	1245	ON_COLOR_SUBMIT {
1252	1246
1253		~~@Override~~
1254	1247	public void defineFilter(EventFilterBuilder filter) {
1255	1248	filter.setEventId(BoundControl.EventIds.SUBMIT);
…	…
1257	1250	}
1258	1251
1259		~~@Override~~
1260	1252	public boolean handle(EventR3 event) {
1261	1253	VisualElement source = event.getSource(VisualElement.class);
…	…
1278	1270	ON_LOCATION_SUBMIT {
1279	1271
1280		~~@Override~~
1281	1272	public void defineFilter(EventFilterBuilder filter) {
1282	1273	filter.setEventId(BoundControl.EventIds.SUBMIT);
…	…
1284	1275	}
1285	1276
1286		~~@Override~~
1287	1277	public boolean handle(EventR3 event) {
1288	1278	VisualElement source = event.getSource(VisualElement.class);
…	…
1304	1294	ON_ALPHA_SLIDER_SUBMIT {
1305	1295
1306		~~@Override~~
1307	1296	public void defineFilter(EventFilterBuilder filter) {
1308	1297	filter.setEventId(BoundControl.EventIds.SUBMIT);
…	…
1310	1299	}
1311	1300
1312		~~@Override~~
1313	1301	public boolean handle(EventR3 event) {
1314	1302	setAlphaValue(event);
…	…
1323	1311	ON_ALPHA_SPINNER_SUBMIT {
1324	1312
1325		~~@Override~~
1326	1313	public void defineFilter(EventFilterBuilder filter) {
1327	1314	filter.setEventId(BoundControl.EventIds.SUBMIT);
…	…
1329	1316	}
1330	1317
1331		~~@Override~~
1332	1318	public boolean handle(EventR3 event) {
1333	1319	setAlphaValue(event);
…	…
1341	1327	ON_STYLE_SUBMIT {
1342	1328
1343		~~@Override~~
1344	1329	public void defineFilter(EventFilterBuilder filter) {
1345	1330	filter.setEventId(BoundControl.EventIds.SUBMIT);
…	…
1348	1333
1349	1334	@SuppressWarnings("unchecked")
1350		~~@Override~~
1351	1335	public boolean handle(EventR3 event) {
1352	1336	VisualElement source = event.getSource(VisualElement.class);

branches/private/pav/NEW_JAVA_5/sophie2-platform/modules/org.sophie2.main.app.halos/src/main/java/org/sophie2/main/app/halos/huds/gradient/GradientThumbRenderer.java

r4723	r7238
26	26
27	27	@SuppressWarnings("unchecked")
28		~~@Override~~
29	28	public JComponent getThumbRendererComponent(JXMultiThumbSlider slider,
30	29	int index, boolean selected) {

branches/private/pav/NEW_JAVA_5/sophie2-platform/modules/org.sophie2.main.app.halos/src/main/java/org/sophie2/main/app/halos/huds/InsetsHud.java

r6206	r7238
488	488	ON_TOP_PADDING_SUBMIT {
489	489
490		~~@Override~~
491	490	public void defineFilter(EventFilterBuilder filter) {
492	491	filter.setEventId(BoundControl.EventIds.SUBMIT);
…	…
494	493	}
495	494
496		~~@Override~~
497	495	public boolean handle(EventR3 event) {
498	496	VisualElement source = event.getSource(FramePaddingTop.class);
…	…
510	508	ON_RIGHT_PADDING_SUBMIT {
511	509
512		~~@Override~~
513	510	public void defineFilter(EventFilterBuilder filter) {
514	511	filter.setEventId(BoundControl.EventIds.SUBMIT);
…	…
516	513	}
517	514
518		~~@Override~~
519	515	public boolean handle(EventR3 event) {
520	516	VisualElement source = event.getSource(FramePaddingRight.class);
…	…
533	529	ON_BOTTOM_PADDING_SUBMIT {
534	530
535		~~@Override~~
536	531	public void defineFilter(EventFilterBuilder filter) {
537	532	filter.setEventId(BoundControl.EventIds.SUBMIT);
…	…
539	534	}
540	535
541		~~@Override~~
542	536	public boolean handle(EventR3 event) {
543	537	VisualElement source = event.getSource(FramePaddingBottom.class);
…	…
555	549	ON_LEFT_PADDING_SUBMIT {
556	550
557		~~@Override~~
558	551	public void defineFilter(EventFilterBuilder filter) {
559	552	filter.setEventId(BoundControl.EventIds.SUBMIT);
…	…
561	554	}
562	555
563		~~@Override~~
564	556	public boolean handle(EventR3 event) {
565	557	VisualElement source = event.getSource(FramePaddingLeft.class);
…	…
577	569	ON_TOP_MARGIN_SUBMIT {
578	570
579		~~@Override~~
580	571	public void defineFilter(EventFilterBuilder filter) {
581	572	filter.setEventId(BoundControl.EventIds.SUBMIT);
…	…
583	574	}
584	575
585		~~@Override~~
586	576	public boolean handle(EventR3 event) {
587	577	VisualElement source = event.getSource(FrameMarginTop.class);
…	…
600	590	ON_RIGHT_MARGIN_SUBMIT {
601	591
602		~~@Override~~
603	592	public void defineFilter(EventFilterBuilder filter) {
604	593	filter.setEventId(BoundControl.EventIds.SUBMIT);
…	…
606	595	}
607	596
608		~~@Override~~
609	597	public boolean handle(EventR3 event) {
610	598	VisualElement source = event.getSource(FrameMarginRight.class);
…	…
623	611	ON_BOTTOM_MARGIN_SUBMIT {
624	612
625		~~@Override~~
626	613	public void defineFilter(EventFilterBuilder filter) {
627	614	filter.setEventId(BoundControl.EventIds.SUBMIT);
…	…
629	616	}
630	617
631		~~@Override~~
632	618	public boolean handle(EventR3 event) {
633	619	VisualElement source = event.getSource(FrameMarginBottom.class);
…	…
646	632	ON_LEFT_MARGIN_SUBMIT {
647	633
648		~~@Override~~
649	634	public void defineFilter(EventFilterBuilder filter) {
650	635	filter.setEventId(BoundControl.EventIds.SUBMIT);
…	…
652	637	}
653	638
654		~~@Override~~
655	639	public boolean handle(EventR3 event) {
656	640	VisualElement source = event.getSource(FrameMarginLeft.class);
…	…
669	653	ON_PADDING_USE_TEMPLATE_SUBMIT {
670	654
671		~~@Override~~
672	655	public void defineFilter(EventFilterBuilder filter) {
673	656	filter.setEventId(BoundControl.EventIds.SUBMIT);
…	…
675	658	}
676	659
677		~~@Override~~
678	660	public boolean handle(EventR3 event) {
679	661	VisualElement source = event.getSource(FramePaddingUseTemplate.class);
…	…
696	678	ON_PADDING_LOCKED_SUBMIT {
697	679
698		~~@Override~~
699	680	public void defineFilter(EventFilterBuilder filter) {
700	681	filter.setEventId(BoundControl.EventIds.SUBMIT);
…	…
702	683	}
703	684
704		~~@Override~~
705	685	public boolean handle(EventR3 event) {
706	686	VisualElement source = event.getSource(FramePaddingLocked.class);
…	…
727	707	ON_MARGIN_USE_TEMPLATE_SUBMIT {
728	708
729		~~@Override~~
730	709	public void defineFilter(EventFilterBuilder filter) {
731	710	filter.setEventId(BoundControl.EventIds.SUBMIT);
…	…
733	712	}
734	713
735		~~@Override~~
736	714	public boolean handle(EventR3 event) {
737	715	VisualElement source = event.getSource(FrameMarginUseTemplate.class);
…	…
755	733	ON_MARGIN_LOCKED_SUBMIT {
756	734
757		~~@Override~~
758	735	public void defineFilter(EventFilterBuilder filter) {
759	736	filter.setEventId(BoundControl.EventIds.SUBMIT);
…	…
761	738	}
762	739
763		~~@Override~~
764	740	public boolean handle(EventR3 event) {
765	741	VisualElement source = event.getSource(FrameMarginLocked.class);

branches/private/pav/NEW_JAVA_5/sophie2-platform/modules/org.sophie2.main.app.halos/src/main/java/org/sophie2/main/app/halos/huds/ShadowHud.java

r6700	r7238
224	224	ON_ENABLE_SUBMIT {
225	225
226		~~@Override~~
227	226	public void defineFilter(EventFilterBuilder filter) {
228	227	filter.setEventId(BoundControl.EventIds.SUBMIT);
…	…
230	229	}
231	230
232		~~@Override~~
233	231	public boolean handle(EventR3 event) {
234	232	VisualElement source = event.getSource(ShadowEnabledCheck.class);
…	…
250	248	ON_POSITION_X_SUBMIT {
251	249
252		~~@Override~~
253	250	public void defineFilter(EventFilterBuilder filter) {
254	251	filter.setEventId(BoundControl.EventIds.SUBMIT);
…	…
256	253	}
257	254
258		~~@Override~~
259	255	public boolean handle(EventR3 event) {
260	256	VisualElement source = event.getSource(ShadowPositionX.class);
…	…
279	275	ON_POSITION_Y_SUBMIT {
280	276
281		~~@Override~~
282	277	public void defineFilter(EventFilterBuilder filter) {
283	278	filter.setEventId(BoundControl.EventIds.SUBMIT);
…	…
285	280	}
286	281
287		~~@Override~~
288	282	public boolean handle(EventR3 event) {
289	283	VisualElement source = event.getSource(ShadowPositionY.class);
…	…
308	302	ON_COLOR_SUBMIT {
309	303
310		~~@Override~~
311	304	public void defineFilter(EventFilterBuilder filter) {
312	305	filter.setEventId(BoundControl.EventIds.SUBMIT);
…	…
314	307	}
315	308
316		~~@Override~~
317	309	public boolean handle(EventR3 event) {
318	310	VisualElement source = event.getSource(ShadowColorField.class);
…	…
334	326	ON_USE_TEMPLATE_SUBMIT {
335	327
336		~~@Override~~
337	328	public void defineFilter(EventFilterBuilder filter) {
338	329	filter.setEventId(BoundControl.EventIds.SUBMIT);
339	330	filter.setSourceClass(ShadowUseTemplate.class);
340
341		}
342
343		@Override
	331	}
	332
344	333	public boolean handle(EventR3 event) {
345	334	// TODO set use template mode on the composite key FrameR4.KEY_SHADOW
…	…
352	341	ON_LOCKED_SUBMIT {
353	342
354		~~@Override~~
355	343	public void defineFilter(EventFilterBuilder filter) {
356	344	filter.setEventId(BoundControl.EventIds.SUBMIT);
…	…
359	347	}
360	348
361		~~@Override~~
362	349	public boolean handle(EventR3 event) {
363	350	// TODO set use template mode on the composite key FrameR4.KEY_SHADOW

branches/private/pav/NEW_JAVA_5/sophie2-platform/modules/org.sophie2.main.app.halos/src/main/java/org/sophie2/main/app/halos/huds/SizeAndPositionHud.java

r6998	r7238
343	343	ON_WIDTH_SUBMIT {
344	344
345		~~@Override~~
346	345	public void defineFilter(EventFilterBuilder filter) {
347	346	filter.setEventId(BoundControl.EventIds.SUBMIT);
…	…
349	348	}
350	349
351		~~@Override~~
352	350	public boolean handle(EventR3 event) {
353	351	VisualElement source = event.getSource(FrameWidth.class);
…	…
372	370	ON_HEIGHT_SUBMIT {
373	371
374		~~@Override~~
375	372	public void defineFilter(EventFilterBuilder filter) {
376	373	filter.setEventId(BoundControl.EventIds.SUBMIT);
…	…
378	375	}
379	376
380		~~@Override~~
381	377	public boolean handle(EventR3 event) {
382	378	VisualElement source = event.getSource(FrameHeight.class);
…	…
401	397	ON_SIZE_USE_TEMPLATE_SUBMIT {
402	398
403		~~@Override~~
404	399	public void defineFilter(EventFilterBuilder filter) {
405	400	filter.setEventId(BoundControl.EventIds.SUBMIT);
…	…
407	402	}
408	403
409		~~@Override~~
410	404	public boolean handle(EventR3 event) {
411	405	VisualElement source = event.getSource(FrameSizeUseTemplate.class);
…	…
434	428	ON_SIZE_LOCKED_SUBMIT {
435	429
436		~~@Override~~
437	430	public void defineFilter(EventFilterBuilder filter) {
438	431	filter.setEventId(BoundControl.EventIds.SUBMIT);
…	…
440	433	}
441	434
442		~~@Override~~
443	435	public boolean handle(EventR3 event) {
444	436	VisualElement source = event.getSource(FrameSizeLocked.class);
…	…
460	452	ON_LOCATION_X_SUBMIT {
461	453
462		~~@Override~~
463	454	public void defineFilter(EventFilterBuilder filter) {
464	455	filter.setEventId(BoundControl.EventIds.SUBMIT);
…	…
466	457	}
467	458
468		~~@Override~~
469	459	public boolean handle(EventR3 event) {
470	460	VisualElement source = event.getSource(FrameXPosition.class);
…	…
493	483	ON_LOCATION_Y_SUBMIT {
494	484
495		~~@Override~~
496	485	public void defineFilter(EventFilterBuilder filter) {
497	486	filter.setEventId(BoundControl.EventIds.SUBMIT);
…	…
499	488	}
500	489
501		~~@Override~~
502	490	public boolean handle(EventR3 event) {
503	491	VisualElement source = event.getSource(FrameYPosition.class);
…	…
526	514	ON_LOCATION_USE_TEMPLATE_SUBMIT {
527	515
528		~~@Override~~
529	516	public void defineFilter(EventFilterBuilder filter) {
530	517	filter.setEventId(BoundControl.EventIds.SUBMIT);
…	…
532	519	}
533	520
534		~~@Override~~
535	521	public boolean handle(EventR3 event) {
536	522	VisualElement source = event.getSource(FrameLocationUseTemplate.class);
…	…
559	545	ON_LOCATION_LOCKED_SUBMIT {
560	546
561		~~@Override~~
562	547	public void defineFilter(EventFilterBuilder filter) {
563	548	filter.setEventId(BoundControl.EventIds.SUBMIT);
…	…
565	550	}
566	551
567		~~@Override~~
568	552	public boolean handle(EventR3 event) {
569	553	VisualElement source = event.getSource(FrameLocationLocked.class);

branches/private/pav/NEW_JAVA_5/sophie2-platform/modules/org.sophie2.main.app.halos/src/main/java/org/sophie2/main/app/halos/huds/TextWrappingHud.java

r2057	r7238
62	62	textDefault.addActionListener(new ActionListener() {
63	63
64		~~@Override~~
65	64	public void actionPerformed(ActionEvent e) {
66	65	// getImageFrameView().getImageOverTextRenderer()
…	…
76	75	textArround.addActionListener(new ActionListener() {
77	76
78		~~@Override~~
79	77	public void actionPerformed(ActionEvent e) {
80	78	// getImageFrameView().getImageOverTextRenderer()

branches/private/pav/NEW_JAVA_5/sophie2-platform/modules/org.sophie2.main.app.halos/src/main/java/org/sophie2/main/app/halos/logic/HalosLogic.java

r6284	r7238
34	34	ON_HALO_BUTTON_CLICKED {
35	35
36		~~@Override~~
37	36	public void defineFilter(EventFilterBuilder filter) {
38	37	filter.setSourceClass(HaloButton.class);
…	…
40	39	}
41	40
42		~~@Override~~
43	41	public boolean handle(EventR3 event) {
44	42

branches/private/pav/NEW_JAVA_5/sophie2-platform/modules/org.sophie2.main.app.halos/src/main/java/org/sophie2/main/app/halos/page/PageFramesUseTemplateHaloButton.java

r7094	r7238
80	80	ON_HALO_CLICK {
81	81
82		~~@Override~~
83	82	public void defineFilter(EventFilterBuilder filter) {
84	83	filter.setSourceClass(PageFramesUseTemplateHaloButton.class);
…	…
86	85	}
87	86
88		~~@Override~~
89	87	public boolean handle(EventR3 event) {
90	88	PageFramesUseTemplateHaloButton halo = event.getSource(PageFramesUseTemplateHaloButton.class);

branches/private/pav/NEW_JAVA_5/sophie2-platform/modules/org.sophie2.main.app.halos/src/main/java/org/sophie2/main/app/halos/shared/AddTemplateHaloButton.java

r7106	r7238
80	80	ON_HALO_CLICK {
81	81
82		~~@Override~~
83	82	public void defineFilter(EventFilterBuilder filter) {
84	83	filter.setSourceClass(AddTemplateHaloButton.class);
…	…
86	85	}
87	86
88		~~@Override~~
89	87	public boolean handle(EventR3 event) {
90	88	AddTemplateHaloButton source = event.getSource(AddTemplateHaloButton.class);

branches/private/pav/NEW_JAVA_5/sophie2-platform/modules/org.sophie2.main.app.halos/src/test/java/org/sophie2/main/app/halos/BackgroundDialogFieldDemo.java

r6933	r7238
28	28	private ProBean bean;
29	29
30		~~@Override~~
31	30	public ProBean getBean() {
32	31	if (this.bean == null) {
…	…
63	62	}
64	63
65		~~@Override~~
66	64	public BackgroundType getBgType() {
67	65	return BackgroundType.IMAGE;
…	…
92	90
93	91	SwingUtilities.invokeLater(new Runnable() {
94		~~@Override~~
95	92	public void run() {
96	93	BackgroundDialogFieldDemo demo = new BackgroundDialogFieldDemo();

branches/private/pav/NEW_JAVA_5/sophie2-platform/modules/org.sophie2.main.app.halos/src/test/java/org/sophie2/main/app/halos/BackgroundDialogFieldTest.java

r5641	r7238
54	54	}
55	55
56		~~@Override~~
57	56	public BackgroundType getBgType() {
58	57	return BackgroundType.NONE;

branches/private/pav/NEW_JAVA_5/sophie2-platform/modules/org.sophie2.main.app.halos/src/test/java/org/sophie2/main/app/halos/huds/color/ColorPickerDemo.java

r6508	r7238
57	57
58	58	SwingUtilities.invokeLater(new Runnable() {
59		~~@Override~~
60	59	public void run() {
61	60

branches/private/pav/NEW_JAVA_5/sophie2-platform/modules/org.sophie2.main.app.halos/src/test/java/org/sophie2/main/app/halos/huds/gradient/GradientPickerDemo.java

r5641	r7238
40	40
41	41	SwingUtilities.invokeLater(new Runnable() {
42		~~@Override~~
43	42	public void run() {
44	43

branches/private/pav/NEW_JAVA_5/sophie2-platform/modules/org.sophie2.main.app.layout/.classpath

r1402	r7238
5	5	<classpathentry kind="src" output="target/test-classes" path="src/test/java"/>
6	6	<classpathentry excluding="**" kind="src" output="target/test-classes" path="src/test/resources"/>
7		<classpathentry kind="con"
8		path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6" />
9		<classpathentry kind="con"
10		path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER" />
11		<classpathentry kind="output" path="target/classes" />
	7	<classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
	8	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/jdk1.5.0_21"/>
	9	<classpathentry kind="output" path="target/classes"/>
12	10	</classpath>

branches/private/pav/NEW_JAVA_5/sophie2-platform/modules/org.sophie2.main.app.layout/.settings/org.eclipse.jdt.core.prefs

r1162	r7238
1		#~~Thu Sep 18 21:11:04 EEST 2008~~
	1	#Mon Oct 05 13:41:40 AFT 2009
2	2	eclipse.preferences.version=1
3	3	org.eclipse.jdt.core.builder.cleanOutputFolder=clean
…	…
18	18	org.eclipse.jdt.core.codeComplete.staticFieldSuffixes=
19	19	org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
20		org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
	20	org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
21	21	org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
22		org.eclipse.jdt.core.compiler.compliance=1.6
	22	org.eclipse.jdt.core.compiler.compliance=1.5
23	23	org.eclipse.jdt.core.compiler.debug.lineNumber=generate
24	24	org.eclipse.jdt.core.compiler.debug.localVariable=generate
…	…
97	97	org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
98	98	org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
99		org.eclipse.jdt.core.compiler.source=1.6
	99	org.eclipse.jdt.core.compiler.source=1.5
100	100	org.eclipse.jdt.core.compiler.taskCaseSensitive=enabled
101	101	org.eclipse.jdt.core.compiler.taskPriorities=NORMAL,HIGH,NORMAL

branches/private/pav/NEW_JAVA_5/sophie2-platform/modules/org.sophie2.main.app.layout/src/main/java/org/sophie2/main/app/layout/left/pages/PagePreviewPaletteLogic.java

r7089	r7238
24	24	ON_ADD_PAGE_BEFORE {
25	25
26		~~@Override~~
27	26	public void defineFilter(EventFilterBuilder filter) {
28	27	filter.setEventId(EventIds.ADD_PAGE_BEFORE);
…	…
30	29	}
31	30
32		~~@Override~~
33	31	public boolean handle(EventR3 event) {
34	32	return insertPage(event, false);
…	…
41	39	ON_ADD_PAGE_AFTER {
42	40
43		~~@Override~~
44	41	public void defineFilter(EventFilterBuilder filter) {
45	42	filter.setEventId(EventIds.ADD_PAGE_AFTER);
…	…
47	44	}
48	45
49		~~@Override~~
50	46	public boolean handle(EventR3 event) {
51	47	return insertPage(event, true);
…	…
58	54	ON_PAGE_DELETE {
59	55
60		~~@Override~~
61	56	public void defineFilter(EventFilterBuilder filter) {
62	57	filter.setEventId(EventIds.DELETE_PAGE);
…	…
64	59	}
65	60
66		~~@Override~~
67	61	public boolean handle(EventR3 event) {
68	62	PagePreviewPalette source = event.getSource(PagePreviewPalette.class);
…	…
113	107	ON_GO_TO_PAGE {
114	108
115		~~@Override~~
116	109	public void defineFilter(EventFilterBuilder filter) {
117	110	filter.setEventId(EventIds.GO_TO_PAGE);
…	…
119	112	}
120	113
121		~~@Override~~
122	114	public boolean handle(EventR3 event) {
123	115	PagePreviewPalette source = event.getSource(PagePreviewPalette.class);

branches/private/pav/NEW_JAVA_5/sophie2-platform/modules/org.sophie2.main.app.layout/src/main/java/org/sophie2/main/app/layout/left/tools/SearchPalette.java

r6700	r7238
68	68	}
69	69	}.transform(new ProListTransformer<SearchMatch, SearchItem>() {
70		~~@Override~~
71	70	public SearchItem translate(SearchMatch source) {
72	71	SearchItem result = new SearchItem(source);

branches/private/pav/NEW_JAVA_5/sophie2-platform/modules/org.sophie2.main.app.layout/src/main/java/org/sophie2/main/app/layout/left/tools/SearchPaletteLogic.java

r6933	r7238
29	29	ON_SEARCH {
30	30
31		~~@Override~~
32	31	public void defineFilter(EventFilterBuilder filter) {
33	32	filter.setEventId(SearchPalette.EventIds.SEARCH);
…	…
35	34	}
36	35
37		~~@Override~~
38	36	public boolean handle(EventR3 event) {
39	37	SearchPalette source = event.getSource(SearchPalette.class);
…	…
41	39
42	40	source.matches().get().clear();
43		if (!~~textToSearch.isEmpty(~~)) {
	41	if (!(textToSearch.length() == 0)) {
44	42	BookView currentBookView = AppViewUtil.getCurrentBookView(source);
45	43
…	…
64	62	ON_ITEM_SELECTED {
65	63
66		~~@Override~~
67	64	public void defineFilter(EventFilterBuilder filter) {
68	65	filter.setEventId(SearchPalette.EventIds.ITEM_SELECTED);
…	…
70	67	}
71	68
72		~~@Override~~
73	69	public boolean handle(EventR3 event) {
74	70	SearchPalette source = event.getSource(SearchPalette.class);
…	…
98	94	ON_PREV_MATCH {
99	95
100		~~@Override~~
101	96	public void defineFilter(EventFilterBuilder filter) {
102	97	filter.setEventId(SearchPalette.EventIds.PREV_MATCH);
…	…
104	99	}
105	100
106		~~@Override~~
107	101	public boolean handle(EventR3 event) {
108	102	return moveSelection(event, -1);
…	…
116	110	ON_NEXT_MATCH {
117	111
118		~~@Override~~
119	112	public void defineFilter(EventFilterBuilder filter) {
120	113	filter.setEventId(SearchPalette.EventIds.NEXT_MATCH);
…	…
122	115	}
123	116
124		~~@Override~~
125	117	public boolean handle(EventR3 event) {
126	118	return moveSelection(event, 1);

branches/private/pav/NEW_JAVA_5/sophie2-platform/modules/org.sophie2.main.app.layout/src/main/java/org/sophie2/main/app/layout/right/changes/AllChangesPalette.java

r6690	r7238
113	113	SwingUtilities.invokeLater(new Runnable() {
114	114
115		~~@Override~~
116	115	public void run() {
117	116	updater.schedule(new UpdateChangesListTask(), 0, 1000);
…	…
158	157
159	158	Collections.sort(changeItems, new Comparator<ChangeItem>() {
160		~~@Override~~
161	159	public int compare(ChangeItem firstItem, ChangeItem secondItem) {
162	160	return secondItem.sortKey().compareTo(firstItem.sortKey());
…	…
230	228	SwingUtilities.invokeLater(new Runnable() {
231	229
232		~~@Override~~
233	230	public void run() {
234	231	List<ResourceRevision> revisions = new ArrayList<ResourceRevision>(

branches/private/pav/NEW_JAVA_5/sophie2-platform/modules/org.sophie2.main.app.layout/src/main/java/org/sophie2/main/app/layout/right/library/BookTemplatesPalette.java

r7094	r7238
111	111	}
112	112	}.transform(new ProListTransformer<BookTemplate, BookTemplateItem>() {
113		~~@Override~~
114	113	public BookTemplateItem translate(BookTemplate source) {
115	114	return new BookTemplateItem(source);

branches/private/pav/NEW_JAVA_5/sophie2-platform/modules/org.sophie2.main.app.layout/src/main/java/org/sophie2/main/app/layout/right/library/ComponentsPalette.java

r6933	r7238
63	63	}
64	64
65		~~@Override~~
66	65	public Object getTransferData(DataFlavor flavor)
67	66	throws UnsupportedFlavorException, IOException {
…	…
69	68	}
70	69
71		~~@Override~~
72	70	public DataFlavor[] getTransferDataFlavors() {
73	71	throw new UnsupportedOperationException("TODO");
74	72	}
75	73
76		~~@Override~~
77	74	public boolean isDataFlavorSupported(DataFlavor flavor) {
78	75	throw new UnsupportedOperationException("TODO");

branches/private/pav/NEW_JAVA_5/sophie2-platform/modules/org.sophie2.main.app.layout/src/main/java/org/sophie2/main/app/layout/right/library/FrameTemplatesPalette.java

r6700	r7238
132	132	}
133	133	.transform(new ProListTransformer<ResourceRefR4, FrameTemplateItem>() {
134		~~@Override~~
135	134	public FrameTemplateItem translate(
136	135	ResourceRefR4 source) {

branches/private/pav/NEW_JAVA_5/sophie2-platform/modules/org.sophie2.main.app.layout/src/main/java/org/sophie2/main/app/layout/right/library/LibraryTabLogic.java

r7106	r7238
46	46	ON_OPEN_BOOK_TEMPLATE {
47	47
48		~~@Override~~
49	48	public void defineFilter(EventFilterBuilder filter) {
50	49	filter.setSourceClass(BookTemplatesPalette.class);
…	…
52	51	}
53	52
54		~~@Override~~
55	53	public boolean handle(EventR3 event) {
56	54	BookTemplatesPalette source = event.getSource(BookTemplatesPalette.class);
…	…
77	75	ON_CREATE_BOOK_FROM_TEMPLATE {
78	76
79		~~@Override~~
80	77	public void defineFilter(EventFilterBuilder filter) {
81	78	filter.setSourceClass(BookTemplatesPalette.class);
…	…
83	80	}
84	81
85		~~@Override~~
86	82	public boolean handle(EventR3 event) {
87	83	BookTemplatesPalette source = event.getSource(BookTemplatesPalette.class);
…	…
140	136	ON_APPLY_PAGE_TEMPLATE {
141	137
142		~~@Override~~
143	138	public void defineFilter(EventFilterBuilder filter) {
144	139	filter.setSourceClass(PageTemplatesPalette.class);
…	…
146	141	}
147	142
148		~~@Override~~
149	143	public boolean handle(EventR3 event) {
150	144	PageTemplatesPalette source = event.getSource(PageTemplatesPalette.class);
…	…
199	193	ON_APPLY_FRAME_TEMPLATE {
200	194
201		~~@Override~~
202	195	public void defineFilter(EventFilterBuilder filter) {
203	196	filter.setSourceClass(FrameTemplatesPalette.class);
…	…
205	198	}
206	199
207		~~@Override~~
208	200	public boolean handle(EventR3 event) {
209	201	FrameTemplatesPalette source = event.getSource(FrameTemplatesPalette.class);
…	…
266	258	ON_DELETE_PAGE_TEMPLATE {
267	259
268		~~@Override~~
269	260	public void defineFilter(EventFilterBuilder filter) {
270	261	filter.setSourceClass(PageTemplatesPalette.class);
…	…
272	263	}
273	264
274		~~@Override~~
275	265	public boolean handle(EventR3 event) {
276	266	PageTemplatesPalette source = event.getSource(PageTemplatesPalette.class);
…	…
307	297	ON_DELETE_FRAME_TEMPLATE {
308	298
309		~~@Override~~
310	299	public void defineFilter(EventFilterBuilder filter) {
311	300	filter.setSourceClass(FrameTemplatesPalette.class);
…	…
313	302	}
314	303
315		~~@Override~~
316	304	public boolean handle(EventR3 event) {
317	305	FrameTemplatesPalette source = event.getSource(FrameTemplatesPalette.class);

branches/private/pav/NEW_JAVA_5/sophie2-platform/modules/org.sophie2.main.app.layout/src/main/java/org/sophie2/main/app/layout/right/library/PageTemplatesPalette.java

r6700	r7238
128	128	}
129	129	.transform(new ProListTransformer<ResourceRefR4, PageTemplateItem>() {
130		~~@Override~~
131	130	public PageTemplateItem translate(
132	131	final ResourceRefR4 source) {

branches/private/pav/NEW_JAVA_5/sophie2-platform/modules/org.sophie2.main.app.menus/.classpath

r1402	r7238
5	5	<classpathentry kind="src" output="target/test-classes" path="src/test/java"/>
6	6	<classpathentry excluding="**" kind="src" output="target/test-classes" path="src/test/resources"/>
7		<classpathentry kind="con"
8		path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6" />
9		<classpathentry kind="con"
10		path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER" />
11		<classpathentry kind="output" path="target/classes" />
	7	<classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
	8	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/jdk1.5.0_21"/>
	9	<classpathentry kind="output" path="target/classes"/>
12	10	</classpath>

branches/private/pav/NEW_JAVA_5/sophie2-platform/modules/org.sophie2.main.app.menus/.settings/org.eclipse.jdt.core.prefs

r1162	r7238
1		#~~Thu Sep 18 21:11:04 EEST 2008~~
	1	#Mon Oct 05 13:41:47 AFT 2009
2	2	eclipse.preferences.version=1
3	3	org.eclipse.jdt.core.builder.cleanOutputFolder=clean
…	…
18	18	org.eclipse.jdt.core.codeComplete.staticFieldSuffixes=
19	19	org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
20		org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
	20	org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
21	21	org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
22		org.eclipse.jdt.core.compiler.compliance=1.6
	22	org.eclipse.jdt.core.compiler.compliance=1.5
23	23	org.eclipse.jdt.core.compiler.debug.lineNumber=generate
24	24	org.eclipse.jdt.core.compiler.debug.localVariable=generate
…	…
97	97	org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
98	98	org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
99		org.eclipse.jdt.core.compiler.source=1.6
	99	org.eclipse.jdt.core.compiler.source=1.5
100	100	org.eclipse.jdt.core.compiler.taskCaseSensitive=enabled
101	101	org.eclipse.jdt.core.compiler.taskPriorities=NORMAL,HIGH,NORMAL

branches/private/pav/NEW_JAVA_5/sophie2-platform/modules/org.sophie2.main.app.menus/src/main/java/org/sophie2/main/app/menus/AppTabBarMenu.java

r2069	r7238
16	16	public class AppTabBarMenu extends PopupMenu {
17	17
18		~~@Override~~
19	18	@Own
20	19	public ListProp<? extends MenuItem> items() {

branches/private/pav/NEW_JAVA_5/sophie2-platform/modules/org.sophie2.main.app.menus/src/main/java/org/sophie2/main/app/menus/edit/EditMenuLogic.java

r6284	r7238
27	27	ON_UNDO {
28	28
29		~~@Override~~
30	29	public void defineFilter(EventFilterBuilder filter) {
31	30	filter.setSourceClass(UndoItem.class);
…	…
33	32	}
34	33
35		~~@Override~~
36	34	public boolean handle(EventR3 event) {
37	35	UndoItem source = event.getSource(UndoItem.class);
…	…
48	46	ON_REDO {
49	47
50		~~@Override~~
51	48	public void defineFilter(EventFilterBuilder filter) {
52	49	filter.setSourceClass(RedoItem.class);
…	…
54	51	}
55	52
56		~~@Override~~
57	53	public boolean handle(EventR3 event) {
58	54	RedoItem source = event.getSource(RedoItem.class);
…	…
69	65	ON_TOGGLE_FRAME_CONNECTIONS {
70	66
71		~~@Override~~
72	67	public void defineFilter(EventFilterBuilder filter) {
73	68	filter.setSourceClass(ShowConnectionsItem.class);
…	…
75	70	}
76	71
77		~~@Override~~
78	72	public boolean handle(EventR3 event) {
79	73	ShowConnectionsItem source = event.getSource(ShowConnectionsItem.class);

branches/private/pav/NEW_JAVA_5/sophie2-platform/modules/org.sophie2.main.app.menus/src/main/java/org/sophie2/main/app/menus/file/FileMenuLogic.java

r7094	r7238
53	53	ON_NEW_BOOK {
54	54
55		~~@Override~~
56	55	public void defineFilter(EventFilterBuilder filter) {
57	56	filter.setSourceClass(NewBookItem.class);
…	…
59	58	}
60	59
61		~~@Override~~
62	60	public boolean handle(EventR3 event) {
63	61	NewBookItem source = event.getSource(NewBookItem.class);
…	…
92	90	ON_OPEN_BOOK {
93	91
94		~~@Override~~
95	92	public void defineFilter(EventFilterBuilder filter) {
96	93	filter.setSourceClass(OpenBookItem.class);
…	…
98	95	}
99	96
100		~~@Override~~
101	97	public boolean handle(EventR3 event) {
102	98
…	…
133	129	ON_SAVE_BOOK {
134	130
135		~~@Override~~
136	131	public void defineFilter(EventFilterBuilder filter) {
137	132	filter.setSourceClass(SaveBookItem.class);
…	…
140	135
141	136	@SuppressWarnings("synthetic-access")
142		~~@Override~~
143	137	public boolean handle(EventR3 event) {
144	138	SaveBookItem source = event.getSource(SaveBookItem.class);
…	…
166	160	ON_SAVE_BOOK_AS {
167	161
168		~~@Override~~
169	162	public void defineFilter(EventFilterBuilder filter) {
170	163	filter.setSourceClass(SaveBookAsItem.class);
…	…
173	166
174	167	@SuppressWarnings("synthetic-access")
175		~~@Override~~
176	168	public boolean handle(EventR3 event) {
177	169	SaveBookAsItem source = event.getSource(SaveBookAsItem.class);
…	…
194	186	ON_SAVE_BOOK_AS_TEMPLATE {
195	187
196		~~@Override~~
197	188	public void defineFilter(EventFilterBuilder filter) {
198	189	filter.setSourceClass(SaveBookAsTemplateItem.class);
…	…
200	191	}
201	192
202		~~@Override~~
203	193	public boolean handle(EventR3 event) {
204	194	SaveBookAsTemplateItem source = event.getSource(SaveBookAsTemplateItem.class);
…	…
231	221	ON_OPEN_BOOK_PROPERTIES {
232	222
233		~~@Override~~
234	223	public void defineFilter(EventFilterBuilder filter) {
235	224	filter.setSourceClass(BookPropertiesItem.class);
…	…
237	226	}
238	227
239		~~@Override~~
240	228	public boolean handle(EventR3 event) {
241	229	BookPropertiesItem source = event.getSource(BookPropertiesItem.class);
…	…
279	267	ON_CLOSE_DOCUMENT {
280	268
281		~~@Override~~
282	269	public void defineFilter(EventFilterBuilder filter) {
283	270	filter.setSourceClass(CloseBookItem.class);
…	…
285	272	}
286	273
287		~~@Override~~
288	274	public boolean handle(EventR3 event) {
289	275	CloseBookItem source = event.getSource(CloseBookItem.class);
…	…
305	291	ON_EXIT {
306	292
307		~~@Override~~
308	293	public void defineFilter(EventFilterBuilder filter) {
309	294	filter.setSourceClass(ExitItem.class);
…	…
311	296	}
312	297
313		~~@Override~~
314	298	public boolean handle(EventR3 event) {
315	299	ExitItem source = event.getSource(ExitItem.class);

branches/private/pav/NEW_JAVA_5/sophie2-platform/modules/org.sophie2.main.app.menus/src/main/java/org/sophie2/main/app/menus/tabbar/TabBarLogic.java

r5991	r7238
28	28	ON_SHOW_DESKTOP {
29	29
30		~~@Override~~
31	30	public void defineFilter(EventFilterBuilder filter) {
32	31	filter.setSourceClass(AppTabBar.class);
…	…
34	33	}
35	34
36		~~@Override~~
37	35	public boolean handle(EventR3 event) {
38	36	AppTabBar source = event.getSource(AppTabBar.class);
…	…
61	59	ON_MINIMIZE_ALL {
62	60
63		~~@Override~~
64	61	public void defineFilter(EventFilterBuilder filter) {
65	62	filter.setSourceClass(MinimizeAllItem.class);
…	…
67	64	}
68	65
69		~~@Override~~
70	66	public boolean handle(EventR3 event) {
71	67	MinimizeAllItem source = event.getSource(MinimizeAllItem.class);
…	…
90	86	ON_RESTORE_ALL {
91	87
92		~~@Override~~
93	88	public void defineFilter(EventFilterBuilder filter) {
94	89	filter.setSourceClass(RestoreAllItem.class);
…	…
96	91	}
97	92
98		~~@Override~~
99	93	public boolean handle(EventR3 event) {
100	94	RestoreAllItem source = event.getSource(RestoreAllItem.class);

branches/private/pav/NEW_JAVA_5/sophie2-platform/modules/org.sophie2.main.app.menus/src/main/java/org/sophie2/main/app/menus/view/ViewMenuLogic.java

r7002	r7238
26	26	@SortKey("rrr-set-full-screen-mode")
27	27	ON_FULL_SCREEN_MODE {
28		~~@Override~~
29	28	public void defineFilter(EventFilterBuilder filter) {
30	29	filter.setSourceClass(FullScreenItem.class);
…	…
32	31	}
33	32
34		~~@Override~~
35	33	public boolean handle(EventR3 event) {
36	34	FullScreenItem source = event.getSource(FullScreenItem.class);
…	…
55	53	@SortKey("rrz-set-normal-mode")
56	54	ON_NORMAL_MODE {
57		~~@Override~~
58	55	public void defineFilter(EventFilterBuilder filter) {
59	56	filter.setSourceClass(NormalModeItem.class);
…	…
61	58	}
62	59
63		~~@Override~~
64	60	public boolean handle(EventR3 event) {
65	61	NormalModeItem source = event.getSource(NormalModeItem.class);

branches/private/pav/NEW_JAVA_5/sophie2-platform/modules/org.sophie2.main.app.menus/src/main/java/org/sophie2/main/app/menus/window/WindowMenu.java

r6264	r7238
105	105	}.transform(new ProListTransformer<DocView, DocumentItem>() {
106	106
107		~~@Override~~
108	107	public DocumentItem translate(DocView source) {
109	108	DocumentItem res = new DocumentItem();

branches/private/pav/NEW_JAVA_5/sophie2-platform/modules/org.sophie2.main.app.menus/src/main/java/org/sophie2/main/app/menus/window/WindowMenuLogic.java

r5991	r7238
30	30	ON_TILE {
31	31
32		~~@Override~~
33	32	public void defineFilter(EventFilterBuilder filter) {
34	33	filter.setSourceClass(TileItem.class);
…	…
36	35	}
37	36
38		~~@Override~~
39	37	public boolean handle(EventR3 event) {
40	38	TileItem source = event.getSource(TileItem.class);
…	…
59	57	ON_CASCADE {
60	58
61		~~@Override~~
62	59	public void defineFilter(EventFilterBuilder filter) {
63	60	filter.setSourceClass(CascadeItem.class);
…	…
65	62	}
66	63
67		~~@Override~~
68	64	public boolean handle(EventR3 event) {
69	65	CascadeItem source = event.getSource(CascadeItem.class);
…	…
86	82	ON_DOCUMENT_SELECT {
87	83
88		~~@Override~~
89	84	public void defineFilter(EventFilterBuilder filter) {
90	85	filter.setSourceClass(DocumentItem.class);
…	…
92	87	}
93	88
94		~~@Override~~
95	89	public boolean handle(EventR3 event) {
96	90	DocumentItem source = event.getSource(DocumentItem.class);

branches/private/pav/NEW_JAVA_5/sophie2-platform/modules/org.sophie2.main.app.model/.classpath

r319	r7238
5	5	<classpathentry kind="src" output="target/test-classes" path="src/test/java"/>
6	6	<classpathentry excluding="**" kind="src" output="target/test-classes" path="src/test/resources"/>
7		~~<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>~~
8	7	<classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
	8	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/jdk1.5.0_21"/>
9	9	<classpathentry kind="output" path="target/classes"/>
10	10	</classpath>

branches/private/pav/NEW_JAVA_5/sophie2-platform/modules/org.sophie2.main.app.model/.settings/org.eclipse.jdt.core.prefs

r333	r7238
1		#~~Thu Sep 18 21:11:04 EEST 2008~~
	1	#Mon Oct 05 13:41:54 AFT 2009
2	2	eclipse.preferences.version=1
3	3	org.eclipse.jdt.core.builder.cleanOutputFolder=clean
…	…
18	18	org.eclipse.jdt.core.codeComplete.staticFieldSuffixes=
19	19	org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
20		org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
	20	org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
21	21	org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
22		org.eclipse.jdt.core.compiler.compliance=1.6
	22	org.eclipse.jdt.core.compiler.compliance=1.5
23	23	org.eclipse.jdt.core.compiler.debug.lineNumber=generate
24	24	org.eclipse.jdt.core.compiler.debug.localVariable=generate
…	…
97	97	org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
98	98	org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
99		org.eclipse.jdt.core.compiler.source=1.6
	99	org.eclipse.jdt.core.compiler.source=1.5
100	100	org.eclipse.jdt.core.compiler.taskCaseSensitive=enabled
101	101	org.eclipse.jdt.core.compiler.taskPriorities=NORMAL,HIGH,NORMAL

branches/private/pav/NEW_JAVA_5/sophie2-platform/modules/org.sophie2.main.dialogs.input/.classpath

r669	r7238
5	5	<classpathentry kind="src" output="target/test-classes" path="src/test/java"/>
6	6	<classpathentry excluding="**" kind="src" output="target/test-classes" path="src/test/resources"/>
7		~~<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>~~
8	7	<classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
	8	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/jdk1.5.0_21"/>
9	9	<classpathentry kind="output" path="target/classes"/>
10	10	</classpath>

branches/private/pav/NEW_JAVA_5/sophie2-platform/modules/org.sophie2.main.dialogs.input/.settings/org.eclipse.jdt.core.prefs

r688	r7238
1		#~~Thu Dec 04 20:06:27 EET 2008~~
	1	#Mon Oct 05 13:42:02 AFT 2009
2	2	eclipse.preferences.version=1
3		org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
4		org.eclipse.jdt.core.compiler.compliance=1.6
5		org.eclipse.jdt.core.compiler.source=1.6
	3	org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
	4	org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
	5	org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
	6	org.eclipse.jdt.core.compiler.compliance=1.5
	7	org.eclipse.jdt.core.compiler.debug.lineNumber=generate
	8	org.eclipse.jdt.core.compiler.debug.localVariable=generate
	9	org.eclipse.jdt.core.compiler.debug.sourceFile=generate
	10	org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
	11	org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
	12	org.eclipse.jdt.core.compiler.source=1.5

branches/private/pav/NEW_JAVA_5/sophie2-platform/modules/org.sophie2.main.dialogs.input/src/main/java/org/sophie2/main/dialogs/input/FileDialogInput.java

r6933	r7238
9	9
10	10	import javax.swing.filechooser.FileFilter;
11		~~import javax.swing.filechooser.FileNameExtensionFilter;~~
12	11
13	12	import org.sophie2.base.dialogs.DialogInput;
…	…
25	24	* FileFilter when the chooser is used to insert images.
26	25	*/
27		public static final FileFilter IMAGE_FILTER = new File~~Name~~ExtensionFilter(
	26	public static final FileFilter IMAGE_FILTER = new FileExtensionFilter(
28	27	"Image (.jpg, .jpeg, .png, .gif)", "jpg", "jpeg", "png", "gif");
29	28
…	…
31	30	* Filter that filters Sophie 2.0 book files
32	31	*/
33		public static final FileFilter BOOK_FILTER = new File~~Name~~ExtensionFilter(
	32	public static final FileFilter BOOK_FILTER = new FileExtensionFilter(
34	33	"Sophie 2.0 book (*.sjrb)", "sjrb");
35	34
…	…
209	208	public static File appendFileExtension(File file, FileFilter fileFilter) {
210	209	File res = file;
211		assert fileFilter instanceof FileNameExtensionFilter : "You should use FileNameExtensionFilter when you try to append extensions.";
212
213		String[] extensions = ((FileNameExtensionFilter) fileFilter).getExtensions();
	210
	211	assert fileFilter instanceof FileExtensionFilter :
	212	"You should use FileNameExtensionFilter when you try to append extensions.";
	213
	214	String[] extensions = ((FileExtensionFilter) fileFilter).getExtensions();
214	215	for (String fileExt : extensions) {
215	216	if (file.getName().endsWith(fileExt)) {

branches/private/pav/NEW_JAVA_5/sophie2-platform/modules/org.sophie2.main.dnd/.classpath

r6405	r7238
5	5	<classpathentry kind="src" output="target/test-classes" path="src/test/java"/>
6	6	<classpathentry excluding="**" kind="src" output="target/test-classes" path="src/test/resources"/>
7		<classpathentry kind="con"
8		path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6" />
9		<classpathentry kind="con"
10		path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER" />
11		<classpathentry kind="output" path="target/classes" />
	7	<classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
	8	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/jdk1.5.0_21"/>
	9	<classpathentry kind="output" path="target/classes"/>
12	10	</classpath>

branches/private/pav/NEW_JAVA_5/sophie2-platform/modules/org.sophie2.main.dnd/.settings/org.eclipse.jdt.core.prefs

r6405	r7238
1		#~~Thu Sep 18 21:11:04 EEST 2008~~
	1	#Mon Oct 05 13:42:09 AFT 2009
2	2	eclipse.preferences.version=1
3	3	org.eclipse.jdt.core.builder.cleanOutputFolder=clean
…	…
18	18	org.eclipse.jdt.core.codeComplete.staticFieldSuffixes=
19	19	org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
20		org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
	20	org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
21	21	org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
22		org.eclipse.jdt.core.compiler.compliance=1.6
	22	org.eclipse.jdt.core.compiler.compliance=1.5
23	23	org.eclipse.jdt.core.compiler.debug.lineNumber=generate
24	24	org.eclipse.jdt.core.compiler.debug.localVariable=generate
…	…
97	97	org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
98	98	org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
99		org.eclipse.jdt.core.compiler.source=1.6
	99	org.eclipse.jdt.core.compiler.source=1.5
100	100	org.eclipse.jdt.core.compiler.taskCaseSensitive=enabled
101	101	org.eclipse.jdt.core.compiler.taskPriorities=NORMAL,HIGH,NORMAL

branches/private/pav/NEW_JAVA_5/sophie2-platform/modules/org.sophie2.main.dnd/src/main/java/org/sophie2/main/dnd/dnddata/ResourceRefData.java

r6405	r7238
67	67	public static class ResourceRefDndProvider implements DndProvider {
68	68
69		~~@Override~~
70	69	public DndData createDndData(AwtTransferable awtTransferable) {
71	70	return new ResourceRefData(awtTransferable) {
…	…
84	83	}
85	84
86		~~@Override~~
87	85	public Class<? extends DndData> getProvidedData() {
88	86	return ResourceRefData.class;
89	87	}
90	88
91		~~@Override~~
92	89	public DataFlavor getSupportedFlavor() {
93	90	return FLAVOR;

branches/private/pav/NEW_JAVA_5/sophie2-platform/modules/org.sophie2.main.dnd/src/main/java/org/sophie2/main/dnd/dnddata/ResourceRevisionData.java

r6405	r7238
56	56	public static class ResourceRevisionDndProvider implements DndProvider {
57	57
58		~~@Override~~
59	58	public DndData createDndData(AwtTransferable awtTransferable) {
60	59	return new ResourceRevisionData(awtTransferable) {
…	…
72	71	}
73	72
74		~~@Override~~
75	73	public Class<? extends DndData> getProvidedData() {
76	74	return ResourceRevisionData.class;
77	75	}
78	76
79		~~@Override~~
80	77	public DataFlavor getSupportedFlavor() {
81	78	return FLAVOR;

branches/private/pav/NEW_JAVA_5/sophie2-platform/modules/org.sophie2.main.dnd/src/main/java/org/sophie2/main/dnd/providers/ImageResourceDataProvider.java

r6751	r7238
24	24	public class ImageResourceDataProvider implements ResourceDataProvider {
25	25
26		~~@Override~~
27	26	public List<DndData> getRegisteredDatas(ResourceTransferable transferable) {
28	27
…	…
66	65	}
67	66
68		~~@Override~~
69	67	public String getResourceKind() {
70	68	return ImageResourceR4.KIND;

branches/private/pav/NEW_JAVA_5/sophie2-platform/modules/org.sophie2.main.func.config/.classpath

r1402	r7238
5	5	<classpathentry kind="src" output="target/test-classes" path="src/test/java"/>
6	6	<classpathentry excluding="**" kind="src" output="target/test-classes" path="src/test/resources"/>
7		<classpathentry kind="con"
8		path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6" />
9		<classpathentry kind="con"
10		path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER" />
11		<classpathentry kind="output" path="target/classes" />
	7	<classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
	8	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/jdk1.5.0_21"/>
	9	<classpathentry kind="output" path="target/classes"/>
12	10	</classpath>

branches/private/pav/NEW_JAVA_5/sophie2-platform/modules/org.sophie2.main.func.config/.settings/org.eclipse.jdt.core.prefs

r1162	r7238
1		#~~Thu Sep 18 21:11:04 EEST 2008~~
	1	#Mon Oct 05 13:42:16 AFT 2009
2	2	eclipse.preferences.version=1
3	3	org.eclipse.jdt.core.builder.cleanOutputFolder=clean
…	…
18	18	org.eclipse.jdt.core.codeComplete.staticFieldSuffixes=
19	19	org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
20		org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
	20	org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
21	21	org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
22		org.eclipse.jdt.core.compiler.compliance=1.6
	22	org.eclipse.jdt.core.compiler.compliance=1.5
23	23	org.eclipse.jdt.core.compiler.debug.lineNumber=generate
24	24	org.eclipse.jdt.core.compiler.debug.localVariable=generate
…	…
97	97	org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
98	98	org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
99		org.eclipse.jdt.core.compiler.source=1.6
	99	org.eclipse.jdt.core.compiler.source=1.5
100	100	org.eclipse.jdt.core.compiler.taskCaseSensitive=enabled
101	101	org.eclipse.jdt.core.compiler.taskPriorities=NORMAL,HIGH,NORMAL

branches/private/pav/NEW_JAVA_5/sophie2-platform/modules/org.sophie2.main.func.config/src/main/java/org/sophie2/main/func/config/PluginAboutPalette.java

r5969	r7238
132	132	res.addActionListener(new ActionListener() {
133	133	@SuppressWarnings("synthetic-access")
134		~~@Override~~
135	134	public void actionPerformed(ActionEvent arg0) {
136	135	PluginItem pi = (PluginItem) pluginsPalette().get()
…	…
186	185	res.addActionListener(new ActionListener() {
187	186	@SuppressWarnings("synthetic-access")
188		~~@Override~~
189	187	public void actionPerformed(ActionEvent arg0) {
190	188	PluginItem item = (PluginItem) pluginsPalette().get()

branches/private/pav/NEW_JAVA_5/sophie2-platform/modules/org.sophie2.main.func.config/src/main/java/org/sophie2/main/func/config/PluginLogic.java

r6944	r7238
18	18	ON_ENABLE {
19	19
20		~~@Override~~
21	20	public void defineFilter(EventFilterBuilder filter) {
22	21	filter.setSourceClass(PluginAboutPalette.class);
…	…
24	23	}
25	24
26		~~@Override~~
27	25	public boolean handle(EventR3 event) {
28	26	String moduleId = event.getEventParam(EventIds.INPUT_PARAM_INDEX,
…	…
38	36	ON_DISABLE {
39	37
40		~~@Override~~
41	38	public void defineFilter(EventFilterBuilder filter) {
42	39	filter.setSourceClass(PluginAboutPalette.class);
…	…
44	41	}
45	42
46		~~@Override~~
47	43	public boolean handle(EventR3 event) {
48	44	String moduleId = event.getEventParam(EventIds.INPUT_PARAM_INDEX,

branches/private/pav/NEW_JAVA_5/sophie2-platform/modules/org.sophie2.main.func.config/src/main/java/org/sophie2/main/func/config/PluginsPalette.java

r4533	r7238
66	66	}.transform(new ProListTransformer<ModuleInfo, PluginItem>(){
67	67
68		~~@Override~~
69	68	public PluginItem translate(final ModuleInfo source) {
70	69	return new PluginItem(){

branches/private/pav/NEW_JAVA_5/sophie2-platform/modules/org.sophie2.main.func.file/.classpath

r672	r7238
5	5	<classpathentry kind="src" output="target/test-classes" path="src/test/java"/>
6	6	<classpathentry excluding="**" kind="src" output="target/test-classes" path="src/test/resources"/>
7		~~<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>~~
8	7	<classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
	8	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/jdk1.5.0_21"/>
9	9	<classpathentry kind="output" path="target/classes"/>
10	10	</classpath>

branches/private/pav/NEW_JAVA_5/sophie2-platform/modules/org.sophie2.main.func.file/.settings/org.eclipse.jdt.core.prefs

r1162	r7238
1		#~~Thu Sep 18 21:11:04 EEST 2008~~
	1	#Mon Oct 05 13:42:22 AFT 2009
2	2	eclipse.preferences.version=1
3	3	org.eclipse.jdt.core.builder.cleanOutputFolder=clean
…	…
18	18	org.eclipse.jdt.core.codeComplete.staticFieldSuffixes=
19	19	org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
20		org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
	20	org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
21	21	org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
22		org.eclipse.jdt.core.compiler.compliance=1.6
	22	org.eclipse.jdt.core.compiler.compliance=1.5
23	23	org.eclipse.jdt.core.compiler.debug.lineNumber=generate
24	24	org.eclipse.jdt.core.compiler.debug.localVariable=generate
…	…
97	97	org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
98	98	org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
99		org.eclipse.jdt.core.compiler.source=1.6
	99	org.eclipse.jdt.core.compiler.source=1.5
100	100	org.eclipse.jdt.core.compiler.taskCaseSensitive=enabled
101	101	org.eclipse.jdt.core.compiler.taskPriorities=NORMAL,HIGH,NORMAL

branches/private/pav/NEW_JAVA_5/sophie2-platform/modules/org.sophie2.main.func.file/src/main/java/org/sophie2/main/func/file/dialogs/FileDialog.java

r6933	r7238
8	8	import javax.swing.Icon;
9	9	import javax.swing.JButton;
	10	import javax.swing.JComboBox;
	11	import javax.swing.JComponent;
10	12	import javax.swing.JFileChooser;
11	13	import javax.swing.JPanel;
…	…
103	105	// this is the root panel positioned on the top.
104	106	JPanel upperPanel = (JPanel) this.fileChooser.getComponent(0);
	107
105	108	// this is the panel containing buttons and some other
106	109	// things. The buttons are the ones that display
107	110	// folder, home, details list and other icons.
108		J~~Panel buttonsPanel = (JPanel~~) upperPanel.getComponent(0);
109		for (Component c : buttons~~Panel~~.getComponents()) {
	111	JComponent buttonsComboBox = (JComponent) upperPanel.getComponent(0);
	112	for (Component c : buttonsComboBox.getComponents()) {
110	113	if (c instanceof JButton) {
111	114	JButton button = (JButton) c;

branches/private/pav/NEW_JAVA_5/sophie2-platform/modules/org.sophie2.main.func.help/.classpath

r2055	r7238
5	5	<classpathentry kind="src" output="target/test-classes" path="src/test/java"/>
6	6	<classpathentry excluding="**" kind="src" output="target/test-classes" path="src/test/resources"/>
7		<classpathentry kind="con"
8		path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6" />
9		<classpathentry kind="con"
10		path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER" />
11		<classpathentry kind="output" path="target/classes" />
	7	<classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
	8	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/jdk1.5.0_21"/>
	9	<classpathentry kind="output" path="target/classes"/>
12	10	</classpath>

branches/private/pav/NEW_JAVA_5/sophie2-platform/modules/org.sophie2.main.func.help/.settings/org.eclipse.jdt.core.prefs

r2055	r7238
1		#~~Thu Sep 18 21:11:04 EEST 2008~~
	1	#Mon Oct 05 13:42:28 AFT 2009
2	2	eclipse.preferences.version=1
3	3	org.eclipse.jdt.core.builder.cleanOutputFolder=clean
…	…
18	18	org.eclipse.jdt.core.codeComplete.staticFieldSuffixes=
19	19	org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
20		org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
	20	org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
21	21	org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
22		org.eclipse.jdt.core.compiler.compliance=1.6
	22	org.eclipse.jdt.core.compiler.compliance=1.5
23	23	org.eclipse.jdt.core.compiler.debug.lineNumber=generate
24	24	org.eclipse.jdt.core.compiler.debug.localVariable=generate
…	…
97	97	org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
98	98	org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
99		org.eclipse.jdt.core.compiler.source=1.6
	99	org.eclipse.jdt.core.compiler.source=1.5
100	100	org.eclipse.jdt.core.compiler.taskCaseSensitive=enabled
101	101	org.eclipse.jdt.core.compiler.taskPriorities=NORMAL,HIGH,NORMAL

branches/private/pav/NEW_JAVA_5/sophie2-platform/modules/org.sophie2.main.func.help/src/main/java/org/sophie2/main/func/help/about/OldAboutDialog.java

r6999	r7238
6	6	import java.awt.event.ActionEvent;
7	7	import java.awt.event.ActionListener;
	8	import java.lang.reflect.Method;
	9	import java.util.Arrays;
8	10
9	11	import javax.swing.JButton;
…	…
17	19	import javax.swing.event.HyperlinkListener;
18	20
	21	import org.sophie2.base.dialogs.DialogManager;
	22	import org.sophie2.main.dialogs.input.ErrorDialogInput;
	23
19	24	/**
20	25	* This class shows the about dialog for Sophie 2 . It is not designed very
21	26	* well, but works so, we wrap it. Use {@link AboutDialog} instead.
22	27	*
23		* @since 17.03.2009 by meddle:
24		* ~~TODO Use the new LogicR3 code for the~~ implementation of this dialog.
	28	* @since 17.03.2009 by meddle: TODO Use the new LogicR3 code for the
	29	* implementation of this dialog.
25	30	*
26	31	* @author Nevena Tacheva This class constructs AboutDialog
…	…
29	34
30	35	// May be this content should be moved to a outer file?
31		private static final String ABOUT_CONTENT =
32		"About Sophie 2.0 <p> <a href=\"http://www.sophieproject.org/\">" +
33		"http://www.sophieproject.org/</a></p> <p> " +
34		"Sophie is software for writing and reading rich media documents " +
35		"in a networked environment. The program emerged from the desire to create " +
36		"an easy-to-use application that would allow users to combine " +
37		"text, images, video, and sound quickly and simply, " +
38		"but with precision and sophistication. Sophie's users are interested " +
39		"in creating robust, elegant, networked texts without having " +
40		"programming knowledge or training in the use of more complex tools such as Flash." +
41		"<p>Initially designed and developed under the auspices of the " +
42		"Institute for the Future of the Book, Sophie is currently being significantly " +
43		"revised and improved, thanks to an additional generous grant from " +
44		"The Andrew W. Mellon Foundation in the fall of 2008 under the sponsorship " +
45		"of the University of California. The Sophie 2.0 Project is being developed by " +
46		"Astea Solutions AD and additional contributors based on a " +
47		"Java code base contributed to the project by Astea Solutions." +
48		"<p>The Andrew W. Mellon Foundation <p>With assets in excess of $6.5 billion, " +
49		"the Mellon Foundation is one of the largest grant awarding " +
50		"not-for-profit organizations focused on education and scholarly research. " +
51		"It provides grants in six areas: Higher Education and Scholarship; " +
52		"Scholarly Communications; Research in Information Technology; " +
53		"Museums and Art Conservation; Performing Arts; and, " +
54		"Conservation and the Environment.<p>University of Southern California <p>" +
55		"Located in Los Angeles, the USC is one of the world's leading private " +
56		"research universities. Founded in 1880, USC today has a student body of " +
57		"33,500. USC's School of Cinematic Arts, internationally recognized as the top " +
58		"academic film, television, and new media program, will be " +
59		"Astea Solutions' principal collaborator on Sophie, " +
60		"providing project oversight and evangelism to the academic community." +
61		"<p>Astea Solutions AD<p> Astea Solutions designs and develops proprietary and " +
62		"open source software products for global markets in the electronic publishing field. " +
63		"The company works closely with Sofia University's " +
64		"Faculty for Mathematics and Informatics and Laboratory for Interactive Multimedia. " +
65		"The oldest higher education institution in Bulgaria, " +
66		"Sofia University is also the country's largest with 14,000 students. " +
67		"Bulgaria is internationally recognized as a source of highly qualified " +
68		"technical talent and many of the United States and Europe's leading " +
69		"technology companies have opened substantial research and development centers " +
70		"in Bulgaria.<p>Astea Solutions also provides a full spectrum of bespoke rich " +
71		"Internet media application development services including custom programming, " +
72		"testing, graphic design, technical documentation and turnkey systems. " +
73		"Much of its service work involves companies and projects in online publishing and " +
74		"distribution. Founded in 2007, Astea Solutions is headquartered in Sofia, " +
75		"Bulgaria and maintains marketing offices in New York City and San Francisco." +
76		"<p>Copyright 2008, The University of Southern California. " +
77		"Licensed under the Educational Community License, Version 2.0 (the \"License\"); " +
78		"you may not use this code except in compliance with the License. " +
79		"You may obtain a copy of the License at " +
80		"<a href=\"http://www.osedu.org/licenses/ECL-2.0/\">http://www.osedu.org/licenses/ECL-2.0/</a>. " +
81		"Unless required by applicable law or agreed to in writing, " +
82		"software distributed under the License is distributed on an " +
83		"\"AS IS\" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, " +
84		"either express or implied. See the License for the specific language " +
85		"governing permissions and limitations under the License.";
86
	36	private static final String ABOUT_CONTENT = "About Sophie 2.0 <p> <a href=\"http://www.sophieproject.org/\">"
	37	+ "http://www.sophieproject.org/</a></p> <p> "
	38	+ "Sophie is software for writing and reading rich media documents "
	39	+ "in a networked environment. The program emerged from the desire to create "
	40	+ "an easy-to-use application that would allow users to combine "
	41	+ "text, images, video, and sound quickly and simply, "
	42	+ "but with precision and sophistication. Sophie's users are interested "
	43	+ "in creating robust, elegant, networked texts without having "
	44	+ "programming knowledge or training in the use of more complex tools such as Flash."
	45	+ "<p>Initially designed and developed under the auspices of the "
	46	+ "Institute for the Future of the Book, Sophie is currently being significantly "
	47	+ "revised and improved, thanks to an additional generous grant from "
	48	+ "The Andrew W. Mellon Foundation in the fall of 2008 under the sponsorship "
	49	+ "of the University of California. The Sophie 2.0 Project is being developed by "
	50	+ "Astea Solutions AD and additional contributors based on a "
	51	+ "Java code base contributed to the project by Astea Solutions."
	52	+ "<p>The Andrew W. Mellon Foundation <p>With assets in excess of $6.5 billion, "
	53	+ "the Mellon Foundation is one of the largest grant awarding "
	54	+ "not-for-profit organizations focused on education and scholarly research. "
	55	+ "It provides grants in six areas: Higher Education and Scholarship; "
	56	+ "Scholarly Communications; Research in Information Technology; "
	57	+ "Museums and Art Conservation; Performing Arts; and, "
	58	+ "Conservation and the Environment.<p>University of Southern California <p>"
	59	+ "Located in Los Angeles, the USC is one of the world's leading private "
	60	+ "research universities. Founded in 1880, USC today has a student body of "
	61	+ "33,500. USC's School of Cinematic Arts, internationally recognized as the top "
	62	+ "academic film, television, and new media program, will be "
	63	+ "Astea Solutions' principal collaborator on Sophie, "
	64	+ "providing project oversight and evangelism to the academic community."
	65	+ "<p>Astea Solutions AD<p> Astea Solutions designs and develops proprietary and "
	66	+ "open source software products for global markets in the electronic publishing field. "
	67	+ "The company works closely with Sofia University's "
	68	+ "Faculty for Mathematics and Informatics and Laboratory for Interactive Multimedia. "
	69	+ "The oldest higher education institution in Bulgaria, "
	70	+ "Sofia University is also the country's largest with 14,000 students. "
	71	+ "Bulgaria is internationally recognized as a source of highly qualified "
	72	+ "technical talent and many of the United States and Europe's leading "
	73	+ "technology companies have opened substantial research and development centers "
	74	+ "in Bulgaria.<p>Astea Solutions also provides a full spectrum of bespoke rich "
	75	+ "Internet media application development services including custom programming, "
	76	+ "testing, graphic design, technical documentation and turnkey systems. "
	77	+ "Much of its service work involves companies and projects in online publishing and "
	78	+ "distribution. Founded in 2007, Astea Solutions is headquartered in Sofia, "
	79	+ "Bulgaria and maintains marketing offices in New York City and San Francisco."
	80	+ "<p>Copyright 2008, The University of Southern California. "
	81	+ "Licensed under the Educational Community License, Version 2.0 (the \"License\"); "
	82	+ "you may not use this code except in compliance with the License. "
	83	+ "You may obtain a copy of the License at "
	84	+ "<a href=\"http://www.osedu.org/licenses/ECL-2.0/\">http://www.osedu.org/licenses/ECL-2.0/</a>. "
	85	+ "Unless required by applicable law or agreed to in writing, "
	86	+ "software distributed under the License is distributed on an "
	87	+ "\"AS IS\" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, "
	88	+ "either express or implied. See the License for the specific language "
	89	+ "governing permissions and limitations under the License.";
	90
87	91	private static final long serialVersionUID = 1L;
88	92	private JButton okButton = null;
…	…
111	115
112	116	/**
	117	* Opens the specified web page in a web browser
	118	*
	119	* @param url
	120	* A web address (URL) of a web page (ex:
	121	* "http://www.google.com/")
	122	*/
	123	public static void openURL(String url) {
	124	final String[] browsers = { "firefox", "opera", "konqueror",
	125	"epiphany", "seamonkey", "galeon", "kazehakase", "mozilla",
	126	"netscape" };
	127
	128	String osName = System.getProperty("os.name");
	129
	130	try {
	131
	132	if (osName.startsWith("Mac OS")) {
	133	Class<?> fileMgr = Class.forName("com.apple.eio.FileManager");
	134	Method openURL = fileMgr.getDeclaredMethod("openURL",
	135	new Class[] { String.class });
	136	openURL.invoke(null, new Object[] { url });
	137
	138	} else if (osName.startsWith("Windows")) {
	139	Runtime.getRuntime().exec(
	140	"rundll32 url.dll,FileProtocolHandler " + url);
	141	} else { // assume Unix or Linux
	142	boolean found = false;
	143
	144	for (String browser : browsers) {
	145	if (!found) {
	146	found = Runtime.getRuntime().exec(
	147	new String[] { "which", browser }).waitFor() == 0;
	148	if (found) {
	149	Runtime.getRuntime().exec(
	150	new String[] { browser, url });
	151	}
	152	}
	153	if (!found) {
	154	throw new Exception(Arrays.toString(browsers));
	155	}
	156	}
	157	}
	158	} catch (Exception e) {
	159	DialogManager.get().showDialog(new ErrorDialogInput(null, "Error attempting " +
	160	"to launch web browser\n", "Error"));
	161	}
	162	}
	163
	164	/**
113	165	* This method initializes okButton
114	166	*
…	…
125	177	this.editor.addHyperlinkListener(new HyperlinkListener() {
126	178
127		~~@Override~~
128	179	public void hyperlinkUpdate(HyperlinkEvent e) {
129	180	if (e.getEventType() == HyperlinkEvent.EventType.ACTIVATED) {
130		if (java.awt.Desktop.isDesktopSupported()) {
131		java.awt.Desktop desktop = java.awt.Desktop
132		.getDesktop();
133		if (desktop
134		.isSupported(java.awt.Desktop.Action.BROWSE)) {
135		try {
136		java.net.URI uri = new java.net.URI(
137		e.getDescription());
138		desktop.browse(uri);
139		} catch (Exception ex) {
140		java.io.StringWriter sw = new java.io.StringWriter();
141		java.io.PrintWriter pw = new java.io.PrintWriter(
142		sw);
143		ex.printStackTrace(pw);
144
145		}
146		}
147		}
148		}
149
	181	openURL(e.getDescription());
	182	}
150	183	}
151	184
…	…
198	231	aboutDialog.getContentPane().add(new OldAboutDialog());
199	232	aboutDialog.setTitle("Sophie 2.0 test release 3");
200		// aboutDialog.setBounds(new Rectangle(0, 0, 255, 190));
201		aboutDialog.setBounds(new Rectangle(0, 0, 425, 470));
	233	// aboutDialog.setBounds(new Rectangle(0, 0, 255, 190));
	234	aboutDialog.setBounds(new Rectangle(0, 0, 425, 470));
202	235	aboutDialog.setLocationRelativeTo(mainFrame);
203	236	aboutDialog.setResizable(false);

branches/private/pav/NEW_JAVA_5/sophie2-platform/modules/org.sophie2.main.func.help/src/main/java/org/sophie2/main/func/help/bugreport/BugReportDialog.java

r6508	r7238
67	67	private ProBean bean;
68	68
69		~~@Override~~
70	69	public ProBean getBean() {
71	70	if (this.bean == null) {
…	…
327	326	}
328	327
329		~~@Override~~
330	328	public Prop<JScrollPane> swingComponent() {
331	329	class swingComponent extends ResourceProperty<JScrollPane> {
…	…
341	339	textArea.getDocument().addDocumentListener(new DocumentListener() {
342	340
343		~~@Override~~
344	341	public void changedUpdate(DocumentEvent e) {
345	342	syncInputToModel(textArea.getText());
346	343	}
347	344
348		~~@Override~~
349	345	public void insertUpdate(DocumentEvent e) {
350	346	syncInputToModel(textArea.getText());
351	347	}
352	348
353		~~@Override~~
354	349	public void removeUpdate(DocumentEvent e) {
355	350	syncInputToModel(textArea.getText());

branches/private/pav/NEW_JAVA_5/sophie2-platform/modules/org.sophie2.main.func.help/src/main/java/org/sophie2/main/func/help/bugreport/BugReportLogic.java

r7131	r7238
46	46	ON_OPEN_BUG_REPORT_FORM {
47	47
48		~~@Override~~
49	48	public void defineFilter(EventFilterBuilder filter) {
50	49	filter.setSourceClass(BugReportItem.class);
…	…
52	51	}
53	52
54		~~@Override~~
55	53	public boolean handle(EventR3 event) {
56	54	showBugReportForm(null);
…	…
67	65	ON_SAVE_REPORT_TO_FILE {
68	66
69		~~@Override~~
70	67	public void defineFilter(EventFilterBuilder filter) {
71	68	filter.setEventId(BugReportDialog.EventIds.SAVE_REPORT_TO_FILE);
…	…
73	70	}
74	71
75		~~@Override~~
76	72	public boolean handle(EventR3 event) {
77	73	BugReportDialog bugReportForm = event.getSource(BugReportDialog.class);
…	…
123	119	ON_ATTACH_FILE {
124	120
125		~~@Override~~
126	121	public void defineFilter(EventFilterBuilder filter) {
127	122	filter.setEventId(BugReportDialog.EventIds.ATTACH_FILE);
…	…
129	124	}
130	125
131		~~@Override~~
132	126	public boolean handle(EventR3 event) {
133	127
…	…
152	146	ON_CLOSE_BUG_REPORT_FORM {
153	147
154		~~@Override~~
155	148	public void defineFilter(EventFilterBuilder filter) {
156	149	filter.setEventId(BugReportDialog.EventIds.CLOSE_FORM);
…	…
158	151	}
159	152
160		~~@Override~~
161	153	public boolean handle(EventR3 event) {
162	154	BugReportDialog bugReportForm = event.getSource(BugReportDialog.class);
…	…
176	168	ON_EMAIL_CHANGED {
177	169
178		~~@Override~~
179	170	public void defineFilter(EventFilterBuilder filter) {
180	171	filter.setEventId(BugReportDialog.EventIds.EMAIL_CHANGED);
…	…
182	173	}
183	174
184		~~@Override~~
185	175	public boolean handle(EventR3 event) {
186	176	String text = event.getEventParam(0, String.class); // + '\n';

branches/private/pav/NEW_JAVA_5/sophie2-platform/modules/org.sophie2.main.func.help/src/main/java/org/sophie2/main/func/help/bugreport/SophieExceptionHandler.java

r7131	r7238
10	10	public class SophieExceptionHandler implements Thread.UncaughtExceptionHandler {
11	11
12		~~@Override~~
13	12	public void uncaughtException(Thread t, Throwable e) {
14	13	e.printStackTrace();

branches/private/pav/NEW_JAVA_5/sophie2-platform/modules/org.sophie2.main.func.help/src/main/java/org/sophie2/main/func/help/HelpMenuLogic.java

r7005	r7238
41	41	ON_SHOW_HELP_CONTENTS {
42	42
43		~~@Override~~
44	43	public void defineFilter(EventFilterBuilder filter) {
45	44	filter.setSourceClass(HelpContentsItem.class);
…	…
49	48	protected final static String MAIN_HELP_ID = "index";
50	49
51		~~@Override~~
52	50	public boolean handle(EventR3 event) {
53	51
…	…
112	110	ON_SHOW_ABOUT {
113	111
114		~~@Override~~
115	112	public void defineFilter(EventFilterBuilder filter) {
116	113	filter.setSourceClass(AboutItem.class);
…	…
118	115	}
119	116
120		~~@Override~~
121	117	public boolean handle(EventR3 event) {
122	118	DialogManager.get().showDialog(new AboutDialogInput(null));
…	…
135	131	ON_OPEN_INSPECTOR {
136	132
137		~~@Override~~
138	133	public void defineFilter(EventFilterBuilder filter) {
139	134	filter.setSourceClass(InspectorItem.class);
…	…
141	136	}
142	137
143		~~@Override~~
144	138	public boolean handle(EventR3 event) {
145	139	InspectorItem source = event.getSource(InspectorItem.class);

branches/private/pav/NEW_JAVA_5/sophie2-platform/modules/org.sophie2.main.func.help/src/main/java/org/sophie2/main/func/help/HelpModule.java

r7005	r7238
80	80	return new Comparator<SophieExtension<HelpEntry>>() {
81	81
82		~~@Override~~
83	82	public int compare(
84	83	SophieExtension<HelpEntry> extension1,

branches/private/pav/NEW_JAVA_5/sophie2-platform/modules/org.sophie2.main.func.help/src/test/java/org/sophie2/main/func/help/bugreport/BugReportDemo.java

r3103	r7238
38	38	Thread thread = new Thread(new Runnable() {
39	39
40		~~@Override~~
41	40	public void run() {
42	41	throw new RuntimeException("Crash Test Exception (not a real bug)");

branches/private/pav/NEW_JAVA_5/sophie2-platform/modules/org.sophie2.main.func.image/.classpath

r2138	r7238
5	5	<classpathentry kind="src" output="target/test-classes" path="src/test/java"/>
6	6	<classpathentry excluding="**" kind="src" output="target/test-classes" path="src/test/resources"/>
7		<classpathentry kind="con"
8		path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6" />
9		<classpathentry kind="con"
10		path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER" />
11		<classpathentry kind="output" path="target/classes" />
	7	<classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
	8	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/jdk1.5.0_21"/>
	9	<classpathentry kind="output" path="target/classes"/>
12	10	</classpath>

branches/private/pav/NEW_JAVA_5/sophie2-platform/modules/org.sophie2.main.func.image/.settings/org.eclipse.jdt.core.prefs

r2138	r7238
1		#~~Thu Sep 18 21:11:04 EEST 2008~~
	1	#Mon Oct 05 13:42:35 AFT 2009
2	2	eclipse.preferences.version=1
3	3	org.eclipse.jdt.core.builder.cleanOutputFolder=clean
…	…
18	18	org.eclipse.jdt.core.codeComplete.staticFieldSuffixes=
19	19	org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
20		org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
	20	org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
21	21	org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
22		org.eclipse.jdt.core.compiler.compliance=1.6
	22	org.eclipse.jdt.core.compiler.compliance=1.5
23	23	org.eclipse.jdt.core.compiler.debug.lineNumber=generate
24	24	org.eclipse.jdt.core.compiler.debug.localVariable=generate
…	…
97	97	org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
98	98	org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
99		org.eclipse.jdt.core.compiler.source=1.6
	99	org.eclipse.jdt.core.compiler.source=1.5
100	100	org.eclipse.jdt.core.compiler.taskCaseSensitive=enabled
101	101	org.eclipse.jdt.core.compiler.taskPriorities=NORMAL,HIGH,NORMAL

branches/private/pav/NEW_JAVA_5/sophie2-platform/modules/org.sophie2.main.func.image/src/main/java/org/sophie2/main/func/image/logic/ImageLogic.java

r6998	r7238
63	63	ON_INSERT_IMAGE {
64	64
65		~~@Override~~
66	65	public void defineFilter(EventFilterBuilder filter) {
67	66	filter.setEventId(MenuItem.EventIds.CLICKED);
…	…
69	68	}
70	69
71		~~@Override~~
72	70	public boolean handle(EventR3 event) {
73	71	InsertImageItem source = event.getSource(InsertImageItem.class);
…	…
160	158	ON_DND_IMAGE_IMPORT {
161	159
162		~~@Override~~
163	160	public void defineFilter(EventFilterBuilder filter) {
164	161	filter.setSourceClass(PageWorkArea.class);
…	…
166	163	}
167	164
168		~~@Override~~
169	165	public boolean handle(EventR3 event) {
170	166

branches/private/pav/NEW_JAVA_5/sophie2-platform/modules/org.sophie2.main.func.image/src/main/java/org/sophie2/main/func/image/view/ImageResourcePreviewProvider.java

r5744	r7238
30	30	public class ImageResourcePreviewProvider implements ResourcePreviewProvider {
31	31
32		~~@Override~~
33	32	public String getResourceKind() {
34	33	return ImageResourceR4.KIND;
35	34	}
36	35
37		~~@Override~~
38	36	public SwingVisualElement getVisualElement(ResourceH element) {
39	37	assert element instanceof ImageResourceH;
…	…
42	40	}
43	41
44		~~@Override~~
45	42	public String filterKind() {
46	43	return "Image";
…	…
77	74	}
78	75
79		~~@Override~~
80	76	public Prop<JPanel> swingComponent() {
81	77	class swingComponent extends ResourceProperty<JPanel> {

branches/private/pav/NEW_JAVA_5/sophie2-platform/modules/org.sophie2.main.func.links/.classpath

r2104	r7238
5	5	<classpathentry kind="src" output="target/test-classes" path="src/test/java"/>
6	6	<classpathentry excluding="**" kind="src" output="target/test-classes" path="src/test/resources"/>
7		<classpathentry kind="con"
8		path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6" />
9		<classpathentry kind="con"
10		path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER" />
11		<classpathentry kind="output" path="target/classes" />
	7	<classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
	8	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/jdk1.5.0_21"/>
	9	<classpathentry kind="output" path="target/classes"/>
12	10	</classpath>

branches/private/pav/NEW_JAVA_5/sophie2-platform/modules/org.sophie2.main.func.links/.settings/org.eclipse.jdt.core.prefs

r2104	r7238
1		#~~Thu Sep 18 21:11:04 EEST 2008~~
	1	#Mon Oct 05 13:42:42 AFT 2009
2	2	eclipse.preferences.version=1
3	3	org.eclipse.jdt.core.builder.cleanOutputFolder=clean
…	…
18	18	org.eclipse.jdt.core.codeComplete.staticFieldSuffixes=
19	19	org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
20		org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
	20	org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
21	21	org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
22		org.eclipse.jdt.core.compiler.compliance=1.6
	22	org.eclipse.jdt.core.compiler.compliance=1.5
23	23	org.eclipse.jdt.core.compiler.debug.lineNumber=generate
24	24	org.eclipse.jdt.core.compiler.debug.localVariable=generate
…	…
97	97	org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
98	98	org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
99		org.eclipse.jdt.core.compiler.source=1.6
	99	org.eclipse.jdt.core.compiler.source=1.5
100	100	org.eclipse.jdt.core.compiler.taskCaseSensitive=enabled
101	101	org.eclipse.jdt.core.compiler.taskPriorities=NORMAL,HIGH,NORMAL

branches/private/pav/NEW_JAVA_5/sophie2-platform/modules/org.sophie2.main.func.links/src/main/java/org/sophie2/main/func/links/actions/navigation/GoToPageConfigurationPanel.java

r6980	r7238
42	42	ActionConfigurationPanel {
43	43
44		~~@Override~~
45	44	public Class<? extends LinkAction> getActionClass() {
46	45	return GoToPageAction.class;
…	…
66	65	}
67	66
68		~~@Override~~
69	67	public Prop<JPanel> swingComponent() {
70	68	class swingComponent extends ResourceProperty<JPanel> {

branches/private/pav/NEW_JAVA_5/sophie2-platform/modules/org.sophie2.main.func.links/src/main/java/org/sophie2/main/func/links/actions/navigation/GoToPageProvider.java

r6408	r7238
11	11	public class GoToPageProvider implements LinkActionProvider{
12	12
13		~~@Override~~
14	13	public LinkAction create() {
15	14	return new GoToPageAction(null);
16	15	}
17	16
18		~~@Override~~
19	17	public String getDescription() {
20	18	return "Go to page..";
21	19	}
22	20
23		~~@Override~~
24	21	public Class<? extends LinkAction> getProvidedClass() {
25	22	return GoToPageAction.class;

branches/private/pav/NEW_JAVA_5/sophie2-platform/modules/org.sophie2.main.func.links/src/main/java/org/sophie2/main/func/links/actions/navigation/NavigationActionsLogic.java

r7002	r7238
22	22	ON_GO_TO_NEXT_PAGE {
23	23
24		~~@Override~~
25	24	public void defineFilter(EventFilterBuilder filter) {
26	25	filter.setEventId(LinkProcessorLogic.LinkEvent.LINK_ACTION_TRIGGERED);
…	…
29	28	}
30	29
31		~~@Override~~
32	30	public boolean handle(EventR3 event) {
33	31
…	…
55	53	ON_GO_TO_PAGE {
56	54
57		~~@Override~~
58	55	public void defineFilter(EventFilterBuilder filter) {
59	56	filter.setEventId(LinkProcessorLogic.LinkEvent.LINK_ACTION_TRIGGERED);
…	…
62	59	}
63	60
64		~~@Override~~
65	61	public boolean handle(EventR3 event) {
66	62	BookView bv = event.getSource(BookView.class);

branches/private/pav/NEW_JAVA_5/sophie2-platform/modules/org.sophie2.main.func.links/src/main/java/org/sophie2/main/func/links/actions/navigation/NextPageProvider.java

r5541	r7238
11	11	public class NextPageProvider implements LinkActionProvider {
12	12
13		~~@Override~~
14	13	public LinkAction create() {
15	14	return new NextPageAction();
16	15	}
17	16
18		~~@Override~~
19	17	public String getDescription() {
20	18	return "Go to next page";
21	19	}
22	20
23		~~@Override~~
24	21	public Class<? extends LinkAction> getProvidedClass() {
25	22	return NextPageAction.class;

branches/private/pav/NEW_JAVA_5/sophie2-platform/modules/org.sophie2.main.func.links/src/main/java/org/sophie2/main/func/links/actions/showing/HideFrameActionProvider.java

r6408	r7238
12	12	public class HideFrameActionProvider implements LinkActionProvider {
13	13
14		~~@Override~~
15	14	public LinkAction create() {
16	15	return new HideFrameAction(null);
17	16	}
18	17
19		~~@Override~~
20	18	public String getDescription() {
21	19	return "Hide frame";
22	20	}
23	21
24		~~@Override~~
25	22	public Class<? extends LinkAction> getProvidedClass() {
26	23	return HideFrameAction.class;

branches/private/pav/NEW_JAVA_5/sophie2-platform/modules/org.sophie2.main.func.links/src/main/java/org/sophie2/main/func/links/actions/showing/HideFrameConfigurationPanel.java

r6163	r7238
46	46	}
47	47
48		~~@Override~~
49	48	public Class<? extends LinkAction> getActionClass() {
50	49	return HideFrameAction.class;
51	50	}
52	51
53		~~@Override~~
54	52	public Prop<JPanel> swingComponent() {
55	53	class swingComponent extends ResourceProperty<JPanel> {

branches/private/pav/NEW_JAVA_5/sophie2-platform/modules/org.sophie2.main.func.links/src/main/java/org/sophie2/main/func/links/actions/showing/ShowFrameActionProvider.java

r6408	r7238
11	11	public class ShowFrameActionProvider implements LinkActionProvider {
12	12
13		~~@Override~~
14	13	public LinkAction create() {
15	14	return new ShowFrameAction(null);
16	15	}
17	16
18		~~@Override~~
19	17	public String getDescription() {
20	18	return "Show frame";
21	19	}
22	20
23		~~@Override~~
24	21	public Class<? extends LinkAction> getProvidedClass() {
25	22	return ShowFrameAction.class;

branches/private/pav/NEW_JAVA_5/sophie2-platform/modules/org.sophie2.main.func.links/src/main/java/org/sophie2/main/func/links/actions/showing/ShowFrameConfigurationPanel.java

r6980	r7238
60	60	}
61	61
62		~~@Override~~
63	62	public Class<? extends LinkAction> getActionClass() {
64	63	return ShowFrameAction.class;
65	64	}
66	65
67		~~@Override~~
68	66	public Prop<JPanel> swingComponent() {
69	67	class swingComponent extends ResourceProperty<JPanel> {

branches/private/pav/NEW_JAVA_5/sophie2-platform/modules/org.sophie2.main.func.links/src/main/java/org/sophie2/main/func/links/actions/showing/ShowingActionLogic.java

r7002	r7238
29	29	ON_SHOW_FRAME {
30	30
31		~~@Override~~
32	31	public void defineFilter(EventFilterBuilder filter) {
33	32	filter.setEventId(LinkProcessorLogic.LinkEvent.LINK_ACTION_TRIGGERED);
…	…
36	35	}
37	36
38		~~@Override~~
39	37	public boolean handle(EventR3 event) {
40	38
…	…
68	66	ON_HIDE_FRAME {
69	67
70		~~@Override~~
71	68	public void defineFilter(EventFilterBuilder filter) {
72	69	filter.setEventId(LinkProcessorLogic.LinkEvent.LINK_ACTION_TRIGGERED);
…	…
75	72	}
76	73
77		~~@Override~~
78	74	public boolean handle(EventR3 event) {
79	75
…	…
108	104	ON_TOGGLE_FRAME {
109	105
110		~~@Override~~
111	106	public void defineFilter(EventFilterBuilder filter) {
112	107	filter.setEventId(LinkProcessorLogic.LinkEvent.LINK_ACTION_TRIGGERED);
…	…
115	110	}
116	111
117		~~@Override~~
118	112	public boolean handle(EventR3 event) {
119	113

branches/private/pav/NEW_JAVA_5/sophie2-platform/modules/org.sophie2.main.func.links/src/main/java/org/sophie2/main/func/links/actions/showing/ToggleFrameActionProvider.java

r6408	r7238
11	11	public class ToggleFrameActionProvider implements LinkActionProvider {
12	12
13		~~@Override~~
14	13	public LinkAction create() {
15	14	return new ToggleFrameAction(null);
16	15	}
17	16
18		~~@Override~~
19	17	public String getDescription() {
20	18	return "Toggle frame";
21	19	}
22	20
23		~~@Override~~
24	21	public Class<? extends LinkAction> getProvidedClass() {
25	22	return ToggleFrameAction.class;

branches/private/pav/NEW_JAVA_5/sophie2-platform/modules/org.sophie2.main.func.links/src/main/java/org/sophie2/main/func/links/actions/showing/ToggleFrameConfigurationPanel.java

r6163	r7238
26	26	implements ActionConfigurationPanel {
27	27
28		~~@Override~~
29	28	public Class<? extends LinkAction> getActionClass() {
30	29	return ToggleFrameAction.class;
…	…
51	50	}
52	51
53		~~@Override~~
54	52	public Prop<JPanel> swingComponent() {
55	53	class swingComponent extends ResourceProperty<JPanel> {

branches/private/pav/NEW_JAVA_5/sophie2-platform/modules/org.sophie2.main.func.links/src/main/java/org/sophie2/main/func/links/ConfigurationPanelsLogic.java

r6980	r7238
39	39	ON_SET_PAGE {
40	40
41		~~@Override~~
42	41	public void defineFilter(EventFilterBuilder filter) {
43	42	filter.setSourceClass(AvailablePages.class);
…	…
46	45
47	46	@SuppressWarnings("unchecked")
48		~~@Override~~
49	47	public boolean handle(EventR3 event) {
50	48	AvailablePages control = event.getSource(AvailablePages.class);
…	…
87	85	ON_SET_FRAME {
88	86
89		~~@Override~~
90	87	public void defineFilter(EventFilterBuilder filter) {
91	88	filter.setSourceClass(FrameSelector.class);
…	…
95	92
96	93	@SuppressWarnings("unchecked")
97		~~@Override~~
98	94	public boolean handle(EventR3 event) {
99	95	FrameSelector control = event.getSource(FrameSelector.class);

branches/private/pav/NEW_JAVA_5/sophie2-platform/modules/org.sophie2.main.func.links/src/main/java/org/sophie2/main/func/links/LinksHud.java

r6980	r7238
256	256	}
257	257
258		~~@Override~~
259	258	public Prop<JButton> swingComponent() {
260	259	class swingComponent extends ResourceProperty<JButton> {
…	…
297	296	}
298	297
299		~~@Override~~
300	298	public Prop<JButton> swingComponent() {
301	299	class swingComponent extends ResourceProperty<JButton> {
…	…
350	348	}
351	349
352		~~@Override~~
353	350	public Prop<JPanel> swingComponent() {
354	351	class swingComponent extends ResourceProperty<JPanel> {

branches/private/pav/NEW_JAVA_5/sophie2-platform/modules/org.sophie2.main.func.links/src/main/java/org/sophie2/main/func/links/LinksHudLogic.java

r6980	r7238
33	33	ON_SET_CURRENT_RULE {
34	34
35		~~@Override~~
36	35	public void defineFilter(EventFilterBuilder filter) {
37	36	filter.setSourceClass(CurrentRule.class);
…	…
40	39
41	40	@SuppressWarnings("unchecked")
42		~~@Override~~
43	41	public boolean handle(EventR3 event) {
44	42	CurrentRule control = event.getSource(CurrentRule.class);
…	…
64	62	ON_SET_TRIGGER {
65	63
66		~~@Override~~
67	64	public void defineFilter(EventFilterBuilder filter) {
68	65	filter.setSourceClass(AvailableTriggers.class);
…	…
71	68
72	69	@SuppressWarnings("unchecked")
73		~~@Override~~
74	70	public boolean handle(EventR3 event) {
75	71
…	…
120	116	ON_SET_ACTION {
121	117
122		~~@Override~~
123	118	public void defineFilter(EventFilterBuilder filter) {
124	119	filter.setSourceClass(AvailableActions.class);
…	…
127	122
128	123	@SuppressWarnings("unchecked")
129		~~@Override~~
130	124	public boolean handle(EventR3 event) {
131	125	AvailableActions control = event.getSource(AvailableActions.class);
…	…
174	168	ON_REMOVE_RULE {
175	169
176		~~@Override~~
177	170	public void defineFilter(EventFilterBuilder filter) {
178	171	filter.setSourceClass(RemoveRule.class);
…	…
180	173	}
181	174
182		~~@Override~~
183	175	public boolean handle(EventR3 event) {
184	176	RemoveRule control = event.getSource(RemoveRule.class);
…	…
221	213	ON_ADD_RULE {
222	214
223		~~@Override~~
224	215	public void defineFilter(EventFilterBuilder filter) {
225	216	filter.setSourceClass(AddRule.class);
…	…
227	218	}
228	219
229		~~@Override~~
230	220	public boolean handle(EventR3 event) {
231	221	AddRule control = event.getSource(AddRule.class);

branches/private/pav/NEW_JAVA_5/sophie2-platform/modules/org.sophie2.main.func.links/src/test/java/org/sophie2/main/func/links/LinksDemoTest.java

r6408	r7238
123	123	*/
124	124	ON_LINK_ACTION_TRIGGERED {
125		~~@Override~~
126	125	public void defineFilter(EventFilterBuilder filter) {
127	126	filter.setSourceClass(BookView.class);
…	…
130	129	}
131	130
132		~~@Override~~
133	131	public boolean handle(EventR3 event) {
134	132
…	…
152	150	static class DummyActionProvider implements LinkActionProvider{
153	151
154		~~@Override~~
155	152	public LinkAction create() {
156	153	return new DummyAction(null);
157	154	}
158	155
159		~~@Override~~
160	156	public String getDescription() {
161	157	return "dummy action";
162	158	}
163	159
164		~~@Override~~
165	160	public Class<? extends LinkAction> getProvidedClass() {
166	161	return DummyAction.class;

branches/private/pav/NEW_JAVA_5/sophie2-platform/modules/org.sophie2.main.func.media/.classpath

r1901	r7238
5	5	<classpathentry kind="src" output="target/test-classes" path="src/test/java"/>
6	6	<classpathentry excluding="**" kind="src" output="target/test-classes" path="src/test/resources"/>
7		<classpathentry kind="con"
8		path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6" />
9		<classpathentry kind="con"
10		path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER" />
11		<classpathentry kind="output" path="target/classes" />
	7	<classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
	8	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/jdk1.5.0_21"/>
	9	<classpathentry kind="output" path="target/classes"/>
12	10	</classpath>

branches/private/pav/NEW_JAVA_5/sophie2-platform/modules/org.sophie2.main.func.media/.settings/org.eclipse.jdt.core.prefs

r1901	r7238
1		#~~Thu Sep 18 21:11:04 EEST 2008~~
	1	#Mon Oct 05 13:42:48 AFT 2009
2	2	eclipse.preferences.version=1
3	3	org.eclipse.jdt.core.builder.cleanOutputFolder=clean
…	…
18	18	org.eclipse.jdt.core.codeComplete.staticFieldSuffixes=
19	19	org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
20		org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
	20	org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
21	21	org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
22		org.eclipse.jdt.core.compiler.compliance=1.6
	22	org.eclipse.jdt.core.compiler.compliance=1.5
23	23	org.eclipse.jdt.core.compiler.debug.lineNumber=generate
24	24	org.eclipse.jdt.core.compiler.debug.localVariable=generate
…	…
97	97	org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
98	98	org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
99		org.eclipse.jdt.core.compiler.source=1.6
	99	org.eclipse.jdt.core.compiler.source=1.5
100	100	org.eclipse.jdt.core.compiler.taskCaseSensitive=enabled
101	101	org.eclipse.jdt.core.compiler.taskPriorities=NORMAL,HIGH,NORMAL

branches/private/pav/NEW_JAVA_5/sophie2-platform/modules/org.sophie2.main.func.media/src/main/java/org/sophie2/main/func/media/logic/MediaLogic.java

r6993	r7238
3	3	import java.io.File;
4	4	import java.io.IOException;
5
6		~~import javax.swing.filechooser.FileNameExtensionFilter;~~
7	5
8	6	import org.sophie2.base.commons.util.BinData;
…	…
41	39	import org.sophie2.main.dialogs.input.DialogUtils;
42	40	import org.sophie2.main.dialogs.input.FileDialogInput;
	41	import org.sophie2.main.dialogs.input.FileExtensionFilter;
43	42	import org.sophie2.main.func.media.model.contents.MediaFrameH;
44	43	import org.sophie2.main.func.media.model.contents.MediaFrameR4;
…	…
70	69	ON_INSERT_VIDEO {
71	70
72		~~@Override~~
73	71	public void defineFilter(EventFilterBuilder filter) {
74	72	filter.setEventId(MenuItem.EventIds.CLICKED);
…	…
76	74	}
77	75
78		~~@Override~~
79	76	public boolean handle(EventR3 event) {
80	77	InsertVideoItem source = event.getSource(InsertVideoItem.class);
…	…
138	135	protected BinData createVideoSource(PageWorkArea targetArea) {
139	136	FileDialogInput fdi = new FileDialogInput(targetArea.swingComponent().get(),
140		"Insert Video", new File~~Name~~ExtensionFilter("Video (.avi, .mov)", "avi",
	137	"Insert Video", new FileExtensionFilter("Video (.avi, .mov)", "avi",
141	138	"mov"), FileDialogInput.Kind.OPEN);
142	139	File videoFile = DialogManager.get().showDialog(fdi).getSelectedFile();
…	…
160	157	ON_ADD_AUDIO_FRAME {
161	158
162		~~@Override~~
163	159	public void defineFilter(EventFilterBuilder filter) {
164	160	filter.setEventId(MenuItem.EventIds.CLICKED);
…	…
166	162	}
167	163
168		~~@Override~~
169	164	@SuppressWarnings("cast")
170	165	public boolean handle(EventR3 event) {
…	…
195	190
196	191	protected BinData createAudioSource(PageWorkArea targetArea) {
197		FileDialogInput fdi = new FileDialogInput(targetArea.swingComponent().get(), "Insert Audio", new File~~Name~~ExtensionFilter(
	192	FileDialogInput fdi = new FileDialogInput(targetArea.swingComponent().get(), "Insert Audio", new FileExtensionFilter(
198	193	"Audio (*.wav)", "wav"), FileDialogInput.Kind.OPEN);
199	194	File audioFile = DialogManager.get().showDialog(fdi).getSelectedFile();
…	…
219	214	ON_PLAY_PAUSE_MEDIA {
220	215
221		~~@Override~~
222	216	public void defineFilter(EventFilterBuilder filter) {
223	217	filter.setSourceClass(PlayPauseMediaManipulationView.class);
…	…
225	219	}
226	220
227		~~@Override~~
228	221	public boolean handle(EventR3 event) {
229	222	PlayPauseMediaManipulationView mediaManView = event
…	…
260	253	ON_STOP_MEDIA {
261	254
262		~~@Override~~
263	255	public void defineFilter(EventFilterBuilder filter) {
264	256	filter.setSourceClass(StopMediaManipulationView.class);
…	…
267	259	}
268	260
269		~~@Override~~
270	261	public boolean handle(EventR3 event) {
271	262	StopMediaManipulationView mediaManView = event
…	…
296	287	@SortKey("hhh-insert-audio-record")
297	288	ON_INSERT_AUDIO_RECORD {
298		~~@Override~~
299	289	public void defineFilter(EventFilterBuilder filter) {
300	290	filter.setEventId(MenuItem.EventIds.CLICKED);
…	…
303	293
304	294	@SuppressWarnings("cast")
305		~~@Override~~
306	295	public boolean handle(EventR3 event) {
307	296	InsertAudioRecordItem source = event.getSource(InsertAudioRecordItem.class);

branches/private/pav/NEW_JAVA_5/sophie2-platform/modules/org.sophie2.main.func.media/src/main/java/org/sophie2/main/func/media/logic/MediaManipulationLogic.java

r5365	r7238
27	27	ON_MOUSE_PRESSED {
28	28
29		~~@Override~~
30	29	public void defineFilter(EventFilterBuilder filter) {
31	30	filter.setSourceClass(ContentManipulationView.class);
…	…
34	33	}
35	34
36		~~@Override~~
37	35	public boolean handle(EventR3 event) {
38	36	ContentManipulationView view = event.getSource(ContentManipulationView.class);
…	…
53	51	ON_MOUSE_RELEASED {
54	52
55		~~@Override~~
56	53	public void defineFilter(EventFilterBuilder filter) {
57	54	filter.setSourceClass(ContentManipulationView.class);
…	…
60	57	}
61	58
62		~~@Override~~
63	59	public boolean handle(EventR3 event) {
64	60

branches/private/pav/NEW_JAVA_5/sophie2-platform/modules/org.sophie2.main.func.resources/.classpath

r1402	r7238
5	5	<classpathentry kind="src" output="target/test-classes" path="src/test/java"/>
6	6	<classpathentry excluding="**" kind="src" output="target/test-classes" path="src/test/resources"/>
7		<classpathentry kind="con"
8		path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6" />
9		<classpathentry kind="con"
10		path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER" />
11		<classpathentry kind="output" path="target/classes" />
	7	<classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
	8	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/jdk1.5.0_21"/>
	9	<classpathentry kind="output" path="target/classes"/>
12	10	</classpath>

branches/private/pav/NEW_JAVA_5/sophie2-platform/modules/org.sophie2.main.func.resources/.settings/org.eclipse.jdt.core.prefs

r1162	r7238
1		#~~Thu Sep 18 21:11:04 EEST 2008~~
	1	#Mon Oct 05 13:42:54 AFT 2009
2	2	eclipse.preferences.version=1
3	3	org.eclipse.jdt.core.builder.cleanOutputFolder=clean
…	…
18	18	org.eclipse.jdt.core.codeComplete.staticFieldSuffixes=
19	19	org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
20		org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
	20	org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
21	21	org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
22		org.eclipse.jdt.core.compiler.compliance=1.6
	22	org.eclipse.jdt.core.compiler.compliance=1.5
23	23	org.eclipse.jdt.core.compiler.debug.lineNumber=generate
24	24	org.eclipse.jdt.core.compiler.debug.localVariable=generate
…	…
97	97	org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
98	98	org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
99		org.eclipse.jdt.core.compiler.source=1.6
	99	org.eclipse.jdt.core.compiler.source=1.5
100	100	org.eclipse.jdt.core.compiler.taskCaseSensitive=enabled
101	101	org.eclipse.jdt.core.compiler.taskPriorities=NORMAL,HIGH,NORMAL

branches/private/pav/NEW_JAVA_5/sophie2-platform/modules/org.sophie2.main.func.resources/src/main/java/org/sophie2/main/func/resources/view/AllResourcesPalette.java

r6690	r7238
77	77	protected ProListFilter<ResourceH> currentFilter = new ProListFilter<ResourceH>() {
78	78
79		~~@Override~~
80	79	public boolean accepts(ResourceH item) {
81	80	if (currentFilters().get().isEmpty()) {
…	…
174	173	.transform(new ProListTransformer<SophieExtension<ResourcePreviewProvider>, JToggleButton>() {
175	174
176		~~@Override~~
177	175	public JToggleButton translate(
178	176	SophieExtension<ResourcePreviewProvider> source) {
…	…
218	216	addItemListener(new ItemListener() {
219	217
220		~~@Override~~
221	218	public void itemStateChanged(ItemEvent e) {
222	219	if (e.getStateChange() == ItemEvent.SELECTED) {
…	…
273	270	}
274	271	}.transform(new ProListTransformer<ResourceH, ResourceItem>() {
275		~~@Override~~
276	272	public ResourceItem translate(ResourceH resource) {
277	273	return new ResourceItem(resource);
…	…
312	308	ON_DND_EXPORT {
313	309
314		~~@Override~~
315	310	public void defineFilter(EventFilterBuilder filter) {
316	311	filter.setEventId(SophieDragDropHandler.TransferEventIds.DND_EXPORT);
…	…
318	313	}
319	314
320		~~@Override~~
321	315	public boolean handle(EventR3 event) {
322	316
…	…
344	338	ON_COPY {
345	339
346		~~@Override~~
347	340	public void defineFilter(EventFilterBuilder filter) {
348	341	filter.setEventId(SophieDragDropHandler.TransferEventIds.COPY);
…	…
350	343	}
351	344
352		~~@Override~~
353	345	public boolean handle(EventR3 event) {
354	346

branches/private/pav/NEW_JAVA_5/sophie2-platform/modules/org.sophie2.main.func.resources/src/main/java/org/sophie2/main/func/resources/view/ResourceDetailsPalette.java

r6690	r7238
256	256	}
257	257
258		~~@Override~~
259	258	public int getColumnCount() {
260	259	return this.data == null ? 0 : 2;
261	260	}
262	261
263		~~@Override~~
264	262	public int getRowCount() {
265	263	return this.data == null ? 0 : this.data.length;
…	…
267	265	}
268	266
269		~~@Override~~
270	267	public Object getValueAt(int row, int column) {
271	268	if (this.data == null) {
…	…
313	310	this.table.addMouseListener(new MouseListener() {
314	311
315		~~@Override~~
316	312	public void mouseReleased(MouseEvent e) {
317	313	// nothing
318	314	}
319	315
320		~~@Override~~
321	316	public void mousePressed(MouseEvent e) {
322	317	res.repaint();
323	318	}
324	319
325		~~@Override~~
326	320	public void mouseExited(MouseEvent e) {
327	321	// nothing
328	322	}
329	323
330		~~@Override~~
331	324	public void mouseEntered(MouseEvent e) {
332	325	// nothing
333	326	}
334	327
335		~~@Override~~
336	328	public void mouseClicked(MouseEvent e) {
337	329	// nothing

branches/private/pav/NEW_JAVA_5/sophie2-platform/modules/org.sophie2.main.func.resources/src/main/java/org/sophie2/main/func/resources/view/ResourcePaletteLogic.java

r6690	r7238
21	21	ON_DELETE_RESOURCE {
22	22
23		~~@Override~~
24	23	public void defineFilter(EventFilterBuilder filter) {
25	24	filter.setSourceClass(ResourceDetailsPalette.class);
…	…
27	26	}
28	27
29		~~@Override~~
30	28	public boolean handle(EventR3 event) {
31	29
…	…
72	70	ON_COPY_RESOURCE {
73	71
74		~~@Override~~
75	72	public void defineFilter(EventFilterBuilder filter) {
76	73	filter.setSourceClass(ResourceDetailsPalette.class);
…	…
78	75	}
79	76
80		~~@Override~~
81	77	// TODO (R4) Rewrite!!!
82	78	public boolean handle(EventR3 event) {
…	…
171	167	ON_IMPORT_RESOURCE {
172	168
173		~~@Override~~
174	169	public void defineFilter(EventFilterBuilder filter) {
175	170	filter.setSourceClass(ResourceDetailsPalette.class);
…	…
177	172	}
178	173
179		~~@Override~~
180	174	public boolean handle(EventR3 event) {
181	175	// TODO put some logic :)
…	…
191	185	ON_EXPORT_RESOURCE {
192	186
193		~~@Override~~
194	187	public void defineFilter(EventFilterBuilder filter) {
195	188	filter.setSourceClass(ResourceDetailsPalette.class);
…	…
197	190	}
198	191
199		~~@Override~~
200	192	public boolean handle(EventR3 event) {
201	193	// TODO put some logic :)
…	…
211	203	ON_EDIT_RESOURCE_META {
212	204
213		~~@Override~~
214	205	public void defineFilter(EventFilterBuilder filter) {
215	206	filter.setSourceClass(ResourceDetailsPalette.class);
…	…
220	211
221	212	@SuppressWarnings("unchecked")
222		~~@Override~~
223	213	public boolean handle(EventR3 event) {
224	214	ResourceDetailsPalette source = event
…	…
241	231	ON_ADD_FILTER {
242	232
243		~~@Override~~
244	233	public void defineFilter(EventFilterBuilder filter) {
245	234	filter.setSourceClass(AllResourcesPalette.class);
…	…
247	236	}
248	237
249		~~@Override~~
250	238	public boolean handle(EventR3 event) {
251	239	String resourceKind = event.getEventParam(AllResourcesPalette.EventIds.INPUT_PARAM_INDEX, String.class);
…	…
263	251	ON_REMOVE_FILTER {
264	252
265		~~@Override~~
266	253	public void defineFilter(EventFilterBuilder filter) {
267	254	filter.setSourceClass(AllResourcesPalette.class);
…	…
269	256	}
270	257
271		~~@Override~~
272	258	public boolean handle(EventR3 event) {
273	259	String resourceKind = event.getEventParam(AllResourcesPalette.EventIds.INPUT_PARAM_INDEX, String.class);

branches/private/pav/NEW_JAVA_5/sophie2-platform/modules/org.sophie2.main.func.resources/src/main/java/org/sophie2/main/func/resources/view/ResourcePreviewFactory.java

r6508	r7238
63	63	SwingVisualElement {
64	64
65		~~@Override~~
66	65	public Prop<JLabel> swingComponent() {
67	66	class swingComponent extends ResourceProperty<JLabel> {
…	…
86	85	}
87	86
88		~~@Override~~
89	87	public Prop<? extends VisualElement> parent() {
90	88	return getBean().makeParentProp(VisualElement.class);
91	89	}
92	90
93		~~@Override~~
94	91	public Prop<String> title() {
95	92	class title extends AutoProperty<String> {
…	…
103	100	}
104	101
105		~~@Override~~
106	102	public Prop<String> toolTip() {
107	103	class toolTip extends AutoProperty<String> {

branches/private/pav/NEW_JAVA_5/sophie2-platform/modules/org.sophie2.main.func.servers/.classpath

r5049	r7238
5	5	<classpathentry kind="src" output="target/test-classes" path="src/test/java"/>
6	6	<classpathentry excluding="**" kind="src" output="target/test-classes" path="src/test/resources"/>
7		<classpathentry kind="con"
8		path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6" />
9		<classpathentry kind="con"
10		path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER" />
11		<classpathentry kind="output" path="target/classes" />
	7	<classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
	8	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/jdk1.5.0_21"/>
	9	<classpathentry kind="output" path="target/classes"/>
12	10	</classpath>

branches/private/pav/NEW_JAVA_5/sophie2-platform/modules/org.sophie2.main.func.servers/.settings/org.eclipse.jdt.core.prefs

r6880	r7238
1		#~~Thu Sep 18 21:11:04 EEST 2008~~
	1	#Mon Oct 05 13:43:01 AFT 2009
2	2	eclipse.preferences.version=1
3	3	org.eclipse.jdt.core.builder.cleanOutputFolder=clean
…	…
18	18	org.eclipse.jdt.core.codeComplete.staticFieldSuffixes=
19	19	org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
20		org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
	20	org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
21	21	org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
22		org.eclipse.jdt.core.compiler.compliance=1.6
	22	org.eclipse.jdt.core.compiler.compliance=1.5
23	23	org.eclipse.jdt.core.compiler.debug.lineNumber=generate
24	24	org.eclipse.jdt.core.compiler.debug.localVariable=generate
…	…
97	97	org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
98	98	org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
99		org.eclipse.jdt.core.compiler.source=1.6
	99	org.eclipse.jdt.core.compiler.source=1.5
100	100	org.eclipse.jdt.core.compiler.taskCaseSensitive=enabled
101	101	org.eclipse.jdt.core.compiler.taskPriorities=NORMAL,HIGH,NORMAL

branches/private/pav/NEW_JAVA_5/sophie2-platform/modules/org.sophie2.main.func.servers/src/main/java/org/sophie2/main/func/servers/logic/ServersTabLogic.java

r6880	r7238
39	39	ON_TOGGLE_CONNECTION {
40	40
41		~~@Override~~
42	41	public void defineFilter(EventFilterBuilder filter) {
43	42	filter.setSourceClass(ConnectionsPalette.class);
…	…
45	44	}
46	45
47		~~@Override~~
48	46	public boolean handle(EventR3 event) {
49	47	AccountH account = event.getContext(AccountH.class);
…	…
81	79	ON_SELECT_SERVER {
82	80
83		~~@Override~~
84	81	public void defineFilter(EventFilterBuilder filter) {
85	82	filter.setSourceClass(ConnectionsPalette.class);
…	…
87	84	}
88	85
89		~~@Override~~
90	86	public boolean handle(EventR3 event) {
91	87	ConnectionsPalette connectionsPalette =
…	…
107	103	ON_ADD_SERVER {
108	104
109		~~@Override~~
110	105	public void defineFilter(EventFilterBuilder filter) {
111	106	filter.setSourceClass(ConnectionsPalette.class);
…	…
113	108	}
114	109
115		~~@Override~~
116	110	public boolean handle(EventR3 event) {
117	111	SophieLog.warn("ON_ADD_SERVER");
…	…
154	148	ON_REMOVE_SERVER {
155	149
156		~~@Override~~
157	150	public void defineFilter(EventFilterBuilder filter) {
158	151	filter.setSourceClass(ConnectionsPalette.class);
…	…
160	153	}
161	154
162		~~@Override~~
163	155	public boolean handle(EventR3 event) {
164	156	// TODO: show confirmation dialog.
…	…
184	176	ON_OPEN_RESOURCE {
185	177
186		~~@Override~~
187	178	public void defineFilter(EventFilterBuilder filter) {
188	179	filter.setSourceClass(ServerResourcesPalette.class);
…	…
190	181	}
191	182
192		~~@Override~~
193	183	public boolean handle(EventR3 event) {
194	184	// XXX: What if the resource is not a book?
…	…
223	213	ResourceRefList list = new ResourceDirectoryH(resourcesAccess).getResources();
224	214	Mapper<ResourceRefR4, ResourceRefR4> mapper = new Mapper<ResourceRefR4, ResourceRefR4>() {
225		~~@Override~~
226	215	public ResourceRefR4 map(ResourceRefR4 element) {
227	216	return baseRef.sub(element);

branches/private/pav/NEW_JAVA_5/sophie2-platform/modules/org.sophie2.main.func.servers/src/main/java/org/sophie2/main/func/servers/resources/AccountUtil.java

r6880	r7238
92	92	File[] accountFiles = accountsDir.listFiles(new FileFilter() {
93	93
94		~~@Override~~
95	94	public boolean accept(File pathname) {
96	95	SophieLog.tracef("Filtering file %s", pathname);

branches/private/pav/NEW_JAVA_5/sophie2-platform/modules/org.sophie2.main.func.servers/src/main/java/org/sophie2/main/func/servers/resources/ServerResourceLocatorProvider.java

r6880	r7238
49	49	}
50	50
51		~~@Override~~
52	51	public boolean canHandle(ResourceRefR4 target) {
53	52	return findConnection(target) != null;
…	…
70	69	}
71	70
72		~~@Override~~
73	71	public ResourceLocator getLocator(ResourceRefR4 target,
74	72	AccessOptions accessOptions, ResourceLocator parent) {

branches/private/pav/NEW_JAVA_5/sophie2-platform/modules/org.sophie2.main.func.servers/src/main/java/org/sophie2/main/func/servers/view/ConnectionsPalette.java

r6880	r7238
439	439	}
440	440	}.transform(new ProListTransformer<AccountH, ConnectionItem>() {
441		~~@Override~~
442	441	public ConnectionItem translate(AccountH account) {
443	442	ConnectionItem res = new ConnectionItem(account);
…	…
477	476	.transform(new ProListTransformer<AccountH, ServerConnection>() {
478	477	@SuppressWarnings("synthetic-access")
479		~~@Override~~
480	478	public ServerConnection translate(AccountH source) {
481	479	if (!ConnectionsPalette.this.accountsConnections

branches/private/pav/NEW_JAVA_5/sophie2-platform/modules/org.sophie2.main.func.servers/src/main/java/org/sophie2/main/func/servers/view/ServerResourcesPalette.java

r6880	r7238
49	49	private Prop<LogicR3Button> openButton() {
50	50	class openButton extends AutoProperty<LogicR3Button> {
	51	@Override
51	52	@SuppressWarnings("synthetic-access")
52		~~@Override~~
53	53	protected LogicR3Button compute() {
54	54	ResourceRefR4 selected = selectedResource().get();
…	…
96	96	}.transform(new ProListTransformer<ResourceRefR4, ServerResourceItem>() {
97	97
98		~~@Override~~
99	98	public ServerResourceItem translate(ResourceRefR4 source) {
100	99	ServerResourceItem item = new ServerResourceItem(source);

branches/private/pav/NEW_JAVA_5/sophie2-platform/modules/org.sophie2.main.func.servers/src/test/java/org/sophie2/main/func/servers/view/ConnectionsPaletteTest.java

r6562	r7238
99	99	private final Mockery mockContext = new Mockery();
100	100
101		~~@Override~~
102	101	public Mockery getMockery() {
103	102	return this.mockContext;
…	…
106	105	private FacadeR4 facade = this.mockContext.mock(FacadeR4.class);
107	106
108		~~@Override~~
109	107	public boolean supports(String serverUrl) {
110	108	assert serverUrl != null;
…	…
112	110	}
113	111
114		~~@Override~~
115	112	public FacadeR4 getFacade(String serverUrl) {
116	113	return this.facade;
…	…
175	172	will(returnValue(Response
176	173	.<String> createResponse(new ResponseProducer<String>() {
177		~~@Override~~
178	174	public String produce() throws ResponseExcpetion {
179	175	return "123";
…	…
187	183	will(returnValue(Response
188	184	.<ImmList<HistoryEntry>> createResponse(new ResponseProducer<ImmList<HistoryEntry>>() {
189		~~@Override~~
190	185	public ImmList<HistoryEntry> produce()
191	186	throws ResponseExcpetion {
…	…
203	198	will(returnValue(Response
204	199	.<Object> createResponse(new ResponseProducer<Object>() {
205		~~@Override~~
206	200	public Object produce() throws ResponseExcpetion {
207	201	return NaiveImmList
…	…
244	238	will(returnValue(Response
245	239	.<Void> createResponse(new ResponseProducer<Void>() {
246		~~@Override~~
247	240	public Void produce() throws ResponseExcpetion {
248	241	throw new ResponseExcpetion(1, "Timeout");

branches/private/pav/NEW_JAVA_5/sophie2-platform/modules/org.sophie2.main.func.text/.classpath

r2399	r7238
5	5	<classpathentry kind="src" output="target/test-classes" path="src/test/java"/>
6	6	<classpathentry excluding="**" kind="src" output="target/test-classes" path="src/test/resources"/>
7		<classpathentry kind="con"
8		path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6" />
9		<classpathentry kind="con"
10		path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER" />
11		<classpathentry kind="output" path="target/classes" />
	7	<classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
	8	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/jdk1.5.0_21"/>
	9	<classpathentry kind="output" path="target/classes"/>
12	10	</classpath>

branches/private/pav/NEW_JAVA_5/sophie2-platform/modules/org.sophie2.main.func.text/.settings/org.eclipse.jdt.core.prefs

r2399	r7238
1		#~~Thu Sep 18 21:11:04 EEST 2008~~
	1	#Mon Oct 05 13:43:07 AFT 2009
2	2	eclipse.preferences.version=1
3	3	org.eclipse.jdt.core.builder.cleanOutputFolder=clean
…	…
18	18	org.eclipse.jdt.core.codeComplete.staticFieldSuffixes=
19	19	org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
20		org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
	20	org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
21	21	org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
22		org.eclipse.jdt.core.compiler.compliance=1.6
	22	org.eclipse.jdt.core.compiler.compliance=1.5
23	23	org.eclipse.jdt.core.compiler.debug.lineNumber=generate
24	24	org.eclipse.jdt.core.compiler.debug.localVariable=generate
…	…
97	97	org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
98	98	org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
99		org.eclipse.jdt.core.compiler.source=1.6
	99	org.eclipse.jdt.core.compiler.source=1.5
100	100	org.eclipse.jdt.core.compiler.taskCaseSensitive=enabled
101	101	org.eclipse.jdt.core.compiler.taskPriorities=NORMAL,HIGH,NORMAL

branches/private/pav/NEW_JAVA_5/sophie2-platform/modules/org.sophie2.main.func.text/src/main/java/org/sophie2/main/func/text/chaining/TextChainHud.java

r7177	r7238
72	72	List<ResourceRefR4> availableTextFrames = TextChainUtils.getAvailableFramesToChain(selectedView);
73	73	textFrames.addAll(availableTextFrames);
	74
74	75	}
75	76	}
76
77	77	return new ComboState<ResourceRefR4>(null, textFrames,
78	78	null);

branches/private/pav/NEW_JAVA_5/sophie2-platform/modules/org.sophie2.main.func.text/src/main/java/org/sophie2/main/func/text/chaining/TextChainingLogic.java

r6751	r7238
43	43	ON_CHAIN_TEXT_FRAME {
44	44
45		~~@Override~~
46	45	public void defineFilter(EventFilterBuilder filter) {
47	46	filter.setSourceClass(TextChainComboBox.class);
…	…
50	49
51	50	@SuppressWarnings("unchecked")
52		~~@Override~~
53	51	public boolean handle(EventR3 event) {
54	52	TextChainComboBox source = event.getSource(TextChainComboBox.class);
…	…
110	108	ON_UNCHAIN_NEXT_HALO_CLICK {
111	109
112		~~@Override~~
113	110	public void defineFilter(EventFilterBuilder filter) {
114	111	filter.setSourceClass(TextUnchainNextHaloButton.class);
…	…
116	113	}
117	114
118		~~@Override~~
119	115	public boolean handle(EventR3 event) {
120	116	TextUnchainNextHaloButton source = event.getSource(TextUnchainNextHaloButton.class);
…	…
201	197	ON_UNCHAIN_PREV_HALO_CLICK {
202	198
203		~~@Override~~
204	199	public void defineFilter(EventFilterBuilder filter) {
205	200	filter.setSourceClass(TextUnchainPrevHaloButton.class);
…	…
207	202	}
208	203
209		~~@Override~~
210	204	public boolean handle(EventR3 event) {
211	205	TextUnchainPrevHaloButton source = event.getSource(TextUnchainPrevHaloButton.class);
…	…
253	247	ON_CHAINED_FRAME_DELETE {
254	248
255		~~@Override~~
256	249	public void defineFilter(EventFilterBuilder filter) {
257	250	filter.setEventId(HaloButton.EventIds.HALO_CLICK);
…	…
259	252	}
260	253
261		~~@Override~~
262	254	public boolean handle(EventR3 event) {
263	255	FrameRemoveHaloButton source = event.getSource(FrameRemoveHaloButton.class);

branches/private/pav/NEW_JAVA_5/sophie2-platform/modules/org.sophie2.main.func.text/src/main/java/org/sophie2/main/func/text/view/HotTextLogic.java

r7177	r7238
76	76	ON_INSERT_TEXT {
77	77
78		~~@Override~~
79	78	public void defineFilter(EventFilterBuilder filter) {
80	79	filter.setEventId(MenuItem.EventIds.CLICKED);
…	…
82	81	}
83	82
84		~~@Override~~
85	83	public boolean handle(EventR3 event) {
86	84	InsertTextItem insertItem = event.getSource(InsertTextItem.class);
…	…
114	112	long lastSignificantTime = 0;
115	113
116		~~@Override~~
117	114	public void defineFilter(EventFilterBuilder filter) {
118	115	filter.setSourceClass(SceneTextView.class);
…	…
120	117	}
121	118
122		~~@Override~~
123	119	public boolean handle(EventR3 event) {
124	120	SceneTextView view = event.getSource(SceneTextView.class);
…	…
158	154	ON_QUICK_SEARCH {
159	155
160		~~@Override~~
161	156	public void defineFilter(EventFilterBuilder filter) {
162	157	filter.setSourceClass(QuickSearchPanel.class);
…	…
164	159	}
165	160
166		~~@Override~~
167	161	public boolean handle(EventR3 event) {
168	162	QuickSearchPanel source = event.getSource(QuickSearchPanel.class);
…	…
260	254	ON_DROP_TEXT_OVER_PWA {
261	255
262		~~@Override~~
263	256	public void defineFilter(EventFilterBuilder filter) {
264	257	filter.setSourceClass(PageWorkArea.class);
…	…
266	259	}
267	260
268		~~@Override~~
269	261	public boolean handle(EventR3 event) {
270	262
…	…
369	361	ON_DROP_TEXT_OVER_FRAME {
370	362
371		~~@Override~~
372	363	public void defineFilter(EventFilterBuilder filter) {
373	364	filter.setSourceClass(TextView.class);
…	…
375	366	}
376	367
377		~~@Override~~
378	368	public boolean handle(EventR3 event) {
379	369

branches/private/pav/NEW_JAVA_5/sophie2-platform/modules/org.sophie2.main.func.text/src/main/java/org/sophie2/main/func/text/view/HotTextResourceDataProvider.java

r6995	r7238
25	25	public class HotTextResourceDataProvider implements ResourceDataProvider {
26	26
27		~~@Override~~
28	27	public List<DndData> getRegisteredDatas(ResourceTransferable transferable) {
29	28	final ResourceH res = transferable.getResource();
…	…
66	65	}
67	66
68		~~@Override~~
69	67	public String getResourceKind() {
70	68	return HotTextResourceR4.KIND;

branches/private/pav/NEW_JAVA_5/sophie2-platform/modules/org.sophie2.main.func.text/src/main/java/org/sophie2/main/func/text/view/HotTextResourcePreviewProvider.java

r6702	r7238
15	15	public class HotTextResourcePreviewProvider implements ResourcePreviewProvider {
16	16
17		~~@Override~~
18	17	public String getResourceKind() {
19	18	return HotTextResourceR4.KIND;
20	19	}
21	20
22		~~@Override~~
23	21	public SwingVisualElement getVisualElement(ResourceH element) {
24	22	assert element instanceof HotTextResourceH;
…	…
27	25	}
28	26
29		~~@Override~~
30	27	public String filterKind() {
31	28	return "Hot Text";

branches/private/pav/NEW_JAVA_5/sophie2-platform/modules/org.sophie2.main.func.text/src/main/java/org/sophie2/main/func/text/view/SceneTextView.java

r7177	r7238
106	106	}
107	107
108		~~@Override~~
109	108	public Prop<? extends TextViewFlow> textFlow() {
110	109	class textFlow extends AutoProperty<TextViewFlow> {

branches/private/pav/NEW_JAVA_5/sophie2-platform/modules/org.sophie2.main.func.timelines/.classpath

r4308	r7238
3	3	<classpathentry kind="src" output="target/classes" path="src/main/java"/>
4	4	<classpathentry kind="src" output="target/test-classes" path="src/test/java"/>
5		~~<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>~~
6	5	<classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
	6	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/jdk1.5.0_21"/>
7	7	<classpathentry kind="output" path="target/classes"/>
8	8	</classpath>

branches/private/pav/NEW_JAVA_5/sophie2-platform/modules/org.sophie2.main.func.timelines/.settings/org.eclipse.jdt.core.prefs

r6880	r7238
1		#~~Thu Sep 18 21:11:04 EEST 2008~~
	1	#Mon Oct 05 13:43:13 AFT 2009
2	2	eclipse.preferences.version=1
3	3	org.eclipse.jdt.core.builder.cleanOutputFolder=clean
…	…
18	18	org.eclipse.jdt.core.codeComplete.staticFieldSuffixes=
19	19	org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
20		org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
	20	org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
21	21	org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
22		org.eclipse.jdt.core.compiler.compliance=1.6
	22	org.eclipse.jdt.core.compiler.compliance=1.5
23	23	org.eclipse.jdt.core.compiler.debug.lineNumber=generate
24	24	org.eclipse.jdt.core.compiler.debug.localVariable=generate
…	…
97	97	org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
98	98	org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
99		org.eclipse.jdt.core.compiler.source=1.6
	99	org.eclipse.jdt.core.compiler.source=1.5
100	100	org.eclipse.jdt.core.compiler.taskCaseSensitive=enabled
101	101	org.eclipse.jdt.core.compiler.taskPriorities=NORMAL,HIGH,NORMAL

branches/private/pav/NEW_JAVA_5/sophie2-platform/modules/org.sophie2.main.func.timelines/src/main/java/org/sophie2/main/func/timelines/TimelinesPalette.java

r6933	r7238
232	232
233	233	res.addChangeListener(new ChangeListener() {
234		~~@Override~~
235	234	public void stateChanged(ChangeEvent e) {
236	235	JSlider slider = (JSlider) e.getSource();

branches/private/pav/NEW_JAVA_5/sophie2-platform/modules/org.sophie2.main.func.timelines/src/main/java/org/sophie2/main/func/timelines/TimelinesPaletteLogic.java

r6933	r7238
16	16
17	17	ON_SET_INTERVAL {
18		~~@Override~~
19	18	public void defineFilter(EventFilterBuilder filter) {
20	19	filter.setEventId(EventIds.SET_INTERVAL);
…	…
22	21	}
23	22
24		~~@Override~~
25	23	public boolean handle(EventR3 event) {
26	24	TimelinesPalette source = event.getSource(TimelinesPalette.class);
…	…
69	67
70	68	ON_SET_POINT {
71		~~@Override~~
72	69	public void defineFilter(EventFilterBuilder filter) {
73	70	filter.setEventId(EventIds.SET_POINT);
…	…
75	72	}
76	73
77		~~@Override~~
78	74	public boolean handle(EventR3 event) {
79	75	TimelinesPalette source = event.getSource(TimelinesPalette.class);
…	…
108	104
109	105	ON_SET_ALL {
110		~~@Override~~
111	106	public void defineFilter(EventFilterBuilder filter) {
112	107	filter.setEventId(EventIds.SET_ALL);
…	…
114	109	}
115	110
116		~~@Override~~
117	111	public boolean handle(EventR3 event) {
118	112
…	…
149	143	ON_PLAY_HEAD {
150	144
151		~~@Override~~
152	145	public void defineFilter(EventFilterBuilder filter) {
153	146	filter.setEventId(EventIds.PLAY_HEAD);
…	…
155	148	}
156	149
157		~~@Override~~
158	150	public boolean handle(EventR3 event) {
159	151	TimelinesPalette timelinePalette = event.getSource(TimelinesPalette.class);
…	…
191	183	}
192	184
193		~~@Override~~
194	185	public void run() {
195	186	this.palette.list().get().setSelectedIndex(this.selectedIndex);

branches/private/pav/NEW_JAVA_5/sophie2-platform/modules/org.sophie2.main.layout.mydoggy/.classpath

r1225	r7238
5	5	<classpathentry kind="src" output="target/test-classes" path="src/test/java"/>
6	6	<classpathentry excluding="**" kind="src" output="target/test-classes" path="src/test/resources"/>
7		~~<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>~~
8	7	<classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
	8	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/jdk1.5.0_21"/>
9	9	<classpathentry kind="output" path="target/classes"/>
10	10	</classpath>

branches/private/pav/NEW_JAVA_5/sophie2-platform/modules/org.sophie2.main.layout.mydoggy/.settings/org.eclipse.jdt.core.prefs

r1225	r7238
1		#~~Thu Sep 18 21:11:04 EEST 2008~~
	1	#Mon Oct 05 13:43:20 AFT 2009
2	2	eclipse.preferences.version=1
3	3	org.eclipse.jdt.core.builder.cleanOutputFolder=clean
…	…
18	18	org.eclipse.jdt.core.codeComplete.staticFieldSuffixes=
19	19	org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
20		org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
	20	org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
21	21	org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
22		org.eclipse.jdt.core.compiler.compliance=1.6
	22	org.eclipse.jdt.core.compiler.compliance=1.5
23	23	org.eclipse.jdt.core.compiler.debug.lineNumber=generate
24	24	org.eclipse.jdt.core.compiler.debug.localVariable=generate
…	…
97	97	org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
98	98	org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
99		org.eclipse.jdt.core.compiler.source=1.6
	99	org.eclipse.jdt.core.compiler.source=1.5
100	100	org.eclipse.jdt.core.compiler.taskCaseSensitive=enabled
101	101	org.eclipse.jdt.core.compiler.taskPriorities=NORMAL,HIGH,NORMAL

branches/private/pav/NEW_JAVA_5/sophie2-platform/modules/org.sophie2.main.layout.mydoggy/src/main/java/org/sophie2/main/layout/mydoggy/constants/MDColorId.java

r6442	r7238
40	40	}
41	41
42		~~@Override~~
43	42	public String getSkinId() {
44	43	return this.id;

branches/private/pav/NEW_JAVA_5/sophie2-platform/modules/org.sophie2.main.layout.mydoggy/src/main/java/org/sophie2/main/layout/mydoggy/constants/MDTabButtonImageId.java

r6442	r7238
59	59	}
60	60
61		~~@Override~~
62	61	public String getSkinId() {
63	62	return this.id;

branches/private/pav/NEW_JAVA_5/sophie2-platform/modules/org.sophie2.main.layout.mydoggy/src/main/java/org/sophie2/main/layout/mydoggy/constants/MDTitleBarImageId.java

r6442	r7238
29	29	}
30	30
31		~~@Override~~
32	31	public String getSkinId() {
33	32	return this.id;

branches/private/pav/NEW_JAVA_5/sophie2-platform/modules/org.sophie2.main.layout.mydoggy/src/main/java/org/sophie2/main/layout/mydoggy/MDAppletWindow.java

r5767	r7238
112	112	private static final long serialVersionUID = 1L;
113	113
114		~~@Override~~
115	114	public void actionPerformed(ActionEvent e) {
116	115	// fire switch to normal mode

branches/private/pav/NEW_JAVA_5/sophie2-platform/modules/org.sophie2.main.layout.mydoggy/src/main/java/org/sophie2/main/layout/mydoggy/MDCompoundLayoutElement.java

r6442	r7238
70	70
71	71	@Const
72		~~@Override~~
73	72	public Prop<MyDoggyToolWindowManager> toolWindowManager() {
74	73	class toolWindowManager extends AutoProperty<MyDoggyToolWindowManager> {
…	…
89	88
90	89
91		~~@Override~~
92	90	@Const
93	91	public Prop<MDSkinUpdater> skinUpdater() {

branches/private/pav/NEW_JAVA_5/sophie2-platform/modules/org.sophie2.main.layout.mydoggy/src/main/java/org/sophie2/main/layout/mydoggy/mdcustomization/SophieDockedContainer.java

r6444	r7238
49	49
50	50	//TODO find a way to actually set a desired Font... --peko
51		this.setDefaultFont(new Font(~~Font.DIALOG~~, Font.BOLD, 10));
	51	this.setDefaultFont(new Font("Dialog", Font.BOLD, 10));
52	52
53	53	this.propertyChangeSupport = new CleanablePropertyChangeSupport(this);

branches/private/pav/NEW_JAVA_5/sophie2-platform/modules/org.sophie2.main.layout.mydoggy/src/main/java/org/sophie2/main/layout/mydoggy/MDDocumentWindow.java

r6690	r7238
82	82	res.addComponentListener(new ComponentListener() {
83	83
84		~~@Override~~
85	84	public void componentShown(ComponentEvent e) {
86	85	//nothing.
…	…
88	87
89	88	@SuppressWarnings("synthetic-access")
90		~~@Override~~
91	89	public void componentResized(ComponentEvent e) {
92	90	JInternalFrame internalFrame = (JInternalFrame) e.getComponent();
…	…
112	110	}
113	111
114		~~@Override~~
115	112	public void componentMoved(ComponentEvent e) {
116	113	//nothing.
117	114	}
118	115
119		~~@Override~~
120	116	public void componentHidden(ComponentEvent e) {
121	117	// nothing.
…	…
135	131	private InternalFrameListener frameListener = new InternalFrameListener() {
136	132
137		~~@Override~~
138	133	public void internalFrameActivated(InternalFrameEvent e) {
139	134	DocView window = model().get();
…	…
148	143	}
149	144
150		~~@Override~~
151	145	public void internalFrameClosed(InternalFrameEvent e) {
152	146	// do nothing
153	147	}
154	148
155		~~@Override~~
156	149	public void internalFrameClosing(InternalFrameEvent e) {
157	150	DocView window = model().get();
…	…
161	154	}
162	155
163		~~@Override~~
164	156	public void internalFrameDeactivated(InternalFrameEvent e) {
165	157	// do nothing
166	158	}
167	159
168		~~@Override~~
169	160	public void internalFrameDeiconified(InternalFrameEvent e) {
170	161	e.getInternalFrame().setVisible(true);
171	162	}
172	163
173		~~@Override~~
174	164	public void internalFrameIconified(InternalFrameEvent e) {
175	165	DocView window = model().get();
…	…
183	173	}
184	174
185		~~@Override~~
186	175	public void internalFrameOpened(InternalFrameEvent e) {
187	176	// do nothing

branches/private/pav/NEW_JAVA_5/sophie2-platform/modules/org.sophie2.main.layout.mydoggy/src/main/java/org/sophie2/main/layout/mydoggy/MDFlap.java

r6500	r7238
146	146	}
147	147	}.transform(new ProListTransformer<Tab, MDTab>() {
148		~~@Override~~
149	148	public MDTab translate(Tab source) {
150	149

branches/private/pav/NEW_JAVA_5/sophie2-platform/modules/org.sophie2.main.layout.mydoggy/src/main/java/org/sophie2/main/layout/mydoggy/MDFrameWindow.java

r6690	r7238
91	91	gcf.addKeyListener(new KeyListener() {
92	92
93		~~@Override~~
94	93	public void keyTyped(KeyEvent e) {
95	94	// nothing
…	…
97	96	}
98	97
99		~~@Override~~
100	98	public void keyReleased(KeyEvent e) {
101	99	if (e.getKeyCode() == KeyEvent.VK_ESCAPE) {
…	…
111	109	}
112	110
113		~~@Override~~
114	111	public void keyPressed(KeyEvent e) {
115	112	// nothing
…	…
196	193	private static final long serialVersionUID = 1L;
197	194
198		~~@Override~~
199	195	public void actionPerformed(ActionEvent e) {
200	196	// fire switch to normal mode

branches/private/pav/NEW_JAVA_5/sophie2-platform/modules/org.sophie2.main.layout.mydoggy/src/main/java/org/sophie2/main/layout/mydoggy/MDMainWindow.java

r6469	r7238
164	164	}
165	165	.transform(new ProListTransformer<DocView, MDDocumentWindow>() {
166		~~@Override~~
167	166	public MDDocumentWindow translate(DocView source) {
168	167	return new MDDocumentWindow(source);
…	…
251	250	}
252	251
253		~~@Override~~
254	252	public Prop<MyDoggyToolWindowManager> toolWindowManager() {
255	253	class toolWindowManager extends ResourceProperty<MyDoggyToolWindowManager> {
…	…
318	316	globalContainer().get().addComponentListener(
319	317	new ComponentListener() {
320		~~@Override~~
321	318	public void componentShown(ComponentEvent e) {
322	319	// Nothing...
323	320	}
324	321
325		~~@Override~~
326	322	public void componentResized(ComponentEvent e) {
327	323	if (syncMainWindowSwing.this.swingDesktop != null) {
…	…
332	328	}
333	329
334		~~@Override~~
335	330	public void componentMoved(ComponentEvent e) {
336	331	// Nothing...
337	332	}
338	333
339		~~@Override~~
340	334	public void componentHidden(ComponentEvent e) {
341	335	// Nothing...
…	…
641	635	// This property is also used to update the
642	636	// LookAndFeel of Sophie.
643		~~@Override~~
644	637	public Prop<MDSkinUpdater> skinUpdater() {
645	638	class skinUpdater extends ResourceProperty<MDSkinUpdater> {

branches/private/pav/NEW_JAVA_5/sophie2-platform/modules/org.sophie2.main.layout.mydoggy/src/main/java/org/sophie2/main/layout/mydoggy/MDSkinUpdater.java

r6508	r7238
188	188	new ObjectCreator<ComponentUI>() {
189	189
190		~~@Override~~
191	190	public ComponentUI create(Context context) {
192	191	return new SophieTabButtonUI(context

branches/private/pav/NEW_JAVA_5/sophie2-platform/modules/org.sophie2.main.layout.mydoggy/src/main/java/org/sophie2/main/layout/mydoggy/MDTab.java

r6310	r7238
74	74	}
75	75	}.transform(new ProListTransformer<Palette, MDPalette>() {
76		~~@Override~~
77	76	public MDPalette translate(Palette source) {
78	77	return new MDPalette(source);

branches/private/pav/NEW_JAVA_5/sophie2-platform/modules/org.sophie2.main.layout.mydoggy/src/test/java/org/sophie2/main/layout/mydoggy/MyDoggyLayoutDemo.java

r6436	r7238
265	265	SwingUtilities.invokeLater(new Runnable() {
266	266
267		~~@Override~~
268	267	public void run() {
269	268	SwingUtilities.updateComponentTreeUI(window.globalContainer().get());

branches/private/pav/NEW_JAVA_5/sophie2-platform/modules/org.sophie2.main.media.natlib/.classpath

r6025	r7238
5	5	<classpathentry kind="src" output="target/test-classes" path="src/test/java"/>
6	6	<classpathentry excluding="**" kind="src" output="target/test-classes" path="src/test/resources"/>
7		<classpathentry kind="con"
8		path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6" />
9		<classpathentry kind="con"
10		path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER" />
11		<classpathentry kind="output" path="target/classes" />
	7	<classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
	8	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/jdk1.5.0_21"/>
	9	<classpathentry kind="output" path="target/classes"/>
12	10	</classpath>

branches/private/pav/NEW_JAVA_5/sophie2-platform/modules/org.sophie2.main.media.natlib/.settings/org.eclipse.jdt.core.prefs

r6025	r7238
1		#~~Thu Sep 18 21:11:04 EEST 2008~~
	1	#Mon Oct 05 13:43:36 AFT 2009
2	2	eclipse.preferences.version=1
3	3	org.eclipse.jdt.core.builder.cleanOutputFolder=clean
…	…
18	18	org.eclipse.jdt.core.codeComplete.staticFieldSuffixes=
19	19	org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
20		org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
	20	org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
21	21	org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
22		org.eclipse.jdt.core.compiler.compliance=1.6
	22	org.eclipse.jdt.core.compiler.compliance=1.5
23	23	org.eclipse.jdt.core.compiler.debug.lineNumber=generate
24	24	org.eclipse.jdt.core.compiler.debug.localVariable=generate
…	…
97	97	org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
98	98	org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
99		org.eclipse.jdt.core.compiler.source=1.6
	99	org.eclipse.jdt.core.compiler.source=1.5
100	100	org.eclipse.jdt.core.compiler.taskCaseSensitive=enabled
101	101	org.eclipse.jdt.core.compiler.taskPriorities=NORMAL,HIGH,NORMAL

branches/private/pav/NEW_JAVA_5/sophie2-platform/modules/org.sophie2.main.media.natlib/src/main/java/org/sophie2/main/media/natlib/decoder/NativeMediaEngine.java

r6301	r7238
12	12	*/
13	13	public class NativeMediaEngine implements MediaEngine {
14		~~@Override~~
15	14	public MediaHandler open(BinData mediaData) {
16	15	return new NativeMediaHandler(mediaData);

branches/private/pav/NEW_JAVA_5/sophie2-platform/modules/org.sophie2.main.media.natlib/src/main/java/org/sophie2/main/media/natlib/decoder/NativeMediaHandler.java

r6988	r7238
45	45	}
46	46
47		~~@Override~~
48	47	public MediaInfo getInfo() {
49	48	if(this.info == null) {
…	…
58	57	}
59	58
60		~~@Override~~
61	59	public void dispose() {
62	60	if(this.bridge != null) {
…	…
72	70	}
73	71
74		~~@Override~~
75	72	public AudioChunk getAudio(long millis) {
76	73	assert millis >= 0 && millis <= Integer.MAX_VALUE;
…	…
82	79	}
83	80
84		~~@Override~~
85	81	public ImmImage getFrame(long millis) {
86	82	assert millis >= 0 && millis <= Integer.MAX_VALUE;

branches/private/pav/NEW_JAVA_5/sophie2-platform/modules/org.sophie2.main.media.natlib/src/main/java/org/sophie2/main/media/natlib/output/DummyOutputBridge.java

r6933	r7238
16	16	private boolean running = false;
17	17
18		~~@Override~~
19	18	public AudioStatusResponse getStatus() {
20	19	int playMillis = (int)(System.currentTimeMillis() - this.startMillis);
…	…
27	26	}
28	27
29		~~@Override~~
30	28	public void sendAudio(int posMillis, AudioChunk audio) {
31	29	this.writeMillis += AudioChunk.MILLIS_LEN;
32	30	}
33	31
34		~~@Override~~
35	32	public void start() {
36	33	assert !this.running;
…	…
40	37	}
41	38
42		~~@Override~~
43	39	public void stop() {
44	40	assert this.running;

branches/private/pav/NEW_JAVA_5/sophie2-platform/modules/org.sophie2.main.media.natlib/src/main/java/org/sophie2/main/media/natlib/output/NativeAudioOutput.java

r6933	r7238
183	183	}
184	184
185		~~@Override~~
186	185	public void start() {
187	186	assert this.state == State.NEW : "Not new : " + this.state;
…	…
190	189	}
191	190
192		~~@Override~~
193	191	public void stop() {
194	192	this.state = State.STOPPING;
195	193	}
196	194
197		~~@Override~~
198	195	public void registerComposite(final MediaComposite media) {
199	196	doInEdt(new Runnable() {
200	197
201		~~@Override~~
202	198	public void run() {
203	199	assert NativeAudioOutput.this.state == State.RUNNING : NativeAudioOutput.this.state;
…	…
213	209	}
214	210
215		~~@Override~~
216	211	public void unregisterComposite(final MediaComposite media) {
217	212	doInEdt(new Runnable() {
218	213
219		~~@Override~~
220	214	public void run() {
221	215	assert NativeAudioOutput.this.composites.containsKey(media);

branches/private/pav/NEW_JAVA_5/sophie2-platform/modules/org.sophie2.main.media.natlib/src/main/java/org/sophie2/main/media/natlib/output/NativeOutputBridge.java

r6933	r7238
75	75	}
76	76
77		~~@Override~~
78	77	public AudioStatusResponse getStatus() {
79	78	return sendCommand(createGetStatus(), AudioStatusResponse.class);
80	79	}
81	80
82		~~@Override~~
83	81	public void sendAudio(int posMillis, AudioChunk audio) {
84	82	sendCommand(createSendChunk(posMillis, audio), OkResponse.class);

branches/private/pav/NEW_JAVA_5/sophie2-platform/modules/org.sophie2.main.media.natlib/src/test/java/org/sophie2/main/media/natlib/demo/AudioDemo.java

r6886	r7238
145	145	SwingUtilities.invokeAndWait(new Runnable() {
146	146
147		~~@Override~~
148	147	public void run() {
149	148	SophieLog.debug("VideoDemo created");
…	…
165	164	output.registerComposite(new MediaComposite() {
166	165
167		~~@Override~~
168	166	public void setTime(TimePos time) {
169	167	//videoDemo.drawFrame(localTime(time));
…	…
172	170	AudioChunk last = AudioChunk.SILENCE;
173	171
174		~~@Override~~
175	172	public void getAudioChunks(List<AudioChunk> res,
176	173	TimePos time) {

branches/private/pav/NEW_JAVA_5/sophie2-platform/modules/org.sophie2.main.media.natlib/src/test/java/org/sophie2/main/media/natlib/demo/VideoDemo.java

r6886	r7238
91	91	SwingUtilities.invokeAndWait(new Runnable() {
92	92
93		~~@Override~~
94	93	public void run() {
95	94	SophieLog.debug("VideoDemo created");
…	…
117	116	SwingUtilities.invokeAndWait(new Runnable() {
118	117
119		~~@Override~~
120	118	public void run() {
121	119	videoDemo.drawFrame(t);

branches/private/pav/NEW_JAVA_5/sophie2-platform/modules/org.sophie2.main.media.natlib/src/test/java/org/sophie2/main/media/natlib/output/NativeAudioOutputDemo.java

r6886	r7238
40	40
41	41	}
42		~~@Override~~
43	42	public void getAudioChunks(List<AudioChunk> res, TimePos time) {
44	43	if(this.index == 0) {
…	…
56	55
57	56	}
58		~~@Override~~
59	57	public void setTime(TimePos time) {
60	58	if(this.index == 0) {

branches/private/pav/NEW_JAVA_5/sophie2-platform/modules/org.sophie2.main.scene.jogl/.classpath

r6172	r7238
5	5	<classpathentry kind="src" output="target/test-classes" path="src/test/java"/>
6	6	<classpathentry excluding="**" kind="src" output="target/test-classes" path="src/test/resources"/>
7		~~<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>~~
8	7	<classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
	8	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/jdk1.5.0_21"/>
9	9	<classpathentry kind="output" path="target/classes"/>
10	10	</classpath>

branches/private/pav/NEW_JAVA_5/sophie2-platform/modules/org.sophie2.main.scene.jogl/.settings/org.eclipse.jdt.core.prefs

r753	r7238
1		#~~Thu Sep 18 21:11:04 EEST 2008~~
	1	#Mon Oct 05 13:44:11 AFT 2009
2	2	eclipse.preferences.version=1
3	3	org.eclipse.jdt.core.builder.cleanOutputFolder=clean
…	…
18	18	org.eclipse.jdt.core.codeComplete.staticFieldSuffixes=
19	19	org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
20		org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
	20	org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
21	21	org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
22		org.eclipse.jdt.core.compiler.compliance=1.6
	22	org.eclipse.jdt.core.compiler.compliance=1.5
23	23	org.eclipse.jdt.core.compiler.debug.lineNumber=generate
24	24	org.eclipse.jdt.core.compiler.debug.localVariable=generate
…	…
97	97	org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
98	98	org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
99		org.eclipse.jdt.core.compiler.source=1.6
	99	org.eclipse.jdt.core.compiler.source=1.5
100	100	org.eclipse.jdt.core.compiler.taskCaseSensitive=enabled
101	101	org.eclipse.jdt.core.compiler.taskPriorities=NORMAL,HIGH,NORMAL

branches/private/pav/NEW_JAVA_5/sophie2-platform/modules/org.sophie2.main.scene.jogl/src/main/java/org/sophie2/main/scene/jogl/JoglSceneVisual.java

r6429	r7238
90	90	}
91	91
92		~~@Override~~
93	92	public void dispose(GLAutoDrawable drawable) {
94	93	// nothing

branches/private/pav/NEW_JAVA_5/sophie2-platform/modules/org.sophie2.main.scene.simple/.classpath

r1402	r7238
5	5	<classpathentry kind="src" output="target/test-classes" path="src/test/java"/>
6	6	<classpathentry excluding="**" kind="src" output="target/test-classes" path="src/test/resources"/>
7		<classpathentry kind="con"
8		path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6" />
9		<classpathentry kind="con"
10		path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER" />
11		<classpathentry kind="output" path="target/classes" />
	7	<classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
	8	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/jdk1.5.0_21"/>
	9	<classpathentry kind="output" path="target/classes"/>
12	10	</classpath>

branches/private/pav/NEW_JAVA_5/sophie2-platform/modules/org.sophie2.main.scene.simple/.settings/org.eclipse.jdt.core.prefs

r1162	r7238
1		#~~Thu Sep 18 21:11:04 EEST 2008~~
	1	#Mon Oct 05 13:44:17 AFT 2009
2	2	eclipse.preferences.version=1
3	3	org.eclipse.jdt.core.builder.cleanOutputFolder=clean
…	…
18	18	org.eclipse.jdt.core.codeComplete.staticFieldSuffixes=
19	19	org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
20		org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
	20	org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
21	21	org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
22		org.eclipse.jdt.core.compiler.compliance=1.6
	22	org.eclipse.jdt.core.compiler.compliance=1.5
23	23	org.eclipse.jdt.core.compiler.debug.lineNumber=generate
24	24	org.eclipse.jdt.core.compiler.debug.localVariable=generate
…	…
97	97	org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
98	98	org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
99		org.eclipse.jdt.core.compiler.source=1.6
	99	org.eclipse.jdt.core.compiler.source=1.5
100	100	org.eclipse.jdt.core.compiler.taskCaseSensitive=enabled
101	101	org.eclipse.jdt.core.compiler.taskPriorities=NORMAL,HIGH,NORMAL

branches/private/pav/NEW_JAVA_5/sophie2-platform/modules/org.sophie2.main.scene.simple/src/test/java/org/sophie2/main/scene/simple/SimpleSceneDemoTest.java

r6508	r7238
109	109	SELECT() {
110	110
111		~~@Override~~
112	111	public void defineFilter(EventFilterBuilder filter) {
113	112	filter.setEventId(InputEventR3.MOUSE_PRESSED);
…	…
118	117	}
119	118
120		~~@Override~~
121	119	public boolean handle(EventR3 event) {
122	120	SimpleSceneDemoTest source = event.getSource(SimpleSceneDemoTest.class);
…	…
132	130	TO_BE_MOVED {
133	131
134		~~@Override~~
135	132	public void defineFilter(EventFilterBuilder filter) {
136	133	filter.setEventIdClass(InputEventR3.class);
…	…
138	135	}
139	136
140		~~@Override~~
141	137	public boolean handle(EventR3 event) {
142	138	if(event.getEventId(InputEventR3.class) == InputEventR3.MOUSE_PRESSED) {
…	…
331	327	long lastTime = System.currentTimeMillis();
332	328
333		~~@Override~~
334	329	public void run() {
335	330	++this.count;
…	…
371	366	SwingUtilities.invokeLater(new Runnable() {
372	367	@SuppressWarnings("unchecked")
373		~~@Override~~
374	368	public void run() {
375	369	FakeModuleRegistry.start(BaseSkinsModule.class, BaseVisualModule.class, DemoModule.class, CoreMvcModule.class, BaseSceneModule.class);

branches/private/pav/NEW_JAVA_5/sophie2-platform/modules/org.sophie2.main.scene.sprites/.classpath

r5734	r7238
5	5	<classpathentry kind="src" output="target/test-classes" path="src/test/java"/>
6	6	<classpathentry excluding="**" kind="src" output="target/test-classes" path="src/test/resources"/>
7		<classpathentry kind="con"
8		path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6" />
9		<classpathentry kind="con"
10		path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER" />
11		<classpathentry kind="output" path="target/classes" />
	7	<classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
	8	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/jdk1.5.0_21"/>
	9	<classpathentry kind="output" path="target/classes"/>
12	10	</classpath>

branches/private/pav/NEW_JAVA_5/sophie2-platform/modules/org.sophie2.main.scene.sprites/.settings/org.eclipse.jdt.core.prefs

r5734	r7238
1		#~~Thu Sep 18 21:11:04 EEST 2008~~
	1	#Mon Oct 05 13:44:23 AFT 2009
2	2	eclipse.preferences.version=1
3	3	org.eclipse.jdt.core.builder.cleanOutputFolder=clean
…	…
18	18	org.eclipse.jdt.core.codeComplete.staticFieldSuffixes=
19	19	org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
20		org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
	20	org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
21	21	org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
22		org.eclipse.jdt.core.compiler.compliance=1.6
	22	org.eclipse.jdt.core.compiler.compliance=1.5
23	23	org.eclipse.jdt.core.compiler.debug.lineNumber=generate
24	24	org.eclipse.jdt.core.compiler.debug.localVariable=generate
…	…
97	97	org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
98	98	org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
99		org.eclipse.jdt.core.compiler.source=1.6
	99	org.eclipse.jdt.core.compiler.source=1.5
100	100	org.eclipse.jdt.core.compiler.taskCaseSensitive=enabled
101	101	org.eclipse.jdt.core.compiler.taskPriorities=NORMAL,HIGH,NORMAL

branches/private/pav/NEW_JAVA_5/sophie2-platform/modules/org.sophie2.main.skin.alternative/.classpath

r4768	r7238
5	5	<classpathentry kind="src" output="target/test-classes" path="src/test/java"/>
6	6	<classpathentry excluding="**" kind="src" output="target/test-classes" path="src/test/resources"/>
7		~~<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>~~
8	7	<classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
	8	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/jdk1.5.0_21"/>
9	9	<classpathentry kind="output" path="target/classes"/>
10	10	</classpath>

branches/private/pav/NEW_JAVA_5/sophie2-platform/modules/org.sophie2.main.skin.alternative/.settings/org.eclipse.jdt.core.prefs

r2185	r7238
1		#~~Thu Sep 18 21:11:04 EEST 2008~~
	1	#Mon Oct 05 13:44:30 AFT 2009
2	2	eclipse.preferences.version=1
3	3	org.eclipse.jdt.core.builder.cleanOutputFolder=clean
…	…
18	18	org.eclipse.jdt.core.codeComplete.staticFieldSuffixes=
19	19	org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
20		org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
	20	org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
21	21	org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
22		org.eclipse.jdt.core.compiler.compliance=1.6
	22	org.eclipse.jdt.core.compiler.compliance=1.5
23	23	org.eclipse.jdt.core.compiler.debug.lineNumber=generate
24	24	org.eclipse.jdt.core.compiler.debug.localVariable=generate
…	…
97	97	org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
98	98	org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
99		org.eclipse.jdt.core.compiler.source=1.6
	99	org.eclipse.jdt.core.compiler.source=1.5
100	100	org.eclipse.jdt.core.compiler.taskCaseSensitive=enabled
101	101	org.eclipse.jdt.core.compiler.taskPriorities=NORMAL,HIGH,NORMAL

branches/private/pav/NEW_JAVA_5/sophie2-platform/modules/org.sophie2.main.skin.alternative/src/main/java/org/sophie2/main/skin/alternative/lookandfeel/SophieLookAndFeel.java

r6206	r7238
1	1	package org.sophie2.main.skin.alternative.lookandfeel;
2	2
3		import java.io.IOException;
4		import java.net.URL;
	3	import java.io.InputStream;
5	4	import java.text.ParseException;
6
7	5	import javax.swing.plaf.synth.SynthLookAndFeel;
8	6
…	…
22	20	public SophieLookAndFeel() {
23	21	super();
24
25		~~URL url = SophieLookAndFeel.class.getClassLoader().getResource("sophie2_lookandfeel.xml");~~
26
27		assert ~~url~~ != null : "XML file not found ?!";
	22
	23	InputStream xmlInputStream = SophieLookAndFeel.class.getClassLoader()
	24	.getResourceAsStream("sophie2_lookandfeel.xml");
	25	assert xmlInputStream != null : "XML file not found ?!";
28	26
29	27	try {
30		load(~~url~~);
	28	load(xmlInputStream, SophieLookAndFeel.class);
31	29	} catch (ParseException e) {
32		~~throw new RuntimeException(e);~~
33		~~} catch (IOException e) {~~
34	30	throw new RuntimeException(e);
35	31	}

branches/private/pav/NEW_JAVA_5/sophie2-platform/modules/org.sophie2.main.skin.alternative/src/main/java/org/sophie2/main/skin/alternative/lookandfeel/TilePainter.java

r6206	r7238
4	4	import java.awt.Graphics2D;
5	5	import java.awt.Image;
	6	import java.awt.Insets;
6	7	import java.awt.Rectangle;
7	8	import java.awt.TexturePaint;
8	9	import java.awt.image.BufferedImage;
	10	import java.lang.ref.WeakReference;
9	11
10	12	import javax.swing.ImageIcon;
	13	import javax.swing.UIDefaults;
	14	import javax.swing.UIManager;
11	15	import javax.swing.plaf.synth.SynthContext;
12	16	import javax.swing.plaf.synth.SynthPainter;
13	17
14	18	import org.sophie2.base.commons.util.ImmImage;
	19	import org.sophie2.core.logging.SophieLog;
	20
	21	import sun.awt.AppContext;
15	22
16	23	/**
17	24	* A {@link SynthPainter} that produces tiled background for different
18		* JComponents. The icon that is tiled should be passed as a parameter named
	25	* JComponents. The icon that is tiled should be passed as a parameter named
19	26	* tileImage using the property tag in the XML file, for example:
20	27	*
…	…
27	34	*/
28	35	public class TilePainter extends SynthPainter {
	36	private Paint9Painter imageCache = getPaint9Painter();
	37	private static final StringBuffer CACHE_KEY = new StringBuffer("SynthCacheKey");
29	38
	39	public enum TileBackgroundId {
	40	BACKGROUND("BACKGROUND"),
	41	HORIZONTAL_BACKGROUND("HORIZONTAL_BACKGROUND"),
	42	VERTICAL_BACKGROUND("VERTICAL_BACKGROUND");
	43
	44	private String id;
	45
	46	private TileBackgroundId(String id) {
	47	this.id = id;
	48	}
	49
	50	public String getId() {
	51	return this.id;
	52	}
	53	}
	54
	55	@SuppressWarnings("unchecked")
	56	private static Paint9Painter getPaint9Painter() {
	57	// A SynthPainter is created per <imagePainter>. We want the
	58	// cache to be shared by all, and we don't use a static because we
	59	// don't want it to persist between look and feels. For that reason
	60	// we use a AppContext specific Paint9Painter. It's backed via
	61	// a WeakRef so that it can go away if the look and feel changes.
	62	synchronized (CACHE_KEY) {
	63	WeakReference<Paint9Painter> cacheRef = (WeakReference<Paint9Painter>) AppContext
	64	.getAppContext().get(CACHE_KEY);
	65	Paint9Painter painter;
	66	if (cacheRef == null \|\| (painter = cacheRef.get()) == null) {
	67	painter = new Paint9Painter(30);
	68	cacheRef = new WeakReference(painter);
	69	AppContext.getAppContext().put(CACHE_KEY, cacheRef);
	70	}
	71	return painter;
	72	}
	73	}
	74	private void paint(SynthContext context, Graphics g, int x, int y, int w, int h, Insets sInsets,
	75	Insets dInsets, boolean center, boolean paintCenter, boolean tiles, Image image) {
	76	Insets destInsets = null;
	77
	78	if (dInsets == null) {
	79	destInsets = sInsets;
	80	} else {
	81	destInsets = dInsets;
	82	}
	83	if (Paint9Painter.validImage(image)) {
	84	Paint9Painter.PaintType type;
	85
	86	if (center) {
	87	type = Paint9Painter.PaintType.CENTER;
	88	}
	89	else {
	90	if (tiles) {
	91	type = Paint9Painter.PaintType.PAINT9_STRETCH;
	92	}
	93	else {
	94	type = Paint9Painter.PaintType.PAINT9_TILE;
	95	}
	96	}
	97	int mask = Paint9Painter.PAINT_ALL;
	98
	99	if (!center && !paintCenter) {
	100	mask \|= Paint9Painter.PAINT_CENTER;
	101	}
	102	this.imageCache.paint(context.getComponent(), g, x, y, w, h, image, sInsets, destInsets,
	103	type, mask);
	104	} else {
	105	SophieLog.errorf("Invalid image given for painting the look and feel!", image);
	106	}
	107	}
30	108	@Override
31	109	public void paintPanelBackground(SynthContext context, Graphics g, int x,
…	…
38	116	public void paintScrollBarTrackBackground(SynthContext context, Graphics g,
39	117	int x, int y, int w, int h) {
	118
	119	UIDefaults uiDefaults = UIManager.getDefaults();
	120	TileBackgroundId id;
	121	Insets sourceInsets = null;
	122	if (w > h) {
	123	id = TileBackgroundId.HORIZONTAL_BACKGROUND;
	124	sourceInsets = uiDefaults.getInsets("ScrollBar.Background.Horizontal.Insets");
	125	} else {
	126	id = TileBackgroundId.VERTICAL_BACKGROUND;
	127	sourceInsets = uiDefaults.getInsets("ScrollBar.Background.Vertical.Insets");
40	128
41		paintTileBackground(context, g, x, y, w, h);
	129	}
	130	// TileBackgroundId id = (w > h) ? TileBackgroundId.HORIZONTAL_BACKGROUND
	131	// : TileBackgroundId.VERTICAL_BACKGROUND;
	132
	133	final ImageIcon bgIcon = (ImageIcon) context.getStyle().getIcon(context, id.getId());
	134
	135	// copy the icon to BufferedImage
	136	Image i = bgIcon.getImage();
	137	paint(context, g, x, y, w, h, sourceInsets, null, false, true, true, i);
42	138	}
43
	139
44	140	private void paintTileBackground(SynthContext context, Graphics g, int x,
45	141	int y, int w, int h) {
…	…
47	143	final ImageIcon bgIcon = (ImageIcon) context.getStyle().getIcon(
48	144	context, "tileImage");
49
	145
50	146	// copy the icon to BufferedImage
51	147	Image image = bgIcon.getImage();

branches/private/pav/NEW_JAVA_5/sophie2-platform/modules/org.sophie2.main.skin.alternative/src/main/java/org/sophie2/main/skin/alternative/SkinsMenuLogic.java

r6473	r7238
26	26	ON_SET_DEFAULT_SKIN {
27	27
28		~~@Override~~
29	28	public void defineFilter(EventFilterBuilder filter) {
30	29	filter.setSourceClass(DefaultSkinItem.class);
…	…
32	31	}
33	32
34		~~@Override~~
35	33	public boolean handle(EventR3 event) {
36	34	SkinManager.get().currentSkin().set(new Skin(SkinsNames.DEFAULT_NAME, new Skin(SkinsNames.DEVELOPERS_NAME, null)));
…	…
47	45	ON_SET_DEVELOPERS_SKIN {
48	46
49		~~@Override~~
50	47	public void defineFilter(EventFilterBuilder filter) {
51	48	filter.setSourceClass(DevelopersSkinItem.class);
…	…
53	50	}
54	51
55		~~@Override~~
56	52	public boolean handle(EventR3 event) {
57	53	SkinManager.get().currentSkin().set(

branches/private/pav/NEW_JAVA_5/sophie2-platform/modules/org.sophie2.main.skin.alternative/src/main/resources/sophie2_lookandfeel.xml

r7002	r7238
16	16	<color value="WHITE" type="TEXT_FOREGROUND" />
17	17	</state>
18		<object class="org.sophie2.main.skin.alternative.lookandfeel.TilePainter"
19		id="TilePainter"></object>
	18	<object class="org.sophie2.main.skin.alternative.lookandfeel.TilePainter"
	19	id="TilePainter"></object>
20	20	</style>
21	21	<bind style="default" type="region" key=".*" />
…	…
27	27	<property key="ArrowButton.size" type="integer" value="14" />
28	28	<state>
29		~~<imagePainter method="arrowButtonForeground" path="distrib/resources/VScrollBar/up_arrow.png"~~
30		~~center="true" direction="north"/>~~
31	29	<imagePainter method="arrowButtonForeground"
32		path="distrib/resources/VScrollBar/down_arrow.png" center="true" direction="south" />
33		<imagePainter method="arrowButtonForeground" path="distrib/resources/HScrollBar/up_arrow.png"
34		center="true" direction="west" />
	30	path="/resources/VScrollBar/up_arrow.png" center="true" direction="north"
	31	sourceInsets="0 0 0 0" />
35	32	<imagePainter method="arrowButtonForeground"
36		path="distrib/resources/HScrollBar/down_arrow.png" center="true" direction="east" />
37		</state>
38
39		<state value="PRESSED">
	33	path="/resources/VScrollBar/down_arrow.png" center="true" direction="south"
	34	sourceInsets="0 0 0 0" />
40	35	<imagePainter method="arrowButtonForeground"
41		path="~~distrib/resources/VScrollBar/up_arrow_pressed.png" center="true~~"
42		~~direction="north~~" />
	36	path="/resources/HScrollBar/up_arrow.png" center="true" direction="west"
	37	sourceInsets="0 0 0 0" />
43	38	<imagePainter method="arrowButtonForeground"
44		path="distrib/resources/VScrollBar/down_arrow_pressed.png" center="true"
45		direction="south" />
	39	path="/resources/HScrollBar/down_arrow.png" center="true" direction="east"
	40	sourceInsets="0 0 0 0" />
	41	</state>
	42
	43	<state value="PRESSED">
46	44	<imagePainter method="arrowButtonForeground"
47		path="~~distrib/resources/H~~ScrollBar/up_arrow_pressed.png" center="true"
48		direction="~~west~~" />
	45	path="/resources/VScrollBar/up_arrow_pressed.png" center="true"
	46	direction="north" sourceInsets="0 0 0 0" />
49	47	<imagePainter method="arrowButtonForeground"
50		path="distrib/resources/HScrollBar/down_arrow_pressed.png" center="true"
51		direction="east" />
52		</state>
53
54		<state value="MOUSE_OVER">
	48	path="/resources/VScrollBar/down_arrow_pressed.png" center="true"
	49	direction="south" sourceInsets="0 0 0 0" />
55	50	<imagePainter method="arrowButtonForeground"
56		path="~~distrib/resources/VScrollBar/up_arrow_over~~.png" center="true"
57		direction="~~north~~" />
	51	path="/resources/HScrollBar/up_arrow_pressed.png" center="true"
	52	direction="west" sourceInsets="0 0 0 0" />
58	53	<imagePainter method="arrowButtonForeground"
59		path="distrib/resources/VScrollBar/down_arrow_over.png" center="true"
60		direction="south" />
	54	path="/resources/HScrollBar/down_arrow_pressed.png" center="true"
	55	direction="east" sourceInsets="0 0 0 0" />
	56	</state>
	57
	58	<state value="MOUSE_OVER">
61	59	<imagePainter method="arrowButtonForeground"
62		path="~~distrib/resources/H~~ScrollBar/up_arrow_over.png" center="true"
63		direction="~~west~~" />
	60	path="/resources/VScrollBar/up_arrow_over.png" center="true"
	61	direction="north" sourceInsets="0 0 0 0" />
64	62	<imagePainter method="arrowButtonForeground"
65		path="distrib/resources/HScrollBar/down_arrow_over.png" center="true"
66		direction="east" />
67
68		</state>
69
70		<state value="DISABLED">
	63	path="/resources/VScrollBar/down_arrow_over.png" center="true"
	64	direction="south" sourceInsets="0 0 0 0" />
71	65	<imagePainter method="arrowButtonForeground"
72		path="~~distrib/resources/VScrollBar/up_arrow_disabled~~.png" center="true"
73		direction="~~north~~" />
	66	path="/resources/HScrollBar/up_arrow_over.png" center="true"
	67	direction="west" sourceInsets="0 0 0 0" />
74	68	<imagePainter method="arrowButtonForeground"
75		path="distrib/resources/VScrollBar/down_arrow_disabled.png" center="true"
76		direction="south" />
	69	path="/resources/HScrollBar/down_arrow_over.png" center="true"
	70	direction="east" sourceInsets="0 0 0 0" />
	71
	72	</state>
	73
	74	<state value="DISABLED">
77	75	<imagePainter method="arrowButtonForeground"
78		path="~~distrib/resources/H~~ScrollBar/up_arrow_disabled.png" center="true"
79		direction="~~west~~" />
	76	path="/resources/VScrollBar/up_arrow_disabled.png" center="true"
	77	direction="north" sourceInsets="0 0 0 0" />
80	78	<imagePainter method="arrowButtonForeground"
81		path="distrib/resources/HScrollBar/down_arrow_disabled.png" center="true"
82		direction="east" />
	79	path="/resources/VScrollBar/down_arrow_disabled.png" center="true"
	80	direction="south" sourceInsets="0 0 0 0" />
	81	<imagePainter method="arrowButtonForeground"
	82	path="/resources/HScrollBar/up_arrow_disabled.png" center="true"
	83	direction="west" sourceInsets="0 0 0 0" />
	84	<imagePainter method="arrowButtonForeground"
	85	path="/resources/HScrollBar/down_arrow_disabled.png" center="true"
	86	direction="east" sourceInsets="0 0 0 0" />
83	87	</state>
84	88	</style>
…	…
96	100	</state>
97	101	<state value="ENABLED">
98		<imagePainter method="buttonBackground" path="~~distrib~~/resources/Button/btn_enabled.png"
	102	<imagePainter method="buttonBackground" path="/resources/Button/btn_enabled.png"
99	103	sourceInsets="11 28 11 28" />
100	104	</state>
101	105	<state value="DISABLED">
102		<imagePainter method="buttonBackground" path="distrib/resources/Button/btn_disabled.png"
	106	<imagePainter method="buttonBackground"
	107	path="/resources/Button/btn_disabled.png" sourceInsets="11 28 11 28" />
	108	</state>
	109	<state value="PRESSED">
	110	<imagePainter method="buttonBackground" path="/resources/Button/btn_roll.png"
103	111	sourceInsets="11 28 11 28" />
104	112	</state>
105		<state value="PRESSED">
106		<imagePainter method="buttonBackground" path="distrib/resources/Button/btn_roll.png"
107		sourceInsets="11 28 11 28" />
108		</state>
109		<state value="MOUSE_OVER">
110		<imagePainter method="buttonBackground" path="distrib/resources/Button/btn_roll.png"
	113	<state value="MOUSE_OVER">
	114	<imagePainter method="buttonBackground" path="/resources/Button/btn_roll.png"
111	115	sourceInsets="11 28 11 28" />
112	116	</state>
…	…
125	129	<font name="Arial" size="11" style="PLAIN" />
126	130	<imagePainter method="buttonBackground"
127		path="~~distrib~~/resources/HaloButtons/empty_background.png" sourceInsets="0 0 0 0" />
128		</state>
129		<state value="ENABLED">
130		<imagePainter method="buttonBackground"
131		path="~~distrib~~/resources/HaloButtons/empty_background.png" sourceInsets="0 0 0 0" />
132		</state>
133		<state value="DISABLED">
134		<imagePainter method="buttonBackground"
135		path="~~distrib~~/resources/HaloButtons/empty_background.png" sourceInsets="0 0 0 0" />
136		</state>
137		<state value="PRESSED">
138		<imagePainter method="buttonBackground"
139		path="~~distrib~~/resources/HaloButtons/empty_background.png" sourceInsets="0 0 0 0" />
140		</state>
141		<state value="MOUSE_OVER">
142		<imagePainter method="buttonBackground"
143		path="~~distrib~~/resources/HaloButtons/empty_background.png" sourceInsets="0 0 0 0" />
	131	path="/resources/HaloButtons/empty_background.png" sourceInsets="0 0 0 0" />
	132	</state>
	133	<state value="ENABLED">
	134	<imagePainter method="buttonBackground"
	135	path="/resources/HaloButtons/empty_background.png" sourceInsets="0 0 0 0" />
	136	</state>
	137	<state value="DISABLED">
	138	<imagePainter method="buttonBackground"
	139	path="/resources/HaloButtons/empty_background.png" sourceInsets="0 0 0 0" />
	140	</state>
	141	<state value="PRESSED">
	142	<imagePainter method="buttonBackground"
	143	path="/resources/HaloButtons/empty_background.png" sourceInsets="0 0 0 0" />
	144	</state>
	145	<state value="MOUSE_OVER">
	146	<imagePainter method="buttonBackground"
	147	path="/resources/HaloButtons/empty_background.png" sourceInsets="0 0 0 0" />
144	148	</state>
145	149	</style>
…	…
157	161	<font name="Arial" size="11" style="PLAIN" />
158	162	<imagePainter method="buttonBackground"
159		path="~~distrib~~/resources/HaloButtons/empty_background.png" sourceInsets="0 0 0 0" />
160		</state>
161		<state value="ENABLED">
162		<imagePainter method="buttonBackground"
163		path="~~distrib~~/resources/HaloButtons/empty_background.png" sourceInsets="0 0 0 0" />
164		</state>
165		<state value="DISABLED">
166		<imagePainter method="buttonBackground"
167		path="~~distrib~~/resources/HaloButtons/empty_background.png" sourceInsets="0 0 0 0" />
168		</state>
169		<state value="PRESSED">
170		<imagePainter method="buttonBackground"
171		path="~~distrib~~/resources/HaloButtons/empty_background.png" sourceInsets="0 0 0 0" />
172		</state>
173		<state value="MOUSE_OVER">
174		<imagePainter method="buttonBackground"
175		path="~~distrib~~/resources/HaloButtons/empty_background.png" sourceInsets="0 0 0 0" />
	163	path="/resources/HaloButtons/empty_background.png" sourceInsets="0 0 0 0" />
	164	</state>
	165	<state value="ENABLED">
	166	<imagePainter method="buttonBackground"
	167	path="/resources/HaloButtons/empty_background.png" sourceInsets="0 0 0 0" />
	168	</state>
	169	<state value="DISABLED">
	170	<imagePainter method="buttonBackground"
	171	path="/resources/HaloButtons/empty_background.png" sourceInsets="0 0 0 0" />
	172	</state>
	173	<state value="PRESSED">
	174	<imagePainter method="buttonBackground"
	175	path="/resources/HaloButtons/empty_background.png" sourceInsets="0 0 0 0" />
	176	</state>
	177	<state value="MOUSE_OVER">
	178	<imagePainter method="buttonBackground"
	179	path="/resources/HaloButtons/empty_background.png" sourceInsets="0 0 0 0" />
176	180	</state>
177	181	</style>
…	…
188	192	<font name="Arial" size="11" style="PLAIN" />
189	193	<imagePainter method="buttonBackground"
190		path="~~distrib~~/resources/HaloButtons/empty_background.png" sourceInsets="0 0 0 0" />
	194	path="/resources/HaloButtons/empty_background.png" sourceInsets="0 0 0 0" />
191	195	</state>
192	196	<state value="ENABLED">
193	197	<imageIcon id="nextSearchIconEnabled"
194		path="~~distrib~~/resources/DocumentSetingsPanel/next_search.png" sourceInsets="0 0 0 0" />
	198	path="/resources/DocumentSetingsPanel/next_search.png" sourceInsets="0 0 0 0" />
195	199	</state>
196	200	<state value="DISABLED">
197	201	<imageIcon id="nextSearchIconDisabled"
198		path="distrib/resources/DocumentSetingsPanel/next_search_disabled.png" sourceInsets="0 0 0 0" />
	202	path="/resources/DocumentSetingsPanel/next_search_disabled.png"
	203	sourceInsets="0 0 0 0" />
199	204	</state>
200	205	<state value="PRESSED">
201	206	<imageIcon id="nextSearchIconPressed"
202		path="distrib/resources/DocumentSetingsPanel/next_search_pressed.png" sourceInsets="0 0 0 0" />
	207	path="/resources/DocumentSetingsPanel/next_search_pressed.png"
	208	sourceInsets="0 0 0 0" />
203	209	</state>
204	210	<state value="MOUSE_OVER">
205	211	<imageIcon id="nextSearchIconOver"
206		path="distrib/resources/DocumentSetingsPanel/next_search_over.png" sourceInsets="0 0 0 0" />
	212	path="/resources/DocumentSetingsPanel/next_search_over.png"
	213	sourceInsets="0 0 0 0" />
207	214	</state>
208	215	</style>
…	…
219	226	<font name="Arial" size="11" style="PLAIN" />
220	227	<imagePainter method="buttonBackground"
221		path="~~distrib~~/resources/HaloButtons/empty_background.png" sourceInsets="0 0 0 0" />
	228	path="/resources/HaloButtons/empty_background.png" sourceInsets="0 0 0 0" />
222	229	</state>
223	230	<state value="ENABLED">
224	231	<imageIcon id="previousSearchIconEnabled"
225		path="distrib/resources/DocumentSetingsPanel/previous_search.png" />
	232	path="/resources/DocumentSetingsPanel/previous_search.png"
	233	sourceInsets="0 0 0 0" />
226	234	<property key="Button.icon" value="previousSearchIconEnabled" />
227	235	<imagePainter method="buttonBackground"
228		path="~~distrib~~/resources/HaloButtons/empty_background.png" sourceInsets="0 0 0 0" />
	236	path="/resources/HaloButtons/empty_background.png" sourceInsets="0 0 0 0" />
229	237	</state>
230	238	<state value="DISABLED">
231	239	<imageIcon id="previousSearchIconDisabled"
232		path="distrib/resources/DocumentSetingsPanel/previous_search_disabled.png" />
	240	path="/resources/DocumentSetingsPanel/previous_search_disabled.png"
	241	sourceInsets="0 0 0 0" />
233	242	<property key="Button.icon" value="previousSearchIconDisabled" />
234	243	<imagePainter method="buttonBackground"
235		path="~~distrib~~/resources/HaloButtons/empty_background.png" sourceInsets="0 0 0 0" />
	244	path="/resources/HaloButtons/empty_background.png" sourceInsets="0 0 0 0" />
236	245	</state>
237	246	<state value="PRESSED">
238	247	<imageIcon id="previousSearchIconPressed"
239		path="distrib/resources/DocumentSetingsPanel/previous_search_pressed.png" />
	248	path="/resources/DocumentSetingsPanel/previous_search_pressed.png"
	249	sourceInsets="0 0 0 0" />
240	250	<property key="Button.icon" value="previousSearchIconPressed" />
241	251	<imagePainter method="buttonBackground"
242		path="~~distrib~~/resources/HaloButtons/empty_background.png" sourceInsets="0 0 0 0" />
	252	path="/resources/HaloButtons/empty_background.png" sourceInsets="0 0 0 0" />
243	253	</state>
244	254	<state value="MOUSE_OVER">
245	255	<imageIcon id="previousSearchIconOver"
246		path="distrib/resources/DocumentSetingsPanel/previous_search_over.png" />
	256	path="/resources/DocumentSetingsPanel/previous_search_over.png"
	257	sourceInsets="0 0 0 0" />
247	258	<property key="Button.icon" value="previousSearchIconOver" />
248	259	<imagePainter method="buttonBackground"
249		path="~~distrib~~/resources/HaloButtons/empty_background.png" sourceInsets="0 0 0 0" />
	260	path="/resources/HaloButtons/empty_background.png" sourceInsets="0 0 0 0" />
250	261	</state>
251	262	</style>
…	…
264	275	<state value="DEFAULT"></state>
265	276	<state>
266		<imagePainter method="toggleButtonBackground" path="~~distrib~~/resources/TabBar/tab_button.png"
	277	<imagePainter method="toggleButtonBackground" path="/resources/TabBar/tab_button.png"
267	278	sourceInsets="15 7 19 7" />
268	279	</state>
269	280	<state value="DISABLED">
270	281	<imagePainter method="toggleButtonBackground"
271		path="~~distrib~~/resources/TabBar/tab_button_disabled.png" sourceInsets="15 7 19 7" />
	282	path="/resources/TabBar/tab_button_disabled.png" sourceInsets="15 7 19 7" />
272	283	<color value="#c2c4c7" type="TEXT_FOREGROUND" />
273	284	</state>
274	285	<state value="PRESSED">
275	286	<imagePainter method="toggleButtonBackground"
276		path="~~distrib~~/resources/TabBar/tab_button_over.png" sourceInsets="15 7 19 7" />
	287	path="/resources/TabBar/tab_button_over.png" sourceInsets="15 7 19 7" />
277	288	</state>
278	289	<state value="MOUSE_OVER">
279	290	<imagePainter method="toggleButtonBackground"
280		path="~~distrib~~/resources/TabBar/tab_button_over.png" sourceInsets="15 7 19 7" />
	291	path="/resources/TabBar/tab_button_over.png" sourceInsets="15 7 19 7" />
281	292	<color value="WHITE" type="TEXT_FOREGROUND" />
282	293	</state>
283	294	<state value="SELECTED">
284	295	<imagePainter method="toggleButtonBackground"
285		path="~~distrib~~/resources/TabBar/tab_button_selected.png" sourceInsets="17 14 19 11" />
	296	path="/resources/TabBar/tab_button_selected.png" sourceInsets="17 14 19 11" />
286	297	<color value="WHITE" type="TEXT_FOREGROUND" />
287	298	<insets top="14" left="9" right="10" bottom="14" />
…	…
289	300	<state value="SELECTED AND MOUSE_OVER">
290	301	<imagePainter method="toggleButtonBackground"
291		path="~~distrib~~/resources/TabBar/tab_button_selected.png" sourceInsets="17 14 19 11" />
	302	path="/resources/TabBar/tab_button_selected.png" sourceInsets="17 14 19 11" />
292	303	<color value="WHITE" type="TEXT_FOREGROUND" />
293	304	<insets top="14" left="9" right="10" bottom="14" />
294	305	</state>
295
	306
296	307	</style>
297	308	<!-- Bind buttonStyle to all JButtons -->
298		<bind style="tabButtonStyle" type="name" key="app.commons.app.tab-bar-button/tabButton" />
	309	<bind style="tabButtonStyle" type="name"
	310	key="app.commons.app.tab-bar-button/tabButton" />
299	311	<bind style="tabButtonStyle" type="name" key="bookDesktopButton" />
300	312
…	…
319	331	<state value="ENABLED">
320	332	<imagePainter method="buttonBackground"
321		path="~~distrib/resources/HaloButtons/empty_background.png" sourceInsets="0 0 0 0~~" />
322		</state>
323		<state value="DISABLED">
324		<imagePainter method="buttonBackground"
325		path="~~distrib~~/resources/HaloButtons/empty_background.png" sourceInsets="0 0 0 0" />
326		</state>
327		<state value="PRESSED">
328		<imagePainter method="buttonBackground"
329		path="~~distrib~~/resources/HaloButtons/empty_background.png" sourceInsets="0 0 0 0" />
	333	path="/resources/HaloButtons/empty_background.png" sourceInsets="1 1 1 1" />
	334	</state>
	335	<state value="DISABLED">
	336	<imagePainter method="buttonBackground"
	337	path="/resources/HaloButtons/empty_background.png" sourceInsets="0 0 0 0" />
	338	</state>
	339	<state value="PRESSED">
	340	<imagePainter method="buttonBackground"
	341	path="/resources/HaloButtons/empty_background.png" sourceInsets="0 0 0 0" />
330	342	</state>
331	343	<state value="FOCUSED">
332	344	<imagePainter method="buttonBackground"
333		path="distrib/resources/HaloButtons/empty_background.png" sourceInsets="0 0 0 0" />
	345	path="/resources/HaloButtons/empty_background.png" sourceInsets="0 0 0 0" />
	346	</state>
	347	<state value="MOUSE_OVER">
	348	<imagePainter method="buttonBackground"
	349	path="/resources/HaloButtons/empty_background.png" sourceInsets="0 0 0 0" />
334	350	</state>
335	351	</style>
…	…
343	359	<style id="CheckBoxStyle">
344	360	<state>
345		<imageIcon id="checkBoxOff" path="distrib/resources/CheckBox/normal.png" sourceInsets="0 0 0 0" />
	361	<imageIcon id="checkBoxOff" path="/resources/CheckBox/normal.png"
	362	sourceInsets="0 0 0 0" />
346	363	<property key="CheckBox.icon" value="checkBoxOff" />
347	364	</state>
348	365	<state value="MOUSE_OVER">
349		<imageIcon id="checkBoxOffMouseOver" path="distrib/resources/CheckBox/rolled.png" sourceInsets="0 0 0 0" />
	366	<imageIcon id="checkBoxOffMouseOver" path="/resources/CheckBox/rolled.png"
	367	sourceInsets="0 0 0 0" />
350	368	<property key="CheckBox.icon" value="checkBoxOffMouseOver" />
351	369	</state>
352	370	<state value="DISABLED">
353		<imageIcon id="checkBoxOffDisabled" path="distrib/resources/CheckBox/disabled.png" sourceInsets="0 0 0 0" />
	371	<imageIcon id="checkBoxOffDisabled" path="/resources/CheckBox/disabled.png"
	372	sourceInsets="0 0 0 0" />
354	373	<property key="CheckBox.icon" value="checkBoxOffDisabled" />
355	374	</state>
356	375	<state value="PRESSED">
357		<imageIcon id="checkBoxPressed" path="distrib/resources/CheckBox/pressed.png" sourceInsets="0 0 0 0" />
	376	<imageIcon id="checkBoxPressed" path="/resources/CheckBox/pressed.png"
	377	sourceInsets="0 0 0 0" />
358	378	<property key="CheckBox.icon" value="checkBoxPressed" />
359	379	</state>
360	380	<state value="SELECTED">
361		<imageIcon id="checkBoxOn" path="distrib/resources/CheckBox/selected.png" sourceInsets="0 0 0 0" />
	381	<imageIcon id="checkBoxOn" path="/resources/CheckBox/selected.png"
	382	sourceInsets="0 0 0 0" />
362	383	<property key="CheckBox.icon" value="checkBoxOn" />
363	384	</state>
364	385	<state value="SELECTED AND MOUSE_OVER">
365		<imageIcon id="checkBoxOnMouseOver" path="distrib/resources/CheckBox/selected_rolled.png" sourceInsets="0 0 0 0" />
	386	<imageIcon id="checkBoxOnMouseOver" path="/resources/CheckBox/selected_rolled.png"
	387	sourceInsets="0 0 0 0" />
366	388	<property key="CheckBox.icon" value="checkBoxOnMouseOver" />
367	389	</state>
368	390	<state value="SELECTED AND PRESSED">
369		<imageIcon id="checkBoxOnPressed" path="distrib/resources/CheckBox/selected_pressed.png" sourceInsets="0 0 0 0" />
	391	<imageIcon id="checkBoxOnPressed" path="/resources/CheckBox/selected_pressed.png"
	392	sourceInsets="0 0 0 0" />
370	393	<property key="CheckBox.icon" value="checkBoxOnPressed" />
371	394	</state>
372	395	<state value="SELECTED AND DISABLED">
373		<imageIcon id="checkBoxOnDisabled" path="distrib/resources/CheckBox/selected_disabled.png" sourceInsets="0 0 0 0" />
	396	<imageIcon id="checkBoxOnDisabled" path="/resources/CheckBox/selected_disabled.png"
	397	sourceInsets="0 0 0 0" />
374	398	<property key="CheckBox.icon" value="checkBoxOnDisabled" />
375	399	</state>
…	…
382	406	<style id="RadioButtonStyle">
383	407	<state>
384		<imageIcon id="radioButtonOff" path="distrib/resources/RadioButton/normal.png" sourceInsets="0 0 0 0" />
	408	<imageIcon id="radioButtonOff" path="/resources/RadioButton/normal.png"
	409	sourceInsets="0 0 0 0" />
385	410	<property key="RadioButton.icon" value="radioButtonOff" />
386	411	</state>
387	412	<state value="MOUSE_OVER">
388		<imageIcon id="radioButtonOffMouseOver" path="distrib/resources/RadioButton/rolled.png" sourceInsets="0 0 0 0" />
	413	<imageIcon id="radioButtonOffMouseOver" path="/resources/RadioButton/rolled.png"
	414	sourceInsets="0 0 0 0" />
389	415	<property key="RadioButton.icon" value="radioButtonOffMouseOver" />
390	416	</state>
391	417	<state value="PRESSED">
392		<imageIcon id="radioButtonOffPressed" path="distrib/resources/RadioButton/pressed.png" sourceInsets="0 0 0 0" />
	418	<imageIcon id="radioButtonOffPressed" path="/resources/RadioButton/pressed.png"
	419	sourceInsets="0 0 0 0" />
393	420	<property key="RadioButton.icon" value="radioButtonOffPressed" />
394	421	</state>
395	422	<state value="DISABLED">
396		<imageIcon id="radioButtonOffDisabled" path="distrib/resources/RadioButton/disabled.png" sourceInsets="0 0 0 0" />
	423	<imageIcon id="radioButtonOffDisabled" path="/resources/RadioButton/disabled.png"
	424	sourceInsets="0 0 0 0" />
397	425	<property key="RadioButton.icon" value="radioButtonOffDisabled" />
398	426	</state>
399	427
400	428	<state value="SELECTED">
401		<imageIcon id="radioButtonOn" path="distrib/resources/RadioButton/selected.png" sourceInsets="0 0 0 0" />
	429	<imageIcon id="radioButtonOn" path="/resources/RadioButton/selected.png"
	430	sourceInsets="0 0 0 0" />
402	431	<property key="RadioButton.icon" value="radioButtonOn" />
403	432	</state>
404	433	<state value="SELECTED AND DISABLED">
405		<imageIcon id="radioButtonOnDisabled" path="distrib/resources/RadioButton/selected_disabled.png" sourceInsets="0 0 0 0" />
	434	<imageIcon id="radioButtonOnDisabled"
	435	path="/resources/RadioButton/selected_disabled.png" sourceInsets="0 0 0 0" />
406	436	<property key="RadioButton.icon" value="radioButtonOnDisabled" />
407	437	</state>
408	438	<state value="SELECTED AND MOUSE_OVER">
409		<imageIcon id="radioButtonOnMouseOver" path="distrib/resources/RadioButton/selected_rolled.png" sourceInsets="0 0 0 0" />
	439	<imageIcon id="radioButtonOnMouseOver" path="/resources/RadioButton/selected_rolled.png"
	440	sourceInsets="0 0 0 0" />
410	441	<property key="RadioButton.icon" value="radioButtonOnMouseOver" />
411	442	</state>
412	443	<state value="SELECTED AND PRESSED">
413		<imageIcon id="radioButtonOnPressed" path="distrib/resources/RadioButton/selected_pressed.png" sourceInsets="0 0 0 0" />
	444	<imageIcon id="radioButtonOnPressed" path="/resources/RadioButton/selected_pressed.png"
	445	sourceInsets="0 0 0 0" />
414	446	<property key="RadioButton.icon" value="radioButtonOnPressed" />
415	447	</state>
…	…
424	456	are differently declared.
425	457	-->
426		<!-- =================================
427		<style id="ToggleButtonStyle">
428		<insets top="5" left="13" right="13" bottom="5" />
429		<state>
430		<imagePainter method="ToggleButtonBackground" path="distrib/resources/Button/btn_enabled.png"
431		sourceInsets="2 1 1 2" />
432		</state>
433		<state value="DISABLED">
434		<imagePainter method="ToggleButtonBackground" path="distrib/resources/Button/btn_disabled.png"
435		sourceInsets="2 1 1 2" />
436		</state>
437		<state value="SELECTED">
438		<imagePainter method="ToggleButtonBackground" path="distrib/resources/Button/btn_roll.png"
439		sourceInsets="2 1 1 2" />
440		</state>
441		</style>
	458	<!--
	459	================================= <style id="ToggleButtonStyle">
	460	<insets top="5" left="13" right="13" bottom="5" /> <state>
	461	<imagePainter method="ToggleButtonBackground"
	462	path="/resources/Button/btn_enabled.png" sourceInsets="2 1 1 2" />
	463	</state> <state value="DISABLED"> <imagePainter
	464	method="ToggleButtonBackground"
	465	path="/resources/Button/btn_disabled.png" sourceInsets="2 1 1 2" />
	466	</state> <state value="SELECTED"> <imagePainter
	467	method="ToggleButtonBackground" path="/resources/Button/btn_roll.png"
	468	sourceInsets="2 1 1 2" /> </state> </style>
442	469	-->
443	470	<!--
…	…
459	486	<property key="ArrowButton.size" type="integer" value="19" />
460	487	<state>
461		<imagePainter method="arrowButtonForeground" path="~~distrib~~/resources/ComboBox/arrow.png"
	488	<imagePainter method="arrowButtonForeground" path="/resources/ComboBox/arrow.png"
462	489	sourceInsets="5 2 5 5" direction="south" />
463	490	</state>
…	…
465	492	<state value="PRESSED">
466	493	<imagePainter method="arrowButtonForeground"
467		path="~~distrib~~/resources/ComboBox/arrow_pressed.png" sourceInsets="5 2 5 5"
	494	path="/resources/ComboBox/arrow_pressed.png" sourceInsets="5 2 5 5"
468	495	direction="south" />
469	496	</state>
470	497
471	498	<state value="MOUSE_OVER">
472		~~<imagePainter method="arrowButtonForeground" path="distrib/resources/ComboBox/arrow_over.png"~~
473		~~sourceInsets="5 2 5 5" direction="south" />~~
474		~~</state>~~
475
476		~~<state value="DISABLED">~~
477	499	<imagePainter method="arrowButtonForeground"
478		path="distrib/resources/ComboBox/arrow_disabled.png" sourceInsets="5 2 5 5"
	500	path="/resources/ComboBox/arrow_over.png" sourceInsets="5 2 5 5"
	501	direction="south" />
	502	</state>
	503
	504	<state value="DISABLED">
	505	<imagePainter method="arrowButtonForeground"
	506	path="/resources/ComboBox/arrow_disabled.png" sourceInsets="5 2 5 5"
479	507	direction="south" />
480	508	</state>
…	…
511	539	<state value="ENABLED">
512	540	<imagePainter method="comboBoxBackground"
513		path="~~distrib~~/resources/ComboBox/text_field_background.png" sourceInsets="5 5 5 5" />
	541	path="/resources/ComboBox/text_field_background.png" sourceInsets="5 5 5 5" />
514	542	</state>
515	543	<state value="DISABLED">
516	544	<imagePainter method="comboBoxBackground"
517		path="~~distrib~~/resources/ComboBox/text_field_background_disabled.png"
	545	path="/resources/ComboBox/text_field_background_disabled.png"
518	546	sourceInsets="5 5 5 5" />
519	547	</state>
…	…
541	569	<state>
542	570	<imagePainter method="scrollBarThumbBackground"
543		direction="horizontal" path="~~distrib~~/resources/HScrollBar/thumb.png"
	571	direction="horizontal" path="/resources/HScrollBar/thumb.png"
544	572	sourceInsets="9 20 9 20" />
545	573	<imagePainter method="scrollBarThumbBackground"
546		direction="vertical" path="~~distrib~~/resources/VScrollBar/thumb.png"
	574	direction="vertical" path="/resources/VScrollBar/thumb.png"
547	575	sourceInsets="20 9 20 9" />
548	576	</state>
…	…
551	579	NOT VISIBLE FOR SOME REASON??? <state value="PRESSED"> <imagePainter
552	580	method="scrollBarThumbBackground" direction="horizontal"
553		path="~~distrib~~/resources/HScrollBar/thumb_pressed.png" sourceInsets="9 20 9
	581	path="/resources/HScrollBar/thumb_pressed.png" sourceInsets="9 20 9
554	582	20" /> <imagePainter method="scrollBarThumbBackground"
555		direction="vertical" path="~~distrib~~/resources/VScrollBar/thumb_pressed.png"
	583	direction="vertical" path="/resources/VScrollBar/thumb_pressed.png"
556	584	sourceInsets="20 9 20 9"/> </state>
557	585	-->
…	…
559	587	<state value="MOUSE_OVER">
560	588	<imagePainter method="scrollBarThumbBackground"
561		direction="horizontal" path="~~distrib~~/resources/HScrollBar/thumb_over.png"
	589	direction="horizontal" path="/resources/HScrollBar/thumb_over.png"
562	590	sourceInsets="9 20 9 20" />
563	591	<imagePainter method="scrollBarThumbBackground"
564		direction="vertical" path="~~distrib~~/resources/VScrollBar/thumb_over.png"
	592	direction="vertical" path="/resources/VScrollBar/thumb_over.png"
565	593	sourceInsets="20 9 20 9" />
566	594	</state>
…	…
568	596	<state value="DISABLED">
569	597	<imagePainter method="scrollBarThumbBackground"
570		direction="horizontal" path="~~distrib~~/resources/HScrollBar/thumb_disabled.png"
	598	direction="horizontal" path="/resources/HScrollBar/thumb_disabled.png"
571	599	sourceInsets="9 20 9 20" />
572	600	<imagePainter method="scrollBarThumbBackground"
573		direction="vertical" path="~~distrib~~/resources/VScrollBar/thumb_disabled.png"
	601	direction="vertical" path="/resources/VScrollBar/thumb_disabled.png"
574	602	sourceInsets="20 9 20 9" />
575	603	</state>
…	…
582	610	<!-- SCROLLBAR TRACK -->
583	611	<!-- ================================= -->
584		<style id="~~scrollb~~arTrackStyle">
	612	<style id="ScrollBarTrackStyle">
585	613	<insets top="0" left="0" right="0" bottom="0" />
586
587		<state>
588		<imagePainter method="scrollBarTrackBackground" path="distrib/resources/HScrollBar/track.png"
	614	<state>
	615
	616	<object id="ScrollBar_BgH_Insets" class="java.awt.Insets">
	617	<int>3</int>
	618
	619	<int>20</int>
	620
	621	<int>3</int>
	622
	623	<int>20</int>
	624	</object>
	625	<object id="ScrollBar_Bg_VerInsets" class="java.awt.Insets">
	626	<int>20</int>
	627
	628	<int>3</int>
	629
	630	<int>20</int>
	631
	632	<int>3</int>
	633	</object>
	634	<defaultsProperty key="ScrollBar.Background.Horizontal.Insets" type="idref" value="ScrollBar_BgH_Insets" />
	635	<defaultsProperty key="ScrollBar.Background.Vertical.Insets" type="idref" value="ScrollBar_Bg_VerInsets" />
	636	<imageIcon id="ScrollBar.Background.Horizontal" path="/resources/HScrollBar/track.png" sourceInsets="3 20 3 20" />
	637	<property key="HORIZONTAL_BACKGROUND" type="idref" value="ScrollBar.Background.Horizontal" />
	638	<painter method="scrollBarTrackBackground" idref="TilePainter" />
	639
	640	<imageIcon id="ScrollBar.Background.Vertical" path="/resources/VScrollBar/track.png" sourceInsets="20 3 20 3" />
	641	<property key="VERTICAL_BACKGROUND" type="idref" value="ScrollBar.Background.Vertical" />
	642	<painter method="scrollBarTrackBackground" idref="TilePainter" />
	643	</state>
	644
	645	<state value="DISABLED">
	646	<imageIcon id="ScrollBar.Background.Horizontal.Disabled" path="/resources/HScrollBar/track_disabled.png"
589	647	direction="horizontal" sourceInsets="3 20 3 20" />
590		<imagePainter method="scrollBarTrackBackground" path="distrib/resources/VScrollBar/track.png"
	648	<property key="HORIZONTAL_BACKGROUND" type="idref" value="ScrollBar.Background.Horizontal.Disabled" />
	649	<painter method="scrollBarTrackBackground" idref="TilePainter" />
	650
	651	<imageIcon id="ScrollBar.Background.Vertical.Disabled" path="/resources/VScrollBar/track_disabled.png"
591	652	direction="vertical" sourceInsets="20 3 20 3" />
592		</state>
593
594		<state value="DISABLED">
595		<imagePainter method="scrollBarTrackBackground"
596		path="distrib/resources/HScrollBar/track_disabled.png" direction="horizontal"
597		sourceInsets="3 20 3 20" />
598		<imagePainter method="scrollBarTrackBackground"
599		path="distrib/resources/VScrollBar/track_disabled.png" direction="vertical"
600		sourceInsets="20 3 20 3" />
601		</state>
602
603		</style>
604		<bind style="scrollbarTrackStyle" type="REGION" key="ScrollBarTrack" />
	653	<property key="VERTICAL_BACKGROUND" type="idref" value="ScrollBar.Background.Vertical.Disabled" />
	654	<painter method="scrollBarTrackBackground" idref="TilePainter" />
	655	</state>
	656	</style>
	657	<bind style="ScrollBarTrackStyle" type="region" key="ScrollBarTrack" />
605	658
606	659	<!-- ================================= -->
…	…
609	662	<style id="InternalFrameStyle">
610	663	<insets top="2" left="2" bottom="9" right="7" />
611		<imageIcon id="InternalFrameIcon" path="~~distrib~~/resources/btn_window_settings.png"
	664	<imageIcon id="InternalFrameIcon" path="/resources/btn_window_settings.png"
612	665	sourceInsets="0 0 0 0" />
613	666	<property key="InternalFrame.icon" type="idref" value="InternalFrameIcon" />
614	667	<state>
615		<imagePainter method="InternalFrameBackground"
616		path="~~distrib~~/resources/InternalFrame/background.png" sourceInsets="6 6 14 13" />
	668	<imagePainter method="internalFrameBackground"
	669	path="/resources/InternalFrame/background.png" sourceInsets="6 6 14 13" />
617	670	<imagePainter method="internalFrameBorder"
618		path="~~distrib~~/resources/InternalFrame/border.png" sourceInsets="11 10 11 10" />
	671	path="/resources/InternalFrame/border.png" sourceInsets="11 10 11 10" />
619	672	</state>
620	673	</style>
…	…
630	683	<property key="InternalFrameTitlePane.buttonSpacing" type="integer"
631	684	value="0" />
632		<imageIcon id="InternalFrameMaximizeButtonIcon" path="distrib/resources/btn_maximize.png" sourceInsets="0 0 0 0"/>
	685	<imageIcon id="InternalFrameMaximizeButtonIcon" path="/resources/btn_maximize.png"
	686	sourceInsets="0 0 0 0" />
633	687	<property key="InternalFrameTitlePane.maximizeIcon" type="idref"
634	688	value="InternalFrameMaximizeButtonIcon" />
635	689
636		<imageIcon id="InternalFrameMinimizeButtonIcon" path="distrib/resources/btn_minimize.png" sourceInsets="11 10 11 10"/>
	690	<imageIcon id="InternalFrameMinimizeButtonIcon" path="/resources/btn_minimize.png"
	691	sourceInsets="11 10 11 10" />
637	692	<property key="InternalFrameTitlePane.minimizeIcon" type="idref"
638	693	value="InternalFrameMinimizeButtonIcon" />
639	694
640		<imageIcon id="InternalFrameIconifyButtonIcon" path="distrib/resources/btn_minimize.png" sourceInsets="11 10 11 10"/>
	695	<imageIcon id="InternalFrameIconifyButtonIcon" path="/resources/btn_minimize.png"
	696	sourceInsets="11 10 11 10" />
641	697	<property key="InternalFrameTitlePane.iconifyIcon" type="idref"
642	698	value="InternalFrameIconifyButtonIcon" />
643	699
644		<imageIcon id="InternalFrameCloseButtonIcon" path="distrib/resources/close.png" sourceInsets="11 10 11 10"/>
	700	<imageIcon id="InternalFrameCloseButtonIcon" path="/resources/close.png"
	701	sourceInsets="11 10 11 10" />
645	702	<property key="InternalFrameTitlePane.closeIcon" type="idref"
646	703	value="InternalFrameCloseButtonIcon" />
…	…
648	705	<state>
649	706	<imagePainter method="internalFrameTitlePaneBackground"
650		path="~~distrib~~/resources/InternalFrame/title_bar_bg.png" sourceInsets="1 1 3 1" />
	707	path="/resources/InternalFrame/title_bar_bg.png" sourceInsets="1 1 3 1" />
651	708	<font name="Arial" size="11" style="BOLD" />
652	709	<color value="#585f68" type="TEXT_FOREGROUND" />
…	…
657	714	<color value="#585f68" type="TEXT_FOREGROUND" />
658	715	<imagePainter method="internalFrameTitlePaneBackground"
659		path="~~distrib~~/resources/InternalFrame/title_bar_bg.png" sourceInsets="1 1 3 1" />
	716	path="/resources/InternalFrame/title_bar_bg.png" sourceInsets="1 1 3 1" />
660	717	</state>
661	718	</style>
…	…
671	728	<state value="ENABLED">
672	729	<imagePainter method="buttonBackground"
673		path="~~distrib~~/resources/HaloButtons/empty_background.png" sourceInsets="0 0 0 0" />
674		</state>
675		<state value="DISABLED">
676		<imagePainter method="buttonBackground"
677		path="~~distrib~~/resources/HaloButtons/empty_background.png" sourceInsets="0 0 0 0" />
678		</state>
679		<state value="PRESSED">
680		<imagePainter method="buttonBackground"
681		path="~~distrib~~/resources/HaloButtons/empty_background.png" sourceInsets="0 0 0 0" />
	730	path="/resources/HaloButtons/empty_background.png" sourceInsets="0 0 0 0" />
	731	</state>
	732	<state value="DISABLED">
	733	<imagePainter method="buttonBackground"
	734	path="/resources/HaloButtons/empty_background.png" sourceInsets="0 0 0 0" />
	735	</state>
	736	<state value="PRESSED">
	737	<imagePainter method="buttonBackground"
	738	path="/resources/HaloButtons/empty_background.png" sourceInsets="0 0 0 0" />
682	739	</state>
683	740	<state value="FOCUSED">
684	741	<imagePainter method="buttonBackground"
685		path="~~distrib~~/resources/HaloButtons/empty_background.png" sourceInsets="0 0 0 0" />
	742	path="/resources/HaloButtons/empty_background.png" sourceInsets="0 0 0 0" />
686	743	</state>
687	744	</style>
…	…
697	754	<state value="ENABLED">
698	755	<imagePainter method="buttonBackground"
699		path="~~distrib~~/resources/HaloButtons/empty_background.png" sourceInsets="0 0 0 0" />
700		</state>
701		<state value="DISABLED">
702		<imagePainter method="buttonBackground"
703		path="~~distrib~~/resources/HaloButtons/empty_background.png" sourceInsets="0 0 0 0" />
704		</state>
705		<state value="PRESSED">
706		<imagePainter method="buttonBackground"
707		path="~~distrib~~/resources/HaloButtons/empty_background.png" sourceInsets="0 0 0 0" />
	756	path="/resources/HaloButtons/empty_background.png" sourceInsets="0 0 0 0" />
	757	</state>
	758	<state value="DISABLED">
	759	<imagePainter method="buttonBackground"
	760	path="/resources/HaloButtons/empty_background.png" sourceInsets="0 0 0 0" />
	761	</state>
	762	<state value="PRESSED">
	763	<imagePainter method="buttonBackground"
	764	path="/resources/HaloButtons/empty_background.png" sourceInsets="0 0 0 0" />
708	765	</state>
709	766	<state value="FOCUSED">
710	767	<imagePainter method="buttonBackground"
711		path="~~distrib~~/resources/HaloButtons/empty_background.png" sourceInsets="0 0 0 0" />
	768	path="/resources/HaloButtons/empty_background.png" sourceInsets="0 0 0 0" />
712	769	</state>
713	770	</style>
…	…
723	780	<state value="ENABLED">
724	781	<imagePainter method="buttonBackground"
725		path="~~distrib~~/resources/HaloButtons/empty_background.png" sourceInsets="0 0 0 0" />
726		</state>
727		<state value="DISABLED">
728		<imagePainter method="buttonBackground"
729		path="~~distrib~~/resources/HaloButtons/empty_background.png" sourceInsets="0 0 0 0" />
730		</state>
731		<state value="PRESSED">
732		<imagePainter method="buttonBackground"
733		path="~~distrib~~/resources/HaloButtons/empty_background.png" sourceInsets="0 0 0 0" />
	782	path="/resources/HaloButtons/empty_background.png" sourceInsets="0 0 0 0" />
	783	</state>
	784	<state value="DISABLED">
	785	<imagePainter method="buttonBackground"
	786	path="/resources/HaloButtons/empty_background.png" sourceInsets="0 0 0 0" />
	787	</state>
	788	<state value="PRESSED">
	789	<imagePainter method="buttonBackground"
	790	path="/resources/HaloButtons/empty_background.png" sourceInsets="0 0 0 0" />
734	791	</state>
735	792	<state value="FOCUSED">
736	793	<imagePainter method="buttonBackground"
737		path="~~distrib~~/resources/HaloButtons/empty_background.png" sourceInsets="0 0 0 0" />
	794	path="/resources/HaloButtons/empty_background.png" sourceInsets="0 0 0 0" />
738	795	</state>
739	796	</style>
…	…
749	806	top="0" left="0" right="0" bottom="0" /> <state value="ENABLED">
750	807	<imagePainter method="buttonBackground"
751		path="~~distrib~~/resources/HaloButtons/empty_background.png" sourceInsets="0 0 0
	808	path="/resources/HaloButtons/empty_background.png" sourceInsets="0 0 0
752	809	0" /> </state> <state value="DISABLED"> <imagePainter
753	810	method="buttonBackground"
754		path="~~distrib~~/resources/HaloButtons/empty_background.png" sourceInsets="0 0 0
	811	path="/resources/HaloButtons/empty_background.png" sourceInsets="0 0 0
755	812	0" /> </state> <state value="PRESSED"> <imagePainter
756	813	method="buttonBackground"
757		path="~~distrib~~/resources/HaloButtons/empty_background.png" sourceInsets="0 0 0
	814	path="/resources/HaloButtons/empty_background.png" sourceInsets="0 0 0
758	815	0" /> </state> <state value="FOCUSED"> <imagePainter
759	816	method="buttonBackground"
760		path="~~distrib~~/resources/HaloButtons/empty_background.png" sourceInsets="0 0 0
	817	path="/resources/HaloButtons/empty_background.png" sourceInsets="0 0 0
761	818	0" /> </state> </style> <bind style="InternalFrameDesktopButtonStyle"
762	819	type="name" key="InternalFrame.desktopIcon" />
…	…
777	834	</style>
778	835	<bind style="PanelStyle" type="region" key="Panel" />
779
	836
780	837	<!-- ================================= -->
781	838	<!-- MYDOGGY ROOT PANEL -->
…	…
784	841	<insets top="4" left="10" right="10" bottom="10" />
785	842	<state>
786		<imageIcon id="mydoggyRootPanelBg" path="~~distrib~~/resources/app_bg.png" sourceInsets="11 10 11 10"/>
	843	<imageIcon id="mydoggyRootPanelBg" path="/resources/app_bg.png" sourceInsets="11 10 11 10"/>
787	844	<property key="tileImage" type="idref" value="mydoggyRootPanelBg" />
788	845	<painter method="panelBackground" idref="TilePainter" />
789		<imagePainter method="panelBorder" path="~~distrib~~/resources/flap_border.png"
	846	<imagePainter method="panelBorder" path="/resources/flap_border.png"
790	847	sourceInsets="10 10 10 10" />
791	848	</state>
…	…
800	857	<insets top="0" left="0" right="0" bottom="0" />
801	858	<state>
802		<imagePainter method="panelBackground" path="~~distrib~~/resources/md_panel_bg.png"
803		sourceInsets="0 0 0 0" />
804		<imagePainter method="panelBorder" path="~~distrib~~/resources/empty_background.png"
	859	<imagePainter method="panelBackground" path="/resources/md_panel_bg.png"
	860	sourceInsets="0 0 0 0" />
	861	<imagePainter method="panelBorder" path="/resources/empty_background.png"
805	862	sourceInsets="0 0 0 0" />
806	863	</state>
…	…
815	872	<insets top="0" left="0" right="0" bottom="0" />
816	873	<state>
817		<imagePainter method="panelBackground" path="~~distrib~~/resources/empty_background.png"
818		sourceInsets="0 0 0 0" />
819		<imagePainter method="panelBorder" path="~~distrib~~/resources/empty_background.png"
	874	<imagePainter method="panelBackground" path="/resources/empty_background.png"
	875	sourceInsets="0 0 0 0" />
	876	<imagePainter method="panelBorder" path="/resources/empty_background.png"
820	877	sourceInsets="0 0 0 0" />
821	878	</state>
…	…
830	887	<insets top="0" left="0" right="0" bottom="0" />
831	888	<state>
832		<imagePainter method="panelBackground" path="distrib/resources/panel_bg.png"
833		sourceInsets="0 0 0 0" />
834		</state>
835		</style>
836		<bind style="BookPanel" type="name"
837		key="main.app.commons.book.book-panel" />
	889	<imagePainter method="panelBackground" path="/resources/panel_bg.png"
	890	sourceInsets="0 0 0 0" />
	891	</state>
	892	</style>
	893	<bind style="BookPanel" type="name" key="main.app.commons.book.book-panel" />
838	894
839	895	<!-- ================================= -->
…	…
843	899	<insets top="0" left="0" right="0" bottom="0" />
844	900	<state>
845		<imageIcon id="tabBarImage" path="~~distrib~~/resources/app_bg.png" sourceInsets="11 10 11 10"/>
	901	<imageIcon id="tabBarImage" path="/resources/app_bg.png" sourceInsets="11 10 11 10"/>
846	902	<property key="tileImage" type="idref" value="tabBarImage" />
847	903	<painter method="panelBackground" idref="TilePainter" />
…	…
849	905	</style>
850	906	<bind style="appTabBarPanelStyle" type="name" key="appTabBarPanel" />
851
	907
852	908	<!-- ================================= -->
853	909	<!-- HUD DIALOG -->
…	…
856	912	<insets top="0" left="0" right="0" bottom="0" />
857	913	<state>
858		<imagePainter method="panelBackground" path="~~distrib~~/resources/hud_bg.png"
	914	<imagePainter method="panelBackground" path="/resources/hud_bg.png"
859	915	sourceInsets="11 10 11 10" />
860	916	</state>
…	…
868	924	<insets top="0" left="0" right="0" bottom="0" />
869	925	<state>
870		<imagePainter method="panelBackground" path="distrib/resources/TabBar/tab_bar_panel_bg.png"
871		sourceInsets="0 0 19 0" />
872		</state>
873		</style>
874		<bind style="appTabBarTrailingPanelStyle" type="name" key="appTabBarTrailingPanel" />
	926	<imagePainter method="panelBackground"
	927	path="/resources/TabBar/tab_bar_panel_bg.png" sourceInsets="0 0 19 0" />
	928	</state>
	929	</style>
	930	<bind style="appTabBarTrailingPanelStyle" type="name"
	931	key="appTabBarTrailingPanel" />
875	932
876	933	<!-- ================================= -->
…	…
880	937	<insets top="0" left="0" right="0" bottom="0" />
881	938	<state>
882		<imagePainter method="panelBackground" path="~~distrib~~/resources/frame_title_bar.png"
	939	<imagePainter method="panelBackground" path="/resources/frame_title_bar.png"
883	940	sourceInsets="11 10 11 10" />
884	941	</state>
…	…
887	944	key="main.view.halos.frame.main-title-bar-halo" />
888	945
	946
	947	<!-- ================================= -->
	948	<!-- BACKGROUND COLOR PANEL STYLE -->
	949	<!-- ================================= -->
	950	<style id="BgColorPanelStyle">
	951	<state>
	952	<imagePainter method="panelBackground" path="/resources/color_fill.png"
	953	sourceInsets="0 0 0 0" />
	954	</state>
	955	</style>
	956	<bind style="BgColorPanelStyle" type="name" key="colorField" />
	957
889	958	<!-- ================================= -->
890	959	<!-- BACKGROUND GRADIENT PANEL STYLE -->
…	…
892	961	<style id="BgGradientPanelStyle">
893	962	<state>
894		<imagePainter method="PanelBackground" path="distrib/resources/gradient_fill.png"
895		sourceInsets="0 0 0 0" />
896		</state>
897		</style>
898		<bind style="BgGradientPanelStyle" type="name" key="gradientField" />
899
900		<!-- ================================= -->
901		<!-- BACKGROUND COLOR PANEL STYLE -->
902		<!-- ================================= -->
903		<style id="BgColorPanelStyle">
904		<state>
905		<imagePainter method="PanelBackground" path="distrib/resources/color_fill.png"
906		sourceInsets="0 0 0 0" />
907		</state>
908		</style>
909		<bind style="BgColorPanelStyle" type="name" key="colorField" />
	963	<imageIcon id="BgGradientFill" path="/resources/gradient_fill.png" sourceInsets="0 0 0 0"/>
	964	<property key="tileImage" type="idref" value="BgGradientFill" />
	965	<painter method="panelBackground" idref="TilePainter" />
	966	<!-- <imagePainter method="panelBorder" path="/resources/flap_border.png"
	967	sourceInsets="10 10 10 10" />
	968	<imagePainter method="panelBackground" path="/resources/gradient_fill.png"
	969	sourceInsets="0 0 0 0" /> -->
	970	</state>
	971	</style>
	972	<bind style="BgColorPanelStyle" type="name" key="gradientField" />
910	973
911	974	<!-- ================================= -->
…	…
914	977	<style id="BgImgPanelStyle">
915	978	<state>
916		<imagePainter method="PanelBackground" path="distrib/resources/bg_image_fill.png"
	979	<imageIcon id="BgImageFill" path="/resources/bg_image_fill.png" sourceInsets="0 0 0 0"/>
	980	<property key="tileImage" type="idref" value="BgImageFill" />
	981	<painter method="panelBackground" idref="TilePainter" />
	982
	983	<imagePainter method="panelBackground" path="/resources/bg_image_fill.png"
917	984	sourceInsets="0 0 0 0" />
918	985	</state>
…	…
937	1004	<font name="Arial" size="13" style="PLAIN" />
938	1005	<state value="FOCUSED">
939		<imagePainter method="tabbedPaneTabBackground" path="~~distrib~~/resources/tab_bar_selected.png"
	1006	<imagePainter method="tabbedPaneTabBackground" path="/resources/tab_bar_selected.png"
940	1007	sourceInsets="0 5 0 5" paintCenter="true" stretch="true" center="false" />
941	1008	</state>
942	1009	<state value="ENABLED">
943		<imagePainter method="tabbedPaneTabBackground" path="~~distrib~~/resources/tab_bar_enabled.png"
	1010	<imagePainter method="tabbedPaneTabBackground" path="/resources/tab_bar_enabled.png"
944	1011	sourceInsets="0 5 0 5" paintCenter="true" stretch="true" center="false" />
945	1012	</state>
946	1013	<state value="DISABLED">
947		<imagePainter method="tabbedPaneTabBackground" path="~~distrib~~/resources/tab_bar_disabled.png"
	1014	<imagePainter method="tabbedPaneTabBackground" path="/resources/tab_bar_disabled.png"
948	1015	sourceInsets="0 5 0 5" paintCenter="true" stretch="true" center="false" />
949	1016	</state>
…	…
955	1022	<!-- ================================= -->
956	1023	<style id="SliderTrackStyle">
957		<imagePainter method="sliderTrackBackground" path="~~distrib~~/resources/slider_track.png"
	1024	<imagePainter method="sliderTrackBackground" path="/resources/slider_track.png"
958	1025	sourceInsets="7 7 7 7" destinationInsets="7 7 7 7" paintCenter="true"
959	1026	stretch="true" center="false" />
960	1027	<state value="DISABLED">
961	1028	<imagePainter method="sliderTrackBackground"
962		path="~~distrib~~/resources/slider_track_disabled.png" sourceInsets="7 7 7 7"
	1029	path="/resources/slider_track_disabled.png" sourceInsets="7 7 7 7"
963	1030	destinationInsets="7 7 7 7" paintCenter="true" stretch="true"
964	1031	center="false" />
…	…
974	1041	<state>
975	1042	<imagePainter method="sliderThumbBackground" direction="horizontal"
976		path="~~distrib/resources/slider_thumb.png" center="true~~" />
	1043	path="/resources/slider_thumb.png" center="true" sourceInsets="0 0 0 0" />
977	1044	<imagePainter method="sliderThumbBackground" direction="vertical"
978		path="~~distrib/resources/slider_thumb.png" center="true~~" />
	1045	path="/resources/slider_thumb.png" center="true" sourceInsets="0 0 0 0" />
979	1046	</state>
980	1047
981	1048	<state value="PRESSED">
982	1049	<imagePainter method="sliderThumbBackground" direction="horizontal"
983		path="distrib/resources/slider_thumb_pressed.png" center="true" />
	1050	path="/resources/slider_thumb_pressed.png" center="true"
	1051	sourceInsets="0 0 0 0" />
984	1052	<imagePainter method="sliderThumbBackground" direction="vertical"
985		path="distrib/resources/slider_thumb_pressed.png" center="true" />
	1053	path="/resources/slider_thumb_pressed.png" center="true"
	1054	sourceInsets="0 0 0 0" />
986	1055	</state>
987	1056
988	1057	<state value="DISABLED">
989	1058	<imagePainter method="sliderThumbBackground" direction="horizontal"
990		path="distrib/resources/slider_thumb_disabled.png" center="true" />
	1059	path="/resources/slider_thumb_disabled.png" center="true"
	1060	sourceInsets="0 0 0 0" />
991	1061	<imagePainter method="sliderThumbBackground" direction="vertical"
992		path="distrib/resources/slider_thumb_disabled.png" center="true" />
	1062	path="/resources/slider_thumb_disabled.png" center="true"
	1063	sourceInsets="0 0 0 0" />
993	1064	</state>
994	1065
…	…
1012	1083	<insets top="5" bottom="4" right="1" left="10" />
1013	1084	<state value="ENABLED">
1014		<imagePainter method="TextFieldBackground"
1015		path="~~distrib~~/resources/TextField/background.png" sourceInsets="5 5 5 5" />
	1085	<imagePainter method="textFieldBackground"
	1086	path="/resources/TextField/background.png" sourceInsets="5 5 5 5" />
1016	1087	<color value="WHITE" type="TEXT_BACKGROUND" />
1017	1088	<color value="BLACK" type="TEXT_FOREGROUND" />
1018	1089	</state>
1019	1090	<state value="FOCUSED">
1020		<imagePainter method="TextFieldBackground"
1021		path="~~distrib~~/resources/TextField/background_focused.png" sourceInsets="5 5 5 5" />
	1091	<imagePainter method="textFieldBackground"
	1092	path="/resources/TextField/background_focused.png" sourceInsets="5 5 5 5" />
1022	1093	<color value="#1899e2" type="TEXT_BACKGROUND" />
1023	1094	<color value="WHITE" type="TEXT_FOREGROUND" />
1024	1095	</state>
1025	1096	<state value="DISABLED">
1026		<imagePainter method="TextFieldBackground"
1027		path="~~distrib~~/resources/TextField/background_disabled.png" sourceInsets="5 5 5 5" />
	1097	<imagePainter method="textFieldBackground"
	1098	path="/resources/TextField/background_disabled.png" sourceInsets="5 5 5 5" />
1028	1099	<color value="WHITE" type="TEXT_BACKGROUND" />
1029	1100	<color value="GRAY" type="TEXT_FOREGROUND" />
…	…
1042	1113	<color value="#272a2e" type="TEXT_FOREGROUND" />
1043	1114	<imagePainter method="textFieldBackground"
1044		path="~~distrib~~/resources/HaloButtons/empty_background.png" sourceInsets="0 0 0 0" />
	1115	path="/resources/HaloButtons/empty_background.png" sourceInsets="0 0 0 0" />
1045	1116	</state>
1046	1117	<state value="ENABLED">
…	…
1048	1119	<color value="#272a2e" type="TEXT_FOREGROUND" />
1049	1120	<imagePainter method="textFieldBackground"
1050		path="~~distrib~~/resources/HaloButtons/empty_background.png" sourceInsets="0 0 0 0" />
	1121	path="/resources/HaloButtons/empty_background.png" sourceInsets="0 0 0 0" />
1051	1122	</state>
1052	1123	<state value="DISABLED">
…	…
1054	1125	<color value="#272a2e" type="TEXT_FOREGROUND" />
1055	1126	<imagePainter method="textFieldBackground"
1056		path="~~distrib~~/resources/HaloButtons/empty_background.png" sourceInsets="0 0 0 0" />
	1127	path="/resources/HaloButtons/empty_background.png" sourceInsets="0 0 0 0" />
1057	1128	</state>
1058	1129	<state value="SELECTED">
…	…
1060	1131	<color value="#272a2e" type="TEXT_FOREGROUND" />
1061	1132	<imagePainter method="textFieldBackground"
1062		path="~~distrib~~/resources/HaloButtons/empty_background.png" sourceInsets="0 0 0 0" />
	1133	path="/resources/HaloButtons/empty_background.png" sourceInsets="0 0 0 0" />
1063	1134	</state>
1064	1135	<state value="FOCUSED">
…	…
1066	1137	<color value="#272a2e" type="TEXT_FOREGROUND" />
1067	1138	<imagePainter method="textFieldBackground"
1068		path="~~distrib~~/resources/HaloButtons/empty_background.png" sourceInsets="0 0 0 0" />
	1139	path="/resources/HaloButtons/empty_background.png" sourceInsets="0 0 0 0" />
1069	1140	</state>
1070	1141	<state value="MOUSE_OVER">
…	…
1072	1143	<color value="#272a2e" type="TEXT_FOREGROUND" />
1073	1144	<imagePainter method="textFieldBackground"
1074		path="~~distrib~~/resources/HaloButtons/empty_background.png" sourceInsets="0 0 0 0" />
	1145	path="/resources/HaloButtons/empty_background.png" sourceInsets="0 0 0 0" />
1075	1146	</state>
1076	1147	<state value="DEFAULT">
…	…
1078	1149	<color value="#272a2e" type="TEXT_FOREGROUND" />
1079	1150	<imagePainter method="textFieldBackground"
1080		path="~~distrib~~/resources/HaloButtons/empty_background.png" sourceInsets="0 0 0 0" />
	1151	path="/resources/HaloButtons/empty_background.png" sourceInsets="0 0 0 0" />
1081	1152	</state>
1082	1153
…	…
1090	1161	<insets top="3" bottom="3" right="3" left="3" />
1091	1162	<state>
1092		<imagePainter method="~~TextAreaBackground" path="distrib/resources/TextArea/background.png~~"
1093		sourceInsets="3 3 3 3" />
	1163	<imagePainter method="textAreaBackground"
	1164	path="/resources/TextArea/background.png" sourceInsets="3 3 3 3" />
1094	1165	</state>
1095	1166	</style>
…	…
1102	1173	<insets top="0" bottom="0" right="0" left="0" />
1103	1174	<state>
1104		<imagePainter method="~~MenuBarBackground" path="distrib~~/resources/Menu/menu_bg.png"
	1175	<imagePainter method="menuBarBackground" path="/resources/Menu/menu_bg.png"
1105	1176	sourceInsets="0 0 0 0" />
1106	1177	</state>
…	…
1113	1184	<style id="MenuStyle">
1114	1185	<insets top="4" bottom="5" right="8" left="7" />
1115
1116		<state>
1117		<imageIcon id="menuArrowIcon" path="distrib/resources/Menu/menu_arrow.png" />
	1186
	1187	<state>
	1188	<imageIcon id="menuArrowIcon" path="/resources/Menu/menu_arrow.png"
	1189	sourceInsets="0 0 0 0" />
1118	1190	<property key="Menu.arrowIcon" type="idref" value="menuArrowIcon" />
1119		<imagePainter method="~~MenuBackground" path="distrib~~/resources/Menu/menu_bg.png"
	1191	<imagePainter method="menuBackground" path="/resources/Menu/menu_bg.png"
1120	1192	sourceInsets="0 0 0 0" />
1121	1193	<font name="Arial" size="14" style="PLAIN" />
1122	1194	</state>
1123	1195	<state value="DISABLED">
1124		<imagePainter method="~~MenuBackground" path="distrib~~/resources/Menu/menu_bg.png"
	1196	<imagePainter method="menuBackground" path="/resources/Menu/menu_bg.png"
1125	1197	sourceInsets="0 0 0 0" />
1126	1198	<color value="#CCCCCC" type="TEXT_FOREGROUND" />
1127	1199	</state>
1128	1200	<state value="SELECTED">
1129		<imageIcon id="menuArrowIconSelected" path="distrib/resources/Menu/menu_arrow_selected.png" />
	1201	<imageIcon id="menuArrowIconSelected" path="/resources/Menu/menu_arrow_selected.png"
	1202	sourceInsets="0 0 0 0" />
1130	1203	<property key="Menu.arrowIcon" type="idref" value="menuArrowIconSelected" />
1131		<imagePainter method="~~MenuBackground" path="distrib/resources/Menu/menu_item_selected.png~~"
1132		sourceInsets="0 0 0 0" />
	1204	<imagePainter method="menuBackground"
	1205	path="/resources/Menu/menu_item_selected.png" sourceInsets="0 0 0 0" />
1133	1206	<color value="WHITE" type="TEXT_FOREGROUND" />
1134	1207	</state>
…	…
1142	1215	<insets top="3" bottom="3" right="5" left="5" />
1143	1216	<state>
1144		<imagePainter method="~~MenuBackground" path="distrib~~/resources/Menu/menu_item_bg.png"
	1217	<imagePainter method="menuBackground" path="/resources/Menu/menu_item_bg.png"
1145	1218	sourceInsets="0 0 0 0" />
1146	1219	<font name="Arial" size="14" style="PLAIN" />
1147	1220	</state>
1148	1221	<state value="SELECTED">
1149		<imagePainter method="~~MenuBackground" path="distrib/resources/Menu/menu_item_selected.png~~"
1150		sourceInsets="0 0 0 0" />
	1222	<imagePainter method="menuBackground"
	1223	path="/resources/Menu/menu_item_selected.png" sourceInsets="0 0 0 0" />
1151	1224	<color value="WHITE" type="TEXT_FOREGROUND" />
1152	1225	</state>
…	…
1163	1236	<insets top="3" bottom="3" right="5" left="5" />
1164	1237	<state>
1165		<imagePainter method="~~MenuItemBackground" path="distrib~~/resources/Menu/menu_item_bg.png"
	1238	<imagePainter method="menuItemBackground" path="/resources/Menu/menu_item_bg.png"
1166	1239	sourceInsets="0 0 0 0" />
1167	1240	<font name="Arial" size="14" style="PLAIN" />
1168	1241	</state>
1169	1242	<state value="MOUSE_OVER">
1170		<imagePainter method="~~MenuItemBackground" path="distrib/resources/Menu/menu_item_selected.png~~"
1171		sourceInsets="0 0 0 0" />
	1243	<imagePainter method="menuItemBackground"
	1244	path="/resources/Menu/menu_item_selected.png" sourceInsets="0 0 0 0" />
1172	1245	<color value="WHITE" type="TEXT_FOREGROUND" />
1173	1246	</state>
…	…
1195	1268	<insets top="0" bottom="9" right="5" left="5" />
1196	1269	<state>
1197		<imagePainter method="~~PopupMenuBackground" path="distrib~~/resources/Menu/popup_menu_bg.png"
	1270	<imagePainter method="popupMenuBackground" path="/resources/Menu/popup_menu_bg.png"
1198	1271	sourceInsets="0 9 9 9" />
1199	1272	</state>
…	…
1205	1278	<!-- ================================= -->
1206	1279	<style id="PopupMenuSeparatorStyle">
1207		<property key="Separator.thickness" type="integer" value="1"/>
1208		<opaque value="true"/>
1209		<state>
1210		<color type="BACKGROUND" value="#bec1c4"/>
1211		</state>
1212		</style>
1213		<bind style="PopupMenuSeparatorStyle" type="region" key="PopupMenuSeparator"/>
	1280	<property key="Separator.thickness" type="integer" value="1" />
	1281	<opaque value="true" />
	1282	<state>
	1283	<color type="BACKGROUND" value="#bec1c4" />
	1284	</state>
	1285	</style>
	1286	<bind style="PopupMenuSeparatorStyle" type="region" key="PopupMenuSeparator" />
1214	1287
1215	1288	<!-- ================================= -->
…	…
1218	1291	<style id="FormattedTextFieldStyle">
1219	1292	<state>
1220		<imagePainter method="FormattedTextFieldBackground"
1221		path="~~distrib~~/resources/text_bg.png" sourceInsets="0 0 0 0" />
	1293	<imagePainter method="formattedTextFieldBackground"
	1294	path="/resources/text_bg.png" sourceInsets="0 0 0 0" />
1222	1295	</state>
1223	1296	</style>
…	…
1249	1322	<property key="Tree.leftChildIndent" type="integer" value="5" />
1250	1323	<property key="Tree.rightChildIndent" type="integer" value="5" />
1251		<imageIcon id="TreeCollapseIcon" path="distrib/resources/tree_cell_collapse.png" />
	1324	<imageIcon id="TreeCollapseIcon" path="/resources/tree_cell_collapse.png"
	1325	sourceInsets="0 0 0 0" />
1252	1326	<property key="Tree.collapsedIcon" type="idref" value="TreeCollapseIcon" />
1253		<imageIcon id="TreeExpandIcon" path="distrib/resources/tree_cell_expand.png" />
	1327	<imageIcon id="TreeExpandIcon" path="/resources/tree_cell_expand.png"
	1328	sourceInsets="0 0 0 0" />
1254	1329	<property key="Tree.expandedIcon" type="idref" value="TreeExpandIcon" />
1255	1330	<state>
1256		<imagePainter method="~~TreeBackground" path="distrib~~/resources/text_bg.png"
	1331	<imagePainter method="treeBackground" path="/resources/text_bg.png"
1257	1332	sourceInsets="0 0 0 0" />
1258	1333	</state>
…	…
1275	1350	<style id="SpinnerStyle">
1276	1351	<state>
1277		<imagePainter method="~~SpinnerBackground" path="distrib~~/resources/text_bg.png"
	1352	<imagePainter method="spinnerBackground" path="/resources/text_bg.png"
1278	1353	sourceInsets="0 0 0 0" />
1279	1354	</state>
…	…
1291	1366	<state>
1292	1367	<color value="#326CB7" type="TEXT_FOREGROUND" />
1293		<imagePainter method="~~ToolTipBackground" path="distrib~~/resources/ToolTip/background.png"
	1368	<imagePainter method="toolTipBackground" path="/resources/ToolTip/background.png"
1294	1369	sourceInsets="4 4 6 6" />
1295	1370	</state>
…	…
1303	1378	<insets top="0" left="0" bottom="0" right="0"></insets>
1304	1379	<property key="OptionPane.separatorPadding" type="integer"
1305		value="1" />
1306
	1380	value="1" />
	1381
1307	1382	<property key="OptionPane.buttonPadding" type="integer"
1308		~~value="10" />~~
1309
	1383	value="10" />
	1384
1310	1385	<state>
1311	1386	<!--
1312		<imagePainter method="OptionPaneBackground" path="distrib/resources/bg_options_pane.png" sourceInsets="15 15 15 15"/>
	1387	<imagePainter method="OptionPaneBackground"
	1388	path="/resources/bg_options_pane.png" sourceInsets="15 15 15 15"/>
1313	1389	-->
1314	1390	</state>
1315	1391	</style>
1316		<bind style="OptionPaneStyle" type="region" key="OptionPane"/>
	1392	<bind style="OptionPaneStyle" type="region" key="OptionPane" />
1317	1393
1318	1394	<!-- ================================= -->
…	…
1322	1398	<insets top="0" left="15" bottom="0" right="0"></insets>
1323	1399	</style>
1324		<bind style="OptionPaneLabelStyle" type="name" key="OptionPane.label"/>
1325
	1400	<bind style="OptionPaneLabelStyle" type="name" key="OptionPane.label" />
	1401
1326	1402	<!-- ================================= -->
1327	1403	<!-- FILE CHOOSER -->
…	…
1329	1405	<style id="FileChooserStyle">
1330	1406	<insets top="0" left="0" right="0" bottom="0" />
1331		<!--
1332		<imageIcon id="FileChooserCancelIcon" path="distrib/resources/FileChooser/" />
1333		<property key="FileChooser.cancelIcon" type="idref"
1334		value="FileChooserCancelIcon" />
1335		<imageIcon id="FileChooserOkIcon" path="distrib/resources/FileChooser" />
1336		<property key="FileChooser.okIcon" type="idref" value="FileChooserOkIcon" />
1337		<imageIcon id="FileViewHardDriveIcon" path="distrib/resources/FileChooser" />
1338		<property key="FileView.hardDriveIcon" type="idref"
1339		value="FileViewHardDriveIcon" />
1340
1341		<imageIcon id="FileViewFloppyDriveIcon" path="distrib/resources/FileChooser" />
	1407	<!--
	1408	<imageIcon id="FileChooserCancelIcon" path="/resources/FileChooser/"
	1409	/> <property key="FileChooser.cancelIcon" type="idref"
	1410	value="FileChooserCancelIcon" /> <imageIcon id="FileChooserOkIcon"
	1411	path="/resources/FileChooser" /> <property key="FileChooser.okIcon"
	1412	type="idref" value="FileChooserOkIcon" /> <imageIcon
	1413	id="FileViewHardDriveIcon" path="/resources/FileChooser" /> <property
	1414	key="FileView.hardDriveIcon" type="idref"
	1415	value="FileViewHardDriveIcon" /> <imageIcon
	1416	id="FileViewFloppyDriveIcon" path="/resources/FileChooser" />
1342	1417	<property key="FileView.floppyDriveIcon" type="idref"
1343		value="FileViewFloppyDriveIcon" />
1344		<imageIcon id="FileViewFileIcon" path="distrib/resources/FileChooser" />
1345		<property key="FileView.fileIcon" type="idref" value="FileViewFileIcon" />
1346		<imageIcon id="FileViewComputerIcon" path="distrib/resources/FileChooser" />
1347		<property key="FileView.computerIcon" type="idref"
1348		value="FileViewComputerIcon" />
1349		-->
1350		<imageIcon id="FileViewDirectoryIcon" path="distrib/resources/FileChooser/btn_up_disabled.png" />
1351		<property key="FileView.directoryIcon" type="idref"
1352		value="FileViewDirectoryIcon" />
1353
1354		<imageIcon id="FileChooserNewFolderIcon" path="distrib/resources/FileChooser/btn_new_folder.png" />
1355		<property key="FileChooser.newFolderIcon" type="idref"
1356		value="FileChooserNewFolderIcon" />
1357
1358		<imageIcon id="FileChooserUpFolderIcon" path="distrib/resources/FileChooser/btn_up.png" />
1359		<property key="FileChooser.upFolderIcon" type="idref"
1360		value="FileChooserUpFolderIcon" />
1361
1362		<imageIcon id="FileChooserHomeFolderIcon" path="distrib/resources/FileChooser/btn_home.png" />
1363		<property key="FileChooser.homeFolderIcon" type="idref"
1364		value="FileChooserHomeFolderIcon" />
1365
1366		<imageIcon id="FileChooserDetailsViewIcon" path="distrib/resources/FileChooser/btn_details.png" />
1367		<property key="FileChooser.detailsViewIcon" type="idref"
1368		value="FileChooserDetailsViewIcon" />
1369		</style>
1370		<bind style="FileChooserStyle" type="region" key="FileChooser" />
1371		<!--
1372		<style id="SeparatorStyle">
1373		<property key="Separator.thickness" type="integer"
1374		value="1" />
1375		<state>
1376		<color type="BACKGROUND" value="#bec1c4"/>
1377		</state>
1378		</style>
1379		<bind style="SeparatorStyle" type="region" key="Separator" />
1380		-->
	1418	value="FileViewFloppyDriveIcon" /> <imageIcon id="FileViewFileIcon"
	1419	path="/resources/FileChooser" /> <property key="FileView.fileIcon"
	1420	type="idref" value="FileViewFileIcon" /> <imageIcon
	1421	id="FileViewComputerIcon" path="/resources/FileChooser" /> <property
	1422	key="FileView.computerIcon" type="idref" value="FileViewComputerIcon"
	1423	/>
	1424	-->
	1425	<imageIcon id="FileViewDirectoryIcon" path="/resources/FileChooser/btn_up_disabled.png"
	1426	sourceInsets="0 0 0 0" />
	1427	<property key="FileView.directoryIcon" type="idref"
	1428	value="FileViewDirectoryIcon" />
	1429
	1430	<imageIcon id="FileChooserNewFolderIcon" path="/resources/FileChooser/btn_new_folder.png"
	1431	sourceInsets="0 0 0 0" />
	1432	<property key="FileChooser.newFolderIcon" type="idref"
	1433	value="FileChooserNewFolderIcon" />
	1434
	1435	<imageIcon id="FileChooserUpFolderIcon" path="/resources/FileChooser/btn_up.png"
	1436	sourceInsets="0 0 0 0" />
	1437	<property key="FileChooser.upFolderIcon" type="idref"
	1438	value="FileChooserUpFolderIcon" />
	1439
	1440	<imageIcon id="FileChooserHomeFolderIcon" path="/resources/FileChooser/btn_home.png"
	1441	sourceInsets="0 0 0 0" />
	1442	<property key="FileChooser.homeFolderIcon" type="idref"
	1443	value="FileChooserHomeFolderIcon" />
	1444
	1445	<imageIcon id="FileChooserDetailsViewIcon" path="/resources/FileChooser/btn_details.png"
	1446	sourceInsets="0 0 0 0" />
	1447	<property key="FileChooser.detailsViewIcon" type="idref"
	1448	value="FileChooserDetailsViewIcon" />
	1449	</style>
	1450	<bind style="FileChooserStyle" type="region" key="FileChooser" />
	1451	<!--
	1452	<style id="SeparatorStyle"> <property key="Separator.thickness"
	1453	type="integer" value="1" /> <state> <color type="BACKGROUND"
	1454	value="#bec1c4"/> </state> </style> <bind style="SeparatorStyle"
	1455	type="region" key="Separator" />
	1456	-->
1381	1457	<style id="SplitPaneDividerStyle">
1382		<property key="Separator.thickness" type="integer"
1383		~~value="1" /~~>
1384		~~<state>~~
1385		~~<imagePainter method="splitPaneDividerBackground" path="distrib/resources/md_panel_bg.png" sourceInsets="0 0 0 0"~~/>
	1458	<property key="Separator.thickness" type="integer" value="1" />
	1459	<state>
	1460	<imagePainter method="splitPaneDividerBackground" path="/resources/md_panel_bg.png"
	1461	sourceInsets="0 0 0 0" />
1386	1462	</state>
1387	1463	</style>
1388	1464	<bind style="SplitPaneDividerStyle" type="region" key="SplitPaneDivider" />
1389
	1465
1390	1466	<!-- ================================= -->
1391	1467	<!-- CONNECTION PALETTE ADD BUTTON -->
…	…
1394	1470	<insets top="11" left="11" right="11" bottom="11" />
1395	1471	<state value="ENABLED">
1396		<imagePainter method="buttonBackground" path="~~distrib~~/resources/serverPalette/btn_add.png"
1397		sourceInsets="0 0 0 0" />
1398		</state>
1399		<state value="DISABLED">
1400		<imagePainter method="buttonBackground" path="~~distrib~~/resources/serverPalette/btn_add_disabled.png"
1401		sourceInsets="0 0 0 0" />
1402		</state>
1403		<state value="PRESSED">
1404		<imagePainter method="buttonBackground" path="~~distrib~~/resources/serverPalette/btn_add_pressed.png"
1405		sourceInsets="0 0 0 0" />
1406		</state>
1407		<state value="MOUSE_OVER">
1408		<imagePainter method="buttonBackground" path="~~distrib~~/resources/serverPalette/btn_add_over.png"
	1472	<imagePainter method="buttonBackground" path="/resources/serverPalette/btn_add.png"
	1473	sourceInsets="0 0 0 0" />
	1474	</state>
	1475	<state value="DISABLED">
	1476	<imagePainter method="buttonBackground" path="/resources/serverPalette/btn_add_disabled.png"
	1477	sourceInsets="0 0 0 0" />
	1478	</state>
	1479	<state value="PRESSED">
	1480	<imagePainter method="buttonBackground" path="/resources/serverPalette/btn_add_pressed.png"
	1481	sourceInsets="0 0 0 0" />
	1482	</state>
	1483	<state value="MOUSE_OVER">
	1484	<imagePainter method="buttonBackground" path="/resources/serverPalette/btn_add_over.png"
1409	1485	sourceInsets="0 0 0 0" />
1410	1486	</state>
…	…
1419	1495	<insets top="11" left="11" right="11" bottom="11" />
1420	1496	<state value="ENABLED">
1421		<imagePainter method="buttonBackground" path="~~distrib~~/resources/serverPalette/btn_edit.png"
1422		sourceInsets="0 0 0 0" />
1423		</state>
1424		<state value="DISABLED">
1425		<imagePainter method="buttonBackground" path="~~distrib~~/resources/serverPalette/btn_edit_disabled.png"
1426		sourceInsets="0 0 0 0" />
1427		</state>
1428		<state value="PRESSED">
1429		<imagePainter method="buttonBackground" path="~~distrib~~/resources/serverPalette/btn_edit_pressed.png"
1430		sourceInsets="0 0 0 0" />
1431		</state>
1432		<state value="MOUSE_OVER">
1433		<imagePainter method="buttonBackground" path="~~distrib~~/resources/serverPalette/btn_edit_over.png"
	1497	<imagePainter method="buttonBackground" path="/resources/serverPalette/btn_edit.png"
	1498	sourceInsets="0 0 0 0" />
	1499	</state>
	1500	<state value="DISABLED">
	1501	<imagePainter method="buttonBackground" path="/resources/serverPalette/btn_edit_disabled.png"
	1502	sourceInsets="0 0 0 0" />
	1503	</state>
	1504	<state value="PRESSED">
	1505	<imagePainter method="buttonBackground" path="/resources/serverPalette/btn_edit_pressed.png"
	1506	sourceInsets="0 0 0 0" />
	1507	</state>
	1508	<state value="MOUSE_OVER">
	1509	<imagePainter method="buttonBackground" path="/resources/serverPalette/btn_edit_over.png"
1434	1510	sourceInsets="0 0 0 0" />
1435	1511	</state>
…	…
1444	1520	<insets top="11" left="12" right="11" bottom="11" />
1445	1521	<state value="ENABLED">
1446		<imagePainter method="buttonBackground" path="~~distrib~~/resources/serverPalette/btn_delete.png"
1447		sourceInsets="0 0 0 0" />
1448		</state>
1449		<state value="DISABLED">
1450		<imagePainter method="buttonBackground" path="~~distrib~~/resources/serverPalette/btn_delete_disabled.png"
1451		sourceInsets="0 0 0 0" />
1452		</state>
1453		<state value="PRESSED">
1454		<imagePainter method="buttonBackground" path="~~distrib~~/resources/serverPalette/btn_delete_pressed.png"
1455		sourceInsets="0 0 0 0" />
1456		</state>
1457		<state value="MOUSE_OVER">
1458		<imagePainter method="buttonBackground" path="~~distrib~~/resources/serverPalette/btn_delete_over.png"
	1522	<imagePainter method="buttonBackground" path="/resources/serverPalette/btn_delete.png"
	1523	sourceInsets="0 0 0 0" />
	1524	</state>
	1525	<state value="DISABLED">
	1526	<imagePainter method="buttonBackground" path="/resources/serverPalette/btn_delete_disabled.png"
	1527	sourceInsets="0 0 0 0" />
	1528	</state>
	1529	<state value="PRESSED">
	1530	<imagePainter method="buttonBackground" path="/resources/serverPalette/btn_delete_pressed.png"
	1531	sourceInsets="0 0 0 0" />
	1532	</state>
	1533	<state value="MOUSE_OVER">
	1534	<imagePainter method="buttonBackground" path="/resources/serverPalette/btn_delete_over.png"
1459	1535	sourceInsets="0 0 0 0" />
1460	1536	</state>
…	…
1467	1543	<style id="listPaletteListButton">
1468	1544	<state value="ENABLED">
1469		<imagePainter method="buttonBackground" path="~~distrib~~/resources/Palettes/list_button.png"
	1545	<imagePainter method="buttonBackground" path="/resources/Palettes/list_button.png"
1470	1546	sourceInsets="5 5 5 5" />
1471	1547	</state>
1472	1548	<state value="DISABLED">
1473		<imagePainter method="buttonBackground" path="~~distrib~~/resources/Palettes/list_button_disabled.png"
	1549	<imagePainter method="buttonBackground" path="/resources/Palettes/list_button_disabled.png"
1474	1550	sourceInsets="5 5 5 5" />
1475	1551	</state>
1476	1552	<state value="PRESSED">
1477		<imagePainter method="buttonBackground" path="~~distrib~~/resources/Palettes/list_button_pressed.png"
	1553	<imagePainter method="buttonBackground" path="/resources/Palettes/list_button_pressed.png"
1478	1554	sourceInsets="5 5 5 5" />
1479	1555	</state>
1480	1556	<state value="MOUSE_OVER">
1481		<imagePainter method="buttonBackground" path="~~distrib~~/resources/Palettes/list_button_over.png"
	1557	<imagePainter method="buttonBackground" path="/resources/Palettes/list_button_over.png"
1482	1558	sourceInsets="5 5 5 5" />
1483	1559	</state>
…	…
1493	1569	<insets top="11" left="11" right="11" bottom="11" />
1494	1570	<state value="ENABLED">
1495		<imagePainter method="buttonBackground" path="~~distrib~~/resources/PagePreviewPalette/add_after.png"
1496		sourceInsets="0 0 0 0" />
1497		</state>
1498		<state value="DISABLED">
1499		<imagePainter method="buttonBackground" path="~~distrib~~/resources/PagePreviewPalette/add_after_disabled.png"
1500		sourceInsets="0 0 0 0" />
1501		</state>
1502		<state value="PRESSED">
1503		<imagePainter method="buttonBackground" path="~~distrib~~/resources/PagePreviewPalette/add_after_pressed.png"
1504		sourceInsets="0 0 0 0" />
1505		</state>
1506		<state value="MOUSE_OVER">
1507		<imagePainter method="buttonBackground" path="~~distrib~~/resources/PagePreviewPalette/add_after_over.png"
	1571	<imagePainter method="buttonBackground" path="/resources/PagePreviewPalette/add_after.png"
	1572	sourceInsets="0 0 0 0" />
	1573	</state>
	1574	<state value="DISABLED">
	1575	<imagePainter method="buttonBackground" path="/resources/PagePreviewPalette/add_after_disabled.png"
	1576	sourceInsets="0 0 0 0" />
	1577	</state>
	1578	<state value="PRESSED">
	1579	<imagePainter method="buttonBackground" path="/resources/PagePreviewPalette/add_after_pressed.png"
	1580	sourceInsets="0 0 0 0" />
	1581	</state>
	1582	<state value="MOUSE_OVER">
	1583	<imagePainter method="buttonBackground" path="/resources/PagePreviewPalette/add_after_over.png"
1508	1584	sourceInsets="0 0 0 0" />
1509	1585	</state>
…	…
1517	1593	<insets top="11" left="11" right="11" bottom="11" />
1518	1594	<state value="ENABLED">
1519		<imagePainter method="buttonBackground" path="~~distrib~~/resources/PagePreviewPalette/add_before.png"
1520		sourceInsets="0 0 0 0" />
1521		</state>
1522		<state value="DISABLED">
1523		<imagePainter method="buttonBackground" path="~~distrib~~/resources/PagePreviewPalette/add_before_disabled.png"
1524		sourceInsets="0 0 0 0" />
1525		</state>
1526		<state value="PRESSED">
1527		<imagePainter method="buttonBackground" path="~~distrib~~/resources/PagePreviewPalette/add_before_pressed.png"
1528		sourceInsets="0 0 0 0" />
1529		</state>
1530		<state value="MOUSE_OVER">
1531		<imagePainter method="buttonBackground" path="~~distrib~~/resources/PagePreviewPalette/add_before_over.png"
	1595	<imagePainter method="buttonBackground" path="/resources/PagePreviewPalette/add_before.png"
	1596	sourceInsets="0 0 0 0" />
	1597	</state>
	1598	<state value="DISABLED">
	1599	<imagePainter method="buttonBackground" path="/resources/PagePreviewPalette/add_before_disabled.png"
	1600	sourceInsets="0 0 0 0" />
	1601	</state>
	1602	<state value="PRESSED">
	1603	<imagePainter method="buttonBackground" path="/resources/PagePreviewPalette/add_before_pressed.png"
	1604	sourceInsets="0 0 0 0" />
	1605	</state>
	1606	<state value="MOUSE_OVER">
	1607	<imagePainter method="buttonBackground" path="/resources/PagePreviewPalette/add_before_over.png"
1532	1608	sourceInsets="0 0 0 0" />
1533	1609	</state>
…	…
1541	1617	<insets top="11" left="12" right="11" bottom="11" />
1542	1618	<state value="ENABLED">
1543		<imagePainter method="buttonBackground" path="~~distrib~~/resources/Palettes/btn_delete.png"
1544		sourceInsets="0 0 0 0" />
1545		</state>
1546		<state value="DISABLED">
1547		<imagePainter method="buttonBackground" path="~~distrib~~/resources/Palettes/btn_delete_disabled.png"
1548		sourceInsets="0 0 0 0" />
1549		</state>
1550		<state value="PRESSED">
1551		<imagePainter method="buttonBackground" path="~~distrib~~/resources/Palettes/btn_delete_pressed.png"
1552		sourceInsets="0 0 0 0" />
1553		</state>
1554		<state value="MOUSE_OVER">
1555		<imagePainter method="buttonBackground" path="~~distrib~~/resources/Palettes/btn_delete_over.png"
	1619	<imagePainter method="buttonBackground" path="/resources/Palettes/btn_delete.png"
	1620	sourceInsets="0 0 0 0" />
	1621	</state>
	1622	<state value="DISABLED">
	1623	<imagePainter method="buttonBackground" path="/resources/Palettes/btn_delete_disabled.png"
	1624	sourceInsets="0 0 0 0" />
	1625	</state>
	1626	<state value="PRESSED">
	1627	<imagePainter method="buttonBackground" path="/resources/Palettes/btn_delete_pressed.png"
	1628	sourceInsets="0 0 0 0" />
	1629	</state>
	1630	<state value="MOUSE_OVER">
	1631	<imagePainter method="buttonBackground" path="/resources/Palettes/btn_delete_over.png"
1556	1632	sourceInsets="0 0 0 0" />
1557	1633	</state>
…	…
1567	1643	<insets top="0" left="0" bottom="0" right="0"/>
1568	1644	<state value="ENABLED">
1569		<imagePainter method="PanelBackground" path="~~distrib~~/resources/empty_background.png"
	1645	<imagePainter method="PanelBackground" path="/resources/empty_background.png"
1570	1646	sourceInsets="6 6 17 6" />
1571	1647	</state>
…	…
1579	1655	<insets top="5" left="5" bottom="1" right="5"/>
1580	1656	<state value="ENABLED">
1581		<imagePainter method="PanelBackground" path="~~distrib~~/resources/PagePreviewPalette/page_preview_thumb.png"
	1657	<imagePainter method="PanelBackground" path="/resources/PagePreviewPalette/page_preview_thumb.png"
1582	1658	sourceInsets="6 6 17 6" />
1583	1659	</state>
…	…
1591	1667	<insets top="5" left="5" bottom="1" right="5"/>
1592	1668	<state value="ENABLED">
1593		<imagePainter method="PanelBackground" path="~~distrib~~/resources/PagePreviewPalette/page_preview_thumb_selected.png"
	1669	<imagePainter method="PanelBackground" path="/resources/PagePreviewPalette/page_preview_thumb_selected.png"
1594	1670	sourceInsets="6 6 17 6" />
1595	1671	</state>
…	…
1602	1678	<style id="pagePreviewPaletteList">
1603	1679	<state value="ENABLED">
1604		<imagePainter method="listBackground" path="~~distrib~~/resources/md_panel_bg.png"
1605		sourceInsets="0 0 0 0" />
1606		</state>
1607		<state value="DISABLED">
1608		<imagePainter method="listBackground" path="~~distrib~~/resources/md_panel_bg.png"
	1680	<imagePainter method="listBackground" path="/resources/md_panel_bg.png"
	1681	sourceInsets="0 0 0 0" />
	1682	</state>
	1683	<state value="DISABLED">
	1684	<imagePainter method="listBackground" path="/resources/md_panel_bg.png"
1609	1685	sourceInsets="0 0 0 0" />
1610	1686	</state>
…	…
1616	1692	<!--
1617	1693	================================= <style id="ScenePanelStyle"> <state>
1618		<imageIcon id="~~tileImage" path="distrib~~/resources/app_bg.png"/> <property
1619		key="~~tileImage" type="idref" value="tileImage~~"/> <painter
1620		method="panelBackground" idref="~~TilePainter"/> </state> </style> <bind~~
1621		style="ScenePanelStyle" type="name" key="ScenePanel" />
	1694	<imageIcon id="BACKGROUND" path="/resources/app_bg.png"/> <property
	1695	key="BACKGROUND" type="idref" value="BACKGROUND"/> <painter
	1696	method="panelBackground" idref="SophiePainter"/> </state> </style>
	1697	<bind style="ScenePanelStyle" type="name" key="ScenePanel" />
1622	1698	-->
1623	1699
…	…
1626	1702	<!--
1627	1703	================================= <style id="DesktopPaneStyle">
1628		<state> <imageIcon id="~~tileImage" path="distrib~~/resources/app_bg.png"/>
1629		<property key="~~tileImage" type="idref" value="tileImage~~"/> <painter
1630		method="panelBackground" idref="~~TilePainter"/> </state> </style> <bind~~
1631		style="DesktopPaneStyle" type="region" key="DesktopPane" />
	1704	<state> <imageIcon id="BACKGROUND" path="/resources/app_bg.png"/>
	1705	<property key="BACKGROUND" type="idref" value="BACKGROUND"/> <painter
	1706	method="panelBackground" idref="SophiePainter"/> </state> </style>
	1707	<bind style="DesktopPaneStyle" type="region" key="DesktopPane" />
1632	1708	-->
1633	1709
…	…
1637	1713	=========== <style id="ScrollPaneStyle"> <property
1638	1714	key="ScrollPane.viewportBorderInsets" type="insets" value="0 0 0 0" />
1639		<state> <imageIcon id="~~tileImage" path="distrib~~/resources/app_bg.png"/>
1640		<property key="~~tileImage" type="idref" value="tileImage~~"/> <painter
1641		method="panelBackground" idref="~~TilePainter"/> </state> </style> <bind~~
1642		style="ScrollPaneStyle" type="region" key="ScrollPane" />
	1715	<state> <imageIcon id="BACKGROUND" path="/resources/app_bg.png"/>
	1716	<property key="BACKGROUND" type="idref" value="BACKGROUND"/> <painter
	1717	method="panelBackground" idref="SophiePainter"/> </state> </style>
	1718	<bind style="ScrollPaneStyle" type="region" key="ScrollPane" />
1643	1719	-->
1644	1720
1645	1721	<!--
1646	1722	<style id="CheckBoxMenuItemStyle"> <state> <imagePainter
1647		method="CheckBoxMenuItemBackground" path="~~distrib~~/resources/text_bg.png"
	1723	method="CheckBoxMenuItemBackground" path="/resources/text_bg.png"
1648	1724	sourceInsets="0 0 0 0" /> </state> </style> <bind
1649	1725	style="CheckBoxMenuItemStyle" type="region" key="CheckBoxMenuItem" />
…	…
1750	1826
1751	1827	<!--
1752		<style id="SplitPaneStyle"> <property
1753		~~key="SplitPane.size"~~ type="integer" value="0" /> <state> <imagePainter
1754		method="SplitPaneBackground" path="~~distrib~~/resources/panel_bg.png"
	1828	<style id="SplitPaneStyle"> <property key="SplitPane.size"
	1829	type="integer" value="0" /> <state> <imagePainter
	1830	method="SplitPaneBackground" path="/resources/panel_bg.png"
1755	1831	sourceInsets="0 0 0 0" /> </state> </style> <bind
1756	1832	style="SplitPaneStyle" type="region" key="SplitPane" />
…	…
1769	1845	<!--
1770	1846	<style id="ViewportStyle"> <state> <imagePainter
1771		method="ViewportBackground" path="~~distrib~~/resources/panel_bg.png"
	1847	method="ViewportBackground" path="/resources/panel_bg.png"
1772	1848	sourceInsets="0 0 0 0"/> </state> </style> <bind style="ViewportStyle"
1773	1849	type="region" key="Viewport"/>

branches/private/pav/NEW_JAVA_5/sophie2-platform/modules/org.sophie2.main.ws_connector/.classpath

r5047	r7238
5	5	<classpathentry kind="src" output="target/test-classes" path="src/test/java"/>
6	6	<classpathentry excluding="**" kind="src" output="target/test-classes" path="src/test/resources"/>
7		~~<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>~~
8	7	<classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
	8	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/jdk1.5.0_21"/>
9	9	<classpathentry kind="output" path="target/classes"/>
10	10	</classpath>

branches/private/pav/NEW_JAVA_5/sophie2-platform/modules/org.sophie2.main.ws_connector/.settings/org.eclipse.jdt.core.prefs

r2023	r7238
1		#~~Thu Sep 18 21:11:04 EEST 2008~~
	1	#Mon Oct 05 13:44:35 AFT 2009
2	2	eclipse.preferences.version=1
3	3	org.eclipse.jdt.core.builder.cleanOutputFolder=clean
…	…
18	18	org.eclipse.jdt.core.codeComplete.staticFieldSuffixes=
19	19	org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
20		org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
	20	org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
21	21	org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
22		org.eclipse.jdt.core.compiler.compliance=1.6
	22	org.eclipse.jdt.core.compiler.compliance=1.5
23	23	org.eclipse.jdt.core.compiler.debug.lineNumber=generate
24	24	org.eclipse.jdt.core.compiler.debug.localVariable=generate
…	…
97	97	org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
98	98	org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
99		org.eclipse.jdt.core.compiler.source=1.6
	99	org.eclipse.jdt.core.compiler.source=1.5
100	100	org.eclipse.jdt.core.compiler.taskCaseSensitive=enabled
101	101	org.eclipse.jdt.core.compiler.taskPriorities=NORMAL,HIGH,NORMAL

branches/private/pav/NEW_JAVA_5/sophie2-platform/modules/org.sophie2.main.ws_connector/src/main/java/org/sophie2/main/ws_connector/FacadeInvocationHandler.java

r6880	r7238
57	57	}
58	58
59		~~@Override~~
60	59	public Object invoke(Object proxy, Method method, Object[] args)
61	60	throws Throwable {
…	…
87	86	.createResponse(new ResponseProducer<Exception>() {
88	87
89		~~@Override~~
90	88	public Exception produce() throws ResponseExcpetion {
91	89	throw new ResponseExcpetion(

branches/private/pav/NEW_JAVA_5/sophie2-platform/modules/org.sophie2.main.ws_connector/src/main/java/org/sophie2/main/ws_connector/WSConnector.java

r6013	r7238
38	38	}
39	39
40		~~@Override~~
41	40	public FacadeR4 getFacade(String serverLocation) {
42	41	assert serverLocation != null : "Server location cannot be null";
…	…
64	63	}
65	64
66		~~@Override~~
67	65	public boolean supports(String serverLocation) {
68	66	assert serverLocation != null : "Server location cannot be null";

branches/private/pav/NEW_JAVA_5/sophie2-platform/modules/org.sophie2.reader/.classpath

r2492	r7238
5	5	<classpathentry kind="src" output="target/test-classes" path="src/test/java"/>
6	6	<classpathentry excluding="**" kind="src" output="target/test-classes" path="src/test/resources"/>
7		<classpathentry kind="con"
8		path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6" />
9		<classpathentry kind="con"
10		path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER" />
11		<classpathentry kind="output" path="target/classes" />
	7	<classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
	8	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/jdk1.5.0_21"/>
	9	<classpathentry kind="output" path="target/classes"/>
12	10	</classpath>

branches/private/pav/NEW_JAVA_5/sophie2-platform/modules/org.sophie2.reader/.settings/org.eclipse.jdt.core.prefs

r2492	r7238
1		#~~Thu Sep 18 21:11:04 EEST 2008~~
	1	#Mon Oct 05 13:44:42 AFT 2009
2	2	eclipse.preferences.version=1
3	3	org.eclipse.jdt.core.builder.cleanOutputFolder=clean
…	…
18	18	org.eclipse.jdt.core.codeComplete.staticFieldSuffixes=
19	19	org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
20		org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
	20	org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
21	21	org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
22		org.eclipse.jdt.core.compiler.compliance=1.6
	22	org.eclipse.jdt.core.compiler.compliance=1.5
23	23	org.eclipse.jdt.core.compiler.debug.lineNumber=generate
24	24	org.eclipse.jdt.core.compiler.debug.localVariable=generate
…	…
97	97	org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
98	98	org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
99		org.eclipse.jdt.core.compiler.source=1.6
	99	org.eclipse.jdt.core.compiler.source=1.5
100	100	org.eclipse.jdt.core.compiler.taskCaseSensitive=enabled
101	101	org.eclipse.jdt.core.compiler.taskPriorities=NORMAL,HIGH,NORMAL

branches/private/pav/NEW_JAVA_5/sophie2-platform/modules/org.sophie2.server/.classpath

r348	r7238
5	5	<classpathentry kind="src" output="target/test-classes" path="src/test/java"/>
6	6	<classpathentry excluding="**" kind="src" output="target/test-classes" path="src/test/resources"/>
7		~~<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>~~
8	7	<classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
	8	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/jdk1.5.0_21"/>
9	9	<classpathentry kind="output" path="target/classes"/>
10	10	</classpath>

branches/private/pav/NEW_JAVA_5/sophie2-platform/modules/org.sophie2.server.core/.classpath

r6206	r7238
5	5	<classpathentry kind="src" output="target/test-classes" path="src/test/java"/>
6	6	<classpathentry excluding="**" kind="src" output="target/test-classes" path="src/test/resources"/>
7		~~<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>~~
8	7	<classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
	8	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/jdk1.5.0_21"/>
9	9	<classpathentry kind="output" path="target/classes"/>
10	10	</classpath>

branches/private/pav/NEW_JAVA_5/sophie2-platform/modules/org.sophie2.server.core/.settings/org.eclipse.jdt.core.prefs

r5787	r7238
1		#~~Fri Aug 28 17:11:15 EES~~T 2009
	1	#Mon Oct 05 13:45:26 AFT 2009
2	2	eclipse.preferences.version=1
3	3	org.eclipse.jdt.core.builder.cleanOutputFolder=clean
…	…
18	18	org.eclipse.jdt.core.codeComplete.staticFieldSuffixes=
19	19	org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
20		org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
	20	org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
21	21	org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
22		org.eclipse.jdt.core.compiler.compliance=1.6
	22	org.eclipse.jdt.core.compiler.compliance=1.5
23	23	org.eclipse.jdt.core.compiler.debug.lineNumber=generate
24	24	org.eclipse.jdt.core.compiler.debug.localVariable=generate
…	…
97	97	org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
98	98	org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
99		org.eclipse.jdt.core.compiler.source=1.6
	99	org.eclipse.jdt.core.compiler.source=1.5
100	100	org.eclipse.jdt.core.compiler.taskCaseSensitive=enabled
101	101	org.eclipse.jdt.core.compiler.taskPriorities=NORMAL,HIGH,NORMAL

branches/private/pav/NEW_JAVA_5/sophie2-platform/modules/org.sophie2.server.core/src/main/java/org/sophie2/server/core/facade/HttpFacadeService.java

r6172	r7238
46	46	}
47	47
48		~~@Override~~
49	48	public Object invoke(Object proxy, Method method, Object[] args)
50	49	throws Throwable {
…	…
144	143	return new InvocationResult() {
145	144
146		~~@Override~~
147	145	public String getContentType() {
148	146	return RESULT_CONTENT_TYPE;
149	147	}
150	148
151		~~@Override~~
152	149	public InputStream getStream() throws IOException {
153	150	return new ByteArrayInputStream(xmlRef.get().getBytes(
154		charset));
	151	charset.toString()));
155	152	}
156	153	};

branches/private/pav/NEW_JAVA_5/sophie2-platform/modules/org.sophie2.server.core/src/main/java/org/sophie2/server/core/facade/ServerConnector.java

r6880	r7238
44	44	* Creates a facade by specified server url.
45	45	*/
46		~~@Override~~
47	46	public FacadeR4 getFacade(String serverUrl) {
48	47	String normalizedServerUrl = normalizeServerUrl(serverUrl);
…	…
86	85	* to given server URL.
87	86	*/
88		~~@Override~~
89	87	public boolean supports(String url) {
90	88	return true;

branches/private/pav/NEW_JAVA_5/sophie2-platform/modules/org.sophie2.server.core/src/main/java/org/sophie2/server/core/facade/ServerFacade.java

r6880	r7238
39	39	private static <T> ResponseProducer<T> notImplementedProducer() {
40	40	return new ResponseProducer<T>() {
41		~~@Override~~
42	41	public T produce() throws ResponseExcpetion {
43	42	throw new ResponseExcpetion("Not implemented");
…	…
76	75
77	76
78		~~@Override~~
79	77	public Response<String> openSession() {
80	78	final ServerSession server = this.serverSession;
81	79	return Response.<String> createResponse(new ResponseProducer<String>() {
82		~~@Override~~
83	80	public String produce() {
84	81	String sessionId = server
…	…
89	86	}
90	87
91		~~@Override~~
92	88	public Response<Void> closeSession(final String sessionId) {
93	89	final ServerSession server = this.serverSession;
94	90	return Response.<Void> createResponse(new ResponseProducer<Void>() {
95		~~@Override~~
96	91	public Void produce() {
97	92	server.closeSession(sessionId);
…	…
101	96	}
102	97
103		~~@Override~~
104	98	public Response<Void> login(final String sessionId, ResourceRefR4 userRef,
105	99	final String password) {
…	…
112	106
113	107	return Response.<Void> createResponse(new AccessResponseProducer<Void>(sessionId, newOwner) {
114		~~@Override~~
115	108	public Void produce() throws ResponseExcpetion {
116	109	UserH user = ResourceH.getHelper(getAccess(), UserH.class);
…	…
127	120	}
128	121
129		~~@Override~~
130	122	public Response<Void> startRegistration(String sid, ResourceRefR4 user,
131	123	String password, String email) {
…	…
134	126	}
135	127
136		~~@Override~~
137	128	public Response<Void> confirmRegistration(String sid, ResourceRefR4 user,
138	129	String secretKey) {
…	…
141	132	}
142	133
143		~~@Override~~
144	134	public Response<Void> logout(final String sessionId) {
145	135	final ServerSession server = this.serverSession;
146	136	return Response.<Void> createResponse(new ResponseProducer<Void>() {
147		~~@Override~~
148	137	public Void produce() throws ResponseExcpetion {
149	138	ResourceRefR4 sessionUser = server.getSessionUser(sessionId,
…	…
183	172	}
184	173
185		~~@Override~~
186	174	public <T> Response<T> getResourceEntry(String sessionId,
187	175	ResourceRefR4 ref, final RevisionId revisionId, final UndefinedKey<T> key) {
188	176
189	177	return Response.<T> createResponse(new AccessResponseProducer<T>(sessionId, ref) {
190		~~@Override~~
191	178	public T produce() throws ResponseExcpetion {
192	179	ResourceRevision revision = ServerFacadeUtils.findFirstNotAfter(
…	…
204	191	}
205	192
206		~~@Override~~
207	193	public Response<ImmList<HistoryEntry>> getResourceHistory(String sessionId,
208	194	ResourceRefR4 ref, final RevisionId from, final RevisionId to,
…	…
216	202	.<ImmList<HistoryEntry>> createResponse(new AccessResponseProducer<ImmList<HistoryEntry>>(sessionId, ref) {
217	203
218		~~@Override~~
219	204	public ImmList<HistoryEntry> produce()
220	205	throws ResponseExcpetion {
…	…
249	234	}
250	235
251		~~@Override~~
252	236	public Response<ImmList<HistoryEntry>> syncResource(String sessionId,
253	237	final ResourceRefR4 ref, final RevisionId lastSyncId, final ImmList<HistoryEntry> changesList) {
…	…
257	241	return Response.<ImmList<HistoryEntry>> createResponse(
258	242	new AccessResponseProducer<ImmList<HistoryEntry>>(sessionId, ref) {
259		~~@Override~~
260	243	public ImmList<HistoryEntry> produce()
261	244	throws ResponseExcpetion {
…	…
303	286	}
304	287
305		~~@Override~~
306	288	public Response<BinData> getBinPart(String sid, ResourceRefR4 ref,
307	289	Key<BinData> binKey, int start, int size) {
…	…
310	292	}
311	293
312		~~@Override~~
313	294	public Response<Integer> getBinSize(String sid, ResourceRefR4 ref,
314	295	Key<BinData> binKey) {
…	…
317	298	}
318	299
319		~~@Override~~
320	300	public Response<BinData> getDownload(String sid, ResourceRefR4 ref,
321	301	DownloadFormat format) {

branches/private/pav/NEW_JAVA_5/sophie2-platform/modules/org.sophie2.server.core/src/main/java/org/sophie2/server/core/facade/ServerSession.java

r6466	r7238
236	236	* equal it compares session id of each session.
237	237	*/
238		~~@Override~~
239	238	public int compareTo(UserSession o) {
240	239	long diff = this.endTimestamp - o.endTimestamp;

branches/private/pav/NEW_JAVA_5/sophie2-platform/modules/org.sophie2.server/.settings/org.eclipse.jdt.core.prefs

r917	r7238
1		#~~Thu Sep 18 21:11:04 EEST 2008~~
	1	#Mon Oct 05 13:45:19 AFT 2009
2	2	eclipse.preferences.version=1
3	3	org.eclipse.jdt.core.builder.cleanOutputFolder=clean
…	…
18	18	org.eclipse.jdt.core.codeComplete.staticFieldSuffixes=
19	19	org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
20		org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
	20	org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
21	21	org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
22		org.eclipse.jdt.core.compiler.compliance=1.6
	22	org.eclipse.jdt.core.compiler.compliance=1.5
23	23	org.eclipse.jdt.core.compiler.debug.lineNumber=generate
24	24	org.eclipse.jdt.core.compiler.debug.localVariable=generate
…	…
97	97	org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
98	98	org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
99		org.eclipse.jdt.core.compiler.source=1.6
	99	org.eclipse.jdt.core.compiler.source=1.5
100	100	org.eclipse.jdt.core.compiler.taskCaseSensitive=enabled
101	101	org.eclipse.jdt.core.compiler.taskPriorities=NORMAL,HIGH,NORMAL

branches/private/pav/NEW_JAVA_5/sophie2-platform/modules/org.sophie2.server.webapp/.classpath

r5441	r7238
5	5	<classpathentry kind="src" output="target/test-classes" path="src/test/java"/>
6	6	<classpathentry excluding="**" kind="src" output="target/test-classes" path="src/test/resources"/>
7		~~<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>~~
8	7	<classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
	8	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/jdk1.5.0_21"/>
9	9	<classpathentry kind="output" path="target/classes"/>
10	10	</classpath>

branches/private/pav/NEW_JAVA_5/sophie2-platform/modules/org.sophie2.server.webapp/.settings/org.eclipse.jdt.core.prefs

r5787	r7238
1		#~~Fri Aug 28 17:10:47 EES~~T 2009
	1	#Mon Oct 05 13:45:33 AFT 2009
2	2	eclipse.preferences.version=1
3	3	org.eclipse.jdt.core.builder.cleanOutputFolder=clean
…	…
18	18	org.eclipse.jdt.core.codeComplete.staticFieldSuffixes=
19	19	org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
20		org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
	20	org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
21	21	org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
22		org.eclipse.jdt.core.compiler.compliance=1.6
	22	org.eclipse.jdt.core.compiler.compliance=1.5
23	23	org.eclipse.jdt.core.compiler.debug.lineNumber=generate
24	24	org.eclipse.jdt.core.compiler.debug.localVariable=generate
…	…
97	97	org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
98	98	org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
99		org.eclipse.jdt.core.compiler.source=1.6
	99	org.eclipse.jdt.core.compiler.source=1.5
100	100	org.eclipse.jdt.core.compiler.taskCaseSensitive=enabled
101	101	org.eclipse.jdt.core.compiler.taskPriorities=NORMAL,HIGH,NORMAL

branches/private/pav/NEW_JAVA_5/sophie2-platform/modules/org.sophie2.server.webapp/src/main/java/org/sophie2/server/webapp/ControllerServlet.java

r6466	r7238
40	40	this.configAwareServletConfig = new ServletConfig() {
41	41
42		~~@Override~~
43	42	public String getInitParameter(String name) {
44	43	return getServletConfig().getInitParameter(name);
45	44	}
46	45
47		~~@Override~~
48	46	public Enumeration<?> getInitParameterNames() {
49	47	return getServletConfig().getInitParameterNames();
50	48	}
51	49
52		~~@Override~~
53	50	public ServletContext getServletContext() {
54	51	return getServletConfig().getServletContext();
55	52	}
56	53
57		~~@Override~~
58	54	public String getServletName() {
59	55	return null;

branches/private/pav/NEW_JAVA_5/sophie2-platform/modules/org.sophie2.server.webapp/src/main/java/org/sophie2/server/webapp/HttpService.java

r6172	r7238
140	140	}
141	141
142		~~@Override~~
143	142	public boolean canHandle(String path) {
144	143	return path.startsWith(this.exportPath);
145	144	}
146	145
147		~~@Override~~
148	146	public void handle(HttpServletRequest request, HttpServletResponse response)
149	147	throws ServletException, IOException {
…	…
161	159	writeResult(response, result);
162	160	} catch (ClassNotFoundException e) {
163		throw new IOException("Class not found during deserialization", e);
	161	SophieLog.error("Class not found during deserialization", e);
	162	throw new IOException("Class not found during deserialization");
164	163	} finally {
165	164	afterFinally();
…	…
197	196	return new InvocationResult() {
198	197
199		~~@Override~~
200	198	public InputStream getStream() {
201	199	return new ByteArrayInputStream(result.toString()
…	…
203	201	}
204	202
205		~~@Override~~
206	203	public String getContentType() {
207	204	return "text/plain;charset=UTF-8";
…	…
211	208	return new InvocationResult() {
212	209
213		~~@Override~~
214	210	public String getContentType() {
215	211	return "text/plain;charset=UTF-8";
216	212	}
217	213
218		~~@Override~~
219	214	public InputStream getStream() throws IOException {
220	215	return new ByteArrayInputStream(

branches/private/pav/NEW_JAVA_5/sophie2-platform/modules/org.sophie2.server.webapp/src/main/java/org/sophie2/server/webapp/ProLibELResolver.java

r3976	r7238
70	70	* Does nothing.
71	71	*/
72		~~@Override~~
73	72	public void contextDestroyed(ServletContextEvent sce) {
74	73	// do nothing
…	…
78	77	* Method which actually does the initialization.
79	78	*/
80		~~@Override~~
81	79	public void contextInitialized(ServletContextEvent sce) {
82	80	JspFactory jspFactory = JspFactory.getDefaultFactory();

branches/private/pav/NEW_JAVA_5/sophie2-platform/modules/org.sophie2.server.webapp/src/main/java/org/sophie2/server/webapp/ServletRequestHandlerAdapter.java

r6172	r7238
4	4	import java.io.IOException;
5	5	import java.util.Arrays;
	6	import java.util.Collections;
6	7
7	8	import javax.servlet.Servlet;
…	…
118	119	super();
119	120	assert pathSpecifications != null : "cannot provide null as path specifications.";
120		this.pathSpecifications = Arrays.copyOf(pathSpecifications,
121		pathSpecifications.length);
	121	int i = 0;
	122	this.pathSpecifications = new String[pathSpecifications.length];
	123	for (String pathSpecification : pathSpecifications) {
	124	this.pathSpecifications[i] = pathSpecification;
	125	i++;
	126	}
122	127	this.adaptee = adaptee;
123	128	}
124	129
125		~~@Override~~
126	130	public synchronized void init(ServletConfig config) throws ServletException {
127	131	if (!this.inited) {
…	…
131	135	}
132	136
133		~~@Override~~
134	137	public boolean inited() {
135	138	return this.inited;
136	139	}
137	140
138		~~@Override~~
139	141	public void handle(HttpServletRequest request, HttpServletResponse response)
140	142	throws ServletException, IOException {
…	…
142	144	}
143	145
144		~~@Override~~
145	146	public boolean canHandle(String path) {
146	147	return RequestUtils.matchesSpecifications(path, this.pathSpecifications);

branches/private/pav/NEW_JAVA_5/sophie2-platform/modules/org.sophie2.server.webapp/src/main/java/org/sophie2/server/webapp/SophieJettyLog.java

r6880	r7238
65	65	}
66	66
67		~~@Override~~
68	67	public void debug(String msg, Throwable th) {
69	68	log(LogLevel.DEBUG, msg, th);
…	…
71	70	}
72	71
73		~~@Override~~
74	72	public void debug(String msg, Object arg0, Object arg1) {
75	73	log(LogLevel.DEBUG, format(msg, arg0, arg1), null);
76	74	}
77	75
78		~~@Override~~
79	76	public Logger getLogger(String name) {
80	77	return new SophieJettyLog(name);
81	78	}
82	79
83		~~@Override~~
84	80	public void info(String msg, Object arg0, Object arg1) {
85	81	log(LogLevel.INFO, format(msg, arg0, arg1), null);
86	82	}
87	83
88		~~@Override~~
89	84	public boolean isDebugEnabled() {
90	85	/*
…	…
95	90	}
96	91
97		~~@Override~~
98	92	public /* synchronized */ void setDebugEnabled(boolean enabled) {
99	93	LogLevel minLevel = enabled ? LogLevel.DEBUG : LogLevel.INFO;
…	…
103	97	}
104	98
105		~~@Override~~
106	99	public void warn(String msg, Throwable th) {
107	100	log(LogLevel.WARN, msg, th);
108	101	}
109	102
110		~~@Override~~
111	103	public void warn(String msg, Object arg0, Object arg1) {
112	104	log(LogLevel.WARN, format(msg, arg0, arg1), null);

branches/private/pav/NEW_JAVA_5/sophie2-platform/modules/org.sophie2.server.webapp/src/main/java/org/sophie2/server/webapp/StaticContentHttpRequestHandler.java

r6343	r7238
78	78	}
79	79
80		~~@Override~~
81	80	public boolean canHandle(String path) {
82	81	String normalizedPath = normalizePath(path);
…	…
116	115	* Handles
117	116	*/
118		~~@Override~~
119	117	public void handle(HttpServletRequest request, HttpServletResponse response)
120	118	throws ServletException, IOException {

branches/private/pav/NEW_JAVA_5/sophie2-platform/modules/org.sophie2.server.webapp/src/main/java/org/sophie2/server/webapp/testing/BaseHttpRequestHandlerTest.java

r4879	r7238
65	65
66	66	@SuppressWarnings("synthetic-access")
67		~~@Override~~
68	67	public Object invoke(Object proxy, Method method, Object[] args)
69	68	throws Throwable {

branches/private/pav/NEW_JAVA_5/sophie2-platform/modules/org.sophie2.server.webapp/src/main/java/org/sophie2/server/webapp/testing/BaseHttpRequestHandlerTests.java

r4155	r7238
61	61
62	62	@SuppressWarnings("synthetic-access")
63		~~@Override~~
64	63	public Object invoke(Object proxy, Method method, Object[] args)
65	64	throws Throwable {

branches/private/pav/NEW_JAVA_5/sophie2-platform/modules/org.sophie2.server.webapp/src/main/java/org/sophie2/server/webapp/WebAppModule.java

r6880	r7238
69	69	servletContext.addEventListener(new ServletContextListener() {
70	70
71		~~@Override~~
72	71	public void contextInitialized(ServletContextEvent sce) {
73	72	JspFactory jspFactory = JspFactory.getDefaultFactory();
…	…
96	95	}
97	96
98		~~@Override~~
99	97	public void contextDestroyed(ServletContextEvent sce) {
100	98	// do nothing

branches/private/pav/NEW_JAVA_5/sophie2-platform/modules/org.sophie2.server.webapp/src/test/java/org/sophie2/server/webapp/HttpServiceTest.java

r6172	r7238
92	92	}
93	93
94		~~@Override~~
95	94	public String greet(String name) {
96	95	return String.format("Hello, %s.", name);

branches/private/pav/NEW_JAVA_5/sophie2-platform/modules/org.sophie2.server.webui/.classpath

r3619	r7238
5	5	<classpathentry kind="src" output="target/test-classes" path="src/test/java"/>
6	6	<classpathentry excluding="**" kind="src" output="target/test-classes" path="src/test/resources"/>
7		<classpathentry kind="con"
8		path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6" />
9		<classpathentry kind="con"
10		path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER" />
11		<classpathentry kind="output" path="target/classes" />
	7	<classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
	8	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/jdk1.5.0_21"/>
	9	<classpathentry kind="output" path="target/classes"/>
12	10	</classpath>

branches/private/pav/NEW_JAVA_5/sophie2-platform/modules/org.sophie2.server.webui/.settings/org.eclipse.jdt.core.prefs

r3619	r7238
1		#~~Thu Sep 18 21:11:04 EEST 2008~~
	1	#Mon Oct 05 13:45:40 AFT 2009
2	2	eclipse.preferences.version=1
3	3	org.eclipse.jdt.core.builder.cleanOutputFolder=clean
…	…
18	18	org.eclipse.jdt.core.codeComplete.staticFieldSuffixes=
19	19	org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
20		org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
	20	org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
21	21	org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
22		org.eclipse.jdt.core.compiler.compliance=1.6
	22	org.eclipse.jdt.core.compiler.compliance=1.5
23	23	org.eclipse.jdt.core.compiler.debug.lineNumber=generate
24	24	org.eclipse.jdt.core.compiler.debug.localVariable=generate
…	…
97	97	org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
98	98	org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
99		org.eclipse.jdt.core.compiler.source=1.6
	99	org.eclipse.jdt.core.compiler.source=1.5
100	100	org.eclipse.jdt.core.compiler.taskCaseSensitive=enabled
101	101	org.eclipse.jdt.core.compiler.taskPriorities=NORMAL,HIGH,NORMAL

branches/private/pav/NEW_JAVA_5/sophie2-platform/modules/org.sophie2.server.webui/src/main/java/org/sophie2/server/webui/AboutHandler.java

r6172	r7238
22	22	private static final long serialVersionUID = -2323601574422423318L;
23	23
24		~~@Override~~
25	24	public boolean canHandle(String path) {
26	25	return RequestUtils.matchesSpecification(path, "/about");

branches/private/pav/NEW_JAVA_5/sophie2-platform/modules/org.sophie2.server.webui/src/main/java/org/sophie2/server/webui/BaseHandlerSupport.java

r6508	r7238
67	67	}
68	68
69		~~@Override~~
70	69	public final void handle(HttpServletRequest request,
71	70	HttpServletResponse response) throws ServletException, IOException {

branches/private/pav/NEW_JAVA_5/sophie2-platform/modules/org.sophie2.server.webui/src/main/java/org/sophie2/server/webui/ForgottenPasswordHandler.java

r6172	r7238
22	22	private static final long serialVersionUID = 4911464333502576011L;
23	23
24		~~@Override~~
25	24	public boolean canHandle(String path) {
26	25	return RequestUtils.matchesSpecification(path, "/forgotten_password");

branches/private/pav/NEW_JAVA_5/sophie2-platform/modules/org.sophie2.server.webui/src/main/java/org/sophie2/server/webui/LoginHandler.java

r6880	r7238
25	25	private static final long serialVersionUID = 7948557049242178442L;
26	26
27		~~@Override~~
28	27	public boolean canHandle(String path) {
29	28	return RequestUtils.matchesSpecification(path, "/login");

branches/private/pav/NEW_JAVA_5/sophie2-platform/modules/org.sophie2.server.webui/src/main/java/org/sophie2/server/webui/LogoutHandler.java

r6172	r7238
23	23	private static final long serialVersionUID = 4819638069731734042L;
24	24
25		~~@Override~~
26	25	public boolean canHandle(String path) {
27	26	return RequestUtils.matchesSpecification(path, "/logout");

branches/private/pav/NEW_JAVA_5/sophie2-platform/modules/org.sophie2.server.webui/src/main/java/org/sophie2/server/webui/ResourcesHandler.java

r6172	r7238
49	49	* <code>false</code> otherwise.
50	50	*/
51		~~@Override~~
52	51	public boolean canHandle(String path) {
53	52	return RequestUtils.matchesSpecification(path, SPECIFICATION);
…	…
122	121	@Override
123	122	public boolean matchAction(String queryString) {
124		return queryString == null \|\| queryString.trim().~~isEmpty()~~
	123	return queryString == null \|\| queryString.trim().length() == 0
125	124	\|\| "view".equals(queryString);
126	125	}

branches/private/pav/NEW_JAVA_5/sophie2-platform/modules/org.sophie2.server.webui/src/main/java/org/sophie2/server/webui/SearchHandler.java

r6172	r7238
22	22	private static final long serialVersionUID = -2203426057306709311L;
23	23
24		~~@Override~~
25	24	public boolean canHandle(String path) {
26	25	return RequestUtils.matchesSpecification(path, "/search");

branches/private/pav/NEW_JAVA_5/sophie2-platform/modules/org.sophie2.server.webui/src/main/java/org/sophie2/server/webui/ServerInfoHandler.java

r6172	r7238
29	29	}
30	30
31		~~@Override~~
32	31	public boolean canHandle(String path) {
33	32	return RequestUtils.matchesSpecification(path, "/info");

branches/private/pav/NEW_JAVA_5/sophie2-platform/modules/org.sophie2.server.webui/src/main/java/org/sophie2/server/webui/WelcomeHandler.java

r6172	r7238
21	21	private static final long serialVersionUID = -7521104924455844443L;
22	22
23		~~@Override~~
24	23	public boolean canHandle(String path) {
25	24	return RequestUtils.matchesSpecification(path, "/");

branches/private/pav/NEW_JAVA_5/sophie2-platform/modules/org.sophie2.system/.classpath

r2854	r7238
5	5	<classpathentry kind="src" output="target/test-classes" path="src/test/java"/>
6	6	<classpathentry excluding="**" kind="src" output="target/test-classes" path="src/test/resources"/>
7		<classpathentry kind="con"
8		path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6" />
9		<classpathentry kind="con"
10		path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER" />
11		<classpathentry kind="output" path="target/classes" />
	7	<classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
	8	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/jdk1.5.0_21"/>
	9	<classpathentry kind="output" path="target/classes"/>
12	10	</classpath>

branches/private/pav/NEW_JAVA_5/sophie2-platform/modules/org.sophie2.system/.settings/org.eclipse.jdt.core.prefs

r2854	r7238
1		#~~Thu Sep 18 21:11:04 EEST 2008~~
	1	#Mon Oct 05 13:45:47 AFT 2009
2	2	eclipse.preferences.version=1
3	3	org.eclipse.jdt.core.builder.cleanOutputFolder=clean
…	…
18	18	org.eclipse.jdt.core.codeComplete.staticFieldSuffixes=
19	19	org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
20		org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
	20	org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
21	21	org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
22		org.eclipse.jdt.core.compiler.compliance=1.6
	22	org.eclipse.jdt.core.compiler.compliance=1.5
23	23	org.eclipse.jdt.core.compiler.debug.lineNumber=generate
24	24	org.eclipse.jdt.core.compiler.debug.localVariable=generate
…	…
97	97	org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
98	98	org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
99		org.eclipse.jdt.core.compiler.source=1.6
	99	org.eclipse.jdt.core.compiler.source=1.5
100	100	org.eclipse.jdt.core.compiler.taskCaseSensitive=enabled
101	101	org.eclipse.jdt.core.compiler.taskPriorities=NORMAL,HIGH,NORMAL

branches/private/pav/NEW_JAVA_5/sophie2-platform/modules/org.sophie2.system/src/main/java/org/sophie2/system/profiler/Profiler.java

r2924	r7238
2	2
3	3	import java.io.PrintStream;
4		~~import java.util.ArrayDeque;~~
5	4	import java.util.ArrayList;
6	5	import java.util.Arrays;
…	…
10	9	import java.util.List;
11	10	import java.util.Map;
12		~~import java.util.Queue;~~
13	11	import java.util.Timer;
14	12	import java.util.TimerTask;
…	…
220	218	@SuppressWarnings("synthetic-access")
221	219	public List<TreeNode> getTreeNodes() {
222		~~Queue<TreeNode> queue = new ArrayDeque~~<TreeNode>();
	220	List<TreeNode> queue = new ArrayList<TreeNode>();
223	221	queue.add(Tree.this.getRoot());
224	222
225	223	List<TreeNode> res = new ArrayList<TreeNode>();
226	224	while(!queue.isEmpty()) {
227		TreeNode node = queue.remove();
	225	TreeNode node = queue.get(queue.size());
	226	queue.remove(queue.size());
228	227	res.add(node);
229	228	queue.addAll(node.map.values());
…	…
423	422	List<TreeNode> children = new ArrayList<TreeNode>(this.map.values());
424	423	Collections.sort(children, new Comparator<TreeNode>() {
425		~~@Override~~
426	424	public int compare(TreeNode o1, TreeNode o2) {
427	425	return o2.getNodeHits() - o1.getNodeHits();
…	…
535	533	// sort entries by hits percentage
536	534	Collections.sort(entries, new Comparator<Entry<StackTraceElement, Float>>() {
537		~~@Override~~
538	535	public int compare(Entry<StackTraceElement, Float> o1,
539	536	Entry<StackTraceElement, Float> o2) {
…	…
616	613	// sort entries by hits percentage
617	614	Collections.sort(entries, new Comparator<Entry<MethodId, Float>>() {
618		~~@Override~~
619	615	public int compare(Entry<MethodId, Float> o1,
620	616	Entry<MethodId, Float> o2) {

branches/private/pav/NEW_JAVA_5/sophie2-platform/pom.xml

r6933	r7238
374	374	<artifactId>maven-compiler-plugin</artifactId>
375	375	<configuration>
376		<source>1.6</source>
377		<target>1.6</target>
	376	<source>1.5</source>
	377	<target>1.5</target>
378	378	<encoding>utf8</encoding>
379	379	<verbose>false</verbose>
380		<failOnError>~~fals~~e</failOnError>
	380	<failOnError>true</failOnError>
381	381	<showWarnings>true</showWarnings>
382	382	</configuration>

Context Navigation

Legend: