Skip to content

java analysis lints cleanup #3395

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Apr 22, 2019
Merged

java analysis lints cleanup #3395

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion src/io/flutter/inspector/InspectorInstanceRef.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@ public InspectorInstanceRef(String id) {

@Override
public boolean equals(Object other) {
//noinspection SimplifiableIfStatement
if (other instanceof InspectorInstanceRef) {
final InspectorInstanceRef otherRef = (InspectorInstanceRef)other;
return Objects.equals(id, otherRef.id);
Expand Down
1 change: 0 additions & 1 deletion src/io/flutter/logging/text/LineParser.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -227,7 +227,6 @@ else if (style instanceof Integer) {
}
}

//noinspection MagicConstant
return new SimpleTextAttributes(fontStyle, color);
}

Expand Down
1 change: 1 addition & 0 deletions src/io/flutter/run/bazelTest/BazelTestFields.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,7 @@ public class BazelTestFields {
/**
* Copy constructor
*/
@SuppressWarnings("CopyConstructorMissesField")
BazelTestFields(@NotNull BazelTestFields template) {
this(template.testName, template.entryFile, template.bazelTarget, template.additionalArgs);
}
Expand Down
14 changes: 8 additions & 6 deletions testSrc/unit/io/flutter/testing/AdaptedFixture.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,6 @@
*/
package io.flutter.testing;

import com.intellij.openapi.diagnostic.ExceptionWithAttachments;
import com.intellij.openapi.util.TraceableDisposable;
import com.intellij.testFramework.fixtures.IdeaTestFixture;
import org.junit.rules.TestRule;
import org.junit.runner.Description;
Expand Down Expand Up @@ -38,18 +36,22 @@ public void evaluate() throws Throwable {
inner = factory.create(description.getClassName());
if (runOnDispatchThread) {
Testing.runOnDispatchThread(inner::setUp);
} else {
}
else {
inner.setUp();
}
try {
base.evaluate();
} finally {
}
finally {
if (runOnDispatchThread) {
Testing.runOnDispatchThread(inner::tearDown);
} else {
}
else {
try {
inner.tearDown();
} catch (RuntimeException ex) {
}
catch (RuntimeException ex) {
// TraceableDisposable.DisposalException is private.
// It gets thrown during CodeInsightTestFixtureImpl.tearDown,
// apparently because of a Kotlin test framework convenience
Expand Down