Removed 'protected' from valid java class access modifiers

parent 6c9fc367
...@@ -213,7 +213,7 @@ class JavaGenerator(spec: Spec) extends Generator(spec) { ...@@ -213,7 +213,7 @@ class JavaGenerator(spec: Spec) extends Generator(spec) {
r.fields.foreach(f => refs.find(f.ty)) r.fields.foreach(f => refs.find(f.ty))
val javaName = if (r.ext.java) (ident.name + "_base") else ident.name val javaName = if (r.ext.java) (ident.name + "_base") else ident.name
val javaFinal = if (!r.ext.java && spec.javaUseFinalForRecord) "final" else "" val javaFinal = if (!r.ext.java && spec.javaUseFinalForRecord) "final " else ""
writeJavaFile(javaName, origin, refs.java, w => { writeJavaFile(javaName, origin, refs.java, w => {
writeDoc(w, doc) writeDoc(w, doc)
...@@ -226,7 +226,7 @@ class JavaGenerator(spec: Spec) extends Generator(spec) { ...@@ -226,7 +226,7 @@ class JavaGenerator(spec: Spec) extends Generator(spec) {
} else { } else {
"" ""
} }
w.w(s"${javaClassAccessModifierString}$javaFinal class ${self + javaTypeParams(params)}$comparableFlag").braced { w.w(s"${javaClassAccessModifierString}${javaFinal}class ${self + javaTypeParams(params)}$comparableFlag").braced {
w.wl w.wl
generateJavaConstants(w, r.consts) generateJavaConstants(w, r.consts)
// Field definitions. // Field definitions.
......
...@@ -100,7 +100,7 @@ object Main { ...@@ -100,7 +100,7 @@ object Main {
.text("The output for the Java files (Generator disabled if unspecified).") .text("The output for the Java files (Generator disabled if unspecified).")
opt[String]("java-package").valueName("...").foreach(x => javaPackage = Some(x)) opt[String]("java-package").valueName("...").foreach(x => javaPackage = Some(x))
.text("The package name to use for generated Java classes.") .text("The package name to use for generated Java classes.")
opt[JavaAccessModifier.Value]("java-class-access-modifier").valueName("<public/protected/package>").foreach(x => javaClassAccessModifier = x) opt[JavaAccessModifier.Value]("java-class-access-modifier").valueName("<public/package>").foreach(x => javaClassAccessModifier = x)
.text("The access modifier to use for generated Java classes (default: public).") .text("The access modifier to use for generated Java classes (default: public).")
opt[String]("java-cpp-exception").valueName("<exception-class>").foreach(x => javaCppException = Some(x)) opt[String]("java-cpp-exception").valueName("<exception-class>").foreach(x => javaCppException = Some(x))
.text("The type for translated C++ exceptions in Java (default: java.lang.RuntimeException that is not checked)") .text("The type for translated C++ exceptions in Java (default: java.lang.RuntimeException that is not checked)")
......
...@@ -141,14 +141,12 @@ package object generatorTools { ...@@ -141,14 +141,12 @@ package object generatorTools {
object JavaAccessModifier extends Enumeration { object JavaAccessModifier extends Enumeration {
val Public = Value("public") val Public = Value("public")
val Protected = Value("protected")
val Package = Value("package") val Package = Value("package")
def getCodeGenerationString(javaAccessModifier: JavaAccessModifier.Value): String = { def getCodeGenerationString(javaAccessModifier: JavaAccessModifier.Value): String = {
javaAccessModifier match { javaAccessModifier match {
case Public => "public " case Public => "public "
case Protected => "protected " case Package => "/*package*/ "
case Package => ""
} }
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment