From 178cc4eb30d9e24fddfd26a367c1f3cacb5aca1e Mon Sep 17 00:00:00 2001 From: Remi Date: Tue, 18 Jun 2019 15:29:38 +0200 Subject: [PATCH] fix(conflict) --- .Rhistory | 0 grid.data | Bin 1326 -> 0 bytes grille.ser | Bin 1164 -> 0 bytes src/ihm/TablooProto$MyTableModel.class | Bin 2118 -> 0 bytes src/ihm/TablooProto$PremiereColonneSpecificRenderer.class | Bin 892 -> 0 bytes src/ihm/TablooProto.class | Bin 2270 -> 0 bytes src/ihm/TablooProto.java | 75 +++++++++++++++++++++++++++++---------------------------------------------- src/kernel/Grid.java | 4 ++++ src/kernel/exception/BadSyntaxException.java | 8 ++++++++ 9 files changed, 41 insertions(+), 46 deletions(-) delete mode 100644 .Rhistory delete mode 100644 grille.ser delete mode 100644 src/ihm/TablooProto$MyTableModel.class delete mode 100644 src/ihm/TablooProto$PremiereColonneSpecificRenderer.class delete mode 100644 src/ihm/TablooProto.class create mode 100644 src/kernel/exception/BadSyntaxException.java diff --git a/.Rhistory b/.Rhistory deleted file mode 100644 index e69de29..0000000 --- a/.Rhistory +++ /dev/null diff --git a/grid.data b/grid.data index f47ffca..a77ad6f 100644 Binary files a/grid.data and b/grid.data differ diff --git a/grille.ser b/grille.ser deleted file mode 100644 index 249ca48..0000000 Binary files a/grille.ser and /dev/null differ diff --git a/src/ihm/TablooProto$MyTableModel.class b/src/ihm/TablooProto$MyTableModel.class deleted file mode 100644 index e3fd890..0000000 Binary files a/src/ihm/TablooProto$MyTableModel.class and /dev/null differ diff --git a/src/ihm/TablooProto$PremiereColonneSpecificRenderer.class b/src/ihm/TablooProto$PremiereColonneSpecificRenderer.class deleted file mode 100644 index d1d4f64..0000000 Binary files a/src/ihm/TablooProto$PremiereColonneSpecificRenderer.class and /dev/null differ diff --git a/src/ihm/TablooProto.class b/src/ihm/TablooProto.class deleted file mode 100644 index 3042673..0000000 Binary files a/src/ihm/TablooProto.class and /dev/null differ diff --git a/src/ihm/TablooProto.java b/src/ihm/TablooProto.java index 70d9de7..cb9f273 100644 --- a/src/ihm/TablooProto.java +++ b/src/ihm/TablooProto.java @@ -2,27 +2,11 @@ package ihm; /* * TablooProto.java requires no other files. - * + * */ -import java.awt.Color; -import java.awt.Component; -import javax.swing.JFrame; -import javax.swing.JScrollPane; -import javax.swing.JTable; -import javax.swing.table.AbstractTableModel; -import java.awt.Dimension; -import java.awt.GridLayout; -import java.io.File; -import java.io.FileInputStream; -import java.io.FileNotFoundException; -import java.io.IOException; -import java.io.ObjectInputStream; - -import javax.swing.JLabel; -import javax.swing.JPanel; -import javax.swing.table.DefaultTableCellRenderer; -import javax.swing.table.TableColumn; +import kernel.Cell; +import kernel.Formula; import kernel.Grid; import kernel.exception.*; import kernel.function.Average; @@ -49,7 +33,7 @@ import java.util.stream.Collectors; public class TablooProto extends JPanel { - static Grid grid; + private static Grid grid; // Fourni: ne rien changer. public TablooProto(Grid grid) throws ClassNotFoundException, IOException { @@ -88,32 +72,31 @@ public class TablooProto extends JPanel { * */ Color couleur; - - public PremiereColonneSpecificRenderer(Color couleur) { - super(); - this.couleur = couleur; - this.setHorizontalAlignment(JLabel.CENTER); - } - - @Override - public Component getTableCellRendererComponent(JTable table, Object value, boolean isSelected, boolean hasFocus, int row, int column) { - Component cell = super.getTableCellRendererComponent(table, value, isSelected, hasFocus, row, column); - cell.setBackground(couleur); - return cell; - } - } - - // Inner class pour etablir la connexion entre la JTable graphique et un modele de donnees. - // Pour nous le modele de donnees sera une grille du noyau de representation et de calcul - // construite et sauvegardee par serialisation comme precedemmment. - // Dans ce prototype exemple, le modele de donnees est une simple matrice de String "en dur". - // Il faudra le remplacer par une connexion a une telle grille. - class MyTableModel extends AbstractTableModel { - - /** - * + + public PremiereColonneSpecificRenderer(Color couleur) { + super(); + this.couleur = couleur; + this.setHorizontalAlignment(JLabel.CENTER); + } + + @Override + public Component getTableCellRendererComponent(JTable table, Object value, boolean isSelected, boolean hasFocus, int row, int column) { + Component cell = super.getTableCellRendererComponent(table, value, isSelected, hasFocus, row, column); + cell.setBackground(couleur); + return cell; + } + } + + // Inner class pour etablir la connexion entre la JTable graphique et un modele de donnees. + // Pour nous le modele de donnees sera une grille du noyau de representation et de calcul + // construite et sauvegardee par serialisation comme precedemmment. + // Dans ce prototype exemple, le modele de donnees est une simple matrice de String "en dur". + // Il faudra le remplacer par une connexion a une telle grille. + class MyTableModel extends AbstractTableModel { + + /** + * */ - private static final long serialVersionUID = 1L; private Grid grid; MyTableModel(Grid grid) { @@ -163,7 +146,7 @@ public class TablooProto extends JPanel { // TODO Auto-generated catch block } - } + } return ""; } diff --git a/src/kernel/Grid.java b/src/kernel/Grid.java index 419a5e1..70caa1d 100644 --- a/src/kernel/Grid.java +++ b/src/kernel/Grid.java @@ -60,6 +60,10 @@ public class Grid implements Serializable { throw new CellNotFoundException(); } + public Cell getCell(String id) { + return this.cells.get(id); + } + public List getCells() { return new ArrayList<>(this.cells.values()); } diff --git a/src/kernel/exception/BadSyntaxException.java b/src/kernel/exception/BadSyntaxException.java new file mode 100644 index 0000000..1d4ae1d --- /dev/null +++ b/src/kernel/exception/BadSyntaxException.java @@ -0,0 +1,8 @@ +package kernel.exception; + +public class BadSyntaxException extends Exception { + + public BadSyntaxException() { + super("Erreur de syntaxe."); + } +} -- libgit2 0.21.2