Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.
View | Details | Raw Unified | Return to bug 337930 | Differences between
and this patch

Collapse All | Expand All

(-)src/org/eclipse/jpt/common/ui/WidgetFactory.java (-3 / +13 lines)
Lines 1-5 Link Here
1
/*******************************************************************************
1
/*******************************************************************************
2
 * Copyright (c) 2008 Oracle. All rights reserved.
2
 * Copyright (c) 2008, 2011 Oracle. All rights reserved.
3
 * This program and the accompanying materials are made available under the
3
 * This program and the accompanying materials are made available under the
4
 * terms of the Eclipse Public License v1.0, which accompanies this distribution
4
 * terms of the Eclipse Public License v1.0, which accompanies this distribution
5
 * and is available at http://www.eclipse.org/legal/epl-v10.html.
5
 * and is available at http://www.eclipse.org/legal/epl-v10.html.
Lines 10-15 Link Here
10
package org.eclipse.jpt.common.ui;
10
package org.eclipse.jpt.common.ui;
11
11
12
import org.eclipse.swt.custom.CCombo;
12
import org.eclipse.swt.custom.CCombo;
13
import org.eclipse.swt.custom.StyledText;
13
import org.eclipse.swt.widgets.Button;
14
import org.eclipse.swt.widgets.Button;
14
import org.eclipse.swt.widgets.Combo;
15
import org.eclipse.swt.widgets.Combo;
15
import org.eclipse.swt.widgets.Composite;
16
import org.eclipse.swt.widgets.Composite;
Lines 35-42 Link Here
35
 * adopters on the understanding that any code that uses this API will almost
36
 * adopters on the understanding that any code that uses this API will almost
36
 * certainly be broken (repeatedly) as the API evolves.
37
 * certainly be broken (repeatedly) as the API evolves.
37
 *
38
 *
38
 * @version 2.0
39
 * @version 3.0
39
 * @since 2.0
40
 * @since 3.0
40
 */
41
 */
41
public interface WidgetFactory {
42
public interface WidgetFactory {
42
43
Lines 163-168 Link Here
163
	 *
164
	 *
164
	 * @param parent The parent container
165
	 * @param parent The parent container
165
	 * @param parent The number of lines the text area should display
166
	 * @param parent The number of lines the text area should display
167
	 * @return A new <code>StyledText</code>
168
	 */
169
	StyledText createMultiLineStyledText(Composite parent);
170
171
	/**
172
	 * Creates a new editable text area.
173
	 *
174
	 * @param parent The parent container
175
	 * @param parent The number of lines the text area should display
166
	 * @return A new <code>Text</code>
176
	 * @return A new <code>Text</code>
167
	 */
177
	 */
168
	Text createMultiLineText(Composite parent);
178
	Text createMultiLineText(Composite parent);
(-)src/org/eclipse/jpt/common/ui/internal/utility/swt/SWTTools.java (-1 / +9 lines)
Lines 10-16 Link Here
10
package org.eclipse.jpt.common.ui.internal.utility.swt;
10
package org.eclipse.jpt.common.ui.internal.utility.swt;
11
11
12
import java.util.Arrays;
12
import java.util.Arrays;
13
14
import org.eclipse.jpt.common.utility.internal.BitTools;
13
import org.eclipse.jpt.common.utility.internal.BitTools;
15
import org.eclipse.jpt.common.utility.internal.StringConverter;
14
import org.eclipse.jpt.common.utility.internal.StringConverter;
16
import org.eclipse.jpt.common.utility.internal.model.value.StaticCollectionValueModel;
15
import org.eclipse.jpt.common.utility.internal.model.value.StaticCollectionValueModel;
Lines 21-26 Link Here
21
import org.eclipse.jpt.common.utility.model.value.WritableCollectionValueModel;
20
import org.eclipse.jpt.common.utility.model.value.WritableCollectionValueModel;
22
import org.eclipse.jpt.common.utility.model.value.WritablePropertyValueModel;
21
import org.eclipse.jpt.common.utility.model.value.WritablePropertyValueModel;
23
import org.eclipse.swt.SWT;
22
import org.eclipse.swt.SWT;
23
import org.eclipse.swt.custom.StyledText;
24
import org.eclipse.swt.widgets.Button;
24
import org.eclipse.swt.widgets.Button;
25
import org.eclipse.swt.widgets.Combo;
25
import org.eclipse.swt.widgets.Combo;
26
import org.eclipse.swt.widgets.Control;
26
import org.eclipse.swt.widgets.Control;
Lines 68-73 Link Here
68
		new TextFieldModelBinding(textModel, textField);
68
		new TextFieldModelBinding(textModel, textField);
69
	}
69
	}
70
70
71
	/**
72
	 * Bind the specified text model to the specified text field.
73
	 */
74
	public static <E> void bind(WritablePropertyValueModel<String> textModel, StyledText textField) {
75
		// the new binding will add itself as a listener to the text model and the text field
76
		new StyledTextFieldModelBinding(textModel, textField);
77
	}
78
71
79
72
	// ********** list box **********
80
	// ********** list box **********
73
81
(-)src/org/eclipse/jpt/common/ui/internal/utility/swt/StyledTextFieldModelBinding.java (+196 lines)
Added Link Here
1
/*******************************************************************************
2
 * Copyright (c) 2011 Oracle. All rights reserved.
3
 * This program and the accompanying materials are made available under the
4
 * terms of the Eclipse Public License v1.0, which accompanies this distribution
5
 * and is available at http://www.eclipse.org/legal/epl-v10.html.
6
 * 
7
 * Contributors:
8
 *     Oracle - initial API and implementation
9
 ******************************************************************************/
10
package org.eclipse.jpt.common.ui.internal.utility.swt;
11
12
import org.eclipse.jpt.common.ui.internal.listeners.SWTPropertyChangeListenerWrapper;
13
import org.eclipse.jpt.common.utility.internal.StringTools;
14
import org.eclipse.jpt.common.utility.model.event.PropertyChangeEvent;
15
import org.eclipse.jpt.common.utility.model.listener.PropertyChangeListener;
16
import org.eclipse.jpt.common.utility.model.value.PropertyValueModel;
17
import org.eclipse.jpt.common.utility.model.value.WritablePropertyValueModel;
18
import org.eclipse.swt.custom.StyledText;
19
import org.eclipse.swt.events.DisposeEvent;
20
import org.eclipse.swt.events.DisposeListener;
21
import org.eclipse.swt.events.ModifyEvent;
22
import org.eclipse.swt.events.ModifyListener;
23
24
/**
25
 * This binding can be used to keep a styled text field
26
 * synchronized with a model text/string.
27
 * 
28
 * @see WritablePropertyValueModel
29
 * @see StyledText
30
 */
31
@SuppressWarnings("nls")
32
class StyledTextFieldModelBinding {
33
34
	/**
35
	 * The text model we keep synchronized with the text field.
36
	 */
37
	private final WritablePropertyValueModel<String> textModel;
38
39
	/**
40
	 * A listener that allows us to synchronize the text field's contents with
41
	 * the text model.
42
	 */
43
	private final PropertyChangeListener textModelChangeListener;
44
45
	/**
46
	 * The text field we keep synchronized with the text model.
47
	 */
48
	private final StyledText textField;
49
50
	/**
51
	 * A listener that allows us to synchronize our text model
52
	 * with the text field's contents.
53
	 */
54
	private final ModifyListener textFieldModifyListener;
55
56
	/**
57
	 * A listener that allows us to stop listening to stuff when the text field
58
	 * is disposed.
59
	 */
60
	private final DisposeListener textFieldDisposeListener;
61
62
	/**
63
	 * Hmm...
64
	 */
65
	private boolean settingTextFieldText = false;
66
67
68
	// ********** constructor **********
69
70
	/**
71
	 * Constructor - the text model and text field are required.
72
	 */
73
	StyledTextFieldModelBinding(WritablePropertyValueModel<String> textModel, StyledText textField) {
74
		super();
75
		if ((textModel == null) || (textField == null)) {
76
			throw new NullPointerException();
77
		}
78
		this.textModel = textModel;
79
		this.textField = textField;
80
81
		this.textModelChangeListener = this.buildTextModelChangeListener();
82
		this.textModel.addPropertyChangeListener(PropertyValueModel.VALUE, this.textModelChangeListener);
83
84
		this.textFieldModifyListener = this.buildTextFieldModifyListener();
85
		this.textField.addModifyListener(this.textFieldModifyListener);
86
87
		this.textFieldDisposeListener = this.buildTextFieldDisposeListener();
88
		this.textField.addDisposeListener(this.textFieldDisposeListener);
89
90
		this.setTextFieldText(textModel.getValue());
91
	}
92
93
94
	// ********** initialization **********
95
96
	private PropertyChangeListener buildTextModelChangeListener() {
97
		return new SWTPropertyChangeListenerWrapper(this.buildTextModelChangeListener_());
98
	}
99
100
	private PropertyChangeListener buildTextModelChangeListener_() {
101
		return new PropertyChangeListener() {
102
			public void propertyChanged(PropertyChangeEvent event) {
103
				StyledTextFieldModelBinding.this.textModelChanged(event);
104
			}
105
			@Override
106
			public String toString() {
107
				return "text listener";
108
			}
109
		};
110
	}
111
112
	private ModifyListener buildTextFieldModifyListener() {
113
		return new ModifyListener() {
114
			public void modifyText(ModifyEvent event) {
115
				StyledTextFieldModelBinding.this.textFieldModified();
116
			}
117
			@Override
118
			public String toString() {
119
				return "text field modify listener";
120
			}
121
		};
122
	}
123
124
	private DisposeListener buildTextFieldDisposeListener() {
125
		return new DisposeListener() {
126
			public void widgetDisposed(DisposeEvent event) {
127
				StyledTextFieldModelBinding.this.textFieldDisposed();
128
			}
129
			@Override
130
			public String toString() {
131
				return "text field dispose listener";
132
			}
133
		};
134
	}
135
136
137
	// ********** text model events **********
138
139
	/* CU private */ void textModelChanged(PropertyChangeEvent event) {
140
		if ( ! this.textField.isDisposed()) {  // ???
141
			this.setTextFieldText((String) event.getNewValue());
142
		}
143
	}
144
145
	private void setTextFieldText(String text) {
146
		// the text model can be null, but the text field cannot
147
		this.setTextFieldText_((text == null) ? "" : text);
148
	}
149
150
	private void setTextFieldText_(String text) {
151
		if ( ! text.equals(this.textField.getText())) {  // ???
152
			this.setTextFieldText__(text);
153
		}
154
	}
155
156
	private void setTextFieldText__(String text) {
157
		this.settingTextFieldText = true;
158
		try {
159
			this.textField.setText(text);
160
		} finally {
161
			this.settingTextFieldText = false;
162
		}
163
	}
164
165
166
	// ********** text field events **********
167
168
	/* CU private */ void textFieldModified() {
169
		if ( ! this.settingTextFieldText) {
170
			this.setTextModelText(this.textField.getText());
171
		}
172
	}
173
174
	private void setTextModelText(String text) {
175
		if ( ! text.equals(this.textModel.getValue())) {  // ???
176
			this.textModel.setValue(text);
177
		}
178
	}
179
180
	/* CU private */ void textFieldDisposed() {
181
		// the text field is not yet "disposed" when we receive this event
182
		// so we can still remove our listeners
183
		this.textField.removeDisposeListener(this.textFieldDisposeListener);
184
		this.textField.removeModifyListener(this.textFieldModifyListener);
185
		this.textModel.removePropertyChangeListener(PropertyValueModel.VALUE, this.textModelChangeListener);
186
	}
187
188
189
	// ********** standard methods **********
190
191
	@Override
192
	public String toString() {
193
		return StringTools.buildToStringFor(this, this.textModel);
194
	}
195
196
}
(-)src/org/eclipse/jpt/common/ui/internal/widgets/DefaultWidgetFactory.java (-4 / +12 lines)
Lines 1-5 Link Here
1
/*******************************************************************************
1
/*******************************************************************************
2
 * Copyright (c) 2008, 2010 Oracle. All rights reserved.
2
 * Copyright (c) 2008, 2011 Oracle. All rights reserved.
3
 * This program and the accompanying materials are made available under the
3
 * This program and the accompanying materials are made available under the
4
 * terms of the Eclipse Public License v1.0, which accompanies this distribution
4
 * terms of the Eclipse Public License v1.0, which accompanies this distribution
5
 * and is available at http://www.eclipse.org/legal/epl-v10.html.
5
 * and is available at http://www.eclipse.org/legal/epl-v10.html.
Lines 12-17 Link Here
12
import org.eclipse.jpt.common.ui.WidgetFactory;
12
import org.eclipse.jpt.common.ui.WidgetFactory;
13
import org.eclipse.swt.SWT;
13
import org.eclipse.swt.SWT;
14
import org.eclipse.swt.custom.CCombo;
14
import org.eclipse.swt.custom.CCombo;
15
import org.eclipse.swt.custom.StyledText;
15
import org.eclipse.swt.layout.GridData;
16
import org.eclipse.swt.layout.GridData;
16
import org.eclipse.swt.widgets.Button;
17
import org.eclipse.swt.widgets.Button;
17
import org.eclipse.swt.widgets.Combo;
18
import org.eclipse.swt.widgets.Combo;
Lines 33-40 Link Here
33
/**
34
/**
34
 * This <code>WidgetFactory</code> simply creates plain SWT widgets.
35
 * This <code>WidgetFactory</code> simply creates plain SWT widgets.
35
 *
36
 *
36
 * @version 2.0
37
 * @version 2.3
37
 * @since 2.0
38
 * @since 2.3
38
 */
39
 */
39
public class DefaultWidgetFactory implements WidgetFactory {
40
public class DefaultWidgetFactory implements WidgetFactory {
40
41
Lines 109-115 Link Here
109
	public Composite createComposite(Composite parent) {
110
	public Composite createComposite(Composite parent) {
110
		return new Composite(parent, SWT.NULL);
111
		return new Composite(parent, SWT.NULL);
111
	}
112
	}
112
	
113
113
	/**
114
	/**
114
	 * {@inheritDoc}
115
	 * {@inheritDoc}
115
	 */
116
	 */
Lines 197-202 Link Here
197
	/**
198
	/**
198
	 * {@inheritDoc}
199
	 * {@inheritDoc}
199
	 */
200
	 */
201
	public StyledText createMultiLineStyledText(Composite parent) {
202
		return new StyledText(parent, SWT.BORDER | SWT.MULTI | SWT.WRAP | SWT.V_SCROLL | SWT.H_SCROLL);
203
	}
204
205
	/**
206
	 * {@inheritDoc}
207
	 */
200
	public Text createMultiLineText(Composite parent) {
208
	public Text createMultiLineText(Composite parent) {
201
		return new Text(parent, SWT.BORDER | SWT.MULTI | SWT.V_SCROLL);
209
		return new Text(parent, SWT.BORDER | SWT.MULTI | SWT.V_SCROLL);
202
	}
210
	}
(-)src/org/eclipse/jpt/common/ui/internal/widgets/FormWidgetFactory.java (-5 / +19 lines)
Lines 1-5 Link Here
1
/*******************************************************************************
1
/*******************************************************************************
2
 * Copyright (c) 2008, 2010 Oracle. All rights reserved.
2
 * Copyright (c) 2008, 2011 Oracle. All rights reserved.
3
 * This program and the accompanying materials are made available under the
3
 * This program and the accompanying materials are made available under the
4
 * terms of the Eclipse Public License v1.0, which accompanies this distribution
4
 * terms of the Eclipse Public License v1.0, which accompanies this distribution
5
 * and is available at http://www.eclipse.org/legal/epl-v10.html.
5
 * and is available at http://www.eclipse.org/legal/epl-v10.html.
Lines 13-18 Link Here
13
import org.eclipse.jpt.common.ui.WidgetFactory;
13
import org.eclipse.jpt.common.ui.WidgetFactory;
14
import org.eclipse.swt.SWT;
14
import org.eclipse.swt.SWT;
15
import org.eclipse.swt.custom.CCombo;
15
import org.eclipse.swt.custom.CCombo;
16
import org.eclipse.swt.custom.StyledText;
16
import org.eclipse.swt.layout.GridData;
17
import org.eclipse.swt.layout.GridData;
17
import org.eclipse.swt.layout.GridLayout;
18
import org.eclipse.swt.layout.GridLayout;
18
import org.eclipse.swt.widgets.Button;
19
import org.eclipse.swt.widgets.Button;
Lines 39-46 Link Here
39
 *
40
 *
40
 * @see FormToolkit
41
 * @see FormToolkit
41
 *
42
 *
42
 * @version 2.0
43
 * @version 2.3
43
 * @since 2.0
44
 * @since 2.3
44
 */
45
 */
45
@SuppressWarnings("nls")
46
@SuppressWarnings("nls")
46
public class FormWidgetFactory implements WidgetFactory {
47
public class FormWidgetFactory implements WidgetFactory {
Lines 76-82 Link Here
76
	protected Composite createBorderContainer(Composite container) {
77
	protected Composite createBorderContainer(Composite container) {
77
		return createBorderContainer(container, 2, 1);
78
		return createBorderContainer(container, 2, 1);
78
	}
79
	}
79
	
80
80
	protected Composite createBorderContainer(Composite container, int marginHeight, int marginWidth) {
81
	protected Composite createBorderContainer(Composite container, int marginHeight, int marginWidth) {
81
82
82
		GridLayout layout = new GridLayout(1, false);
83
		GridLayout layout = new GridLayout(1, false);
Lines 93-99 Link Here
93
94
94
		return container;
95
		return container;
95
	}
96
	}
96
	
97
97
	/**
98
	/**
98
	 * {@inheritDoc}
99
	 * {@inheritDoc}
99
	 */
100
	 */
Lines 254-259 Link Here
254
	/**
255
	/**
255
	 * {@inheritDoc}
256
	 * {@inheritDoc}
256
	 */
257
	 */
258
	public StyledText createMultiLineStyledText(Composite parent) {
259
		return createStyledText(parent, SWT.MULTI | SWT.WRAP | SWT.V_SCROLL | SWT.H_SCROLL);
260
	}
261
262
	/**
263
	 * {@inheritDoc}
264
	 */
257
	public Text createMultiLineText(Composite parent) {
265
	public Text createMultiLineText(Composite parent) {
258
		return createText(parent, SWT.MULTI | SWT.V_SCROLL);
266
		return createText(parent, SWT.MULTI | SWT.V_SCROLL);
259
	}
267
	}
Lines 315-320 Link Here
315
		return createText(parent, SWT.NONE);
323
		return createText(parent, SWT.NONE);
316
	}
324
	}
317
325
326
	protected StyledText createStyledText(Composite parent, int style) {
327
		StyledText text = new StyledText(parent, SWT.BORDER | SWT.FLAT | style);
328
		widgetFactory.adapt(text, true, false);
329
		return text;
330
	}
331
318
	protected Text createText(Composite parent, int style) {
332
	protected Text createText(Composite parent, int style) {
319
		return widgetFactory.createText(parent, null, SWT.BORDER | SWT.FLAT | style);
333
		return widgetFactory.createText(parent, null, SWT.BORDER | SWT.FLAT | style);
320
	}
334
	}
(-)src/org/eclipse/jpt/common/ui/internal/widgets/Pane.java (-27 / +150 lines)
Lines 1-5 Link Here
1
/*******************************************************************************
1
/*******************************************************************************
2
 * Copyright (c) 2008, 2010 Oracle. All rights reserved.
2
 * Copyright (c) 2008, 2011 Oracle. All rights reserved.
3
 * This program and the accompanying materials are made available under the
3
 * This program and the accompanying materials are made available under the
4
 * terms of the Eclipse Public License v1.0, which accompanies this distribution
4
 * terms of the Eclipse Public License v1.0, which accompanies this distribution
5
 * and is available at http://www.eclipse.org/legal/epl-v10.html.
5
 * and is available at http://www.eclipse.org/legal/epl-v10.html.
Lines 41-46 Link Here
41
import org.eclipse.jpt.common.utility.model.value.PropertyValueModel;
41
import org.eclipse.jpt.common.utility.model.value.PropertyValueModel;
42
import org.eclipse.jpt.common.utility.model.value.WritablePropertyValueModel;
42
import org.eclipse.jpt.common.utility.model.value.WritablePropertyValueModel;
43
import org.eclipse.swt.SWT;
43
import org.eclipse.swt.SWT;
44
import org.eclipse.swt.custom.StyledText;
44
import org.eclipse.swt.events.ModifyListener;
45
import org.eclipse.swt.events.ModifyListener;
45
import org.eclipse.swt.events.MouseAdapter;
46
import org.eclipse.swt.events.MouseAdapter;
46
import org.eclipse.swt.events.MouseEvent;
47
import org.eclipse.swt.events.MouseEvent;
Lines 87-94 Link Here
87
 * @see FormPane
88
 * @see FormPane
88
 * @see DialogPane
89
 * @see DialogPane
89
 *
90
 *
90
 * @version 2.0
91
 * @version 2.3
91
 * @since 2.0
92
 * @since 2.3
92
 */
93
 */
93
@SuppressWarnings("nls")
94
@SuppressWarnings("nls")
94
public abstract class Pane<T extends Model>
95
public abstract class Pane<T extends Model>
Lines 1687-1693 Link Here
1687
	 * @param stringConverter The converter responsible to transform each item
1688
	 * @param stringConverter The converter responsible to transform each item
1688
	 * into a string representation
1689
	 * into a string representation
1689
	 * @param helpId The topic help ID to be registered for the given center
1690
	 * @param helpId The topic help ID to be registered for the given center
1690
	 * compositer
1691
	 * composite
1691
	 * @return The newly created <code>Combo</code>
1692
	 * @return The newly created <code>Combo</code>
1692
	 *
1693
	 *
1693
	 * @category Layout
1694
	 * @category Layout
Lines 1711-1716 Link Here
1711
	}
1712
	}
1712
1713
1713
	/**
1714
	/**
1715
	 * Adjusts the layout of the given container so that the text control has the correct amount of
1716
	 * lines by default.
1717
	 */
1718
	private void adjustMultiLineTextLayout(Composite container,
1719
	                                       int lineCount,
1720
	                                       Control text,
1721
	                                       int lineHeight) {
1722
1723
		int textHeight = text.computeSize(SWT.DEFAULT, SWT.DEFAULT).y;
1724
1725
		// Specify the number of lines the text area should display
1726
		GridData gridData = (GridData) text.getLayoutData();
1727
		gridData.heightHint = lineHeight * lineCount;
1728
1729
		// Move the label to the top of its cell
1730
		Control label = container.getChildren()[0];
1731
		int labelHeight = label.computeSize(SWT.DEFAULT, SWT.DEFAULT).y;
1732
1733
		gridData = (GridData) label.getLayoutData();
1734
		gridData.verticalAlignment = SWT.TOP;
1735
		gridData.verticalIndent   += (Math.abs(textHeight - labelHeight) / 2);
1736
	}
1737
1738
	/**
1714
	 * Creates a new container that will have a text field as the center control
1739
	 * Creates a new container that will have a text field as the center control
1715
	 * labeled with the given label.
1740
	 * labeled with the given label.
1716
	 *
1741
	 *
Lines 1724-1733 Link Here
1724
	 * @category Layout
1749
	 * @category Layout
1725
	 */
1750
	 */
1726
	protected final Text addLabeledMultiLineText(Composite container,
1751
	protected final Text addLabeledMultiLineText(Composite container,
1727
	                                               String labelText,
1752
	                                             String labelText,
1728
	                                               WritablePropertyValueModel<String> textHolder,
1753
	                                             WritablePropertyValueModel<String> textHolder,
1729
	                                               int lineCount,
1754
	                                             int lineCount,
1730
	                                               String helpId) {
1755
	                                             String helpId) {
1731
1756
1732
		Text text = this.addMultiLineText(container, textHolder, lineCount);
1757
		Text text = this.addMultiLineText(container, textHolder, lineCount);
1733
1758
Lines 1738-1756 Link Here
1738
			helpId
1763
			helpId
1739
		);
1764
		);
1740
1765
1741
		int textHeight = text.computeSize(SWT.DEFAULT, SWT.DEFAULT).y;
1766
		adjustMultiLineTextLayout(container, lineCount, text, text.getLineHeight());
1742
1767
1743
		// Specify the number of lines the text area should display
1768
		return text;
1744
		GridData gridData = (GridData) text.getLayoutData();
1769
	}
1745
		gridData.heightHint = text.getLineHeight() * lineCount;
1746
1770
1747
		// Move the label to the top of its cell
1771
	/**
1748
		Control label = container.getChildren()[0];
1772
	 * Creates a new container that will have a text field as the center control
1749
		int labelHeight = label.computeSize(SWT.DEFAULT, SWT.DEFAULT).y;
1773
	 * labeled with the given label.
1774
	 *
1775
	 * @param container The parent container
1776
	 * @param labelText The text area's label
1777
	 * @param textHolder The holder of the text field's input
1778
	 * @param lineCount The number of lines the text area should display
1779
	 * @param helpId The topic help ID to be registered for the text field
1780
	 * @return The newly created <code>StyledText</code>
1781
	 *
1782
	 * @category Layout
1783
	 */
1784
	protected final StyledText addLabeledMultiLineStyledText(Composite container,
1785
	                                                         String labelText,
1786
	                                                         WritablePropertyValueModel<String> textHolder,
1787
	                                                         int lineCount,
1788
	                                                         String helpId) {
1750
1789
1751
		gridData = (GridData) label.getLayoutData();
1790
		StyledText text = this.addMultiLineStyledText(container, textHolder, lineCount);
1752
		gridData.verticalAlignment = SWT.TOP;
1791
1753
		gridData.verticalIndent   += (Math.abs(textHeight - labelHeight) / 2);
1792
		container = this.addLabeledComposite(
1793
			container,
1794
			labelText,
1795
			text,
1796
			helpId
1797
		);
1798
1799
		adjustMultiLineTextLayout(container, lineCount, text, text.getLineHeight());
1754
1800
1755
		return text;
1801
		return text;
1756
	}
1802
	}
Lines 2268-2283 Link Here
2268
	}
2314
	}
2269
2315
2270
	/**
2316
	/**
2271
	 * Creates a new lable expanding on multiple lines.
2317
	 * Creates a new label expanding on multiple lines.
2272
	 *
2318
	 *
2273
	 * @param parent The parent container
2319
	 * @param parent The parent container
2274
	 * @param labelText The label's text
2320
	 * @param labelText The label's text
2275
	 *
2321
	 *
2276
	 * @category Layout
2322
	 * @category Layout
2277
	 */
2323
	 */
2278
	protected final FormText addMultiLineLabel(Composite container,
2324
	protected final FormText addMultiLineLabel(Composite container, String labelText) {
2279
	                                         String labelText) {
2280
2281
		FormText label = this.widgetFactory.createMultiLineLabel(container, labelText);
2325
		FormText label = this.widgetFactory.createMultiLineLabel(container, labelText);
2282
		manageWidget(label);
2326
		manageWidget(label);
2283
		return label;
2327
		return label;
Lines 2300-2305 Link Here
2300
	}
2344
	}
2301
	
2345
	
2302
	/**
2346
	/**
2347
	 * Creates a new <code>StyledText</code> widget that has multiple lines.
2348
	 *
2349
	 * @param container The parent container
2350
	 * @return The newly created <code>StyledText</code> widget
2351
	 */
2352
	protected final StyledText addMultiLineStyledText(Composite container) {
2353
2354
		StyledText text = this.widgetFactory.createMultiLineStyledText(container);
2355
		text.setLayoutData(getFieldGridData());
2356
		this.manageWidget(text);
2357
2358
		return text;
2359
	}
2360
2361
	/**
2303
	 * Creates a new <code>Text</code> widget that has multiple lines.
2362
	 * Creates a new <code>Text</code> widget that has multiple lines.
2304
	 *
2363
	 *
2305
	 * @param container The parent container
2364
	 * @param container The parent container
Lines 2327-2332 Link Here
2327
	}
2386
	}
2328
2387
2329
	/**
2388
	/**
2389
	 * Creates a new <code>StyledText</code> widget that has multiple lines.
2390
	 *
2391
	 * @param container The parent container
2392
	 * @param lineCount The number of lines the text area should display
2393
	 * @param helpId The topic help ID to be registered for the new text
2394
	 * @return The newly created <code>StyledText</code> widget
2395
	 *
2396
	 * @category Layout
2397
	 */
2398
	protected final StyledText addMultiLineStyledText(Composite container,
2399
	                                                  int lineCount,
2400
	                                                  String helpId) {
2401
2402
		StyledText text = this.addMultiLineStyledText(container);
2403
2404
		GridData gridData   = getFieldGridData();
2405
		gridData.heightHint = text.getLineHeight() * lineCount;
2406
		text.setLayoutData(gridData);
2407
2408
		if (helpId != null) {
2409
			getHelpSystem().setHelp(text, helpId);
2410
		}
2411
2412
		return text;
2413
	}
2414
2415
	/**
2330
	 * Creates a new <code>Text</code> widget that has multiple lines.
2416
	 * Creates a new <code>Text</code> widget that has multiple lines.
2331
	 *
2417
	 *
2332
	 * @param container The parent container
2418
	 * @param container The parent container
Lines 2337-2349 Link Here
2337
	 * @category Layout
2423
	 * @category Layout
2338
	 */
2424
	 */
2339
	protected final Text addMultiLineText(Composite container,
2425
	protected final Text addMultiLineText(Composite container,
2340
	                                        WritablePropertyValueModel<String> textHolder,
2426
	                                      WritablePropertyValueModel<String> textHolder,
2341
	                                        int lineCount) {
2427
	                                      int lineCount) {
2342
2428
2343
		return this.addMultiLineText(container, textHolder, lineCount, null);
2429
		return this.addMultiLineText(container, textHolder, lineCount, null);
2344
	}
2430
	}
2345
2431
2346
	/**
2432
	/**
2433
	 * Creates a new <code>StyledText</code> widget that has multiple lines.
2434
	 *
2435
	 * @param container The parent container
2436
	 * @param textHolder The holder of the text field's input
2437
	 * @param lineCount The number of lines the text area should display
2438
	 * @return The newly created <code>StyledText</code> widget
2439
	 *
2440
	 * @category Layout
2441
	 */
2442
	protected final StyledText addMultiLineStyledText(Composite container,
2443
	                                                  WritablePropertyValueModel<String> textHolder,
2444
	                                                  int lineCount) {
2445
2446
		return this.addMultiLineStyledText(container, textHolder, lineCount, null);
2447
	}
2448
2449
	/**
2347
	 * Creates a new <code>Text</code> widget that has multiple lines.
2450
	 * Creates a new <code>Text</code> widget that has multiple lines.
2348
	 *
2451
	 *
2349
	 * @param container The parent container
2452
	 * @param container The parent container
Lines 2354-2362 Link Here
2354
	 * @category Layout
2457
	 * @category Layout
2355
	 */
2458
	 */
2356
	protected final Text addMultiLineText(Composite container,
2459
	protected final Text addMultiLineText(Composite container,
2357
	                                        WritablePropertyValueModel<String> textHolder,
2460
	                                      WritablePropertyValueModel<String> textHolder,
2358
	                                        int lineCount,
2461
	                                      int lineCount,
2359
	                                        String helpId) {
2462
	                                      String helpId) {
2360
2463
2361
		Text text = this.addMultiLineText(container, lineCount, helpId);
2464
		Text text = this.addMultiLineText(container, lineCount, helpId);
2362
		SWTTools.bind(textHolder, text);
2465
		SWTTools.bind(textHolder, text);
Lines 2364-2369 Link Here
2364
	}
2467
	}
2365
2468
2366
	/**
2469
	/**
2470
	 * Creates a new <code>StyledText</code> widget that has multiple lines.
2471
	 *
2472
	 * @param container The parent container
2473
	 * @param textHolder The holder of the text field's input
2474
	 * @param helpId The topic help ID to be registered for the new text
2475
	 * @return The newly created <code>StyledText</code> widget
2476
	 *
2477
	 * @category Layout
2478
	 */
2479
	protected final StyledText addMultiLineStyledText(Composite container,
2480
	                                                  WritablePropertyValueModel<String> textHolder,
2481
	                                                  int lineCount,
2482
	                                                  String helpId) {
2483
2484
		StyledText text = this.addMultiLineStyledText(container, lineCount, helpId);
2485
		SWTTools.bind(textHolder, text);
2486
		return text;
2487
	}
2488
2489
	/**
2367
	 * Creates a new <code>PageBook</code> and set the proper layout and layout
2490
	 * Creates a new <code>PageBook</code> and set the proper layout and layout
2368
	 * data.
2491
	 * data.
2369
	 *
2492
	 *
(-)META-INF/MANIFEST.MF (+2 lines)
Lines 25-30 Link Here
25
 org.eclipse.jst.common.project.facet.core;bundle-version="[1.3.100,2.0.0)",
25
 org.eclipse.jst.common.project.facet.core;bundle-version="[1.3.100,2.0.0)",
26
 org.eclipse.jst.j2ee;bundle-version="[1.1.200,2.0.0)",
26
 org.eclipse.jst.j2ee;bundle-version="[1.1.200,2.0.0)",
27
 org.eclipse.jst.j2ee.core;bundle-version="[1.1.200,2.0.0)",
27
 org.eclipse.jst.j2ee.core;bundle-version="[1.1.200,2.0.0)",
28
 org.eclipse.persistence.jpa.jpql;bundle-version="1.0.0",
28
 org.eclipse.wst.common.emf;bundle-version="[1.1.200,2.0.0)",
29
 org.eclipse.wst.common.emf;bundle-version="[1.1.200,2.0.0)",
29
 org.eclipse.wst.common.emfworkbench.integration;bundle-version="[1.1.200,2.0.0)",
30
 org.eclipse.wst.common.emfworkbench.integration;bundle-version="[1.1.200,2.0.0)",
30
 org.eclipse.wst.common.frameworks;bundle-version="[1.1.200,2.0.0)",
31
 org.eclipse.wst.common.frameworks;bundle-version="[1.1.200,2.0.0)",
Lines 62-67 Link Here
62
 org.eclipse.jpt.jpa.core.internal.jpa2.resource.java;x-internal:=true,
63
 org.eclipse.jpt.jpa.core.internal.jpa2.resource.java;x-internal:=true,
63
 org.eclipse.jpt.jpa.core.internal.jpa2.resource.java.binary;x-internal:=true,
64
 org.eclipse.jpt.jpa.core.internal.jpa2.resource.java.binary;x-internal:=true,
64
 org.eclipse.jpt.jpa.core.internal.jpa2.resource.java.source;x-internal:=true,
65
 org.eclipse.jpt.jpa.core.internal.jpa2.resource.java.source;x-internal:=true,
66
 org.eclipse.jpt.jpa.core.internal.jpql;x-friends:="org.eclipse.jpt.jpa.ui",
65
 org.eclipse.jpt.jpa.core.internal.libprov;x-internal:=true,
67
 org.eclipse.jpt.jpa.core.internal.libprov;x-internal:=true,
66
 org.eclipse.jpt.jpa.core.internal.libval;x-internal:=true,
68
 org.eclipse.jpt.jpa.core.internal.libval;x-internal:=true,
67
 org.eclipse.jpt.jpa.core.internal.operations;x-internal:=true,
69
 org.eclipse.jpt.jpa.core.internal.operations;x-internal:=true,
(-)property_files/jpa_jpql_validation.properties (+484 lines)
Added Link Here
1
################################################################################
2
# Copyright (c) 2011 Oracle. All rights reserved.
3
# This program and the accompanying materials are made available under the
4
# terms of the Eclipse Public License v1.0, which accompanies this distribution
5
# and is available at http:#www.eclipse.org/legal/epl-v10.html.
6
# 
7
# Contributors:
8
#     Oracle - initial API and implementation
9
################################################################################
10
11
# AbsExpression - Grammar
12
ABS_EXPRESSION_INVALID_EXPRESSION = The encapsulated expression is not a valid expression.
13
ABS_EXPRESSION_MISSING_EXPRESSION = The encapsulated expression must be provided for an ABS expression.
14
ABS_EXPRESSION_MISSING_LEFT_PARENTHESIS = The left parenthesis is missing from the ABS expression.
15
ABS_EXPRESSION_MISSING_RIGHT_PARENTHESIS = The right parenthesis is missing from the ABS expression.
16
# AbsExpression - Semantic
17
ABS_EXPRESSION_INVALID_NUMERIC_EXPRESSION = The encapsulated expression is not a valid numeric expression.
18
19
# AbstractFromClause - Grammar
20
ABSTRACT_FROM_CLAUSE_IDENTIFICATION_VARIABLE_DECLARATION_ENDS_WITH_COMMA = The FROM clause cannot end with a comma.
21
ABSTRACT_FROM_CLAUSE_IDENTIFICATION_VARIABLE_DECLARATION_IS_MISSING_COMMA = The FROM clause has ''{0}'' and ''{1}'' that are not separated by a comma.
22
ABSTRACT_FROM_CLAUSE_MISSING_IDENTIFICATION_VARIABLE_DECLARATION = The FROM clause must defined at least one identification variable declaration.
23
ABSTRACT_FROM_CLAUSE_WRONG_ORDER_OF_IDENTIFICATION_VARIABLE_DECLARATION = The identification variable ''{0}'' is declared after its usage. Identification variables are evaluated from left to right.
24
25
# AbstractPathExpression - Grammar
26
ABSTRACT_PATH_EXPRESSION_CANNOT_END_WITH_COMMA = A path expression cannot end with a comma.
27
ABSTRACT_PATH_EXPRESSION_MISSING_IDENTIFICATION_VARIABLE = A path expression must start with an identification variable.
28
29
# AbstractSchemaName - Grammar
30
ABSTRACT_SCHEMA_NAME_INVALID = The abstract schema type ''{0}'' is unknown.
31
ABSTRACT_SCHEMA_NAME_NOT_RESOLVABLE = ''{0}'' cannot be resolved to a type.
32
# AbstractSchemaName - Semantic
33
PATH_EXPRESSION_NOT_RELATIONSHIP_MAPPING = The derived path ''{0}'' does not represent an association field.
34
35
# AbstractSelectClause - Grammar
36
ABSTRACT_SELECT_CLAUSE_SELECT_EXPRESSION_ENDS_WITH_COMMA = The select expression cannot end with a comma.
37
ABSTRACT_SELECT_CLAUSE_SELECT_EXPRESSION_IS_MISSING_COMMA = The SELECT clause has ''{0}'' and ''{1}'' that are not separated by a comma.
38
ABSTRACT_SELECT_CLAUSE_SELECT_EXPRESSION_MALFORMED = The select expression is malformed.
39
ABSTRACT_SELECT_CLAUSE_SELECT_MISSING_EXPRESSION = The select expression is missing from the SELECT clause.
40
41
# AbstractSelectStatement - Grammar
42
ABSTRACT_SELECT_STATEMENT_FROM_CLAUSE_MSSING = A select statement must have a FROM clause.
43
44
# AdditionExpression - Semantic
45
ADDITION_EXPRESSION_LEFT_EXPRESSION_WRONG_TYPE = The left side of the addition is not a valid arithmetic expression.
46
ADDITION_EXPRESSION_RIGHT_EXPRESSION_WRONG_TYPE = The right side of the addition is not a valid arithmetic expression.
47
48
# AllOrAnyExpression - Grammar
49
ALL_OR_ANY_EXPRESSION_INVALID_EXPRESSION = The encapsulated expression is not a valid expression.
50
ALL_OR_ANY_EXPRESSION_MISSING_EXPRESSION = The subquery must be provided for an {0} expression.
51
ALL_OR_ANY_EXPRESSION_MISSING_LEFT_PARENTHESIS = The left parenthesis is missing from the {0} expression.
52
ALL_OR_ANY_EXPRESSION_MISSING_RIGHT_PARENTHESIS = The right parenthesis is missing from the {0} expression.
53
ALL_OR_ANY_EXPRESSION_NOT_PART_OF_COMPARISON_EXPRESSION = The {0} expression must be part of a comparison expression.
54
55
# ArithmeticFactor - Grammar
56
ARITHMETIC_FACTOR_MISSING_EXPRESSION = An arithmetic factor must be followed by an expression.
57
# ArithmeticFactor - Semantic
58
ARITHMETIC_FACTOR_INVALID_EXPRESSION = The expression must be an arithmetic expression.
59
60
# ArithmeticExpression - Grammar
61
ARITHMETIC_EXPRESSION_INVALID_LEFT_EXPRESSION = The left expression is not an arithmetic expression.
62
ARITHMETIC_EXPRESSION_INVALID_RIGHT_EXPRESSION = The right expression is not an arithmetic expression.
63
ARITHMETIC_EXPRESSION_MISSING_LEFT_EXPRESSION = The left expression is missing from the arithmetic expression.
64
ARITHMETIC_EXPRESSION_MISSING_RIGHT_EXPRESSION = The right expression is missing from the arithmetic expression.
65
66
# AvgFunction - Grammar
67
AVG_FUNCTION_INVALID_EXPRESSION = The encapsulated expression is not a valid expression.
68
AVG_FUNCTION_MISSING_LEFT_PARENTHESIS = The left parenthesis is missing from the AVG expression.
69
AVG_FUNCTION_MISSING_EXPRESSION = The encapsulated expression must be provided for an AVG expression.
70
AVG_FUNCTION_MISSING_RIGHT_PARENTHESIS = The right parenthesis is missing from the AVG expression.
71
# AvgFunction - Semantic
72
AVG_FUNCTION_INVALID_NUMERIC_EXPRESSION = The encapsulated expression is not a valid numeric expression.
73
74
# BetweenExpression - Grammar
75
BETWEEN_EXPRESSION_MISSING_EXPRESSION = The result expression is missing from the BETWEEN expression.
76
BETWEEN_EXPRESSION_MISSING_LOWER_BOUND_EXPRESSION = The lower bound expression is missing from the BETWEEN expression.
77
BETWEEN_EXPRESSION_MISSING_AND = The identifier AND is missing from the BETWEEN expression.
78
BETWEEN_EXPRESSION_MISSING_UPPER_BOUND_EXPRESSION = The upper bound expression is missing from the BETWEEN expression.
79
# BetweenExpression - Semantic
80
BETWEEN_EXPRESSION_WRONG_TYPE = The expression's type and the lower and upper bound expressions' type have to be the same type.
81
82
# CaseExpression - Grammar
83
CASE_EXPRESSION_MISSING_ELSE_EXPRESSION = A CASE expression must have an ELSE expression.
84
CASE_EXPRESSION_MISSING_ELSE_IDENTIFIER = The identifier ELSE is missing from the CASE expression.
85
CASE_EXPRESSION_MISSING_END_IDENTIFIER = The identifier END is missing from the CASE expression.
86
CASE_EXPRESSION_MISSING_WHEN_CLAUSE = A CASE expression must define at least one WHEN clause.
87
CASE_EXPRESSION_WHEN_CLAUSES_END_WITH_COMMA = The WHEN clauses cannot end with a comma.
88
CASE_EXPRESSION_WHEN_CLAUSES_HAS_COMMA = Two WHEN clauses cannot be separated by a comma.
89
90
# CoalesceExpression - Grammar
91
COALESCE_EXPRESSION_INVALID_EXPRESSION = The encapsulated expression is not a valid expression.
92
COALESCE_EXPRESSION_MISSING_EXPRESSION = The encapsulated expressions must be provided for a COALESCE expression.
93
COALESCE_EXPRESSION_MISSING_LEFT_PARENTHESIS = The left parenthesis is missing from the COALESCE expression.
94
COALESCE_EXPRESSION_MISSING_RIGHT_PARENTHESIS = The right parenthesis is missing from the COALESCE expression.
95
96
# CollectionExpression - Grammar
97
COLLECTION_EXPRESSION_MISSING_EXPRESSION = An expression at position {0} must be defined.
98
99
# CollectionMemberExpression - Grammar
100
COLLECTION_MEMBER_EXPRESSION_MISSING_ENTITY_EXPRESSION = A collection member expression must define an entity expression.
101
COLLECTION_MEMBER_EXPRESSION_MISSING_COLLECTION_VALUED_PATH_EXPRESSION = A collection member expression must define a collection valued path expression.
102
# CollectionMemberExpression - Semantic
103
COLLECTION_MEMBER_EXPRESSION_EMBEDDABLE = An embeddable type is not supported.
104
105
# CollectionMemberDeclaration - Grammar
106
COLLECTION_MEMBER_DECLARATION_MISSING_COLLECTION_VALUED_PATH_EXPRESSION = The collection-valued path expression is missing from the collection member declaration.
107
COLLECTION_MEMBER_DECLARATION_MISSING_LEFT_PARENTHESIS = The left parenthesis is missing from the collection member declaration.
108
COLLECTION_MEMBER_DECLARATION_MISSING_IDENTIFICATION_VARIABLE = An identification variable must be specified for a collection member declaration.
109
COLLECTION_MEMBER_DECLARATION_MISSING_RIGHT_PARENTHESIS = The right parenthesis is missing from the collection member declaration.
110
111
# CollectionValuedPathExpression - Semantic
112
COLLECTION_VALUED_PATH_EXPRESSION_NOT_RESOLVABLE" ,     "The collection-valued path ''{0}'' cannot be resolved to a valid association field.
113
COLLECTION_VALUED_PATH_EXPRESSION_NOT_COLLECTION_TYPE = The collection-valued path ''{0}'' must resolve to an association field.
114
115
# ComparisonExpression - Grammar
116
COMPARISON_EXPRESSION_MISSING_LEFT_EXPRESSION = A comparison expression must define the left side of the comparison.
117
COMPARISON_EXPRESSION_MISSING_RIGHT_EXPRESSION = A comparison expression must define the right side of the comparison.
118
# ComparisonExpression - Semantic
119
COMPARISON_EXPRESSION_WRONG_COMPARISON_TYPE = The left and right expressions' type must be of the same type.
120
121
# ConcatExpression - Grammar
122
CONCAT_EXPRESSION_INVALID_EXPRESSION = The expression ''{0}'' is not valid expression.
123
CONCAT_EXPRESSION_MISSING_EXPRESSION = The encapsulated expression is missing from the CONCAT expression.
124
CONCAT_EXPRESSION_MISSING_LEFT_PARENTHESIS = The left parenthesis is missing from the CONCAT expression.
125
CONCAT_EXPRESSION_MISSING_RIGHT_PARENTHESIS = The right parenthesis is missing from the CONCAT expression.
126
# ConcatExpression - Semantic
127
CONCAT_EXPRESSION_EXPRESSION_WRONG_TYPE = The expression ''{0}'' is not a String.
128
129
# ConstructorExpression - Grammar
130
CONSTRUCTOR_EXPRESSION_CONSTRUCTOR_ITEM_ENDS_WITH_COMMA = The constructor items cannot end with a comma.
131
CONSTRUCTOR_EXPRESSION_CONSTRUCTOR_ITEM_IS_MISSING_COMMA = The constructor expression has two constructor items (''{0}'' and ''{1}'') that are not separated by a comma.
132
CONSTRUCTOR_EXPRESSION_MISSING_CONSTRUCTOR_ITEM = A constructor expression must define at least one constructor item.
133
CONSTRUCTOR_EXPRESSION_MISSING_CONSTRUCTOR_NAME = The fully qualified class name must be specified.
134
CONSTRUCTOR_EXPRESSION_MISSING_LEFT_PARENTHESIS = The left parenthesis is missing from the constructor expression.
135
CONSTRUCTOR_EXPRESSION_MISSING_RIGHT_PARENTHESIS = The right parenthesis is missing from the constructor expression.
136
# ConstructorExpression - Semantic
137
CONSTRUCTOR_EXPRESSION_MISMATCHED_PARAMETER_TYPES = No constructors can be found that match the argument types.
138
CONSTRUCTOR_EXPRESSION_UNKNOWN_TYPE = ''{0}'' cannot be resolved to a type.
139
140
# CountFunction - Grammar
141
COUNT_FUNCTION_INVALID_EXPRESSION = The encapsulated expression is not a valid expression.
142
COUNT_FUNCTION_MISSING_EXPRESSION = The encapsulated expression must be provided for a COUNT expression.
143
COUNT_FUNCTION_MISSING_LEFT_PARENTHESIS = The left parenthesis is missing from the COUNT expression.
144
COUNT_FUNCTION_MISSING_RIGHT_PARENTHESIS = The right parenthesis is missing from the COUNT expression.
145
# CountFunction - Semantic
146
COUNT_FUNCTION_DISTINCT_EMBEDDABLE = The use of DISTINCT is not supported for arguments of embeddable types.
147
148
# DateTime - Grammar
149
DATE_TIME_JDBC_ESCAPE_FORMAT_INVALID_SPECIFICATION = The JDBC escape format does not start with either 'd', 't' or 'ts'.
150
DATE_TIME_JDBC_ESCAPE_FORMAT_MISSING_CLOSE_QUOTE = The JDBC escape format is missing the close quote.
151
DATE_TIME_JDBC_ESCAPE_FORMAT_MISSING_OPEN_QUOTE = The JDBC escape format is missing the open quote.
152
DATE_TIME_JDBC_ESCAPE_FORMAT_MISSING_RIGHT_CURLY_BRACE = The JDBC escape format is missing the right curly brace.
153
154
# DeleteClause - Grammar
155
DELETE_CLAUSE_FROM_MISSING = The identifier FROM is missing from the DELETE FROM clause.
156
DELETE_CLAUSE_MULTIPLE_RANGE_VARIABLE_DECLARATION = Only one entity abstract schema type can be defined.
157
DELETE_CLAUSE_RANGE_VARIABLE_DECLARATION_MALFORMED = The entity abstract schema type declaration is malformed.
158
DELETE_CLAUSE_RANGE_VARIABLE_DECLARATION_MISSING = A DELETE clause must define an entity abstract schema type.
159
160
# DivisionExpression - Semantic
161
DIVISION_EXPRESSION_LEFT_EXPRESSION_WRONG_TYPE = The left side of the division is not a valid arithmetic expression.
162
DIVISION_EXPRESSION_RIGHT_EXPRESSION_WRONG_TYPE = The right side of the division is not a valid arithmetic expression.
163
164
# EclipseLinkQueryBuilder - Validation
165
ECLIPSE_LINK_QUERY_BUILDER_GRAMMAR_VALIDATOR_ERROR_MESSAGE = Syntax error parsing the query [{0}]. {1}
166
ECLIPSE_LINK_QUERY_BUILDER_SEMANTIC_VALIDATOR_ERROR_MESSAGE = Problem compiling the query [{0}]. {1}
167
168
# EncapsulatedIdentificationVariableExpression - Semantic
169
ENCAPSULATED_IDENTIFICATION_VARIABLE_EXPRESSION_NOT_MAP_VALUED = The {0} operator may only be applied to identification variables that correspond to map-valued associations or map-valued element collections.
170
171
# EmptyCollectionComparisonExpression - Grammar
172
EMPTY_COLLECTION_COMPARISON_EXPRESSION_MISSING_EXPRESSION = The collection valued path expression must be defined.
173
174
# EntityTypeLiteral - Semantic
175
ENTITY_TYPE_LITERAL_NOT_RESOLVABLE = ''{0}'' cannot be resolved to a type.
176
177
# EntryExpression - Grammar
178
ENTRY_EXPRESSION_INVALID_EXPRESSION = The encapsulated expression is not a valid expression.
179
ENTRY_EXPRESSION_MISSING_EXPRESSION = An identification variable must be provided for an ENTRY expression.
180
ENTRY_EXPRESSION_MISSING_LEFT_PARENTHESIS = The left parenthesis is missing from the ENTRY expression.
181
ENTRY_EXPRESSION_MISSING_RIGHT_PARENTHESIS = The right parenthesis is missing from the ENTRY expression.
182
183
# ExistsExpression - Grammar
184
EXISTS_EXPRESSION_INVALID_EXPRESSION = The encapsulated expression is not a valid expression.
185
EXISTS_EXPRESSION_MISSING_EXPRESSION = A subquery must be provided for an EXISTS expression.
186
EXISTS_EXPRESSION_MISSING_LEFT_PARENTHESIS = The left parenthesis is missing from the EXISTS expression.
187
EXISTS_EXPRESSION_MISSING_RIGHT_PARENTHESIS = The right parenthesis is missing from the EXISTS expression.
188
189
# FuncExpression - Grammar
190
FUNC_EXPRESSION_MISSING_FUNCTION_NAME = The SQL function name must be specified.
191
FUNC_EXPRESSION_MISSING_LEFT_PARENTHESIS = The left parenthesis is missing from the FUNC expression.
192
FUNC_EXPRESSION_MISSING_RIGHT_PARENTHESIS = The right parenthesis is missing from the FUNC expression.
193
194
# GroupByClause - Grammar
195
GROUP_BY_CLAUSE_GROUP_BY_ITEM_ENDS_WITH_COMMA = The select expression cannot end with a comma.
196
GROUP_BY_CLAUSE_GROUP_BY_ITEM_IS_MISSING_COMMA = The GROUP BY clause has ''{0}'' and ''{1}'' that are not separated by a comma.
197
GROUP_BY_CLAUSE_GROUP_BY_ITEM_MISSING = The grouping item is missing from the GROUP BY clause.
198
199
# HavingClause - Grammar
200
HAVING_CLAUSE_INVALID_CONDITIONAL_EXPRESSION = The expression is not a valid conditional expression.
201
HAVING_CLAUSE_MISSING_CONDITIONAL_EXPRESSION = The conditional expression is missing from the HAVING clause.
202
203
# IdentificationVariable - Grammar
204
IDENTIFICATION_VARIABLE_INVALID_DUPLICATE = The identification variable ''{0}'' cannot be declared more than once.
205
IDENTIFICATION_VARIABLE_INVALID_JAVA_IDENTIFIER = The identification variable ''{0}'' is not following the rules for a Java identifier.
206
IDENTIFICATION_VARIABLE_INVALID_RESERVED_WORD = The identification variable ''{0}'' cannot be a reserved word.
207
# IdentificationVariable - Semantic
208
IDENTIFICATION_VARIABLE_ENTITY_NAME = An identification variable must not have the same name as any entity in the same persistence unit.
209
IDENTIFICATION_VARIABLE_INVALID_NOT_DECLARED = The identification variable ''{0}'' is not defined in the FROM clause.
210
211
# IdentificationVariableDeclaration - Grammar
212
IDENTIFICATION_VARIABLE_DECLARATION_MISSING_RANGE_VARIABLE_DECLARATION = The range variable declaration must be specified.
213
214
# IndexExpression - Grammar
215
INDEX_EXPRESSION_INVALID_EXPRESSION = The encapsulated expression is not a valid expression.
216
INDEX_EXPRESSION_MISSING_EXPRESSION = An identification variable must be provided for an INDEX expression.
217
INDEX_EXPRESSION_MISSING_LEFT_PARENTHESIS = The left parenthesis is missing from the INDEX expression.
218
INDEX_EXPRESSION_MISSING_RIGHT_PARENTHESIS = The right parenthesis is missing from the INDEX expression.
219
# IndexExpression - Semantic
220
INDEX_EXPRESSION_WRONG_VARIABLE = The identification variable ''{0}'' does not represent an association or element collection.
221
222
# InExpression - Grammar
223
IN_EXPRESSION_IN_ITEM_ENDS_WITH_COMMA = The items cannot end with a comma.
224
IN_EXPRESSION_IN_ITEM_IS_MISSING_COMMA = The IN expression has ''{0}'' and ''{1}'' that are not separated by a comma.
225
IN_EXPRESSION_MALFORMED_EXPRESSION = The IN expression does not have a valid state field path expression or TYPE expession.
226
IN_EXPRESSION_MISSING_IN_ITEMS = A least one item must be defined for the IN expression.
227
IN_EXPRESSION_MISSING_LEFT_PARENTHESIS = The left parenthesis is missing from the IN expression.
228
IN_EXPRESSION_MISSING_RIGHT_PARENTHESIS = The right parenthesis is missing from the IN expression.
229
IN_EXPRESSION_MISSING_EXPRESSION = A state field path expression or TYPE expression must be defined.
230
231
# InputParameter - Grammar
232
INPUT_PARAMETER_JAVA_IDENTIFIER = The named input parameter ''{0}'' is not following the rules for a Java identifier.
233
INPUT_PARAMETER_MISSING_PARAMETER = The parameter value is missing from the input parameter.
234
INPUT_PARAMETER_MIXTURE = Named and positional input parameters must not be mixed in a single query.
235
INPUT_PARAMETER_NOT_INTEGER = The positional input parameter ''{0}'' cannot use non-Integer characters.
236
INPUT_PARAMETER_SMALLER_THAN_ONE = The number used for the positional input parameter ''{0}'' must be greater than 0.
237
INPUT_PARAMETER_WRONG_CLAUSE_DECLARATION = Input parameters can only be used in the WHERE clause or HAVING clause of a query.
238
239
# Join - Grammar
240
JOIN_MISSING_IDENTIFICATION_VARIABLE = An identification variable must be defined for a JOIN expression.
241
JOIN_MISSING_JOIN_ASSOCIATION_PATH = The join association path is missing from the JOIN expression.
242
243
# JoinFetch - Grammar
244
JOIN_FETCH_MISSING_JOIN_ASSOCIATION_PATH = The join association path is missing from the JOIN FETCH expression.
245
JOIN_FETCH_WRONG_CLAUSE_DECLARATION = JOIN FETCH expressions cannot be used in a FROM clause of a subquery.
246
247
# JPQLExpression - Grammar
248
JPQL_EXPRESSION_INVALID_QUERY = The query does not start with a valid identifier, has to be either SELECT, UPDATE or DELETE FROM.
249
JPQL_EXPRESSION_UNKNOWN_ENDING = The query contains a malformed ending.
250
251
# KeyExpression - Grammar
252
KEY_EXPRESSION_INVALID_EXPRESSION = The encapsulated expression is not a valid expression.
253
KEY_EXPRESSION_MISSING_EXPRESSION = The identification variable must be provided for an ABS expression.
254
KEY_EXPRESSION_MISSING_LEFT_PARENTHESIS = The left parenthesis is missing from the ABS expression.
255
KEY_EXPRESSION_MISSING_RIGHT_PARENTHESIS = The right parenthesis is missing from the ABS expression.
256
257
# LengthExpression - Grammar
258
LENGTH_EXPRESSION_INVALID_EXPRESSION = The encapsulated expression is not a valid expression.
259
LENGTH_EXPRESSION_MISSING_EXPRESSION = An expression must be provided for a LENGTH expression.
260
LENGTH_EXPRESSION_MISSING_LEFT_PARENTHESIS = The left parenthesis is missing from the LENGTH expression.
261
LENGTH_EXPRESSION_MISSING_RIGHT_PARENTHESIS = The right parenthesis is missing from the LENGTH expression.
262
# LikeExpression - Semantic
263
LENGTH_EXPRESSION_WRONG_TYPE = The encapsulated expression is not of string type.
264
265
# LikeExpression - Grammar
266
LIKE_EXPRESSION_INVALID_ESCAPE_CHARACTER = {0} is not a valid escape character.
267
LIKE_EXPRESSION_MISSING_ESCAPE_CHARACTER = The escape character is missing from the LIKE expression.
268
LIKE_EXPRESSION_MISSING_PATTERN_VALUE = The pattern value is missing from the LIKE expression.
269
LIKE_EXPRESSION_MISSING_STRING_EXPRESSION = The string expression is missing from the LIKE expression.
270
271
# LocateExpression - Grammar
272
LOCATE_EXPRESSION_INVALID_FIRST_EXPRESSION = The first argument is not a valid expression.
273
LOCATE_EXPRESSION_INVALID_SECOND_EXPRESSION = The second argument is not a valid expression.
274
LOCATE_EXPRESSION_INVALID_THIRD_EXPRESSION = The third argument is not a valid expression.
275
LOCATE_EXPRESSION_MISSING_FIRST_EXPRESSION = The first argument is missing from the LOCATE expression.
276
LOCATE_EXPRESSION_MISSING_LEFT_PARENTHESIS = The left parenthesis is missing from the LOCATE expression.
277
LOCATE_EXPRESSION_MISSING_FIRST_COMMA = The first comma is missing from the LOCATE expression.
278
LOCATE_EXPRESSION_MISSING_RIGHT_PARENTHESIS = The right parenthesis is missing from the LOCATE expression.
279
LOCATE_EXPRESSION_MISSING_SECOND_COMMA = The second comma is missing from the LOCATE expression.
280
LOCATE_EXPRESSION_MISSING_SECOND_EXPRESSION = The second argument is missing from the LOCATE expression.
281
LOCATE_EXPRESSION_MISSING_THIRD_EXPRESSION = The third argument is missing from the LOCATE expression.
282
# LocateExpression - Semantic
283
LOCATE_EXPRESSION_FIRST_EXPRESSION_WRONG_TYPE = The first expression is not of string type.
284
LOCATE_EXPRESSION_SECOND_EXPRESSION_WRONG_TYPE = The second expression is not of string type.
285
LOCATE_EXPRESSION_THIRD_EXPRESSION_WRONG_TYPE = The third encapsulated expression is not of numeric type.
286
287
# LogicalExpression - Grammar
288
LOGICAL_EXPRESSION_INVALID_LEFT_EXPRESSION = The left expression is missing from the logical expression.
289
LOGICAL_EXPRESSION_INVALID_RIGHT_EXPRESSION = The right expression is missing from the logical expression.
290
LOGICAL_EXPRESSION_MISSING_LEFT_EXPRESSION = The left expression is not a valid expression.
291
LOGICAL_EXPRESSION_MISSING_RIGHT_EXPRESSION = The right expression is not a valid expression.
292
293
# LowerExpression - Grammar
294
LOWER_EXPRESSION_INVALID_EXPRESSION = The encapsulated expression is not a valid expression.
295
LOWER_EXPRESSION_MISSING_EXPRESSION = An expression must be provided for a LOWER expression.
296
LOWER_EXPRESSION_MISSING_LEFT_PARENTHESIS = The left parenthesis is missing from the LOWER expression.
297
LOWER_EXPRESSION_MISSING_RIGHT_PARENTHESIS = The right parenthesis is missing from the LOWER expression.
298
# UpperExpression - Semantic
299
LOWER_EXPRESSION_WRONG_TYPE = The expression is not a String.
300
301
# MaxFunction - Grammar
302
MAX_FUNCTION_INVALID_EXPRESSION = The encapsulated expression is not a valid expression.
303
MAX_FUNCTION_MISSING_EXPRESSION = The encapsulated expression must be provided for a MAX expression.
304
MAX_FUNCTION_MISSING_LEFT_PARENTHESIS = The left parenthesis is missing from the MAX expression.
305
MAX_FUNCTION_MISSING_RIGHT_PARENTHESIS = The right parenthesis is missing from the MAX expression.
306
307
# MinFunction - Grammar
308
MIN_FUNCTION_INVALID_EXPRESSION = The encapsulated expression is not a valid expression.
309
MIN_FUNCTION_MISSING_EXPRESSION = The encapsulated expression must be provided for a MIN expression.
310
MIN_FUNCTION_MISSING_LEFT_PARENTHESIS = The left parenthesis is missing from the MIN expression.
311
MIN_FUNCTION_MISSING_RIGHT_PARENTHESIS = The right parenthesis is missing from the MIN expression.
312
313
# ModExpression - Grammar
314
MOD_EXPRESSION_INVALID_FIRST_EXPRESSION = The first argument is not a valid expression.
315
MOD_EXPRESSION_INVALID_SECOND_PARENTHESIS = The second argument is not a valid expression.
316
MOD_EXPRESSION_MISSING_COMMA = The comma is missing from the MOD expression.
317
MOD_EXPRESSION_MISSING_FIRST_EXPRESSION = The first argument is missing from the MOD expression.
318
MOD_EXPRESSION_MISSING_LEFT_PARENTHESIS = The left parenthesis is missing from the MOD expression.
319
MOD_EXPRESSION_MISSING_RIGHT_PARENTHESIS = The right parenthesis is missing from the MOD expression.
320
MOD_EXPRESSION_MISSING_SECOND_EXPRESSION = The second argument is missing from the MOD expression.
321
# ModExpression - Semantic
322
MOD_EXPRESSION_FIRST_EXPRESSION_WRONG_TYPE = The first expression is not an Integer.
323
MOD_EXPRESSION_SECOND_EXPRESSION_WRONG_TYPE = The second expression is not an Integer.
324
325
# MultiplicationExpression - Semantic
326
MULTIPLICATION_EXPRESSION_LEFT_EXPRESSION_WRONG_TYPE = The left side of the multiplication is not a valid arithmetic expression.
327
MULTIPLICATION_EXPRESSION_RIGHT_EXPRESSION_WRONG_TYPE = The right side of the multiplication is not a valid arithmetic expression.
328
329
# NotExpression - Grammar
330
NOT_EXPRESSION_MISSING_EXPRESSION = The expression is missing after the identifier NOT.
331
# NotExpression - Semantic
332
NOT_EXPRESSION_WRONG_TYPE = The expression is not of boolean type.
333
334
# NullComparisonExpression - Grammar
335
NULL_COMPARISON_EXPRESSION_MISSING_EXPRESSION = The expression is missing from the null comparison expression.
336
# NullComparisonExpression - Semantic
337
NULL_COMPARISON_EXPRESSION_INVALID_TYPE = ''{0}'' cannot be resolved to an embeddable.
338
339
# NullIfExpression - Grammar
340
NULL_IF_EXPRESSION_INVALID_FIRST_EXPRESSION = The first argument is not a valid expression.
341
NULL_IF_EXPRESSION_INVALID_SECOND_EXPRESSION = The second argument is not a valid expression.
342
NULL_IF_EXPRESSION_MISSING_COMMA = The comma is missing from the NULLIF expression.
343
NULL_IF_EXPRESSION_MISSING_FIRST_EXPRESSION = The first argument is missing from the NULLIF expression.
344
NULL_IF_EXPRESSION_MISSING_LEFT_PARENTHESIS = The left parenthesis is missing from the NULLIF expression.
345
NULL_IF_EXPRESSION_MISSING_RIGHT_PARENTHESIS = The right parenthesis is missing from the NULLIF expression.
346
NULL_IF_EXPRESSION_MISSING_SECOND_EXPRESSION = The second argument is missing from the NULLIF expression.
347
348
# NumericLiteral - Grammar
349
NUMERIC_LITERAL_INVALID = ''{0}'' is not a valid numeric value.
350
351
# ObjectByItem - Grammar
352
ORDER_BY_ITEM_INVALID_PATH = ''{0}'' is not a valid state field path expression.
353
ORDER_BY_ITEM_MISSING_STATE_FIELD_PATH_EXPRESSION = A state field path expression must be specified.
354
355
# ObjectExpression - Grammar
356
OBJECT_EXPRESSION_INVALID_EXPRESSION = The encapsulated expression is not a valid expression.
357
OBJECT_EXPRESSION_MISSING_EXPRESSION = An identification variable must be provided for an OBJECT expression.
358
OBJECT_EXPRESSION_MISSING_LEFT_PARENTHESIS = The left parenthesis is missing from the OBJECT expression.
359
OBJECT_EXPRESSION_MISSING_RIGHT_PARENTHESIS = The right parenthesis is missing from the OBJECT expression.
360
361
# OrderByClause - Grammar
362
ORDER_BY_CLAUSE_ORDER_BY_ITEM_ENDS_WITH_COMMA = The select expression cannot end with a comma.
363
ORDER_BY_CLAUSE_ORDER_BY_ITEM_IS_MISSING_COMMA = The ORDER BY clause has ''{0}'' and ''{1}'' that are not separated by a comma.
364
ORDER_BY_CLAUSE_ORDER_BY_ITEM_MISSING = The ordering item is missing from the ORDER BY clause.
365
366
# RangeVariableDeclaration - Grammar
367
RANGE_VARIABLE_DECLARATION_MISSING_ABSTRACT_SCHEMA_NAME = An abstract schema name must be specified.
368
RANGE_VARIABLE_DECLARATION_MISSING_IDENTIFICATION_VARIABLE = An identification variable must be provider for a range variable declaration.
369
370
# ResultVariable - Grammar
371
RESULT_VARIABLE_MISSING_SELECT_EXPRESSION = The select item is missing from the result variable declaration.
372
RESULT_VARIABLE_MISSING_RESULT_VARIABLE = The result variable is missing from the select item declaration.
373
374
# SelectStatement - Semantic
375
SELECT_STATEMENT_SELECT_CLAUSE_HAS_NON_AGGREGATE_FUNCTIONS = The select list can only consist of aggregate functions because there is no GROUP BY clause and the HAVING clause is used.
376
377
# SimpleSelectClause - Grammar
378
SIMPLE_SELECT_CLAUSE_NOT_SINGLE_EXPRESSION = Only one expression can be declared in a SELECT clause of a subquery.
379
380
# SizeExpression - Grammar
381
SIZE_EXPRESSION_INVALID_EXPRESSION = The encapsulated expression is not a valid expression.
382
SIZE_EXPRESSION_MISSING_EXPRESSION = A collection-valued path expression must be provided for a SIZE expression.
383
SIZE_EXPRESSION_MISSING_RIGHT_PARENTHESIS = The right parenthesis is missing from the SIZE expression.
384
SIZE_EXPRESSION_MISSING_LEFT_PARENTHESIS = The left parenthesis is missing from the SIZE expression.
385
386
# SqrtExpression - Grammar
387
SQRT_EXPRESSION_INVALID_EXPRESSION = The encapsulated expression is not a valid expression.
388
SQRT_EXPRESSION_MISSING_EXPRESSION = An expression must be provided for a SQRT expression.
389
SQRT_EXPRESSION_MISSING_LEFT_PARENTHESIS = The left parenthesis is missing from the SQRT expression.
390
SQRT_EXPRESSION_MISSING_RIGHT_PARENTHESIS = The right parenthesis is missing from the SQRT expression.
391
# SqrtExpression - Semantic
392
SQRT_EXPRESSION_WRONG_TYPE = The expression is not a numeric type.
393
394
# StateFieldPathExpression - Semantic
395
STATE_FIELD_PATH_EXPRESSION_ASSOCIATION_FIELD = The association field ''{0}'' cannot be used as a state field path.
396
STATE_FIELD_PATH_EXPRESSION_COLLECTION_TYPE = The state field path ''{0}'' cannot be resolved to a collection type.
397
STATE_FIELD_PATH_EXPRESSION_INVALID_ENUM_CONSTANT = ''{0}'' cannot be resolved to an Enum constant.
398
STATE_FIELD_PATH_EXPRESSION_NO_MAPPING = No mapping is associated with the state field path ''{0}''.
399
STATE_FIELD_PATH_EXPRESSION_NOT_RESOLVABLE = The state field path ''{0}'' cannot be resolved to a valid type.
400
401
# SubExpression - Grammar
402
SUB_EXPRESSION_MISSING_EXPRESSION = The encapsulated expression is missing.
403
SUB_EXPRESSION_MISSING_RIGHT_PARENTHESIS = The right parenthesis is missing from the sub-expression.
404
405
# SubstractionExpression - Semantic
406
SUBTRACTION_EXPRESSION_LEFT_EXPRESSION_WRONG_TYPE = The left side of the subtraction is not a valid arithmetic expression.
407
SUBTRACTION_EXPRESSION_RIGHT_EXPRESSION_WRONG_TYPE = The right side of the subtraction is not a valid arithmetic expression.
408
409
# SubstringExpression - Grammar
410
SUBSTRING_EXPRESSION_INVALID_FIRST_EXPRESSION = The first argument is not a valid expression.
411
SUBSTRING_EXPRESSION_INVALID_SECOND_EXPRESSION = The second argument is not a valid expression.
412
SUBSTRING_EXPRESSION_INVALID_THIRD_EXPRESSION = The third argument is not a valid expression.
413
SUBSTRING_EXPRESSION_MISSING_FIRST_COMMA = The first comma is missing from the SUBSTRING expression.
414
SUBSTRING_EXPRESSION_MISSING_FIRST_EXPRESSION = The first argument is missing from the SUBSTRING expression.
415
SUBSTRING_EXPRESSION_MISSING_LEFT_PARENTHESIS = The left parenthesis is missing from the SUBSTRING expression.
416
SUBSTRING_EXPRESSION_MISSING_RIGHT_PARENTHESIS = The right parenthesis is missing from the SUBSTRING expression.
417
SUBSTRING_EXPRESSION_MISSING_SECOND_COMMA = The second comma is missing from the SUBSTRING expression.
418
SUBSTRING_EXPRESSION_MISSING_SECOND_EXPRESSION = The second argument is missing from the SUBSTRING expression.
419
SUBSTRING_EXPRESSION_MISSING_THIRD_EXPRESSION = The third argument is missing from the SUBSTRING expression.
420
# SubstringExpression - Semantic
421
SUBSTRING_EXPRESSION_FIRST_EXPRESSION_WRONG_TYPE = The first argument is not a String value.
422
SUBSTRING_EXPRESSION_SECOND_EXPRESSION_WRONG_TYPE = The first argument is not an integer value.
423
SUBSTRING_EXPRESSION_THIRD_EXPRESSION_WRONG_TYPE = The first argument is not an integer value.
424
425
# SumFunction - Grammar
426
SUM_FUNCTION_INVALID_EXPRESSION = The encapsulated expression is not a valid expression.
427
SUM_FUNCTION_MISSING_EXPRESSION = The encapsulated expression must be provided for a SUM expression.
428
SUM_FUNCTION_MISSING_LEFT_PARENTHESIS = The left parenthesis is missing from the SUM expression.
429
SUM_FUNCTION_MISSING_RIGHT_PARENTHESIS = The right parenthesis is missing from the SUM expression.
430
# SumFunction - Semantic
431
SUM_FUNCTION_WRONG_TYPE = The argument must be numeric.
432
433
# TrimExpression - Grammar
434
TRIM_EXPRESSION_INVALID_EXPRESSION = The encapsulated expression is not a valid expression.
435
TRIM_EXPRESSION_INVALID_TRIM_CHARACTER = The trim character should be a single-character string literal or a character-valued input parameter (i.e., char or Character).
436
TRIM_EXPRESSION_MISSING_EXPRESSION = An expression must be provided for a TRIM expression.
437
TRIM_EXPRESSION_MISSING_LEFT_PARENTHESIS = The left parenthesis is missing from the TRIM expression.
438
TRIM_EXPRESSION_MISSING_RIGHT_PARENTHESIS = The right parenthesis is missing from the TRIM expression.
439
TRIM_EXPRESSION_NOT_SINGLE_STRING_LITERAL = The trim character should be a single-character string literal.
440
441
# TypeExpression - Grammar
442
TYPE_EXPRESSION_INVALID_EXPRESSION = The encapsulated expression is not a valid expression.
443
TYPE_EXPRESSION_MISSING_EXPRESSION = An identification variable or a path expression must be provided for a TYPE expression.
444
TYPE_EXPRESSION_MISSING_LEFT_PARENTHESIS = The left parenthesis is missing from the TYPE expression.
445
TYPE_EXPRESSION_MISSING_RIGHT_PARENTHESIS = The right parenthesis is missing from the TYPE expression.
446
# TypeExpression - Semantic
447
448
# UpdateClause - Grammar
449
UPDATE_CLAUSE_MISSING_RANGE_VARIABLE_DECLARATION = The range variable declaration is missing from the UPDATE clause.
450
UPDATE_CLAUSE_MISSING_SET = The SET identifier is missing from the UPDATE clause.
451
UPDATE_CLAUSE_MISSING_UPDATE_ITEMS = At least one update item must be specified for an UPDATE clause.
452
UPDATE_CLAUSE_UPDATE_ITEM_ENDS_WITH_COMMA = The update item cannot end with a comma.
453
UPDATE_CLAUSE_UPDATE_ITEM_IS_MISSING_COMMA = The UPDATE clause has ''{0}'' and ''{1}'' that are not separated by a comma.
454
455
# UpdateItem - Grammar
456
UPDATE_ITEM_MISSING_EQUAL_SIGN = The equal sign must be specified.
457
UPDATE_ITEM_MISSING_NEW_VALUE = The new value must be specified.
458
UPDATE_ITEM_MISSING_STATE_FIELD_PATH_EXPRESSION = The state field path expression is missing.
459
# UpdateItem - Semantic
460
UPDATE_ITEM_NOT_ASSIGNABLE = Type mismatch: cannot convert from {0} to {1}.
461
UPDATE_ITEM_NOT_RESOLVABLE = The state field cannot be resolved.
462
463
# UpperExpression - Grammar
464
UPPER_EXPRESSION_INVALID_EXPRESSION = The encapsulated expression is not a valid expression.
465
UPPER_EXPRESSION_MISSING_EXPRESSION = An expression must be provided for a UPPER expression.
466
UPPER_EXPRESSION_MISSING_LEFT_PARENTHESIS = The left parenthesis is missing from the UPPER expression.
467
UPPER_EXPRESSION_MISSING_RIGHT_PARENTHESIS = The right parenthesis is missing from the UPPER expression.
468
# UpperExpression - Semantic
469
UPPER_EXPRESSION_WRONG_TYPE = The expression is not a String.
470
471
# ValueExpression - Grammar
472
VALUE_EXPRESSION_INVALID_EXPRESSION = The encapsulated expression is not a valid expression.
473
VALUE_EXPRESSION_MISSING_EXPRESSION = An identification variable must be provided for a VALUE expression.
474
VALUE_EXPRESSION_MISSING_LEFT_PARENTHESIS = The left parenthesis is missing from the VALUE expression.
475
VALUE_EXPRESSION_MISSING_RIGHT_PARENTHESIS = The right parenthesis is missing from the VALUE expression.
476
477
# WhenClause - Grammar
478
WHEN_CLAUSE_MISSING_THEN_EXPRESSION = A conditional expression must be provider for a WHEN clause.
479
WHEN_CLAUSE_MISSING_THEN_IDENTIFIER = The identifier THEN is missing from the WHEN clause.
480
WHEN_CLAUSE_MISSING_WHEN_EXPRESSION = A WHEN expression must be provided for a WHEN clause.
481
482
# WhereClause - Grammar
483
WHERE_CLAUSE_INVALID_CONDITIONAL_EXPRESSION = The expression is not a valid conditional expression.
484
WHERE_CLAUSE_MISSING_CONDITIONAL_EXPRESSION = The conditional expression is missing from the WHERE clause.
(-)src/org/eclipse/jpt/jpa/core/context/orm/OrmNamedQuery.java (-2 / +3 lines)
Lines 21-27 Link Here
21
 * stability. It is available at this early stage to solicit feedback from
21
 * stability. It is available at this early stage to solicit feedback from
22
 * pioneering adopters on the understanding that any code that uses this API
22
 * pioneering adopters on the understanding that any code that uses this API
23
 * will almost certainly be broken (repeatedly) as the API evolves.
23
 * will almost certainly be broken (repeatedly) as the API evolves.
24
 * 
24
 *
25
 * @version 2.1
25
 * @version 2.1
26
 * @since 2.0
26
 * @since 2.0
27
 */
27
 */
Lines 32-35 Link Here
32
32
33
	// required to resolve ambiguity
33
	// required to resolve ambiguity
34
	ListIterable<OrmQueryHint> getHints();
34
	ListIterable<OrmQueryHint> getHints();
35
}
35
36
}
(-)src/org/eclipse/jpt/jpa/core/context/orm/OrmQuery.java (-2 / +4 lines)
Lines 3-9 Link Here
3
 * This program and the accompanying materials are made available under the
3
 * This program and the accompanying materials are made available under the
4
 * terms of the Eclipse Public License v1.0, which accompanies this distribution
4
 * terms of the Eclipse Public License v1.0, which accompanies this distribution
5
 * and is available at http://www.eclipse.org/legal/epl-v10.html.
5
 * and is available at http://www.eclipse.org/legal/epl-v10.html.
6
 * 
6
 *
7
 * Contributors:
7
 * Contributors:
8
 *     Oracle - initial API and implementation
8
 *     Oracle - initial API and implementation
9
 ******************************************************************************/
9
 ******************************************************************************/
Lines 23-29 Link Here
23
 * stability. It is available at this early stage to solicit feedback from
23
 * stability. It is available at this early stage to solicit feedback from
24
 * pioneering adopters on the understanding that any code that uses this API
24
 * pioneering adopters on the understanding that any code that uses this API
25
 * will almost certainly be broken (repeatedly) as the API evolves.
25
 * will almost certainly be broken (repeatedly) as the API evolves.
26
 * 
26
 *
27
 * @version 2.1
27
 * @version 2.1
28
 * @since 2.0
28
 * @since 2.0
29
 */
29
 */
Lines 46-49 Link Here
46
	// ********** validation **********
46
	// ********** validation **********
47
47
48
	TextRange getNameTextRange();
48
	TextRange getNameTextRange();
49
50
	TextRange getQueryTextRange();
49
}
51
}
(-)src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmQuery.java (-2 / +5 lines)
Lines 10-16 Link Here
10
package org.eclipse.jpt.jpa.core.internal.context.orm;
10
package org.eclipse.jpt.jpa.core.internal.context.orm;
11
11
12
import java.util.Vector;
12
import java.util.Vector;
13
14
import org.eclipse.jpt.common.core.utility.TextRange;
13
import org.eclipse.jpt.common.core.utility.TextRange;
15
import org.eclipse.jpt.common.utility.internal.iterables.ListIterable;
14
import org.eclipse.jpt.common.utility.internal.iterables.ListIterable;
16
import org.eclipse.jpt.common.utility.internal.iterables.LiveCloneIterable;
15
import org.eclipse.jpt.common.utility.internal.iterables.LiveCloneIterable;
Lines 55-61 Link Here
55
	// ********** synchronize/update **********
54
	// ********** synchronize/update **********
56
55
57
	@Override
56
	@Override
58
	public void synchronizeWithResourceModel() { 
57
	public void synchronizeWithResourceModel() {
59
		super.synchronizeWithResourceModel();
58
		super.synchronizeWithResourceModel();
60
		this.setName_(this.xmlQuery.getName());
59
		this.setName_(this.xmlQuery.getName());
61
		this.setQuery_(this.xmlQuery.getQuery());
60
		this.setQuery_(this.xmlQuery.getQuery());
Lines 231-236 Link Here
231
		return this.xmlQuery.getNameTextRange();
230
		return this.xmlQuery.getNameTextRange();
232
	}
231
	}
233
232
233
	public TextRange getQueryTextRange() {
234
		return this.xmlQuery.getQueryTextRange();
235
	}
236
234
	@Override
237
	@Override
235
	public void toString(StringBuilder sb) {
238
	public void toString(StringBuilder sb) {
236
		sb.append(this.name);
239
		sb.append(this.name);
(-)src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaNamedQuery.java (-3 / +43 lines)
Lines 1-18 Link Here
1
/*******************************************************************************
1
/*******************************************************************************
2
 * Copyright (c) 2007, 2010 Oracle. All rights reserved.
2
 * Copyright (c) 2007, 2011 Oracle. All rights reserved.
3
 * This program and the accompanying materials are made available under the
3
 * This program and the accompanying materials are made available under the
4
 * terms of the Eclipse Public License v1.0, which accompanies this distribution
4
 * terms of the Eclipse Public License v1.0, which accompanies this distribution
5
 * and is available at http://www.eclipse.org/legal/epl-v10.html.
5
 * and is available at http://www.eclipse.org/legal/epl-v10.html.
6
 * 
6
 *
7
 * Contributors:
7
 * Contributors:
8
 *     Oracle - initial API and implementation
8
 *     Oracle - initial API and implementation
9
 ******************************************************************************/
9
 ******************************************************************************/
10
package org.eclipse.jpt.jpa.core.internal.jpa1.context.java;
10
package org.eclipse.jpt.jpa.core.internal.jpa1.context.java;
11
11
12
import java.util.List;
13
import org.eclipse.jdt.core.dom.CompilationUnit;
14
import org.eclipse.jpt.common.core.utility.TextRange;
12
import org.eclipse.jpt.jpa.core.context.java.JavaJpaContextNode;
15
import org.eclipse.jpt.jpa.core.context.java.JavaJpaContextNode;
13
import org.eclipse.jpt.jpa.core.context.java.JavaNamedQuery;
16
import org.eclipse.jpt.jpa.core.context.java.JavaNamedQuery;
14
import org.eclipse.jpt.jpa.core.internal.context.java.AbstractJavaQuery;
17
import org.eclipse.jpt.jpa.core.internal.context.java.AbstractJavaQuery;
18
import org.eclipse.jpt.jpa.core.internal.jpql.JpaJpqlQueryHelper;
19
import org.eclipse.jpt.jpa.core.internal.validation.JpaValidationMessages;
20
import org.eclipse.jpt.jpa.core.internal.validation.JpaValidationPreferences;
15
import org.eclipse.jpt.jpa.core.resource.java.NamedQueryAnnotation;
21
import org.eclipse.jpt.jpa.core.resource.java.NamedQueryAnnotation;
22
import org.eclipse.persistence.jpa.jpql.JPQLQueryProblem;
23
import org.eclipse.wst.validation.internal.provisional.core.IMessage;
24
import org.eclipse.wst.validation.internal.provisional.core.IReporter;
16
25
17
/**
26
/**
18
 * Java named query
27
 * Java named query
Lines 24-27 Link Here
24
	public GenericJavaNamedQuery(JavaJpaContextNode parent, NamedQueryAnnotation queryAnnotation) {
33
	public GenericJavaNamedQuery(JavaJpaContextNode parent, NamedQueryAnnotation queryAnnotation) {
25
		super(parent, queryAnnotation);
34
		super(parent, queryAnnotation);
26
	}
35
	}
27
}
36
37
38
	// ********** validation **********
39
40
	private boolean shouldValidate() {
41
		return JpaValidationPreferences.getProblemSeverityPreference(this, JpaValidationMessages.JPQL_QUERY_VALIDATION) == -1;
42
	}
43
44
	/**
45
	 * {@inheritDoc}
46
	 */
47
	@Override
48
	public void validate(List<IMessage> messages, IReporter reporter, CompilationUnit astRoot) {
49
		super.validate(messages, reporter, astRoot);
50
51
		// Make this quick check so we don't validate the query, which is time consuming
52
		if (shouldValidate()) {
53
54
			JpaJpqlQueryHelper helper = new JpaJpqlQueryHelper();
55
			helper.setQuery(this, getQuery());
56
57
			String parsedJpqlQuery = helper.getParsedJPQLQuery();
58
			String actualQuery = getQuery();
59
60
			for (JPQLQueryProblem problem : helper.validate()) {
61
				TextRange textRange = this.getQueryAnnotation().getQueryTextRange(astRoot);
62
				IMessage message = helper.buildProblem(this, textRange, problem, parsedJpqlQuery, actualQuery, 1);
63
				messages.add(message);
64
			}
65
		}
66
	}
67
}
(-)src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaQueryContainer.java (-2 / +5 lines)
Lines 308-317 Link Here
308
	@Override
308
	@Override
309
	public void validate(List<IMessage> messages, IReporter reporter, CompilationUnit astRoot) {
309
	public void validate(List<IMessage> messages, IReporter reporter, CompilationUnit astRoot) {
310
		super.validate(messages, reporter, astRoot);
310
		super.validate(messages, reporter, astRoot);
311
		this.validateQueries(messages, astRoot);
311
		this.validateQueries(messages, reporter, astRoot);
312
	}
312
	}
313
313
314
	protected void validateQueries(List<IMessage> messages, CompilationUnit astRoot) {
314
	protected void validateQueries(List<IMessage> messages, IReporter reporter, CompilationUnit astRoot) {
315
		for (Iterator<JavaQuery> localQueries = this.queries(); localQueries.hasNext(); ) {
315
		for (Iterator<JavaQuery> localQueries = this.queries(); localQueries.hasNext(); ) {
316
			JavaQuery localQuery = localQueries.next();
316
			JavaQuery localQuery = localQueries.next();
317
			String name = localQuery.getName();
317
			String name = localQuery.getName();
Lines 354-359 Link Here
354
						)
354
						)
355
				);
355
				);
356
			}
356
			}
357
			else {
358
				localQuery.validate(messages, reporter, astRoot);
359
			}
357
		}
360
		}
358
	}
361
	}
359
362
(-)src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmNamedQuery.java (-3 / +41 lines)
Lines 1-18 Link Here
1
/*******************************************************************************
1
/*******************************************************************************
2
 * Copyright (c) 2007, 2010 Oracle. All rights reserved.
2
 * Copyright (c) 2007, 2011 Oracle. All rights reserved.
3
 * This program and the accompanying materials are made available under the
3
 * This program and the accompanying materials are made available under the
4
 * terms of the Eclipse Public License v1.0, which accompanies this distribution
4
 * terms of the Eclipse Public License v1.0, which accompanies this distribution
5
 * and is available at http://www.eclipse.org/legal/epl-v10.html.
5
 * and is available at http://www.eclipse.org/legal/epl-v10.html.
6
 * 
6
 *
7
 * Contributors:
7
 * Contributors:
8
 *     Oracle - initial API and implementation
8
 *     Oracle - initial API and implementation
9
 ******************************************************************************/
9
 ******************************************************************************/
10
package org.eclipse.jpt.jpa.core.internal.jpa1.context.orm;
10
package org.eclipse.jpt.jpa.core.internal.jpa1.context.orm;
11
11
12
import java.util.List;
13
import org.eclipse.jpt.common.core.utility.TextRange;
12
import org.eclipse.jpt.jpa.core.context.XmlContextNode;
14
import org.eclipse.jpt.jpa.core.context.XmlContextNode;
13
import org.eclipse.jpt.jpa.core.context.orm.OrmNamedQuery;
15
import org.eclipse.jpt.jpa.core.context.orm.OrmNamedQuery;
14
import org.eclipse.jpt.jpa.core.internal.context.orm.AbstractOrmQuery;
16
import org.eclipse.jpt.jpa.core.internal.context.orm.AbstractOrmQuery;
17
import org.eclipse.jpt.jpa.core.internal.jpql.JpaJpqlQueryHelper;
18
import org.eclipse.jpt.jpa.core.internal.validation.JpaValidationMessages;
19
import org.eclipse.jpt.jpa.core.internal.validation.JpaValidationPreferences;
15
import org.eclipse.jpt.jpa.core.resource.orm.XmlNamedQuery;
20
import org.eclipse.jpt.jpa.core.resource.orm.XmlNamedQuery;
21
import org.eclipse.persistence.jpa.jpql.JPQLQueryProblem;
22
import org.eclipse.wst.validation.internal.provisional.core.IMessage;
23
import org.eclipse.wst.validation.internal.provisional.core.IReporter;
16
24
17
/**
25
/**
18
 * <code>orm.xml</code> named query
26
 * <code>orm.xml</code> named query
Lines 24-27 Link Here
24
	public GenericOrmNamedQuery(XmlContextNode parent, XmlNamedQuery resourceNamedQuery) {
32
	public GenericOrmNamedQuery(XmlContextNode parent, XmlNamedQuery resourceNamedQuery) {
25
		super(parent, resourceNamedQuery);
33
		super(parent, resourceNamedQuery);
26
	}
34
	}
27
}
35
36
	// ********** validation **********
37
38
	private boolean shouldValidate() {
39
		return JpaValidationPreferences.getProblemSeverityPreference(this, JpaValidationMessages.JPQL_QUERY_VALIDATION) == -1;
40
	}
41
42
	/**
43
	 * {@inheritDoc}
44
	 */
45
	@Override
46
	public void validate(List<IMessage> messages, IReporter reporter) {
47
		super.validate(messages, reporter);
48
49
		// Make this quick check so we don't validate the query, which is time consuming
50
		if (shouldValidate()) {
51
52
			JpaJpqlQueryHelper helper = new JpaJpqlQueryHelper();
53
			helper.setQuery(this, getQuery());
54
55
			String parsedJpqlQuery = helper.getParsedJPQLQuery();
56
			String actualQuery = getQuery();
57
58
			for (JPQLQueryProblem problem : helper.validate()) {
59
				TextRange textRange = this.getQueryTextRange();
60
				IMessage message = helper.buildProblem(this, textRange, problem, parsedJpqlQuery, actualQuery, 0);
61
				messages.add(message);
62
			}
63
		}
64
	}
65
}
(-)src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmQueryContainer.java (-3 / +5 lines)
Lines 14-20 Link Here
14
import java.util.List;
14
import java.util.List;
15
import java.util.ListIterator;
15
import java.util.ListIterator;
16
import java.util.Vector;
16
import java.util.Vector;
17
18
import org.eclipse.jpt.common.core.utility.TextRange;
17
import org.eclipse.jpt.common.core.utility.TextRange;
19
import org.eclipse.jpt.common.utility.internal.StringTools;
18
import org.eclipse.jpt.common.utility.internal.StringTools;
20
import org.eclipse.jpt.common.utility.internal.iterables.CompositeIterable;
19
import org.eclipse.jpt.common.utility.internal.iterables.CompositeIterable;
Lines 300-309 Link Here
300
	@Override
299
	@Override
301
	public void validate(List<IMessage> messages, IReporter reporter) {
300
	public void validate(List<IMessage> messages, IReporter reporter) {
302
		super.validate(messages, reporter);
301
		super.validate(messages, reporter);
303
		this.validateQueries(messages);
302
		this.validateQueries(messages, reporter);
304
	}
303
	}
305
304
306
	protected void validateQueries(List<IMessage> messages) {
305
	protected void validateQueries(List<IMessage> messages, IReporter reporter) {
307
		for (OrmQuery localQuery : this.getQueries()) {
306
		for (OrmQuery localQuery : this.getQueries()) {
308
			String name = localQuery.getName();
307
			String name = localQuery.getName();
309
			if (StringTools.stringIsEmpty(name)){
308
			if (StringTools.stringIsEmpty(name)){
Lines 345-350 Link Here
345
						)
344
						)
346
				);
345
				);
347
			}
346
			}
347
			else {
348
				localQuery.validate(messages, reporter);
349
			}
348
		}
350
		}
349
	}
351
	}
350
352
(-)src/org/eclipse/jpt/jpa/core/internal/jpa2/context/java/GenericJavaNamedQuery2_0.java (-2 / +41 lines)
Lines 1-5 Link Here
1
/*******************************************************************************
1
/*******************************************************************************
2
* Copyright (c) 2009, 2010 Oracle. All rights reserved.
2
* Copyright (c) 2009, 2011 Oracle. All rights reserved.
3
* This program and the accompanying materials are made available under the
3
* This program and the accompanying materials are made available under the
4
* terms of the Eclipse Public License v1.0, which accompanies this distribution
4
* terms of the Eclipse Public License v1.0, which accompanies this distribution
5
* and is available at http://www.eclipse.org/legal/epl-v10.html.
5
* and is available at http://www.eclipse.org/legal/epl-v10.html.
Lines 9-19 Link Here
9
*******************************************************************************/
9
*******************************************************************************/
10
package org.eclipse.jpt.jpa.core.internal.jpa2.context.java;
10
package org.eclipse.jpt.jpa.core.internal.jpa2.context.java;
11
11
12
import java.util.List;
13
import org.eclipse.jdt.core.dom.CompilationUnit;
14
import org.eclipse.jpt.common.core.utility.TextRange;
12
import org.eclipse.jpt.jpa.core.context.java.JavaJpaContextNode;
15
import org.eclipse.jpt.jpa.core.context.java.JavaJpaContextNode;
13
import org.eclipse.jpt.jpa.core.internal.context.java.AbstractJavaQuery;
16
import org.eclipse.jpt.jpa.core.internal.context.java.AbstractJavaQuery;
17
import org.eclipse.jpt.jpa.core.internal.jpql.JpaJpqlQueryHelper;
18
import org.eclipse.jpt.jpa.core.internal.validation.JpaValidationMessages;
19
import org.eclipse.jpt.jpa.core.internal.validation.JpaValidationPreferences;
14
import org.eclipse.jpt.jpa.core.jpa2.context.LockModeType2_0;
20
import org.eclipse.jpt.jpa.core.jpa2.context.LockModeType2_0;
15
import org.eclipse.jpt.jpa.core.jpa2.context.java.JavaNamedQuery2_0;
21
import org.eclipse.jpt.jpa.core.jpa2.context.java.JavaNamedQuery2_0;
16
import org.eclipse.jpt.jpa.core.jpa2.resource.java.NamedQuery2_0Annotation;
22
import org.eclipse.jpt.jpa.core.jpa2.resource.java.NamedQuery2_0Annotation;
23
import org.eclipse.persistence.jpa.jpql.JPQLQueryProblem;
24
import org.eclipse.wst.validation.internal.provisional.core.IMessage;
25
import org.eclipse.wst.validation.internal.provisional.core.IReporter;
17
26
18
/**
27
/**
19
 * JPA 2.0
28
 * JPA 2.0
Lines 87-90 Link Here
87
		return LockModeType2_0.NONE;
96
		return LockModeType2_0.NONE;
88
	}
97
	}
89
98
90
}
99
100
	// ********** validation **********
101
102
	private boolean shouldValidate() {
103
		return JpaValidationPreferences.getProblemSeverityPreference(this, JpaValidationMessages.JPQL_QUERY_VALIDATION) == -1;
104
	}
105
106
	/**
107
	 * {@inheritDoc}
108
	 */
109
	@Override
110
	public void validate(List<IMessage> messages, IReporter reporter, CompilationUnit astRoot) {
111
		super.validate(messages, reporter, astRoot);
112
113
		// Make this quick check so we don't validate the query, which is time consuming
114
		if (shouldValidate()) {
115
116
			JpaJpqlQueryHelper helper = new JpaJpqlQueryHelper();
117
			helper.setQuery(this, getQuery());
118
119
			String parsedJpqlQuery = helper.getParsedJPQLQuery();
120
			String actualQuery = getQuery();
121
122
			for (JPQLQueryProblem problem : helper.validate()) {
123
				TextRange textRange = this.getQueryAnnotation().getQueryTextRange(astRoot);
124
				IMessage message = helper.buildProblem(this, textRange, problem, parsedJpqlQuery, actualQuery, 1);
125
				messages.add(message);
126
			}
127
		}
128
	}
129
}
(-)src/org/eclipse/jpt/jpa/core/internal/jpa2/context/orm/GenericOrmNamedQuery2_0.java (-3 / +40 lines)
Lines 1-19 Link Here
1
/*******************************************************************************
1
/*******************************************************************************
2
 * Copyright (c) 2007, 2010 Oracle. All rights reserved.
2
 * Copyright (c) 2007, 2011 Oracle. All rights reserved.
3
 * This program and the accompanying materials are made available under the
3
 * This program and the accompanying materials are made available under the
4
 * terms of the Eclipse Public License v1.0, which accompanies this distribution
4
 * terms of the Eclipse Public License v1.0, which accompanies this distribution
5
 * and is available at http://www.eclipse.org/legal/epl-v10.html.
5
 * and is available at http://www.eclipse.org/legal/epl-v10.html.
6
 * 
6
 *
7
 * Contributors:
7
 * Contributors:
8
 *     Oracle - initial API and implementation
8
 *     Oracle - initial API and implementation
9
 ******************************************************************************/
9
 ******************************************************************************/
10
package org.eclipse.jpt.jpa.core.internal.jpa2.context.orm;
10
package org.eclipse.jpt.jpa.core.internal.jpa2.context.orm;
11
11
12
import java.util.List;
13
import org.eclipse.jpt.common.core.utility.TextRange;
12
import org.eclipse.jpt.jpa.core.context.XmlContextNode;
14
import org.eclipse.jpt.jpa.core.context.XmlContextNode;
13
import org.eclipse.jpt.jpa.core.internal.context.orm.AbstractOrmQuery;
15
import org.eclipse.jpt.jpa.core.internal.context.orm.AbstractOrmQuery;
16
import org.eclipse.jpt.jpa.core.internal.jpql.JpaJpqlQueryHelper;
17
import org.eclipse.jpt.jpa.core.internal.validation.JpaValidationMessages;
18
import org.eclipse.jpt.jpa.core.internal.validation.JpaValidationPreferences;
14
import org.eclipse.jpt.jpa.core.jpa2.context.LockModeType2_0;
19
import org.eclipse.jpt.jpa.core.jpa2.context.LockModeType2_0;
15
import org.eclipse.jpt.jpa.core.jpa2.context.orm.OrmNamedQuery2_0;
20
import org.eclipse.jpt.jpa.core.jpa2.context.orm.OrmNamedQuery2_0;
16
import org.eclipse.jpt.jpa.core.resource.orm.XmlNamedQuery;
21
import org.eclipse.jpt.jpa.core.resource.orm.XmlNamedQuery;
22
import org.eclipse.persistence.jpa.jpql.JPQLQueryProblem;
23
import org.eclipse.wst.validation.internal.provisional.core.IMessage;
24
import org.eclipse.wst.validation.internal.provisional.core.IReporter;
17
25
18
/**
26
/**
19
 * JPA 2.0
27
 * JPA 2.0
Lines 87-90 Link Here
87
		return LockModeType2_0.NONE;
95
		return LockModeType2_0.NONE;
88
	}
96
	}
89
97
90
}
98
	// ********** validation **********
99
100
	private boolean shouldValidate() {
101
		return JpaValidationPreferences.getProblemSeverityPreference(this, JpaValidationMessages.JPQL_QUERY_VALIDATION) == -1;
102
	}
103
104
	/**
105
	 * {@inheritDoc}
106
	 */
107
	@Override
108
	public void validate(List<IMessage> messages, IReporter reporter) {
109
		super.validate(messages, reporter);
110
111
		// Make this quick check so we don't validate the query, which is time consuming
112
		if (shouldValidate()) {
113
114
			JpaJpqlQueryHelper helper = new JpaJpqlQueryHelper();
115
			helper.setQuery(this, getQuery());
116
117
			String parsedJpqlQuery = helper.getParsedJPQLQuery();
118
			String actualQuery = getQuery();
119
120
			for (JPQLQueryProblem problem : helper.validate()) {
121
				TextRange textRange = this.getQueryTextRange();
122
				IMessage message = helper.buildProblem(this, textRange, problem, parsedJpqlQuery, actualQuery, 0);
123
				messages.add(message);
124
			}
125
		}
126
	}
127
}
(-)src/org/eclipse/jpt/jpa/core/internal/jpql/JpaConstructor.java (+114 lines)
Added Link Here
1
/*******************************************************************************
2
 * Copyright (c) 2011 Oracle. All rights reserved.
3
 * This program and the accompanying materials are made available under the
4
 * terms of the Eclipse Public License v1.0 and Eclipse Distribution License v. 1.0
5
 * which accompanies this distribution.
6
 * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
7
 * and the Eclipse Distribution License is available at
8
 * http://www.eclipse.org/org/documents/edl-v10.php.
9
 *
10
 * Contributors:
11
 *     Oracle - initial API and implementation
12
 *
13
 ******************************************************************************/
14
package org.eclipse.jpt.jpa.core.internal.jpql;
15
16
import org.eclipse.jdt.core.dom.IMethodBinding;
17
import org.eclipse.jdt.core.dom.ITypeBinding;
18
import org.eclipse.jdt.core.dom.MethodDeclaration;
19
import org.eclipse.persistence.jpa.jpql.spi.IConstructor;
20
import org.eclipse.persistence.jpa.jpql.spi.IType;
21
import org.eclipse.persistence.jpa.jpql.spi.ITypeDeclaration;
22
23
/**
24
 * The concrete implementation of {@link IConstructor} that is wrapping the design-time
25
 * representation of a Java constructor.
26
 *
27
 * @version 3.0
28
 * @since 3.0
29
 * @author Pascal Filion
30
 */
31
final class JpaConstructor implements IConstructor {
32
33
	/**
34
	 * The design-time representation of a Java constructor.
35
	 */
36
	private final MethodDeclaration method;
37
38
	/**
39
	 * The cached {@link ITypeDeclaration ITypeDeclarations} representing each of the constructor's
40
	 * parameter types.
41
	 */
42
	private ITypeDeclaration[] typeDeclarations;
43
44
	/**
45
	 * The repository of Java types.
46
	 */
47
	private final JpaTypeRepository typeRepository;
48
49
	/**
50
	 * Creates a new <code>JpaConstructor</code>.
51
	 *
52
	 * @param typeRepository The repository of Java types
53
	 * @param method The design-time representation of a Java constructor
54
	 */
55
	JpaConstructor(JpaTypeRepository typeRepository, MethodDeclaration method) {
56
		super();
57
		this.method         = method;
58
		this.typeRepository = typeRepository;
59
	}
60
61
	private ITypeDeclaration buildTypeDeclaration(ITypeBinding parameterType) {
62
63
		boolean array = parameterType.isArray();
64
		String typeName = array ? parameterType.getComponentType().getBinaryName() : parameterType.getBinaryName();
65
66
		// Retrieve the fully qualified name of the type
67
		ITypeBinding[] typeArguments = parameterType.getTypeArguments();
68
		ITypeDeclaration[] genericTypes = new ITypeDeclaration[typeArguments.length];
69
		int index = 0;
70
71
		for (ITypeBinding typeArgument : typeArguments) {
72
			String genericTypeName = typeArgument.getErasure().getBinaryName();
73
			IType genericType = typeRepository.getType(genericTypeName);
74
			genericTypes[index++] = genericType.getTypeDeclaration();
75
		}
76
77
		return new JpaTypeDeclaration(
78
			typeRepository.getType(typeName),
79
			genericTypes,
80
			parameterType.getDimensions()
81
		);
82
	}
83
84
	private ITypeDeclaration[] buildTypeDeclarations() {
85
86
		IMethodBinding binding = method.resolveBinding();
87
		ITypeBinding[] parameterTypes = binding.getParameterTypes();
88
		ITypeDeclaration[] declarations = new ITypeDeclaration[parameterTypes.length];
89
90
		for (int index = declarations.length; --index >= 0; ) {
91
			declarations[index] = buildTypeDeclaration(parameterTypes[index]);
92
		}
93
94
		return declarations;
95
	}
96
97
	/**
98
	 * {@inheritDoc}
99
	 */
100
	public ITypeDeclaration[] getParameterTypes() {
101
		if (typeDeclarations == null) {
102
			typeDeclarations = buildTypeDeclarations();
103
		}
104
		return typeDeclarations;
105
	}
106
107
	/**
108
	 * {@inheritDoc}
109
	 */
110
	@Override
111
	public String toString() {
112
		return method.toString();
113
	}
114
}
(-)src/org/eclipse/jpt/jpa/core/internal/jpql/JpaEmbeddable.java (+63 lines)
Added Link Here
1
/*******************************************************************************
2
 * Copyright (c) 2011 Oracle. All rights reserved.
3
 * This program and the accompanying materials are made available under the
4
 * terms of the Eclipse Public License v1.0 and Eclipse Distribution License v. 1.0
5
 * which accompanies this distribution.
6
 * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
7
 * and the Eclipse Distribution License is available at
8
 * http://www.eclipse.org/org/documents/edl-v10.php.
9
 *
10
 * Contributors:
11
 *     Oracle - initial API and implementation
12
 *
13
 ******************************************************************************/
14
package org.eclipse.jpt.jpa.core.internal.jpql;
15
16
import org.eclipse.jpt.jpa.core.context.Embeddable;
17
import org.eclipse.persistence.jpa.jpql.spi.IEmbeddable;
18
import org.eclipse.persistence.jpa.jpql.spi.IManagedTypeVisitor;
19
20
/**
21
 * The concrete implementation of {@link IEmbeddable} that is wrapping the design-time
22
 * representation of a JPA embeddable.
23
 *
24
 * @version 3.0
25
 * @since 3.0
26
 * @author Pascal Filion
27
 */
28
final class JpaEmbeddable extends JpaManagedType
29
                          implements IEmbeddable {
30
31
	/**
32
	 * Creates a new <code>JpaEmbeddable</code>.
33
	 *
34
	 * @param provider The provider of JPA managed types
35
	 * @param embeddable The design-time model object wrapped by this class
36
	 */
37
	JpaEmbeddable(JpaManagedTypeProvider provider, Embeddable embeddable) {
38
		super(provider, embeddable);
39
	}
40
41
	/**
42
	 * {@inheritDoc}
43
	 */
44
	public void accept(IManagedTypeVisitor visitor) {
45
		visitor.visit(this);
46
	}
47
48
	/**
49
	 * {@inheritDoc}
50
	 */
51
	@Override
52
	Embeddable getManagedType() {
53
		return (Embeddable) super.getManagedType();
54
	}
55
56
	/**
57
	 * {@inheritDoc}
58
	 */
59
	@Override
60
	public String toString() {
61
		return getType().getName();
62
	}
63
}
(-)src/org/eclipse/jpt/jpa/core/internal/jpql/JpaEntity.java (+111 lines)
Added Link Here
1
/*******************************************************************************
2
 * Copyright (c) 2011 Oracle. All rights reserved.
3
 * This program and the accompanying materials are made available under the
4
 * terms of the Eclipse Public License v1.0 and Eclipse Distribution License v. 1.0
5
 * which accompanies this distribution.
6
 * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
7
 * and the Eclipse Distribution License is available at
8
 * http://www.eclipse.org/org/documents/edl-v10.php.
9
 *
10
 * Contributors:
11
 *     Oracle - initial API and implementation
12
 *
13
 ******************************************************************************/
14
package org.eclipse.jpt.jpa.core.internal.jpql;
15
16
import java.util.HashMap;
17
import java.util.ListIterator;
18
import java.util.Map;
19
import org.eclipse.jpt.jpa.core.context.Entity;
20
import org.eclipse.jpt.jpa.core.context.NamedQuery;
21
import org.eclipse.persistence.jpa.jpql.spi.IEntity;
22
import org.eclipse.persistence.jpa.jpql.spi.IManagedTypeVisitor;
23
import org.eclipse.persistence.jpa.jpql.spi.IQuery;
24
25
/**
26
 * The concrete implementation of {@link IEntity} that is wrapping the design-time representation
27
 * of a JPA entity.
28
 *
29
 * @version 3.0
30
 * @since 3.0
31
 * @author Pascal Filion
32
 */
33
abstract class JpaEntity extends JpaManagedType
34
                         implements IEntity {
35
36
	/**
37
	 * The cached used to quickly retrieve any queries that have been cached.
38
	 */
39
	private Map<String, IQuery> queries;
40
41
	/**
42
	 * Creates a new <code>JpaEntity</code>.
43
	 *
44
	 * @param provider The provider of JPA managed types
45
	 * @param entity The design-time model object wrapped by this class
46
	 */
47
	JpaEntity(JpaManagedTypeProvider provider, Entity entity) {
48
		super(provider, entity);
49
	}
50
51
	/**
52
	 * {@inheritDoc}
53
	 */
54
	public void accept(IManagedTypeVisitor visitor) {
55
		visitor.visit(this);
56
	}
57
58
	final IQuery buildQuery(JpaManagedTypeProvider provider, NamedQuery namedQuery) {
59
		return new JpaQuery(provider, namedQuery);
60
	}
61
62
	/**
63
	 * {@inheritDoc}
64
	 */
65
	@Override
66
	Entity getManagedType() {
67
		return (Entity) super.getManagedType();
68
	}
69
70
	/**
71
	 * {@inheritDoc}
72
	 */
73
	public final String getName() {
74
		return getManagedType().getName();
75
	}
76
77
	/**
78
	 * {@inheritDoc}
79
	 */
80
	public IQuery getNamedQuery(String queryName) {
81
		initializeQueries();
82
		return queries.get(queryName);
83
	}
84
85
	private void initializeQueries() {
86
		if (queries == null) {
87
			queries = new HashMap<String, IQuery>();
88
			initializeQueries(queries);
89
		}
90
	}
91
92
	void initializeQueries(Map<String, IQuery> queries) {
93
		JpaManagedTypeProvider provider = getProvider();
94
		for (ListIterator<NamedQuery> iter = namedQueries(); iter.hasNext(); ) {
95
			NamedQuery namedQuery = iter.next();
96
			queries.put(namedQuery.getName(), buildQuery(provider, namedQuery));
97
		}
98
	}
99
100
	private ListIterator<NamedQuery> namedQueries() {
101
		return getManagedType().getQueryContainer().namedQueries();
102
	}
103
104
	/**
105
	 * {@inheritDoc}
106
	 */
107
	@Override
108
	public String toString() {
109
		return getName();
110
	}
111
}
(-)src/org/eclipse/jpt/jpa/core/internal/jpql/JpaJpqlQueryHelper.java (+189 lines)
Added Link Here
1
/*******************************************************************************
2
 * Copyright (c) 2011 Oracle. All rights reserved.
3
 * This program and the accompanying materials are made available under the
4
 * terms of the Eclipse Public License v1.0 and Eclipse Distribution License v. 1.0
5
 * which accompanies this distribution.
6
 * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
7
 * and the Eclipse Distribution License is available at
8
 * http://www.eclipse.org/org/documents/edl-v10.php.
9
 *
10
 * Contributors:
11
 *     Oracle - initial API and implementation
12
 *
13
 ******************************************************************************/
14
package org.eclipse.jpt.jpa.core.internal.jpql;
15
16
import org.eclipse.jpt.common.core.internal.utility.SimpleTextRange;
17
import org.eclipse.jpt.common.core.utility.TextRange;
18
import org.eclipse.jpt.jpa.core.context.NamedQuery;
19
import org.eclipse.jpt.jpa.core.internal.validation.DefaultJpaValidationMessages;
20
import org.eclipse.jpt.jpa.core.internal.validation.JpaValidationMessages;
21
import org.eclipse.jpt.jpa.core.internal.validation.JpaValidationPreferences;
22
import org.eclipse.persistence.jpa.jpql.ExpressionTools;
23
import org.eclipse.persistence.jpa.jpql.JPQLQueryHelper;
24
import org.eclipse.persistence.jpa.jpql.JPQLQueryProblem;
25
import org.eclipse.persistence.jpa.jpql.spi.IQuery;
26
import org.eclipse.wst.validation.internal.provisional.core.IMessage;
27
28
/**
29
 * This helper can perform the following operations over a JPQL query:
30
 * <ul>
31
 * <li>Calculates the result type of a query: {@link #getResultType()};</li>
32
 * <li>Calculates the type of an input parameter: {@link #getParameterType(String)}.</li>
33
 * <li>Calculates the possible choices to complete the query from a given
34
 *     position (used for content assist): {@link #buildContentAssistItems(int)}.</li>
35
 * <li>Validates the query by introspecting its grammar and semantic:
36
 *     <ul>
37
 *     <li>{@link #validate()},</li>
38
 *     <li>{@link #validateGrammar()},</li>
39
 *     <li>{@link #validateSemantic()}.</li>
40
 *     </ul></li>
41
 *
42
 * @version 3.0
43
 * @since 3.0
44
 * @author Pascal Filion
45
 */
46
@SuppressWarnings("nls")
47
public final class JpaJpqlQueryHelper extends JPQLQueryHelper {
48
49
	/**
50
	 * Caches the provider in order to prevent recreating the SPI representation of the JPA artifacts
51
	 * more than once.
52
	 */
53
	private JpaManagedTypeProvider managedTypeProvider;
54
55
	/**
56
	 * Creates a new <code>JpaQueryHelper</code>.
57
	 */
58
	public JpaJpqlQueryHelper() {
59
		super();
60
	}
61
62
	/**
63
	 * Calculates the start and end positions by adjusting to the given <em>jpqlQuery</em>, which may
64
	 * differ from the string representation of the parsed tree since the parsed tree does not keep
65
	 * track of multiple whitespace but only one. It also increase the length when the start and end
66
	 * positions are the same.
67
	 *
68
	 * @param problem The {@link JPQLQueryProblem problem} that was found in the JPQL query, which is
69
	 * either a grammatical or semantic problem
70
	 * @param parsedJpqlQuery The string representation of the parsed tree representation of the JPQL
71
	 * query, which may differ from the actual JPQL query since it does not keep more than one
72
	 * whitespace
73
	 * @param actualQuery The actual JPQL query that was parsed and validated
74
	 * @return The start and end positions, which may have been adjusted
75
	 */
76
	public int[] buildPositions(JPQLQueryProblem problem, String parsedJpqlQuery, String actualQuery) {
77
78
		int startPosition = problem.getStartPosition();
79
		int endPosition   = problem.getEndPosition();
80
81
		// If the start and end positions are the same, then expand the text range
82
		if (startPosition == endPosition) {
83
			startPosition = Math.max(startPosition - 1, 0);
84
		}
85
86
		// Reposition the cursor so it's correctly positioned in the actual query, which is the
87
		// since it may contains more than one whitespace for a single whitespace
88
		int newStartPosition = ExpressionTools.repositionCursor(parsedJpqlQuery, startPosition, actualQuery);
89
90
		if (newStartPosition != startPosition) {
91
			endPosition  += (newStartPosition - startPosition);
92
			startPosition = newStartPosition;
93
		}
94
95
		return new int[] { startPosition, endPosition };
96
	}
97
98
	/**
99
	 * Creates a new {@link IMessage} for the given {@link JPQLQueryProblem}.
100
	 *
101
	 * @param targetObject The object for which a new {@link IMessage} is creating describing the
102
	 * problem
103
	 * @param problem The {@link JPQLQueryProblem problem} that was found in the JPQL query, which is
104
	 * either a grammatical or semantic problem
105
	 * @param textRange The range of the JPQL query in the Java source file
106
	 * @param parsedJpqlQuery The string representation of the parsed tree representation of the JPQL
107
	 * query, which may differ from the actual JPQL query since it does not keep more than one
108
	 * whitespace
109
	 * @param actualQuery The actual JPQL query that was parsed and validated
110
	 * @param offset This offset is used to move the start position
111
	 * @return A new {@link IMessage} that has the required information to display the problem
112
	 * underline and the error message in the Problems view
113
	 */
114
	public IMessage buildProblem(Object targetObject,
115
	                             TextRange textRange,
116
	                             JPQLQueryProblem problem,
117
	                             String parsedJpqlQuery,
118
	                             String actualQuery,
119
	                             int offset) {
120
121
		int[] positions = buildPositions(problem, parsedJpqlQuery, actualQuery);
122
123
		// Create the text range of the problem
124
		textRange = new SimpleTextRange(
125
			textRange.getOffset() + positions[0] + offset,
126
			positions[1] - positions[0],
127
			textRange.getLineNumber()
128
		);
129
130
		// Now create the message
131
		IMessage message = DefaultJpaValidationMessages.buildMessage(
132
			severity(targetObject),
133
			problem.getMessageKey(),
134
			problem.getMessageArguments(),
135
			targetObject,
136
			textRange
137
		);
138
		message.setBundleName("jpa_jpql_validation");
139
		return message;
140
	}
141
142
	private JpaManagedTypeProvider buildProvider(NamedQuery query) {
143
		try {
144
			return new JpaPersistenceUnit(query.getJpaProject(), query.getPersistenceUnit());
145
		}
146
		catch (Exception e) {
147
			return new JpaMappingFile(query.getJpaProject(), query.getMappingFileRoot().getParent());
148
		}
149
	}
150
151
	/**
152
	 * Disposes the provider so the application metadata is not kept in memory.
153
	 */
154
	public void disposeProvider() {
155
		managedTypeProvider = null;
156
	}
157
158
	/**
159
	 * Sets the given named query and string representation of the JPQL query.
160
	 *
161
	 * @param namedQuery The model object where the JPQL query is stored
162
	 * @param actualQuery The actual JPQL query, which can differ from the one owned by the model
163
	 * object, which happens when the model is out of sync because it has not been updated yet
164
	 */
165
	public void setQuery(NamedQuery namedQuery, String actualQuery) {
166
167
		if (managedTypeProvider == null) {
168
			managedTypeProvider = buildProvider(namedQuery);
169
		}
170
171
		IQuery query = new JpaQuery(managedTypeProvider, namedQuery, actualQuery);
172
		super.setQuery(query);
173
	}
174
175
	/**
176
	 * Retrieve the severity that is associated to JPQL query validation, which cannot be retrieved
177
	 * using the JPQL problem message key.
178
179
	 * @param targetObject The object for which a new {@link IMessage} is creating describing the
180
	 * problem
181
	 * @return The global severity for validating JPQL queries
182
	 */
183
	private int severity(Object targetObject) {
184
		return JpaValidationPreferences.getProblemSeverityPreference(
185
			targetObject,
186
			JpaValidationMessages.JPQL_QUERY_VALIDATION
187
		);
188
	}
189
}
(-)src/org/eclipse/jpt/jpa/core/internal/jpql/JpaManagedType.java (+135 lines)
Added Link Here
1
/*******************************************************************************
2
 * Copyright (c) 2011 Oracle. All rights reserved.
3
 * This program and the accompanying materials are made available under the
4
 * terms of the Eclipse Public License v1.0 and Eclipse Distribution License v. 1.0
5
 * which accompanies this distribution.
6
 * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
7
 * and the Eclipse Distribution License is available at
8
 * http://www.eclipse.org/org/documents/edl-v10.php.
9
 *
10
 * Contributors:
11
 *     Oracle - initial API and implementation
12
 *
13
 ******************************************************************************/
14
package org.eclipse.jpt.jpa.core.internal.jpql;
15
16
import java.util.Collections;
17
import java.util.HashMap;
18
import java.util.Iterator;
19
import java.util.Map;
20
import org.eclipse.jpt.jpa.core.context.AttributeMapping;
21
import org.eclipse.jpt.jpa.core.context.TypeMapping;
22
import org.eclipse.persistence.jpa.jpql.spi.IManagedType;
23
import org.eclipse.persistence.jpa.jpql.spi.IMapping;
24
25
/**
26
 * The abstract definition of {@link IManagedType} defined for wrapping the design-time mapped class
27
 * object.
28
 *
29
 * @version 3.0
30
 * @since 3.0
31
 * @author Pascal Filion
32
 */
33
abstract class JpaManagedType implements IManagedType {
34
35
	/**
36
	 * The design-time model object wrapped by this class.
37
	 */
38
	private final TypeMapping managedType;
39
40
	/**
41
	 * The cached collection of {@link IMapping mappings} that prevent rebuilding them every time one
42
	 * is requested.
43
	 */
44
	private Map<String, IMapping> mappings;
45
46
	/**
47
	 * The provider of JPA managed types.
48
	 */
49
	private final JpaManagedTypeProvider provider;
50
51
	/**
52
	 * The cached type of this managed type.
53
	 */
54
	private JpaType type;
55
56
	/**
57
	 * Creates a new <code>JDeveloperManagedType</code>.
58
	 *
59
	 * @param managedType The provider of JPA managed types
60
	 * @param mappedClass The design-time model object wrapped by this class
61
	 */
62
	JpaManagedType(JpaManagedTypeProvider provider, TypeMapping managedType) {
63
		super();
64
		this.provider    = provider;
65
		this.managedType = managedType;
66
	}
67
68
	private IMapping buildMapping(AttributeMapping mapping) {
69
		return new JpaMapping(this, mapping);
70
	}
71
72
	private Map<String, IMapping> buildMappings() {
73
		Map<String, IMapping> mappings = new HashMap<String, IMapping>();
74
		for (Iterator<AttributeMapping> iter = managedType.allAttributeMappings(); iter.hasNext(); ) {
75
			AttributeMapping mapping = iter.next();
76
			mappings.put(mapping.getName(), buildMapping(mapping));
77
		}
78
		return mappings;
79
	}
80
81
	/**
82
	 * {@inheritDoc}
83
	 */
84
	public int compareTo(IManagedType managedType) {
85
		return getType().getName().compareTo(managedType.getType().getName());
86
	}
87
88
	/**
89
	 * Returns the encapsulated model object.
90
	 *
91
	 * @return The managed type wrapped by this external form
92
	 */
93
	TypeMapping getManagedType() {
94
		return managedType;
95
	}
96
97
	/**
98
	 * {@inheritDoc}
99
	 */
100
	public final IMapping getMappingNamed(String name) {
101
		initializeMappings();
102
		return mappings.get(name);
103
	}
104
105
	/**
106
	 * {@inheritDoc}
107
	 */
108
	public final JpaManagedTypeProvider getProvider() {
109
		return provider;
110
	}
111
112
	/**
113
	 * {@inheritDoc}
114
	 */
115
	public final JpaType getType() {
116
		if (type == null) {
117
			type = provider.getTypeRepository().getType(managedType.getPersistentType().getName());
118
		}
119
		return type;
120
	}
121
122
	private void initializeMappings() {
123
		if (mappings == null) {
124
			mappings = buildMappings();
125
		}
126
	}
127
128
	/**
129
	 * {@inheritDoc}
130
	 */
131
	public final Iterable<IMapping> mappings() {
132
		initializeMappings();
133
		return Collections.unmodifiableCollection(mappings.values());
134
	}
135
}
(-)src/org/eclipse/jpt/jpa/core/internal/jpql/JpaManagedTypeProvider.java (+275 lines)
Added Link Here
1
/*******************************************************************************
2
 * Copyright (c) 2011 Oracle. All rights reserved.
3
 * This program and the accompanying materials are made available under the
4
 * terms of the Eclipse Public License v1.0 and Eclipse Distribution License v. 1.0
5
 * which accompanies this distribution.
6
 * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
7
 * and the Eclipse Distribution License is available at
8
 * http://www.eclipse.org/org/documents/edl-v10.php.
9
 *
10
 * Contributors:
11
 *     Oracle - initial API and implementation
12
 *
13
 ******************************************************************************/
14
package org.eclipse.jpt.jpa.core.internal.jpql;
15
16
import java.util.ArrayList;
17
import java.util.Collection;
18
import java.util.Collections;
19
import java.util.HashMap;
20
import java.util.Iterator;
21
import java.util.Map;
22
import org.eclipse.jpt.jpa.core.JpaFacet;
23
import org.eclipse.jpt.jpa.core.JpaPlatform;
24
import org.eclipse.jpt.jpa.core.JpaProject;
25
import org.eclipse.jpt.jpa.core.context.Embeddable;
26
import org.eclipse.jpt.jpa.core.context.Entity;
27
import org.eclipse.jpt.jpa.core.context.MappedSuperclass;
28
import org.eclipse.jpt.jpa.core.context.PersistentType;
29
import org.eclipse.jpt.jpa.core.context.TypeMapping;
30
import org.eclipse.jpt.jpa.core.context.persistence.PersistentTypeContainer;
31
import org.eclipse.jpt.jpa.core.internal.jpa1.GenericJpaProject;
32
import org.eclipse.persistence.jpa.jpql.spi.IEmbeddable;
33
import org.eclipse.persistence.jpa.jpql.spi.IEntity;
34
import org.eclipse.persistence.jpa.jpql.spi.IJPAVersion;
35
import org.eclipse.persistence.jpa.jpql.spi.IManagedType;
36
import org.eclipse.persistence.jpa.jpql.spi.IManagedTypeProvider;
37
import org.eclipse.persistence.jpa.jpql.spi.IManagedTypeVisitor;
38
import org.eclipse.persistence.jpa.jpql.spi.IMappedSuperclass;
39
import org.eclipse.persistence.jpa.jpql.spi.IPlatform;
40
import org.eclipse.persistence.jpa.jpql.spi.IType;
41
42
/**
43
 * The abstract implementation of {@link IManagedTypeProvider} that is wrapping the design-time
44
 * representation of a provider of managed types.
45
 *
46
 * @version 3.0
47
 * @since 3.0
48
 * @author Pascal Filion
49
 */
50
abstract class JpaManagedTypeProvider implements IManagedTypeProvider {
51
52
	/**
53
	 * The filtered collection of managed types that are the abstract schema types.
54
	 */
55
	private Collection<IEntity> abstractSchemaTypes;
56
57
	/**
58
	 * The project that gives access to the application's metadata.
59
	 */
60
	private final JpaProject jpaProject;
61
62
	/**
63
	 * The cached {@link IManagedType managed types}.
64
	 */
65
	private Map<String, IManagedType> managedTypes;
66
67
	/**
68
	 * The design-time provider of managed types.
69
	 */
70
	private final PersistentTypeContainer persistentTypeContainer;
71
72
	/**
73
	 * The external form of a type repository.
74
	 */
75
	private JpaTypeRepository typeRepository;
76
77
	/**
78
	 * The version of the Java Persistence this entity for which it was defined.
79
	 */
80
	private IJPAVersion version;
81
82
	/**
83
	 * Creates a new <code>JpaManagedTypeProvider</code>.
84
	 *
85
	 * @param jpaProject The project that gives access to the application's metadata
86
	 * @param persistentTypeContainer The design-time provider of managed types
87
	 */
88
	JpaManagedTypeProvider(JpaProject jpaProject, PersistentTypeContainer persistentTypeContainer) {
89
90
		super();
91
		this.jpaProject = jpaProject;
92
		this.persistentTypeContainer = persistentTypeContainer;
93
	}
94
95
	/**
96
	 * {@inheritDoc}
97
	 */
98
	public Iterable<IEntity> abstractSchemaTypes() {
99
		if (abstractSchemaTypes == null) {
100
			initializeManagedTypes();
101
			EntityCollector visitor = new EntityCollector();
102
			for (IManagedType managedType : managedTypes.values()) {
103
				managedType.accept(visitor);
104
			}
105
			abstractSchemaTypes = visitor.entities;
106
		}
107
		return Collections.unmodifiableCollection(abstractSchemaTypes);
108
	}
109
110
	abstract JpaEntity buildEntity(TypeMapping mappedClass);
111
112
	private IManagedType buildManagedType(PersistentType persistentType) {
113
114
		TypeMapping mappedClass = persistentType.getMapping();
115
116
		if (mappedClass instanceof Entity) {
117
			return buildEntity(mappedClass);
118
		}
119
120
		if (mappedClass instanceof MappedSuperclass) {
121
			return new JpaMappedSuperclass(this, (MappedSuperclass) mappedClass);
122
		}
123
124
		if (mappedClass instanceof Embeddable) {
125
			return new JpaEmbeddable(this, (Embeddable) mappedClass);
126
		}
127
128
		return new JpaNullManagedType(this, mappedClass);
129
	}
130
131
	private Map<String, IManagedType> buildManagedTypes() {
132
		Map<String, IManagedType> managedTypes = new HashMap<String, IManagedType>();
133
		for (Iterator<? extends PersistentType> iter = persistenceTypes(); iter.hasNext(); ) {
134
			PersistentType persistentType = iter.next();
135
			managedTypes.put(persistentType.getMapping().getName(), buildManagedType(persistentType));
136
		}
137
		return managedTypes;
138
	}
139
140
	private IJPAVersion convert(JpaPlatform.Version version) {
141
142
		String jpaVersion = version.getJpaVersion();
143
144
		if (JpaFacet.VERSION_1_0.getVersionString().equals(jpaVersion)) {
145
			return IJPAVersion.VERSION_1_0;
146
		}
147
148
		return IJPAVersion.VERSION_2_0;
149
	}
150
151
	/**
152
	 * {@inheritDoc}
153
	 */
154
	public IManagedType getManagedType(IType type) {
155
156
		initializeManagedTypes();
157
158
		for (IManagedType managedType : managedTypes.values()) {
159
			if (managedType.getType() == type) {
160
				return managedType;
161
			}
162
		}
163
164
		return null;
165
	}
166
167
	/**
168
	 * {@inheritDoc}
169
	 */
170
	public IManagedType getManagedType(String abstractSchemaName) {
171
		initializeManagedTypes();
172
		return managedTypes.get(abstractSchemaName);
173
	}
174
175
	/**
176
	 * Returns the container of managed types.
177
	 *
178
	 * @return The container of managed types
179
	 */
180
	PersistentTypeContainer getPersistentTypeContainer() {
181
		return persistentTypeContainer;
182
	}
183
184
	/**
185
	 * {@inheritDoc}
186
	 */
187
	public IPlatform getPlatform() {
188
		return (jpaProject instanceof GenericJpaProject) ? IPlatform.JAVA  : IPlatform.ECLIPSE_LINK;
189
	}
190
191
	/**
192
	 * Returns the encapsulated {@link PersistentType}, which is the actual object.
193
	 *
194
	 * @return The design-time representation of a managed type provider
195
	 */
196
	PersistentTypeContainer getProvider() {
197
		return persistentTypeContainer;
198
	}
199
200
	/**
201
	 * {@inheritDoc}
202
	 */
203
	public JpaTypeRepository getTypeRepository() {
204
		if (typeRepository == null) {
205
			typeRepository = new JpaTypeRepository(jpaProject.getJavaProject());
206
		}
207
		return typeRepository;
208
	}
209
210
	/**
211
	 * {@inheritDoc}
212
	 */
213
	public IJPAVersion getVersion() {
214
		if (version == null) {
215
			version = convert(jpaProject.getJpaPlatform().getJpaVersion());
216
		}
217
		return version;
218
	}
219
220
	private void initializeManagedTypes() {
221
		if (managedTypes == null) {
222
			managedTypes = buildManagedTypes();
223
		}
224
	}
225
226
	/**
227
	 * {@inheritDoc}
228
	 */
229
	public Iterable<IManagedType> managedTypes() {
230
		initializeManagedTypes();
231
		return Collections.unmodifiableCollection(managedTypes.values());
232
	}
233
234
	/**
235
	 * Retrieves the managed types from the design-time provider.
236
	 *
237
	 * @return The managed types that are defined only in the provider
238
	 */
239
	abstract Iterator<? extends PersistentType> persistenceTypes();
240
241
	private static class EntityCollector implements IManagedTypeVisitor {
242
243
		/**
244
		 * The collection of {@link IEntity entities} that got visited.
245
		 */
246
		private final Collection<IEntity> entities;
247
248
		/**
249
		 * Creates a new <code>EntityCollector</code>.
250
		 */
251
		EntityCollector() {
252
			super();
253
			entities = new ArrayList<IEntity>();
254
		}
255
256
		/**
257
		 * {@inheritDoc}
258
		 */
259
		public void visit(IEmbeddable embeddable) {
260
		}
261
262
		/**
263
		 * {@inheritDoc}
264
		 */
265
		public void visit(IEntity entity) {
266
			entities.add(entity);
267
		}
268
269
		/**
270
		 * {@inheritDoc}
271
		 */
272
		public void visit(IMappedSuperclass mappedSuperclass) {
273
		}
274
	}
275
}
(-)src/org/eclipse/jpt/jpa/core/internal/jpql/JpaMappedSuperclass.java (+63 lines)
Added Link Here
1
/*******************************************************************************
2
 * Copyright (c) 2011 Oracle. All rights reserved.
3
 * This program and the accompanying materials are made available under the
4
 * terms of the Eclipse Public License v1.0 and Eclipse Distribution License v. 1.0
5
 * which accompanies this distribution.
6
 * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
7
 * and the Eclipse Distribution License is available at
8
 * http://www.eclipse.org/org/documents/edl-v10.php.
9
 *
10
 * Contributors:
11
 *     Oracle - initial API and implementation
12
 *
13
 ******************************************************************************/
14
package org.eclipse.jpt.jpa.core.internal.jpql;
15
16
import org.eclipse.jpt.jpa.core.context.MappedSuperclass;
17
import org.eclipse.persistence.jpa.jpql.spi.IManagedTypeVisitor;
18
import org.eclipse.persistence.jpa.jpql.spi.IMappedSuperclass;
19
20
/**
21
 * The concrete implementation of {@link IMappedSuperclass} that is wrapping the design-time
22
 * representation of a JPA mapped superclass.
23
 *
24
 * @version 3.0
25
 * @since 3.0
26
 * @author Pascal Filion
27
 */
28
final class JpaMappedSuperclass extends JpaManagedType
29
                                implements IMappedSuperclass {
30
31
	/**
32
	 * Creates a new <code>JpaMappedSuperclass</code>.
33
	 *
34
	 * @param provider The provider of JPA managed types
35
	 * @param mappedSuperclass The design-time model object wrapped by this class
36
	 */
37
	JpaMappedSuperclass(JpaManagedTypeProvider provider, MappedSuperclass mappedSuperclass) {
38
		super(provider, mappedSuperclass);
39
	}
40
41
	/**
42
	 * {@inheritDoc}
43
	 */
44
	public void accept(IManagedTypeVisitor visitor) {
45
		visitor.visit(this);
46
	}
47
48
	/**
49
	 * {@inheritDoc}
50
	 */
51
	@Override
52
	MappedSuperclass getManagedType() {
53
		return (MappedSuperclass) super.getManagedType();
54
	}
55
56
	/**
57
	 * {@inheritDoc}
58
	 */
59
	@Override
60
	public String toString() {
61
		return getType().getName();
62
	}
63
}
(-)src/org/eclipse/jpt/jpa/core/internal/jpql/JpaMapping.java (+270 lines)
Added Link Here
1
/*******************************************************************************
2
 * Copyright (c) 2011 Oracle. All rights reserved.
3
 * This program and the accompanying materials are made available under the
4
 * terms of the Eclipse Public License v1.0 and Eclipse Distribution License v. 1.0
5
 * which accompanies this distribution.
6
 * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
7
 * and the Eclipse Distribution License is available at
8
 * http://www.eclipse.org/org/documents/edl-v10.php.
9
 *
10
 * Contributors:
11
 *     Oracle - initial API and implementation
12
 *
13
 ******************************************************************************/
14
package org.eclipse.jpt.jpa.core.internal.jpql;
15
16
import java.lang.annotation.Annotation;
17
import java.util.Iterator;
18
import java.util.List;
19
import org.eclipse.jpt.common.utility.internal.CollectionTools;
20
import org.eclipse.jpt.common.utility.internal.StringTools;
21
import org.eclipse.jpt.common.utility.internal.iterators.TransformationIterator;
22
import org.eclipse.jpt.jpa.core.MappingKeys;
23
import org.eclipse.jpt.jpa.core.context.AttributeMapping;
24
import org.eclipse.jpt.jpa.core.context.PersistentAttribute;
25
import org.eclipse.jpt.jpa.core.context.java.JavaPersistentAttribute;
26
import org.eclipse.jpt.jpa.core.jpa2.MappingKeys2_0;
27
import org.eclipse.jpt.jpa.core.resource.java.JavaResourcePersistentAttribute;
28
import org.eclipse.persistence.jpa.jpql.spi.IManagedType;
29
import org.eclipse.persistence.jpa.jpql.spi.IMapping;
30
import org.eclipse.persistence.jpa.jpql.spi.IMappingType;
31
import org.eclipse.persistence.jpa.jpql.spi.IType;
32
import org.eclipse.persistence.jpa.jpql.spi.ITypeDeclaration;
33
34
/**
35
 * The concrete implementation of {@link IMapping} that is wrapping the design-time representation
36
 * of a mapping.
37
 *
38
 * @version 3.0
39
 * @since 3.0
40
 * @author Pascal Filion
41
 */
42
@SuppressWarnings("nls")
43
final class JpaMapping implements IMapping {
44
45
	/**
46
	 * The design-time {@link AttributeMapping} wrapped by this class.
47
	 */
48
	private final AttributeMapping mapping;
49
50
	/**
51
	 * The type of the actual mapping.
52
	 */
53
	private IMappingType mappingType;
54
55
	/**
56
	 * The parent of this mapping.
57
	 */
58
	private final JpaManagedType parent;
59
60
	/**
61
	 * The {@link IType} of the property represented by the mapping.
62
	 */
63
	private IType type;
64
65
	/**
66
	 * The {@link ITypeDeclaration} of the property represented by the mapping.
67
	 */
68
	private ITypeDeclaration typeDeclaration;
69
70
	/**
71
	 * Creates a new <code>JpaMapping</code>.
72
	 *
73
	 * @param parent The parent of this mapping
74
	 * @param mapping The design-time {@link AttributeMapping} wrapped by this class
75
	 */
76
	JpaMapping(JpaManagedType parent, AttributeMapping mapping) {
77
		super();
78
		this.parent  = parent;
79
		this.mapping = mapping;
80
	}
81
82
	private ITypeDeclaration[] buildGenericTypeDeclarations() {
83
		JavaPersistentAttribute javaPersistentAttribute = mapping.getPersistentAttribute().getJavaPersistentAttribute();
84
		JavaResourcePersistentAttribute resource = javaPersistentAttribute.getResourcePersistentAttribute();
85
		List<ITypeDeclaration> declarations = CollectionTools.list(buildGenericTypeDeclarations(resource));
86
		return declarations.toArray(new ITypeDeclaration[declarations.size()]);
87
	}
88
89
	private Iterator<ITypeDeclaration> buildGenericTypeDeclarations(JavaResourcePersistentAttribute resource) {
90
		return new TransformationIterator<String, ITypeDeclaration>(resource.typeTypeArgumentNames()) {
91
			@Override
92
			protected ITypeDeclaration transform(String next) {
93
				return getTypeRepository().getType(next).getTypeDeclaration();
94
			}
95
		};
96
	}
97
98
	private ITypeDeclaration buildTypeDeclaration() {
99
100
		PersistentAttribute property = mapping.getPersistentAttribute();
101
		boolean array = property.getTypeName().endsWith("[]");
102
		int dimensionality = 0;
103
104
		if (array) {
105
			dimensionality = getType().getTypeDeclaration().getDimensionality();
106
		}
107
108
		return new JpaTypeDeclaration(
109
			getType(),
110
			buildGenericTypeDeclarations(),
111
			dimensionality
112
		);
113
	}
114
115
	/**
116
	 * {@inheritDoc}
117
	 */
118
	public int compareTo(IMapping mapping) {
119
		return getName().compareTo(mapping.getName());
120
	}
121
122
	/**
123
	 * {@inheritDoc}
124
	 */
125
	public IMappingType getMappingType() {
126
		if (mappingType == null) {
127
			getTypeDeclaration();
128
			mappingType = mappingType();
129
		}
130
		return mappingType;
131
	}
132
133
	/**
134
	 * {@inheritDoc}
135
	 */
136
	public String getName() {
137
		return mapping.getName();
138
	}
139
140
	/**
141
	 * {@inheritDoc}
142
	 */
143
	public IManagedType getParent() {
144
		return parent;
145
	}
146
147
	/**
148
	 * {@inheritDoc}
149
	 */
150
	public IType getType() {
151
		if (type == null) {
152
			PersistentAttribute property = mapping.getPersistentAttribute();
153
			type = getTypeRepository().getType(property.getTypeName());
154
		}
155
		return type;
156
	}
157
158
	/**
159
	 * {@inheritDoc}
160
	 */
161
	public ITypeDeclaration getTypeDeclaration() {
162
		if (typeDeclaration == null) {
163
			typeDeclaration = buildTypeDeclaration();
164
		}
165
		return typeDeclaration;
166
	}
167
168
	private JpaTypeRepository getTypeRepository() {
169
		return parent.getType().getTypeRepository();
170
	}
171
172
	/**
173
	 * {@inheritDoc}
174
	 */
175
	public boolean hasAnnotation(Class<? extends Annotation> annotationType) {
176
		JavaResourcePersistentAttribute attribute = mapping.getPersistentAttribute().getJavaPersistentAttribute().getResourcePersistentAttribute();
177
		return attribute.getAnnotation(annotationType.getName()) != null;
178
	}
179
180
	private IMappingType mappingType() {
181
182
		String type = mapping.getKey();
183
184
		// Basic
185
		if (type == MappingKeys.BASIC_ATTRIBUTE_MAPPING_KEY) {
186
			return IMappingType.BASIC;
187
		}
188
189
		// Embedded
190
		if (type == MappingKeys.EMBEDDED_ATTRIBUTE_MAPPING_KEY) {
191
			return IMappingType.EMBEDDED;
192
		}
193
194
		// Embedded Id
195
		if (type == MappingKeys.EMBEDDED_ID_ATTRIBUTE_MAPPING_KEY) {
196
			return IMappingType.EMBEDDED_ID;
197
		}
198
199
		// Id
200
		if (type == MappingKeys.ID_ATTRIBUTE_MAPPING_KEY) {
201
			return IMappingType.ID;
202
		}
203
204
		// M:M
205
		if (type == MappingKeys.MANY_TO_MANY_ATTRIBUTE_MAPPING_KEY) {
206
			return IMappingType.MANY_TO_MANY;
207
		}
208
209
		// 1:M
210
		if (type == MappingKeys.ONE_TO_MANY_ATTRIBUTE_MAPPING_KEY) {
211
			return IMappingType.ONE_TO_MANY;
212
		}
213
214
		// M:1
215
		if (type == MappingKeys.MANY_TO_ONE_ATTRIBUTE_MAPPING_KEY) {
216
			return IMappingType.MANY_TO_ONE;
217
		}
218
219
		// 1:1
220
		if (type == MappingKeys.ONE_TO_ONE_ATTRIBUTE_MAPPING_KEY) {
221
			return IMappingType.ONE_TO_ONE;
222
		}
223
224
		// Version
225
		if (type == MappingKeys.VERSION_ATTRIBUTE_MAPPING_KEY) {
226
			return IMappingType.VERSION;
227
		}
228
229
		// Element Collection
230
		if (type == MappingKeys2_0.ELEMENT_COLLECTION_ATTRIBUTE_MAPPING_KEY) {
231
			return IMappingType.ELEMENT_COLLECTION;
232
		}
233
234
		// Basic Collection
235
//		if (type == EclipseLinkMappingKeys.BASIC_COLLECTION_ATTRIBUTE_MAPPING_KEY) {
236
//			return IMappingType.BASIC_COLLECTION;
237
//		}
238
//
239
//		// Basic Map
240
//		if (type == EclipseLinkMappingKeys.BASIC_MAP_ATTRIBUTE_MAPPING_KEY) {
241
//			return IMappingType.BASIC_MAP;
242
//		}
243
//
244
//		// Transformation
245
//		if (type == EclipseLinkMappingKeys.TRANSFORMATION_ATTRIBUTE_MAPPING_KEY) {
246
//			return IMappingType.TRANSFORMATION;
247
//		}
248
//
249
//		// Variable 1:1
250
//		if (type == EclipseLinkMappingKeys.VARIABLE_ONE_TO_ONE_ATTRIBUTE_MAPPING_KEY) {
251
//			return IMappingType.VARIABLE_ONE_TO_ONE;
252
//		}
253
254
		return IMappingType.TRANSIENT;
255
	}
256
257
	/**
258
	 * {@inheritDoc}
259
	 */
260
	@Override
261
	public String toString() {
262
		StringBuilder sb = new StringBuilder();
263
		StringTools.buildSimpleToStringOn(this, sb);
264
		sb.append("name=");
265
		sb.append(getName());
266
		sb.append(", mappingType=");
267
		sb.append(getMappingType());
268
		return sb.toString();
269
	}
270
}
(-)src/org/eclipse/jpt/jpa/core/internal/jpql/JpaMappingFile.java (+65 lines)
Added Link Here
1
/*******************************************************************************
2
 * Copyright (c) 2011 Oracle. All rights reserved.
3
 * This program and the accompanying materials are made available under the 
4
 * terms of the Eclipse Public License v1.0 and Eclipse Distribution License v. 1.0 
5
 * which accompanies this distribution. 
6
 * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
7
 * and the Eclipse Distribution License is available at 
8
 * http://www.eclipse.org/org/documents/edl-v10.php.
9
 *
10
 * Contributors:
11
 *     Oracle - initial API and implementation
12
 *
13
 ******************************************************************************/
14
package org.eclipse.jpt.jpa.core.internal.jpql;
15
16
import java.util.Iterator;
17
import org.eclipse.jpt.jpa.core.JpaProject;
18
import org.eclipse.jpt.jpa.core.context.Entity;
19
import org.eclipse.jpt.jpa.core.context.MappingFile;
20
import org.eclipse.jpt.jpa.core.context.PersistentType;
21
import org.eclipse.jpt.jpa.core.context.TypeMapping;
22
23
/**
24
 * The concrete implementation that is wrapping the design-time representation of a mapping file.
25
 *
26
 * @version 3.0
27
 * @since 3.0
28
 * @author Pascal Filion
29
 */
30
public class JpaMappingFile extends JpaManagedTypeProvider {
31
32
	/**
33
	 * Creates a new <code>JpaMappingFile</code>.
34
	 * 
35
	 * @param jpaProject The project that gives access to the application's metadata
36
	 * @param persistentTypeContainer The design-time provider of managed types
37
	 */
38
	public JpaMappingFile(JpaProject jpaProject, MappingFile persistentTypeContainer) {
39
		super(jpaProject, persistentTypeContainer);
40
	}
41
42
	/**
43
	 * {@inheritDoc}
44
	 */
45
	@Override
46
	JpaEntity buildEntity(TypeMapping mappedClass) {
47
		return new JpaOrmEntity(this, (Entity) mappedClass);
48
	}
49
50
	/**
51
	 * {@inheritDoc}
52
	 */
53
	@Override
54
	protected MappingFile getPersistentTypeContainer() {
55
		return (MappingFile) super.getPersistentTypeContainer();
56
	}
57
58
	/**
59
	 * {@inheritDoc}
60
	 */
61
	@Override
62
	protected Iterator<? extends PersistentType> persistenceTypes() {
63
		return getPersistentTypeContainer().getPersistentTypes().iterator();
64
	}
65
}
(-)src/org/eclipse/jpt/jpa/core/internal/jpql/JpaNullManagedType.java (+112 lines)
Added Link Here
1
/*******************************************************************************
2
 * Copyright (c) 2011 Oracle. All rights reserved.
3
 * This program and the accompanying materials are made available under the
4
 * terms of the Eclipse Public License v1.0 and Eclipse Distribution License v. 1.0
5
 * which accompanies this distribution.
6
 * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
7
 * and the Eclipse Distribution License is available at
8
 * http://www.eclipse.org/org/documents/edl-v10.php.
9
 *
10
 * Contributors:
11
 *     Oracle - initial API and implementation
12
 *
13
 ******************************************************************************/
14
package org.eclipse.jpt.jpa.core.internal.jpql;
15
16
import org.eclipse.jpt.common.utility.internal.iterables.EmptyIterable;
17
import org.eclipse.jpt.jpa.core.context.TypeMapping;
18
import org.eclipse.persistence.jpa.jpql.spi.IManagedType;
19
import org.eclipse.persistence.jpa.jpql.spi.IManagedTypeProvider;
20
import org.eclipse.persistence.jpa.jpql.spi.IManagedTypeVisitor;
21
import org.eclipse.persistence.jpa.jpql.spi.IMapping;
22
import org.eclipse.persistence.jpa.jpql.spi.IType;
23
24
/**
25
 * The concrete implementation of {@link IManagedType} that is wrapping the design-time
26
 * representation a "null" managed type.
27
 *
28
 * @version 3.0
29
 * @since 3.0
30
 * @author Pascal Filion
31
 */
32
final class JpaNullManagedType implements IManagedType {
33
34
	/**
35
	 * The provider of JPA managed types.
36
	 */
37
	private final JpaManagedTypeProvider provider;
38
39
	/**
40
	 * The cached {@link IType} of this "null" managed type.
41
	 */
42
	private IType type;
43
44
	/**
45
	 * The design-time model object wrapped by this class.
46
	 */
47
	private final TypeMapping typeMapping;
48
49
	/**
50
	 * Creates a new <code>JpaNullManagedType</code>.
51
	 *
52
	 * @param managedType The provider of JPA managed types
53
	 * @param typeMapping The design-time model object wrapped by this class
54
	 */
55
	JpaNullManagedType(JpaManagedTypeProvider provider, TypeMapping typeMapping) {
56
		super();
57
		this.provider    = provider;
58
		this.typeMapping = typeMapping;
59
	}
60
61
	/**
62
	 * {@inheritDoc}
63
	 */
64
	public void accept(IManagedTypeVisitor visitor) {
65
	}
66
67
	/**
68
	 * {@inheritDoc}
69
	 */
70
	public int compareTo(IManagedType managedType) {
71
		return getType().getName().compareTo(managedType.getType().getName());
72
	}
73
74
	/**
75
	 * {@inheritDoc}
76
	 */
77
	public IMapping getMappingNamed(String name) {
78
		return null;
79
	}
80
81
	/**
82
	 * {@inheritDoc}
83
	 */
84
	public IManagedTypeProvider getProvider() {
85
		return provider;
86
	}
87
88
	/**
89
	 * {@inheritDoc}
90
	 */
91
	public IType getType() {
92
		if (type == null) {
93
			type = provider.getTypeRepository().getType(typeMapping.getPersistentType().getName());
94
		}
95
		return type;
96
	}
97
98
	/**
99
	 * {@inheritDoc}
100
	 */
101
	public Iterable<IMapping> mappings() {
102
		return EmptyIterable.instance();
103
	}
104
105
	/**
106
	 * {@inheritDoc}
107
	 */
108
	@Override
109
	public String toString() {
110
		return getType().getName();
111
	}
112
}
(-)src/org/eclipse/jpt/jpa/core/internal/jpql/JpaOrmEntity.java (+59 lines)
Added Link Here
1
/*******************************************************************************
2
 * Copyright (c) 2011 Oracle. All rights reserved.
3
 * This program and the accompanying materials are made available under the
4
 * terms of the Eclipse Public License v1.0, which accompanies this distribution
5
 * and is available at http://www.eclipse.org/legal/epl-v10.html.
6
 *
7
 * Contributors:
8
 *     Oracle - initial API and implementation
9
 *******************************************************************************/
10
package org.eclipse.jpt.jpa.core.internal.jpql;
11
12
import java.util.ListIterator;
13
import java.util.Map;
14
import org.eclipse.jpt.jpa.core.context.Entity;
15
import org.eclipse.jpt.jpa.core.context.NamedQuery;
16
import org.eclipse.jpt.jpa.core.context.java.JavaTypeMapping;
17
import org.eclipse.jpt.jpa.core.context.orm.OrmPersistentType;
18
import org.eclipse.persistence.jpa.jpql.spi.IQuery;
19
20
/**
21
 * The concrete implementation of {@link IEntity} that is wrapping the design-time representation
22
 * of a JPA entity defined in an ORM configuration.
23
 *
24
 * @version 3.0
25
 * @since 3.0
26
 * @author Pascal Filion
27
 */
28
final class JpaOrmEntity extends JpaEntity {
29
30
	/**
31
	 * Creates a new <code>JpaOrmEntity</code>.
32
	 *
33
	 * @param provider The provider of JPA managed types
34
	 * @param entity The design-time model object wrapped by this class
35
	 */
36
	JpaOrmEntity(JpaMappingFile provider, Entity entity) {
37
		super(provider, entity);
38
	}
39
40
	/**
41
	 * {@inheritDoc}
42
	 */
43
	@Override
44
	void initializeQueries(Map<String, IQuery> queries) {
45
		super.initializeQueries(queries);
46
47
		JpaManagedTypeProvider provider = getProvider();
48
		OrmPersistentType type = (OrmPersistentType) getManagedType().getPersistentType();
49
		JavaTypeMapping mapping = type.getJavaPersistentType().getMapping();
50
51
		if (mapping instanceof Entity) {
52
			Entity entity = (Entity) mapping;
53
			for (ListIterator<NamedQuery> iter = entity.getQueryContainer().namedQueries(); iter.hasNext(); ) {
54
				NamedQuery namedQuery = iter.next();
55
				queries.put(namedQuery.getName(), buildQuery(provider, namedQuery));
56
			}
57
		}
58
	}
59
}
(-)src/org/eclipse/jpt/jpa/core/internal/jpql/JpaPersistenceUnit.java (+81 lines)
Added Link Here
1
/*******************************************************************************
2
 * Copyright (c) 2011 Oracle. All rights reserved.
3
 * This program and the accompanying materials are made available under the 
4
 * terms of the Eclipse Public License v1.0 and Eclipse Distribution License v. 1.0 
5
 * which accompanies this distribution. 
6
 * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
7
 * and the Eclipse Distribution License is available at 
8
 * http://www.eclipse.org/org/documents/edl-v10.php.
9
 *
10
 * Contributors:
11
 *     Oracle - initial API and implementation
12
 *
13
 ******************************************************************************/
14
package org.eclipse.jpt.jpa.core.internal.jpql;
15
16
import java.util.Iterator;
17
import org.eclipse.jpt.common.utility.internal.iterators.CompositeIterator;
18
import org.eclipse.jpt.common.utility.internal.iterators.TransformationIterator;
19
import org.eclipse.jpt.jpa.core.JpaProject;
20
import org.eclipse.jpt.jpa.core.context.Entity;
21
import org.eclipse.jpt.jpa.core.context.PersistentType;
22
import org.eclipse.jpt.jpa.core.context.TypeMapping;
23
import org.eclipse.jpt.jpa.core.context.persistence.ClassRef;
24
import org.eclipse.jpt.jpa.core.context.persistence.PersistenceUnit;
25
26
/**
27
 * The concrete implementation that is wrapping the design-time representation of a persistence unit.
28
 *
29
 * @version 3.0
30
 * @since 3.0
31
 * @author Pascal Filion
32
 */
33
public final class JpaPersistenceUnit extends JpaManagedTypeProvider {
34
35
	/**
36
	 * Creates a new <code>JpaPersistenceUnit</code>.
37
	 *
38
	 * @param jpaProject The project that gives access to the application's metadata
39
	 * @param persistentUnit The design-time persistence unit
40
	 */
41
	public JpaPersistenceUnit(JpaProject jpaProject, PersistenceUnit persistentUnit) {
42
		super(jpaProject, persistentUnit);
43
	}
44
45
	/**
46
	 * {@inheritDoc}
47
	 */
48
	@Override
49
	JpaEntity buildEntity(TypeMapping mappedClass) {
50
		return new JpaPersistenceUnitEntity(this, (Entity) mappedClass);
51
	}
52
53
	/**
54
	 * {@inheritDoc}
55
	 */
56
	@Override
57
	PersistenceUnit getPersistentTypeContainer() {
58
		return (PersistenceUnit) super.getPersistentTypeContainer();
59
	}
60
61
	@SuppressWarnings("unchecked")
62
	private Iterator<ClassRef> javaClassRefs() {
63
		return new CompositeIterator<ClassRef>(
64
			getPersistentTypeContainer().specifiedClassRefs(),
65
			getPersistentTypeContainer().impliedClassRefs()
66
		);
67
	}
68
69
	/**
70
	 * {@inheritDoc}
71
	 */
72
	@Override
73
	Iterator<? extends PersistentType> persistenceTypes() {
74
		return new TransformationIterator<ClassRef, PersistentType>(javaClassRefs()) {
75
			@Override
76
			protected PersistentType transform(ClassRef classRef) {
77
				return classRef.getJavaPersistentType();
78
			}
79
		};
80
	}
81
}
(-)src/org/eclipse/jpt/jpa/core/internal/jpql/JpaPersistenceUnitEntity.java (+33 lines)
Added Link Here
1
/*******************************************************************************
2
 * Copyright (c) 2011 Oracle. All rights reserved.
3
 * This program and the accompanying materials are made available under the
4
 * terms of the Eclipse Public License v1.0, which accompanies this distribution
5
 * and is available at http://www.eclipse.org/legal/epl-v10.html.
6
 * 
7
 * Contributors:
8
 *     Oracle - initial API and implementation
9
 *******************************************************************************/
10
package org.eclipse.jpt.jpa.core.internal.jpql;
11
12
import org.eclipse.jpt.jpa.core.context.Entity;
13
14
/**
15
 * The concrete implementation of {@link IEntity} that is wrapping the design-time representation
16
 * of a JPA entity defined in a persistence unit.
17
 *
18
 * @version 3.0
19
 * @since 3.0
20
 * @author Pascal Filion
21
 */
22
final class JpaPersistenceUnitEntity extends JpaEntity {
23
24
	/**
25
	 * Creates a new <code>JpaPersistenceUnitEntity</code>.
26
	 *
27
	 * @param provider The provider of JPA managed types
28
	 * @param entity The design-time model object wrapped by this class
29
	 */
30
	JpaPersistenceUnitEntity(JpaManagedTypeProvider provider, Entity entity) {
31
		super(provider, entity);
32
	}
33
}
(-)src/org/eclipse/jpt/jpa/core/internal/jpql/JpaQuery.java (+115 lines)
Added Link Here
1
/*******************************************************************************
2
 * Copyright (c) 2011 Oracle. All rights reserved.
3
 * This program and the accompanying materials are made available under the 
4
 * terms of the Eclipse Public License v1.0 and Eclipse Distribution License v. 1.0 
5
 * which accompanies this distribution. 
6
 * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
7
 * and the Eclipse Distribution License is available at 
8
 * http://www.eclipse.org/org/documents/edl-v10.php.
9
 *
10
 * Contributors:
11
 *     Oracle - initial API and implementation
12
 *
13
 ******************************************************************************/
14
package org.eclipse.jpt.jpa.core.internal.jpql;
15
16
import org.eclipse.jpt.common.utility.internal.StringTools;
17
import org.eclipse.jpt.jpa.core.context.NamedQuery;
18
import org.eclipse.persistence.jpa.jpql.spi.IQuery;
19
20
/**
21
 * The concrete implementation of {@link IQuery} that is wrapping the design-time representation
22
 * of a JPQL query.
23
 *
24
 * @version 3.0
25
 * @since 3.0
26
 * @author Pascal Filion
27
 */
28
@SuppressWarnings("nls")
29
public final class JpaQuery implements IQuery {
30
31
	/**
32
	 * The actual JPQL query, which can differ from the one owned by the model object, which happens
33
	 * when the model is out of sync because it has not been updated yet.
34
	 */
35
	private String actualQuery;
36
37
	/**
38
	 *  The provider of managed types.
39
	 */
40
	private JpaManagedTypeProvider provider;
41
42
	/**
43
	 * The model object holding onto the JPQL query.
44
	 */
45
	private NamedQuery query;
46
47
	/**
48
	 * Creates a new <code>JpaQuery</code>.
49
	 *
50
	 * @param provider The provider of managed types
51
	 * @param query The model object of the JPQL query
52
	 */
53
	public JpaQuery(JpaManagedTypeProvider provider, NamedQuery query) {
54
		this(provider, query, query.getQuery());
55
	}
56
57
	/**
58
	 * Creates a new <code>JpaQuery</code>.
59
	 *
60
	 * @param provider The provider of managed types
61
	 * @param query The model object of the JPQL query
62
	 * @param actualQuery The actual JPQL query, which can differ from the one owned by the model
63
	 * object, which happens when the model is out of sync because it has not been updated yet
64
	 */
65
	JpaQuery(JpaManagedTypeProvider provider, NamedQuery query, String actualQuery) {
66
		super();
67
		initialize(provider, query, actualQuery);
68
	}
69
70
	/**
71
	 * {@inheritDoc}
72
	 */
73
	public String getExpression() {
74
		return actualQuery;
75
	}
76
77
	/**
78
	 * {@inheritDoc}
79
	 */
80
	public JpaManagedTypeProvider getProvider() {
81
		return provider;
82
	}
83
84
	/**
85
	 * Returns the encapsulated {@link NamedQuery}, which is the actual object.
86
	 *
87
	 * @return The design-time representation of a JPQL query
88
	 */
89
	NamedQuery getQuery() {
90
		return query;
91
	}
92
93
	private void initialize(JpaManagedTypeProvider provider, NamedQuery query, String actualQuery) {
94
95
		this.query       = query;
96
		this.provider    = provider;
97
		this.actualQuery = actualQuery;
98
99
		if (this.actualQuery == null) {
100
			this.actualQuery = StringTools.EMPTY_STRING;
101
		}
102
	}
103
104
	/**
105
	 * {@inheritDoc}
106
	 */
107
	@Override
108
	public String toString() {
109
		StringBuilder sb = new StringBuilder();
110
		sb.append(super.toString());
111
		sb.append(", query=");
112
		sb.append(getExpression());
113
		return sb.toString();
114
	}
115
}
(-)src/org/eclipse/jpt/jpa/core/internal/jpql/JpaType.java (+450 lines)
Added Link Here
1
/*******************************************************************************
2
 * Copyright (c) 2011 Oracle. All rights reserved.
3
 * This program and the accompanying materials are made available under the
4
 * terms of the Eclipse Public License v1.0 and Eclipse Distribution License v. 1.0
5
 * which accompanies this distribution.
6
 * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
7
 * and the Eclipse Distribution License is available at
8
 * http://www.eclipse.org/org/documents/edl-v10.php.
9
 *
10
 * Contributors:
11
 *     Oracle - initial API and implementation
12
 *
13
 ******************************************************************************/
14
package org.eclipse.jpt.jpa.core.internal.jpql;
15
16
import java.lang.annotation.Annotation;
17
import java.util.ArrayList;
18
import java.util.Collection;
19
import java.util.Collections;
20
import java.util.List;
21
import org.eclipse.core.runtime.NullProgressMonitor;
22
import org.eclipse.jdt.core.Flags;
23
import org.eclipse.jdt.core.IField;
24
import org.eclipse.jdt.core.IJavaElement;
25
import org.eclipse.jdt.core.IMember;
26
import org.eclipse.jdt.core.IType;
27
import org.eclipse.jdt.core.JavaModelException;
28
import org.eclipse.jdt.core.dom.AST;
29
import org.eclipse.jdt.core.dom.ASTNode;
30
import org.eclipse.jdt.core.dom.ASTParser;
31
import org.eclipse.jdt.core.dom.ASTVisitor;
32
import org.eclipse.jdt.core.dom.AbstractTypeDeclaration;
33
import org.eclipse.jdt.core.dom.AnonymousClassDeclaration;
34
import org.eclipse.jdt.core.dom.ClassInstanceCreation;
35
import org.eclipse.jdt.core.dom.CompilationUnit;
36
import org.eclipse.jdt.core.dom.EnumConstantDeclaration;
37
import org.eclipse.jdt.core.dom.ITypeBinding;
38
import org.eclipse.jdt.core.dom.MethodDeclaration;
39
import org.eclipse.jdt.core.dom.NodeFinder;
40
import org.eclipse.jpt.common.core.internal.utility.jdt.ASTTools;
41
import org.eclipse.jpt.common.utility.internal.StringTools;
42
import org.eclipse.persistence.jpa.jpql.ExpressionTools;
43
import org.eclipse.persistence.jpa.jpql.spi.IConstructor;
44
import org.eclipse.persistence.jpa.jpql.spi.ITypeDeclaration;
45
46
/**
47
 * The concrete implementation of {@link org.eclipse.persistence.jpa.query.spi.IType IType} that is
48
 * wrapping the design-time representation of a Java type.
49
 *
50
 * @version 3.0
51
 * @since 3.0
52
 * @author Pascal Filion
53
 */
54
final class JpaType implements org.eclipse.persistence.jpa.jpql.spi.IType {
55
56
	/**
57
	 * The {@link CompilationUnit} for the type that was cached.
58
	 */
59
	private CompilationUnit compilationUnit;
60
61
	/**
62
	 * The cached collection of {@link IConstructor constructors}.
63
	 */
64
	private Collection<IConstructor> constructors;
65
66
	/**
67
	 * The list of names for the {@link Enum}'s constants otherwise an empty array.
68
	 */
69
	private String[] enumConstants;
70
71
	/**
72
	 * The actual Java type.
73
	 */
74
	private Class<?> javaType;
75
76
	/**
77
	 * The design-time representation of a Java type.
78
	 */
79
	private IType type;
80
81
	/**
82
	 * The {@link ITypeBinding} for the type that was cached.
83
	 */
84
	private ITypeBinding typeBinding;
85
86
	/**
87
	 * This flag makes sure to not try more than once resolving the {@link ITypeBinding} if it fails
88
	 * the first time.
89
	 */
90
	private boolean typeBindingResolved;
91
92
	/**
93
	 * Caches the type hierarchy of the {@link IType} in order to prevent rebuilding it each time.
94
	 */
95
	private ITypeDeclaration typeDeclaration;
96
97
	/**
98
	 * The fully qualified name of the Java type.
99
	 */
100
	private final String typeName;
101
102
	/**
103
	 * The external form of a type repository.
104
	 */
105
	private final JpaTypeRepository typeRepository;
106
107
	/**
108
	 * Creates a new <code>JpaType</code>.
109
	 *
110
	 * @param typeRepository The external form of a type repository
111
	 * @param javaType The actual Java type
112
	 */
113
	JpaType(JpaTypeRepository typeRepository, Class<?> javaType) {
114
		this(typeRepository, javaType.getName());
115
		this.javaType = javaType;
116
	}
117
118
	/**
119
	 * Creates a new <code>JpaType</code>.
120
	 *
121
	 * @param typeRepository The external form of a type repository
122
	 * @param type The design-time representation of a Java type
123
	 */
124
	JpaType(JpaTypeRepository typeRepository, IType type) {
125
		this(typeRepository, type.getFullyQualifiedName());
126
		this.type = type;
127
	}
128
129
	/**
130
	 * Creates a new <code>JpaType</code>.
131
	 *
132
	 * @param typeRepository The external form of a type repository
133
	 * @param typeName The fully qualified name of the Java type
134
	 */
135
	JpaType(JpaTypeRepository typeRepository, String typeName) {
136
		super();
137
		this.typeName       = typeName;
138
		this.typeRepository = typeRepository;
139
	}
140
141
	private CompilationUnit buildCompilationUnit() {
142
143
		ASTParser parser = ASTParser.newParser(AST.JLS3);
144
145
		if (type.getElementType() == IJavaElement.CLASS_FILE) {
146
			parser.setSource(type.getClassFile());
147
		}
148
		else {
149
			parser.setSource(type.getTypeRoot());
150
		}
151
152
		parser.setIgnoreMethodBodies(true); // we don't need method bodies
153
		parser.setResolveBindings(true);
154
		parser.setBindingsRecovery(true); // see bugs 196200, 222735
155
156
		return (CompilationUnit) parser.createAST(new NullProgressMonitor());
157
	}
158
159
	private IConstructor buildConstructor(MethodDeclaration method) {
160
		return new JpaConstructor(typeRepository, method);
161
	}
162
163
	private Collection<IConstructor> buildConstructors() {
164
165
		if (type == null) {
166
			return Collections.emptyList();
167
		}
168
169
		Collection<IConstructor> constructors = new ArrayList<IConstructor>();
170
		collectConstructor(constructors);
171
		return constructors;
172
	}
173
174
	private String[] buildEnumConstants() {
175
176
		try {
177
			if ((type != null) && type.isEnum()) {
178
179
				List<String> names = new ArrayList<String>();
180
181
				for (IField field : type.getFields()) {
182
					if (field.isEnumConstant()) {
183
						names.add(field.getElementName());
184
					}
185
				}
186
187
				return names.toArray(new String[names.size()]);
188
			}
189
		}
190
		catch (Exception e) {
191
			// Just ignore and return an empty array
192
		}
193
194
		return ExpressionTools.EMPTY_STRING_ARRAY;
195
	}
196
197
	private ITypeBinding buildTypeBinding() {
198
199
		CompilationUnit compilationUnit = compilationUnit();
200
201
		// This code was copied from ASTNodes.getTypeBinding(CompilationUnit, IType)
202
		try {
203
			if (type.isAnonymous()) {
204
				IJavaElement parent = type.getParent();
205
206
				if ((parent instanceof IField) && Flags.isEnum(((IMember) parent).getFlags())) {
207
					ASTNode node = NodeFinder.perform(compilationUnit, type.getNameRange());
208
					EnumConstantDeclaration constant = (EnumConstantDeclaration) node;
209
210
					if (constant != null) {
211
						AnonymousClassDeclaration declaration = constant.getAnonymousClassDeclaration();
212
213
						if (declaration != null) {
214
							return declaration.resolveBinding();
215
						}
216
					}
217
				}
218
				else {
219
					ASTNode node = NodeFinder.perform(compilationUnit, type.getNameRange());
220
					ClassInstanceCreation creation = (ClassInstanceCreation) getParent(node, ClassInstanceCreation.class);
221
222
					if (creation != null) {
223
						return creation.resolveTypeBinding();
224
					}
225
				}
226
			}
227
			else {
228
				ASTNode node = NodeFinder.perform(compilationUnit, type.getNameRange());
229
				AbstractTypeDeclaration declaration = (AbstractTypeDeclaration) getParent(node, AbstractTypeDeclaration.class);
230
231
				if (declaration != null) {
232
					return declaration.resolveBinding();
233
				}
234
			}
235
		}
236
		catch (JavaModelException e) {
237
			// Simply ignore
238
		}
239
240
		return null;
241
	}
242
243
	private ITypeDeclaration buildTypeDeclaration() {
244
		return new JpaTypeDeclaration(this, new ITypeDeclaration[0]);
245
	}
246
247
	private void collectConstructor(final Collection<IConstructor> constructors) {
248
		compilationUnit().accept(new ASTVisitor() {
249
			@Override
250
			public boolean visit(MethodDeclaration node) {
251
				if (node.isConstructor()) {
252
					constructors.add(buildConstructor(node));
253
				}
254
				return true;
255
			}
256
		});
257
	}
258
259
	private CompilationUnit compilationUnit() {
260
		if (compilationUnit == null) {
261
			compilationUnit = buildCompilationUnit();
262
		}
263
		return compilationUnit;
264
	}
265
266
	/**
267
	 * {@inheritDoc}
268
	 */
269
	public Iterable<IConstructor> constructors() {
270
		if (constructors == null) {
271
			constructors = buildConstructors();
272
		}
273
		return Collections.unmodifiableCollection(constructors);
274
	}
275
276
	/**
277
	 * {@inheritDoc}
278
	 */
279
	@Override
280
	public boolean equals(Object object) {
281
		return (this == object) || equals((org.eclipse.persistence.jpa.jpql.spi.IType) object);
282
	}
283
284
	/**
285
	 * {@inheritDoc}
286
	 */
287
	public boolean equals(org.eclipse.persistence.jpa.jpql.spi.IType type) {
288
		return (this == type) || typeName.equals(type.getName());
289
	}
290
291
	/**
292
	 * {@inheritDoc}
293
	 */
294
	public String[] getEnumConstants() {
295
		if (enumConstants == null) {
296
			enumConstants = buildEnumConstants();
297
		}
298
		return enumConstants;
299
	}
300
301
	/**
302
	 * Returns the encapsulated Java {@link Class}, which is the actual type.
303
	 *
304
	 * @return The actual Java type
305
	 */
306
	Class<?> getJavaType() {
307
		return javaType;
308
	}
309
310
	/**
311
	 * {@inheritDoc}
312
	 */
313
	public String getName() {
314
		return typeName;
315
	}
316
317
	private ASTNode getParent(ASTNode node, Class<? extends ASTNode> parentClass) {
318
319
		do {
320
			node = node.getParent();
321
		}
322
		while ((node != null) && !parentClass.isInstance(node));
323
324
		return node;
325
	}
326
327
	/**
328
	 * Returns the encapsulated {@link Type}, which is the actual type.
329
	 *
330
	 * @return The design-time representation of a Java type
331
	 */
332
	IType getType() {
333
		return type;
334
	}
335
336
	private ITypeBinding getTypeBinding() {
337
		if ((typeBinding == null) && !typeBindingResolved) {
338
			typeBinding = buildTypeBinding();
339
			typeBindingResolved = true;
340
		}
341
		return typeBinding;
342
	}
343
344
	/**
345
	 * {@inheritDoc}
346
	 */
347
	public ITypeDeclaration getTypeDeclaration() {
348
		if (typeDeclaration == null) {
349
			typeDeclaration = buildTypeDeclaration();
350
		}
351
		return typeDeclaration;
352
	}
353
354
	/**
355
	 * Returns the repository that gives access to the application's classes.
356
	 *
357
	 * @return The external form of the type repository
358
	 */
359
	JpaTypeRepository getTypeRepository() {
360
		return typeRepository;
361
	}
362
363
	/**
364
	 * {@inheritDoc}
365
	 */
366
	public boolean hasAnnotation(Class<? extends Annotation> annotationType) {
367
368
		if (type != null) {
369
			return type.getAnnotation(annotationType.getName()) != null;
370
		}
371
372
		if (javaType != null) {
373
			return javaType.isAnnotationPresent(annotationType);
374
		}
375
376
		return false;
377
	}
378
379
	/**
380
	 * {@inheritDoc}
381
	 */
382
	@Override
383
	public int hashCode() {
384
		return typeName.hashCode();
385
	}
386
387
	/**
388
	 * {@inheritDoc}
389
	 */
390
	public boolean isAssignableTo(org.eclipse.persistence.jpa.jpql.spi.IType type) {
391
392
		if (this == type) {
393
			return true;
394
		}
395
396
		if (this.type != null) {
397
			ITypeBinding typeBinding = getTypeBinding();
398
			if (typeBinding != null) {
399
				return ASTTools.typeIsSubTypeOf(typeBinding, type.getName());
400
			}
401
		}
402
403
		JpaType jpaType = (JpaType) type;
404
405
		// Dealing with two Class<?>
406
		if ((javaType != null) && (jpaType.javaType != null)) {
407
			return jpaType.javaType.isAssignableFrom(javaType);
408
		}
409
410
		// Anything else is always false
411
		return false;
412
	}
413
414
	/**
415
	 * {@inheritDoc}
416
	 */
417
	public boolean isEnum() {
418
419
		if (javaType != null) {
420
			return javaType.isEnum();
421
		}
422
423
		try {
424
			return (type != null) ? type.isEnum() : false;
425
		}
426
		catch (Exception e) {
427
			// Simply ignore and return no
428
			return false;
429
		}
430
	}
431
432
	/**
433
	 * {@inheritDoc}
434
	 */
435
	public boolean isResolvable() {
436
		return (type != null) || (javaType != null);
437
	}
438
439
	void setTypeDeclaration(JpaTypeDeclaration typeDeclaration) {
440
		this.typeDeclaration = typeDeclaration;
441
	}
442
443
	/**
444
	 * {@inheritDoc}
445
	 */
446
	@Override
447
	public String toString() {
448
		return StringTools.buildToStringFor(this, typeName);
449
	}
450
}
(-)src/org/eclipse/jpt/jpa/core/internal/jpql/JpaTypeDeclaration.java (+105 lines)
Added Link Here
1
/*******************************************************************************
2
 * Copyright (c) 2011 Oracle. All rights reserved.
3
 * This program and the accompanying materials are made available under the
4
 * terms of the Eclipse Public License v1.0 and Eclipse Distribution License v. 1.0
5
 * which accompanies this distribution.
6
 * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
7
 * and the Eclipse Distribution License is available at
8
 * http://www.eclipse.org/org/documents/edl-v10.php.
9
 *
10
 * Contributors:
11
 *     Oracle - initial API and implementation
12
 *
13
 ******************************************************************************/
14
package org.eclipse.jpt.jpa.core.internal.jpql;
15
16
import org.eclipse.persistence.jpa.jpql.spi.IType;
17
import org.eclipse.persistence.jpa.jpql.spi.ITypeDeclaration;
18
19
/**
20
 * The concrete implementation of {@link ITypeDeclaration} that is wrapping the design-time
21
 * representation of the declaration description of a type.
22
 *
23
 * @version 3.0
24
 * @since 3.0
25
 * @author Pascal Filion
26
 */
27
final class JpaTypeDeclaration implements ITypeDeclaration {
28
29
	/**
30
	 * The dimensionality of the array or 0 if the type is not an array.
31
	 */
32
	private int dimensionality;
33
34
	/**
35
	 * The generics of the given type or an empty list if the type is not parameterized.
36
	 */
37
	private final ITypeDeclaration[] genericTypes;
38
39
	/**
40
	 * The external form of the Java type.
41
	 */
42
	private final IType type;
43
44
	/**
45
	 * Creates a new <code>JpaTypeDeclaration</code>.
46
	 *
47
	 * @param type The external form of the Java type
48
	 * @param genericTypes The generics of the given type or an empty list if the type is not
49
	 * parameterized
50
	 */
51
	JpaTypeDeclaration(IType type, ITypeDeclaration[] genericTypes) {
52
		this(type, genericTypes, 0);
53
	}
54
55
	/**
56
	 * Creates a new <code>JpaTypeDeclaration</code>.
57
	 *
58
	 * @param type The external form of the Java type
59
	 * @param genericTypes The generics of the given type or an empty list if the type is not
60
	 * parameterized
61
	 * @param dimensionality The dimensionality of the array or 0 if it's not an array
62
	 */
63
	JpaTypeDeclaration(IType type, ITypeDeclaration[] genericTypes, int dimensionality) {
64
		super();
65
		this.type           = type;
66
		this.genericTypes   = genericTypes;
67
		this.dimensionality = dimensionality;
68
	}
69
70
	/**
71
	 * {@inheritDoc}
72
	 */
73
	public int getDimensionality() {
74
		return dimensionality;
75
	}
76
77
	/**
78
	 * {@inheritDoc}
79
	 */
80
	public IType getType() {
81
		return type;
82
	}
83
84
	/**
85
	 * {@inheritDoc}
86
	 */
87
	public ITypeDeclaration[] getTypeParameters() {
88
		return genericTypes;
89
	}
90
91
	/**
92
	 * {@inheritDoc}
93
	 */
94
	public boolean isArray() {
95
		return dimensionality > 0;
96
	}
97
98
	/**
99
	 * {@inheritDoc}
100
	 */
101
	@Override
102
	public String toString() {
103
		return type.getName();
104
	}
105
}
(-)src/org/eclipse/jpt/jpa/core/internal/jpql/JpaTypeRepository.java (+366 lines)
Added Link Here
1
/*******************************************************************************
2
 * Copyright (c) 2011 Oracle. All rights reserved.
3
 * This program and the accompanying materials are made available under the
4
 * terms of the Eclipse Public License v1.0 and Eclipse Distribution License v. 1.0
5
 * which accompanies this distribution.
6
 * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
7
 * and the Eclipse Distribution License is available at
8
 * http://www.eclipse.org/org/documents/edl-v10.php.
9
 *
10
 * Contributors:
11
 *     Oracle - initial API and implementation
12
 *
13
 ******************************************************************************/
14
package org.eclipse.jpt.jpa.core.internal.jpql;
15
16
import java.util.HashMap;
17
import java.util.Map;
18
import org.eclipse.core.resources.IResource;
19
import org.eclipse.core.runtime.IPath;
20
import org.eclipse.jdt.core.IJavaProject;
21
import org.eclipse.jdt.core.JavaModelException;
22
import org.eclipse.persistence.jpa.jpql.TypeHelper;
23
import org.eclipse.persistence.jpa.jpql.spi.IType;
24
import org.eclipse.persistence.jpa.jpql.spi.ITypeDeclaration;
25
import org.eclipse.persistence.jpa.jpql.spi.ITypeRepository;
26
27
/**
28
 * The concrete implementation of {@link ITypeRepository} that is wrapping the design-time
29
 * representation of a type repository.
30
 *
31
 * @version 3.0
32
 * @since 3.0
33
 * @author Pascal Filion
34
 */
35
@SuppressWarnings("nls")
36
final class JpaTypeRepository implements ITypeRepository {
37
38
	/**
39
	 * The Java project that gives access the design-time objects representing the Java types.
40
	 */
41
	private final IJavaProject javaProject;
42
43
	/**
44
	 * Keeps a map of the primitives for fast access.
45
	 */
46
	private Map<String, Class<?>> primitives;
47
48
	/**
49
	 * The cached helper that is using this repository for retrieving {@link IType types}.
50
	 */
51
	private TypeHelper typeHelper;
52
53
	/**
54
	 * The types that have been cached for faster access.
55
	 */
56
	private final Map<String, JpaType> types;
57
58
	/**
59
	 * The {@link IType} that represents a unresolvable or simply an unknown type, which is created
60
	 * when {@link #getType(String)} is invoked with {@link IType#UNRESOLVABLE_TYPE}.
61
	 */
62
	private JpaType unresolvableType;
63
64
	/**
65
	 * Creates a new <code>JpaTypeRepository</code>.
66
	 *
67
	 * @param javaProject The Java project that gives access the design-time objects representing
68
	 * the Java types
69
	 */
70
	JpaTypeRepository(IJavaProject javaProject) {
71
		super();
72
		this.javaProject = javaProject;
73
		this.types       = new HashMap<String, JpaType>();
74
	}
75
76
	private Map<String, Class<?>> buildPrimitives() {
77
		Map<String, Class<?>> primitives = new HashMap<String, Class<?>>();
78
		primitives.put(Byte     .TYPE.getName(), Byte     .TYPE);
79
		primitives.put(Short    .TYPE.getName(), Short    .TYPE);
80
		primitives.put(Character.TYPE.getName(), Character.TYPE);
81
		primitives.put(Integer  .TYPE.getName(), Integer  .TYPE);
82
		primitives.put(Long     .TYPE.getName(), Long     .TYPE);
83
		primitives.put(Float    .TYPE.getName(), Float    .TYPE);
84
		primitives.put(Double   .TYPE.getName(), Double   .TYPE);
85
		primitives.put(Boolean  .TYPE.getName(), Boolean  .TYPE);
86
		return primitives;
87
	}
88
89
	private JpaType buildType(Class<?> javaType) {
90
		JpaType jpaType = new JpaType(this, javaType);
91
		types.put(jpaType.getName(), jpaType);
92
		return jpaType;
93
	}
94
95
	private JpaType buildType(org.eclipse.jdt.core.IType type) {
96
		JpaType jpaType = new JpaType(this, type);
97
		types.put(jpaType.getName(), jpaType);
98
		return jpaType;
99
	}
100
101
	private JpaType buildType(String typeName) {
102
		return new JpaType(this, typeName);
103
	}
104
105
	private String convertToJavaArrayType(String typeName) {
106
107
		int index = typeName.indexOf("[]");
108
		int dimensionality = (typeName.length() - index) / 2;
109
		StringBuilder sb = new StringBuilder();
110
111
		while (dimensionality-- > 0) {
112
			sb.append("[");
113
		}
114
115
		String type = typeName.substring(0, index);
116
		Class<?> primitive = primitives.get(type);
117
118
		if (primitive != null) {
119
			if (primitive == Byte.TYPE) {
120
				sb.append("B");
121
			}
122
			else if (primitive == Character.TYPE) {
123
				sb.append("C");
124
			}
125
			else if (primitive == Short.TYPE) {
126
				sb.append("S");
127
			}
128
			else if (primitive == Integer.TYPE) {
129
				sb.append("I");
130
			}
131
			else if (primitive == Long.TYPE) {
132
				sb.append("L");
133
			}
134
			else if (primitive == Float.TYPE) {
135
				sb.append("F");
136
			}
137
			else if (primitive == Double.TYPE) {
138
				sb.append("D");
139
			}
140
			else if (primitive == Boolean.TYPE) {
141
				sb.append("Z");
142
			}
143
		}
144
		else {
145
			sb.append(type);
146
			sb.append(";");
147
		}
148
149
		return sb.toString();
150
	}
151
152
	private Class<?> findPrimitive(String typeName) {
153
		if (primitives == null) {
154
			primitives = buildPrimitives();
155
		}
156
		return primitives.get(typeName);
157
	}
158
159
	/**
160
	 * Retrieves the design-time Java type for the given type name, which has to be the fully
161
	 * qualified type name.
162
	 *
163
	 * @param typeName The fully qualified type name
164
	 * @return The design-time Java type if it could be retrieved; <code>null</code> otherwise
165
	 */
166
	private org.eclipse.jdt.core.IType findType(String typeName) {
167
		try {
168
			return javaProject.findType(typeName);
169
		}
170
		catch (JavaModelException e) {
171
			return null;
172
		}
173
	}
174
175
	/**
176
	 * {@inheritDoc}
177
	 */
178
	public JpaType getEnumType(String enumTypeName) {
179
180
		// Get the position of the last dot so we can remove the constant
181
		int lastDotIndex = enumTypeName.lastIndexOf(".");
182
183
		if (lastDotIndex == -1) {
184
			return null;
185
		}
186
187
		// Retrieve the fully qualified enum type name
188
		String typeName = enumTypeName.substring(0, lastDotIndex);
189
190
		// Attempt to load the enum type
191
		JpaType type = getType(typeName);
192
		return type.isEnum() ? type: null;
193
	}
194
195
	/**
196
	 * Returns
197
	 *
198
	 * @return
199
	 */
200
	IJavaProject getJavaProject() {
201
		return javaProject;
202
	}
203
204
	/**
205
	 * {@inheritDoc}
206
	 */
207
	public JpaType getType(Class<?> javaClass) {
208
		return getType(javaClass.getName());
209
	}
210
211
	/**
212
	 * Retrieves the {@link org.eclipse.jdt.core.IType IType} for the given {@link IResource}.
213
	 *
214
	 * @param resource The workspace location of the {@link org.eclipse.jdt.core.IType IType} to
215
	 * retrieve
216
	 * @return The design-time representation of a Java type
217
	 */
218
	org.eclipse.jdt.core.IType getType(IResource resource) {
219
		try {
220
			return (org.eclipse.jdt.core.IType) javaProject.findElement((IPath) resource);
221
		}
222
		catch (Exception e) {
223
			return null;
224
		}
225
	}
226
227
	/**
228
	 * Retrieves the {@link org.eclipse.jdt.core.IType IType} for the given {@link IResource}.
229
	 *
230
	 * @param resource The workspace location of the {@link org.eclipse.jdt.core.IType IType} to
231
	 * retrieve
232
	 * @return The design-time representation of a Java type
233
	 */
234
	IType getType(org.eclipse.jdt.core.IType type) {
235
		try {
236
			IType jpaType = types.get(type.getFullyQualifiedName());
237
			if (jpaType == null) {
238
				jpaType = buildType(type);
239
			}
240
			return jpaType;
241
		}
242
		catch (Exception e) {
243
			return null;
244
		}
245
	}
246
247
	/**
248
	 * {@inheritDoc}
249
	 */
250
	public JpaType getType(String typeName) {
251
252
		if (IType.UNRESOLVABLE_TYPE == typeName) {
253
			return unresolvableType();
254
		}
255
256
		if (typeName.endsWith("[]")) {
257
			return loadArrayType(typeName);
258
		}
259
260
		return loadTypeImp(typeName);
261
	}
262
263
	/**
264
	 * {@inheritDoc}
265
	 */
266
	public TypeHelper getTypeHelper() {
267
		if (typeHelper == null) {
268
			typeHelper = new TypeHelper(this);
269
		}
270
		return typeHelper;
271
	}
272
273
	private JpaType loadArrayType(String typeName) {
274
275
		JpaType type = types.get(typeName);
276
277
		if (type == null) {
278
			try {
279
				// Try to see if the type is a JDK class, otherwise, just use the type name
280
				// since IType doesn't support array types
281
				String javaTypeName = convertToJavaArrayType(typeName);
282
				type = buildType(Class.forName(javaTypeName));
283
			}
284
			catch (Exception e) {
285
286
				int index = typeName.indexOf("[]");
287
				int dimensionality = (typeName.length() - index) / 2;
288
289
				type = getType(typeName.substring(0, index));
290
291
				type.setTypeDeclaration(
292
					new JpaTypeDeclaration(type, new ITypeDeclaration[0], dimensionality)
293
				);
294
			}
295
296
			types.put(typeName, type);
297
		}
298
299
		return type;
300
	}
301
302
	private JpaType loadInnerType(String typeName) {
303
304
		int index = typeName.lastIndexOf(".");
305
306
		if (index == -1) {
307
			return null;
308
		}
309
310
		StringBuilder sb = new StringBuilder();
311
		sb.append(typeName.substring(0, index));
312
		sb.append("$");
313
		sb.append(typeName.substring(index + 1, typeName.length()));
314
		typeName = sb.toString();
315
316
		JpaType type = types.get(typeName);
317
318
		if (type == null) {
319
			type = loadTypeImp(typeName);
320
		}
321
322
		return type;
323
	}
324
325
	private JpaType loadTypeImp(String typeName) {
326
327
		JpaType type = types.get(typeName);
328
329
		// The type was already cached, simply return it
330
		if (type != null) {
331
			return type;
332
		}
333
334
		// First check for primitive, they don't have a corresponding IType
335
		Class<?> primitive = findPrimitive(typeName);
336
337
		if (primitive != null) {
338
			return buildType(primitive);
339
		}
340
341
		// Attempt to load the Java type
342
		org.eclipse.jdt.core.IType iType = findType(typeName);
343
344
		// A Java type exists, return it
345
		if (iType != null) {
346
			return buildType(iType);
347
		}
348
349
		// Now try with a possible inner enum type
350
		type = loadInnerType(typeName);
351
352
		// No Java type exists, create a "null" IType
353
		if (type == null) {
354
			type = buildType(typeName);
355
		}
356
357
		return type;
358
	}
359
360
	private JpaType unresolvableType() {
361
		if (unresolvableType == null) {
362
			unresolvableType = new JpaType(this, IType.UNRESOLVABLE_TYPE);
363
		}
364
		return unresolvableType;
365
	}
366
}
(-)src/org/eclipse/jpt/jpa/core/internal/validation/JpaValidationMessages.java (-7 / +7 lines)
Lines 3-9 Link Here
3
 * This program and the accompanying materials are made available under the
3
 * This program and the accompanying materials are made available under the
4
 * terms of the Eclipse Public License v1.0, which accompanies this distribution
4
 * terms of the Eclipse Public License v1.0, which accompanies this distribution
5
 * and is available at http://www.eclipse.org/legal/epl-v10.html.
5
 * and is available at http://www.eclipse.org/legal/epl-v10.html.
6
 * 
6
 *
7
 * Contributors:
7
 * Contributors:
8
 *     Oracle - initial API and implementation
8
 *     Oracle - initial API and implementation
9
 ******************************************************************************/
9
 ******************************************************************************/
Lines 13-19 Link Here
13
public interface JpaValidationMessages {
13
public interface JpaValidationMessages {
14
14
15
	public static final String BUNDLE_NAME = "jpa_validation";
15
	public static final String BUNDLE_NAME = "jpa_validation";
16
	
16
17
	public static final String PROJECT_INVALID_LIBRARY_PROVIDER = "PROJECT_INVALID_LIBRARY_PROVIDER";
17
	public static final String PROJECT_INVALID_LIBRARY_PROVIDER = "PROJECT_INVALID_LIBRARY_PROVIDER";
18
	public static final String PROJECT_NO_CONNECTION = "PROJECT_NO_CONNECTION";
18
	public static final String PROJECT_NO_CONNECTION = "PROJECT_NO_CONNECTION";
19
	public static final String PROJECT_INVALID_CONNECTION = "PROJECT_INVALID_CONNECTION";
19
	public static final String PROJECT_INVALID_CONNECTION = "PROJECT_INVALID_CONNECTION";
Lines 43-48 Link Here
43
	public static final String GENERATOR_NAME_UNDEFINED = "GENERATOR_NAME_UNDEFINED";
43
	public static final String GENERATOR_NAME_UNDEFINED = "GENERATOR_NAME_UNDEFINED";
44
	public static final String QUERY_DUPLICATE_NAME = "QUERY_DUPLICATE_NAME";
44
	public static final String QUERY_DUPLICATE_NAME = "QUERY_DUPLICATE_NAME";
45
	public static final String QUERY_NAME_UNDEFINED = "QUERY_NAME_UNDEFINED";
45
	public static final String QUERY_NAME_UNDEFINED = "QUERY_NAME_UNDEFINED";
46
	public static final String JPQL_QUERY_VALIDATION = "JPQL_QUERY_VALIDATION";
46
	public static final String QUERY_STATEMENT_UNDEFINED = "QUERY_STATEMENT_UNDEFINED";
47
	public static final String QUERY_STATEMENT_UNDEFINED = "QUERY_STATEMENT_UNDEFINED";
47
	public static final String MAPPING_FILE_EXTRANEOUS_PERSISTENCE_UNIT_METADATA = "MAPPING_FILE_EXTRANEOUS_PERSISTENCE_UNIT_METADATA";
48
	public static final String MAPPING_FILE_EXTRANEOUS_PERSISTENCE_UNIT_METADATA = "MAPPING_FILE_EXTRANEOUS_PERSISTENCE_UNIT_METADATA";
48
	public static final String PERSISTENT_TYPE_MAPPED_BUT_NOT_INCLUDED_IN_PERSISTENCE_UNIT = "PERSISTENT_TYPE_MAPPED_BUT_NOT_INCLUDED_IN_PERSISTENCE_UNIT";
49
	public static final String PERSISTENT_TYPE_MAPPED_BUT_NOT_INCLUDED_IN_PERSISTENCE_UNIT = "PERSISTENT_TYPE_MAPPED_BUT_NOT_INCLUDED_IN_PERSISTENCE_UNIT";
Lines 158-164 Link Here
158
	public static final String VIRTUAL_ASSOCIATION_OVERRIDE_JOIN_TABLE_UNRESOLVED_NAME = "VIRTUAL_ASSOCIATION_OVERRIDE_JOIN_TABLE_UNRESOLVED_NAME";
159
	public static final String VIRTUAL_ASSOCIATION_OVERRIDE_JOIN_TABLE_UNRESOLVED_NAME = "VIRTUAL_ASSOCIATION_OVERRIDE_JOIN_TABLE_UNRESOLVED_NAME";
159
	public static final String VIRTUAL_ASSOCIATION_OVERRIDE_JOIN_TABLE_UNRESOLVED_CATALOG = "VIRTUAL_ASSOCIATION_OVERRIDE_JOIN_TABLE_UNRESOLVED_CATALOG";
160
	public static final String VIRTUAL_ASSOCIATION_OVERRIDE_JOIN_TABLE_UNRESOLVED_CATALOG = "VIRTUAL_ASSOCIATION_OVERRIDE_JOIN_TABLE_UNRESOLVED_CATALOG";
160
	public static final String VIRTUAL_ASSOCIATION_OVERRIDE_JOIN_TABLE_UNRESOLVED_SCHEMA = "VIRTUAL_ASSOCIATION_OVERRIDE_JOIN_TABLE_UNRESOLVED_SCHEMA";
161
	public static final String VIRTUAL_ASSOCIATION_OVERRIDE_JOIN_TABLE_UNRESOLVED_SCHEMA = "VIRTUAL_ASSOCIATION_OVERRIDE_JOIN_TABLE_UNRESOLVED_SCHEMA";
161
	
162
162
	public static final String GENERATED_VALUE_UNRESOLVED_GENERATOR = "GENERATED_VALUE_UNRESOLVED_GENERATOR";
163
	public static final String GENERATED_VALUE_UNRESOLVED_GENERATOR = "GENERATED_VALUE_UNRESOLVED_GENERATOR";
163
	public static final String PRIMARY_KEY_JOIN_COLUMN_UNRESOLVED_NAME = "PRIMARY_KEY_JOIN_COLUMN_UNRESOLVED_NAME";
164
	public static final String PRIMARY_KEY_JOIN_COLUMN_UNRESOLVED_NAME = "PRIMARY_KEY_JOIN_COLUMN_UNRESOLVED_NAME";
164
	public static final String PRIMARY_KEY_JOIN_COLUMN_NAME_MUST_BE_SPECIFIED_MULTIPLE_JOIN_COLUMNS = "PRIMARY_KEY_JOIN_COLUMN_NAME_MUST_BE_SPECIFIED_MULTIPLE_JOIN_COLUMNS";
165
	public static final String PRIMARY_KEY_JOIN_COLUMN_NAME_MUST_BE_SPECIFIED_MULTIPLE_JOIN_COLUMNS = "PRIMARY_KEY_JOIN_COLUMN_NAME_MUST_BE_SPECIFIED_MULTIPLE_JOIN_COLUMNS";
Lines 176-182 Link Here
176
	public static final String VIRTUAL_SECONDARY_TABLE_PRIMARY_KEY_JOIN_COLUMN_UNRESOLVED_REFERENCED_COLUMN_NAME = "VIRTUAL_SECONDARY_TABLE_PRIMARY_KEY_JOIN_COLUMN_UNRESOLVED_REFERENCED_COLUMN_NAME";
177
	public static final String VIRTUAL_SECONDARY_TABLE_PRIMARY_KEY_JOIN_COLUMN_UNRESOLVED_REFERENCED_COLUMN_NAME = "VIRTUAL_SECONDARY_TABLE_PRIMARY_KEY_JOIN_COLUMN_UNRESOLVED_REFERENCED_COLUMN_NAME";
177
	public static final String VIRTUAL_SECONDARY_TABLE_PRIMARY_KEY_JOIN_COLUMN_NAME_MUST_BE_SPECIFIED_MULTIPLE_JOIN_COLUMNS = "VIRTUAL_SECONDARY_TABLE_PRIMARY_KEY_JOIN_COLUMN_NAME_MUST_BE_SPECIFIED_MULTIPLE_JOIN_COLUMNS";
178
	public static final String VIRTUAL_SECONDARY_TABLE_PRIMARY_KEY_JOIN_COLUMN_NAME_MUST_BE_SPECIFIED_MULTIPLE_JOIN_COLUMNS = "VIRTUAL_SECONDARY_TABLE_PRIMARY_KEY_JOIN_COLUMN_NAME_MUST_BE_SPECIFIED_MULTIPLE_JOIN_COLUMNS";
178
	public static final String VIRTUAL_SECONDARY_TABLE_PRIMARY_KEY_JOIN_COLUMN_REFERENCED_COLUMN_NAME_MUST_BE_SPECIFIED_MULTIPLE_JOIN_COLUMNS = "VIRTUAL_SECONDARY_TABLE_PRIMARY_KEY_JOIN_COLUMN_REFERENCED_COLUMN_NAME_MUST_BE_SPECIFIED_MULTIPLE_JOIN_COLUMNS";
179
	public static final String VIRTUAL_SECONDARY_TABLE_PRIMARY_KEY_JOIN_COLUMN_REFERENCED_COLUMN_NAME_MUST_BE_SPECIFIED_MULTIPLE_JOIN_COLUMNS = "VIRTUAL_SECONDARY_TABLE_PRIMARY_KEY_JOIN_COLUMN_REFERENCED_COLUMN_NAME_MUST_BE_SPECIFIED_MULTIPLE_JOIN_COLUMNS";
179
	
180
180
	public static final String NO_JPA_PROJECT = "NO_JPA_PROJECT";
181
	public static final String NO_JPA_PROJECT = "NO_JPA_PROJECT";
181
	public static final String TARGET_ENTITY_NOT_DEFINED = "TARGET_ENTITY_NOT_DEFINED";
182
	public static final String TARGET_ENTITY_NOT_DEFINED = "TARGET_ENTITY_NOT_DEFINED";
182
	public static final String VIRTUAL_ATTRIBUTE_TARGET_ENTITY_NOT_DEFINED = "VIRTUAL_ATTRIBUTE_TARGET_ENTITY_NOT_DEFINED";
183
	public static final String VIRTUAL_ATTRIBUTE_TARGET_ENTITY_NOT_DEFINED = "VIRTUAL_ATTRIBUTE_TARGET_ENTITY_NOT_DEFINED";
Lines 186-192 Link Here
186
	public static final String ENTITY_TABLE_PER_CLASS_NOT_SUPPORTED_ON_PLATFORM = "ENTITY_TABLE_PER_CLASS_NOT_SUPPORTED_ON_PLATFORM";
187
	public static final String ENTITY_TABLE_PER_CLASS_NOT_SUPPORTED_ON_PLATFORM = "ENTITY_TABLE_PER_CLASS_NOT_SUPPORTED_ON_PLATFORM";
187
	public static final String ENTITY_TABLE_PER_CLASS_NOT_PORTABLE_ON_PLATFORM = "ENTITY_TABLE_PER_CLASS_NOT_PORTABLE_ON_PLATFORM";
188
	public static final String ENTITY_TABLE_PER_CLASS_NOT_PORTABLE_ON_PLATFORM = "ENTITY_TABLE_PER_CLASS_NOT_PORTABLE_ON_PLATFORM";
188
	public static final String TARGET_NOT_AN_EMBEDDABLE = "TARGET_NOT_AN_EMBEDDABLE";
189
	public static final String TARGET_NOT_AN_EMBEDDABLE = "TARGET_NOT_AN_EMBEDDABLE";
189
	
190
190
	public static final String COLUMN_TABLE_NOT_VALID="COLUMN_TABLE_NOT_VALID";
191
	public static final String COLUMN_TABLE_NOT_VALID="COLUMN_TABLE_NOT_VALID";
191
	public static final String VIRTUAL_ATTRIBUTE_COLUMN_TABLE_NOT_VALID="VIRTUAL_ATTRIBUTE_COLUMN_TABLE_NOT_VALID";
192
	public static final String VIRTUAL_ATTRIBUTE_COLUMN_TABLE_NOT_VALID="VIRTUAL_ATTRIBUTE_COLUMN_TABLE_NOT_VALID";
192
	public static final String VIRTUAL_ATTRIBUTE_OVERRIDE_COLUMN_TABLE_NOT_VALID="VIRTUAL_ATTRIBUTE_OVERRIDE_COLUMN_TABLE_NOT_VALID";
193
	public static final String VIRTUAL_ATTRIBUTE_OVERRIDE_COLUMN_TABLE_NOT_VALID="VIRTUAL_ATTRIBUTE_OVERRIDE_COLUMN_TABLE_NOT_VALID";
Lines 228-232 Link Here
228
	public static final String VIRTUAL_ATTRIBUTE_MAP_KEY_ATTRIBUTE_OVERRIDE_COLUMN_TABLE_NOT_VALID="VIRTUAL_ATTRIBUTE_MAP_KEY_ATTRIBUTE_OVERRIDE_COLUMN_TABLE_NOT_VALID";
229
	public static final String VIRTUAL_ATTRIBUTE_MAP_KEY_ATTRIBUTE_OVERRIDE_COLUMN_TABLE_NOT_VALID="VIRTUAL_ATTRIBUTE_MAP_KEY_ATTRIBUTE_OVERRIDE_COLUMN_TABLE_NOT_VALID";
229
	public static final String MAP_KEY_COLUMN_TABLE_NOT_VALID="MAP_KEY_COLUMN_TABLE_NOT_VALID";
230
	public static final String MAP_KEY_COLUMN_TABLE_NOT_VALID="MAP_KEY_COLUMN_TABLE_NOT_VALID";
230
	public static final String VIRTUAL_ATTRIBUTE_MAP_KEY_COLUMN_TABLE_NOT_VALID="VIRTUAL_ATTRIBUTE_MAP_KEY_COLUMN_TABLE_NOT_VALID";
231
	public static final String VIRTUAL_ATTRIBUTE_MAP_KEY_COLUMN_TABLE_NOT_VALID="VIRTUAL_ATTRIBUTE_MAP_KEY_COLUMN_TABLE_NOT_VALID";
231
232
}
232
}
(-)src/org/eclipse/jpt/jpa/core/resource/orm/XmlNamedNativeQuery.java (-9 / +13 lines)
Lines 3-9 Link Here
3
 * This program and the accompanying materials are made available under the
3
 * This program and the accompanying materials are made available under the
4
 * terms of the Eclipse Public License v1.0, which accompanies this distribution
4
 * terms of the Eclipse Public License v1.0, which accompanies this distribution
5
 * and is available at http://www.eclipse.org/legal/epl-v10.html.
5
 * and is available at http://www.eclipse.org/legal/epl-v10.html.
6
 * 
6
 *
7
 * Contributors:
7
 * Contributors:
8
 *     Oracle - initial API and implementation
8
 *     Oracle - initial API and implementation
9
 ******************************************************************************/
9
 ******************************************************************************/
Lines 29-35 Link Here
29
/**
29
/**
30
 * <!-- begin-user-doc -->
30
 * <!-- begin-user-doc -->
31
 * A representation of the model object '<em><b>Named Native Query</b></em>'.
31
 * A representation of the model object '<em><b>Named Native Query</b></em>'.
32
 * 
32
 *
33
 * Provisional API: This interface is part of an interim API that is still
33
 * Provisional API: This interface is part of an interim API that is still
34
 * under development and expected to change significantly before reaching
34
 * under development and expected to change significantly before reaching
35
 * stability. It is available at this early stage to solicit feedback from
35
 * stability. It is available at this early stage to solicit feedback from
Lines 538-548 Link Here
538
		result.append(')');
538
		result.append(')');
539
		return result.toString();
539
		return result.toString();
540
	}
540
	}
541
	
541
542
	public TextRange getNameTextRange() {
542
	public TextRange getNameTextRange() {
543
		return getAttributeTextRange(JPA.NAME);
543
		return getAttributeTextRange(JPA.NAME);
544
	}
544
	}
545
	
545
546
	public TextRange getQueryTextRange() {
547
		return getAttributeTextRange(JPA.QUERY);
548
	}
549
546
	// ********** translators **********
550
	// ********** translators **********
547
551
548
	public static Translator buildTranslator(String elementName, EStructuralFeature structuralFeature) {
552
	public static Translator buildTranslator(String elementName, EStructuralFeature structuralFeature) {
Lines 563-585 Link Here
563
	protected static Translator buildNameTranslator() {
567
	protected static Translator buildNameTranslator() {
564
		return new Translator(JPA.NAME, OrmPackage.eINSTANCE.getXmlQuery_Name(), Translator.DOM_ATTRIBUTE);
568
		return new Translator(JPA.NAME, OrmPackage.eINSTANCE.getXmlQuery_Name(), Translator.DOM_ATTRIBUTE);
565
	}
569
	}
566
	
570
567
	protected static Translator buildResultClassTranslator() {
571
	protected static Translator buildResultClassTranslator() {
568
		return new Translator(JPA.RESULT_CLASS, OrmPackage.eINSTANCE.getXmlNamedNativeQuery_ResultClass(), Translator.DOM_ATTRIBUTE);
572
		return new Translator(JPA.RESULT_CLASS, OrmPackage.eINSTANCE.getXmlNamedNativeQuery_ResultClass(), Translator.DOM_ATTRIBUTE);
569
	}
573
	}
570
	
574
571
	protected static Translator buildResultSetMappingTranslator() {
575
	protected static Translator buildResultSetMappingTranslator() {
572
		return new Translator(JPA.RESULT_SET_MAPPING, OrmPackage.eINSTANCE.getXmlNamedNativeQuery_ResultSetMapping(), Translator.DOM_ATTRIBUTE);
576
		return new Translator(JPA.RESULT_SET_MAPPING, OrmPackage.eINSTANCE.getXmlNamedNativeQuery_ResultSetMapping(), Translator.DOM_ATTRIBUTE);
573
	}
577
	}
574
	
578
575
	protected static Translator buildDescriptionTranslator() {
579
	protected static Translator buildDescriptionTranslator() {
576
		return new Translator(JPA2_0.DESCRIPTION, OrmV2_0Package.eINSTANCE.getXmlQuery_2_0_Description());
580
		return new Translator(JPA2_0.DESCRIPTION, OrmV2_0Package.eINSTANCE.getXmlQuery_2_0_Description());
577
	}
581
	}
578
	
582
579
	protected static Translator buildQueryTranslator() {
583
	protected static Translator buildQueryTranslator() {
580
		return new Translator(JPA.QUERY, OrmPackage.eINSTANCE.getXmlQuery_Query());
584
		return new Translator(JPA.QUERY, OrmPackage.eINSTANCE.getXmlQuery_Query());
581
	}
585
	}
582
	
586
583
	protected static Translator buildHintTranslator() {
587
	protected static Translator buildHintTranslator() {
584
		return XmlQueryHint.buildTranslator(JPA.HINT, OrmPackage.eINSTANCE.getXmlQuery_Hints());
588
		return XmlQueryHint.buildTranslator(JPA.HINT, OrmPackage.eINSTANCE.getXmlQuery_Hints());
585
	}
589
	}
(-)src/org/eclipse/jpt/jpa/core/resource/orm/XmlNamedQuery.java (-7 / +29 lines)
Lines 3-9 Link Here
3
 * This program and the accompanying materials are made available under the
3
 * This program and the accompanying materials are made available under the
4
 * terms of the Eclipse Public License v1.0, which accompanies this distribution
4
 * terms of the Eclipse Public License v1.0, which accompanies this distribution
5
 * and is available at http://www.eclipse.org/legal/epl-v10.html.
5
 * and is available at http://www.eclipse.org/legal/epl-v10.html.
6
 * 
6
 *
7
 * Contributors:
7
 * Contributors:
8
 *     Oracle - initial API and implementation
8
 *     Oracle - initial API and implementation
9
 ******************************************************************************/
9
 ******************************************************************************/
Lines 19-24 Link Here
19
import org.eclipse.emf.ecore.impl.ENotificationImpl;
19
import org.eclipse.emf.ecore.impl.ENotificationImpl;
20
import org.eclipse.emf.ecore.util.EObjectContainmentEList;
20
import org.eclipse.emf.ecore.util.EObjectContainmentEList;
21
import org.eclipse.emf.ecore.util.InternalEList;
21
import org.eclipse.emf.ecore.util.InternalEList;
22
import org.eclipse.jpt.common.core.internal.utility.SimpleTextRange;
22
import org.eclipse.jpt.common.core.internal.utility.translators.SimpleTranslator;
23
import org.eclipse.jpt.common.core.internal.utility.translators.SimpleTranslator;
23
import org.eclipse.jpt.common.core.utility.TextRange;
24
import org.eclipse.jpt.common.core.utility.TextRange;
24
import org.eclipse.jpt.jpa.core.resource.orm.v2_0.JPA2_0;
25
import org.eclipse.jpt.jpa.core.resource.orm.v2_0.JPA2_0;
Lines 27-37 Link Here
27
import org.eclipse.jpt.jpa.core.resource.orm.v2_0.XmlNamedQuery_2_0;
28
import org.eclipse.jpt.jpa.core.resource.orm.v2_0.XmlNamedQuery_2_0;
28
import org.eclipse.jpt.jpa.core.resource.xml.AbstractJpaEObject;
29
import org.eclipse.jpt.jpa.core.resource.xml.AbstractJpaEObject;
29
import org.eclipse.wst.common.internal.emf.resource.Translator;
30
import org.eclipse.wst.common.internal.emf.resource.Translator;
31
import org.eclipse.wst.xml.core.internal.provisional.document.IDOMNode;
30
32
31
/**
33
/**
32
 * <!-- begin-user-doc -->
34
 * <!-- begin-user-doc -->
33
 * A representation of the model object '<em><b>Named Query</b></em>'.
35
 * A representation of the model object '<em><b>Named Query</b></em>'.
34
 * 
36
 *
35
 * Provisional API: This interface is part of an interim API that is still
37
 * Provisional API: This interface is part of an interim API that is still
36
 * under development and expected to change significantly before reaching
38
 * under development and expected to change significantly before reaching
37
 * stability. It is available at this early stage to solicit feedback from
39
 * stability. It is available at this early stage to solicit feedback from
Lines 503-513 Link Here
503
		result.append(')');
505
		result.append(')');
504
		return result.toString();
506
		return result.toString();
505
	}
507
	}
506
	
508
507
	public TextRange getNameTextRange() {
509
	public TextRange getNameTextRange() {
508
		return getAttributeTextRange(JPA.NAME);
510
		return getAttributeTextRange(JPA.NAME);
509
	}
511
	}
510
	
512
513
	public TextRange getQueryTextRange() {
514
		// <named-query>
515
		IDOMNode node = getElementNode(JPA.QUERY);
516
		if (node != null) {
517
			// The query element has text
518
			if (node.hasChildNodes()) {
519
				return buildTextRange((IDOMNode) node.getFirstChild());
520
			}
521
			// The query element does not have text
522
			TextRange textRange = buildTextRange(node);
523
			return new SimpleTextRange(
524
				node.getEndStructuredDocumentRegion().getStartOffset(),
525
				0,
526
				textRange.getLineNumber()
527
			);
528
		}
529
530
		return this.getValidationTextRange();
531
	}
532
511
	// ********** translators **********
533
	// ********** translators **********
512
534
513
	public static Translator buildTranslator(String elementName, EStructuralFeature structuralFeature) {
535
	public static Translator buildTranslator(String elementName, EStructuralFeature structuralFeature) {
Lines 527-541 Link Here
527
	protected static Translator buildNameTranslator() {
549
	protected static Translator buildNameTranslator() {
528
		return new Translator(JPA.NAME, OrmPackage.eINSTANCE.getXmlQuery_Name(), Translator.DOM_ATTRIBUTE);
550
		return new Translator(JPA.NAME, OrmPackage.eINSTANCE.getXmlQuery_Name(), Translator.DOM_ATTRIBUTE);
529
	}
551
	}
530
	
552
531
	protected static Translator buildDescriptionTranslator() {
553
	protected static Translator buildDescriptionTranslator() {
532
		return new Translator(JPA2_0.DESCRIPTION, OrmV2_0Package.eINSTANCE.getXmlQuery_2_0_Description());
554
		return new Translator(JPA2_0.DESCRIPTION, OrmV2_0Package.eINSTANCE.getXmlQuery_2_0_Description());
533
	}
555
	}
534
	
556
535
	protected static Translator buildQueryTranslator() {
557
	protected static Translator buildQueryTranslator() {
536
		return new Translator(JPA.QUERY, OrmPackage.eINSTANCE.getXmlQuery_Query());
558
		return new Translator(JPA.QUERY, OrmPackage.eINSTANCE.getXmlQuery_Query());
537
	}
559
	}
538
	
560
539
	protected static Translator buildLockModeTranslator() {
561
	protected static Translator buildLockModeTranslator() {
540
		return new Translator(JPA2_0.NAMED_QUERY__LOCK_MODE, OrmV2_0Package.eINSTANCE.getXmlNamedQuery_2_0_LockMode());
562
		return new Translator(JPA2_0.NAMED_QUERY__LOCK_MODE, OrmV2_0Package.eINSTANCE.getXmlNamedQuery_2_0_LockMode());
541
	}
563
	}
(-)src/org/eclipse/jpt/jpa/core/resource/orm/XmlQuery.java (-4 / +6 lines)
Lines 3-9 Link Here
3
 * This program and the accompanying materials are made available under the
3
 * This program and the accompanying materials are made available under the
4
 * terms of the Eclipse Public License v1.0, which accompanies this distribution
4
 * terms of the Eclipse Public License v1.0, which accompanies this distribution
5
 * and is available at http://www.eclipse.org/legal/epl-v10.html.
5
 * and is available at http://www.eclipse.org/legal/epl-v10.html.
6
 * 
6
 *
7
 * Contributors:
7
 * Contributors:
8
 *     Oracle - initial API and implementation
8
 *     Oracle - initial API and implementation
9
 ******************************************************************************/
9
 ******************************************************************************/
Lines 16-22 Link Here
16
/**
16
/**
17
 * <!-- begin-user-doc -->
17
 * <!-- begin-user-doc -->
18
 * A representation of the model object '<em><b>Query</b></em>'.
18
 * A representation of the model object '<em><b>Query</b></em>'.
19
 * 
19
 *
20
 * Provisional API: This interface is part of an interim API that is still
20
 * Provisional API: This interface is part of an interim API that is still
21
 * under development and expected to change significantly before reaching
21
 * under development and expected to change significantly before reaching
22
 * stability. It is available at this early stage to solicit feedback from
22
 * stability. It is available at this early stage to solicit feedback from
Lines 106-111 Link Here
106
	 * @generated
106
	 * @generated
107
	 */
107
	 */
108
	EList<XmlQueryHint> getHints();
108
	EList<XmlQueryHint> getHints();
109
	
109
110
	public TextRange getNameTextRange();
110
	TextRange getNameTextRange();
111
112
	TextRange getQueryTextRange();
111
}
113
}
(-)META-INF/MANIFEST.MF (+2 lines)
Lines 32-37 Link Here
32
 org.eclipse.jst.common.project.facet.ui;bundle-version="[1.3.100,2.0.0)",
32
 org.eclipse.jst.common.project.facet.ui;bundle-version="[1.3.100,2.0.0)",
33
 org.eclipse.jst.j2ee;bundle-version="[1.1.200,2.0.0)",
33
 org.eclipse.jst.j2ee;bundle-version="[1.1.200,2.0.0)",
34
 org.eclipse.jst.j2ee.ui;bundle-version="[1.1.200,2.0.0)",
34
 org.eclipse.jst.j2ee.ui;bundle-version="[1.1.200,2.0.0)",
35
 org.eclipse.persistence.jpa.jpql;bundle-version="1.0.0",
35
 org.eclipse.ui.ide;bundle-version="[3.4.0,4.0.0)",
36
 org.eclipse.ui.ide;bundle-version="[3.4.0,4.0.0)",
36
 org.eclipse.ui.views.properties.tabbed;bundle-version="[3.4.0,4.0.0)",
37
 org.eclipse.ui.views.properties.tabbed;bundle-version="[3.4.0,4.0.0)",
37
 org.eclipse.ui.navigator;bundle-version="[3.3.100,4.0.0)",
38
 org.eclipse.ui.navigator;bundle-version="[3.3.100,4.0.0)",
Lines 64-69 Link Here
64
 org.eclipse.jpt.jpa.ui.internal.jpa2.persistence.connection;x-internal:=true,
65
 org.eclipse.jpt.jpa.ui.internal.jpa2.persistence.connection;x-internal:=true,
65
 org.eclipse.jpt.jpa.ui.internal.jpa2.persistence.options;x-internal:=true,
66
 org.eclipse.jpt.jpa.ui.internal.jpa2.persistence.options;x-internal:=true,
66
 org.eclipse.jpt.jpa.ui.internal.jpa2.platform.generic;x-internal:=true,
67
 org.eclipse.jpt.jpa.ui.internal.jpa2.platform.generic;x-internal:=true,
68
 org.eclipse.jpt.jpa.ui.internal.jpql;x-internal:=true,
67
 org.eclipse.jpt.jpa.ui.internal.listeners;x-internal:=true,
69
 org.eclipse.jpt.jpa.ui.internal.listeners;x-internal:=true,
68
 org.eclipse.jpt.jpa.ui.internal.menus;x-internal:=true,
70
 org.eclipse.jpt.jpa.ui.internal.menus;x-internal:=true,
69
 org.eclipse.jpt.jpa.ui.internal.navigator;x-internal:=true,
71
 org.eclipse.jpt.jpa.ui.internal.navigator;x-internal:=true,
(-)plugin.xml (-7 / +34 lines)
Lines 1-7 Link Here
1
<?xml version="1.0" encoding="UTF-8"?>
1
<?xml version="1.0" encoding="UTF-8"?>
2
<?eclipse version="3.2"?>
2
<?eclipse version="3.2"?>
3
<!--
3
<!--
4
  Copyright (c) 2007, 2010 Oracle. All rights reserved.
4
  Copyright (c) 2007, 2011 Oracle. All rights reserved.
5
  This program and the accompanying materials are made available under the
5
  This program and the accompanying materials are made available under the
6
  terms of the Eclipse Public License v1.0, which accompanies this distribution
6
  terms of the Eclipse Public License v1.0, which accompanies this distribution
7
  and is available at http://www.eclipse.org/legal/epl-v10.html.
7
  and is available at http://www.eclipse.org/legal/epl-v10.html.
Lines 69-78 Link Here
69
			<partition type="__dftl_partition_content_type"/>
69
			<partition type="__dftl_partition_content_type"/>
70
			<partition type="__java_string"/>
70
			<partition type="__java_string"/>
71
		</javaCompletionProposalComputer>
71
		</javaCompletionProposalComputer>
72
		
72
73
	</extension>
73
	</extension>
74
	
74
75
	
76
	<extension
75
	<extension
77
		point="org.eclipse.jdt.ui.javaCompletionProposalComputer"
76
		point="org.eclipse.jdt.ui.javaCompletionProposalComputer"
78
		id="jpaProposalCategory"
77
		id="jpaProposalCategory"
Lines 80-87 Link Here
80
		<proposalCategory
79
		<proposalCategory
81
			icon="$nl$/icons/full/eview16/jpa_perspective.gif"/>
80
			icon="$nl$/icons/full/eview16/jpa_perspective.gif"/>
82
	</extension>
81
	</extension>
83
	
82
84
	
83
	<extension
84
		point="org.eclipse.jdt.ui.javaCompletionProposalComputer"
85
		id="JpaJpqlCompletionProposalComputer">
86
87
		<javaCompletionProposalComputer
88
        activate="true"
89
        categoryId="org.eclipse.jpt.jpa.ui.jpaProposalCategory"
90
        class="org.eclipse.jpt.jpa.ui.internal.jpql.JpaJpqlJavaCompletionProposalComputer">
91
			<partition type="__dftl_partition_content_type"/>
92
			<partition type="__java_string"/>
93
		</javaCompletionProposalComputer>
94
		
95
	</extension>
96
97
	 <extension
98
	       id="JpaJpqlSseCompletionProposal"
99
	       point="org.eclipse.wst.sse.ui.completionProposal">
100
	    <proposalComputer
101
	          activate="true"
102
	          categoryId="org.eclipse.wst.xml.ui.proposalCategory.xmlTags"
103
	          class="org.eclipse.jpt.jpa.ui.internal.jpql.JpaJpqlSseCompletionProposalComputer"
104
	          id="org.eclipse.jpt.jpa.ui.internal.jpql.JpaJpqlSseCompletionProposalComputer">
105
	       <contentType
106
	             id="org.eclipse.jpt.jpa.core.content.orm">
107
	       </contentType>
108
	    </proposalComputer>
109
	 </extension>	
110
111
85
	<extension
112
	<extension
86
		point="org.eclipse.jpt.jpa.ui.jpaPlatformUis">
113
		point="org.eclipse.jpt.jpa.ui.jpaPlatformUis">
87
		
114
		
Lines 94-100 Link Here
94
			id="generic2_0.ui"
121
			id="generic2_0.ui"
95
			jpaPlatform="generic2_0"
122
			jpaPlatform="generic2_0"
96
			factoryClass="org.eclipse.jpt.jpa.ui.internal.jpa2.platform.generic.Generic2_0JpaPlatformUiFactory"/>
123
			factoryClass="org.eclipse.jpt.jpa.ui.internal.jpa2.platform.generic.Generic2_0JpaPlatformUiFactory"/>
97
		
124
	
98
	</extension>
125
	</extension>
99
  	
126
  	
100
	
127
	
(-)property_files/jpt_ui.properties (+4 lines)
Lines 126-131 Link Here
126
JpaProblemSeveritiesPage_Info=Info
126
JpaProblemSeveritiesPage_Info=Info
127
JpaProblemSeveritiesPage_Warning=Warning
127
JpaProblemSeveritiesPage_Warning=Warning
128
128
129
JpqlContentProposalProvider_Description=Content Assist Available ({0})
130
JpaJpqlJavaCompletionProposalComputer_Error=Can't retrieve JPQL proposals due to an internal error.
131
JpaJpqlSseCompletionProposalComputer_Error=Can't retrieve JPQL proposals due to an internal error.
132
129
MappingFileWizard_title=New Mapping File
133
MappingFileWizard_title=New Mapping File
130
MappingFileWizardPage_newFile_title=Mapping file
134
MappingFileWizardPage_newFile_title=Mapping file
131
MappingFileWizardPage_newFile_desc=Specify mapping file name and location
135
MappingFileWizardPage_newFile_desc=Specify mapping file name and location
(-)property_files/jpt_ui_jpql_identifiers.properties (+83 lines)
Added Link Here
1
################################################################################
2
# Copyright (c) 2011 Oracle. All rights reserved.
3
# This program and the accompanying materials are made available under the
4
# terms of the Eclipse Public License v1.0, which accompanies this distribution
5
# and is available at http://www.eclipse.org/legal/epl-v10.html.
6
# 
7
# Contributors:
8
#     Oracle - initial API and implementation
9
################################################################################
10
11
# JPA 1.0 identifiers
12
ABS=The <b>ABS</b> function removes the minus sign from a specified numeric argument and returns the absolute value (integer, float, or double) of the same type as the argument to the function, which is always a positive number or zero.
13
ALL=<ul><li>An <b>ALL</b> conditional expression is a predicate that is <code>true</code> if the comparison operation is <code>true</code> for all values in the result of the subquery or the result of the subquery is empty.</li><li>An <b>ALL</b> conditional expression is <code>false</code> if the result of the comparison is <code>false</code> for at least one row, and is unknown if neither <code>true</code> nor <code>false</code>.</ul><p><p>The comparison operators used with <b>ALL</b> conditional expressions are =, <, <=, >, >=, <>.<p><p>The result of the subquery must be like that of the other argument to the comparison operator in type.
14
#AND
15
ANY=<ul><li>An <b>ANY</b> conditional expression is a predicate that is <code>true</code> if the comparison operation is <code>true</code> for some value in the result of the subquery.</li><li>An <b>ANY</b> conditional expression is <code>false</code> if the result of the subquery is empty or if the comparison operation is <code>false</code> for every value in the result of the subquery,</li><li>and is unknown if neither <code>true</code> nor <code>false</code>.</li></ul><p><p>The comparison operators used with <b>ANY</b> conditional expressions are =, <, <=, >, >=, <>.<p><p>The result of the subquery must be like that of the other argument to the comparison operator in type.
16
ASC=The keyword <b>ASC</b> specifies that ascending ordering be used for the associated order by item.
17
AVG=One of the aggregate functions. The arguments must be numeric. <b>AVG</b> returns <code>Double</code>.<p><p><b>BNF:</b> <code>expression ::= AVG([DISTINCT] state_field_path_expression)</code>
18
BETWEEN=Used in conditional expression to determine whether the result of an expression falls within an inclusive range of values. Numeric, string and date expression can be evaluated in this way.
19
BOTH=Trim from both ends.
20
CONCAT=The <b>CONCAT</b> function returns a string that is a concatenation of its arguments.
21
COUNT=One of the aggregate functions. The return type of this function is a <code>Long</code>.
22
CURRENT_DATE=This function returns the value of current date on the database server.
23
CURRENT_TIME=This function returns the value of current time on the database server.
24
CURRENT_TIMESTAMP=This function returns the value of current timestamp on the database
25
DELETE_FROM=A delete statement provide bulk operations over sets of entities.
26
DESC=The keyword <b>DESC</b> specifies that descending ordering be used. Ascending ordering is the default.
27
DISTINCT=The <b>DISTINCT</b> keyword is used to specify that duplicate values must be eliminated from the query result. If <b>DISTINCT</b> is not specified, duplicate values are not eliminated.
28
ESCAPE=The optional <code>escape character</code> is a single-character string literal or a character-valued input parameter (i.e., char or Character) and is used to escape the special meaning of the underscore and percent characters in <code>pattern value</code>.
29
EXISTS=An <b>EXISTS</b> expression is a predicate that is <code>true</code> only if the result of the subquery consists of one or more values and that is <code>false</code> otherwise.
30
FROM=The <b>FROM</b> clause of a query defines the domain of the query by declaring identification variables. An identification variable is an identifier declared in the <b>FROM</b> clause of a query. The domain of the query may be constrained by path expressions. Identification variables designate instances of a particular entity abstract schema type. The <b>FROM</b> clause can contain multiple identification variable declarations separated by a comma (,).
31
GROUP_BY=The <b>GROUP BY</b> construct enables the aggregation of values according to the properties of an entity class.
32
HAVING=The <b>HAVING</b> construct enables conditions to be specified that further restrict the query result as restrictions upon the groups.
33
IN=An identification variable declared by a collection member declaration ranges over values of a collection obtained by navigation using a path expression. Such a path expression represents a navigation involving the association-fields of an entity abstract schema type. Because a path expression can be based on another path expression, the navigation can use the association-fields of related entities. An identification variable of a collection member declaration is declared using a special operator, the reserved identifier <b>IN</b>. The argument to the <b>IN</b> operator is a collection-valued path expression. The path expression evaluates to a collection type specified as a result of navigation to a collection-valued association-field of an entity abstract schema type.
34
IS_EMPTY=An <b>EMPTY</b> expression tests whether or not the collection designated by the collection-valued path expression is empty (i.e, has no elements).
35
IS_NULL=A null comparison tests whether or not the single-valued path expression or input parameter is a <b>NULL</b> value.
36
JOIN=A <b>JOIN</b> enables the fetching of an association as a side effect of the execution of a query. A <b>JOIN</b> is specified over an entity and its related entities.
37
JOIN_FETCH=A <b>JOIN FETCH</b> enables the fetching of an association as a side effect of the execution of a query. A <b>JOIN FETCH</b> is specified over an entity and its related entities.
38
LEADING=Trim from leading end.
39
LENGTH=The <b>LENGTH</b> function returns the length of the string in characters as an integer.
40
LIKE=The <b>LIKE</b> condition is used to specify a search for a pattern.<p><p>The <code>string_expression</code> must have a string value. The <code>pattern_value</code> is a string literal or a string-valued input parameter in which an underscore (_) stands for any single character, a percent (%) character stands for any sequence of characters (including the empty sequence), and all other characters stand for themselves. The optional <code>escape_character</code> is a single-character string literal or a character-valued input parameter (i.e., char or Character) and is used to escape the special meaning of the underscore and percent characters in <code>pattern_value</code>.
41
LOCATE=The <b>LOCATE</b> function returns the position of a given string within a string, starting the search at a specified position. It returns the first position at which the string was found as an integer. The first argument is the string to be located; the second argument is the string to be searched; the optional third argument is an integer that represents the string position at which the search is started (by default, the beginning of the string to be searched). The first position in a string is denoted by 1. If the string is not found, 0 is returned. The <b>LENGTH</b> function returns the length of the string in characters as an integer.
42
LOWER=The <b>LOWER</b> function converts a string to lower case and it returns a string.
43
MAX=One of the aggregate functions. The arguments must correspond to orderable state-field types (i.e., numeric types, string types, character types, or date types). The return type of this function is based on the state-field's type.
44
MEMBER=This expression tests whether the designated value is a member of the collection specified by the collection-valued path expression. If the collection-valued path expression designates an empty collection, the value of the <b>MEMBER OF</b> expression is <b>FALSE</b> and the value of the <b>NOT MEMBER OF</b> expression is <b>TRUE</b>. Otherwise, if the value of the collection-valued path expression or single-valued association-field path expression in the collection member expression is <b>NULL</b> or unknown, the value of the collection member expression is unknown.
45
MIN= One of the aggregate functions. The arguments must correspond to orderable state-field types (i.e., numeric types, string types, character types, or date types). The return type of this function is based on the state-field's type.
46
MOD=The modulo operation finds the remainder of division of one number by another. It takes two integer arguments and returns an integer.
47
NEW=In the <b>SELECT</b> clause a constructor may be used in the <b>SELECT</b> list to return one or more Java instances. The specified class is not required to be an entity or to be mapped to the database. The constructor name must be fully qualified.
48
OBJECT=Stand-alone identification variables in the <b>SELECT</b> clause may optionally be qualified by the <b>OBJECT</b> operator. The <b>SELECT</b> clause must not use the <b>OBJECT</b> operator to qualify path expressions.
49
#OR
50
ORDER_BY=The <b>ORDER BY</b> clause allows the objects or values that are returned by the query to be ordered.
51
SELECT=The <b>SELECT</b> clause determines the type of the objects or values to be selected.
52
SIZE=The <b>SIZE</b> function returns an integer value, the number of elements of the collection. If the collection is empty, the <b>SIZE</b> function evaluates to zero.
53
SOME=<ul><li>An <b>SOME</b> conditional expression is a predicate that is <code>true</code> if the comparison operation is <code>true</code> for some value in the result of the subquery.</li><li>A <b>SOME</b> conditional expression is <code>false</code> if the result of the subquery is empty or if the comparison operation is <code>false</code> for every value in the result of the subquery,</li><li>and is unknown if neither <code>true</code> nor <code>false</code>.</li></ul><p><p>The comparison operators used with <b>SOME</b> conditional expressions are =, <, <=, >, >=, <>.<p><p>The result of the subquery must be like that of the other argument to the comparison operator in type.
54
SQRT=The <b>SQRT</b> function takes a numeric argument and returns a double.
55
SUBSTRING=The second and third arguments of the <b>SUBSTRING</b> function denote the starting position and length of the substring to be returned. These arguments are integers. The first position of a string is denoted by 1. The <b>SUBSTRING</b> function returns a string.
56
SUM= One of the aggregate functions. The arguments must be numeric. The <b>SUM</b> function returns <code>Long</code> when applied to state-fields of integral types (other than <code>BigInteger</code>); <code>Double</code> when applied to state-fields of floating point types; <code>BigInteger</code> when applied to state-fields of type <code>BigInteger</code>; and <code>BigDecimal</code> when applied to state-fields of type <code>BigDecimal</code>. If <b>SUM</b>, <b>AVG</b>, <b>MAX</b>, or <b>MIN</b> is used, and there are no values to which the aggregate function can be applied, the result of the aggregate function is <code>NULL</code>. If <code>COUNT</code> is used, and there are no values to which <b>COUNT</b> can be applied, the result of the aggregate function is 0.
57
TRAILING=Trim from trailing end.
58
TRIM=The <b>TRIM</b> function trims the specified character from a string. If the character to be trimmed is not specified, it is assumed to be space (or blank). The optional <code>trim_character</code> is a single-character string literal or a character-valued input parameter (i.e., char or Character). If a trim specification is not provided, <b>BOTH</b> is assumed. The <b>TRIM</b> function returns the trimmed string.
59
UPDATE=An update statement provide bulk operations over sets of entities.
60
UPPER=The <b>UPPER</b> function converts a string to upper case and it returns a string.
61
WHERE=The <b>WHERE</b> clause of a query consists of a conditional expression used to select objects or values that satisfy the expression. The <b>WHERE</b> clause restricts the result of a select statement or the scope of an update or delete operation.
62
63
# JPA 2.0 identifiers
64
CASE=A <b>CASE</b> experssion can include any number of any number of <b>WHEN/THEN</b> statement pairs and returns one of the values in the map or the default item, evaluating the map key expressions to decide which.
65
COALESCE=A <b>COALESCE</b> expression returns <code>null</code> if all its arguments evaluate to <code>null</code>, and the value of the first non-<code>null</code> argument otherwise.<p><p>The return type is the type returned by the arguments if they are all of the same type, otherwise it is undetermined.
66
ENTRY=Use <b>ENTRY</b> in the <b>FROM</b> clause of a <b>MAP</b>. 
67
INDEX=The <b>INDEX</b> function returns an integer value corresponding to the position of its argument in an ordered list. The <b>INDEX</b> function can only be applied to identification variables denoting types for which an order column has been specified.
68
KEY=Use <b>KEY</b> in the <b>SELECT</b> clause or the <b>WHERE</b> clause of a <b>MAP</b>. 
69
NULLIF=<b>NULLIF</b> returns the first expression if the two expressions are not equal. If the expressions are equal, <b>NULLIF</b> returns a null value of the type of the first expression.<p><p><b>NULLIF</b> is equivalent to a searched <b>CASE</b> expression in which the two expressions are equal and the resulting expression is <b>NULL</b>.<p><p>Returns the same type as the first expression.
70
TYPE=An entity type expression can be used to restrict query polymorphism. The <b>TYPE</b> operator returns the exact type of the argument.
71
VALUE=Use <b>VALUE</b> in the <b>SELECT</b> clause or the <b>WHERE</b> clause of a <b>MAP</b>. 
72
73
# EclipseLink identifiers
74
FUNC=Use <b>FUNC</b> for direct, native database functions.
75
TREAT=<b>TREAT</b>downcasts child classes in inheritance hierarchy.
76
77
# Reserved JPQL identifiers
78
BIT_LENGTH=The identifier <b>BIT_LENGTH</b> is not currently used: it is reserved for future use.
79
CHAR_LENGTH=The identifier <b>CHAR_LENGTH</b> is not currently used: it is reserved for future use.
80
CHARACTER_LENGTH=The identifier <b>CHARACTER_LENGTH</b> is not currently used: it is reserved for future use.
81
CLASS=The identifier <b>CLASS</b> is not currently used: it is reserved for future use.
82
POSITION=The identifier <b>POSITION</b> is not currently used: it is reserved for future use.
83
UNKNOWN=The identifier <b>UNKNOWN</b> is not currently used: it is reserved for future use.
(-)property_files/jpt_ui_validation_preferences.properties (+1 lines)
Lines 209-211 Link Here
209
ID_MAPPING_UNRESOLVED_GENERATOR_NAME=Unresolved generator name:
209
ID_MAPPING_UNRESOLVED_GENERATOR_NAME=Unresolved generator name:
210
GENERATED_VALUE_UNRESOLVED_GENERATOR=Generator is not defined in the persistence unit:
210
GENERATED_VALUE_UNRESOLVED_GENERATOR=Generator is not defined in the persistence unit:
211
QUERY_DUPLICATE_NAME=Duplicate query defined:
211
QUERY_DUPLICATE_NAME=Duplicate query defined:
212
JPQL_QUERY_VALIDATION=Invalid or incomplete JPQL queries:
(-)src/org/eclipse/jpt/jpa/ui/internal/JptUiIcons.java (-1 / +10 lines)
Lines 124-127 Link Here
124
	public static final String TRANSIENT = "full/obj16/transient";
124
	public static final String TRANSIENT = "full/obj16/transient";
125
	
125
	
126
	public static final String NULL_ATTRIBUTE_MAPPING = "full/obj16/null-attribute-mapping";
126
	public static final String NULL_ATTRIBUTE_MAPPING = "full/obj16/null-attribute-mapping";
127
}
127
128
129
	// **************** Content Assist icons **********************************
130
131
	public static final String JPQL_FUNCTION = "full/obj16/jpql.function";
132
133
	public static final String JPQL_IDENTIFIER = "full/obj16/jpql.identifier";
134
135
	public static final String JPQL_VARIABLE = "full/obj16/jpql.variable";
136
}
(-)src/org/eclipse/jpt/jpa/ui/internal/JptUiMessages.java (-1 / +4 lines)
Lines 92-97 Link Here
92
	public static String JpaFacetWizardPage_title;
92
	public static String JpaFacetWizardPage_title;
93
	public static String JpaFacetWizardPage_userLibsLink;
93
	public static String JpaFacetWizardPage_userLibsLink;
94
	public static String JpaFacetWizardPage_userServerLibLabel;
94
	public static String JpaFacetWizardPage_userServerLibLabel;
95
	public static String JpaJpqlJavaCompletionProposalComputer_Error;
96
	public static String JpaJpqlSseCompletionProposalComputer_Error;
95
	public static String JpaLibraryProviderInstallPanel_includeLibraries;
97
	public static String JpaLibraryProviderInstallPanel_includeLibraries;
96
	public static String JpaMakePersistentWizardPage_title;
98
	public static String JpaMakePersistentWizardPage_title;
97
	public static String JpaMakePersistentWizardPage_message;
99
	public static String JpaMakePersistentWizardPage_message;
Lines 110-115 Link Here
110
	public static String JpaStructureView_linkWithEditorTooltip;
112
	public static String JpaStructureView_linkWithEditorTooltip;
111
	public static String JpaStructureView_structureNotAvailable;
113
	public static String JpaStructureView_structureNotAvailable;
112
	public static String JpaStructureView_numItemsSelected;
114
	public static String JpaStructureView_numItemsSelected;
115
	public static String JpqlContentProposalProvider_Description;
113
	public static String MappingFileWizard_title;
116
	public static String MappingFileWizard_title;
114
	public static String MappingFileWizardPage_newFile_title;
117
	public static String MappingFileWizardPage_newFile_title;
115
	public static String MappingFileWizardPage_newFile_desc;
118
	public static String MappingFileWizardPage_newFile_desc;
Lines 140-146 Link Here
140
	public static String JpaProblemSeveritiesPage_Warning;
143
	public static String JpaProblemSeveritiesPage_Warning;
141
	public static String SelectJpaOrmMappingFileDialog_newButton;
144
	public static String SelectJpaOrmMappingFileDialog_newButton;
142
145
143
	
146
144
	private static final String BUNDLE_NAME = "jpt_ui"; //$NON-NLS-1$
147
	private static final String BUNDLE_NAME = "jpt_ui"; //$NON-NLS-1$
145
	private static final Class<?> BUNDLE_CLASS = JptUiMessages.class;
148
	private static final Class<?> BUNDLE_CLASS = JptUiMessages.class;
146
	static {
149
	static {
(-)src/org/eclipse/jpt/jpa/ui/internal/JptUiValidationPreferenceMessages.java (-12 / +11 lines)
Lines 1-9 Link Here
1
/*******************************************************************************
1
/*******************************************************************************
2
 * Copyright (c) 2009, 2010 Oracle. All rights reserved.
2
 * Copyright (c) 2009, 2011 Oracle. All rights reserved.
3
 * This program and the accompanying materials are made available under the
3
 * This program and the accompanying materials are made available under the
4
 * terms of the Eclipse Public License v1.0, which accompanies this distribution
4
 * terms of the Eclipse Public License v1.0, which accompanies this distribution
5
 * and is available at http://www.eclipse.org/legal/epl-v10.html.
5
 * and is available at http://www.eclipse.org/legal/epl-v10.html.
6
 * 
6
 *
7
 * Contributors:
7
 * Contributors:
8
 *     Oracle - initial API and implementation
8
 *     Oracle - initial API and implementation
9
 ******************************************************************************/
9
 ******************************************************************************/
Lines 19-27 Link Here
19
	public static String PROJECT_INVALID_CONNECTION;
19
	public static String PROJECT_INVALID_CONNECTION;
20
	public static String PROJECT_INACTIVE_CONNECTION;
20
	public static String PROJECT_INACTIVE_CONNECTION;
21
	public static String PROJECT_NO_PERSISTENCE_XML;
21
	public static String PROJECT_NO_PERSISTENCE_XML;
22
	
22
23
	public static String XML_VERSION_NOT_LATEST;
23
	public static String XML_VERSION_NOT_LATEST;
24
	
24
25
	public static String PROJECT_MULTIPLE_PERSISTENCE_XML;
25
	public static String PROJECT_MULTIPLE_PERSISTENCE_XML;
26
	public static String PERSISTENCE_NO_PERSISTENCE_UNIT;
26
	public static String PERSISTENCE_NO_PERSISTENCE_UNIT;
27
	public static String PERSISTENCE_MULTIPLE_PERSISTENCE_UNITS;
27
	public static String PERSISTENCE_MULTIPLE_PERSISTENCE_UNITS;
Lines 82-94 Link Here
82
	public static String ELEMENT_COLLECTION_TARGET_CLASS_NOT_DEFINED;
82
	public static String ELEMENT_COLLECTION_TARGET_CLASS_NOT_DEFINED;
83
	public static String ELEMENT_COLLECTION_TARGET_CLASS_MUST_BE_EMBEDDABLE_OR_BASIC_TYPE;
83
	public static String ELEMENT_COLLECTION_TARGET_CLASS_MUST_BE_EMBEDDABLE_OR_BASIC_TYPE;
84
	public static String ELEMENT_COLLECTION_MAP_KEY_CLASS_NOT_DEFINED;
84
	public static String ELEMENT_COLLECTION_MAP_KEY_CLASS_NOT_DEFINED;
85
	
85
86
	public static String DATABASE_CATEGORY;
86
	public static String DATABASE_CATEGORY;
87
	public static String TABLE_CATEGORY;
87
	public static String TABLE_CATEGORY;
88
	public static String COLUMN_CATEGORY;
88
	public static String COLUMN_CATEGORY;
89
	public static String OVERRIDES_CATEGORY;
89
	public static String OVERRIDES_CATEGORY;
90
	public static String IMPLIED_ATTRIBUTE_LEVEL_CATEGORY;
90
	public static String IMPLIED_ATTRIBUTE_LEVEL_CATEGORY;
91
	
91
92
	public static String TABLE_UNRESOLVED_CATALOG;
92
	public static String TABLE_UNRESOLVED_CATALOG;
93
	public static String TABLE_UNRESOLVED_SCHEMA;
93
	public static String TABLE_UNRESOLVED_SCHEMA;
94
	public static String TABLE_UNRESOLVED_NAME;
94
	public static String TABLE_UNRESOLVED_NAME;
Lines 125-136 Link Here
125
	public static String VIRTUAL_SECONDARY_TABLE_PRIMARY_KEY_JOIN_COLUMN_REFERENCED_COLUMN_NAME_MUST_BE_SPECIFIED_MULTIPLE_JOIN_COLUMNS;
125
	public static String VIRTUAL_SECONDARY_TABLE_PRIMARY_KEY_JOIN_COLUMN_REFERENCED_COLUMN_NAME_MUST_BE_SPECIFIED_MULTIPLE_JOIN_COLUMNS;
126
	public static String MAP_KEY_COLUMN_TABLE_NOT_VALID;
126
	public static String MAP_KEY_COLUMN_TABLE_NOT_VALID;
127
	public static String VIRTUAL_MAP_KEY_ATTRIBUTE_OVERRIDE_COLUMN_TABLE_NOT_VALID;
127
	public static String VIRTUAL_MAP_KEY_ATTRIBUTE_OVERRIDE_COLUMN_TABLE_NOT_VALID;
128
	
128
129
	public static String COLLECTION_TABLE_UNRESOLVED_CATALOG;
129
	public static String COLLECTION_TABLE_UNRESOLVED_CATALOG;
130
	public static String COLLECTION_TABLE_UNRESOLVED_SCHEMA;
130
	public static String COLLECTION_TABLE_UNRESOLVED_SCHEMA;
131
	public static String COLLECTION_TABLE_UNRESOLVED_NAME;
131
	public static String COLLECTION_TABLE_UNRESOLVED_NAME;
132
	public static String ORDER_COLUMN_UNRESOLVED_NAME;
132
	public static String ORDER_COLUMN_UNRESOLVED_NAME;
133
	
133
134
	public static String VIRTUAL_ATTRIBUTE_JOIN_TABLE_UNRESOLVED_CATALOG;
134
	public static String VIRTUAL_ATTRIBUTE_JOIN_TABLE_UNRESOLVED_CATALOG;
135
	public static String VIRTUAL_ATTRIBUTE_JOIN_TABLE_UNRESOLVED_SCHEMA;
135
	public static String VIRTUAL_ATTRIBUTE_JOIN_TABLE_UNRESOLVED_SCHEMA;
136
	public static String VIRTUAL_ATTRIBUTE_JOIN_TABLE_UNRESOLVED_NAME;
136
	public static String VIRTUAL_ATTRIBUTE_JOIN_TABLE_UNRESOLVED_NAME;
Lines 170-176 Link Here
170
	public static String VIRTUAL_ATTRIBUTE_INVERSE_JOIN_COLUMN_REFERENCED_COLUMN_NAME_MUST_BE_SPECIFIED_MULTIPLE_JOIN_COLUMNS;
170
	public static String VIRTUAL_ATTRIBUTE_INVERSE_JOIN_COLUMN_REFERENCED_COLUMN_NAME_MUST_BE_SPECIFIED_MULTIPLE_JOIN_COLUMNS;
171
	public static String VIRTUAL_ATTRIBUTE_MAP_KEY_COLUMN_TABLE_NOT_VALID;
171
	public static String VIRTUAL_ATTRIBUTE_MAP_KEY_COLUMN_TABLE_NOT_VALID;
172
	public static String VIRTUAL_ATTRIBUTE_MAP_KEY_ATTRIBUTE_OVERRIDE_COLUMN_TABLE_NOT_VALID;
172
	public static String VIRTUAL_ATTRIBUTE_MAP_KEY_ATTRIBUTE_OVERRIDE_COLUMN_TABLE_NOT_VALID;
173
	
173
174
	public static String VIRTUAL_ASSOCIATION_OVERRIDE_JOIN_TABLE_UNRESOLVED_CATALOG;
174
	public static String VIRTUAL_ASSOCIATION_OVERRIDE_JOIN_TABLE_UNRESOLVED_CATALOG;
175
	public static String VIRTUAL_ASSOCIATION_OVERRIDE_JOIN_TABLE_UNRESOLVED_SCHEMA;
175
	public static String VIRTUAL_ASSOCIATION_OVERRIDE_JOIN_TABLE_UNRESOLVED_SCHEMA;
176
	public static String VIRTUAL_ASSOCIATION_OVERRIDE_JOIN_TABLE_UNRESOLVED_NAME;
176
	public static String VIRTUAL_ASSOCIATION_OVERRIDE_JOIN_TABLE_UNRESOLVED_NAME;
Lines 205-210 Link Here
205
	public static String ID_MAPPING_UNRESOLVED_GENERATOR_NAME;
205
	public static String ID_MAPPING_UNRESOLVED_GENERATOR_NAME;
206
	public static String GENERATED_VALUE_UNRESOLVED_GENERATOR;
206
	public static String GENERATED_VALUE_UNRESOLVED_GENERATOR;
207
	public static String QUERY_DUPLICATE_NAME;
207
	public static String QUERY_DUPLICATE_NAME;
208
	public static String JPQL_QUERY_VALIDATION;
208
209
209
	private static final String BUNDLE_NAME = "jpt_ui_validation_preferences"; //$NON-NLS-1$
210
	private static final String BUNDLE_NAME = "jpt_ui_validation_preferences"; //$NON-NLS-1$
210
	private static final Class<?> BUNDLE_CLASS = JptUiValidationPreferenceMessages.class;
211
	private static final Class<?> BUNDLE_CLASS = JptUiValidationPreferenceMessages.class;
Lines 215-220 Link Here
215
	private JptUiValidationPreferenceMessages() {
216
	private JptUiValidationPreferenceMessages() {
216
		throw new UnsupportedOperationException();
217
		throw new UnsupportedOperationException();
217
	}
218
	}
218
219
}
219
220
}
(-)src/org/eclipse/jpt/jpa/ui/internal/details/NamedQueryPropertyComposite.java (-28 / +35 lines)
Lines 1-5 Link Here
1
/*******************************************************************************
1
/*******************************************************************************
2
 * Copyright (c) 2008, 2009 Oracle. All rights reserved.
2
 * Copyright (c) 2008, 2011 Oracle. All rights reserved.
3
 * This program and the accompanying materials are made available under the
3
 * This program and the accompanying materials are made available under the
4
 * terms of the Eclipse Public License v1.0, which accompanies this distribution
4
 * terms of the Eclipse Public License v1.0, which accompanies this distribution
5
 * and is available at http://www.eclipse.org/legal/epl-v10.html.
5
 * and is available at http://www.eclipse.org/legal/epl-v10.html.
Lines 15-24 Link Here
15
import org.eclipse.jpt.common.utility.model.value.WritablePropertyValueModel;
15
import org.eclipse.jpt.common.utility.model.value.WritablePropertyValueModel;
16
import org.eclipse.jpt.jpa.core.context.NamedQuery;
16
import org.eclipse.jpt.jpa.core.context.NamedQuery;
17
import org.eclipse.jpt.jpa.core.context.Query;
17
import org.eclipse.jpt.jpa.core.context.Query;
18
import org.eclipse.jpt.jpa.ui.internal.jpql.JpaJpqlContentProposalProvider;
19
import org.eclipse.swt.custom.StyledText;
18
import org.eclipse.swt.widgets.Composite;
20
import org.eclipse.swt.widgets.Composite;
19
21
20
/**
22
/**
21
 * Here the layout of this pane:
23
 * Here's the layout of this pane:
22
 * <pre>
24
 * <pre>
23
 * -----------------------------------------------------------------------------
25
 * -----------------------------------------------------------------------------
24
 * |        ------------------------------------------------------------------ |
26
 * |        ------------------------------------------------------------------ |
Lines 40-50 Link Here
40
 * @see NamedQueriesComposite - The parent container
42
 * @see NamedQueriesComposite - The parent container
41
 * @see QueryHintsComposite
43
 * @see QueryHintsComposite
42
 *
44
 *
43
 * @version 2.0
45
 * @version 2.3
44
 * @since 2.0
46
 * @since 2.3
45
 */
47
 */
46
public class NamedQueryPropertyComposite<T extends NamedQuery> extends Pane<T>
48
public class NamedQueryPropertyComposite<T extends NamedQuery> extends Pane<T> {
47
{
49
48
	/**
50
	/**
49
	 * Creates a new <code>NamedQueryPropertyComposite</code>.
51
	 * Creates a new <code>NamedQueryPropertyComposite</code>.
50
	 *
52
	 *
Lines 59-64 Link Here
59
		super(parentPane, subjectHolder, parent);
61
		super(parentPane, subjectHolder, parent);
60
	}
62
	}
61
63
64
	protected WritablePropertyValueModel<String> buildNameTextHolder() {
65
		return new PropertyAspectAdapter<NamedQuery, String>(
66
				getSubjectHolder(), Query.NAME_PROPERTY) {
67
			@Override
68
			protected String buildValue_() {
69
				return this.subject.getName();
70
			}
71
72
			@Override
73
			protected void setValue_(String value) {
74
				if (value.length() == 0) {
75
					value = null;
76
				}
77
				this.subject.setName(value);
78
			}
79
		};
80
	}
81
62
	protected WritablePropertyValueModel<String> buildQueryHolder() {
82
	protected WritablePropertyValueModel<String> buildQueryHolder() {
63
		return new PropertyAspectAdapter<NamedQuery, String>(getSubjectHolder(), Query.QUERY_PROPERTY) {
83
		return new PropertyAspectAdapter<NamedQuery, String>(getSubjectHolder(), Query.QUERY_PROPERTY) {
64
			@Override
84
			@Override
Lines 73-88 Link Here
73
		};
93
		};
74
	}
94
	}
75
95
96
	/**
97
	 * {@inheritDoc}
98
	 */
76
	@Override
99
	@Override
77
	protected void initializeLayout(Composite container) {
100
	protected void initializeLayout(Composite container) {
78
		
101
79
		addLabeledText(
102
		addLabeledText(
80
			container, 
103
			container,
81
			JptUiDetailsMessages.NamedQueryComposite_nameTextLabel, 
104
			JptUiDetailsMessages.NamedQueryComposite_nameTextLabel,
82
			buildNameTextHolder());
105
			buildNameTextHolder());
83
106
84
		// Query text area
107
		// Query text area
85
		addLabeledMultiLineText(
108
		StyledText text = addLabeledMultiLineStyledText(
86
			container,
109
			container,
87
			JptUiDetailsMessages.NamedQueryPropertyComposite_query,
110
			JptUiDetailsMessages.NamedQueryPropertyComposite_query,
88
			buildQueryHolder(),
111
			buildQueryHolder(),
Lines 90-95 Link Here
90
			null
113
			null
91
		);
114
		);
92
115
116
		new JpaJpqlContentProposalProvider(getSubjectHolder(), text);
117
93
		// Query Hints pane
118
		// Query Hints pane
94
		container = addTitledGroup(
119
		container = addTitledGroup(
95
			addSubPane(container, 5),
120
			addSubPane(container, 5),
Lines 98-119 Link Here
98
123
99
		new QueryHintsComposite(this, container);
124
		new QueryHintsComposite(this, container);
100
	}
125
	}
101
		
102
	protected WritablePropertyValueModel<String> buildNameTextHolder() {
103
		return new PropertyAspectAdapter<NamedQuery, String>(
104
				getSubjectHolder(), Query.NAME_PROPERTY) {
105
			@Override
106
			protected String buildValue_() {
107
				return this.subject.getName();
108
			}
109
		
110
			@Override
111
			protected void setValue_(String value) {
112
				if (value.length() == 0) {
113
					value = null;
114
				}
115
				this.subject.setName(value);
116
			}
117
		};
118
	}
119
}
126
}
(-)src/org/eclipse/jpt/jpa/ui/internal/details/QueriesComposite.java (-3 / +3 lines)
Lines 17-24 Link Here
17
import org.eclipse.jface.window.Window;
17
import org.eclipse.jface.window.Window;
18
import org.eclipse.jpt.common.ui.internal.util.ControlSwitcher;
18
import org.eclipse.jpt.common.ui.internal.util.ControlSwitcher;
19
import org.eclipse.jpt.common.ui.internal.widgets.AddRemoveListPane;
19
import org.eclipse.jpt.common.ui.internal.widgets.AddRemoveListPane;
20
import org.eclipse.jpt.common.ui.internal.widgets.Pane;
21
import org.eclipse.jpt.common.ui.internal.widgets.AddRemovePane.Adapter;
20
import org.eclipse.jpt.common.ui.internal.widgets.AddRemovePane.Adapter;
21
import org.eclipse.jpt.common.ui.internal.widgets.Pane;
22
import org.eclipse.jpt.common.utility.internal.CollectionTools;
22
import org.eclipse.jpt.common.utility.internal.CollectionTools;
23
import org.eclipse.jpt.common.utility.internal.Transformer;
23
import org.eclipse.jpt.common.utility.internal.Transformer;
24
import org.eclipse.jpt.common.utility.internal.model.value.CompositeListValueModel;
24
import org.eclipse.jpt.common.utility.internal.model.value.CompositeListValueModel;
Lines 75-81 Link Here
75
{
75
{
76
	private AddRemoveListPane<QueryContainer> listPane;
76
	private AddRemoveListPane<QueryContainer> listPane;
77
	NamedNativeQueryPropertyComposite namedNativeQueryPane;
77
	NamedNativeQueryPropertyComposite namedNativeQueryPane;
78
	NamedQueryPropertyComposite<? extends NamedQuery> namedQueryPane;
78
	Pane<? extends NamedQuery> namedQueryPane;
79
	private WritablePropertyValueModel<Query> queryHolder;
79
	private WritablePropertyValueModel<Query> queryHolder;
80
80
81
81
Lines 295-301 Link Here
295
		installPaneSwitcher(pageBook);
295
		installPaneSwitcher(pageBook);
296
	}
296
	}
297
	
297
	
298
	protected NamedQueryPropertyComposite<? extends NamedQuery> buildNamedQueryPropertyComposite(PageBook pageBook) {
298
	protected Pane<? extends NamedQuery> buildNamedQueryPropertyComposite(PageBook pageBook) {
299
		return new NamedQueryPropertyComposite<NamedQuery>(
299
		return new NamedQueryPropertyComposite<NamedQuery>(
300
			this,
300
			this,
301
			this.buildNamedQueryHolder(),
301
			this.buildNamedQueryHolder(),
(-)src/org/eclipse/jpt/jpa/ui/internal/jpa2/details/NamedQueryProperty2_0Composite.java (-15 / +82 lines)
Lines 1-27 Link Here
1
/*******************************************************************************
1
/*******************************************************************************
2
* Copyright (c) 2009 Oracle. All rights reserved.
2
* Copyright (c) 2009, 2011 Oracle. All rights reserved.
3
* This program and the accompanying materials are made available under the
3
* This program and the accompanying materials are made available under the
4
* terms of the Eclipse Public License v1.0, which accompanies this distribution
4
* terms of the Eclipse Public License v1.0, which accompanies this distribution
5
* and is available at http://www.eclipse.org/legal/epl-v10.html.
5
* and is available at http://www.eclipse.org/legal/epl-v10.html.
6
* 
6
*
7
* Contributors:
7
* Contributors:
8
*     Oracle - initial API and implementation
8
*     Oracle - initial API and implementation
9
*******************************************************************************/
9
*******************************************************************************/
10
package org.eclipse.jpt.jpa.ui.internal.jpa2.details;
10
package org.eclipse.jpt.jpa.ui.internal.jpa2.details;
11
11
12
import org.eclipse.jpt.common.ui.internal.widgets.Pane;
12
import org.eclipse.jpt.common.ui.internal.widgets.Pane;
13
import org.eclipse.jpt.common.utility.internal.model.value.PropertyAspectAdapter;
13
import org.eclipse.jpt.common.utility.model.value.PropertyValueModel;
14
import org.eclipse.jpt.common.utility.model.value.PropertyValueModel;
15
import org.eclipse.jpt.common.utility.model.value.WritablePropertyValueModel;
16
import org.eclipse.jpt.jpa.core.context.Query;
14
import org.eclipse.jpt.jpa.core.jpa2.context.NamedQuery2_0;
17
import org.eclipse.jpt.jpa.core.jpa2.context.NamedQuery2_0;
15
import org.eclipse.jpt.jpa.ui.internal.details.JptUiDetailsMessages;
18
import org.eclipse.jpt.jpa.ui.internal.details.JptUiDetailsMessages;
16
import org.eclipse.jpt.jpa.ui.internal.details.NamedQueryPropertyComposite;
17
import org.eclipse.jpt.jpa.ui.internal.details.QueryHintsComposite;
19
import org.eclipse.jpt.jpa.ui.internal.details.QueryHintsComposite;
20
import org.eclipse.jpt.jpa.ui.internal.jpql.JpaJpqlContentProposalProvider;
21
import org.eclipse.swt.custom.StyledText;
18
import org.eclipse.swt.widgets.Composite;
22
import org.eclipse.swt.widgets.Composite;
19
23
20
/**
24
/**
21
 *  NamedQueryProperty2_0Composite
25
 * Here's the layout of this pane:
26
 * <pre>
27
 * -----------------------------------------------------------------------------
28
 * |            -------------------------------------------------------------- |
29
 * | Query:     | I                                                          | |
30
 * |            |                                                            | |
31
 * |            |                                                            | |
32
 * |            -------------------------------------------------------------- |
33
 * |            -------------------------------------------------------------- |
34
 * | Lock Mode: |                                                          |v| |
35
 * |            -------------------------------------------------------------- |
36
 * |                                                                           |
37
 * | - Query Hints ----------------------------------------------------------- |
38
 * | | --------------------------------------------------------------------- | |
39
 * | | |                                                                   | | |
40
 * | | | QueryHintsComposite                                               | | |
41
 * | | |                                                                   | | |
42
 * | | --------------------------------------------------------------------- | |
43
 * | ------------------------------------------------------------------------- |
44
 * -----------------------------------------------------------------------------</pre>
45
 *
46
 *
47
 * @see NamedQuery2_0
48
 * @see NamedQueriesComposite - The parent container
49
 * @see QueryHintsComposite
50
 *
51
 * @version 2.0
52
 * @since 2.0
22
 */
53
 */
23
public class NamedQueryProperty2_0Composite extends NamedQueryPropertyComposite<NamedQuery2_0>
54
public class NamedQueryProperty2_0Composite extends Pane<NamedQuery2_0> {
24
{
55
25
	/**
56
	/**
26
	 * Creates a new <code>NamedQueryProperty2_0Composite</code>.
57
	 * Creates a new <code>NamedQueryProperty2_0Composite</code>.
27
	 *
58
	 *
Lines 30-51 Link Here
30
	 * @param parent The parent container
61
	 * @param parent The parent container
31
	 */
62
	 */
32
	public NamedQueryProperty2_0Composite(Pane<?> parentPane,
63
	public NamedQueryProperty2_0Composite(Pane<?> parentPane,
33
	                                   PropertyValueModel<NamedQuery2_0> subjectHolder,
64
	                                      PropertyValueModel<NamedQuery2_0> subjectHolder,
34
	                                   Composite parent) {
65
	                                      Composite parent) {
35
66
36
		super(parentPane, subjectHolder, parent);
67
		super(parentPane, subjectHolder, parent);
37
	}
68
	}
38
69
70
	protected WritablePropertyValueModel<String> buildNameTextHolder() {
71
		return new PropertyAspectAdapter<NamedQuery2_0, String>(getSubjectHolder(), Query.NAME_PROPERTY) {
72
			@Override
73
			protected String buildValue_() {
74
				return this.subject.getName();
75
			}
76
77
			@Override
78
			protected void setValue_(String value) {
79
				if (value.length() == 0) {
80
					value = null;
81
				}
82
				this.subject.setName(value);
83
			}
84
		};
85
	}
86
87
	protected WritablePropertyValueModel<String> buildQueryHolder() {
88
		return new PropertyAspectAdapter<NamedQuery2_0, String>(getSubjectHolder(), Query.QUERY_PROPERTY) {
89
			@Override
90
			protected String buildValue_() {
91
				return this.subject.getQuery();
92
			}
93
94
			@Override
95
			protected void setValue_(String value) {
96
				this.subject.setQuery(value);
97
			}
98
		};
99
	}
100
101
	/**
102
	 * {@inheritDoc}
103
	 */
39
	@Override
104
	@Override
40
	protected void initializeLayout(Composite container) {
105
	protected void initializeLayout(Composite container) {
41
		
106
42
		this.addLabeledText(
107
		this.addLabeledText(
43
			container, 
108
			container,
44
			JptUiDetailsMessages.NamedQueryComposite_nameTextLabel, 
109
			JptUiDetailsMessages.NamedQueryComposite_nameTextLabel,
45
			this.buildNameTextHolder());
110
			this.buildNameTextHolder());
46
111
47
		// Query text area
112
		// Query text area
48
		this.addLabeledMultiLineText(
113
		StyledText text = this.addLabeledMultiLineStyledText(
49
			container,
114
			container,
50
			JptUiDetailsMessages.NamedQueryPropertyComposite_query,
115
			JptUiDetailsMessages.NamedQueryPropertyComposite_query,
51
			this.buildQueryHolder(),
116
			this.buildQueryHolder(),
Lines 53-60 Link Here
53
			null
118
			null
54
		);
119
		);
55
120
121
		new JpaJpqlContentProposalProvider(getSubjectHolder(), text);
122
123
		// Lock Mode type
56
		new LockModeComposite(this, container);
124
		new LockModeComposite(this, container);
57
			
125
58
		// Query Hints pane
126
		// Query Hints pane
59
		container = this.addTitledGroup(
127
		container = this.addTitledGroup(
60
			this.addSubPane(container, 5),
128
			this.addSubPane(container, 5),
Lines 63-67 Link Here
63
131
64
		new QueryHintsComposite(this, container);
132
		new QueryHintsComposite(this, container);
65
	}
133
	}
66
	
134
}
67
}
(-)src/org/eclipse/jpt/jpa/ui/internal/jpa2/details/Queries2_0Composite.java (-4 / +2 lines)
Lines 15-21 Link Here
15
import org.eclipse.jpt.jpa.core.context.Query;
15
import org.eclipse.jpt.jpa.core.context.Query;
16
import org.eclipse.jpt.jpa.core.context.QueryContainer;
16
import org.eclipse.jpt.jpa.core.context.QueryContainer;
17
import org.eclipse.jpt.jpa.core.jpa2.context.NamedQuery2_0;
17
import org.eclipse.jpt.jpa.core.jpa2.context.NamedQuery2_0;
18
import org.eclipse.jpt.jpa.ui.internal.details.NamedQueryPropertyComposite;
19
import org.eclipse.jpt.jpa.ui.internal.details.QueriesComposite;
18
import org.eclipse.jpt.jpa.ui.internal.details.QueriesComposite;
20
import org.eclipse.swt.widgets.Composite;
19
import org.eclipse.swt.widgets.Composite;
21
import org.eclipse.ui.part.PageBook;
20
import org.eclipse.ui.part.PageBook;
Lines 34-42 Link Here
34
		super(parentPane, subjectHolder, parent);
33
		super(parentPane, subjectHolder, parent);
35
	}
34
	}
36
	
35
	
37
	
38
	@Override
36
	@Override
39
	protected NamedQueryPropertyComposite<NamedQuery2_0> buildNamedQueryPropertyComposite(PageBook pageBook) {
37
	protected Pane<NamedQuery2_0> buildNamedQueryPropertyComposite(PageBook pageBook) {
40
		return new NamedQueryProperty2_0Composite(
38
		return new NamedQueryProperty2_0Composite(
41
			this,
39
			this,
42
			this.buildNamedQuery2_0Holder(),
40
			this.buildNamedQuery2_0Holder(),
Lines 51-54 Link Here
51
			}
49
			}
52
		};
50
		};
53
	}
51
	}
54
}
52
}
(-)src/org/eclipse/jpt/jpa/ui/internal/jpql/JpaJpqlContentProposalProvider.java (+757 lines)
Added Link Here
1
/*******************************************************************************
2
 * Copyright (c) 2011 Oracle. All rights reserved.
3
 * This program and the accompanying materials are made available under the
4
 * terms of the Eclipse Public License v1.0 and Eclipse Distribution License v. 1.0
5
 * which accompanies this distribution.
6
 * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
7
 * and the Eclipse Distribution License is available at
8
 * http://www.eclipse.org/org/documents/edl-v10.php.
9
 *
10
 * Contributors:
11
 *     Oracle - initial API and implementation
12
 *
13
 ******************************************************************************/
14
package org.eclipse.jpt.jpa.ui.internal.jpql;
15
16
import java.text.MessageFormat;
17
import java.util.ArrayList;
18
import java.util.Arrays;
19
import java.util.Collections;
20
import java.util.Comparator;
21
import java.util.List;
22
import java.util.Locale;
23
import java.util.ResourceBundle;
24
import org.eclipse.core.commands.AbstractHandler;
25
import org.eclipse.core.commands.ExecutionEvent;
26
import org.eclipse.core.commands.ExecutionException;
27
import org.eclipse.core.commands.IHandler;
28
import org.eclipse.core.commands.ParameterizedCommand;
29
import org.eclipse.core.expressions.EvaluationResult;
30
import org.eclipse.core.expressions.Expression;
31
import org.eclipse.core.expressions.ExpressionInfo;
32
import org.eclipse.core.expressions.IEvaluationContext;
33
import org.eclipse.jface.bindings.Binding;
34
import org.eclipse.jface.bindings.Trigger;
35
import org.eclipse.jface.bindings.keys.KeyStroke;
36
import org.eclipse.jface.bindings.keys.SWTKeySupport;
37
import org.eclipse.jface.fieldassist.ControlDecoration;
38
import org.eclipse.jface.fieldassist.FieldDecorationRegistry;
39
import org.eclipse.jface.text.DefaultTextHover;
40
import org.eclipse.jface.text.Document;
41
import org.eclipse.jface.text.IDocument;
42
import org.eclipse.jface.text.ITextHover;
43
import org.eclipse.jface.text.ITextViewer;
44
import org.eclipse.jface.text.Position;
45
import org.eclipse.jface.text.contentassist.ContentAssistant;
46
import org.eclipse.jface.text.contentassist.ICompletionProposal;
47
import org.eclipse.jface.text.contentassist.IContentAssistProcessor;
48
import org.eclipse.jface.text.contentassist.IContentAssistant;
49
import org.eclipse.jface.text.contentassist.IContextInformation;
50
import org.eclipse.jface.text.contentassist.IContextInformationValidator;
51
import org.eclipse.jface.text.source.Annotation;
52
import org.eclipse.jface.text.source.AnnotationModel;
53
import org.eclipse.jface.text.source.DefaultAnnotationHover;
54
import org.eclipse.jface.text.source.IAnnotationHover;
55
import org.eclipse.jface.text.source.ISourceViewer;
56
import org.eclipse.jface.text.source.SourceViewer;
57
import org.eclipse.jface.text.source.SourceViewerConfiguration;
58
import org.eclipse.jpt.common.utility.model.event.PropertyChangeEvent;
59
import org.eclipse.jpt.common.utility.model.listener.PropertyChangeListener;
60
import org.eclipse.jpt.common.utility.model.value.PropertyValueModel;
61
import org.eclipse.jpt.jpa.core.JptJpaCorePlugin;
62
import org.eclipse.jpt.jpa.core.context.NamedQuery;
63
import org.eclipse.jpt.jpa.core.internal.jpql.JpaJpqlQueryHelper;
64
import org.eclipse.jpt.jpa.ui.internal.JptUiMessages;
65
import org.eclipse.osgi.util.NLS;
66
import org.eclipse.persistence.jpa.jpql.JPQLQueryProblem;
67
import org.eclipse.swt.SWT;
68
import org.eclipse.swt.custom.StyleRange;
69
import org.eclipse.swt.custom.StyledText;
70
import org.eclipse.swt.events.DisposeEvent;
71
import org.eclipse.swt.events.DisposeListener;
72
import org.eclipse.swt.events.FocusEvent;
73
import org.eclipse.swt.events.FocusListener;
74
import org.eclipse.swt.events.ModifyEvent;
75
import org.eclipse.swt.events.ModifyListener;
76
import org.eclipse.swt.graphics.Color;
77
import org.eclipse.swt.graphics.Image;
78
import org.eclipse.swt.widgets.Composite;
79
import org.eclipse.ui.ISources;
80
import org.eclipse.ui.IWorkbench;
81
import org.eclipse.ui.PlatformUI;
82
import org.eclipse.ui.actions.ActionFactory;
83
import org.eclipse.ui.handlers.IHandlerActivation;
84
import org.eclipse.ui.handlers.IHandlerService;
85
import org.eclipse.ui.internal.editors.text.EditorsPlugin;
86
import org.eclipse.ui.keys.IBindingService;
87
import org.eclipse.ui.swt.IFocusService;
88
import org.eclipse.ui.texteditor.AnnotationPreference;
89
import org.eclipse.ui.texteditor.ITextEditorActionDefinitionIds;
90
91
/**
92
 * This provider installs content assist support on a {@link StyledText} widget in order to give
93
 * choices at any given position within a JPQL query.
94
 * <p>
95
 * NOTE 1: Add a timer before validating.
96
 * <p>
97
 * NOTE 2. I think it's possible to install error highlight into the SourceViewer rather than doing
98
 *         it manually.
99
 * <p>
100
 * NOTE 3. Add syntax highlight for the JPQL identifiers.
101
 *
102
 * @version 3.0
103
 * @since 3.0
104
 * @author Pascal Filion
105
 */
106
@SuppressWarnings({"nls", "restriction"})
107
public final class JpaJpqlContentProposalProvider extends JpqlCompletionProposalComputer<ICompletionProposal> {
108
109
	/**
110
	 * This model holds onto the {@link Annotation annotations} that have been created for each
111
	 * {@link JPQLQueryProblem}
112
	 */
113
	private AnnotationModel annotationModel;
114
115
	/**
116
	 * The {@link Color} of the highlight.
117
	 */
118
	private Color errorColor;
119
120
	/**
121
	 * This handler will trigger an event that will be used to notify the {@link SourceViewer} to
122
	 * invoke the content assist.
123
	 */
124
	private IHandlerActivation handlerActivation;
125
126
	/**
127
	 * The position within the JPQL query.
128
	 */
129
	private int position;
130
131
	/**
132
	 * The running instance of the helper, which will be cached during the editing process for
133
	 * optimization purposes.
134
	 */
135
	private JpaJpqlQueryHelper queryHelper;
136
137
	/**
138
	 * The holder of the named query.
139
	 */
140
	private PropertyValueModel<? extends NamedQuery> queryHolder;
141
142
	/**
143
	 * This manager is responsible to only keep the union of the ranges that were created by
144
	 * validating the JPQL query.
145
	 */
146
	private RangeManager rangeManager;
147
148
	/**
149
	 * The {@link ResourceBundle} that contains the JPQL problems.
150
	 */
151
	private ResourceBundle resourceBundle;
152
153
	/**
154
	 * This viewer is used to install various functionality over the {@link StyledText}.
155
	 */
156
	private SourceViewer sourceViewer;
157
158
	/**
159
	 * The configuration object used to configure the {@link SourceViewer}.
160
	 */
161
	private JpqlSourceViewerConfiguration sourceViewerConfiguration;
162
163
	/**
164
	 * The widget used to display the JPQL query.
165
	 */
166
	private StyledText styledText;
167
168
	/**
169
	 * The unique identifier - appended by hashCode() - used to register the widget with the focus
170
	 * handler.
171
	 */
172
	private static final String CONTROL_ID = "jpql.focus.control";
173
174
	/**
175
	 * The unique identifier used to mark an {@link Annotation} as a JPQL problem.
176
	 */
177
	private static final String ERROR_TYPE = "jpql.error";
178
179
	/**
180
	 * Creates a new <code>JpaJpqlContentProposalProvider</code>.
181
	 *
182
	 * @param queryHolder The holder of the named query
183
	 * @param styledText The {@link StyledText} widget that shows the JPQL query
184
	 */
185
	public JpaJpqlContentProposalProvider(PropertyValueModel<? extends NamedQuery> queryHolder,
186
	                                      StyledText styledText) {
187
188
		super();
189
		initialize(queryHolder, styledText);
190
	}
191
192
	private void activateHandler() {
193
194
		IWorkbench workbench = PlatformUI.getWorkbench();
195
		IFocusService focusService = (IFocusService) workbench.getService(IFocusService.class);
196
		IHandlerService handlerService = (IHandlerService) workbench.getService(IHandlerService.class);
197
198
		if ((focusService != null) && (handlerService != null)) {
199
200
			focusService.addFocusTracker(styledText, CONTROL_ID + hashCode());
201
202
			Expression expression = buildExpression();
203
			IHandler handler = buildHandler();
204
205
			handlerActivation = handlerService.activateHandler(
206
				ITextEditorActionDefinitionIds.CONTENT_ASSIST_PROPOSALS,
207
				handler,
208
				expression
209
			);
210
211
			handlerActivation = handlerService.activateHandler(
212
				ActionFactory.UNDO.getCommandId(),
213
				handler,
214
				expression
215
			);
216
217
			handlerActivation = handlerService.activateHandler(
218
				ActionFactory.REDO.getCommandId(),
219
				handler,
220
				expression
221
			);
222
		}
223
	}
224
225
	private DisposeListener buildDisposeListener() {
226
		return new DisposeListener() {
227
			public void widgetDisposed(DisposeEvent e) {
228
				dispose();
229
			}
230
		};
231
	}
232
233
	private Expression buildExpression() {
234
		return new Expression() {
235
			@Override
236
			public void collectExpressionInfo(ExpressionInfo info) {
237
				info.addVariableNameAccess(ISources.ACTIVE_FOCUS_CONTROL_NAME);
238
			}
239
			@Override
240
			public EvaluationResult evaluate(IEvaluationContext context) {
241
				Object variable = context.getVariable(ISources.ACTIVE_FOCUS_CONTROL_NAME);
242
				return (variable == styledText) ? EvaluationResult.TRUE : EvaluationResult.FALSE;
243
			}
244
		};
245
	}
246
247
	private FocusListener buildFocusListener() {
248
		return new FocusListener() {
249
			public void focusGained(FocusEvent e) {
250
			}
251
			public void focusLost(FocusEvent e) {
252
				// Only dispose the query helper if the content proposal popup doesn't grab the focus
253
				if (!sourceViewerConfiguration.contentAssistant.hasProposalPopupFocus()) {
254
					disposeQueryHelper();
255
				}
256
			}
257
		};
258
	}
259
260
	private IHandler buildHandler() {
261
		return new AbstractHandler() {
262
			public Object execute(ExecutionEvent event) throws ExecutionException {
263
				String commandId = event.getCommand().getId();
264
265
				// Content Assist
266
				if (ITextEditorActionDefinitionIds.CONTENT_ASSIST_PROPOSALS.equals(commandId)) {
267
					sourceViewer.doOperation(ISourceViewer.CONTENTASSIST_PROPOSALS);
268
				}
269
				// Undo
270
				else if (ActionFactory.UNDO.getCommandId().equals(commandId)) {
271
					if (sourceViewer.getUndoManager().undoable()) {
272
						sourceViewer.getUndoManager().undo();
273
					}
274
				}
275
				// Redo
276
				else if (ActionFactory.REDO.getCommandId().equals(commandId)) {
277
					if (sourceViewer.getUndoManager().redoable()) {
278
						sourceViewer.getUndoManager().redo();
279
					}
280
				}
281
282
				return null;
283
			}
284
		};
285
	}
286
287
	/**
288
	 * {@inheritDoc}
289
	 */
290
	@Override
291
	JpaJpqlQueryHelper buildJPQLQueryHelper() {
292
		return queryHelper;
293
	}
294
295
	private String buildMessage(JPQLQueryProblem problem) {
296
		String message = resourceBundle().getString(problem.getMessageKey());
297
		message = MessageFormat.format(message, (Object[]) problem.getMessageArguments());
298
		return message;
299
	}
300
301
	private ModifyListener buildModifyListener() {
302
		return new ModifyListener() {
303
			public void modifyText(ModifyEvent e) {
304
				validate();
305
			}
306
		};
307
	}
308
309
	private Comparator<JPQLQueryProblem> buildProblemComparator() {
310
		return new Comparator<JPQLQueryProblem>() {
311
			public int compare(JPQLQueryProblem problem1, JPQLQueryProblem problem2) {
312
				int result = problem1.getStartPosition() - problem2.getStartPosition();
313
				if (result == 0) {
314
					result = problem1.getEndPosition() - problem2.getEndPosition();
315
				}
316
				return result;
317
			}
318
		};
319
	}
320
321
	/**
322
	 * {@inheritDoc}
323
	 */
324
	@Override
325
	ICompletionProposal buildProposal(String proposal,
326
	                                  String displayString,
327
	                                  String additionalInfo,
328
	                                  Image image,
329
	                                  int cursorOffset) {
330
331
		return new JpqlCompletionProposal(
332
			contentAssistProposals,
333
			proposal,
334
			displayString,
335
			additionalInfo,
336
			image,
337
			namedQuery,
338
			actualQuery,
339
			jpqlQuery,
340
			offset,
341
			position,
342
			cursorOffset,
343
			false
344
		);
345
	}
346
347
	private SourceViewer buildSourceViewer() {
348
		return new SourceViewer(styledText.getParent(), null, styledText.getStyle()) {
349
			@Override
350
			protected StyledText createTextWidget(Composite parent, int styles) {
351
				return styledText;
352
			}
353
		};
354
	}
355
356
	private PropertyChangeListener buildSubjectChangeListener() {
357
		return new PropertyChangeListener() {
358
			public void propertyChanged(PropertyChangeEvent e) {
359
				subjectChanged(e);
360
			}
361
		};
362
	}
363
364
	private Image contentAssistImage() {
365
		FieldDecorationRegistry registry = FieldDecorationRegistry.getDefault();
366
		return registry.getFieldDecoration(FieldDecorationRegistry.DEC_CONTENT_PROPOSAL).getImage();
367
	}
368
369
	/**
370
	 * Makes sure the {@link Color} used to paint the underlying problem is disposed when the
371
	 * {@link StyledText} widget is disposed.
372
	 */
373
	private void dispose() {
374
375
		if (queryHelper != null) {
376
			disposeQueryHelper();
377
			queryHelper = null;
378
		}
379
380
		if (errorColor != null) {
381
			errorColor.dispose();
382
			errorColor = null;
383
		}
384
385
		IWorkbench workbench = PlatformUI.getWorkbench();
386
		IHandlerService handlerService = (IHandlerService) workbench.getService(IHandlerService.class);
387
		handlerService.deactivateHandler(handlerActivation);
388
	}
389
390
	private void disposeQueryHelper() {
391
		queryHelper.dispose();
392
		queryHelper.disposeProvider();
393
	}
394
395
	private Color errorColor() {
396
		// TODO: Support the color changing
397
		if (errorColor == null) {
398
			// TODO: Is there a better way to do this?
399
			for (Object object : EditorsPlugin.getDefault().getMarkerAnnotationPreferences().getAnnotationPreferences()) {
400
				AnnotationPreference preference = (AnnotationPreference) object;
401
				if ("org.eclipse.ui.workbench.texteditor.error".equals(preference.getAnnotationType())) {
402
					errorColor = new Color(styledText.getDisplay(), preference.getColorPreferenceValue());
403
					break;
404
				}
405
			}
406
			if (errorColor == null) {
407
				errorColor = new Color(styledText.getDisplay(), 255, 0, 0);
408
			}
409
		}
410
		return errorColor;
411
	}
412
413
	private KeyStroke findContentAssistTrigger() {
414
415
		IBindingService bindingService = (IBindingService) PlatformUI.getWorkbench().getService(IBindingService.class);
416
417
		// Dig through the list of available bindings to find the one for content assist
418
		for (Binding binding : bindingService.getBindings()) {
419
			if (isContentAssistBinding(binding)) {
420
				Trigger[] triggers = binding.getTriggerSequence().getTriggers();
421
				if ((triggers != null) && (triggers.length > 0)) {
422
					return (KeyStroke) triggers[0];
423
				}
424
			}
425
		}
426
427
		// The default trigger was not found, use the default
428
		return KeyStroke.getInstance(SWT.CTRL, ' ');
429
	}
430
431
	private void initialize(PropertyValueModel<? extends NamedQuery> queryHolder,
432
	                        StyledText styledText) {
433
434
		this.styledText      = styledText;
435
		this.queryHolder     = queryHolder;
436
		this.queryHelper     = new JpaJpqlQueryHelper();
437
		this.rangeManager    = new RangeManager();
438
		this.annotationModel = new AnnotationModel();
439
		this.styledText.addModifyListener (buildModifyListener());
440
		this.styledText.addDisposeListener(buildDisposeListener());
441
		this.styledText.addFocusListener(buildFocusListener());
442
443
		// Make sure the user can't delete the entire query when doing undo
444
		queryHolder.addPropertyChangeListener(PropertyValueModel.VALUE, buildSubjectChangeListener());
445
446
		// Add the content assist image at the top left corner
447
		installControlDecoration();
448
449
		// Create the SourceViewer, which is responsible for everything: content assist, tool tip
450
		// hovering over the annotation (problems), etc
451
		sourceViewer = buildSourceViewer();
452
		sourceViewerConfiguration = new JpqlSourceViewerConfiguration();
453
		sourceViewer.configure(sourceViewerConfiguration);
454
		sourceViewer.setDocument(new Document(), annotationModel);
455
456
		// Bind the content assist key trigger with the handler service
457
		activateHandler();
458
459
		// Install a custom context menu to the widget
460
		TextTransferHandler.installContextMenu(styledText, sourceViewer.getUndoManager());
461
	}
462
463
	private void installControlDecoration() {
464
465
		// Retrieve the content assist trigger
466
		KeyStroke contentAssistTrigger = findContentAssistTrigger();
467
		String key = SWTKeySupport.getKeyFormatterForPlatform().format(contentAssistTrigger);
468
469
		// Add the context assist icon at the top left corner of the StyledText
470
		ControlDecoration decoration = new ControlDecoration(styledText, SWT.LEFT | SWT.TOP);
471
		decoration.setDescriptionText(NLS.bind(JptUiMessages.JpqlContentProposalProvider_Description, key));
472
		decoration.setImage(contentAssistImage());
473
		decoration.setShowOnlyOnFocus(true);
474
	}
475
476
	private boolean isContentAssistBinding(Binding binding) {
477
478
		ParameterizedCommand command = binding.getParameterizedCommand();
479
480
		return command != null &&
481
		       command.getCommand() != null &&
482
		       command.getCommand().getId().equals(ITextEditorActionDefinitionIds.CONTENT_ASSIST_PROPOSALS);
483
	}
484
485
	private NamedQuery query() {
486
		return queryHolder.getValue();
487
	}
488
489
	private ResourceBundle resourceBundle() {
490
		if (resourceBundle == null) {
491
			resourceBundle = ResourceBundle.getBundle(
492
				"jpa_jpql_validation",
493
				Locale.getDefault(),
494
				JptJpaCorePlugin.class.getClassLoader()
495
			);
496
		}
497
		return resourceBundle;
498
	}
499
500
	private List<JPQLQueryProblem> sortProblems(List<JPQLQueryProblem> problems) {
501
		Collections.sort(problems, buildProblemComparator());
502
		return problems;
503
	}
504
505
	private void subjectChanged(PropertyChangeEvent e) {
506
507
		// Disposes of the internal data since the subject changed
508
		disposeQueryHelper();
509
510
		// Prevent undoing the actual query that was set
511
		if (e.getNewValue() != null) {
512
			sourceViewer.getUndoManager().reset();
513
		}
514
	}
515
516
	/**
517
	 * Validates the given JPQL query and add highlights where problems have been found.
518
	 */
519
	private void validate() {
520
521
		NamedQuery query = query();
522
523
		if ((query != null) && !styledText.isDisposed()) {
524
525
			String jpqlQuery = styledText.getText();
526
			rangeManager.clear();
527
528
			try {
529
				queryHelper.setQuery(query, jpqlQuery);
530
				String parsedJpqlQuery = queryHelper.getParsedJPQLQuery();
531
532
				for (JPQLQueryProblem problem : sortProblems(queryHelper.validate())) {
533
534
					// Create the range
535
					int[] positions = queryHelper.buildPositions(problem, parsedJpqlQuery, jpqlQuery);
536
					rangeManager.addRange(positions);
537
538
					// Add the problem to the tool tip
539
					Annotation annotation = new Annotation(ERROR_TYPE, true, buildMessage(problem));
540
					annotationModel.addAnnotation(annotation, new Position(positions[0], positions[1] - positions[0]));
541
				}
542
			}
543
			finally {
544
				queryHelper.dispose();
545
			}
546
547
			// Update the widget
548
			styledText.setStyleRanges(rangeManager.buildStyleRanges());
549
		}
550
	}
551
552
	/**
553
	 * This processor is responsible to create the list of {@link ICompletionProposal proposals}
554
	 * based on the position of the cursor within the query.
555
	 */
556
	private class ContentAssistProcessor implements IContentAssistProcessor {
557
558
		/**
559
		 * {@inheritDoc}
560
		 */
561
		public ICompletionProposal[] computeCompletionProposals(ITextViewer viewer, int offset) {
562
563
			JpaJpqlContentProposalProvider.this.position = offset;
564
565
			String jpqlQuery = viewer.getDocument().get();
566
			List<ICompletionProposal> proposals = buildProposals(query(), jpqlQuery, 0, position);
567
			return proposals.toArray(new ICompletionProposal[proposals.size()]);
568
		}
569
570
		/**
571
		 * {@inheritDoc}
572
		 */
573
		public IContextInformation[] computeContextInformation(ITextViewer viewer, int offset) {
574
			return null;
575
		}
576
577
		/**
578
		 * {@inheritDoc}
579
		 */
580
		public char[] getCompletionProposalAutoActivationCharacters() {
581
			return null;
582
		}
583
584
		/**
585
		 * {@inheritDoc}
586
		 */
587
		public char[] getContextInformationAutoActivationCharacters() {
588
			return null;
589
		}
590
591
		/**
592
		 * {@inheritDoc}
593
		 */
594
		public IContextInformationValidator getContextInformationValidator() {
595
			return null;
596
		}
597
598
		/**
599
		 * {@inheritDoc}
600
		 */
601
		public String getErrorMessage() {
602
			return null;
603
		}
604
	}
605
606
	private class JpqlSourceViewerConfiguration extends SourceViewerConfiguration {
607
608
		ContentAssistant contentAssistant;
609
610
		/**
611
		 * {@inheritDoc}
612
		 */
613
		@Override
614
		public IAnnotationHover getAnnotationHover(ISourceViewer sourceViewer) {
615
			return new DefaultAnnotationHover();
616
		}
617
618
		/**
619
		 * {@inheritDoc}
620
		 */
621
		@Override
622
		public IContentAssistant getContentAssistant(ISourceViewer sourceViewer) {
623
			contentAssistant = new ContentAssistant();
624
			contentAssistant.setContentAssistProcessor(new ContentAssistProcessor(), IDocument.DEFAULT_CONTENT_TYPE);
625
			return contentAssistant;
626
		}
627
628
		/**
629
		 * {@inheritDoc}
630
		 */
631
		@Override
632
		public ITextHover getTextHover(ISourceViewer sourceViewer, String contentType) {
633
			return new DefaultTextHover(sourceViewer);
634
		}
635
636
		/**
637
		 * {@inheritDoc}
638
		 */
639
		@Override
640
		public ITextHover getTextHover(ISourceViewer sourceViewer, String contentType, int stateMask) {
641
			return new DefaultTextHover(sourceViewer);
642
		}
643
	}
644
645
	/**
646
	 * This manager is responsible to only keep the union of the ranges that were created by
647
	 * validating the JPQL query.
648
	 */
649
	private class RangeManager {
650
651
		/**
652
		 * The {@link StyleRange ranges} that will will be used to paint the highlight under the JPQL
653
		 * query where the query is grammatically and/or semantically invalid
654
		 */
655
		List<int[]> ranges;
656
657
		/**
658
		 * Creates a new <code>RangeManager</code>.
659
		 */
660
		RangeManager() {
661
			super();
662
			ranges = new ArrayList<int[]>();
663
		}
664
665
		/**
666
		 * Adds the given range (start and end positions) to this manager and if an existing range is
667
		 * within the given one, then they will be merged to make the union of the two ranges.
668
		 *
669
		 * @param range The start and end position of the problem
670
		 */
671
		void addRange(int[] range) {
672
			ranges.add(range);
673
			if (ranges.size() > 1) {
674
				mergeRanges();
675
			}
676
		}
677
678
		private Comparator<StyleRange> buildComparator() {
679
			return new Comparator<StyleRange>() {
680
				public int compare(StyleRange range1, StyleRange range2) {
681
					return range1.start - range2.start;
682
				}
683
			};
684
		}
685
686
		/**
687
		 * Creates the list of {@link StyleRange ranges} that will will be used to paint the highlight
688
		 * under the JPQL query where the query is grammatically and/or semantically invalid.
689
		 *
690
		 * @return The list of {@link StyleRange ranges}
691
		 */
692
		StyleRange[] buildStyleRanges() {
693
694
			StyleRange[] styleRanges = new StyleRange[ranges.size()];
695
696
			for (int index = ranges.size(); --index >= 0; ) {
697
				int[] positions = ranges.get(index);
698
699
				StyleRange styleRange = new StyleRange();
700
				styleRange.start          = positions[0];
701
				styleRange.length         = positions[1] - positions[0];
702
				styleRange.underline      = true;
703
				styleRange.underlineColor = errorColor();
704
				styleRange.underlineStyle = SWT.UNDERLINE_ERROR;
705
				styleRanges[index]        = styleRange;
706
			}
707
708
			Arrays.sort(styleRanges, buildComparator());
709
			return styleRanges;
710
		}
711
712
		/**
713
		 * Clears the registered ranges.
714
		 */
715
		void clear() {
716
			ranges.clear();
717
		}
718
719
		private void mergeRanges() {
720
721
			for (int firstIndex = 0, count = ranges.size(); firstIndex < count; firstIndex++) {
722
				int[] firstRange = ranges.get(firstIndex);
723
724
				for (int secondIndex = firstIndex + 1; secondIndex < count; secondIndex++) {
725
					int[] secondRange = ranges.get(secondIndex);
726
					boolean merged = false;
727
728
					// range  └───┘
729
					// to add   └──────┘
730
					// become └────────┘
731
					if (firstRange[0] <= secondRange[0] &&
732
					    firstRange[1] >= secondRange[0]) {
733
734
						firstRange[1] = Math.max(firstRange[1], secondRange[1]);
735
						merged = true;
736
					}
737
					// range       └───┘
738
					// to add └──────┘
739
					// become └────────┘
740
					else if (firstRange[1] >= secondRange[1] &&
741
					         firstRange[0] <= secondRange[1]) {
742
743
						firstRange[0] = Math.min(firstRange[0], secondRange[0]);
744
						merged = true;
745
					}
746
747
					if (merged) {
748
						merged = false;
749
						ranges.remove(secondIndex);
750
						secondIndex--;
751
						count--;
752
					}
753
				}
754
			}
755
		}
756
	}
757
}
(-)src/org/eclipse/jpt/jpa/ui/internal/jpql/JpaJpqlJavaCompletionProposalComputer.java (+320 lines)
Added Link Here
1
/*******************************************************************************
2
 * Copyright (c) 2011 Oracle. All rights reserved.
3
 * This program and the accompanying materials are made available under the
4
 * terms of the Eclipse Public License v1.0 and Eclipse Distribution License v. 1.0
5
 * which accompanies this distribution.
6
 * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
7
 * and the Eclipse Distribution License is available at
8
 * http://www.eclipse.org/org/documents/edl-v10.php.
9
 *
10
 * Contributors:
11
 *     Oracle - initial API and implementation
12
 *
13
 ******************************************************************************/
14
package org.eclipse.jpt.jpa.ui.internal.jpql;
15
16
import java.util.Collections;
17
import java.util.Iterator;
18
import java.util.List;
19
import org.eclipse.core.resources.IFile;
20
import org.eclipse.core.runtime.IProgressMonitor;
21
import org.eclipse.core.runtime.IStatus;
22
import org.eclipse.core.runtime.Status;
23
import org.eclipse.jdt.core.CompletionContext;
24
import org.eclipse.jdt.core.ICompilationUnit;
25
import org.eclipse.jdt.core.JavaModelException;
26
import org.eclipse.jdt.core.dom.ASTNode;
27
import org.eclipse.jdt.core.dom.AbstractTypeDeclaration;
28
import org.eclipse.jdt.core.dom.Annotation;
29
import org.eclipse.jdt.core.dom.ArrayInitializer;
30
import org.eclipse.jdt.core.dom.CompilationUnit;
31
import org.eclipse.jdt.core.dom.IExtendedModifier;
32
import org.eclipse.jdt.core.dom.MemberValuePair;
33
import org.eclipse.jdt.core.dom.NormalAnnotation;
34
import org.eclipse.jdt.core.dom.SingleMemberAnnotation;
35
import org.eclipse.jdt.core.dom.StringLiteral;
36
import org.eclipse.jdt.ui.text.java.ContentAssistInvocationContext;
37
import org.eclipse.jdt.ui.text.java.IJavaCompletionProposalComputer;
38
import org.eclipse.jdt.ui.text.java.JavaContentAssistInvocationContext;
39
import org.eclipse.jface.text.contentassist.ICompletionProposal;
40
import org.eclipse.jface.text.contentassist.IContextInformation;
41
import org.eclipse.jpt.common.core.internal.utility.jdt.ASTTools;
42
import org.eclipse.jpt.common.core.utility.TextRange;
43
import org.eclipse.jpt.common.utility.internal.StringTools;
44
import org.eclipse.jpt.jpa.core.JpaFile;
45
import org.eclipse.jpt.jpa.core.JpaStructureNode;
46
import org.eclipse.jpt.jpa.core.JptJpaCorePlugin;
47
import org.eclipse.jpt.jpa.core.context.NamedQuery;
48
import org.eclipse.jpt.jpa.core.context.java.JavaEntity;
49
import org.eclipse.jpt.jpa.core.context.java.JavaNamedQuery;
50
import org.eclipse.jpt.jpa.core.context.java.JavaPersistentType;
51
import org.eclipse.jpt.jpa.core.context.java.JavaTypeMapping;
52
import org.eclipse.jpt.jpa.ui.JptJpaUiPlugin;
53
import org.eclipse.jpt.jpa.ui.internal.JptUiMessages;
54
import org.eclipse.persistence.jpa.jpql.ExpressionTools;
55
import org.eclipse.swt.graphics.Image;
56
57
/**
58
 * This computer adds content assist support when it is invoked inside the query element of {@link
59
 * javax.persistence.NamedQuery &#64;NamedQuery}.
60
 *
61
 * @version 3.0
62
 * @since 3.0
63
 * @author Pascal Filion
64
 */
65
@SuppressWarnings("restriction")
66
public final class JpaJpqlJavaCompletionProposalComputer extends JpqlCompletionProposalComputer<ICompletionProposal>
67
                                                         implements IJavaCompletionProposalComputer {
68
69
	/**
70
	 * Creates a new <code>JpaJpqlJavaCompletionProposalComputer</code>.
71
	 */
72
	public JpaJpqlJavaCompletionProposalComputer() {
73
		super();
74
	}
75
76
	/**
77
	 * {@inheritDoc}
78
	 */
79
	@Override
80
	ICompletionProposal buildProposal(String proposal,
81
	                                  String displayString,
82
	                                  String additionalInfo,
83
	                                  Image image,
84
	                                  int cursorOffset) {
85
86
		return new JpqlCompletionProposal(
87
			contentAssistProposals,
88
			proposal,
89
			displayString,
90
			additionalInfo,
91
			image,
92
			namedQuery,
93
			actualQuery,
94
			jpqlQuery,
95
			offset + 1, // +1 is to skip the opening "
96
			position,
97
			cursorOffset,
98
			true
99
		);
100
	}
101
102
	/**
103
	 * {@inheritDoc}
104
	 */
105
	public List<ICompletionProposal> computeCompletionProposals(ContentAssistInvocationContext context,
106
	                                                            IProgressMonitor monitor) {
107
108
		if (context instanceof JavaContentAssistInvocationContext) {
109
			monitor.beginTask(null, 100);
110
			try {
111
				return computeCompletionProposals((JavaContentAssistInvocationContext) context, monitor);
112
			}
113
			catch (Exception e) {
114
				Status status = new Status(IStatus.ERROR, JptJpaUiPlugin.PLUGIN_ID, JptUiMessages.JpaJpqlJavaCompletionProposalComputer_Error, e);
115
				JptJpaCorePlugin.log(status);
116
			}
117
			finally {
118
				monitor.done();
119
			}
120
		}
121
122
		return Collections.emptyList();
123
	}
124
125
	private List<ICompletionProposal> computeCompletionProposals(JavaContentAssistInvocationContext context,
126
	                                                             IProgressMonitor monitor) throws Exception {
127
128
		CompletionContext completionContext = context.getCoreContext();
129
130
		// The token "start" is the offset of the token's first character within the document.
131
		// A token start of -1 can means:
132
		// - It is inside the string representation of a unicode character, \\u0|0E9 where | is the
133
		//   cursor, then -1 is returned;
134
		// - The string is not valid (it has some invalid characters)
135
		int tokenStart = completionContext.getTokenStart();
136
		if (tokenStart == -1) return Collections.emptyList();
137
138
		int[] position = { completionContext.getOffset() - tokenStart - 1 };
139
		if (position[0] < 0) return Collections.emptyList();
140
141
		ICompilationUnit compilationUnit = context.getCompilationUnit();
142
		if (compilationUnit == null) return Collections.emptyList();
143
		CompilationUnit astRoot = ASTTools.buildASTRoot(compilationUnit);
144
145
		IFile file = getCorrespondingResource(compilationUnit);
146
		if (file == null) return Collections.emptyList();
147
148
		JpaFile jpaFile = JptJpaCorePlugin.getJpaFile(file);
149
		if (jpaFile == null) return Collections.emptyList();
150
151
		monitor.worked(80);
152
		checkCanceled(monitor);
153
154
		// Retrieve the JPA's model object
155
		NamedQuery namedQuery = namedQuery(astRoot, jpaFile, tokenStart);
156
		if (namedQuery == null) return Collections.emptyList();
157
158
		// Retrieve the actual value of the element "query" since the content assist can be
159
		// invoked before the model received the new content
160
		String jpqlQuery = jpqlQuery(astRoot, tokenStart, completionContext.getTokenEnd(), position);
161
162
		// Now create the proposals
163
		return buildProposals(namedQuery, jpqlQuery, tokenStart, position[0]);
164
	}
165
166
	/**
167
	 * {@inheritDoc}
168
	 */
169
	public List<IContextInformation> computeContextInformation(ContentAssistInvocationContext context,
170
	                                                           IProgressMonitor monitor) {
171
172
		return Collections.emptyList();
173
	}
174
175
	private NamedQuery findNamedQuery(JpaStructureNode structureNode,
176
	                                  CompilationUnit astRoot,
177
	                                  int tokenStart) {
178
179
		if (structureNode instanceof JavaPersistentType) {
180
			JavaPersistentType persistentType = (JavaPersistentType) structureNode;
181
			JavaTypeMapping typeMapping = persistentType.getMapping();
182
183
			if (typeMapping instanceof JavaEntity) {
184
				JavaEntity entity = (JavaEntity) typeMapping;
185
186
				for (Iterator<JavaNamedQuery> queries = entity.getQueryContainer().namedQueries(); queries.hasNext(); ) {
187
					JavaNamedQuery namedQuery = queries.next();
188
					TextRange textRange = namedQuery.getQueryAnnotation().getQueryTextRange(astRoot);
189
190
					if ((textRange != null) && textRange.includes(tokenStart)) {
191
						return namedQuery;
192
					}
193
				}
194
			}
195
		}
196
197
		return null;
198
	}
199
200
	private IFile getCorrespondingResource(ICompilationUnit compilationUnit) {
201
		try {
202
			return (IFile) compilationUnit.getCorrespondingResource();
203
		}
204
		catch (JavaModelException ex) {
205
			JptJpaCorePlugin.log(ex);
206
			return null;
207
		}
208
	}
209
210
	private boolean isInsideNode(ASTNode node, int tokenStart, int tokenEnd) {
211
		int startPosition = node.getStartPosition();
212
		return startPosition <= tokenStart &&
213
		       startPosition + node.getLength() >= tokenEnd;
214
	}
215
216
	private String jpqlQuery(CompilationUnit astRoot, int tokenStart, int tokenEnd, int[] position) {
217
218
		String jpqlQuery = retrieveQuery(astRoot, tokenStart, tokenEnd);
219
220
		if (jpqlQuery == null) {
221
			jpqlQuery = StringTools.EMPTY_STRING;
222
		}
223
		else if (StringTools.stringIsQuoted(jpqlQuery)) {
224
			jpqlQuery = jpqlQuery.substring(1, jpqlQuery.length() - 1);
225
		}
226
227
		return jpqlQuery;
228
	}
229
230
	/**
231
	 * {@inheritDoc}
232
	 */
233
	@Override
234
	String modifyJpqlQuery(String jpqlQuery, int[] position) {
235
		return ExpressionTools.unescape(jpqlQuery, position);
236
	}
237
238
	private NamedQuery namedQuery(CompilationUnit astRoot, JpaFile jpaFile, int tokenStart) {
239
240
		for (JpaStructureNode node : jpaFile.getRootStructureNodes()) {
241
			NamedQuery namedQuery = findNamedQuery(node, astRoot, tokenStart);
242
			if (namedQuery != null) {
243
				return namedQuery;
244
			}
245
		}
246
247
		return null;
248
	}
249
250
	/**
251
	 * This twisted code is meant to retrieve the real string value that is not escaped and to also
252
	 * retrieve the position within the non-escaped string. The query could have escape characters,
253
	 * such as \r, \n etc being written as \\r, \\n, the position is based on that escaped string,
254
	 * the conversion will convert them into \r and \r and adjust the position accordingly.
255
	 *
256
	 * @param astRoot The parsed tree representation of the Java source file
257
	 * @param tokenStart The beginning of the query expression of the {@link javax.persistence.NamedQuery
258
	 * &#64;NamedQuery}'s query member within the source file
259
	 * @param tokenEnd The end of the query member within the source file
260
	 * @param position The position of the cursor within the query expression
261
	 * @return The actual value retrieved from the query element
262
	 */
263
	@SuppressWarnings("unchecked")
264
	private String retrieveQuery(CompilationUnit astRoot, int tokenStart, int tokenEnd) {
265
266
		// Dig into the TypeDeclarations
267
		for (AbstractTypeDeclaration type : (List<AbstractTypeDeclaration>) astRoot.types()) {
268
269
			if (isInsideNode(type, tokenStart, tokenEnd)) {
270
271
				// Dig inside its modifiers and annotations
272
				for (IExtendedModifier modifier : (List<IExtendedModifier>) type.modifiers()) {
273
274
					if (!modifier.isAnnotation()) {
275
						continue;
276
					}
277
278
					Annotation annotation = (Annotation) modifier;
279
280
					// Dig inside the annotation
281
					if (isInsideNode(annotation, tokenStart, tokenEnd)) {
282
283
						// @NamedQueries({...})
284
						if (annotation.isSingleMemberAnnotation()) {
285
							SingleMemberAnnotation singleMemberAnnotation = (SingleMemberAnnotation) annotation;
286
							ArrayInitializer array = (ArrayInitializer) singleMemberAnnotation.getValue();
287
288
							for (org.eclipse.jdt.core.dom.Expression expression : (List<org.eclipse.jdt.core.dom.Expression>) array.expressions()) {
289
								if (isInsideNode(expression, tokenStart, tokenEnd)) {
290
									return retrieveQuery((NormalAnnotation) expression, tokenStart, tokenEnd);
291
								}
292
							}
293
						}
294
						// @NamedQuery()
295
						else if (annotation.isNormalAnnotation()) {
296
							return retrieveQuery((NormalAnnotation) annotation, tokenStart, tokenEnd);
297
						}
298
					}
299
				}
300
			}
301
		}
302
303
		return null;
304
	}
305
306
	@SuppressWarnings("unchecked")
307
	private String retrieveQuery(NormalAnnotation annotation, int tokenStart, int tokenEnd) {
308
309
		for (MemberValuePair pair : (List<MemberValuePair>) annotation.values()) {
310
			org.eclipse.jdt.core.dom.Expression expression = pair.getValue();
311
312
			if (isInsideNode(expression, tokenStart, tokenEnd)) {
313
				StringLiteral literal = (StringLiteral) pair.getValue();
314
				return literal.getEscapedValue();
315
			}
316
		}
317
318
		return null;
319
	}
320
}
(-)src/org/eclipse/jpt/jpa/ui/internal/jpql/JpaJpqlSseCompletionProposalComputer.java (+229 lines)
Added Link Here
1
/*******************************************************************************
2
 * Copyright (c) 2011 Oracle. All rights reserved.
3
 * This program and the accompanying materials are made available under the
4
 * terms of the Eclipse Public License v1.0 and Eclipse Distribution License v. 1.0
5
 * which accompanies this distribution.
6
 * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
7
 * and the Eclipse Distribution License is available at
8
 * http://www.eclipse.org/org/documents/edl-v10.php.
9
 *
10
 * Contributors:
11
 *     Oracle - initial API and implementation
12
 *
13
 ******************************************************************************/
14
package org.eclipse.jpt.jpa.ui.internal.jpql;
15
16
import java.util.Collections;
17
import java.util.Iterator;
18
import java.util.List;
19
import org.eclipse.core.filebuffers.FileBuffers;
20
import org.eclipse.core.filebuffers.ITextFileBuffer;
21
import org.eclipse.core.filebuffers.ITextFileBufferManager;
22
import org.eclipse.core.resources.IFile;
23
import org.eclipse.core.resources.IWorkspaceRoot;
24
import org.eclipse.core.resources.ResourcesPlugin;
25
import org.eclipse.core.runtime.IProgressMonitor;
26
import org.eclipse.core.runtime.IStatus;
27
import org.eclipse.core.runtime.Status;
28
import org.eclipse.jface.text.contentassist.ICompletionProposal;
29
import org.eclipse.jface.text.contentassist.IContextInformation;
30
import org.eclipse.jpt.common.core.utility.TextRange;
31
import org.eclipse.jpt.common.utility.internal.StringTools;
32
import org.eclipse.jpt.jpa.core.JpaFile;
33
import org.eclipse.jpt.jpa.core.JpaStructureNode;
34
import org.eclipse.jpt.jpa.core.JptJpaCorePlugin;
35
import org.eclipse.jpt.jpa.core.context.NamedQuery;
36
import org.eclipse.jpt.jpa.core.context.PersistentType;
37
import org.eclipse.jpt.jpa.core.context.QueryContainer;
38
import org.eclipse.jpt.jpa.core.context.TypeMapping;
39
import org.eclipse.jpt.jpa.core.context.orm.EntityMappings;
40
import org.eclipse.jpt.jpa.core.context.orm.OrmEntity;
41
import org.eclipse.jpt.jpa.core.context.orm.OrmNamedQuery;
42
import org.eclipse.jpt.jpa.ui.JptJpaUiPlugin;
43
import org.eclipse.jpt.jpa.ui.internal.JptUiMessages;
44
import org.eclipse.persistence.jpa.jpql.ExpressionTools;
45
import org.eclipse.swt.graphics.Image;
46
import org.eclipse.wst.sse.ui.contentassist.CompletionProposalInvocationContext;
47
import org.eclipse.wst.sse.ui.contentassist.ICompletionProposalComputer;
48
49
/**
50
 * This computer adds content assist support when it is invoked inside the &lt;query&gt; element
51
 * defined in a mapping file (ORM Configuration).
52
 *
53
 * @version 3.0
54
 * @since 3.0
55
 * @author Pascal Filion
56
 */
57
public final class JpaJpqlSseCompletionProposalComputer extends JpqlCompletionProposalComputer<ICompletionProposal>
58
                                                        implements ICompletionProposalComputer {
59
60
	/**
61
	 * Creates a new <code>JpaJpqlSseCompletionProposalComputer</code>.
62
	 */
63
	public JpaJpqlSseCompletionProposalComputer() {
64
		super();
65
	}
66
67
	/**
68
	 * {@inheritDoc}
69
	 */
70
	@Override
71
	ICompletionProposal buildProposal(String proposal,
72
	                                  String displayString,
73
	                                  String additionalInfo,
74
	                                  Image image,
75
	                                  int cursorOffset) {
76
77
		return new JpqlCompletionProposal(
78
			contentAssistProposals,
79
			proposal,
80
			displayString,
81
			additionalInfo,
82
			image,
83
			namedQuery,
84
			actualQuery,
85
			jpqlQuery,
86
			offset,
87
			position,
88
			cursorOffset,
89
			true
90
		);
91
	}
92
93
	/**
94
	 * {@inheritDoc}
95
	 */
96
	public List<ICompletionProposal> computeCompletionProposals(CompletionProposalInvocationContext context,
97
	                                                            IProgressMonitor monitor) {
98
99
		monitor.beginTask(null, 100);
100
101
		try {
102
			int offset = context.getInvocationOffset();
103
			if (offset == -1) return Collections.emptyList();
104
105
			ITextFileBufferManager manager = FileBuffers.getTextFileBufferManager();
106
			ITextFileBuffer buffer = manager.getTextFileBuffer(context.getDocument());
107
			if (buffer == null) return Collections.emptyList();
108
109
			IWorkspaceRoot root = ResourcesPlugin.getWorkspace().getRoot();
110
			IFile file = root.getFile(buffer.getLocation());
111
112
			JpaFile jpaFile = JptJpaCorePlugin.getJpaFile(file);
113
			if (jpaFile == null) return Collections.emptyList();
114
115
			monitor.worked(80);
116
			checkCanceled(monitor);
117
118
			// Retrieve the JPA's model object
119
			int[] position = new int[1];
120
			NamedQuery namedQuery = namedQuery(jpaFile, offset, position);
121
			if (namedQuery == null) return Collections.emptyList();
122
123
			// Keep track of the beginning of the text since the entire string is always replaced
124
			int tokenStart = offset - position[0];
125
126
			// Now create the proposals
127
			String jpqlQuery = jpqlQuery(namedQuery, position[0]);
128
			return buildProposals(namedQuery, jpqlQuery, tokenStart, position[0]);
129
		}
130
		catch (Exception e) {
131
			Status status = new Status(IStatus.ERROR, JptJpaUiPlugin.PLUGIN_ID, JptUiMessages.JpaJpqlSseCompletionProposalComputer_Error, e);
132
			JptJpaCorePlugin.log(status);
133
		}
134
		finally {
135
			monitor.done();
136
		}
137
138
		return Collections.emptyList();
139
	}
140
141
	/**
142
	 * {@inheritDoc}
143
	 */
144
	public List<IContextInformation> computeContextInformation(CompletionProposalInvocationContext context,
145
	                                                           IProgressMonitor monitor) {
146
147
		return Collections.emptyList();
148
	}
149
150
	private NamedQuery findNamedQuery(JpaStructureNode structureNode, int offset, int[] position) {
151
152
		if (structureNode instanceof EntityMappings) {
153
			EntityMappings entityMappings = (EntityMappings) structureNode;
154
155
			// First look into the global queries
156
			NamedQuery query = findNamedQuery(entityMappings.getQueryContainer(), offset, position);
157
158
			// Now traverse each entity
159
			if (query != null) {
160
				return query;
161
			}
162
163
			for (PersistentType persistentType : entityMappings.getPersistentTypes()) {
164
				TypeMapping typeMapping = persistentType.getMapping();
165
166
				if (typeMapping instanceof OrmEntity) {
167
					query = findNamedQuery(((OrmEntity) typeMapping).getQueryContainer(), offset, position);
168
169
					if (query != null) {
170
						return query;
171
					}
172
				}
173
			}
174
		}
175
176
		return null;
177
	}
178
179
	private NamedQuery findNamedQuery(QueryContainer container, int offset, int[] position) {
180
181
		for (Iterator<OrmNamedQuery> queries = container.namedQueries(); queries.hasNext(); ) {
182
			OrmNamedQuery namedQuery = queries.next();
183
			TextRange textRange = namedQuery.getQueryTextRange();
184
185
			if (textRange.touches(offset)) {
186
				position[0] = offset - textRange.getOffset();
187
				return namedQuery;
188
			}
189
		}
190
191
		return null;
192
	}
193
194
	private String jpqlQuery(NamedQuery namedQuery, int position) {
195
196
		String query = namedQuery.getQuery();
197
198
		if (query == null) {
199
			query = StringTools.EMPTY_STRING;
200
		}
201
202
		// The NamedQuery's query does not have the trailing whitespace, add them
203
		if (query.length() < position) {
204
			query = StringTools.pad(query, position, ' ');
205
		}
206
207
		return query;
208
	}
209
210
	/**
211
	 * {@inheritDoc}
212
	 */
213
	@Override
214
	String modifyJpqlQuery(String jpqlQuery, int[] position) {
215
		return ExpressionTools.unescape(jpqlQuery, position);
216
	}
217
218
	private NamedQuery namedQuery(JpaFile jpaFile, int offset, int[] position) {
219
220
		for (JpaStructureNode node : jpaFile.getRootStructureNodes()) {
221
			NamedQuery namedQuery = findNamedQuery(node, offset, position);
222
			if (namedQuery != null) {
223
				return namedQuery;
224
			}
225
		}
226
227
		return null;
228
	}
229
}
(-)src/org/eclipse/jpt/jpa/ui/internal/jpql/JpqlCompletionProposal.java (+158 lines)
Added Link Here
1
/*******************************************************************************
2
 * Copyright (c) 2011 Oracle. All rights reserved.
3
 * This program and the accompanying materials are made available under the
4
 * terms of the Eclipse Public License v1.0 and Eclipse Distribution License v. 1.0
5
 * which accompanies this distribution.
6
 * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
7
 * and the Eclipse Distribution License is available at
8
 * http://www.eclipse.org/org/documents/edl-v10.php.
9
 *
10
 * Contributors:
11
 *     Oracle - initial API and implementation
12
 *
13
 ******************************************************************************/
14
package org.eclipse.jpt.jpa.ui.internal.jpql;
15
16
import org.eclipse.jdt.core.IJavaProject;
17
import org.eclipse.jdt.ui.PreferenceConstants;
18
import org.eclipse.jface.text.BadLocationException;
19
import org.eclipse.jface.text.IDocument;
20
import org.eclipse.jface.text.contentassist.ICompletionProposal;
21
import org.eclipse.jface.text.contentassist.IContextInformation;
22
import org.eclipse.jpt.jpa.core.context.NamedQuery;
23
import org.eclipse.persistence.jpa.jpql.ContentAssistProposals;
24
import org.eclipse.persistence.jpa.jpql.ResultQuery;
25
import org.eclipse.swt.graphics.Image;
26
import org.eclipse.swt.graphics.Point;
27
28
/**
29
 * The concrete implementation of a {@link org.eclipse.jface.text.contentassist.ICompletionProposal
30
 * ICompletionProposal} that adds relevance and toggling the completion insertion property behavior.
31
 *
32
 * @version 3.0
33
 * @since 3.0
34
 * @author Pascal Filion
35
 */
36
final class JpqlCompletionProposal implements ICompletionProposal {
37
38
	private String actualQuery;
39
	private String additionalInfo;
40
	private ContentAssistProposals proposals;
41
	private int cursorOffset;
42
	private String displayString;
43
	private boolean escapeCharacters;
44
	private Image image;
45
	private String jpqlQuery;
46
	private NamedQuery namedQuery;
47
	private int offset;
48
	private int position;
49
	private String proposal;
50
	private ResultQuery result;
51
	private boolean toggleCompletion;
52
53
	JpqlCompletionProposal(ContentAssistProposals proposals,
54
	                       String proposal,
55
	                       String displayString,
56
	                       String additionalInfo,
57
	                       Image image,
58
	                       NamedQuery namedQuery,
59
	                       String actualQuery,
60
	                       String jpqlQuery,
61
	                       int offset,
62
	                       int position,
63
	                       int cursorOffset,
64
	                       boolean escapeCharacters) {
65
66
		super();
67
68
		this.image              = image;
69
		this.offset             = offset;
70
		this.position           = position;
71
		this.proposal           = proposal;
72
		this.jpqlQuery          = jpqlQuery;
73
		this.namedQuery         = namedQuery;
74
		this.actualQuery        = actualQuery;
75
		this.cursorOffset       = cursorOffset;
76
		this.displayString      = displayString;
77
		this.additionalInfo     = additionalInfo;
78
		this.escapeCharacters   = escapeCharacters;
79
		this.proposals = proposals;
80
	}
81
82
	/**
83
	 * {@inheritDoc}
84
	 */
85
	public void apply(IDocument document) {
86
		try {
87
			ResultQuery result = buildResult();
88
			document.replace(offset, actualQuery.length(), result.getQuery());
89
		}
90
		catch (BadLocationException e) {
91
			// Ignore
92
		}
93
	}
94
95
	private ResultQuery buildResult() {
96
		if (result == null) {
97
			if (escapeCharacters) {
98
				result = proposals.buildEscapedQuery(
99
					jpqlQuery,
100
					proposal,
101
					position,
102
					isCompletionInserts() ^ toggleCompletion
103
				);
104
			}
105
			else {
106
				result = proposals.buildQuery(
107
					jpqlQuery,
108
					proposal,
109
					position,
110
					isCompletionInserts() ^ toggleCompletion
111
				);
112
			}
113
		}
114
		return result;
115
	}
116
117
	/**
118
	 * {@inheritDoc}
119
	 */
120
	public String getAdditionalProposalInfo() {
121
		return additionalInfo;
122
	}
123
124
	/**
125
	 * {@inheritDoc}
126
	 */
127
	public IContextInformation getContextInformation() {
128
		return null; // Not needed, this is legacy API
129
	}
130
131
	/**
132
	 * {@inheritDoc}
133
	 */
134
	public String getDisplayString() {
135
		return displayString;
136
	}
137
138
	/**
139
	 * {@inheritDoc}
140
	 */
141
	public Image getImage() {
142
		return image;
143
	}
144
145
	/**
146
	 * {@inheritDoc}
147
	 */
148
	public Point getSelection(IDocument document) {
149
		ResultQuery result = buildResult();
150
		return new Point(offset + result.getPosition() + cursorOffset, 0);
151
	}
152
153
	private boolean isCompletionInserts() {
154
		IJavaProject javaProject = namedQuery.getJpaProject().getJavaProject();
155
		String value = PreferenceConstants.getPreference(PreferenceConstants.CODEASSIST_INSERT_COMPLETION, javaProject);
156
		return Boolean.valueOf(value);
157
	}
158
}
(-)src/org/eclipse/jpt/jpa/ui/internal/jpql/JpqlCompletionProposalComputer.java (+397 lines)
Added Link Here
1
/*******************************************************************************
2
 * Copyright (c) 2011 Oracle. All rights reserved.
3
 * This program and the accompanying materials are made available under the
4
 * terms of the Eclipse Public License v1.0 and Eclipse Distribution License v. 1.0
5
 * which accompanies this distribution.
6
 * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
7
 * and the Eclipse Distribution License is available at
8
 * http://www.eclipse.org/org/documents/edl-v10.php.
9
 *
10
 * Contributors:
11
 *     Oracle - initial API and implementation
12
 *
13
 ******************************************************************************/
14
package org.eclipse.jpt.jpa.ui.internal.jpql;
15
16
import java.util.ArrayList;
17
import java.util.Comparator;
18
import java.util.List;
19
import org.eclipse.core.runtime.IProgressMonitor;
20
import org.eclipse.jface.resource.ImageDescriptor;
21
import org.eclipse.jface.resource.ImageRegistry;
22
import org.eclipse.jpt.common.utility.internal.CollectionTools;
23
import org.eclipse.jpt.jpa.core.context.NamedQuery;
24
import org.eclipse.jpt.jpa.core.internal.jpql.JpaJpqlQueryHelper;
25
import org.eclipse.jpt.jpa.ui.JptJpaUiPlugin;
26
import org.eclipse.jpt.jpa.ui.internal.JptUiIcons;
27
import org.eclipse.persistence.jpa.internal.jpql.parser.Expression;
28
import org.eclipse.persistence.jpa.internal.jpql.parser.IdentifierRole;
29
import org.eclipse.persistence.jpa.internal.jpql.parser.JPQLExpression;
30
import org.eclipse.persistence.jpa.jpql.ContentAssistProposals;
31
import org.eclipse.persistence.jpa.jpql.spi.IEntity;
32
import org.eclipse.persistence.jpa.jpql.spi.IMapping;
33
import org.eclipse.swt.graphics.Image;
34
import org.eclipse.swt.widgets.Display;
35
36
import static org.eclipse.jpt.common.utility.internal.CollectionTools.*;
37
38
/**
39
 * The abstract definition of JPQL content assist support.
40
 *
41
 * @version 3.0
42
 * @since 3.0
43
 * @author Pascal Filion
44
 */
45
@SuppressWarnings({"nls", "restriction"})
46
abstract class JpqlCompletionProposalComputer<T> {
47
48
	/**
49
	 * The current value of the query element.
50
	 */
51
	String actualQuery;
52
53
	/**
54
	 * The provider of content assist items based on the position of the cursor within the JPQL query.
55
	 */
56
	ContentAssistProposals contentAssistProposals;
57
58
	/**
59
	 * The local registry containing the images used to display the possible proposals. The registry is
60
	 * disposed when the session ended.
61
	 */
62
	private ImageRegistry imageRegistry;
63
64
	/**
65
	 * The same value as {@link #actualQuery} or the modified query that was used by the Hermes parser.
66
	 */
67
	String jpqlQuery;
68
69
	/**
70
	 * The JPA model object that is used to access the Java project.
71
	 */
72
	NamedQuery namedQuery;
73
74
	/**
75
	 * The start position of the query within the document.
76
	 */
77
	int offset;
78
79
	/**
80
	 * The position of the cursor within {@link #actualQuery}.
81
	 */
82
	int position;
83
84
	/**
85
	 * This helper is responsible to retrieve the possible proposals to complete or to add more
86
	 * information to a JPQL based on the position of the cursor.
87
	 */
88
	JpaJpqlQueryHelper queryHelper;
89
90
	/**
91
	 * Creates a new <code>JpqlCompletionProposalComputer</code>.
92
	 */
93
	public JpqlCompletionProposalComputer() {
94
		super();
95
	}
96
97
	/**
98
	 * Adds completion proposals for the abstract schema names that are possible proposals.
99
	 *
100
	 * @param proposals The list used to store the new completion proposals
101
	 */
102
	private void addAbstractSchemaNames(List<T> proposals) {
103
		for (IEntity abstractSchemaType : sortByNames(contentAssistProposals.abstractSchemaTypes())) {
104
			proposals.add(buildAbstractSchemaNameProposal(abstractSchemaType));
105
		}
106
	}
107
108
	/**
109
	 * Adds completion proposals for the identification variables that are possible proposals.
110
	 *
111
	 * @param proposals The list used to store the new completion proposals
112
	 */
113
	private void addIdentificationVariables(List<T> proposals) {
114
		for (String variable : sort(contentAssistProposals.identificationVariables())) {
115
			proposals.add(buildIdentificationVariableProposal(variable));
116
		}
117
	}
118
119
	/**
120
	 * Adds completion proposals for the JPQL identifiers that are possible proposals.
121
	 *
122
	 * @param proposals The list used to store the new completion proposals
123
	 */
124
	private void addIdentifiers(List<T> proposals) {
125
		for (String identifier : sort(contentAssistProposals.identifiers())) {
126
			proposals.add(buildIdentifierProposal(identifier));
127
		}
128
	}
129
130
	private String additionalInfo(String proposal) {
131
		return JpqlIdentifierMessages.localizedMessage(proposal);
132
	}
133
134
	/**
135
	 * Adds completion proposals for the state fields and association fields that are possible proposals.
136
	 *
137
	 * @param proposals The list used to store the new completion proposals
138
	 */
139
	private void addMappings(List<T> proposals) {
140
		for (IMapping mapping : sort(contentAssistProposals.mappings())) {
141
			proposals.add(buildMappingProposal(mapping));
142
		}
143
	}
144
145
	private T buildAbstractSchemaNameProposal(IEntity abstractSchemaType) {
146
		String proposal = abstractSchemaType.getName();
147
		return buildProposal(proposal, proposal, entityImage());
148
	}
149
150
	private Comparator<IEntity> buildEntityNameComparator() {
151
		return new Comparator<IEntity>() {
152
			public int compare(IEntity entity1, IEntity entity2) {
153
				return entity1.getName().compareTo(entity2.getName());
154
			}
155
		};
156
	}
157
158
	private String buildIdentificationVariableDisplayString(String identificationVariable) {
159
160
		IEntity abstractSchemaType = contentAssistProposals.getAbstractSchemaType(identificationVariable);
161
162
		if (abstractSchemaType != null) {
163
			StringBuilder sb = new StringBuilder();
164
			sb.append(identificationVariable);
165
			sb.append(" : ");
166
			sb.append(abstractSchemaType.getName());
167
			identificationVariable = sb.toString();
168
		}
169
170
		return identificationVariable;
171
	}
172
173
	private T buildIdentificationVariableProposal(String proposal) {
174
		return buildProposal(
175
			proposal,
176
			buildIdentificationVariableDisplayString(proposal),
177
			identificationVariableImage()
178
		);
179
	}
180
181
	private T buildIdentifierProposal(String proposal) {
182
183
		String additionalInfo = additionalInfo(proposal);
184
		IdentifierRole role = JPQLExpression.identifierRole(proposal);
185
		boolean realFunction = (role == IdentifierRole.FUNCTION) && isRealFunction(proposal);
186
		int cursorOffset = 0;
187
188
		// For JPQL function, we add () to the display string, example: AVG()
189
		// But for TRUE, FALSE, etc, we don't add ()
190
		if (realFunction) {
191
			proposal += "()";
192
			cursorOffset--;
193
		}
194
195
		return buildProposal(
196
			proposal,
197
			proposal,
198
			additionalInfo,
199
			identifierImage(realFunction),
200
			cursorOffset
201
		);
202
	}
203
204
	JpaJpqlQueryHelper buildJPQLQueryHelper() {
205
		return new JpaJpqlQueryHelper();
206
	}
207
208
	private T buildMappingProposal(IMapping mapping) {
209
		String proposal = mapping.getName();
210
		return buildProposal(proposal, proposal, mappingImage(mapping));
211
	}
212
213
	private T buildProposal(String proposal, String displayString, Image image) {
214
		return buildProposal(proposal, displayString, null, image, 0);
215
	}
216
217
	/**
218
	 * Creates a new completion proposal for the given proposal.
219
	 *
220
	 * @param proposal A valid proposal that can be inserted into the query
221
	 * @param displayString The human readable string of the proposal
222
	 * @param additionalInfo Optional additional information about the proposal. The additional
223
	 * information will be presented to assist the user in deciding if the selected proposal is the
224
	 * desired choice
225
	 * @param image The image that represents the proposal
226
	 * @param cursorOffset An offset that moves the cursor backward or forward after it is adjusted
227
	 * based on the given proposal
228
	 * @return The completion proposal
229
	 */
230
	abstract T buildProposal(String proposal,
231
	                         String displayString,
232
	                         String additionalInfo,
233
	                         Image image,
234
	                         int cursorOffset);
235
236
	/**
237
	 * Creates the list of completion proposals based on the current content of the JPQL query and at
238
	 * the specified position.
239
	 *
240
	 * @param namedQuery The model object used to access the application metadata information
241
	 * @param actualQuery The model object may sometimes be out of sync with the actual content, the
242
	 * actual query is required for proper content assist
243
	 * @param offset The beginning of the string within the document
244
	 * @param position The position of the cursor within the query, which starts at the beginning of
245
	 * that query and not the document
246
	 * @return The list of completion proposals
247
	 */
248
	final List<T> buildProposals(NamedQuery namedQuery, String actualQuery, int offset, int position) {
249
250
		this.offset      = offset;
251
		this.actualQuery = actualQuery;
252
		this.namedQuery  = namedQuery;
253
254
		// It's possible the string has literal representation of the escape characters, if required,
255
		// convert them into actual escape characters and adjust the position accordingly
256
		int[] positions = { position };
257
		this.jpqlQuery  = modifyJpqlQuery(actualQuery, positions);
258
		this.position   = positions[0];
259
260
		// Gather the possible proposals
261
		this.queryHelper = buildJPQLQueryHelper();
262
		this.queryHelper.setQuery(namedQuery, jpqlQuery);
263
		this.contentAssistProposals = queryHelper.buildContentAssistProposals(positions[0]);
264
265
		// Create the proposals for those proposals
266
		List<T> proposals = new ArrayList<T>();
267
		addAbstractSchemaNames    (proposals);
268
		addIdentificationVariables(proposals);
269
		addIdentifiers            (proposals);
270
		addMappings               (proposals);
271
272
		return proposals;
273
	}
274
275
	final void checkCanceled(IProgressMonitor monitor) throws InterruptedException {
276
		if (monitor.isCanceled()) {
277
			throw new InterruptedException();
278
		}
279
	}
280
281
	private Image entityImage() {
282
		return getImage(JptUiIcons.ENTITY);
283
	}
284
285
	/**
286
	 * Returns the reason why this computer was unable to produce any completion proposals or
287
	 * context information.
288
	 *
289
	 * @return An error message or <code>null</code> if no error occurred
290
	 */
291
	public String getErrorMessage() {
292
		return null;
293
	}
294
295
	private Image getImage(String key) {
296
		ImageRegistry imageRegistry = getImageRegistry();
297
		Image image = imageRegistry.get(key);
298
		if (image == null) {
299
			imageRegistry.put(key, getImageDescriptor(key));
300
			image = imageRegistry.get(key);
301
		}
302
		return image;
303
	}
304
305
	private ImageDescriptor getImageDescriptor(String key) {
306
		return JptJpaUiPlugin.getImageDescriptor(key);
307
	}
308
309
	private ImageRegistry getImageRegistry() {
310
		if (imageRegistry == null) {
311
			imageRegistry = new ImageRegistry(Display.getCurrent());
312
		}
313
		return imageRegistry;
314
	}
315
316
	private Image identificationVariableImage() {
317
		return getImage(JptUiIcons.JPQL_VARIABLE);
318
	}
319
320
	private Image identifierImage(boolean function) {
321
322
		if (function) {
323
			return getImage(JptUiIcons.JPQL_FUNCTION);
324
		}
325
326
		return getImage(JptUiIcons.JPQL_IDENTIFIER);
327
	}
328
329
	private boolean isRealFunction(String identifier) {
330
		return identifier != Expression.TRUE         &&
331
		       identifier != Expression.FALSE        &&
332
		       identifier != Expression.NULL         &&
333
		       identifier != Expression.CURRENT_DATE &&
334
		       identifier != Expression.CURRENT_TIME &&
335
		       identifier != Expression.CURRENT_TIMESTAMP;
336
	}
337
338
	private Image mappingImage(IMapping mapping) {
339
		switch (mapping.getMappingType()) {
340
			case BASIC:               return getImage(JptUiIcons.BASIC);
341
			case BASIC_COLLECTION:    return getImage(JptUiIcons.ELEMENT_COLLECTION);
342
			case BASIC_MAP:           return getImage(JptUiIcons.ELEMENT_COLLECTION);
343
			case ELEMENT_COLLECTION:  return getImage(JptUiIcons.ELEMENT_COLLECTION);
344
			case EMBEDDED:            return getImage(JptUiIcons.EMBEDDED);
345
			case EMBEDDED_ID:         return getImage(JptUiIcons.EMBEDDED_ID);
346
			case ID:                  return getImage(JptUiIcons.ID);
347
			case MANY_TO_MANY:        return getImage(JptUiIcons.MANY_TO_MANY);
348
			case MANY_TO_ONE:         return getImage(JptUiIcons.MANY_TO_ONE);
349
			case ONE_TO_MANY:         return getImage(JptUiIcons.ONE_TO_MANY);
350
			case ONE_TO_ONE:          return getImage(JptUiIcons.ONE_TO_ONE);
351
			case TRANSFORMATION:      return getImage(JptUiIcons.BASIC);      // TODO
352
			case VARIABLE_ONE_TO_ONE: return getImage(JptUiIcons.ONE_TO_ONE); // TODO
353
			case VERSION:             return getImage(JptUiIcons.VERSION);
354
			default:                  return getImage(JptUiIcons.TRANSIENT);
355
		}
356
	}
357
358
	/**
359
	 * In some context, the given JPQL query needs to be modified before it is parsed.
360
	 *
361
	 * @param jpqlQuery The JPQL query to keep unchanged or to modify before parsing it
362
	 * @param position The position of the cursor within the JPQL query, which needs to be updated if
363
	 * the query is modified
364
	 * @return The given JPQL query or a modified version that will be parsed
365
	 */
366
	String modifyJpqlQuery(String jpqlQuery, int[] position) {
367
		return jpqlQuery;
368
	}
369
370
	/**
371
	 * Informs the computer that a content assist session has ended.
372
	 */
373
	public void sessionEnded() {
374
375
		offset      = -1;
376
		position    = -1;
377
		namedQuery  = null;
378
		actualQuery = null;
379
		queryHelper = null;
380
		contentAssistProposals = null;
381
382
		if (imageRegistry != null) {
383
			imageRegistry.dispose();
384
		}
385
	}
386
387
	/**
388
	 * Informs the computer that a content assist session has started.
389
	 */
390
	public void sessionStarted() {
391
		// Nothing to do
392
	}
393
394
	private Iterable<IEntity> sortByNames(Iterable<IEntity> abstractSchemaTypes) {
395
		return CollectionTools.sort(abstractSchemaTypes, buildEntityNameComparator());
396
	}
397
}
(-)src/org/eclipse/jpt/jpa/ui/internal/jpql/JpqlIdentifierMessages.java (+186 lines)
Added Link Here
1
/*******************************************************************************
2
 * Copyright (c) 2011 Oracle. All rights reserved.
3
 * This program and the accompanying materials are made available under the
4
 * terms of the Eclipse Public License v1.0 and Eclipse Distribution License v. 1.0
5
 * which accompanies this distribution.
6
 * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
7
 * and the Eclipse Distribution License is available at
8
 * http://www.eclipse.org/org/documents/edl-v10.php.
9
 *
10
 * Contributors:
11
 *     Oracle - initial API and implementation
12
 *
13
 ******************************************************************************/
14
package org.eclipse.jpt.jpa.ui.internal.jpql;
15
16
import java.lang.reflect.Field;
17
import java.util.HashMap;
18
import java.util.Map;
19
import org.eclipse.osgi.util.NLS;
20
import org.eclipse.persistence.jpa.internal.jpql.parser.Expression;
21
22
/**
23
 * The localized messages describing the JPQL identifiers.
24
 *
25
 * @version 3.0
26
 * @since 3.0
27
 * @author Pascal Filion
28
 */
29
@SuppressWarnings({"nls", "restriction"})
30
final class JpqlIdentifierMessages extends NLS {
31
32
	// JPA 1.0 identifiers
33
	public static String ABS;
34
	public static String ALL;
35
	public static String ANY;
36
	public static String ASC;
37
	public static String AVG;
38
	public static String BETWEEN;
39
	public static String BOTH;
40
	public static String CONCAT;
41
	public static String COUNT;
42
	public static String CURRENT_DATE;
43
	public static String CURRENT_TIME;
44
	public static String CURRENT_TIMESTAMP;
45
	public static String DELETE_FROM;
46
	public static String DESC;
47
	public static String DISTINCT;
48
	public static String ESCAPE;
49
	public static String EXISTS;
50
	public static String FROM;
51
	public static String GROUP_BY;
52
	public static String HAVING;
53
	public static String IN;
54
	public static String IS_EMPTY;
55
	public static String IS_NULL;
56
	public static String JOIN;
57
	public static String JOIN_FETCH;
58
	public static String LEADING;
59
	public static String LENGTH;
60
	public static String LIKE;
61
	public static String LOCATE;
62
	public static String LOWER;
63
	public static String MAX;
64
	public static String MEMBER;
65
	public static String MIN;
66
	public static String MOD;
67
	public static String NEW;
68
	public static String OBJECT;
69
	public static String ORDER_BY;
70
	public static String SELECT;
71
	public static String SIZE;
72
	public static String SOME;
73
	public static String SQRT;
74
	public static String SUBSTRING;
75
	public static String SUM;
76
	public static String TRAILING;
77
	public static String TRIM;
78
	public static String UPDATE;
79
	public static String UPPER;
80
	public static String WHERE;
81
82
	// JPA 2.0 identifiers
83
//	public static String CASE;
84
	public static String COALESCE;
85
//	public static String ENTRY;
86
	public static String INDEX;
87
//	public static String KEY;
88
	public static String NULLIF;
89
	public static String TYPE;
90
//	public static String VALUE;
91
92
	// EclipseLink identifiers
93
//	public static String FUNC;
94
//	public static String TREAT;
95
96
	// Reserved JPQL identifiers
97
	public static String BIT_LENGTH;
98
	public static String CHAR_LENGTH;
99
	public static String CHARACTER_LENGTH;
100
	public static String CLASS;
101
	public static String POSITION;
102
	public static String UNKNOWN;
103
104
	static {
105
		NLS.initializeMessages("jpt_ui_jpql_identifiers", JpqlIdentifierMessages.class);
106
	}
107
108
	JpqlIdentifierMessages() {
109
		super();
110
		throw new UnsupportedOperationException();
111
	}
112
113
	private static Map<String, String> registeredIdentifers;
114
115
	private static Map<String, String> buildRegisteredIdentifers() {
116
117
		Map<String, String> identifiers = new HashMap<String, String>();
118
119
		identifiers.put(Expression.IS_NOT_EMPTY,  Expression.IS_EMPTY);
120
		identifiers.put(Expression.IS_NOT_NULL,   Expression.IS_NULL);
121
		identifiers.put(Expression.MEMBER_OF,     Expression.MEMBER);
122
		identifiers.put(Expression.NOT_IN,        Expression.IN);
123
		identifiers.put(Expression.NOT_BETWEEN,   Expression.BETWEEN);
124
		identifiers.put(Expression.NOT_MEMBER,    Expression.MEMBER);
125
		identifiers.put(Expression.NOT_MEMBER_OF, Expression.MEMBER);
126
127
		identifiers.put(Expression.INNER_JOIN,      Expression.JOIN);
128
		identifiers.put(Expression.LEFT_JOIN,       Expression.JOIN);
129
		identifiers.put(Expression.LEFT_OUTER_JOIN, Expression.JOIN);
130
131
		identifiers.put(Expression.INNER_JOIN_FETCH,      Expression.JOIN_FETCH);
132
		identifiers.put(Expression.LEFT_JOIN_FETCH,       Expression.JOIN_FETCH);
133
		identifiers.put(Expression.LEFT_OUTER_JOIN_FETCH, Expression.JOIN_FETCH);
134
135
		return identifiers;
136
	}
137
138
	/**
139
	 * Converts the given JPQL identifier to the shortest form that is used to map the localized
140
	 * message. If the identifier is <b>NOT MEMBER</b> for instance, then it needs to be converted
141
	 * to <b>MEMBER</b> since that's the identifier used to map the localize message.
142
	 *
143
	 * @param identifier The JPQL identifier to convert, if needed
144
	 * @return Either the given JPQL identifier or its counterpart that is used to map the localized
145
	 * message
146
	 */
147
	private static String convertIdentifier(String identifier) {
148
		identifier = registeredIdentifer(identifier);
149
		identifier = identifier.replace(" ", "_");
150
		return identifier;
151
	}
152
153
	/**
154
	 * Retrieves the localized message for the given string value, if it's a JPQL identifier.
155
	 *
156
	 * @param identifier The JPQL identifier for which its localized description is needed
157
	 * @return The localized message describing the given JPQL identifier or <code>null</code> if the
158
	 * given choice is not an identifier
159
	 */
160
	static String localizedMessage(String identifier) {
161
		try {
162
			identifier = convertIdentifier(identifier);
163
			Field constant = JpqlIdentifierMessages.class.getField(identifier);
164
			return (String) constant.get(null);
165
		}
166
		catch (Exception e) {
167
			// The choice is not a JPQL identifier
168
			return null;
169
		}
170
	}
171
172
	private static String registeredIdentifer(String identifier) {
173
		String another = registeredIdentifers().get(identifier);
174
		if (another != null) {
175
			return another;
176
		}
177
		return identifier;
178
	}
179
180
	private static Map<String, String> registeredIdentifers() {
181
		if (registeredIdentifers == null) {
182
			registeredIdentifers = buildRegisteredIdentifers();
183
		}
184
		return registeredIdentifers;
185
	}
186
}
(-)src/org/eclipse/jpt/jpa/ui/internal/jpql/TextTransferHandler.java (+228 lines)
Added Link Here
1
/*******************************************************************************
2
 * Copyright (c) 2011 Oracle. All rights reserved.
3
 * This program and the accompanying materials are made available under the
4
 * terms of the Eclipse Public License v1.0 and Eclipse Distribution License v. 1.0
5
 * which accompanies this distribution.
6
 * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
7
 * and the Eclipse Distribution License is available at
8
 * http://www.eclipse.org/org/documents/edl-v10.php.
9
 *
10
 * Contributors:
11
 *     Oracle - initial API and implementation
12
 *
13
 ******************************************************************************/
14
package org.eclipse.jpt.jpa.ui.internal.jpql;
15
16
import org.eclipse.jface.text.IUndoManager;
17
import org.eclipse.jpt.common.utility.internal.StringTools;
18
import org.eclipse.swt.SWT;
19
import org.eclipse.swt.custom.StyledText;
20
import org.eclipse.swt.dnd.Clipboard;
21
import org.eclipse.swt.dnd.TextTransfer;
22
import org.eclipse.swt.dnd.TransferData;
23
import org.eclipse.swt.events.MenuEvent;
24
import org.eclipse.swt.events.MenuListener;
25
import org.eclipse.swt.events.SelectionAdapter;
26
import org.eclipse.swt.events.SelectionEvent;
27
import org.eclipse.swt.events.SelectionListener;
28
import org.eclipse.swt.graphics.Point;
29
import org.eclipse.swt.widgets.Menu;
30
import org.eclipse.swt.widgets.MenuItem;
31
import org.eclipse.ui.internal.WorkbenchMessages;
32
33
/**
34
 * This handler adds a context menu onto a {@link StyledText} which have the default actions dealing
35
 * with text editing: Undo | Cut, Copy, Paste, Delete | Select All.
36
 *
37
 * @version 3.0
38
 * @since 3.0
39
 * @author Pascal Filion
40
 */
41
@SuppressWarnings("restriction")
42
public final class TextTransferHandler {
43
44
	private MenuItem copyMenuItem;
45
	private MenuItem cutMenuItem;
46
	private MenuItem deleteMenuItem;
47
	private MenuItem pasteMenuItem;
48
	private Menu popup;
49
	private MenuItem selectAllMenuItem;
50
	private StyledText styledText;
51
	private IUndoManager undoManager;
52
	private MenuItem undoMenuItem;
53
54
	private TextTransferHandler(StyledText styledText, IUndoManager undoManager) {
55
		super();
56
		this.styledText  = styledText;
57
		this.undoManager = undoManager;
58
	}
59
60
	/**
61
	 * Installs a context menu onto the given {@link StyledText} which have the default actions
62
	 * dealing with text editing: Undo | Cut, Copy, Paste, Delete | Select All.
63
	 *
64
	 * @param styledText The widget for which a context menu will be added
65
	 * @param undoManager The manager to undo keystrokes
66
	 */
67
	public static void installContextMenu(StyledText styledText, IUndoManager undoManager) {
68
		TextTransferHandler handler = new TextTransferHandler(styledText, undoManager);
69
		handler.installPopup();
70
	}
71
72
	private SelectionAdapter buildCopySelectionListener() {
73
		return new SelectionAdapter() {
74
			@Override
75
			public void widgetSelected(SelectionEvent e) {
76
				styledText.copy();
77
			}
78
		};
79
	}
80
81
	private SelectionListener buildCutSelectionListener() {
82
		return new SelectionAdapter() {
83
			@Override
84
			public void widgetSelected(SelectionEvent e) {
85
				styledText.cut();
86
			}
87
		};
88
	}
89
90
	private SelectionListener buildDeleteSelectionListener() {
91
		return new SelectionAdapter() {
92
			@Override
93
			public void widgetSelected(SelectionEvent e) {
94
				Point selection = styledText.getSelection();
95
				styledText.replaceTextRange(selection.x, selection.y - selection.x, StringTools.EMPTY_STRING);
96
			}
97
		};
98
	}
99
100
	private MenuListener buildMenuListener() {
101
		return new MenuListener() {
102
			public void menuHidden(MenuEvent e) {
103
			}
104
			public void menuShown(MenuEvent e) {
105
				update();
106
			}
107
		};
108
	}
109
110
	private SelectionListener buildPasteSelectionListener() {
111
		return new SelectionAdapter() {
112
			@Override
113
			public void widgetSelected(SelectionEvent e) {
114
				styledText.paste();
115
			}
116
		};
117
	}
118
119
	private SelectionListener buildSelectAllSelectionListener() {
120
		return new SelectionAdapter() {
121
			@Override
122
			public void widgetSelected(SelectionEvent e) {
123
				styledText.selectAll();
124
			}
125
		};
126
	}
127
128
	private SelectionListener buildUndoSelectionListener() {
129
		return new SelectionAdapter() {
130
			@Override
131
			public void widgetSelected(SelectionEvent e) {
132
				undoManager.undo();
133
			}
134
		};
135
	}
136
137
	private boolean canCopy() {
138
		Point selection = styledText.getSelection();
139
		return selection.x != selection.y;
140
	}
141
142
	private boolean canCut() {
143
		Point selection = styledText.getSelection();
144
		return selection.x != selection.y;
145
	}
146
147
	private boolean canDelete() {
148
		Point selection = styledText.getSelection();
149
		return selection.x != selection.y;
150
	}
151
152
	private boolean canPaste() {
153
154
		Clipboard clipboard = new Clipboard(styledText.getDisplay());
155
		boolean canPaste = false;
156
157
		for (TransferData data : clipboard.getAvailableTypes()) {
158
			if (TextTransfer.getInstance().isSupportedType(data)) {
159
				canPaste = true;
160
				break;
161
			}
162
		}
163
164
		clipboard.dispose();
165
		return canPaste;
166
	}
167
168
	private boolean canSelectAll() {
169
		Point selection = styledText.getSelection();
170
		String text = styledText.getText();
171
		return (selection.y - selection.x) != text.length();
172
	}
173
174
	private void installPopup() {
175
176
		popup = new Menu(styledText.getShell(), SWT.POP_UP);
177
		popup.addMenuListener(buildMenuListener());
178
		styledText.setMenu(popup);
179
180
		populatePopup();
181
	}
182
183
	private void populatePopup() {
184
185
		// Undo
186
		undoMenuItem = new MenuItem(popup, SWT.PUSH);
187
		undoMenuItem.setText(WorkbenchMessages.Workbench_undo);
188
		undoMenuItem.addSelectionListener(buildUndoSelectionListener());
189
190
		new MenuItem(popup, SWT.SEPARATOR);
191
192
		// Cut
193
		cutMenuItem = new MenuItem(popup, SWT.PUSH);
194
		cutMenuItem.setText(WorkbenchMessages.Workbench_cut);
195
		cutMenuItem.addSelectionListener(buildCutSelectionListener());
196
197
		// Copy
198
		copyMenuItem = new MenuItem(popup, SWT.PUSH);
199
		copyMenuItem.setText(WorkbenchMessages.Workbench_copy);
200
		copyMenuItem.addSelectionListener(buildCopySelectionListener());
201
202
		// Paste
203
		pasteMenuItem = new MenuItem(popup, SWT.PUSH);
204
		pasteMenuItem.setText(WorkbenchMessages.Workbench_paste);
205
		pasteMenuItem.addSelectionListener(buildPasteSelectionListener());
206
207
		// Delete
208
		deleteMenuItem = new MenuItem(popup, SWT.PUSH);
209
		deleteMenuItem.setText(WorkbenchMessages.Workbench_delete);
210
		deleteMenuItem.addSelectionListener(buildDeleteSelectionListener());
211
212
		new MenuItem(popup, SWT.SEPARATOR);
213
214
		// Select All
215
		selectAllMenuItem = new MenuItem(popup, SWT.PUSH);
216
		selectAllMenuItem.setText(WorkbenchMessages.Workbench_selectAll);
217
		selectAllMenuItem.addSelectionListener(buildSelectAllSelectionListener());
218
	}
219
220
	private void update() {
221
		deleteMenuItem   .setEnabled(canDelete());
222
		copyMenuItem     .setEnabled(canCopy());
223
		cutMenuItem      .setEnabled(canCut());
224
		pasteMenuItem    .setEnabled(canPaste());
225
		selectAllMenuItem.setEnabled(canSelectAll());
226
		undoMenuItem     .setEnabled(undoManager.undoable());
227
	}
228
}
(-)src/org/eclipse/jpt/jpa/ui/internal/preferences/JpaProblemSeveritiesPage.java (-21 / +22 lines)
Lines 73-85 Link Here
73
73
74
	/**
74
	/**
75
	 * Default severity levels are stored here,  ERROR is the default default so only need
75
	 * Default severity levels are stored here,  ERROR is the default default so only need
76
	 * to include WARNING, INFO, IGNORE in this Map. These will be displayed if neither the project 
76
	 * to include WARNING, INFO, IGNORE in this Map. These will be displayed if neither the project
77
	 * or workspace preference applies.
77
	 * or workspace preference applies.
78
	 * <br> key is the preferenceKey which is also the validation message key @see JpaValidationMessages.
78
	 * <br> key is the preferenceKey which is also the validation message key @see JpaValidationMessages.
79
	 * <br> value is a severity level - @see JpaValidationPreferences#ERROR WARNING INFO IGNORE
79
	 * <br> value is a severity level - @see JpaValidationPreferences#ERROR WARNING INFO IGNORE
80
	 */
80
	 */
81
	private Map<String, String> defaultSeverities;
81
	private Map<String, String> defaultSeverities;
82
	
82
83
	/**
83
	/**
84
	 * The list of <code>Combo</code>s is cached in order to perform a revert of
84
	 * The list of <code>Combo</code>s is cached in order to perform a revert of
85
	 * the properties.
85
	 * the properties.
Lines 335-341 Link Here
335
	private void addAttributeLevelCategory(Composite parent) {
335
	private void addAttributeLevelCategory(Composite parent) {
336
336
337
		parent = addExpandableSection(parent, JptUiValidationPreferenceMessages.ATTRIBUTE_LEVEL_CATEGORY);
337
		parent = addExpandableSection(parent, JptUiValidationPreferenceMessages.ATTRIBUTE_LEVEL_CATEGORY);
338
		
338
339
		addLabeledCombo(
339
		addLabeledCombo(
340
			parent, JptUiValidationPreferenceMessages.PERSISTENT_ATTRIBUTE_UNSPECIFIED_NAME,
340
			parent, JptUiValidationPreferenceMessages.PERSISTENT_ATTRIBUTE_UNSPECIFIED_NAME,
341
			JpaValidationMessages.PERSISTENT_ATTRIBUTE_UNSPECIFIED_NAME);
341
			JpaValidationMessages.PERSISTENT_ATTRIBUTE_UNSPECIFIED_NAME);
Lines 395-401 Link Here
395
			JpaValidationMessages.ELEMENT_COLLECTION_MAP_KEY_CLASS_NOT_DEFINED);
395
			JpaValidationMessages.ELEMENT_COLLECTION_MAP_KEY_CLASS_NOT_DEFINED);
396
396
397
		parent = addSubExpandableSection(parent, JptUiValidationPreferenceMessages.IMPLIED_ATTRIBUTE_LEVEL_CATEGORY);
397
		parent = addSubExpandableSection(parent, JptUiValidationPreferenceMessages.IMPLIED_ATTRIBUTE_LEVEL_CATEGORY);
398
		
398
399
		addLabeledCombo(
399
		addLabeledCombo(
400
			parent, JptUiValidationPreferenceMessages.VIRTUAL_ATTRIBUTE_TARGET_ENTITY_IS_NOT_AN_ENTITY,
400
			parent, JptUiValidationPreferenceMessages.VIRTUAL_ATTRIBUTE_TARGET_ENTITY_IS_NOT_AN_ENTITY,
401
			JpaValidationMessages.VIRTUAL_ATTRIBUTE_TARGET_ENTITY_IS_NOT_AN_ENTITY);
401
			JpaValidationMessages.VIRTUAL_ATTRIBUTE_TARGET_ENTITY_IS_NOT_AN_ENTITY);
Lines 410-416 Link Here
410
			JpaValidationMessages.VIRTUAL_ATTRIBUTE_ELEMENT_COLLECTION_TARGET_CLASS_MUST_BE_EMBEDDABLE_OR_BASIC_TYPE);
410
			JpaValidationMessages.VIRTUAL_ATTRIBUTE_ELEMENT_COLLECTION_TARGET_CLASS_MUST_BE_EMBEDDABLE_OR_BASIC_TYPE);
411
		addLabeledCombo(
411
		addLabeledCombo(
412
			parent, JptUiValidationPreferenceMessages.VIRTUAL_ATTRIBUTE_ELEMENT_COLLECTION_MAP_KEY_CLASS_NOT_DEFINED,
412
			parent, JptUiValidationPreferenceMessages.VIRTUAL_ATTRIBUTE_ELEMENT_COLLECTION_MAP_KEY_CLASS_NOT_DEFINED,
413
			JpaValidationMessages.VIRTUAL_ATTRIBUTE_ELEMENT_COLLECTION_MAP_KEY_CLASS_NOT_DEFINED);	
413
			JpaValidationMessages.VIRTUAL_ATTRIBUTE_ELEMENT_COLLECTION_MAP_KEY_CLASS_NOT_DEFINED);
414
	}
414
	}
415
415
416
	private void addDatabaseCategory(Composite parent) {
416
	private void addDatabaseCategory(Composite parent) {
Lines 423-431 Link Here
423
	}
423
	}
424
424
425
	private void addTableCategory(Composite parent) {
425
	private void addTableCategory(Composite parent) {
426
		
426
427
		parent = addExpandableSection(parent, JptUiValidationPreferenceMessages.TABLE_CATEGORY);
427
		parent = addExpandableSection(parent, JptUiValidationPreferenceMessages.TABLE_CATEGORY);
428
		
428
429
		addLabeledCombo(parent, JptUiValidationPreferenceMessages.TABLE_UNRESOLVED_CATALOG,                                            					JpaValidationMessages.TABLE_UNRESOLVED_CATALOG);
429
		addLabeledCombo(parent, JptUiValidationPreferenceMessages.TABLE_UNRESOLVED_CATALOG,                                            					JpaValidationMessages.TABLE_UNRESOLVED_CATALOG);
430
		addLabeledCombo(parent, JptUiValidationPreferenceMessages.TABLE_UNRESOLVED_SCHEMA,                                             					JpaValidationMessages.TABLE_UNRESOLVED_SCHEMA);
430
		addLabeledCombo(parent, JptUiValidationPreferenceMessages.TABLE_UNRESOLVED_SCHEMA,                                             					JpaValidationMessages.TABLE_UNRESOLVED_SCHEMA);
431
		addLabeledCombo(parent, JptUiValidationPreferenceMessages.TABLE_UNRESOLVED_NAME,                                               					JpaValidationMessages.TABLE_UNRESOLVED_NAME);
431
		addLabeledCombo(parent, JptUiValidationPreferenceMessages.TABLE_UNRESOLVED_NAME,                                               					JpaValidationMessages.TABLE_UNRESOLVED_NAME);
Lines 452-461 Link Here
452
		addLabeledCombo(parent, JptUiValidationPreferenceMessages.VIRTUAL_ATTRIBUTE_COLLECTION_TABLE_UNRESOLVED_SCHEMA,                                 JpaValidationMessages.VIRTUAL_ATTRIBUTE_COLLECTION_TABLE_UNRESOLVED_SCHEMA);
452
		addLabeledCombo(parent, JptUiValidationPreferenceMessages.VIRTUAL_ATTRIBUTE_COLLECTION_TABLE_UNRESOLVED_SCHEMA,                                 JpaValidationMessages.VIRTUAL_ATTRIBUTE_COLLECTION_TABLE_UNRESOLVED_SCHEMA);
453
		addLabeledCombo(parent, JptUiValidationPreferenceMessages.VIRTUAL_ATTRIBUTE_COLLECTION_TABLE_UNRESOLVED_NAME,                                   JpaValidationMessages.VIRTUAL_ATTRIBUTE_COLLECTION_TABLE_UNRESOLVED_NAME);
453
		addLabeledCombo(parent, JptUiValidationPreferenceMessages.VIRTUAL_ATTRIBUTE_COLLECTION_TABLE_UNRESOLVED_NAME,                                   JpaValidationMessages.VIRTUAL_ATTRIBUTE_COLLECTION_TABLE_UNRESOLVED_NAME);
454
	}
454
	}
455
	
455
456
	private void addColumnCategory(Composite parent) {	
456
	private void addColumnCategory(Composite parent) {
457
		parent = addExpandableSection(parent, JptUiValidationPreferenceMessages.COLUMN_CATEGORY);
457
		parent = addExpandableSection(parent, JptUiValidationPreferenceMessages.COLUMN_CATEGORY);
458
		
458
459
		addLabeledCombo(parent, JptUiValidationPreferenceMessages.COLUMN_TABLE_NOT_VALID,                                      							JpaValidationMessages.COLUMN_TABLE_NOT_VALID);
459
		addLabeledCombo(parent, JptUiValidationPreferenceMessages.COLUMN_TABLE_NOT_VALID,                                      							JpaValidationMessages.COLUMN_TABLE_NOT_VALID);
460
		addLabeledCombo(parent, JptUiValidationPreferenceMessages.COLUMN_UNRESOLVED_TABLE,                                             					JpaValidationMessages.COLUMN_UNRESOLVED_TABLE);
460
		addLabeledCombo(parent, JptUiValidationPreferenceMessages.COLUMN_UNRESOLVED_TABLE,                                             					JpaValidationMessages.COLUMN_UNRESOLVED_TABLE);
461
		addLabeledCombo(parent, JptUiValidationPreferenceMessages.COLUMN_UNRESOLVED_NAME,                                              					JpaValidationMessages.COLUMN_UNRESOLVED_NAME);
461
		addLabeledCombo(parent, JptUiValidationPreferenceMessages.COLUMN_UNRESOLVED_NAME,                                              					JpaValidationMessages.COLUMN_UNRESOLVED_NAME);
Lines 503-509 Link Here
503
		addLabeledCombo(parent, JptUiValidationPreferenceMessages.VIRTUAL_ATTRIBUTE_MAP_KEY_COLUMN_TABLE_NOT_VALID, 													JpaValidationMessages.VIRTUAL_ATTRIBUTE_MAP_KEY_COLUMN_TABLE_NOT_VALID);
503
		addLabeledCombo(parent, JptUiValidationPreferenceMessages.VIRTUAL_ATTRIBUTE_MAP_KEY_COLUMN_TABLE_NOT_VALID, 													JpaValidationMessages.VIRTUAL_ATTRIBUTE_MAP_KEY_COLUMN_TABLE_NOT_VALID);
504
	}
504
	}
505
505
506
	private void addOverridesCategory(Composite parent) {	
506
	private void addOverridesCategory(Composite parent) {
507
507
508
		parent = addExpandableSection(parent, JptUiValidationPreferenceMessages.OVERRIDES_CATEGORY);
508
		parent = addExpandableSection(parent, JptUiValidationPreferenceMessages.OVERRIDES_CATEGORY);
509
509
Lines 529-535 Link Here
529
		addLabeledCombo(parent, JptUiValidationPreferenceMessages.VIRTUAL_ASSOCIATION_OVERRIDE_INVERSE_JOIN_COLUMN_NAME_MUST_BE_SPECIFIED_MULTIPLE_INVERSE_JOIN_COLUMNS, 				JpaValidationMessages.VIRTUAL_ASSOCIATION_OVERRIDE_INVERSE_JOIN_COLUMN_NAME_MUST_BE_SPECIFIED_MULTIPLE_INVERSE_JOIN_COLUMNS);
529
		addLabeledCombo(parent, JptUiValidationPreferenceMessages.VIRTUAL_ASSOCIATION_OVERRIDE_INVERSE_JOIN_COLUMN_NAME_MUST_BE_SPECIFIED_MULTIPLE_INVERSE_JOIN_COLUMNS, 				JpaValidationMessages.VIRTUAL_ASSOCIATION_OVERRIDE_INVERSE_JOIN_COLUMN_NAME_MUST_BE_SPECIFIED_MULTIPLE_INVERSE_JOIN_COLUMNS);
530
		addLabeledCombo(parent, JptUiValidationPreferenceMessages.VIRTUAL_ASSOCIATION_OVERRIDE_INVERSE_JOIN_COLUMN_REFERENCED_COLUMN_NAME_MUST_BE_SPECIFIED_MULTIPLE_INVERSE_JOIN_COLUMNS, JpaValidationMessages.VIRTUAL_ASSOCIATION_OVERRIDE_INVERSE_JOIN_COLUMN_REFERENCED_COLUMN_NAME_MUST_BE_SPECIFIED_MULTIPLE_INVERSE_JOIN_COLUMNS);
530
		addLabeledCombo(parent, JptUiValidationPreferenceMessages.VIRTUAL_ASSOCIATION_OVERRIDE_INVERSE_JOIN_COLUMN_REFERENCED_COLUMN_NAME_MUST_BE_SPECIFIED_MULTIPLE_INVERSE_JOIN_COLUMNS, JpaValidationMessages.VIRTUAL_ASSOCIATION_OVERRIDE_INVERSE_JOIN_COLUMN_REFERENCED_COLUMN_NAME_MUST_BE_SPECIFIED_MULTIPLE_INVERSE_JOIN_COLUMNS);
531
531
532
		
532
533
		parent = addSubExpandableSection(parent, JptUiValidationPreferenceMessages.IMPLIED_ATTRIBUTE_LEVEL_CATEGORY);
533
		parent = addSubExpandableSection(parent, JptUiValidationPreferenceMessages.IMPLIED_ATTRIBUTE_LEVEL_CATEGORY);
534
534
535
		addLabeledCombo(parent, JptUiValidationPreferenceMessages.VIRTUAL_ATTRIBUTE_ATTRIBUTE_OVERRIDE_INVALID_NAME,                  									JpaValidationMessages.VIRTUAL_ATTRIBUTE_ATTRIBUTE_OVERRIDE_INVALID_NAME);
535
		addLabeledCombo(parent, JptUiValidationPreferenceMessages.VIRTUAL_ATTRIBUTE_ATTRIBUTE_OVERRIDE_INVALID_NAME,                  									JpaValidationMessages.VIRTUAL_ATTRIBUTE_ATTRIBUTE_OVERRIDE_INVALID_NAME);
Lines 591-602 Link Here
591
		addLabeledCombo(parent, JptUiValidationPreferenceMessages.ID_MAPPING_UNRESOLVED_GENERATOR_NAME, JpaValidationMessages.ID_MAPPING_UNRESOLVED_GENERATOR_NAME);
591
		addLabeledCombo(parent, JptUiValidationPreferenceMessages.ID_MAPPING_UNRESOLVED_GENERATOR_NAME, JpaValidationMessages.ID_MAPPING_UNRESOLVED_GENERATOR_NAME);
592
		addLabeledCombo(parent, JptUiValidationPreferenceMessages.GENERATED_VALUE_UNRESOLVED_GENERATOR, JpaValidationMessages.GENERATED_VALUE_UNRESOLVED_GENERATOR);
592
		addLabeledCombo(parent, JptUiValidationPreferenceMessages.GENERATED_VALUE_UNRESOLVED_GENERATOR, JpaValidationMessages.GENERATED_VALUE_UNRESOLVED_GENERATOR);
593
		addLabeledCombo(parent, JptUiValidationPreferenceMessages.QUERY_DUPLICATE_NAME,                 JpaValidationMessages.QUERY_DUPLICATE_NAME);
593
		addLabeledCombo(parent, JptUiValidationPreferenceMessages.QUERY_DUPLICATE_NAME,                 JpaValidationMessages.QUERY_DUPLICATE_NAME);
594
		addLabeledCombo(parent, JptUiValidationPreferenceMessages.JPQL_QUERY_VALIDATION,                JpaValidationMessages.JPQL_QUERY_VALIDATION);
594
	}
595
	}
595
	
596
596
	private Composite addExpandableSection(Composite parent, String text) {
597
	private Composite addExpandableSection(Composite parent, String text) {
597
		return addExpandableSection(parent, text, new GridData(GridData.FILL, GridData.FILL, true, false));
598
		return addExpandableSection(parent, text, new GridData(GridData.FILL, GridData.FILL, true, false));
598
	}
599
	}
599
	
600
600
	private Composite addSubExpandableSection(Composite parent, String text) {
601
	private Composite addSubExpandableSection(Composite parent, String text) {
601
		return addExpandableSection(parent, text, new GridData(GridData.FILL, GridData.FILL, true, false, 2, 1));
602
		return addExpandableSection(parent, text, new GridData(GridData.FILL, GridData.FILL, true, false, 2, 1));
602
	}
603
	}
Lines 714-720 Link Here
714
		String preference = this.defaultSeverities.get(preferenceKey);
715
		String preference = this.defaultSeverities.get(preferenceKey);
715
		return preference == null ? JpaValidationPreferences.ERROR : preference;
716
		return preference == null ? JpaValidationPreferences.ERROR : preference;
716
	}
717
	}
717
	
718
718
	protected int convertPreferenceValueToComboIndex(String preferenceValue) {
719
	protected int convertPreferenceValueToComboIndex(String preferenceValue) {
719
		if (JpaValidationPreferences.ERROR.equals(preferenceValue)) {
720
		if (JpaValidationPreferences.ERROR.equals(preferenceValue)) {
720
			return ERROR_INDEX;
721
			return ERROR_INDEX;
Lines 778-784 Link Here
778
			revertToDefault();
779
			revertToDefault();
779
		}
780
		}
780
	}
781
	}
781
	
782
782
	@Override
783
	@Override
783
	protected void enableProjectSpecificSettings(boolean useProjectSpecificSettings) {
784
	protected void enableProjectSpecificSettings(boolean useProjectSpecificSettings) {
784
		super.enableProjectSpecificSettings(useProjectSpecificSettings);
785
		super.enableProjectSpecificSettings(useProjectSpecificSettings);
Lines 787-795 Link Here
787
			//      "otherwise the 'enable project specific settings' checkbox is being pressed")
788
			//      "otherwise the 'enable project specific settings' checkbox is being pressed")
788
			return;
789
			return;
789
		}
790
		}
790
		
791
791
		this.hasProjectSpecificPreferences = Boolean.valueOf(useProjectSpecificSettings);
792
		this.hasProjectSpecificPreferences = Boolean.valueOf(useProjectSpecificSettings);
792
		
793
793
		//set all specified workspace preferences in the project preferences
794
		//set all specified workspace preferences in the project preferences
794
		if (useProjectSpecificSettings){
795
		if (useProjectSpecificSettings){
795
			this.overrideWorkspacePreferences();
796
			this.overrideWorkspacePreferences();
Lines 812-818 Link Here
812
				preference = getDefaultPreferenceValue(preferenceKey);
813
				preference = getDefaultPreferenceValue(preferenceKey);
813
			}
814
			}
814
			combo.select(convertPreferenceValueToComboIndex(preference));
815
			combo.select(convertPreferenceValueToComboIndex(preference));
815
			//UI will show the defaults from the workspace, but set all preferences 
816
			//UI will show the defaults from the workspace, but set all preferences
816
			//to null so they will be deleted from project preferences
817
			//to null so they will be deleted from project preferences
817
			this.severityLevels.put(preferenceKey, null);
818
			this.severityLevels.put(preferenceKey, null);
818
		}
819
		}
Lines 833-839 Link Here
833
			}
834
			}
834
		}
835
		}
835
	}
836
	}
836
	
837
837
	// ********** OK/Revert/Apply behavior **********
838
	// ********** OK/Revert/Apply behavior **********
838
839
839
	@Override
840
	@Override
Lines 858-864 Link Here
858
		}
859
		}
859
		catch (InterruptedException ex) {
860
		catch (InterruptedException ex) {
860
			return false;
861
			return false;
861
		} 
862
		}
862
		catch (InvocationTargetException ex) {
863
		catch (InvocationTargetException ex) {
863
			throw new RuntimeException(ex.getTargetException());
864
			throw new RuntimeException(ex.getTargetException());
864
		}
865
		}

Return to bug 337930