X-Git-Url: https://mograsim.net/gitweb/?a=blobdiff_plain;f=plugins%2Fnet.mograsim.plugin.core%2Fsrc%2Fnet%2Fmograsim%2Fplugin%2Ftables%2Fmi%2FBooleanEditingSupport.java;h=3c0a61240967a0afdd1866d13b4ff2022c22410b;hb=648fc6e69e09fe4467cb6bac47934be1a7dcf0d6;hp=8fbfe392567b9a7f7208d582d9f3a537f387a750;hpb=3eb713f4790896fbb3b71028a03b946a3d12dbd0;p=Mograsim.git diff --git a/plugins/net.mograsim.plugin.core/src/net/mograsim/plugin/tables/mi/BooleanEditingSupport.java b/plugins/net.mograsim.plugin.core/src/net/mograsim/plugin/tables/mi/BooleanEditingSupport.java index 8fbfe392..3c0a6124 100644 --- a/plugins/net.mograsim.plugin.core/src/net/mograsim/plugin/tables/mi/BooleanEditingSupport.java +++ b/plugins/net.mograsim.plugin.core/src/net/mograsim/plugin/tables/mi/BooleanEditingSupport.java @@ -1,11 +1,9 @@ package net.mograsim.plugin.tables.mi; import org.eclipse.jface.viewers.CellEditor; -import org.eclipse.jface.viewers.CheckboxCellEditor; import org.eclipse.jface.viewers.EditingSupport; import org.eclipse.jface.viewers.TableViewer; -import net.mograsim.logic.core.types.Bit; import net.mograsim.machine.mi.MicroInstruction; import net.mograsim.machine.mi.MicroInstructionDefinition; import net.mograsim.machine.mi.parameters.BooleanClassification; @@ -24,7 +22,7 @@ public class BooleanEditingSupport extends EditingSupport super(viewer); this.viewer = viewer; this.boolClass = (BooleanClassification) definition.getParameterClassification(index); - editor = new CheckboxCellEditor(viewer.getTable()); + editor = new CyclingCellEditor(viewer.getTable(), boolClass.size());// new CheckboxCellEditor(viewer.getTable()); this.index = index; } @@ -45,7 +43,7 @@ public class BooleanEditingSupport extends EditingSupport { InstructionTableRow row = (InstructionTableRow) element; // true is 0 because the true value comes first in the combo box - return row.data.getCell(row.address).getParameter(index).getValue().getMSBit(0).equals(Bit.ONE); + return ((Mnemonic) row.data.getCell(row.address).getParameter(index)).ordinal(); } @Override @@ -54,7 +52,7 @@ public class BooleanEditingSupport extends EditingSupport InstructionTableRow row = (InstructionTableRow) element; MicroInstructionParameter[] params = row.data.getCell(row.address).getParameters(); // true is 0 because the true value comes first in the combo box - Mnemonic newParam = boolClass.get((Boolean) value); + Mnemonic newParam = boolClass.get((Integer) value); params[index] = newParam; row.data.setCell(row.address, MicroInstruction.create(params));