Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
D
djinni
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
cpp-libs
djinni
Commits
fb00ce1c
Commit
fb00ce1c
authored
Aug 08, 2016
by
Alexander von Franqué
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Removed 'protected' from valid java class access modifiers
parent
6c9fc367
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
4 additions
and
6 deletions
+4
-6
src/source/JavaGenerator.scala
src/source/JavaGenerator.scala
+2
-2
src/source/Main.scala
src/source/Main.scala
+1
-1
src/source/generator.scala
src/source/generator.scala
+1
-3
No files found.
src/source/JavaGenerator.scala
View file @
fb00ce1c
...
@@ -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.
...
...
src/source/Main.scala
View file @
fb00ce1c
...
@@ -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/p
rotected/p
ackage>"
).
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)"
)
...
...
src/source/generator.scala
View file @
fb00ce1c
...
@@ -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
=>
""
}
}
}
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment