Lines 116-121
Link Here
|
116 |
import org.eclipse.jdt.internal.corext.fix.CleanUpConstants; |
116 |
import org.eclipse.jdt.internal.corext.fix.CleanUpConstants; |
117 |
import org.eclipse.jdt.internal.corext.fix.ControlStatementsFix; |
117 |
import org.eclipse.jdt.internal.corext.fix.ControlStatementsFix; |
118 |
import org.eclipse.jdt.internal.corext.fix.ConvertLoopFix; |
118 |
import org.eclipse.jdt.internal.corext.fix.ConvertLoopFix; |
|
|
119 |
import org.eclipse.jdt.internal.corext.fix.SortModifiersFix; |
119 |
import org.eclipse.jdt.internal.corext.fix.IProposableFix; |
120 |
import org.eclipse.jdt.internal.corext.fix.IProposableFix; |
120 |
import org.eclipse.jdt.internal.corext.fix.LinkedProposalModel; |
121 |
import org.eclipse.jdt.internal.corext.fix.LinkedProposalModel; |
121 |
import org.eclipse.jdt.internal.corext.fix.VariableDeclarationFix; |
122 |
import org.eclipse.jdt.internal.corext.fix.VariableDeclarationFix; |
Lines 141-146
Link Here
|
141 |
import org.eclipse.jdt.internal.ui.JavaPluginImages; |
142 |
import org.eclipse.jdt.internal.ui.JavaPluginImages; |
142 |
import org.eclipse.jdt.internal.ui.fix.ControlStatementsCleanUp; |
143 |
import org.eclipse.jdt.internal.ui.fix.ControlStatementsCleanUp; |
143 |
import org.eclipse.jdt.internal.ui.fix.ConvertLoopCleanUp; |
144 |
import org.eclipse.jdt.internal.ui.fix.ConvertLoopCleanUp; |
|
|
145 |
import org.eclipse.jdt.internal.ui.fix.SortModifiersCleanUp; |
144 |
import org.eclipse.jdt.internal.ui.fix.VariableDeclarationCleanUp; |
146 |
import org.eclipse.jdt.internal.ui.fix.VariableDeclarationCleanUp; |
145 |
import org.eclipse.jdt.internal.ui.javaeditor.JavaEditor; |
147 |
import org.eclipse.jdt.internal.ui.javaeditor.JavaEditor; |
146 |
import org.eclipse.jdt.internal.ui.text.correction.proposals.ASTRewriteCorrectionProposal; |
148 |
import org.eclipse.jdt.internal.ui.text.correction.proposals.ASTRewriteCorrectionProposal; |
Lines 204-209
Link Here
|
204 |
|| getConvertIterableLoopProposal(context, coveringNode, null) |
206 |
|| getConvertIterableLoopProposal(context, coveringNode, null) |
205 |
|| getRemoveBlockProposals(context, coveringNode, null) |
207 |
|| getRemoveBlockProposals(context, coveringNode, null) |
206 |
|| getMakeVariableDeclarationFinalProposals(context, null) |
208 |
|| getMakeVariableDeclarationFinalProposals(context, null) |
|
|
209 |
|| getSortModifiersProposals(context, null) |
207 |
|| getMissingCaseStatementProposals(context, coveringNode, null) |
210 |
|| getMissingCaseStatementProposals(context, coveringNode, null) |
208 |
|| getConvertStringConcatenationProposals(context, null); |
211 |
|| getConvertStringConcatenationProposals(context, null); |
209 |
} |
212 |
} |
Lines 242-247
Link Here
|
242 |
getConvertIterableLoopProposal(context, coveringNode, resultingCollections); |
245 |
getConvertIterableLoopProposal(context, coveringNode, resultingCollections); |
243 |
getRemoveBlockProposals(context, coveringNode, resultingCollections); |
246 |
getRemoveBlockProposals(context, coveringNode, resultingCollections); |
244 |
getMakeVariableDeclarationFinalProposals(context, resultingCollections); |
247 |
getMakeVariableDeclarationFinalProposals(context, resultingCollections); |
|
|
248 |
getSortModifiersProposals(context, resultingCollections); |
245 |
getConvertStringConcatenationProposals(context, resultingCollections); |
249 |
getConvertStringConcatenationProposals(context, resultingCollections); |
246 |
getMissingCaseStatementProposals(context, coveringNode, resultingCollections); |
250 |
getMissingCaseStatementProposals(context, coveringNode, resultingCollections); |
247 |
} |
251 |
} |
Lines 1913-1918
Link Here
|
1913 |
return true; |
1917 |
return true; |
1914 |
} |
1918 |
} |
1915 |
|
1919 |
|
|
|
1920 |
private static boolean getSortModifiersProposals(IInvocationContext context, Collection resultingCollections) { |
1921 |
SelectionAnalyzer analyzer= new SelectionAnalyzer(Selection.createFromStartLength(context.getSelectionOffset(), context.getSelectionLength()), false); |
1922 |
context.getASTRoot().accept(analyzer); |
1923 |
ASTNode[] selectedNodes= analyzer.getSelectedNodes(); |
1924 |
if (selectedNodes.length == 0) |
1925 |
return false; |
1926 |
|
1927 |
IProposableFix fix= SortModifiersFix.createFix(context.getASTRoot(), selectedNodes); |
1928 |
if (fix == null) |
1929 |
return false; |
1930 |
|
1931 |
if (resultingCollections == null) |
1932 |
return true; |
1933 |
|
1934 |
Image image= JavaPluginImages.get(JavaPluginImages.IMG_CORRECTION_CHANGE); |
1935 |
Map options= new Hashtable(); |
1936 |
options.put(CleanUpConstants.VARIABLE_DECLARATIONS_SORT_MODIFIERS, CleanUpOptions.TRUE); |
1937 |
SortModifiersCleanUp cleanUp= new SortModifiersCleanUp(options); |
1938 |
FixCorrectionProposal proposal= new FixCorrectionProposal(fix, cleanUp, 5, image, context); |
1939 |
resultingCollections.add(proposal); |
1940 |
return true; |
1941 |
} |
1942 |
|
1916 |
private static boolean getInlineLocalProposal(IInvocationContext context, final ASTNode node, Collection proposals) throws CoreException { |
1943 |
private static boolean getInlineLocalProposal(IInvocationContext context, final ASTNode node, Collection proposals) throws CoreException { |
1917 |
if (!(node instanceof SimpleName)) |
1944 |
if (!(node instanceof SimpleName)) |
1918 |
return false; |
1945 |
return false; |