Skip to content
Snippets Groups Projects
Commit 0dc9a2af authored by Raphael GIRARDOT's avatar Raphael GIRARDOT
Browse files

scanServerLabel must not be static

parent ae4edf55
Branches
Tags
No related merge requests found
...@@ -49,14 +49,14 @@ import fr.soleil.model.scanserver.CurrentScanDataModel; ...@@ -49,14 +49,14 @@ import fr.soleil.model.scanserver.CurrentScanDataModel;
*/ */
public class ScanServerStatusBar extends AbstractTangoBox { public class ScanServerStatusBar extends AbstractTangoBox {
private static final long serialVersionUID = -1761729788819376572L; private static final long serialVersionUID = -6600067056280163015L;
/** /**
* small Font * small Font
*/ */
private static final CometeFont SMALL_FONT = new CometeFont("Dialog", Font.PLAIN, 10); private static final CometeFont SMALL_FONT = new CometeFont(Font.DIALOG, Font.PLAIN, 10);
private static final JButton SCAN_SERVER_LABEL = new JButton(); private final JButton scanServerLabel = new JButton();
/** /**
* Map of Label * Map of Label
...@@ -156,10 +156,10 @@ public class ScanServerStatusBar extends AbstractTangoBox { ...@@ -156,10 +156,10 @@ public class ScanServerStatusBar extends AbstractTangoBox {
cell00.gridy = 0; cell00.gridy = 0;
cell00.gridwidth = 2; cell00.gridwidth = 2;
cell00.insets = defaultInset; cell00.insets = defaultInset;
add(SCAN_SERVER_LABEL, cell00); add(scanServerLabel, cell00);
SCAN_SERVER_LABEL.setToolTipText("Open control panel"); scanServerLabel.setToolTipText("Open control panel");
SCAN_SERVER_LABEL.addActionListener(new ActionListener() { scanServerLabel.addActionListener(new ActionListener() {
@Override @Override
public void actionPerformed(ActionEvent e) { public void actionPerformed(ActionEvent e) {
...@@ -461,7 +461,7 @@ public class ScanServerStatusBar extends AbstractTangoBox { ...@@ -461,7 +461,7 @@ public class ScanServerStatusBar extends AbstractTangoBox {
setWidgetModel(statusField, stringBox, generateAttributeKey("Status")); setWidgetModel(statusField, stringBox, generateAttributeKey("Status"));
setStateModel(); setStateModel();
SCAN_SERVER_LABEL.setText(model); scanServerLabel.setText(model);
labelMap.get(CurrentScanDataModel.SCAN_STATE).setToolTipText(model); labelMap.get(CurrentScanDataModel.SCAN_STATE).setToolTipText(model);
Set<String> keySet = labelMap.keySet(); Set<String> keySet = labelMap.keySet();
Iterator<String> keyIterator = keySet.iterator(); Iterator<String> keyIterator = keySet.iterator();
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment