Skip to content
Merged
Show file tree
Hide file tree
Changes from 6 commits
Commits
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
65 changes: 0 additions & 65 deletions .atom-build.json

This file was deleted.

4 changes: 4 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -72,3 +72,7 @@ Thumbs.db

# world thumbnail files
.*.jpg

# Claude.ai

/.claude
2 changes: 1 addition & 1 deletion docs/guide/using-java.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ A complete description of these functions can be found in the reference guide wh

### Java and Java Compiler Installation

In order to develop and run Java controllers for Webots it is necessary to have the 64-bit version of the Java Development Kit (JDK) version 1.8 or later.
In order to develop and run Java controllers for Webots it is necessary to have the 64-bit version of the Java Development Kit (JDK) version 16 or later.

The Java Development Kit (JDK) is free for personal and development use and it can be downloaded from the [Oracle Technology Network](http://www.oracle.com/technetwork/java/javase/downloads).
Make sure you choose the most recent 64-bit release of the Standard Edition (SE) of the JDK version 8 or later.
Expand Down
1 change: 1 addition & 0 deletions docs/reference/changelog-r2025.md
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@
- Fixed `addForceWithOffset` and `addTorque` doing the same thing as `addForce` in Python ([#6881](https://github.com/cyberbotics/webots/pull/6881)).
- Fixed Python controllers on Windows ([#6933](https://github.com/cyberbotics/webots/pull/6933)).
- OSM importer no longer crashes when run in 3d mode ([#6935](https://github.com/cyberbotics/webots/pull/6935)).
- Fixed Java compilation deprecation warning and run-time warning ([#6936](https://github.com/cyberbotics/webots/pull/6936)).

## Webots R2025a
Released on January 31st, 2025.
Expand Down
14 changes: 12 additions & 2 deletions scripts/install/bash_profile.windows
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
# Uncomment / edit the following environment variables when the corresponding software is installed #
#####################################################################################################

# export PYTHON_HOME="C:\Program Files\Python310" # Optionally defines the path to Python home.
# export JAVA_HOME=/C/Program\ Files/OpenJDK/`ls /C/Program\ Files/OpenJDK` # Optionally defines the path to Java home.
# export PYTHON_HOME="/C/Program Files/Python314" # Optionally defines the path to Python home.
# export JAVA_HOME="/C/Program Files/Microsoft/jdk-25.0.2.10-hotspot" # Optionally defines the path to Java home.
# export MATLAB_HOME=/C/Program\ Files/MATLAB/R2018b # Optionally defines the path to MATLAB home.
# export INNO_SETUP_HOME="/C/Program Files (x86)/Inno Setup 6" # Optionally defines the path to Inno Setup home.

Expand All @@ -17,6 +17,16 @@ export WEBOTS_DISABLE_SAVE_SCREEN_PERSPECTIVE_ON_CLOSE=1 # If defined, Webots w
export WEBOTS_ALLOW_MODIFY_INSTALLATION=1 # If defined, you are allowed to modify files in the Webots home using Webots.


########################################################################
# Bash function to start your favorite source code editor from MSYS2 #
########################################################################

code() {
"/C/Program Files/VSCodium/VSCodium.exe" "$@" &>/dev/null &
disown
}


####################################################################################################
# These aliases / environment variables allow to easily switch between a two webots source folders #
####################################################################################################
Expand Down
12 changes: 6 additions & 6 deletions src/controller/java/controller.i
Original file line number Diff line number Diff line change
Expand Up @@ -468,12 +468,12 @@ namespace webots {
if (cPtr == 0)
return null;

Field field = fields.get(new Long(cPtr));
Field field = fields.get(Long.valueOf(cPtr));
if (field != null)
return field;

field = new Field(cPtr, false);
fields.put(new Long(cPtr), field);
fields.put(Long.valueOf(cPtr), field);
return field;
}
%}
Expand Down Expand Up @@ -727,12 +727,12 @@ namespace webots {
if (cPtr == 0)
return null;

Node node = nodes.get(new Long(cPtr));
Node node = nodes.get(Long.valueOf(cPtr));
if (node != null)
return node;

node = new Node(cPtr, false);
nodes.put(new Long(cPtr), node);
nodes.put(Long.valueOf(cPtr), node);
return node;
}
%}
Expand Down Expand Up @@ -810,12 +810,12 @@ namespace webots {
if (cPtr == 0)
return null;

Proto proto = protos.get(new Long(cPtr));
Proto proto = protos.get(Long.valueOf(cPtr));
if (proto != null)
return proto;

proto = new Proto(cPtr, false);
protos.put(new Long(cPtr), proto);
protos.put(Long.valueOf(cPtr), proto);
return proto;
}
%}
Expand Down
8 changes: 5 additions & 3 deletions src/webots/control/WbLanguageTools.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -53,13 +53,15 @@ const QString &WbLanguageTools::javaCommand() {
}

const QStringList WbLanguageTools::javaArguments() {
QStringList arguments;
#ifdef __APPLE__
// In order to run the robot window on the gui thread (thread 0)
// which is a requirement of Qt, this option is required
return QStringList("-XstartOnFirstThread");
#else
return QStringList();
arguments << "-XstartOnFirstThread";
#endif
// Allow JNI native access without warnings (Java 22+)
arguments << "--enable-native-access=ALL-UNNAMED";
return arguments;
}

QString WbLanguageTools::pythonCommand(QString &shortVersion, const QString &command, QProcessEnvironment &env) {
Expand Down