You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by gg...@apache.org on 2025/07/20 20:24:03 UTC
(commons-bsf) branch master updated: Merge some string literals
This is an automated email from the ASF dual-hosted git repository.
ggregory pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-bsf.git
The following commit(s) were added to refs/heads/master by this push:
new 9682c96 Merge some string literals
9682c96 is described below
commit 9682c969d0ef973216df9640a60e158189df20f5
Author: Gary D. Gregory <ga...@gmail.com>
AuthorDate: Sun Jul 20 16:23:58 2025 -0400
Merge some string literals
---
src/main/java/org/apache/bsf/BSFManager.java | 2 +-
src/main/java/org/apache/bsf/Main.java | 10 +++---
.../org/apache/bsf/engines/jacl/BSFCommand.java | 10 +++---
.../org/apache/bsf/engines/java/JavaEngine.java | 2 +-
.../org/apache/bsf/engines/xslt/XSLTEngine.java | 2 +-
.../java/org/apache/bsf/util/BSFEngineImpl.java | 4 +--
.../org/apache/bsf/util/BSFEventProcessor.java | 2 +-
.../util/BSFEventProcessorReturningEventInfos.java | 2 +-
.../java/org/apache/bsf/util/ReflectionUtils.java | 14 ++++----
.../bsf/util/type/TypeConvertorRegistry.java | 41 +++++++++++++++-------
src/test/java/org/apache/bsf/engines/JaclTest.java | 2 +-
.../org/apache/bsf/engines/JavascriptTest.java | 4 +--
.../java/org/apache/bsf/engines/JythonTest.java | 2 +-
13 files changed, 56 insertions(+), 41 deletions(-)
diff --git a/src/main/java/org/apache/bsf/BSFManager.java b/src/main/java/org/apache/bsf/BSFManager.java
index 970077e..8856d85 100644
--- a/src/main/java/org/apache/bsf/BSFManager.java
+++ b/src/main/java/org/apache/bsf/BSFManager.java
@@ -606,7 +606,7 @@ public class BSFManager {
}
}
throw new BSFException(BSFException.REASON_OTHER_ERROR,
- "[BSFManager.getLangFromFilename] file extension missing or unknown: " + "unable to determine language for '" + fileName + "'");
+ "[BSFManager.getLangFromFilename] file extension missing or unknown: unable to determine language for '" + fileName + "'");
}
/**
diff --git a/src/main/java/org/apache/bsf/Main.java b/src/main/java/org/apache/bsf/Main.java
index 87935e2..aac441f 100644
--- a/src/main/java/org/apache/bsf/Main.java
+++ b/src/main/java/org/apache/bsf/Main.java
@@ -147,13 +147,13 @@ public class Main {
System.err.println(" args:");
System.err.println();
System.err.println(" [-in fileName] default: " + DEFAULT_IN_FILE_NAME);
- System.err.println(" [-lang languageName] default: " + "<If -in is specified and -lang");
- System.err.println(" " + " is not, attempt to determine");
- System.err.println(" " + " language from file extension;");
- System.err.println(" " + " otherwise, -lang is required.>");
+ System.err.println(" [-lang languageName] default: <If -in is specified and -lang");
+ System.err.println(" is not, attempt to determine");
+ System.err.println(" language from file extension;");
+ System.err.println(" otherwise, -lang is required.>");
System.err.println(" [-mode (eval|exec|compile)] default: " + DEFAULT_MODE);
System.err.println();
- System.err.println(" Additional args used only if -mode is " + "set to \"compile\":");
+ System.err.println(" Additional args used only if -mode is set to \"compile\":");
System.err.println();
System.err.println(" [-out className] default: " + DEFAULT_CLASS_NAME);
}
diff --git a/src/main/java/org/apache/bsf/engines/jacl/BSFCommand.java b/src/main/java/org/apache/bsf/engines/jacl/BSFCommand.java
index bf77873..90557f4 100644
--- a/src/main/java/org/apache/bsf/engines/jacl/BSFCommand.java
+++ b/src/main/java/org/apache/bsf/engines/jacl/BSFCommand.java
@@ -41,7 +41,7 @@ class BSFCommand implements Command {
public void cmdProc(final Interp interp, final TclObject argv[]) throws TclException {
if (argv.length < 2) {
- interp.setResult("invalid # of args; usage: bsf " + "lookupBean|registerBean|unregisterBean|addEventListener args");
+ interp.setResult("invalid # of args; usage: bsf lookupBean|registerBean|unregisterBean|addEventListener args");
throw new TclException(TCL.ERROR);
}
@@ -49,7 +49,7 @@ class BSFCommand implements Command {
if (op.equals("lookupBean")) {
if (argv.length != 3) {
- interp.setResult("invalid # of args; usage: bsf " + "lookupBean name-of-bean");
+ interp.setResult("invalid # of args; usage: bsf lookupBean name-of-bean");
throw new TclException(TCL.ERROR);
}
@@ -63,7 +63,7 @@ class BSFCommand implements Command {
} else if (op.equals("registerBean")) {
if (argv.length != 4) {
- interp.setResult("invalid # of args; usage: bsf " + "registerBean name-of-bean bean");
+ interp.setResult("invalid # of args; usage: bsf registerBean name-of-bean bean");
throw new TclException(TCL.ERROR);
}
mgr.registerBean(argv[2].toString(), ReflectObject.get(interp, argv[3]));
@@ -71,7 +71,7 @@ class BSFCommand implements Command {
} else if (op.equals("unregisterBean")) {
if (argv.length != 3) {
- interp.setResult("invalid # of args; usage: bsf " + "unregisterBean name-of-bean");
+ interp.setResult("invalid # of args; usage: bsf unregisterBean name-of-bean");
throw new TclException(TCL.ERROR);
}
mgr.unregisterBean(argv[2].toString());
@@ -79,7 +79,7 @@ class BSFCommand implements Command {
} else if (op.equals("addEventListener")) {
if (argv.length != 6) {
- interp.setResult("invalid # of args; usage: bsf " + "addEventListener object event-set-name filter " + "script-to-run");
+ interp.setResult("invalid # of args; usage: bsf addEventListener object event-set-name filter script-to-run");
throw new TclException(TCL.ERROR);
}
try {
diff --git a/src/main/java/org/apache/bsf/engines/java/JavaEngine.java b/src/main/java/org/apache/bsf/engines/java/JavaEngine.java
index 9b1eda6..d9082c7 100644
--- a/src/main/java/org/apache/bsf/engines/java/JavaEngine.java
+++ b/src/main/java/org/apache/bsf/engines/java/JavaEngine.java
@@ -160,7 +160,7 @@ public class JavaEngine extends BSFEngineImpl {
classname = gf.className;
// Write the kluge header to the file.
- gf.fos.write(("import java.lang.*;" + "import java.util.*;" + "public class " + classname + " {\n"
+ gf.fos.write(("import java.lang.*;import java.util.*;public class " + classname + " {\n"
+ " static public Object BSFJavaEngineEntry(org.apache.bsf.BSFManager bsf) {\n").getBytes());
// Edit the script to replace placeholder with the generated
diff --git a/src/main/java/org/apache/bsf/engines/xslt/XSLTEngine.java b/src/main/java/org/apache/bsf/engines/xslt/XSLTEngine.java
index 7a75bec..cea4b45 100644
--- a/src/main/java/org/apache/bsf/engines/xslt/XSLTEngine.java
+++ b/src/main/java/org/apache/bsf/engines/xslt/XSLTEngine.java
@@ -131,7 +131,7 @@ public class XSLTEngine extends BSFEngineImpl {
throw new Exception("Unable to get input from '" + srcObj + "' " + mesg);
}
} catch (final Exception e) {
- throw new BSFException(BSFException.REASON_EXECUTION_ERROR, "BSF:XSLTEngine: unable to get " + "input from '" + srcObj + "' as XML", e);
+ throw new BSFException(BSFException.REASON_EXECUTION_ERROR, "BSF:XSLTEngine: unable to get input from '" + srcObj + "' as XML", e);
}
}
} else {
diff --git a/src/main/java/org/apache/bsf/util/BSFEngineImpl.java b/src/main/java/org/apache/bsf/util/BSFEngineImpl.java
index ec8a596..79ddb9e 100644
--- a/src/main/java/org/apache/bsf/util/BSFEngineImpl.java
+++ b/src/main/java/org/apache/bsf/util/BSFEngineImpl.java
@@ -63,7 +63,7 @@ public abstract class BSFEngineImpl implements BSFEngine {
if (bsfInfo == null) {
bsfInfo = new ObjInfo(BSFManager.class, "bsf");
- cb.addFieldDeclaration("org.apache.bsf.BSFManager bsf = " + "new org.apache.bsf.BSFManager();");
+ cb.addFieldDeclaration("org.apache.bsf.BSFManager bsf = new org.apache.bsf.BSFManager();");
cb.putSymbol("bsf", bsfInfo);
}
@@ -91,7 +91,7 @@ public abstract class BSFEngineImpl implements BSFEngine {
if (bsfInfo == null) {
bsfInfo = new ObjInfo(BSFManager.class, "bsf");
- cb.addFieldDeclaration("org.apache.bsf.BSFManager bsf = " + "new org.apache.bsf.BSFManager();");
+ cb.addFieldDeclaration("org.apache.bsf.BSFManager bsf = new org.apache.bsf.BSFManager();");
cb.putSymbol("bsf", bsfInfo);
}
diff --git a/src/main/java/org/apache/bsf/util/BSFEventProcessor.java b/src/main/java/org/apache/bsf/util/BSFEventProcessor.java
index 7a12ed9..2e1adb8 100644
--- a/src/main/java/org/apache/bsf/util/BSFEventProcessor.java
+++ b/src/main/java/org/apache/bsf/util/BSFEventProcessor.java
@@ -67,7 +67,7 @@ public class BSFEventProcessor implements EventProcessor {
throw re;
} catch (final Exception e) {
// should not occur
- System.err.println("BSFError: non-exceptionable event delivery " + "threw exception (that's not nice): " + e);
+ System.err.println("BSFError: non-exceptionable event delivery threw exception (that's not nice): " + e);
e.printStackTrace();
}
}
diff --git a/src/main/java/org/apache/bsf/util/BSFEventProcessorReturningEventInfos.java b/src/main/java/org/apache/bsf/util/BSFEventProcessorReturningEventInfos.java
index 78fe6d2..516b225 100644
--- a/src/main/java/org/apache/bsf/util/BSFEventProcessorReturningEventInfos.java
+++ b/src/main/java/org/apache/bsf/util/BSFEventProcessorReturningEventInfos.java
@@ -95,7 +95,7 @@ public class BSFEventProcessorReturningEventInfos implements EventProcessor {
throw re;
} catch (final Exception e) {
// should not occur
- System.err.println("BSFError: non-exceptionable event delivery " + "threw exception (that's not nice): " + e);
+ System.err.println("BSFError: non-exceptionable event delivery threw exception (that's not nice): " + e);
e.printStackTrace();
}
}
diff --git a/src/main/java/org/apache/bsf/util/ReflectionUtils.java b/src/main/java/org/apache/bsf/util/ReflectionUtils.java
index e66a1e3..219e591 100644
--- a/src/main/java/org/apache/bsf/util/ReflectionUtils.java
+++ b/src/main/java/org/apache/bsf/util/ReflectionUtils.java
@@ -158,7 +158,7 @@ public class ReflectionUtils {
// find an event adapter class of the right type
final Class adapterClass = EventAdapterRegistry.lookup(listenerType);
if (adapterClass == null) {
- throw new IllegalArgumentException("event adapter for listener type " + "'" + listenerType + "' (eventset " + "'" + eventSetName + "') unknown");
+ throw new IllegalArgumentException("event adapter for listener type '" + listenerType + "' (eventset '" + eventSetName + "') unknown");
}
// create the event adapter and give it the event processor
@@ -304,7 +304,7 @@ public class ReflectionUtils {
final Object value = f.get(target);
return new Bean(fieldType, value);
} catch (final NoSuchFieldException e) {
- throw new IllegalArgumentException("field '" + fieldName + "' is " + "unknown for '" + target + "'");
+ throw new IllegalArgumentException("field '" + fieldName + "' is unknown for '" + target + "'");
}
}
//////////////////////////////////////////////////////////////////////////
@@ -327,7 +327,7 @@ public class ReflectionUtils {
final BeanInfo bi = Introspector.getBeanInfo(target.getClass());
final PropertyDescriptor pd = (PropertyDescriptor) findFeatureByName("property", propName, bi.getPropertyDescriptors());
if (pd == null) {
- throw new IllegalArgumentException("property '" + propName + "' is " + "unknown for '" + target + "'");
+ throw new IllegalArgumentException("property '" + propName + "' is unknown for '" + target + "'");
}
// get read method and type of property
@@ -336,7 +336,7 @@ public class ReflectionUtils {
if (index != null) {
// if index != null, then property is indexed - pd better be so too
if (!(pd instanceof IndexedPropertyDescriptor)) {
- throw new IllegalArgumentException("attempt to get non-indexed " + "property '" + propName + "' as being indexed");
+ throw new IllegalArgumentException("attempt to get non-indexed property '" + propName + "' as being indexed");
}
final IndexedPropertyDescriptor ipd = (IndexedPropertyDescriptor) pd;
rm = ipd.getIndexedReadMethod();
@@ -391,7 +391,7 @@ public class ReflectionUtils {
// now set the value
f.set(target, fieldVal);
} catch (final NoSuchFieldException e) {
- throw new IllegalArgumentException("field '" + fieldName + "' is " + "unknown for '" + target + "'");
+ throw new IllegalArgumentException("field '" + fieldName + "' is unknown for '" + target + "'");
}
}
//////////////////////////////////////////////////////////////////////////
@@ -417,7 +417,7 @@ public class ReflectionUtils {
final BeanInfo bi = Introspector.getBeanInfo(target.getClass());
final PropertyDescriptor pd = (PropertyDescriptor) findFeatureByName("property", propName, bi.getPropertyDescriptors());
if (pd == null) {
- throw new IllegalArgumentException("property '" + propName + "' is " + "unknown for '" + target + "'");
+ throw new IllegalArgumentException("property '" + propName + "' is unknown for '" + target + "'");
}
// get write method and type of property
@@ -426,7 +426,7 @@ public class ReflectionUtils {
if (index != null) {
// if index != null, then property is indexed - pd better be so too
if (!(pd instanceof IndexedPropertyDescriptor)) {
- throw new IllegalArgumentException("attempt to set non-indexed " + "property '" + propName + "' as being indexed");
+ throw new IllegalArgumentException("attempt to set non-indexed property '" + propName + "' as being indexed");
}
final IndexedPropertyDescriptor ipd = (IndexedPropertyDescriptor) pd;
wm = ipd.getIndexedWriteMethod();
diff --git a/src/main/java/org/apache/bsf/util/type/TypeConvertorRegistry.java b/src/main/java/org/apache/bsf/util/type/TypeConvertorRegistry.java
index 071e453..6c10577 100644
--- a/src/main/java/org/apache/bsf/util/type/TypeConvertorRegistry.java
+++ b/src/main/java/org/apache/bsf/util/type/TypeConvertorRegistry.java
@@ -40,7 +40,7 @@ public class TypeConvertorRegistry {
}
public String getCodeGenString() {
- return "(Class from, Class to, Object obj) {\n" + "return obj;\n" + "}";
+ return "(Class from, Class to, Object obj) {\nreturn obj;\n}";
}
};
register(Boolean.class, boolean.class, tc);
@@ -69,7 +69,7 @@ public class TypeConvertorRegistry {
}
public String getCodeGenString() {
- return "(Class from, Class to, Object obj) {\n" + "return (obj == null) ? \"(null)\" : obj.toString ();\n" + "}";
+ return "(Class from, Class to, Object obj) {\nreturn (obj == null) ? \"(null)\" : obj.toString ();\n}";
}
};
register(Object.class, String.class, tc);
@@ -101,15 +101,30 @@ public class TypeConvertorRegistry {
}
public String getCodeGenString() {
- return "(Class from, Class to, Object obj) {\n" + "String str = (String) obj;\n" + "if (to == Boolean.class || to == boolean.class) {\n"
- + "return Boolean.valueOf (str);\n" + "} else if (to == Byte.class || to == byte.class) {\n" + "return Byte.valueOf (str);\n"
- + "} else if (to == Character.class || to == char.class) {\n" + "return Character.valueOf (str.charAt (0));\n"
- + "} else if (to == Short.class || to == short.class) {\n" + "return Short.valueOf (str);\n"
- + "} else if (to == Integer.class || to == int.class) {\n" + "return Integer.valueOf (str);\n"
- + "} else if (to == Long.class || to == long.class) {\n" + "return Long.valueOf (str);\n"
- + "} else if (to == Float.class || to == float.class) {\n" + "return Float.valueOf (str);\n"
- + "} else if (to == Double.class || to == double.class) {\n" + "return Double.valueOf (str);\n" + "} else {\n" + "return null;\n"
- + "}\n" + "}";
+ // @formatter:off
+ return "(Class from, Class to, Object obj) {\n"
+ + "String str = (String) obj;\n"
+ + "if (to == Boolean.class || to == boolean.class) {\n"
+ + "return Boolean.valueOf (str);\n"
+ + "} else if (to == Byte.class || to == byte.class) {\n"
+ + "return Byte.valueOf (str);\n"
+ + "} else if (to == Character.class || to == char.class) {\n"
+ + "return Character.valueOf (str.charAt (0));\n"
+ + "} else if (to == Short.class || to == short.class) {\n"
+ + "return Short.valueOf (str);\n"
+ + "} else if (to == Integer.class || to == int.class) {\n"
+ + "return Integer.valueOf (str);\n"
+ + "} else if (to == Long.class || to == long.class) {\n"
+ + "return Long.valueOf (str);\n"
+ + "} else if (to == Float.class || to == float.class) {\n"
+ + "return Float.valueOf (str);\n"
+ + "} else if (to == Double.class || to == double.class) {\n"
+ + "return Double.valueOf (str);\n"
+ + "} else {\n"
+ + "return null;\n"
+ + "}\n"
+ + "}";
+ // @formatter:on
}
};
register(String.class, boolean.class, tc);
@@ -136,7 +151,7 @@ public class TypeConvertorRegistry {
}
public String getCodeGenString() {
- return "(Class from, Class to, Object obj) {\n" + "return Font.decode ((String) obj);\n" + "}";
+ return "(Class from, Class to, Object obj) {\nreturn Font.decode ((String) obj);\n}";
}
};
register(String.class, Font.class, tc);
@@ -148,7 +163,7 @@ public class TypeConvertorRegistry {
}
public String getCodeGenString() {
- return "(Class from, Class to, Object obj) {\n" + "return Color.decode ((String) obj);\n" + "}";
+ return "(Class from, Class to, Object obj) {\nreturn Color.decode ((String) obj);\n}";
}
};
register(String.class, Color.class, tc);
diff --git a/src/test/java/org/apache/bsf/engines/JaclTest.java b/src/test/java/org/apache/bsf/engines/JaclTest.java
index 27cc301..82cf997 100644
--- a/src/test/java/org/apache/bsf/engines/JaclTest.java
+++ b/src/test/java/org/apache/bsf/engines/JaclTest.java
@@ -149,7 +149,7 @@ public class JaclTest extends AbstractBSFEngineTest {
try {
bsfManager.declareBean("foo", foo, Integer.class);
- bar = (Integer) jaclEngine.eval("Test.jacl", 0, 0, "proc ret {} {\n upvar 1 foo lfoo\n " + "return $lfoo\n }\n ret");
+ bar = (Integer) jaclEngine.eval("Test.jacl", 0, 0, "proc ret {} {\n upvar 1 foo lfoo\n return $lfoo\n }\n ret");
} catch (final Exception e) {
fail(failMessage("declareBean() test failed", e));
}
diff --git a/src/test/java/org/apache/bsf/engines/JavascriptTest.java b/src/test/java/org/apache/bsf/engines/JavascriptTest.java
index 2e73e13..7d69dd4 100644
--- a/src/test/java/org/apache/bsf/engines/JavascriptTest.java
+++ b/src/test/java/org/apache/bsf/engines/JavascriptTest.java
@@ -46,7 +46,7 @@ public class JavascriptTest extends BSFEngineTestCase {
public void testExec() {
try {
- engine.exec("Test.js", 0, 0, "java.lang.System.out.print " + "(\"PASSED\");");
+ engine.exec("Test.js", 0, 0, "java.lang.System.out.print (\"PASSED\");");
} catch (final Exception e) {
fail(failMessage("exec() test failed", e));
}
@@ -77,7 +77,7 @@ public class JavascriptTest extends BSFEngineTestCase {
public void testIexec() {
try {
- engine.iexec("Test.js", 0, 0, "java.lang.System.out.print " + "(\"PASSED\")");
+ engine.iexec("Test.js", 0, 0, "java.lang.System.out.print (\"PASSED\")");
} catch (final Exception e) {
fail(failMessage("iexec() test failed", e));
}
diff --git a/src/test/java/org/apache/bsf/engines/JythonTest.java b/src/test/java/org/apache/bsf/engines/JythonTest.java
index fb0fc88..5ceded1 100644
--- a/src/test/java/org/apache/bsf/engines/JythonTest.java
+++ b/src/test/java/org/apache/bsf/engines/JythonTest.java
@@ -81,7 +81,7 @@ public class JythonTest extends BSFEngineTestCase {
// iexec() differs from exec() in this engine, primarily
// in that it only executes up to the first newline.
try {
- jythonEngine.iexec("Test.py", 0, 0, "print \"PASSED\"," + "\n" + "print \"FAILED\",");
+ jythonEngine.iexec("Test.py", 0, 0, "print \"PASSED\",\nprint \"FAILED\",");
} catch (final Exception e) {
fail(failMessage("iexec() test failed", e));
}