Skip to content

Commit 0b21eb1

Browse files
committed
Fix a broken test, and remove javac.source in project.properties as suggested. (Squash before merge.)
1 parent 7ffd540 commit 0b21eb1

File tree

3 files changed

+3
-3
lines changed

3 files changed

+3
-3
lines changed

ide/db/nbproject/project.properties

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@ auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.space
2828
auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.tab-size=4
2929
auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.text-limit-width=100
3030
javac.compilerargs=-Xlint -Xlint:-serial
31-
javac.source=11
3231
javac.release=11
3332
javadoc.arch=${basedir}/arch.xml
3433
javadoc.apichanges=${basedir}/apichanges.xml

ide/db/src/org/netbeans/modules/db/util/JdbcUrl.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -780,8 +780,8 @@ public String toString() {
780780
"',className='" + className + // NOI18N
781781
"',type='" + type + // NOI18N
782782
"',urlTemplate='" + urlTemplate + // NOI18N
783-
"',parseUrl,=" + parseUrl + // NOI18N
784-
"',sampleUrl,=" + sampleUrl + "]"; // NOI18N
783+
"',parseUrl=" + parseUrl + // NOI18N
784+
"',sampleUrl=" + sampleUrl + "]"; // NOI18N
785785
}
786786

787787
public String getSampleUser() {

ide/db/test/unit/src/org/netbeans/modules/db/util/DriverListUtilTest.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -703,6 +703,7 @@ private JdbcUrl checkUrl(String name, String type, String className,
703703

704704
JdbcUrl other = new JdbcUrl(url.getName(), url.getName(), url.getClassName(),
705705
url.getType(), url.getUrlTemplate(), url.isParseUrl());
706+
other.setUsernamePasswordDisplayed(url.isUsernamePasswordDisplayed());
706707

707708
assertEquals(url, other);
708709

0 commit comments

Comments
 (0)