Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
M
mpd
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Иван Мажукин
mpd
Commits
72ebd5eb
Commit
72ebd5eb
authored
Apr 24, 2019
by
Max Kellermann
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
java/Object: add Object.toString() wrapper
parent
61b2ae0f
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
68 additions
and
1 deletion
+68
-1
Main.cxx
src/Main.cxx
+1
-0
Object.cxx
src/java/Object.cxx
+45
-0
Object.hxx
src/java/Object.hxx
+21
-1
meson.build
src/java/meson.build
+1
-0
No files found.
src/Main.cxx
View file @
72ebd5eb
...
...
@@ -639,6 +639,7 @@ JNIEXPORT void JNICALL
Java_org_musicpd_Bridge_run
(
JNIEnv
*
env
,
jclass
,
jobject
_context
,
jobject
_logListener
)
{
Java
::
Init
(
env
);
Java
::
Object
::
Initialise
(
env
);
Java
::
File
::
Initialise
(
env
);
Environment
::
Initialise
(
env
);
...
...
src/java/Object.cxx
0 → 100644
View file @
72ebd5eb
/*
* Copyright 2010-2019 Max Kellermann <max.kellermann@gmail.com>
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
*
* - Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
*
* - Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the
* distribution.
*
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
* ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
* FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
* FOUNDATION OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
* INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
* SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
* STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
* OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include "Object.hxx"
#include "Class.hxx"
jmethodID
Java
::
Object
::
toString_method
;
void
Java
::
Object
::
Initialise
(
JNIEnv
*
env
)
{
assert
(
env
!=
nullptr
);
Class
cls
(
env
,
"java/lang/Object"
);
toString_method
=
env
->
GetMethodID
(
cls
,
"toString"
,
"()Ljava/lang/String;"
);
assert
(
toString_method
!=
nullptr
);
}
src/java/Object.hxx
View file @
72ebd5eb
/*
* Copyright 2010-201
8
Max Kellermann <max.kellermann@gmail.com>
* Copyright 2010-201
9
Max Kellermann <max.kellermann@gmail.com>
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
...
...
@@ -34,6 +34,8 @@
#include <jni.h>
#include <assert.h>
namespace
Java
{
/**
* Wrapper for a local "jobject" reference.
...
...
@@ -51,6 +53,24 @@ namespace Java {
GlobalObject
(
JNIEnv
*
env
,
jobject
obj
)
noexcept
:
GlobalRef
<
jobject
>
(
env
,
obj
)
{}
};
/**
* Utilities for java.net.Object.
*/
class
Object
{
static
jmethodID
toString_method
;
public
:
static
void
Initialise
(
JNIEnv
*
env
);
static
jstring
toString
(
JNIEnv
*
env
,
jobject
o
)
{
assert
(
env
!=
nullptr
);
assert
(
o
!=
nullptr
);
assert
(
toString_method
!=
nullptr
);
return
(
jstring
)
env
->
CallObjectMethod
(
o
,
toString_method
);
}
};
}
#endif
src/java/meson.build
View file @
72ebd5eb
...
...
@@ -2,6 +2,7 @@ java = static_library(
'java',
'Global.cxx',
'File.cxx',
'Object.cxx',
'String.cxx',
include_directories: inc,
dependencies: [
...
...
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