-
Notifications
You must be signed in to change notification settings - Fork 1
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.
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
Add Index Checker annotations #2
base: master
Are you sure you want to change the base?
Changes from all commits
2ab3356
def1f40
d64daa4
4fb83b3
3df94d1
0c85993
18d524b
38a283b
1c4c2bf
86154e5
1f24c04
34f6086
bc6dc86
731f19b
3dbc048
56ef4ca
8d9a536
a02a68a
ff61de0
4b3f6e7
7df959f
459770f
cfdb626
61c1649
a04f724
bba4571
8c5de67
8ae6208
315c75e
b5947d3
47c9284
8045aa5
1cf2d12
055a8b1
dc8ae7f
55038b9
a2e017a
b5cf5fb
9ccdcd4
c91631b
eb569c8
731eccd
a922df9
de27638
4126044
b1c6a5a
31342e8
66ca971
59208e9
280a385
67d6f87
6c78aed
164e57a
b3f8b47
eb918a7
9a26b56
3a5f674
446de1a
48d91b0
6312c5e
f71225f
ba66e2a
c32ec43
e78d4ce
f19cea1
6eaddd4
4752f0d
893f9b1
520a4be
fb40637
787248d
468caee
2852491
90dd716
67929f4
3bf0c0a
3d284b2
fc51946
9febaa0
7532528
6fbf1c1
b24c696
2514371
5632a20
4d42a42
7db9d8f
35c8d58
a88a6cf
a4fb36d
0508981
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,4 @@ | ||
language: java | ||
sudo: false | ||
script: | ||
- travis_wait mvn compile |
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -59,31 +59,78 @@ | |
<version>4.11</version> | ||
<scope>test</scope> | ||
</dependency> | ||
<!-- Annotations from the Checker Framework: nullness, interning, locking, ... --> | ||
<dependency> | ||
<groupId>org.checkerframework</groupId> | ||
<artifactId>checker-qual</artifactId> | ||
<version>2.5.1</version> | ||
</dependency> | ||
<dependency> | ||
<groupId>org.checkerframework</groupId> | ||
<artifactId>jdk8</artifactId> | ||
<version>2.5.1</version> | ||
</dependency> | ||
</dependencies> | ||
|
||
<distributionManagement> | ||
<snapshotRepository> | ||
<id>ossrh</id> | ||
<url>https://oss.sonatype.org/content/repositories/snapshots</url> | ||
</snapshotRepository> | ||
</distributionManagement> | ||
</distributionManagement> | ||
|
||
<build> | ||
<testSourceDirectory>src/test/java</testSourceDirectory> | ||
|
||
<plugins> | ||
|
||
<plugin> | ||
<groupId>org.apache.maven.plugins</groupId> | ||
<artifactId>maven-compiler-plugin</artifactId> | ||
<version>3.7.0</version> | ||
<configuration> | ||
<source>${project.source.level}</source> | ||
<target>${project.target.level}</target> | ||
<encoding>${project.build.sourceEncoding}</encoding> | ||
<source>1.8</source> | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Rather than hard-coding here, why not change the version number at line 159? That will reduce the size of the diffs and make it easier to merge in future changes. |
||
<target>1.8</target> | ||
<compilerArguments> | ||
<Xmaxerrs>10000</Xmaxerrs> | ||
<Xmaxwarns>10000</Xmaxwarns> | ||
</compilerArguments> | ||
<annotationProcessorPaths> | ||
<path> | ||
<groupId>org.checkerframework</groupId> | ||
<artifactId>checker</artifactId> | ||
<version>2.5.1</version> | ||
</path> | ||
</annotationProcessorPaths> | ||
<annotationProcessors> | ||
<!-- Add all the checkers you want to enable here --> | ||
<annotationProcessor>${checkerframework.checkers}</annotationProcessor> | ||
</annotationProcessors> | ||
<compilerArgs> | ||
<arg>-AprintErrorStack</arg> | ||
<!-- location of the annotated JDK, which comes from a Maven dependency --> | ||
<arg>-Xbootclasspath/p:${annotatedJdk}</arg> | ||
<arg>-AskipDefs=Test</arg> | ||
<arg>${checkerframework.extraargs}</arg> | ||
<arg>${checkerframework.extraargs2}</arg> | ||
<!-- Uncomment the following line to turn type-checking warnings into errors. --> | ||
<!-- <arg>-Awarns</arg> --> | ||
</compilerArgs> | ||
</configuration> | ||
</plugin> | ||
|
||
<plugin> | ||
<!-- This plugin will set properties values using dependency information --> | ||
<groupId>org.apache.maven.plugins</groupId> | ||
<artifactId>maven-dependency-plugin</artifactId> | ||
<executions> | ||
<execution> | ||
<goals> | ||
<goal>properties</goal> | ||
</goals> | ||
</execution> | ||
</executions> | ||
</plugin> | ||
|
||
<plugin> | ||
<groupId>org.apache.maven.plugins</groupId> | ||
<artifactId>maven-surefire-plugin</artifactId> | ||
|
@@ -155,9 +202,15 @@ | |
</reporting> | ||
|
||
<properties> | ||
<project.source.level>1.8</project.source.level> | ||
<project.target.level>1.8</project.target.level> | ||
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> | ||
<project.source.level>1.6</project.source.level> | ||
<project.target.level>1.6</project.target.level> | ||
<!-- These properties will be set by the Maven Dependency plugin --> | ||
<annotatedJdk>${org.checkerframework:jdk8:jar}</annotatedJdk> | ||
<!-- These properties are here for convenience when modifying the build from the command line --> | ||
<checkerframework.checkers>org.checkerframework.checker.index.IndexChecker</checkerframework.checkers> | ||
<checkerframework.extraargs></checkerframework.extraargs> | ||
<checkerframework.extraargs2></checkerframework.extraargs2> | ||
</properties> | ||
|
||
<profiles> | ||
|
@@ -225,6 +278,19 @@ | |
</executions> | ||
</plugin> | ||
|
||
<plugin> | ||
<!-- This plugin will set properties values using dependency information --> | ||
<groupId>org.apache.maven.plugins</groupId> | ||
<artifactId>maven-dependency-plugin</artifactId> | ||
<executions> | ||
<execution> | ||
<goals> | ||
<goal>properties</goal> | ||
</goals> | ||
</execution> | ||
</executions> | ||
</plugin> | ||
|
||
</plugins> | ||
</build> | ||
</profile> | ||
|
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -2,7 +2,7 @@ | |
* JFreeChart : a free chart library for the Java(tm) platform | ||
* =========================================================== | ||
* | ||
* (C) Copyright 2000-2016, by Object Refinery Limited and Contributors. | ||
* (C) Copyright 2000-2018, by Object Refinery Limited and Contributors. | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. I don't think the copyright dates should be changed. There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. If this is because you want to revert the JFreeChart source code to an earlier version, that should be done in a separate pull request, to make this one easier to review. There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. This is different because typetools hasn't merged from upstream, but this branch has (as of about 30 minutes ago when I realized I needed to because the tests were failing!). I certainly didn't change the copyright date. I'll merge upstream into typetools/master to fix the diff. |
||
* | ||
* Project Info: http://www.jfree.org/jfreechart/index.html | ||
* | ||
|
@@ -27,17 +27,11 @@ | |
* --------------- | ||
* ChartFrame.java | ||
* --------------- | ||
* (C) Copyright 2001-2008, by Object Refinery Limited and Contributors. | ||
* (C) Copyright 2001-2018, by Object Refinery Limited and Contributors. | ||
* | ||
* Original Author: David Gilbert (for Object Refinery Limited); | ||
* Contributor(s): -; | ||
* | ||
* Changes | ||
* ------- | ||
* 22-Nov-2001 : Version 1 (DG); | ||
* 08-Jan-2001 : Added chartPanel attribute (DG); | ||
* 24-May-2002 : Renamed JFreeChartFrame --> ChartFrame (DG); | ||
* | ||
*/ | ||
|
||
package org.jfree.chart; | ||
|
@@ -75,7 +69,7 @@ public ChartFrame(String title, JFreeChart chart) { | |
public ChartFrame(String title, JFreeChart chart, boolean scrollPane) { | ||
super(title); | ||
setDefaultCloseOperation(WindowConstants.DISPOSE_ON_CLOSE); | ||
this.chartPanel = new ChartPanel(chart); | ||
this.chartPanel = new ChartPanel(chart, false); | ||
if (scrollPane) { | ||
setContentPane(new JScrollPane(this.chartPanel)); | ||
} | ||
|
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
There was (gratiutous) whitespace at the end of this line, which you removed. Please reinstate it, and review the diffs to ensure that no other whitespace changes remain.