TheCloud/Digital
1
0
Fork 0
mirror of https://github.com/hneemann/Digital.git synced 2025-09-12 06:15:32 -04:00
Code Issues Packages Projects Releases Wiki Activity

simplified the SingleValueDialog

Browse Source
This commit is contained in:
hneemann 2020-07-02 12:44:36 +02:00
parent 6a4741b05a
commit 08865eb529
2 changed files with 50 additions and 72 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/main/java/de/neemann/digital/draw/shapes/InputShape.java
View File

@ -166,7 +166,7 @@ public class InputShape implements Shape {
if (dialog == null || !dialog.isVisible()) {
Model model = ((In) element).getModel();
dialog = new SingleValueDialog(model.getWindowPosManager().getMainFrame(), pos, label, value, isHighZ, model)
.setSelectedFormat(getFormat(format));
.setSelectedFormat(format);
dialog.setVisible(true);
} else
dialog.requestFocus();
@ -200,20 +200,4 @@ public class InputShape implements Shape {
}
}
}
private SingleValueDialog.InMode getFormat(IntFormat format) {
switch (format) {
case decSigned:
case dec:
return SingleValueDialog.InMode.DECIMAL;
case oct:
return SingleValueDialog.InMode.OCTAL;
case bin:
return SingleValueDialog.InMode.BIN;
case ascii:
return SingleValueDialog.InMode.ASCII;
default:
return SingleValueDialog.InMode.HEX;
}
}
}

104
src/main/java/de/neemann/digital/gui/components/SingleValueDialog.java
View File

@ -29,33 +29,12 @@ public final class SingleValueDialog extends JDialog implements ModelStateObserv
private final ObservableValue value;
private final SyncAccess syncAccess;
/**
* The format used in the text field
*/
public enum InMode {
/**
* Hex format
*/
private enum InMode {
HEX(Lang.get("attr_dialogHex")),
/**
* decimal format
*/
DECIMAL(Lang.get("attr_dialogDecimal")),
/**
* binary format
*/
BIN(Lang.get("attr_dialogBinary")),
/**
* octal format
*/
OCTAL(Lang.get("attr_dialogOctal")),
/**
* ascii format
*/
ASCII(Lang.get("attr_dialogAscii")),
/**
* highZ needs to be the last entry!! See InMode#values(boolean)
*/
HIGHZ(Lang.get("attr_dialogHighz"));
private final String langText;
@ -76,6 +55,22 @@ public final class SingleValueDialog extends JDialog implements ModelStateObserv
return Arrays.copyOf(values(), values().length - 1);
}
}
private static InMode getByFormat(IntFormat format) {
switch (format) {
case decSigned:
case dec:
return SingleValueDialog.InMode.DECIMAL;
case oct:
return SingleValueDialog.InMode.OCTAL;
case bin:
return SingleValueDialog.InMode.BIN;
case ascii:
return SingleValueDialog.InMode.ASCII;
default:
return SingleValueDialog.InMode.HEX;
}
}
}
private final JTextField textField;
@ -110,9 +105,7 @@ public final class SingleValueDialog extends JDialog implements ModelStateObserv
textField.setHorizontalAlignment(JTextField.RIGHT);
formatComboBox = new JComboBox<>(InMode.values(supportsHighZ));
formatComboBox.addActionListener(actionEvent -> {
setLongToDialog(editValue);
});
formatComboBox.addActionListener(actionEvent -> setLongToDialog(editValue));
model.modify(() -> model.addObserver(this));
addWindowListener(new WindowAdapter() {
@ -223,35 +216,32 @@ public final class SingleValueDialog extends JDialog implements ModelStateObserv
}
private void setLongToDialog(long editValue) {
switch (getSelectedFormat()) {
case ASCII:
char val = (char) (editValue);
setText("'" + val + "'");
textField.setCaretPosition(1);
break;
case DECIMAL:
setText(Long.toString(editValue));
break;
case HEX:
setText("0x" + Long.toHexString(editValue));
break;
case BIN:
setText("0b" + Long.toBinaryString(editValue));
break;
case OCTAL:
setText("0" + Long.toOctalString(editValue));
break;
case HIGHZ:
setText("?");
break;
default:
if (!textIsModifying) {
switch (getSelectedFormat()) {
case ASCII:
char val = (char) (editValue);
textField.setText("'" + val + "'");
textField.setCaretPosition(1);
break;
case DECIMAL:
textField.setText(Long.toString(editValue));
break;
case HEX:
textField.setText("0x" + Long.toHexString(editValue));
break;
case BIN:
textField.setText("0b" + Long.toBinaryString(editValue));
break;
case OCTAL:
textField.setText("0" + Long.toOctalString(editValue));
break;
case HIGHZ:
textField.setText("?");
break;
default:
}
textField.requestFocus();
}
textField.requestFocus();
}
private void setText(String text) {
if (!textIsModifying)
textField.setText(text);
}
private InMode getSelectedFormat() {
@ -264,10 +254,14 @@ public final class SingleValueDialog extends JDialog implements ModelStateObserv
* @param format the format
* @return this for chained calls
*/
public SingleValueDialog setSelectedFormat(InMode format) {
public SingleValueDialog setSelectedFormat(IntFormat format) {
setSelectedFormat(InMode.getByFormat(format));
return this;
}
private void setSelectedFormat(InMode format) {
if (!getSelectedFormat().equals(format))
formatComboBox.setSelectedItem(format);
return this;
}
private void setStringToDialog(String text) {