Skip to content

Commit d7c9259

Browse files
m3m0r7m3m0r7
committed
Rename JavaSingleClass to JavaCompiledClass
1 parent 8a7694d commit d7c9259

File tree

8 files changed

+14
-17
lines changed

8 files changed

+14
-17
lines changed

‎console/Commands/JVM/RunCommand.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
use PHPJava\Core\JavaArchive;
55
use PHPJava\Core\JavaClass;
6-
use PHPJava\Core\JavaSingleClass;
6+
use PHPJava\Core\JavaCompiledClass;
77
use PHPJava\Core\JVM\Parameters\GlobalOptions;
88
use PHPJava\Core\Stream\Reader\FileReader;
99
use Symfony\Component\Console\Command\Command;
@@ -76,7 +76,7 @@ private function runJar(string $file, array $parameters)
7676
private function runClass(string $file, array $parameters)
7777
{
7878
$class = new JavaClass(
79-
new JavaSingleClass(
79+
new JavaCompiledClass(
8080
new FileReader($file)
8181
)
8282
);

‎src/Core/JavaArchive.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -151,7 +151,7 @@ function ($fileName) {
151151

152152
switch ($fileType = FileTypeResolver::resolve($resolvePath)) {
153153
case ClassResolver::RESOLVED_TYPE_CLASS:
154-
$value = new JavaSingleClass(
154+
$value = new JavaCompiledClass(
155155
new Stream\Reader\FileReader($value),
156156
$this->options
157157
);

src/Core/JavaSingleClass.php renamed to src/Core/JavaCompiledClass.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
use PHPJava\Utilities\DebugTool;
2626
use PHPJava\Utilities\Formatter;
2727

28-
class JavaSingleClass implements JavaGenericClassInterface, JavaClassInterface
28+
class JavaCompiledClass implements JavaGenericClassInterface, JavaClassInterface
2929
{
3030
use \PHPJava\Kernel\Core\ConstantPool;
3131
use ParentClassExtendable;

src/Core/JavaBuiltinClass.php renamed to src/Core/JavaSimpleClass.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
use PHPJava\Kernel\Structures\_Utf8;
2020
use PHPJava\Utilities\DebugTool;
2121

22-
class JavaBuiltinClass implements JavaGenericClassInterface, JavaClassInterface
22+
class JavaSimpleClass implements JavaGenericClassInterface, JavaClassInterface
2323
{
2424
use \PHPJava\Kernel\Core\ConstantPool;
2525
use ParentClassExtendable;

‎src/Kernel/Internal/JavaClassDeferredLoader.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
use PHPJava\Core\JavaClass;
55
use PHPJava\Core\JavaClassInterface;
6-
use PHPJava\Core\JavaSingleClass;
6+
use PHPJava\Core\JavaCompiledClass;
77

88
final class JavaClassDeferredLoader implements JavaClassInterface
99
{
@@ -79,7 +79,7 @@ private function initializeIfNotInitiated(): JavaClass
7979
return $this->javaClass;
8080
}
8181
return $this->javaClass = new JavaClass(
82-
new JavaSingleClass(
82+
new JavaCompiledClass(
8383
new $this->deferLoadingReaderClass(...$this->arguments),
8484
$this->options
8585
)

‎src/Kernel/Resolvers/ClassResolver.php‎

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44
use PHPJava\Core\JavaArchive;
55
use PHPJava\Core\JavaClass;
66
use PHPJava\Core\JavaClassInterface;
7+
use PHPJava\Core\JavaCompiledClass;
78
use PHPJava\Core\JavaGenericClassInterface;
8-
use PHPJava\Core\JavaSingleClass;
99
use PHPJava\Core\JVM\Parameters\Runtime;
1010
use PHPJava\Core\Stream\Reader\FileReader;
1111
use PHPJava\Packages\java\lang\ClassNotFoundException;
@@ -90,7 +90,7 @@ public function resolve(string $javaPath, JavaClassInterface $class = null, bool
9090
*/
9191
if (is_file($path)) {
9292
$initiatedClass = new JavaClass(
93-
new JavaSingleClass(
93+
new JavaCompiledClass(
9494
new FileReader($path),
9595
$this->options
9696
)
@@ -119,10 +119,7 @@ public function resolve(string $javaPath, JavaClassInterface $class = null, bool
119119
try {
120120
return $this->resolvedPaths[] = [
121121
static::RESOLVED_TYPE_CLASS,
122-
new JavaClass(
123-
$value,
124-
$this->options
125-
),
122+
new JavaClass($value),
126123
];
127124
} catch (ClassNotFoundException $e) {
128125
}

‎tests/Base.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?php
22
namespace PHPJava\Tests;
33

4-
use PHPJava\Core\JavaSingleClass;
4+
use PHPJava\Core\JavaCompiledClass;
55
use PHPUnit\Framework\TestCase;
66

77
class Base extends TestCase
@@ -19,7 +19,7 @@ public function setUp(): void
1919
foreach ($this->fixtures as $fixture) {
2020
exec('javac -classpath ' . $pathRoot . ':' . $pathRoot . 'caches -encoding UTF8 ' . $pathRoot . str_replace(['../', './'], '', $fixture) . '.java -d ' . __DIR__ . '/caches');
2121
$this->initiatedJavaClasses[$fixture] = new \PHPJava\Core\JavaClass(
22-
new JavaSingleClass(
22+
new JavaCompiledClass(
2323
new \PHPJava\Core\Stream\Reader\FileReader(
2424
$this->getClassName($fixture)
2525
)

‎tests/CallToAmbiguousMethodsTest.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?php
22
namespace PHPJava\Tests;
33

4-
use PHPJava\Core\JavaSingleClass;
4+
use PHPJava\Core\JavaCompiledClass;
55
use PHPJava\Core\JVM\Parameters\GlobalOptions;
66
use PHPJava\Kernel\Types\_Byte;
77
use PHPJava\Kernel\Types\_Char;
@@ -25,7 +25,7 @@ public function setUp(): void
2525
]
2626
);
2727
$this->ambiguousInitiatedClass = new \PHPJava\Core\JavaClass(
28-
new JavaSingleClass(
28+
new JavaCompiledClass(
2929
new \PHPJava\Core\Stream\Reader\FileReader(
3030
$this->getClassName($this->fixtures[0])
3131
)

0 commit comments

Comments
 (0)