Skip to content

Commit 2aa01b2

Browse files
committed
Issue #451: add AnonInnerLength to checkstyle config
1 parent 65e0cd3 commit 2aa01b2

16 files changed

Lines changed: 535 additions & 572 deletions

config/checkstyle-checks.xml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -750,7 +750,8 @@
750750
<property name="ignoreComments" value="true"/>
751751
</module>
752752

753-
<!-- Size Violations -->
753+
<!-- Size Violations -->
754+
<module name="AnonInnerLength"/>
754755
<module name="LambdaBodyLength"/>
755756
<module name="MethodCount">
756757
<property name="maxTotal" value="34"/>

net.sf.eclipsecs.core/src/net/sf/eclipsecs/core/config/ConfigurationReader.java

Lines changed: 2 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -155,32 +155,19 @@ private static List<Module> getModules(final Document document) {
155155
final List<Module> modules = new ArrayList<>();
156156

157157
document.accept(new VisitorSupport() {
158-
159158
@Override
160159
public void visit(final Element node) {
161-
162160
if (XMLTags.MODULE_TAG.equals(node.getName())) {
163-
164161
final String name = node.attributeValue(XMLTags.NAME_TAG);
165-
166162
final RuleMetadata metadata = MetadataFactory.getRuleMetadata(name);
167-
Module module = null;
168-
if (metadata != null) {
169-
module = new Module(metadata, true);
170-
} else {
171-
module = new Module(name);
172-
}
173-
163+
Module module = metadata != null ? new Module(metadata, true) : new Module(name);
174164
addProperties(node, module);
175165
addMessages(node, module);
176166
addMetadata(node, module);
177-
178-
// if the module has not metadata attached we create some
179-
// generic metadata
167+
// if the module has not metadata attached we create some generic metadata
180168
if (module.getMetaData() == null) {
181169
MetadataFactory.createGenericMetadata(module);
182170
}
183-
184171
modules.add(module);
185172
}
186173
}

net.sf.eclipsecs.sample/src/net/sf/eclipsecs/sample/checks/MethodLimitQuickfix.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,6 @@ protected ASTVisitor handleGetCorrectingASTVisitor(final IRegion lineInfo,
4141
@Override
4242
@SuppressWarnings("unchecked")
4343
public boolean visit(MethodDeclaration node) {
44-
4544
Javadoc doc = node.getJavadoc();
4645

4746
if (doc == null) {

net.sf.eclipsecs.ui/src/net/sf/eclipsecs/ui/ApplicationStartedHandler.java

Lines changed: 17 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -20,26 +20,24 @@
2020

2121
package net.sf.eclipsecs.ui;
2222

23-
import org.osgi.service.component.annotations.Component;
24-
import org.osgi.service.event.EventConstants;
25-
import org.osgi.service.event.EventHandler;
26-
27-
import net.sf.eclipsecs.core.jobs.AbstractCheckJob;
28-
import net.sf.eclipsecs.ui.properties.filter.CheckFileOnOpenPartListener;
29-
30-
import java.util.Collection;
31-
import java.util.Collections;
32-
import java.util.HashSet;
23+
import java.util.Arrays;
24+
import java.util.Set;
25+
import java.util.stream.Collectors;
3326

3427
import org.eclipse.e4.ui.workbench.UIEvents;
35-
import org.eclipse.ui.IEditorReference;
3628
import org.eclipse.ui.IWindowListener;
3729
import org.eclipse.ui.IWorkbench;
3830
import org.eclipse.ui.IWorkbenchPage;
3931
import org.eclipse.ui.IWorkbenchPartReference;
4032
import org.eclipse.ui.IWorkbenchWindow;
4133
import org.eclipse.ui.PlatformUI;
4234
import org.eclipse.ui.progress.IProgressService;
35+
import org.osgi.service.component.annotations.Component;
36+
import org.osgi.service.event.EventConstants;
37+
import org.osgi.service.event.EventHandler;
38+
39+
import net.sf.eclipsecs.core.jobs.AbstractCheckJob;
40+
import net.sf.eclipsecs.ui.properties.filter.CheckFileOnOpenPartListener;
4341

4442
/**
4543
* Event handler being called when the eclipse application has started.
@@ -50,7 +48,6 @@ public final class ApplicationStartedHandler implements EventHandler {
5048
private final CheckFileOnOpenPartListener mPartListener = new CheckFileOnOpenPartListener();
5149

5250
private final IWindowListener mWindowListener = new IWindowListener() {
53-
5451
@Override
5552
public void windowOpened(IWorkbenchWindow window) {
5653
window.getPartService().addPartListener(mPartListener);
@@ -63,13 +60,11 @@ public void windowActivated(IWorkbenchWindow window) {
6360
@Override
6461
public void windowClosed(IWorkbenchWindow window) {
6562
window.getPartService().removePartListener(mPartListener);
66-
6763
}
6864

6965
@Override
7066
public void windowDeactivated(IWorkbenchWindow window) {
7167
}
72-
7368
};
7469

7570
@Override
@@ -87,35 +82,20 @@ private void registerListener() {
8782
workbench.getDisplay().asyncExec(new Runnable() {
8883
@Override
8984
public void run() {
90-
91-
IWorkbenchWindow[] windows = workbench.getWorkbenchWindows();
92-
93-
for (IWorkbenchWindow window : windows) {
94-
85+
for (IWorkbenchWindow window : workbench.getWorkbenchWindows()) {
9586
if (window != null) {
96-
97-
// collect open editors and have then run against Checkstyle if
98-
// appropriate
99-
Collection<IWorkbenchPartReference> parts = new HashSet<>();
100-
101-
// add already opened files to the filter
102-
// bugfix for 2923044
103-
IWorkbenchPage[] pages = window.getPages();
104-
for (IWorkbenchPage page : pages) {
105-
106-
IEditorReference[] editorRefs = page.getEditorReferences();
107-
Collections.addAll(parts, editorRefs);
108-
}
109-
87+
// collect open editors and have then run against Checkstyle if appropriate
88+
// add already opened files to the filter - bugfix for 2923044
89+
Set<IWorkbenchPartReference> parts = Arrays.stream(window.getPages())
90+
.map(IWorkbenchPage::getEditorReferences)
91+
.flatMap(Arrays::stream)
92+
.collect(Collectors.toSet());
11093
mPartListener.partsOpened(parts);
111-
112-
// remove listener first for safety, we don't want
113-
// register the same listener twice accidently
94+
// remove listener first for safety, we don't want to register the same listener twice accidently
11495
window.getPartService().removePartListener(mPartListener);
11596
window.getPartService().addPartListener(mPartListener);
11697
}
11798
}
118-
11999
workbench.addWindowListener(mWindowListener);
120100
}
121101
});

net.sf.eclipsecs.ui/src/net/sf/eclipsecs/ui/config/CheckConfigurationPropertiesDialog.java

Lines changed: 11 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@
2525
import org.eclipse.jface.viewers.ArrayContentProvider;
2626
import org.eclipse.jface.viewers.ComboViewer;
2727
import org.eclipse.jface.viewers.ISelectionChangedListener;
28-
import org.eclipse.jface.viewers.IStructuredSelection;
2928
import org.eclipse.jface.viewers.LabelProvider;
3029
import org.eclipse.jface.viewers.SelectionChangedEvent;
3130
import org.eclipse.jface.viewers.StructuredSelection;
@@ -192,26 +191,19 @@ protected Control createDialogArea(Composite parent) {
192191
mConfigType.addSelectionChangedListener(new ISelectionChangedListener() {
193192
@Override
194193
public void selectionChanged(SelectionChangedEvent event) {
195-
if (event.getSelection() instanceof IStructuredSelection) {
196-
IConfigurationType type = (IConfigurationType) ((IStructuredSelection) event
197-
.getSelection()).getFirstElement();
198-
199-
if (mConfigType.getCombo().isEnabled()) {
200-
201-
String oldName = mCheckConfig.getName();
202-
String oldDescr = mCheckConfig.getDescription();
203-
204-
mCheckConfig = mWorkingSet.newWorkingCopy(type);
205-
try {
206-
mCheckConfig.setName(oldName);
207-
} catch (CheckstylePluginException ex) {
208-
// NOOP
209-
}
210-
mCheckConfig.setDescription(oldDescr);
194+
IConfigurationType type = (IConfigurationType) event.getStructuredSelection().getFirstElement();
195+
if (mConfigType.getCombo().isEnabled()) {
196+
String oldName = mCheckConfig.getName();
197+
String oldDescr = mCheckConfig.getDescription();
198+
mCheckConfig = mWorkingSet.newWorkingCopy(type);
199+
try {
200+
mCheckConfig.setName(oldName);
201+
} catch (CheckstylePluginException ex) {
202+
// NOOP
211203
}
212-
213-
createConfigurationEditor(mCheckConfig);
204+
mCheckConfig.setDescription(oldDescr);
214205
}
206+
createConfigurationEditor(mCheckConfig);
215207
}
216208
});
217209

net.sf.eclipsecs.ui/src/net/sf/eclipsecs/ui/quickfixes/blocks/AvoidNestedBlocksQuickfix.java

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -44,26 +44,18 @@ protected ASTVisitor handleGetCorrectingASTVisitor(final IRegion lineInfo,
4444
final int markerStartOffset) {
4545

4646
return new ASTVisitor() {
47-
4847
@SuppressWarnings("unchecked")
4948
@Override
5049
public boolean visit(Block node) {
51-
5250
if (containsPosition(lineInfo, node.getStartPosition())) {
53-
5451
if (node.getParent() instanceof Block) {
55-
5652
List<?> statements = ((Block) node.getParent()).statements();
5753
int index = statements.indexOf(node);
58-
5954
statements.remove(node);
6055
statements.addAll(index, ASTNode.copySubtrees(node.getAST(), node.statements()));
61-
6256
} else if (node.getParent() instanceof SwitchStatement) {
63-
6457
List<?> statements = ((SwitchStatement) node.getParent()).statements();
6558
int index = statements.indexOf(node);
66-
6759
statements.remove(node);
6860
statements.addAll(index, ASTNode.copySubtrees(node.getAST(), node.statements()));
6961
}

0 commit comments

Comments
 (0)