回答編集履歴

"machine" だらけな感じを簡略化

2022/02/05 06:25

投稿

jimbe

スコア13168

test CHANGED Viewed

@@ -23,44 +23,44 @@
     setSize(800, 600);
     setLocationRelativeTo(null);
-    MachineModel machineModel = new MachineModel();
+    MachineModel model = new MachineModel();
-    machineModel.putMachine(new Machine("機械1", 100, "ABC", 50)); //テストデータ1
+    model.put(new Machine("機械1", 100, "ABC", 50)); //テストデータ1
-    machineModel.putMachine(new Machine("機械2", 200, "FRE", 10)); //テストデータ2
+    model.put(new Machine("機械2", 200, "FRE", 10)); //テストデータ2
-    JTabbedPane tabbedpane = new JTabbedPane();
+    JTabbedPane tabbedPane = new JTabbedPane();
-    for(int i=0; i<machineModel.size(); i++) {
+    for(int i=0; i<model.size(); i++) {
-      Machine machine = machineModel.getMachine(i);
-      MachinePanel panel = new MachinePanel(machine.name, machineModel);
+      MachinePanel panel = new MachinePanel(model.get(i).name, model);
-      tabbedpane.addTab(panel.name, panel);
+      tabbedPane.addTab(panel.name, panel);
-    }
+    }
-    tabbedpane.addTab("情報", new InfoPanel(this, machineModel));
+    tabbedPane.addTab("情報", new InfoPanel(this, model));
-    getContentPane().add(tabbedpane);
+    getContentPane().add(tabbedPane);
   }
 }
 //"機械n"タブ
 class MachinePanel extends JPanel {
   final String name;
-  private MachineModel machineModel;
+  private MachineModel model;
   private JLabel label;
-  MachinePanel(String name, MachineModel machineModel) {
+  MachinePanel(String name, MachineModel model) {
     super();
     setPreferredSize(new Dimension(720, 240));
     setBorder(new LineBorder(Color.RED, 2, true));
     this.name = name;
-    this.machineModel = machineModel;
+    this.model = model;
-    machineModel.addChangeListener((e) -> showMachine());
+    model.addChangeListener((e) -> setLabels());
     label = new JLabel("sanpuru");
     add(label);
-    showMachine();
+    setLabels();
-  }
+  }
-  private void showMachine() {
+  private void setLabels() {
-    label.setText(""+machineModel.getMachine(name));
+    label.setText(""+model.get(name));
   }
 }
 //"情報"タブ
@@ -69,14 +69,14 @@
     void rowClicked(int rowIndex);
   }
-  public InfoPanel(Frame frame, MachineModel machineModel){
+  public InfoPanel(Frame frame, MachineModel model){
     super();
-    MachineInfoTableModel tableModel = new MachineInfoTableModel(machineModel);
+    InfoTableModel tableModel = new InfoTableModel(model);
     JComponent tableComponent = createTablePanel(tableModel, (rowIndex) -> {
       //行クリック
-      Machine machine = tableModel.getMachine(rowIndex);
+      Machine machine = tableModel.get(rowIndex);
-      MachineDialog dialog = new MachineDialog(frame, machine, (m)->machineModel.putMachine(m));
+      MachineDialog dialog = new MachineDialog(frame, machine, (m)->model.put(m));
       dialog.setLocationRelativeTo(null);
       dialog.setVisible(true);
     });
@@ -85,7 +85,7 @@
     add(createSouthPanel(), BorderLayout.SOUTH);
   }
-  private JComponent createTablePanel(MachineInfoTableModel tableModel, RowClickListener listener) {
+  private JComponent createTablePanel(InfoTableModel tableModel, RowClickListener listener) {
     JTable table = new JTable(tableModel);
     table.setRowSelectionAllowed(true);
     table.setSelectionMode(ListSelectionModel.SINGLE_SELECTION);
@@ -151,16 +151,16 @@
     return machineList.size();
   }
-  Machine getMachine(int index) {
+  Machine get(int index) {
     return machineList.get(index);
   }
-  Machine getMachine(String name) {
+  Machine get(String name) {
     for(Machine m : machineList) if(m.name.equals(name)) return m;
     return null;
   }
-  public void putMachine(Machine machine) {
+  public void put(Machine machine) {
     for(int i=0; i<machineList.size(); i++) {
       if(machineList.get(i).name.equals(machine.name)) {
         machineList.set(i, machine);
@@ -188,22 +188,18 @@
   }
 }
 //機械情報テーブルモデル
-class MachineInfoTableModel extends AbstractTableModel {
+class InfoTableModel extends AbstractTableModel {
   private static final String[] COLUMN_NAMES = {"", "ワット数", "油の種類", "油残量"};
-  private MachineModel machineModel;
+  private MachineModel model;
-  MachineInfoTableModel(MachineModel machineModel) {
+  InfoTableModel(MachineModel model) {
-    this.machineModel = machineModel;
+    this.model = model;
-    machineModel.addChangeListener((e) -> fireTableDataChanged());
+    model.addChangeListener((e) -> fireTableDataChanged());
-  }
+  }
-  int size() {
-    return machineModel.size();
-  }
-  Machine getMachine(int index) {
+  Machine get(int index) {
-    return machineModel.getMachine(index);
+    return model.get(index);
   }
   @Override
@@ -219,7 +215,7 @@
   @Override
   public int getRowCount() {
-    return size();
+    return model.size();
   }
   @Override
@@ -229,7 +225,7 @@
   @Override
   public Object getValueAt(int rowIndex, int columnIndex) {
-    Machine machine = getMachine(rowIndex);
+    Machine machine = model.get(rowIndex);
     switch(columnIndex) {
     case 0: return machine.name;
     case 1: return machine.output;
@@ -242,10 +238,10 @@
 //機械情報入力ダイアログ
 class MachineDialog extends JDialog {
   interface MachineManager {
-    void putMachine(Machine machine);
+    void put(Machine machine);
-  }
+  }
-  MachineDialog(Frame frame, Machine machine, MachineManager machineManager) {
+  MachineDialog(Frame frame, Machine machine, MachineManager manager) {
     super(frame, "詳細入力", true);
     setDefaultCloseOperation(JDialog.DISPOSE_ON_CLOSE);
     setSize(300, 200);
@@ -264,7 +260,7 @@
           int output = Integer.parseInt(outputText.getText());
           String oilType = oilTypeText.getText();
           int oilAmount = Integer.parseInt(oilAmountText.getText());
-          machineManager.putMachine(new Machine(machine.name, output, oilType, oilAmount));
+          manager.put(new Machine(machine.name, output, oilType, oilAmount));
           dispose();
         } catch(NumberFormatException e) {

TN8001 さん回答のコメントから仕様推測変更

2022/02/05 06:05

投稿

jimbe

スコア13168

test CHANGED Viewed

@@ -5,7 +5,7 @@
 import java.awt.*;
 import java.awt.event.*;
-import java.util.ArrayList;
+import java.util.*;
 import java.util.List;
 import javax.swing.*;
@@ -23,20 +23,44 @@
     setSize(800, 600);
     setLocationRelativeTo(null);
+    MachineModel machineModel = new MachineModel();
+    machineModel.putMachine(new Machine("機械1", 100, "ABC", 50)); //テストデータ1
+    machineModel.putMachine(new Machine("機械2", 200, "FRE", 10)); //テストデータ2
     JTabbedPane tabbedpane = new JTabbedPane();
+    for(int i=0; i<machineModel.size(); i++) {
+      Machine machine = machineModel.getMachine(i);
+      MachinePanel panel = new MachinePanel(machine.name, machineModel);
-    tabbedpane.addTab("機械1", new Machine1Panel());
+      tabbedpane.addTab(panel.name, panel);
+    }
-    tabbedpane.addTab("情報", new InfoPanel(this));
+    tabbedpane.addTab("情報", new InfoPanel(this, machineModel));
     getContentPane().add(tabbedpane);
   }
 }
-//"機械1"タブ
+//"機械n"タブ
-class Machine1Panel extends JPanel {
+class MachinePanel extends JPanel {
+  final String name;
+  private MachineModel machineModel;
-  Machine1Panel() {
+  private JLabel label;
+  MachinePanel(String name, MachineModel machineModel) {
+    super();
     setPreferredSize(new Dimension(720, 240));
     setBorder(new LineBorder(Color.RED, 2, true));
+    this.name = name;
+    this.machineModel = machineModel;
+    machineModel.addChangeListener((e) -> showMachine());
-    add(new JLabel("sanpuru"));
+    label = new JLabel("sanpuru");
+    add(label);
+    showMachine();
+  }
+  private void showMachine() {
+    label.setText(""+machineModel.getMachine(name));
   }
 }
 //"情報"タブ
@@ -45,17 +69,14 @@
     void rowClicked(int rowIndex);
   }
-  public InfoPanel(Frame frame){
+  public InfoPanel(Frame frame, MachineModel machineModel){
     super();
-    MachineInfoTableModel tableModel = new MachineInfoTableModel();
+    MachineInfoTableModel tableModel = new MachineInfoTableModel(machineModel);
-    tableModel.putMachine(new Machine("機械1", 100, "ABC", 50)); //テストデータ1
-    tableModel.putMachine(new Machine("機械2", 200, "FRE", 10)); //テストデータ2
     JComponent tableComponent = createTablePanel(tableModel, (rowIndex) -> {
       //行クリック
       Machine machine = tableModel.getMachine(rowIndex);
-      MachineDialog dialog = new MachineDialog(frame, machine, tableModel);
+      MachineDialog dialog = new MachineDialog(frame, machine, (m)->machineModel.putMachine(m));
       dialog.setLocationRelativeTo(null);
       dialog.setVisible(true);
     });
@@ -92,7 +113,7 @@
     return panel;
   }
 }
-//機械情報
+//機械
 class Machine {
   final String name;
   final int output; //ワット
@@ -105,12 +126,26 @@
     this.oilType = oilType;
     this.oilAmount = oilAmount;
   }
+  @Override
+  public String toString() {
+    return "name="+name+", output="+output+", oilType="+oilType+", oilAmount="+oilAmount;
-}
+  }
+}
-//機械情報モデル
+//機械モデル
+class MachineModel {
-class MachineInfoTableModel extends AbstractTableModel implements MachineDialog.MachineManager {
+  interface DataChangeListener extends EventListener {
+    public void dataChanged(DataChangeEvent e);
+  }
-  private static final String[] COLUMN_NAMES = {"", "ワット数", "油の種類", "油残量"};
+  static class DataChangeEvent extends EventObject {
+    public DataChangeEvent(Object source) {
+      super(source);
+    }
+  }
   private List<Machine> machineList = new ArrayList<>();
+  private final Set<DataChangeListener> listenerList = new HashSet<>();
   int size() {
     return machineList.size();
@@ -120,17 +155,55 @@
     return machineList.get(index);
   }
+  Machine getMachine(String name) {
+    for(Machine m : machineList) if(m.name.equals(name)) return m;
-  @Override
+    return null;
+  }
   public void putMachine(Machine machine) {
     for(int i=0; i<machineList.size(); i++) {
       if(machineList.get(i).name.equals(machine.name)) {
         machineList.set(i, machine);
-        fireTableRowsUpdated(i, i);
+        fireDataChangeEvent();
         return;
       }
     }
     machineList.add(machine);
+    fireDataChangeEvent();
+  }
+  synchronized void addChangeListener(DataChangeListener l) {
+    if(!listenerList.contains(l)) {
+      listenerList.add(l);
+    }
+  }
-    fireTableRowsInserted(machineList.size()-1, machineList.size()-1);
+  synchronized void removeChangeListener(DataChangeListener l) {
+    listenerList.remove(l);
+  }
+  synchronized protected void fireDataChangeEvent() {
+    DataChangeEvent evt = new DataChangeEvent(this);
+    for(DataChangeListener listener : listenerList) listener.dataChanged(evt);
+  }
+}
+//機械情報テーブルモデル
+class MachineInfoTableModel extends AbstractTableModel {
+  private static final String[] COLUMN_NAMES = {"", "ワット数", "油の種類", "油残量"};
+  private MachineModel machineModel;
+  MachineInfoTableModel(MachineModel machineModel) {
+    this.machineModel = machineModel;
+    machineModel.addChangeListener((e) -> fireTableDataChanged());
+  }
+  int size() {
+    return machineModel.size();
+  }
+  Machine getMachine(int index) {
+    return machineModel.getMachine(index);
   }
   @Override
@@ -156,7 +229,7 @@
   @Override
   public Object getValueAt(int rowIndex, int columnIndex) {
-    Machine machine = machineList.get(rowIndex);
+    Machine machine = getMachine(rowIndex);
     switch(columnIndex) {
     case 0: return machine.name;
     case 1: return machine.output;