Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
NetBeans
Apache NetBeans
Commits
9cacf1fd
Unverified
Commit
9cacf1fd
authored
Nov 11, 2021
by
Neil C Smith
Committed by
GitHub
Nov 11, 2021
Browse files
Merge pull request #3309 from apache/delivery
Merge delivery into release126 for 12.6-rc3
parents
22aebab0
c0d6b2bc
Changes
19
Hide whitespace changes
Inline
Side-by-side
enterprise/payara.tooling/src/org/netbeans/modules/payara/tooling/data/JDKVersion.java
View file @
9cacf1fd
...
...
@@ -47,6 +47,11 @@ public final class JDKVersion {
*/
private
final
Optional
<
String
>
vendor
;
/**
* JDK vm
*/
private
final
Optional
<
String
>
vm
;
private
final
static
int
MAJOR_INDEX
=
0
;
private
final
static
int
MINOR_INDEX
=
1
;
private
final
static
int
SUBMINOR_INDEX
=
2
;
...
...
@@ -58,21 +63,23 @@ public final class JDKVersion {
private
static
final
Short
DEFAULT_VALUE
=
0
;
private
JDKVersion
(
String
version
,
String
vendor
)
{
private
JDKVersion
(
String
version
,
String
vendor
,
String
vm
)
{
short
[]
versions
=
parseVersions
(
version
);
this
.
major
=
versions
[
MAJOR_INDEX
];
this
.
minor
=
Optional
.
ofNullable
(
versions
[
MINOR_INDEX
]);
this
.
subminor
=
Optional
.
ofNullable
(
versions
[
SUBMINOR_INDEX
]);
this
.
update
=
Optional
.
ofNullable
(
versions
[
UPDATE_INDEX
]);
this
.
vendor
=
Optional
.
ofNullable
(
vendor
);
this
.
vm
=
Optional
.
ofNullable
(
vm
);
}
JDKVersion
(
Short
major
,
Optional
<
Short
>
minor
,
Optional
<
Short
>
subminor
,
Optional
<
Short
>
update
,
Optional
<
String
>
vendor
)
{
JDKVersion
(
Short
major
,
Optional
<
Short
>
minor
,
Optional
<
Short
>
subminor
,
Optional
<
Short
>
update
,
Optional
<
String
>
vendor
,
Optional
<
String
>
vm
)
{
this
.
major
=
major
;
this
.
minor
=
minor
;
this
.
subminor
=
subminor
;
this
.
update
=
update
;
this
.
vendor
=
vendor
;
this
.
vm
=
vm
;
}
/**
...
...
@@ -112,7 +119,7 @@ public final class JDKVersion {
}
/**
* Get JDK Vendor.
* Get JDK Vendor
name
.
*
* @return JDK vendor.
*/
...
...
@@ -120,6 +127,15 @@ public final class JDKVersion {
return
vendor
;
}
/**
* Get JDK VM name.
*
* @return JDK vm.
*/
public
Optional
<
String
>
getVM
()
{
return
vm
;
}
public
boolean
gt
(
JDKVersion
version
)
{
if
(
major
>
version
.
getMajor
())
{
return
true
;
...
...
@@ -241,7 +257,7 @@ public final class JDKVersion {
public
static
JDKVersion
toValue
(
String
version
)
{
if
(
version
!=
null
&&
version
.
matches
(
VERSION_MATCHER
))
{
return
new
JDKVersion
(
version
,
null
);
return
new
JDKVersion
(
version
,
null
,
null
);
}
else
{
return
null
;
}
...
...
@@ -249,7 +265,15 @@ public final class JDKVersion {
public
static
JDKVersion
toValue
(
String
version
,
String
vendor
)
{
if
(
version
!=
null
&&
version
.
matches
(
VERSION_MATCHER
))
{
return
new
JDKVersion
(
version
,
vendor
);
return
new
JDKVersion
(
version
,
vendor
,
null
);
}
else
{
return
null
;
}
}
public
static
JDKVersion
toValue
(
String
version
,
String
vendor
,
String
vm
)
{
if
(
version
!=
null
&&
version
.
matches
(
VERSION_MATCHER
))
{
return
new
JDKVersion
(
version
,
vendor
,
vm
);
}
else
{
return
null
;
}
...
...
@@ -259,15 +283,12 @@ public final class JDKVersion {
return
IDE_JDK_VERSION
;
}
public
static
boolean
isCorrectJDK
(
JDKVersion
jdkVersion
,
Optional
<
String
>
vendor
,
Optional
<
JDKVersion
>
minVersion
,
Optional
<
JDKVersion
>
maxVersion
)
{
public
static
boolean
isCorrectJDK
(
JDKVersion
jdkVersion
,
Optional
<
String
>
vendor
OrVM
,
Optional
<
JDKVersion
>
minVersion
,
Optional
<
JDKVersion
>
maxVersion
)
{
boolean
correctJDK
=
true
;
if
(
vendor
.
isPresent
())
{
if
(
jdkVersion
.
getVendor
().
isPresent
())
{
correctJDK
=
jdkVersion
.
getVendor
().
get
().
contains
(
vendor
.
get
());
}
else
{
correctJDK
=
false
;
}
if
(
vendorOrVM
.
isPresent
())
{
correctJDK
=
jdkVersion
.
getVendor
().
map
(
vendor
->
vendor
.
contains
(
vendorOrVM
.
get
())).
orElse
(
false
)
||
jdkVersion
.
getVM
().
map
(
vm
->
vm
.
contains
(
vendorOrVM
.
get
())).
orElse
(
false
);
}
if
(
correctJDK
&&
minVersion
.
isPresent
())
{
correctJDK
=
jdkVersion
.
ge
(
minVersion
.
get
());
...
...
@@ -288,6 +309,7 @@ public final class JDKVersion {
private
static
void
initialize
()
{
String
vendor
=
System
.
getProperty
(
"java.vendor"
);
// NOI18N
String
vm
=
System
.
getProperty
(
"java.vm.name"
);
// NOI18N
/*
In JEP 223 java.specification.version will be a single number versioning , not a dotted versioning .
For JDK 8:
...
...
@@ -308,7 +330,8 @@ public final class JDKVersion {
Optional
.
of
(
versions
[
MINOR_INDEX
]),
Optional
.
of
(
versions
[
SUBMINOR_INDEX
]),
Optional
.
of
(
versions
[
UPDATE_INDEX
]),
Optional
.
of
(
vendor
)
Optional
.
of
(
vendor
),
Optional
.
of
(
vm
)
);
}
...
...
enterprise/payara.tooling/src/org/netbeans/modules/payara/tooling/data/StartupArgsEntity.java
View file @
9cacf1fd
...
...
@@ -187,7 +187,8 @@ public class StartupArgsEntity implements StartupArgs {
if
(
javaVersionLine
!=
null
)
{
javaVersion
=
JDKVersion
.
toValue
(
javaVersionLine
.
substring
(
javaVersionLine
.
indexOf
(
"\""
)
+
1
,
javaVersionLine
.
lastIndexOf
(
"\""
)),
// NOI18N
implementorLine
!=
null
?
implementorLine
.
substring
(
implementorLine
.
indexOf
(
"\""
)
+
1
,
implementorLine
.
lastIndexOf
(
"\""
))
:
null
// NOI18N
implementorLine
!=
null
?
implementorLine
.
substring
(
implementorLine
.
indexOf
(
"\""
)
+
1
,
implementorLine
.
lastIndexOf
(
"\""
))
:
null
,
// NOI18N
null
);
}
}
catch
(
IOException
ex
)
{
...
...
enterprise/payara.tooling/src/org/netbeans/modules/payara/tooling/server/ServerTasks.java
View file @
9cacf1fd
...
...
@@ -167,7 +167,7 @@ public class ServerTasks {
List
<
String
>
optList
=
jvmConfigReader
.
getJvmOptions
()
.
stream
()
.
filter
(
fullOption
->
JDKVersion
.
isCorrectJDK
(
javaVersion
,
fullOption
.
vendor
,
fullOption
.
minVersion
,
fullOption
.
maxVersion
))
.
filter
(
fullOption
->
JDKVersion
.
isCorrectJDK
(
javaVersion
,
fullOption
.
vendor
OrVM
,
fullOption
.
minVersion
,
fullOption
.
maxVersion
))
.
map
(
fullOption
->
fullOption
.
option
)
.
collect
(
toList
());
...
...
enterprise/payara.tooling/src/org/netbeans/modules/payara/tooling/server/parser/JvmConfigReader.java
View file @
9cacf1fd
...
...
@@ -201,7 +201,9 @@ public class JvmConfigReader extends NodeListener implements XMLReader {
public
static
class
JvmOption
{
public
final
String
option
;
@Deprecated
public
final
Optional
<
String
>
vendor
;
public
final
Optional
<
String
>
vendorOrVM
;
public
final
Optional
<
JDKVersion
>
minVersion
;
public
final
Optional
<
JDKVersion
>
maxVersion
;
...
...
@@ -217,21 +219,22 @@ public class JvmConfigReader extends NodeListener implements XMLReader {
public
JvmOption
(
String
option
)
{
Matcher
matcher
=
PATTERN
.
matcher
(
option
);
this
.
vendor
=
Optional
.
empty
();
if
(
matcher
.
matches
())
{
if
(
matcher
.
group
(
1
).
contains
(
"-"
)
// NOI18N
&&
Character
.
isLetter
(
matcher
.
group
(
1
).
charAt
(
0
)))
{
String
[]
parts
=
matcher
.
group
(
1
).
split
(
"-"
);
// NOI18N
this
.
vendor
=
Optional
.
ofNullable
(
parts
[
0
]);
this
.
vendor
OrVM
=
Optional
.
ofNullable
(
parts
[
0
]);
this
.
minVersion
=
Optional
.
ofNullable
(
JDKVersion
.
toValue
(
parts
[
1
]));
}
else
{
this
.
vendor
=
Optional
.
empty
();
this
.
vendor
OrVM
=
Optional
.
empty
();
this
.
minVersion
=
Optional
.
ofNullable
(
JDKVersion
.
toValue
(
matcher
.
group
(
1
)));
}
this
.
maxVersion
=
Optional
.
ofNullable
(
JDKVersion
.
toValue
(
matcher
.
group
(
2
)));
this
.
option
=
matcher
.
group
(
3
);
}
else
{
this
.
option
=
option
;
this
.
vendor
=
Optional
.
empty
();
this
.
vendor
OrVM
=
Optional
.
empty
();
this
.
minVersion
=
Optional
.
empty
();
this
.
maxVersion
=
Optional
.
empty
();
}
...
...
@@ -240,6 +243,7 @@ public class JvmConfigReader extends NodeListener implements XMLReader {
public
JvmOption
(
String
option
,
String
minVersion
,
String
maxVersion
)
{
this
.
option
=
option
;
this
.
vendor
=
Optional
.
empty
();
this
.
vendorOrVM
=
Optional
.
empty
();
this
.
minVersion
=
Optional
.
ofNullable
(
JDKVersion
.
toValue
(
minVersion
));
this
.
maxVersion
=
Optional
.
ofNullable
(
JDKVersion
.
toValue
(
maxVersion
));
}
...
...
enterprise/payara.tooling/test/unit/src/org/netbeans/modules/payara/tooling/data/JDKVersionTest.java
View file @
9cacf1fd
...
...
@@ -40,23 +40,23 @@ public class JDKVersionTest {
public
void
parseJDKVersion
()
{
Map
<
String
,
JDKVersion
>
jdkVersions
=
new
HashMap
<>();
jdkVersions
.
put
(
"1.8"
,
new
JDKVersion
((
short
)
1
,
Optional
.
of
((
short
)
8
),
Optional
.
of
((
short
)
0
),
Optional
.
of
((
short
)
0
),
Optional
.
empty
()));
new
JDKVersion
((
short
)
1
,
Optional
.
of
((
short
)
8
),
Optional
.
of
((
short
)
0
),
Optional
.
of
((
short
)
0
),
Optional
.
empty
(),
Optional
.
empty
()));
jdkVersions
.
put
(
"1.8.0"
,
new
JDKVersion
((
short
)
1
,
Optional
.
of
((
short
)
8
),
Optional
.
of
((
short
)
0
),
Optional
.
of
((
short
)
0
),
Optional
.
empty
()));
new
JDKVersion
((
short
)
1
,
Optional
.
of
((
short
)
8
),
Optional
.
of
((
short
)
0
),
Optional
.
of
((
short
)
0
),
Optional
.
empty
(),
Optional
.
empty
()));
jdkVersions
.
put
(
"1.8.0u121"
,
new
JDKVersion
((
short
)
1
,
Optional
.
of
((
short
)
8
),
Optional
.
of
((
short
)
0
),
Optional
.
of
((
short
)
121
),
Optional
.
empty
()));
new
JDKVersion
((
short
)
1
,
Optional
.
of
((
short
)
8
),
Optional
.
of
((
short
)
0
),
Optional
.
of
((
short
)
121
),
Optional
.
empty
(),
Optional
.
empty
()));
jdkVersions
.
put
(
"1.8.0_191"
,
new
JDKVersion
((
short
)
1
,
Optional
.
of
((
short
)
8
),
Optional
.
of
((
short
)
0
),
Optional
.
of
((
short
)
191
),
Optional
.
empty
()));
new
JDKVersion
((
short
)
1
,
Optional
.
of
((
short
)
8
),
Optional
.
of
((
short
)
0
),
Optional
.
of
((
short
)
191
),
Optional
.
empty
(),
Optional
.
empty
()));
jdkVersions
.
put
(
"1.8.0_232-ea-8u232-b09-0ubuntu1-b09"
,
new
JDKVersion
((
short
)
1
,
Optional
.
of
((
short
)
8
),
Optional
.
of
((
short
)
0
),
Optional
.
of
((
short
)
232
),
Optional
.
empty
()));
new
JDKVersion
((
short
)
1
,
Optional
.
of
((
short
)
8
),
Optional
.
of
((
short
)
0
),
Optional
.
of
((
short
)
232
),
Optional
.
empty
(),
Optional
.
empty
()));
jdkVersions
.
put
(
"9"
,
new
JDKVersion
((
short
)
9
,
Optional
.
of
((
short
)
0
),
Optional
.
of
((
short
)
0
),
Optional
.
of
((
short
)
0
),
Optional
.
empty
()));
new
JDKVersion
((
short
)
9
,
Optional
.
of
((
short
)
0
),
Optional
.
of
((
short
)
0
),
Optional
.
of
((
short
)
0
),
Optional
.
empty
(),
Optional
.
empty
()));
jdkVersions
.
put
(
"11.0.6"
,
new
JDKVersion
((
short
)
11
,
Optional
.
of
((
short
)
0
),
Optional
.
of
((
short
)
6
),
Optional
.
of
((
short
)
0
),
Optional
.
empty
()));
new
JDKVersion
((
short
)
11
,
Optional
.
of
((
short
)
0
),
Optional
.
of
((
short
)
6
),
Optional
.
of
((
short
)
0
),
Optional
.
empty
(),
Optional
.
empty
()));
jdkVersions
.
put
(
"11.0.6_234"
,
new
JDKVersion
((
short
)
11
,
Optional
.
of
((
short
)
0
),
Optional
.
of
((
short
)
6
),
Optional
.
of
((
short
)
234
),
Optional
.
empty
()));
new
JDKVersion
((
short
)
11
,
Optional
.
of
((
short
)
0
),
Optional
.
of
((
short
)
6
),
Optional
.
of
((
short
)
234
),
Optional
.
empty
(),
Optional
.
empty
()));
jdkVersions
.
put
(
"11.0.6u234"
,
new
JDKVersion
((
short
)
11
,
Optional
.
of
((
short
)
0
),
Optional
.
of
((
short
)
6
),
Optional
.
of
((
short
)
234
),
Optional
.
empty
()));
new
JDKVersion
((
short
)
11
,
Optional
.
of
((
short
)
0
),
Optional
.
of
((
short
)
6
),
Optional
.
of
((
short
)
234
),
Optional
.
empty
(),
Optional
.
empty
()));
for
(
Entry
<
String
,
JDKVersion
>
version
:
jdkVersions
.
entrySet
())
{
assertTrue
(
JDKVersion
.
toValue
(
version
.
getKey
()).
equals
(
version
.
getValue
()),
version
.
getKey
());
...
...
extide/gradle/src/org/netbeans/modules/gradle/queries/Info.java
View file @
9cacf1fd
...
...
@@ -69,7 +69,11 @@ public final class Info implements ProjectInformation, PropertyChangeListener {
@Override
public
String
getName
()
{
final
NbGradleProject
nb
=
NbGradleProject
.
get
(
project
);
GradleBaseProject
prj
=
GradleBaseProject
.
get
(
project
);
if
(!
nb
.
isGradleProjectLoaded
()
||
prj
==
null
||
prj
.
getName
()
==
null
)
{
return
project
.
getProjectDirectory
().
getNameExt
();
}
String
ret
=
prj
.
isRoot
()
?
prj
.
getName
()
:
prj
.
getRootDir
().
getName
()
+
prj
.
getPath
();
return
ret
;
...
...
extide/gradle/test/unit/src/org/netbeans/modules/gradle/AbstractGradleProjectTestCase.java
View file @
9cacf1fd
...
...
@@ -87,6 +87,11 @@ public class AbstractGradleProjectTestCase extends NbTestCase {
}).
get
();
}
protected
void
dumpProject
(
Project
project
){
NbGradleProjectImpl
impl
=
(
NbGradleProjectImpl
)
project
;
impl
.
dumpProject
();
}
protected
FileObject
createGradleProject
(
String
path
,
String
buildScript
,
String
settingsScript
)
throws
IOException
{
FileObject
ret
=
FileUtil
.
toFileObject
(
getWorkDir
());
if
(
path
!=
null
)
{
...
...
extide/libs.gradle/external/binaries-list
View file @
9cacf1fd
...
...
@@ -14,4 +14,4 @@
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
B2123DF25C938DD072C7D07716629AABEF0ABD10 gradle-tooling-api-7.3-rc-1.jar
\ No newline at end of file
526C85998C50C960237920A9D98580F35801525D gradle-tooling-api-7.3.jar
\ No newline at end of file
extide/libs.gradle/external/gradle-tooling-api-7.3-
rc-1-
license.txt
→
extide/libs.gradle/external/gradle-tooling-api-7.3-license.txt
View file @
9cacf1fd
Name: Gradle Wrapper
Description: Gradle Tooling API
Version: 7.3
-rc-1
Files: gradle-tooling-api-7.3
-rc-1
.jar
Version: 7.3
Files: gradle-tooling-api-7.3.jar
License: Apache-2.0
Origin: Gradle Inc.
URL: https://gradle.org/
...
...
extide/libs.gradle/external/gradle-tooling-api-7.3-
rc-1-
notice.txt
→
extide/libs.gradle/external/gradle-tooling-api-7.3-notice.txt
View file @
9cacf1fd
File moved
extide/libs.gradle/nbproject/project.properties
View file @
9cacf1fd
...
...
@@ -22,4 +22,4 @@ javac.compilerargs=-Xlint -Xlint:-serial
# For more information, please see http://wiki.netbeans.org/SignatureTest
sigtest.gen.fail.on.error
=
false
release.external/
gradle-tooling-api-7.3
-rc-1
.jar
=
modules/gradle/gradle-tooling-api.jar
release.external/
gradle-tooling-api-7.3.jar
=
modules/gradle/gradle-tooling-api.jar
extide/libs.gradle/nbproject/project.xml
View file @
9cacf1fd
...
...
@@ -39,7 +39,7 @@
</public-packages>
<class-path-extension>
<runtime-relative-path>
gradle/gradle-tooling-api.jar
</runtime-relative-path>
<binary-origin>
external/gradle-tooling-api-7.3
-rc-1
.jar
</binary-origin>
<binary-origin>
external/gradle-tooling-api-7.3.jar
</binary-origin>
</class-path-extension>
</data>
</configuration>
...
...
ide/git/src/org/netbeans/modules/git/ui/history/SearchHistoryAction.java
View file @
9cacf1fd
...
...
@@ -63,63 +63,54 @@ public class SearchHistoryAction extends MultipleRepositoryAction {
}
public
static
void
openSearch
(
final
File
repository
,
final
File
[]
roots
,
final
String
branchName
,
final
String
contextName
)
{
openSearch
(
repository
,
roots
,
branchName
,
contextName
,
roots
!=
null
&&
(
roots
.
length
==
1
&&
roots
[
0
].
isFile
()
||
roots
.
length
>
1
&&
Utils
.
shareCommonDataObject
(
roots
)));
openSearch
(
repository
,
roots
,
branchName
,
contextName
,
roots
!=
null
&&
(
roots
.
length
==
1
||
roots
.
length
>
1
&&
Utils
.
shareCommonDataObject
(
roots
)));
}
public
static
void
openSearch
(
final
File
repository
,
final
File
[]
roots
,
final
String
branchName
,
final
String
contextName
,
final
boolean
invokeSearch
)
{
final
String
title
=
NbBundle
.
getMessage
(
SearchHistoryTopComponent
.
class
,
"LBL_SearchHistoryTopComponent.title"
,
contextName
);
final
RepositoryInfo
info
=
RepositoryInfo
.
getInstance
(
repository
);
EventQueue
.
invokeLater
(
new
Runnable
()
{
@Override
public
void
run
()
{
SearchHistoryTopComponent
tc
=
new
SearchHistoryTopComponent
(
repository
,
info
,
roots
);
tc
.
setBranch
(
branchName
);
tc
.
setDisplayName
(
title
);
tc
.
open
();
tc
.
requestActive
();
if
(
invokeSearch
)
{
tc
.
search
(
false
);
}
EventQueue
.
invokeLater
(()
->
{
SearchHistoryTopComponent
tc
=
new
SearchHistoryTopComponent
(
repository
,
info
,
roots
);
tc
.
setBranch
(
branchName
);
tc
.
setDisplayName
(
title
);
tc
.
open
();
tc
.
requestActive
();
if
(
invokeSearch
)
{
tc
.
search
(
false
);
}
});
}
public
static
void
openSearch
(
final
File
repository
,
final
File
root
,
final
String
contextName
,
final
String
commitIdFrom
,
final
String
commitIdTo
)
{
public
static
void
openSearch
(
final
File
repository
,
final
File
root
,
final
String
contextName
,
final
String
commitIdFrom
,
final
String
commitIdTo
)
{
final
String
title
=
NbBundle
.
getMessage
(
SearchHistoryTopComponent
.
class
,
"LBL_SearchHistoryTopComponent.title"
,
contextName
);
final
RepositoryInfo
info
=
RepositoryInfo
.
getInstance
(
repository
);
Mutex
.
EVENT
.
readAccess
(
new
Runnable
()
{
@Override
public
void
run
()
{
SearchHistoryTopComponent
tc
=
new
SearchHistoryTopComponent
(
repository
,
info
,
new
File
[]
{
root
});
tc
.
setDisplayName
(
title
);
tc
.
open
();
tc
.
requestActive
();
tc
.
setSearchCommitFrom
(
commitIdFrom
);
tc
.
setSearchCommitTo
(
commitIdTo
);
tc
.
search
(
true
);
}
Mutex
.
EVENT
.
readAccess
(()
->
{
SearchHistoryTopComponent
tc
=
new
SearchHistoryTopComponent
(
repository
,
info
,
new
File
[]
{
root
});
tc
.
setDisplayName
(
title
);
tc
.
open
();
tc
.
requestActive
();
tc
.
setSearchCommitFrom
(
commitIdFrom
);
tc
.
setSearchCommitTo
(
commitIdTo
);
tc
.
search
(
true
);
});
}
public
static
void
openSearch
(
final
File
repository
,
final
File
root
,
final
String
contextName
,
final
int
lineNumber
)
{
final
String
title
=
NbBundle
.
getMessage
(
SearchHistoryTopComponent
.
class
,
"LBL_SearchHistoryTopComponent.title"
,
contextName
);
final
RepositoryInfo
info
=
RepositoryInfo
.
getInstance
(
repository
);
EventQueue
.
invokeLater
(
new
Runnable
()
{
@Override
public
void
run
()
{
SearchHistoryTopComponent
tc
=
new
SearchHistoryTopComponent
(
repository
,
info
,
root
,
new
SearchHistoryTopComponent
.
DiffResultsViewFactory
()
{
@Override
DiffResultsView
createDiffResultsView
(
SearchHistoryPanel
panel
,
List
<
RepositoryRevision
>
results
)
{
return
new
DiffResultsViewForLine
(
panel
,
results
,
lineNumber
);
}
});
tc
.
setDisplayName
(
title
);
tc
.
open
();
tc
.
requestActive
();
tc
.
search
(
true
);
tc
.
activateDiffView
(
true
);
}
EventQueue
.
invokeLater
(()
->
{
SearchHistoryTopComponent
tc
=
new
SearchHistoryTopComponent
(
repository
,
info
,
root
,
new
SearchHistoryTopComponent
.
DiffResultsViewFactory
()
{
@Override
DiffResultsView
createDiffResultsView
(
SearchHistoryPanel
panel
,
List
<
RepositoryRevision
>
results
)
{
return
new
DiffResultsViewForLine
(
panel
,
results
,
lineNumber
);
}
});
tc
.
setDisplayName
(
title
);
tc
.
open
();
tc
.
requestActive
();
tc
.
search
(
true
);
tc
.
activateDiffView
(
true
);
});
}
...
...
ide/libs.graalsdk/src/org/netbeans/libs/graalsdk/impl/GraalEngine.java
View file @
9cacf1fd
...
...
@@ -173,13 +173,17 @@ final class GraalEngine implements ScriptEngine, Invocable {
@Override
public
<
T
>
T
getInterface
(
Object
thiz
,
Class
<
T
>
clasz
)
{
if
(
thiz
instanceof
Value
)
{
return
((
Value
)
thiz
).
as
(
clasz
);
}
Value
v
=
factory
.
ctx
.
ctx
().
asValue
(
thiz
);
T
ret
=
v
.
as
(
clasz
);
if
(
ret
!=
null
)
{
return
ret
;
try
{
if
(
thiz
instanceof
Value
)
{
return
((
Value
)
thiz
).
as
(
clasz
);
}
Value
v
=
factory
.
ctx
.
ctx
().
asValue
(
thiz
);
T
ret
=
v
.
as
(
clasz
);
if
(
ret
!=
null
)
{
return
ret
;
}
}
catch
(
ClassCastException
ex
)
{
// the interface is not supported on the value object; ignore.
}
if
(
clasz
.
isInstance
(
thiz
))
{
return
clasz
.
cast
(
thiz
);
...
...
java/debugger.jpda.truffle/src/org/netbeans/modules/debugger/jpda/truffle/access/TruffleAccess.java
View file @
9cacf1fd
...
...
@@ -457,10 +457,11 @@ public class TruffleAccess implements JPDABreakpointListener {
private
static
HitBreakpointInfo
[]
getBreakpointInfos
(
ExecutionHaltedInfo
haltedInfo
,
JPDAThread
thread
)
{
ObjectVariable
[]
breakpointsHit
=
haltedInfo
.
breakpointsHit
;
ObjectVariable
[]
breakpointConditionExceptions
=
haltedInfo
.
breakpointConditionExceptions
;
int
n
=
breakpointsHit
.
length
;
int
n
=
(
breakpointsHit
!=
null
)
?
breakpointsHit
.
length
:
0
;
HitBreakpointInfo
[]
breakpointInfos
=
null
;
for
(
int
i
=
0
;
i
<
n
;
i
++)
{
HitBreakpointInfo
breakpointInfo
=
HitBreakpointInfo
.
create
(
breakpointsHit
[
i
],
breakpointConditionExceptions
[
i
]);
ObjectVariable
exception
=
(
breakpointConditionExceptions
!=
null
)
?
breakpointConditionExceptions
[
i
]
:
null
;
HitBreakpointInfo
breakpointInfo
=
HitBreakpointInfo
.
create
(
breakpointsHit
[
i
],
exception
);
if
(
breakpointInfo
!=
null
)
{
if
(
breakpointInfos
==
null
)
{
breakpointInfos
=
new
HitBreakpointInfo
[]
{
breakpointInfo
};
...
...
java/java.hints/src/org/netbeans/modules/java/hints/jdk/mapreduce/ForLoopToFunctionalHint.java
View file @
9cacf1fd
...
...
@@ -26,10 +26,10 @@ import com.sun.source.tree.EnhancedForLoopTree;
import
com.sun.source.tree.StatementTree
;
import
com.sun.source.tree.Tree
;
import
com.sun.source.util.TreePath
;
import
javax.lang.model.SourceVersion
;
import
org.netbeans.api.java.source.CompilationInfo
;
import
org.netbeans.spi.editor.hints.ErrorDescription
;
import
org.netbeans.spi.editor.hints.Fix
;
import
org.netbeans.spi.editor.hints.Severity
;
import
org.netbeans.spi.java.hints.ErrorDescriptionFactory
;
import
org.netbeans.spi.java.hints.Hint
;
import
org.netbeans.spi.java.hints.HintContext
;
...
...
@@ -37,8 +37,7 @@ import org.netbeans.spi.java.hints.JavaFix;
import
org.netbeans.spi.java.hints.TriggerTreeKind
;
import
org.openide.util.NbBundle.Messages
;
@Hint
(
displayName
=
"#DN_ForLoopToFunctionalHint"
,
description
=
"#DESC_ForLoopToFunctionalHint"
,
category
=
"general"
,
minSourceVersion
=
"8"
)
@Hint
(
displayName
=
"#DN_ForLoopToFunctionalHint"
,
description
=
"#DESC_ForLoopToFunctionalHint"
,
category
=
"general"
,
severity
=
Severity
.
HINT
,
minSourceVersion
=
"8"
)
@Messages
({
"DN_ForLoopToFunctionalHint=Use Functional Operations"
,
"DESC_ForLoopToFunctionalHint=Use functional operations instead of imperative style loop."
...
...
java/java.hints/test/unit/src/org/netbeans/modules/java/hints/jdk/mapreduce/ForLoopToFunctionalHintTest.java
View file @
9cacf1fd
...
...
@@ -56,7 +56,7 @@ public class ForLoopToFunctionalHintTest extends NbTestCase {
+
"}"
)
.
sourceLevel
(
"1.8"
)
.
run
(
ForLoopToFunctionalHint
.
class
)
.
findWarning
(
"12:8-12:11:
verifier
:"
+
Bundle
.
ERR_ForLoopToFunctionalHint
())
.
findWarning
(
"12:8-12:11:
hint
:"
+
Bundle
.
ERR_ForLoopToFunctionalHint
())
.
applyFix
()
.
assertOutput
(
"package testdemo;\n"
+
"\n"
...
...
@@ -126,7 +126,7 @@ public class ForLoopToFunctionalHintTest extends NbTestCase {
+
"}"
)
.
sourceLevel
(
"1.8"
)
.
run
(
ForLoopToFunctionalHint
.
class
)
.
findWarning
(
"12:8-12:11:
verifier
:"
+
Bundle
.
ERR_ForLoopToFunctionalHint
())
.
findWarning
(
"12:8-12:11:
hint
:"
+
Bundle
.
ERR_ForLoopToFunctionalHint
())
.
applyFix
()
.
assertOutput
(
"package testdemo;\n"
+
"\n"
...
...
@@ -180,7 +180,7 @@ public class ForLoopToFunctionalHintTest extends NbTestCase {
+
"}"
)
.
sourceLevel
(
"1.8"
)
.
run
(
ForLoopToFunctionalHint
.
class
)
.
findWarning
(
"22:8-22:11:
verifier
:"
+
Bundle
.
ERR_ForLoopToFunctionalHint
())
.
findWarning
(
"22:8-22:11:
hint
:"
+
Bundle
.
ERR_ForLoopToFunctionalHint
())
.
applyFix
()
.
assertOutput
(
"/*\n"
+
" * To change this template, choose Tools | Templates\n"
...
...
@@ -237,7 +237,7 @@ public class ForLoopToFunctionalHintTest extends NbTestCase {
+
"}"
)
.
sourceLevel
(
"1.8"
)
.
run
(
ForLoopToFunctionalHint
.
class
)
.
findWarning
(
"12:8-12:11:
verifier
:"
+
Bundle
.
ERR_ForLoopToFunctionalHint
())
.
findWarning
(
"12:8-12:11:
hint
:"
+
Bundle
.
ERR_ForLoopToFunctionalHint
())
.
applyFix
()
.
assertOutput
(
"package testdemo;\n"
+
"\n"
...
...
@@ -288,7 +288,7 @@ public class ForLoopToFunctionalHintTest extends NbTestCase {
+
"}"
)
.
sourceLevel
(
"1.8"
)
.
run
(
ForLoopToFunctionalHint
.
class
)
.
findWarning
(
"12:8-12:11:
verifier
:"
+
Bundle
.
ERR_ForLoopToFunctionalHint
())
.
findWarning
(
"12:8-12:11:
hint
:"
+
Bundle
.
ERR_ForLoopToFunctionalHint
())
.
applyFix
()
.
assertOutput
(
"package testdemo;\n"
+
"\n"
...
...
@@ -341,7 +341,7 @@ public class ForLoopToFunctionalHintTest extends NbTestCase {
+
"}"
)
.
sourceLevel
(
"1.8"
)
.
run
(
ForLoopToFunctionalHint
.
class
)
.
findWarning
(
"12:8-12:11:
verifier
:"
+
Bundle
.
ERR_ForLoopToFunctionalHint
())
.
findWarning
(
"12:8-12:11:
hint
:"
+
Bundle
.
ERR_ForLoopToFunctionalHint
())
.
applyFix
()
.
assertOutput
(
"package testdemo;\n"
+
"\n"
...
...
@@ -398,7 +398,7 @@ public class ForLoopToFunctionalHintTest extends NbTestCase {
+
"}"
)
.
sourceLevel
(
"1.8"
)
.
run
(
ForLoopToFunctionalHint
.
class
)
.
findWarning
(
"12:8-12:11:
verifier
:"
+
Bundle
.
ERR_ForLoopToFunctionalHint
())
.
findWarning
(
"12:8-12:11:
hint
:"
+
Bundle
.
ERR_ForLoopToFunctionalHint
())
.
applyFix
()
.
assertOutput
(
"package testdemo;\n"
+
"\n"
...
...
@@ -455,7 +455,7 @@ public class ForLoopToFunctionalHintTest extends NbTestCase {
+
"}"
)
.
sourceLevel
(
"1.8"
)
.
run
(
ForLoopToFunctionalHint
.
class
)
.
findWarning
(
"12:8-12:11:
verifier
:"
+
Bundle
.
ERR_ForLoopToFunctionalHint
())
.
findWarning
(
"12:8-12:11:
hint
:"
+
Bundle
.
ERR_ForLoopToFunctionalHint
())
.
applyFix
()
.
assertOutput
(
"package testdemo;\n"
+
"\n"
...
...
@@ -519,7 +519,7 @@ public class ForLoopToFunctionalHintTest extends NbTestCase {
+
"}"
)
.
sourceLevel
(
"1.8"
)
.
run
(
ForLoopToFunctionalHint
.
class
)
.
findWarning
(
"12:8-12:11:
verifier
:"
+
Bundle
.
ERR_ForLoopToFunctionalHint
())
.
findWarning
(
"12:8-12:11:
hint
:"
+
Bundle
.
ERR_ForLoopToFunctionalHint
())
.
applyFix
()
.
assertOutput
(
"package testdemo;\n"
+
"\n"
...
...
@@ -583,7 +583,7 @@ public class ForLoopToFunctionalHintTest extends NbTestCase {
+
"}"
)
.
sourceLevel
(
"1.8"
)
.
run
(
ForLoopToFunctionalHint
.
class
)
.
findWarning
(
"14:8-14:11:
verifier
:"
+
Bundle
.
ERR_ForLoopToFunctionalHint
())
.
findWarning
(
"14:8-14:11:
hint
:"
+
Bundle
.
ERR_ForLoopToFunctionalHint
())
.
applyFix
()
.
assertOutput
(
"package testdemo;\n"
+
"\n"
...
...
@@ -658,7 +658,7 @@ public class ForLoopToFunctionalHintTest extends NbTestCase {
+
"}"
)
.
sourceLevel
(
"1.8"
)
.
run
(
ForLoopToFunctionalHint
.
class
)
.
findWarning
(
"12:8-12:11:
verifier
:"
+
Bundle
.
ERR_ForLoopToFunctionalHint
())
.
findWarning
(
"12:8-12:11:
hint
:"
+
Bundle
.
ERR_ForLoopToFunctionalHint
())
.
applyFix
()
.
assertOutput
(
"package testdemo;\n"
+
"\n"
...
...
@@ -725,7 +725,7 @@ public class ForLoopToFunctionalHintTest extends NbTestCase {
+
"}"
)
.
sourceLevel
(
"1.8"
)
.
run
(
ForLoopToFunctionalHint
.
class
)
<