Skip to content

Commit 4ec4ff6

Browse files
eclipse-platform-botakurtakov
eclipse-platform-bot
authored and
akurtakov
committed
Perform clean code of bundles/org.eclipse.jface.text
1 parent ab07e3f commit 4ec4ff6

20 files changed

+142
-0
lines changed

‎bundles/org.eclipse.jface.text/src/org/eclipse/jface/contentassist/AbstractControlContentAssistSubjectAdapter.java‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,7 @@
5353
@Deprecated
5454
public abstract class AbstractControlContentAssistSubjectAdapter implements IContentAssistSubjectControl {
5555

56+
@Deprecated
5657
protected static final boolean DEBUG= "true".equalsIgnoreCase(Platform.getDebugOption("org.eclipse.jface.text/debug/ContentAssistSubjectAdapters")); //$NON-NLS-1$//$NON-NLS-2$
5758

5859
/**
@@ -87,14 +88,17 @@ public abstract class AbstractControlContentAssistSubjectAdapter implements ICon
8788
/**
8889
* Creates a new {@link AbstractControlContentAssistSubjectAdapter}.
8990
*/
91+
@Deprecated
9092
public AbstractControlContentAssistSubjectAdapter() {
9193
fVerifyKeyListeners= new ArrayList<>(1);
9294
fKeyListeners= new HashSet<>(1);
9395
}
9496

97+
@Deprecated
9598
@Override
9699
public abstract Control getControl();
97100

101+
@Deprecated
98102
@Override
99103
public void addKeyListener(KeyListener keyListener) {
100104
fKeyListeners.add(keyListener);
@@ -106,6 +110,7 @@ public void addKeyListener(KeyListener keyListener) {
106110
installControlListener();
107111
}
108112

113+
@Deprecated
109114
@Override
110115
public void removeKeyListener(KeyListener keyListener) {
111116
boolean deleted= fKeyListeners.remove(keyListener);
@@ -120,11 +125,13 @@ public void removeKeyListener(KeyListener keyListener) {
120125
uninstallControlListener();
121126
}
122127

128+
@Deprecated
123129
@Override
124130
public boolean supportsVerifyKeyListener() {
125131
return true;
126132
}
127133

134+
@Deprecated
128135
@Override
129136
public boolean appendVerifyKeyListener(final VerifyKeyListener verifyKeyListener) {
130137
fVerifyKeyListeners.add(verifyKeyListener);
@@ -137,6 +144,7 @@ public boolean appendVerifyKeyListener(final VerifyKeyListener verifyKeyListener
137144
return true;
138145
}
139146

147+
@Deprecated
140148
@Override
141149
public boolean prependVerifyKeyListener(final VerifyKeyListener verifyKeyListener) {
142150
fVerifyKeyListeners.add(0, verifyKeyListener);
@@ -149,6 +157,7 @@ public boolean prependVerifyKeyListener(final VerifyKeyListener verifyKeyListene
149157
return true;
150158
}
151159

160+
@Deprecated
152161
@Override
153162
public void removeVerifyKeyListener(VerifyKeyListener verifyKeyListener) {
154163
fVerifyKeyListeners.remove(verifyKeyListener);
@@ -160,6 +169,7 @@ public void removeVerifyKeyListener(VerifyKeyListener verifyKeyListener) {
160169
uninstallControlListener();
161170
}
162171

172+
@Deprecated
163173
@Override
164174
public void setEventConsumer(IEventConsumer eventConsumer) {
165175
// this is not supported
@@ -168,6 +178,7 @@ public void setEventConsumer(IEventConsumer eventConsumer) {
168178
}
169179
}
170180

181+
@Deprecated
171182
@Override
172183
public String getLineDelimiter() {
173184
return System.lineSeparator();
@@ -329,6 +340,7 @@ private void uninstallControlListener() {
329340
* @param labelProvider a {@link ILabelProvider}, or <code>null</code>
330341
* if no visual feedback should be shown
331342
*/
343+
@Deprecated
332344
public void setContentAssistCueProvider(final ILabelProvider labelProvider) {
333345
if (fCueLabelProvider != null) {
334346
fCueLabelProvider.dispose();

‎bundles/org.eclipse.jface.text/src/org/eclipse/jface/contentassist/ComboContentAssistSubjectAdapter.java‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -88,27 +88,32 @@ public void replace(int pos, int length, String text) throws BadLocationExceptio
8888
*
8989
* @param combo the combo to adapt
9090
*/
91+
@Deprecated
9192
public ComboContentAssistSubjectAdapter(Combo combo) {
9293
Assert.isNotNull(combo);
9394
fCombo= combo;
9495
fModifyListeners= new HashMap<>();
9596
}
9697

98+
@Deprecated
9799
@Override
98100
public Control getControl() {
99101
return fCombo;
100102
}
101103

104+
@Deprecated
102105
@Override
103106
public int getLineHeight() {
104107
return fCombo.getTextHeight();
105108
}
106109

110+
@Deprecated
107111
@Override
108112
public int getCaretOffset() {
109113
return fCombo.getCaretPosition();
110114
}
111115

116+
@Deprecated
112117
@Override
113118
public Point getLocationAtOffset(int offset) {
114119
String comboString= fCombo.getText();
@@ -124,16 +129,19 @@ public Point getLocationAtOffset(int offset) {
124129
return new Point(x, fCombo.getClientArea().y);
125130
}
126131

132+
@Deprecated
127133
@Override
128134
public Point getWidgetSelectionRange() {
129135
return new Point(fCombo.getSelection().x, Math.abs(fCombo.getSelection().y - fCombo.getSelection().x));
130136
}
131137

138+
@Deprecated
132139
@Override
133140
public Point getSelectedRange() {
134141
return new Point(fCombo.getSelection().x, Math.abs(fCombo.getSelection().y - fCombo.getSelection().x));
135142
}
136143

144+
@Deprecated
137145
@Override
138146
public IDocument getDocument() {
139147
IDocument document= (IDocument)fCombo.getData("document"); //$NON-NLS-1$
@@ -144,17 +152,20 @@ public IDocument getDocument() {
144152
return document;
145153
}
146154

155+
@Deprecated
147156
@Override
148157
public void setSelectedRange(int i, int j) {
149158
fCombo.setSelection(new Point(i, i+j));
150159
}
151160

161+
@Deprecated
152162
@Override
153163
public void revealRange(int i, int j) {
154164
// XXX: this should be improved
155165
fCombo.setSelection(new Point(i, i+j));
156166
}
157167

168+
@Deprecated
158169
@Override
159170
public boolean addSelectionListener(final SelectionListener selectionListener) {
160171
fCombo.addSelectionListener(selectionListener);
@@ -164,6 +175,7 @@ public boolean addSelectionListener(final SelectionListener selectionListener) {
164175
return true;
165176
}
166177

178+
@Deprecated
167179
@Override
168180
public void removeSelectionListener(SelectionListener selectionListener) {
169181
fCombo.removeSelectionListener(selectionListener);

‎bundles/org.eclipse.jface.text/src/org/eclipse/jface/contentassist/ISubjectControlContentAssistProcessor.java‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@ public interface ISubjectControlContentAssistProcessor extends IContentAssistPro
4141
* @return an array of completion proposals or <code>null</code> if no
4242
* proposals are possible
4343
*/
44+
@Deprecated
4445
ICompletionProposal[] computeCompletionProposals(IContentAssistSubjectControl contentAssistSubjectControl, int documentOffset);
4546

4647
/**
@@ -55,5 +56,6 @@ public interface ISubjectControlContentAssistProcessor extends IContentAssistPro
5556
* @return an array of context information objects or <code>null</code>
5657
* if no context could be found
5758
*/
59+
@Deprecated
5860
IContextInformation[] computeContextInformation(IContentAssistSubjectControl contentAssistSubjectControl, int documentOffset);
5961
}

‎bundles/org.eclipse.jface.text/src/org/eclipse/jface/contentassist/ISubjectControlContentAssistant.java‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,5 +32,6 @@ public interface ISubjectControlContentAssistant extends IContentAssistant {
3232
*
3333
* @param contentAssistSubjectControl the one who requests content assist
3434
*/
35+
@Deprecated
3536
void install(IContentAssistSubjectControl contentAssistSubjectControl);
3637
}

‎bundles/org.eclipse.jface.text/src/org/eclipse/jface/contentassist/ISubjectControlContextInformationPresenter.java‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,5 +35,6 @@ public interface ISubjectControlContextInformationPresenter extends IContextInfo
3535
* @param contentAssistSubjectControl the content assist subject control
3636
* @param offset the document offset for which the information has been computed
3737
*/
38+
@Deprecated
3839
void install(IContextInformation info, IContentAssistSubjectControl contentAssistSubjectControl, int offset);
3940
}

‎bundles/org.eclipse.jface.text/src/org/eclipse/jface/contentassist/ISubjectControlContextInformationValidator.java‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,5 +36,6 @@ public interface ISubjectControlContextInformationValidator extends IContextInfo
3636
* @param offset the document offset for which the information
3737
* has been computed
3838
*/
39+
@Deprecated
3940
void install(IContextInformation info, IContentAssistSubjectControl contentAssistSubjectControl, int offset);
4041
}

‎bundles/org.eclipse.jface.text/src/org/eclipse/jface/contentassist/SubjectControlContentAssistant.java‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@
2626
@Deprecated
2727
public class SubjectControlContentAssistant extends org.eclipse.jface.text.contentassist.ContentAssistant implements ISubjectControlContentAssistant {
2828

29+
@Deprecated
2930
@Override
3031
public void install(IContentAssistSubjectControl contentAssistSubjectControl) {
3132
Assert.isNotNull(contentAssistSubjectControl);

‎bundles/org.eclipse.jface.text/src/org/eclipse/jface/contentassist/SubjectControlContextInformationValidator.java‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,21 +44,25 @@ public final class SubjectControlContextInformationValidator implements ISubject
4444
*
4545
* @param processor the processor to be used for validation
4646
*/
47+
@Deprecated
4748
public SubjectControlContextInformationValidator(IContentAssistProcessor processor) {
4849
fProcessor= processor;
4950
}
5051

52+
@Deprecated
5153
@Override
5254
public void install(IContextInformation contextInformation, ITextViewer viewer, int offset) {
5355
throw new UnsupportedOperationException();
5456
}
5557

58+
@Deprecated
5659
@Override
5760
public void install(IContextInformation contextInformation, IContentAssistSubjectControl contentAssistSubjectControl, int offset) {
5861
fContextInformation= contextInformation;
5962
fContentAssistSubjectControl= contentAssistSubjectControl;
6063
}
6164

65+
@Deprecated
6266
@Override
6367
public boolean isContextInformationValid(int offset) {
6468
if (fContentAssistSubjectControl != null && fProcessor instanceof ISubjectControlContentAssistProcessor) {

‎bundles/org.eclipse.jface.text/src/org/eclipse/jface/contentassist/TextContentAssistSubjectAdapter.java‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -77,26 +77,31 @@ public void replace(int pos, int length, String text) throws BadLocationExceptio
7777
*
7878
* @param text the text widget to adapt
7979
*/
80+
@Deprecated
8081
public TextContentAssistSubjectAdapter(Text text) {
8182
Assert.isNotNull(text);
8283
fText= text;
8384
}
8485

86+
@Deprecated
8587
@Override
8688
public Control getControl() {
8789
return fText;
8890
}
8991

92+
@Deprecated
9093
@Override
9194
public int getLineHeight() {
9295
return fText.getLineHeight();
9396
}
9497

98+
@Deprecated
9599
@Override
96100
public int getCaretOffset() {
97101
return fText.getCaretPosition();
98102
}
99103

104+
@Deprecated
100105
@Override
101106
public Point getLocationAtOffset(int offset) {
102107
Point caretLocation= fText.getCaretLocation();
@@ -107,16 +112,19 @@ public Point getLocationAtOffset(int offset) {
107112
return caretLocation;
108113
}
109114

115+
@Deprecated
110116
@Override
111117
public Point getWidgetSelectionRange() {
112118
return new Point(fText.getSelection().x, Math.abs(fText.getSelection().y - fText.getSelection().x));
113119
}
114120

121+
@Deprecated
115122
@Override
116123
public Point getSelectedRange() {
117124
return new Point(fText.getSelection().x, Math.abs(fText.getSelection().y - fText.getSelection().x));
118125
}
119126

127+
@Deprecated
120128
@Override
121129
public IDocument getDocument() {
122130
IDocument document= (IDocument)fText.getData("document"); //$NON-NLS-1$
@@ -127,17 +135,20 @@ public IDocument getDocument() {
127135
return document;
128136
}
129137

138+
@Deprecated
130139
@Override
131140
public void setSelectedRange(int i, int j) {
132141
fText.setSelection(new Point(i, i+j));
133142
}
134143

144+
@Deprecated
135145
@Override
136146
public void revealRange(int i, int j) {
137147
// XXX: this should be improved
138148
fText.setSelection(new Point(i, i+j));
139149
}
140150

151+
@Deprecated
141152
@Override
142153
public boolean addSelectionListener(final SelectionListener selectionListener) {
143154
fText.addSelectionListener(selectionListener);
@@ -147,6 +158,7 @@ public boolean addSelectionListener(final SelectionListener selectionListener) {
147158
return true;
148159
}
149160

161+
@Deprecated
150162
@Override
151163
public void removeSelectionListener(SelectionListener selectionListener) {
152164
fText.removeSelectionListener(selectionListener);

0 commit comments

Comments
 (0)