Skip to content

Commit 8aca388

Browse files
committed
Modules manager - 26
1 parent a0b5453 commit 8aca388

4 files changed

Lines changed: 9 additions & 6 deletions

File tree

apps/bined-editor/src/main/java/org/exbin/bined/editor/BinedEditorApp.java

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
import javax.annotation.ParametersAreNonnullByDefault;
2020
import org.exbin.framework.App;
2121
import org.exbin.framework.basic.BasicApplication;
22+
import org.exbin.framework.basic.ModuleFileLocation;
2223

2324
/**
2425
* The main class of the BinEd Binary / Hex Editor application.
@@ -38,15 +39,16 @@ public static void main(String[] args) {
3839
app.init();
3940
App.launch(() -> {
4041
app.setAppDirectory(BinedEditorApp.class);
42+
app.setupAddons();
4143
app.addClassPathModules();
4244
app.addModulesFromManifest(BinedEditorApp.class);
4345
File appDirectory = app.getAppDirectory();
4446
if ("".equals(appDirectory.getPath())) {
45-
app.addModulesFrom(new File("lib").toURI());
46-
app.addModulesFrom(new File(BasicApplication.PLUGINS_DIRECTORY).toURI());
47+
app.addModulesFrom(new File("lib").toURI(), ModuleFileLocation.LIBRARY);
48+
app.addModulesFrom(new File(BasicApplication.PLUGINS_DIRECTORY).toURI(), ModuleFileLocation.PLUGIN);
4749
} else {
48-
app.addModulesFrom(new File(app.getAppDirectory(), "lib").toURI());
49-
app.addModulesFrom(new File(app.getAppDirectory(), BasicApplication.PLUGINS_DIRECTORY).toURI());
50+
app.addModulesFrom(new File(app.getAppDirectory(), "lib").toURI(), ModuleFileLocation.LIBRARY);
51+
app.addModulesFrom(new File(app.getAppDirectory(), BasicApplication.PLUGINS_DIRECTORY).toURI(), ModuleFileLocation.PLUGIN);
5052
}
5153
app.initModules();
5254

modules/exbin-framework-bined-launcher/src/main/java/org/exbin/framework/bined/launcher/BinedLauncherModule.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -160,6 +160,7 @@ public void launch(String[] args) {
160160
binedInspectorModule.setEditorProvider(editorProvider);
161161

162162
AddonManagerModuleApi addonManagerModule = App.getModule(AddonManagerModuleApi.class);
163+
addonManagerModule.setDevMode(devMode);
163164
ActionManagerModule actionManagerModule = App.getModule(ActionManagerModule.class);
164165
actionManagerModule.registerOptionsPanels();
165166

plugins/exbin-framework-bined-operation-bouncycastle/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ repositories {
2323
}
2424

2525
dependencies {
26-
implementation group: 'org.bouncycastle', name: 'bcprov-jdk18on', version: '1.78.1'
26+
implementation group: 'org.bouncycastle', name: 'bcprov-jdk18on', version: '1.79'
2727
implementation moduleDep('BinedLibJava', 'org.exbin.bined', 'modules', 'bined-core')
2828
implementation moduleDep('BinedLibJava', 'org.exbin.bined', 'modules', 'bined-swing')
2929
implementation moduleDep('BinedLibJava', 'org.exbin.bined', 'modules', 'bined-section')

plugins/exbin-framework-bined-operation-bouncycastle/src/main/resources/META-INF/module.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,6 @@
99
<module id="org.exbin.framework.language.api.LanguageModuleApi" />
1010
<module id="org.exbin.framework.utils.UtilsModule" />
1111
<module id="org.exbin.framework.bined.BinedModule" />
12-
<library jar="bcprov-jdk18on-1.78.1.jar" />
12+
<library maven="org.bouncycastle:bcprov-jdk18on:1.79" />
1313
</dependency>
1414
</module>

0 commit comments

Comments
 (0)