Update PShell
This commit is contained in:
@@ -5,12 +5,12 @@ package ch.psi.mxsc;
|
||||
|
||||
import ch.psi.mxsc.BasePlatePanel.SelectionMode;
|
||||
import ch.psi.pshell.framework.Context;
|
||||
import ch.psi.pshell.plugin.Plugin;
|
||||
import ch.psi.pshell.device.Device;
|
||||
import ch.psi.pshell.device.DeviceListener;
|
||||
import ch.psi.pshell.device.DeviceBase;
|
||||
import ch.psi.pshell.device.DeviceListener;
|
||||
import ch.psi.pshell.device.GenericDevice;
|
||||
import ch.psi.pshell.extension.Plugin;
|
||||
import ch.psi.pshell.imaging.PointDouble;
|
||||
import ch.psi.pshell.imaging.Renderer;
|
||||
import ch.psi.pshell.imaging.RendererMode;
|
||||
@@ -101,7 +101,7 @@ public class MainPanel extends Panel {
|
||||
|
||||
public MainPanel() {
|
||||
initComponents();
|
||||
Context.getPluginManager().addDynamicClass(PuckDetection.class);
|
||||
Context.getExtensions().addDynamicClass(PuckDetection.class);
|
||||
Controller.createInstance(this);
|
||||
basePlatePanel.setMode(BasePlatePanel.Mode.single);
|
||||
setExpertMode(false);
|
||||
@@ -519,7 +519,7 @@ public class MainPanel extends Panel {
|
||||
void setStatus(String status) {
|
||||
String current = current = (statusBar==null) ? this.status : statusBar.getStatusLabel().getText();
|
||||
if (!status.equals(current)) {
|
||||
Context.getInterpreter().setPreference(ViewPreference.STATUS, status);
|
||||
Context.getSequencer().setPreference(ViewPreference.STATUS, status);
|
||||
}
|
||||
this.status = status;
|
||||
}
|
||||
@@ -867,11 +867,11 @@ public class MainPanel extends Panel {
|
||||
|
||||
Panel showCommandsPanel() {
|
||||
if (commandsPlugin != null) {
|
||||
Context.getPluginManager().unloadPlugin(commandsPlugin);
|
||||
Context.getExtensions().unloadPlugin(commandsPlugin);
|
||||
}
|
||||
commandsPlugin = Context.getPluginManager().loadPlugin(Setup.expandPath("{plugins}/Commands.java"));
|
||||
commandsPlugin = Context.getExtensions().loadPlugin(Setup.expandPath("{plugins}/Commands.java"));
|
||||
((Panel) commandsPlugin).setDetached(true, getTopLevel());
|
||||
Context.getPluginManager().initializePlugin(commandsPlugin);
|
||||
Context.getExtensions().initializePlugin(commandsPlugin);
|
||||
return ((Panel) commandsPlugin);
|
||||
}
|
||||
|
||||
@@ -879,11 +879,11 @@ public class MainPanel extends Panel {
|
||||
|
||||
Panel showRecoveryPanel() {
|
||||
if (recoveryPlugin != null) {
|
||||
Context.getPluginManager().unloadPlugin(recoveryPlugin);
|
||||
Context.getExtensions().unloadPlugin(recoveryPlugin);
|
||||
}
|
||||
recoveryPlugin = Context.getPluginManager().loadPlugin(Setup.expandPath("{plugins}/Recovery.java"));
|
||||
recoveryPlugin = Context.getExtensions().loadPlugin(Setup.expandPath("{plugins}/Recovery.java"));
|
||||
((Panel) recoveryPlugin).setDetached(true, getTopLevel());
|
||||
Context.getPluginManager().initializePlugin(recoveryPlugin);
|
||||
Context.getExtensions().initializePlugin(recoveryPlugin);
|
||||
return ((Panel) recoveryPlugin);
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user