Skip to content

Commit f7f5440

Browse files
merksmerks
committed
Add back in cleaned up //$NON-NLS-1$ markers.
- Fix and ant build scripts to use Java 17. - Fix the classpath to find the SWT binaries.
1 parent ed523bf commit f7f5440

File tree

5 files changed

+15
-15
lines changed

5 files changed

+15
-15
lines changed

‎ant/org.eclipse.ant.launching/buildfiles/buildCommonDebug.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
<property name="destdir" value="${temp.folder}/lib/antdebug.jar.bin"/>
3131
<delete dir="${destdir}"/>
3232
<mkdir dir="${destdir}"/>
33-
<javac source="11" target="11" destdir="${destdir}" failonerror="true" verbose="false" debug="on" includeAntRuntime="yes"
33+
<javac release="17" destdir="${destdir}" failonerror="true" verbose="false" debug="on" includeAntRuntime="yes"
3434
classpath="${basedir}/bin">
3535
<src path="${basedir}/common"/>
3636
<compilerarg value="-Xlint"/>

‎ant/org.eclipse.ant.launching/buildfiles/buildRemote.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
<property name="destdir" value="${temp.folder}/lib/remote.jar.bin"/>
3131
<delete dir="${destdir}"/>
3232
<mkdir dir="${destdir}"/>
33-
<javac release="11" destdir="${destdir}" failonerror="true" verbose="false" debug="on" includeAntRuntime="yes"
33+
<javac release="17" destdir="${destdir}" failonerror="true" verbose="false" debug="on" includeAntRuntime="yes"
3434
classpath="${basedir}/bin">
3535
<src path="${basedir}/remote"/>
3636
<compilerarg value="-Xlint"/>

‎ant/org.eclipse.ant.launching/remote/org/eclipse/ant/internal/launching/remote/InputHandlerSetter.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,11 +35,11 @@ protected void setInputHandler(Project project, String inputHandlerClassname) {
3535
handler = (InputHandler) (Class.forName(inputHandlerClassname).getConstructor().newInstance());
3636
}
3737
catch (ClassCastException e) {
38-
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);
38+
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$
3939
throw new BuildException(msg, e);
4040
}
4141
catch (Exception e) {
42-
String msg = MessageFormat.format(RemoteAntMessages.getString("InternalAntRunner.Unable_to_instantiate_specified_input_handler_class_{0}___{1}_6"), inputHandlerClassname, e.getClass().getName());
42+
String msg = MessageFormat.format(RemoteAntMessages.getString("InternalAntRunner.Unable_to_instantiate_specified_input_handler_class_{0}___{1}_6"), inputHandlerClassname, e.getClass().getName()); //$NON-NLS-1$
4343
throw new BuildException(msg, e);
4444
}
4545
}

‎ant/org.eclipse.ant.launching/remote/org/eclipse/ant/internal/launching/remote/InternalAntRunner.java‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -192,7 +192,7 @@ private void addBuildListeners(Project project) {
192192
}
193193
}
194194
catch (ClassCastException e) {
195-
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);
195+
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$
196196
logMessage(null, message, Project.MSG_ERR);
197197
throw new BuildException(message, e);
198198
}
@@ -432,7 +432,7 @@ private void run(List<String> argList) {
432432
}
433433
}
434434

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

437437
setTasks();
438438
setTypes();
@@ -579,12 +579,12 @@ private BuildLogger createLogger() {
579579
buildLogger = (BuildLogger) (Class.forName(loggerClassname).getConstructor().newInstance());
580580
}
581581
catch (ClassCastException e) {
582-
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);
582+
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$
583583
logMessage(null, message, Project.MSG_ERR);
584584
throw new BuildException(message, e);
585585
}
586586
catch (Exception e) {
587-
String message = MessageFormat.format(RemoteAntMessages.getString("InternalAntRunner.Unable_to_instantiate_logger__{0}_6"), loggerClassname);
587+
String message = MessageFormat.format(RemoteAntMessages.getString("InternalAntRunner.Unable_to_instantiate_logger__{0}_6"), loggerClassname); //$NON-NLS-1$
588588
logMessage(null, message, Project.MSG_ERR);
589589
throw new BuildException(message, e);
590590
}
@@ -684,7 +684,7 @@ private String getAntVersionNumber() throws BuildException {
684684
antVersionNumber = versionNumber;
685685
}
686686
catch (IOException ioe) {
687-
throw new BuildException(MessageFormat.format(RemoteAntMessages.getString("InternalAntRunner.Could_not_load_the_version_information._{0}_9"), ioe.getMessage()), ioe);
687+
throw new BuildException(MessageFormat.format(RemoteAntMessages.getString("InternalAntRunner.Could_not_load_the_version_information._{0}_9"), ioe.getMessage()), ioe); //$NON-NLS-1$
688688
}
689689
catch (NullPointerException npe) {
690690
throw new BuildException(RemoteAntMessages.getString("InternalAntRunner.Could_not_load_the_version_information._10"), npe); //$NON-NLS-1$
@@ -895,7 +895,7 @@ private boolean processCommandLine(List<String> commands) {
895895
}
896896
catch (IOException e) {
897897
// just log message and ignore exception
898-
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);
898+
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$
899899
return false;
900900
}
901901

@@ -1011,7 +1011,7 @@ private void processUnrecognizedCommands(List<String> commands) {
10111011
}
10121012

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

@@ -1037,7 +1037,7 @@ private void createLogFile(String fileName) throws FileNotFoundException, IOExce
10371037
// this stream is closed in the finally block of run(list)
10381038
out = new PrintStream(new FileOutputStream(logFile));
10391039
err = out;
1040-
logMessage(getCurrentProject(), MessageFormat.format(RemoteAntMessages.getString("InternalAntRunner.Using_{0}_file_as_build_log._1"), logFile.getCanonicalPath()), Project.MSG_INFO);
1040+
logMessage(getCurrentProject(), MessageFormat.format(RemoteAntMessages.getString("InternalAntRunner.Using_{0}_file_as_build_log._1"), logFile.getCanonicalPath()), Project.MSG_INFO); //$NON-NLS-1$
10411041
if (buildLogger != null) {
10421042
buildLogger.setErrorPrintStream(err);
10431043
buildLogger.setOutputPrintStream(out);
@@ -1287,7 +1287,7 @@ private void loadPropertyFiles() {
12871287
props.load(fis);
12881288
}
12891289
catch (IOException e) {
1290-
fEarlyErrorMessage = MessageFormat.format(RemoteAntMessages.getString("InternalAntRunner.Could_not_load_property_file_{0}__{1}_4"), filename, e.getMessage());
1290+
fEarlyErrorMessage = MessageFormat.format(RemoteAntMessages.getString("InternalAntRunner.Could_not_load_property_file_{0}__{1}_4"), filename, e.getMessage()); //$NON-NLS-1$
12911291
}
12921292
if (userProperties == null) {
12931293
userProperties = new HashMap<>();

‎ant/org.eclipse.ant.ui/buildfiles/buildRemoteExtraJAR.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,15 +30,15 @@
3030
<property name="destdir" value="${temp.folder}/lib/remoteAnt.jar.bin"/>
3131
<delete dir="${destdir}"/>
3232
<mkdir dir="${destdir}"/>
33-
<javac source="11" target="11" destdir="${destdir}" failonerror="true" verbose="false" debug="on" includeAntRuntime="yes">
33+
<javac release="17" destdir="${destdir}" failonerror="true" verbose="false" debug="on" includeAntRuntime="yes">
3434
<src path="${basedir}/Remote Ant Support"/>
3535
<compilerarg value="-Xlint"/>
3636
<classpath>
3737
<dirset dir="${basedir}/..">
3838
<include name="org.eclipse.ant.launching/common_bin"/>
3939
</dirset>
4040
<dirset dir="${basedir}/../../..">
41-
<include name="eclipse.platform.swt/bundles/org.eclipse.swt/bin"/>
41+
<include name="eclipse.platform.swt/binaries/org.eclipse.swt*/bin"/>
4242
</dirset>
4343

4444
<fileset dir="${eclipse.home}">

0 commit comments

Comments
 (0)