Skip to content

Add back in cleaned up //$NON-NLS-1$ markers. #1905

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
merks merged 1 commit into from
Jun 6, 2025
Merged

Add back in cleaned up //$NON-NLS-1$ markers. #1905

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
2 changes: 1 addition & 1 deletion ant/org.eclipse.ant.launching/buildfiles/buildCommonDebug.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
<property name="destdir" value="${temp.folder}/lib/antdebug.jar.bin"/>
<delete dir="${destdir}"/>
<mkdir dir="${destdir}"/>
<javac source="11" target="11" destdir="${destdir}" failonerror="true" verbose="false" debug="on" includeAntRuntime="yes"
<javac release="17" destdir="${destdir}" failonerror="true" verbose="false" debug="on" includeAntRuntime="yes"
classpath="${basedir}/bin">
<src path="${basedir}/common"/>
<compilerarg value="-Xlint"/>
Expand Down
2 changes: 1 addition & 1 deletion ant/org.eclipse.ant.launching/buildfiles/buildRemote.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
<property name="destdir" value="${temp.folder}/lib/remote.jar.bin"/>
<delete dir="${destdir}"/>
<mkdir dir="${destdir}"/>
<javac release="11" destdir="${destdir}" failonerror="true" verbose="false" debug="on" includeAntRuntime="yes"
<javac release="17" destdir="${destdir}" failonerror="true" verbose="false" debug="on" includeAntRuntime="yes"
classpath="${basedir}/bin">
<src path="${basedir}/remote"/>
<compilerarg value="-Xlint"/>
Expand Down
4 changes: 2 additions & 2 deletions ...se.ant.launching/remote/org/eclipse/ant/internal/launching/remote/InputHandlerSetter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,11 +35,11 @@ protected void setInputHandler(Project project, String inputHandlerClassname) {
handler = (InputHandler) (Class.forName(inputHandlerClassname).getConstructor().newInstance());
}
catch (ClassCastException e) {
String msg = MessageFormat.format(RemoteAntMessages.getString("InternalAntRunner.The_specified_input_handler_class_{0}_does_not_implement_the_org.apache.tools.ant.input.InputHandler_interface_5"), inputHandlerClassname);
String msg = MessageFormat.format(RemoteAntMessages.getString("InternalAntRunner.The_specified_input_handler_class_{0}_does_not_implement_the_org.apache.tools.ant.input.InputHandler_interface_5"), inputHandlerClassname); //$NON-NLS-1$
throw new BuildException(msg, e);
}
catch (Exception e) {
String msg = MessageFormat.format(RemoteAntMessages.getString("InternalAntRunner.Unable_to_instantiate_specified_input_handler_class_{0}___{1}_6"), inputHandlerClassname, e.getClass().getName());
String msg = MessageFormat.format(RemoteAntMessages.getString("InternalAntRunner.Unable_to_instantiate_specified_input_handler_class_{0}___{1}_6"), inputHandlerClassname, e.getClass().getName()); //$NON-NLS-1$
throw new BuildException(msg, e);
}
}
Expand Down
18 changes: 9 additions & 9 deletions ...pse.ant.launching/remote/org/eclipse/ant/internal/launching/remote/InternalAntRunner.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -192,7 +192,7 @@ private void addBuildListeners(Project project) {
}
}
catch (ClassCastException e) {
String message = MessageFormat.format(RemoteAntMessages.getString("InternalAntRunner.{0}_which_was_specified_to_be_a_build_listener_is_not_an_instance_of_org.apache.tools.ant.BuildListener._1"), clazz);
String message = MessageFormat.format(RemoteAntMessages.getString("InternalAntRunner.{0}_which_was_specified_to_be_a_build_listener_is_not_an_instance_of_org.apache.tools.ant.BuildListener._1"), clazz); //$NON-NLS-1$
logMessage(null, message, Project.MSG_ERR);
throw new BuildException(message, e);
}
Expand Down Expand Up @@ -432,7 +432,7 @@ private void run(List<String> argList) {
}
}

getCurrentProject().log(MessageFormat.format(RemoteAntMessages.getString("InternalAntRunner.Build_file__{0}_1"), getBuildFileLocation()));
getCurrentProject().log(MessageFormat.format(RemoteAntMessages.getString("InternalAntRunner.Build_file__{0}_1"), getBuildFileLocation())); //$NON-NLS-1$

setTasks();
setTypes();
Expand Down Expand Up @@ -579,12 +579,12 @@ private BuildLogger createLogger() {
buildLogger = (BuildLogger) (Class.forName(loggerClassname).getConstructor().newInstance());
}
catch (ClassCastException e) {
String message = MessageFormat.format(RemoteAntMessages.getString("InternalAntRunner.{0}_which_was_specified_to_perform_logging_is_not_an_instance_of_org.apache.tools.ant.BuildLogger._2"), loggerClassname);
String message = MessageFormat.format(RemoteAntMessages.getString("InternalAntRunner.{0}_which_was_specified_to_perform_logging_is_not_an_instance_of_org.apache.tools.ant.BuildLogger._2"), loggerClassname); //$NON-NLS-1$
logMessage(null, message, Project.MSG_ERR);
throw new BuildException(message, e);
}
catch (Exception e) {
String message = MessageFormat.format(RemoteAntMessages.getString("InternalAntRunner.Unable_to_instantiate_logger__{0}_6"), loggerClassname);
String message = MessageFormat.format(RemoteAntMessages.getString("InternalAntRunner.Unable_to_instantiate_logger__{0}_6"), loggerClassname); //$NON-NLS-1$
logMessage(null, message, Project.MSG_ERR);
throw new BuildException(message, e);
}
Expand Down Expand Up @@ -684,7 +684,7 @@ private String getAntVersionNumber() throws BuildException {
antVersionNumber = versionNumber;
}
catch (IOException ioe) {
throw new BuildException(MessageFormat.format(RemoteAntMessages.getString("InternalAntRunner.Could_not_load_the_version_information._{0}_9"), ioe.getMessage()), ioe);
throw new BuildException(MessageFormat.format(RemoteAntMessages.getString("InternalAntRunner.Could_not_load_the_version_information._{0}_9"), ioe.getMessage()), ioe); //$NON-NLS-1$
}
catch (NullPointerException npe) {
throw new BuildException(RemoteAntMessages.getString("InternalAntRunner.Could_not_load_the_version_information._10"), npe); //$NON-NLS-1$
Expand Down Expand Up @@ -895,7 +895,7 @@ private boolean processCommandLine(List<String> commands) {
}
catch (IOException e) {
// just log message and ignore exception
logMessage(getCurrentProject(), MessageFormat.format(RemoteAntMessages.getString("InternalAntRunner.Could_not_write_to_the_specified_log_file__{0}._Make_sure_the_path_exists_and_you_have_write_permissions._2"), arg), Project.MSG_ERR);
logMessage(getCurrentProject(), MessageFormat.format(RemoteAntMessages.getString("InternalAntRunner.Could_not_write_to_the_specified_log_file__{0}._Make_sure_the_path_exists_and_you_have_write_permissions._2"), arg), Project.MSG_ERR); //$NON-NLS-1$
return false;
}

Expand Down Expand Up @@ -1011,7 +1011,7 @@ private void processUnrecognizedCommands(List<String> commands) {
}

// warn of ignored commands
String message = MessageFormat.format(RemoteAntMessages.getString("InternalAntRunner.Unknown_argument__{0}_2"), s.substring(1));
String message = MessageFormat.format(RemoteAntMessages.getString("InternalAntRunner.Unknown_argument__{0}_2"), s.substring(1)); //$NON-NLS-1$
logMessage(currentProject, message, Project.MSG_WARN);
}

Expand All @@ -1037,7 +1037,7 @@ private void createLogFile(String fileName) throws FileNotFoundException, IOExce
// this stream is closed in the finally block of run(list)
out = new PrintStream(new FileOutputStream(logFile));
err = out;
logMessage(getCurrentProject(), MessageFormat.format(RemoteAntMessages.getString("InternalAntRunner.Using_{0}_file_as_build_log._1"), logFile.getCanonicalPath()), Project.MSG_INFO);
logMessage(getCurrentProject(), MessageFormat.format(RemoteAntMessages.getString("InternalAntRunner.Using_{0}_file_as_build_log._1"), logFile.getCanonicalPath()), Project.MSG_INFO); //$NON-NLS-1$
if (buildLogger != null) {
buildLogger.setErrorPrintStream(err);
buildLogger.setOutputPrintStream(out);
Expand Down Expand Up @@ -1287,7 +1287,7 @@ private void loadPropertyFiles() {
props.load(fis);
}
catch (IOException e) {
fEarlyErrorMessage = MessageFormat.format(RemoteAntMessages.getString("InternalAntRunner.Could_not_load_property_file_{0}__{1}_4"), filename, e.getMessage());
fEarlyErrorMessage = MessageFormat.format(RemoteAntMessages.getString("InternalAntRunner.Could_not_load_property_file_{0}__{1}_4"), filename, e.getMessage()); //$NON-NLS-1$
}
if (userProperties == null) {
userProperties = new HashMap<>();
Expand Down
4 changes: 2 additions & 2 deletions ant/org.eclipse.ant.ui/buildfiles/buildRemoteExtraJAR.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,15 +30,15 @@
<property name="destdir" value="${temp.folder}/lib/remoteAnt.jar.bin"/>
<delete dir="${destdir}"/>
<mkdir dir="${destdir}"/>
<javac source="11" target="11" destdir="${destdir}" failonerror="true" verbose="false" debug="on" includeAntRuntime="yes">
<javac release="17" destdir="${destdir}" failonerror="true" verbose="false" debug="on" includeAntRuntime="yes">
<src path="${basedir}/Remote Ant Support"/>
<compilerarg value="-Xlint"/>
<classpath>
<dirset dir="${basedir}/..">
<include name="org.eclipse.ant.launching/common_bin"/>
</dirset>
<dirset dir="${basedir}/../../..">
<include name="eclipse.platform.swt/bundles/org.eclipse.swt/bin"/>
<include name="eclipse.platform.swt/binaries/org.eclipse.swt*/bin"/>
</dirset>

<fileset dir="${eclipse.home}">
Expand Down
Loading