Skip to content

Commit

Permalink
Merge pull request #138 from yprie/sprint4/update-and-improve-compari…
Browse files Browse the repository at this point in the history 
…son-table

add the undo/redo option
  • Loading branch information
@ValentinMgt
ValentinMgt authored May 16, 2023
2 parents cff281d + 82a4063 commit e561363
Show file tree
Hide file tree
Showing 4 changed files with 196 additions and 45 deletions.
48 changes: 48 additions & 0 deletions src/main/java/components/comparison/appCommands/AddColumnCommand.java
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,48 @@
package components.comparison.appCommands;

import application.history.ModelUserActionCommand;
import components.comparison.controllers.ComparisonTableController;
import javafx.beans.property.StringProperty;
import javafx.scene.control.TableColumn;
import javafx.scene.control.TableView;
import utils.command.Executable;

import java.util.List;

public class AddColumnCommand extends ModelUserActionCommand {
private final int idx;
private final TableView<List<StringProperty>> tv;
private final List<TableView<List<StringProperty>>> tables;
public AddColumnCommand(int columnIndex, TableView<List<StringProperty>> tv, List<TableView<List<StringProperty>>> tables) {
this.idx = columnIndex;
this.tv = tv;
this.tables = tables;
}

@Override
public Void execute() {
TableColumn<List<StringProperty>, StringProperty> tc = new TableColumn<>(" ");
tv.getColumns().add(idx, tc);
tv.getColumns().get(idx).setSortable(false);
for (TableView<List<StringProperty>> tableView : tables){
if (tableView != tv){
TableColumn<List<StringProperty>, StringProperty> column = new TableColumn<>(" ");
tableView.getColumns().add(column);
tv.getColumns().get(tv.getColumns().size() - 1).setSortable(false);
}
}
return null;
}

@Override
public Object undo() {
tv.getColumns().remove(idx);
for (TableView<List<StringProperty>> tableView : tables){
if (tableView != tv){
tableView.getColumns().remove(tableView.getColumns().size() - 1);
}
}
return null;
}

}
53 changes: 53 additions & 0 deletions src/main/java/components/comparison/appCommands/DelColumnCommand.java
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,53 @@
package components.comparison.appCommands;

import application.history.ModelUserActionCommand;
import javafx.beans.property.StringProperty;
import javafx.scene.control.TableColumn;
import javafx.scene.control.TableView;
import utils.command.Executable;

import java.util.ArrayList;
import java.util.List;

public class DelColumnCommand extends ModelUserActionCommand {
private final int idx;
private final TableView<List<StringProperty>> tv;
private final List<TableView<List<StringProperty>>> tables;

public DelColumnCommand(int columnIndex, TableView<List<StringProperty>> tv, List<TableView<List<StringProperty>>> tables) {
this.idx = columnIndex;
this.tv = tv;
this.tables = tables;
}
@Override
public Void execute() {
tv.getColumns().remove(idx);
List<Boolean> easy_balance = new ArrayList<>();
//check if the last column of other tables is empty
for (TableView<?> tableView : tables){
if (tableView != tv){
if (tableView.getColumns().get(tableView.getColumns().size() - 1).getText().equals(" ")){
easy_balance.add(false);
} else {
easy_balance.add(true);
}
}
}
if (easy_balance.contains(true)){
tv.getColumns().add(new TableColumn<>(" "));
}
else {
for (TableView<?> tableView : tables){
if (tableView != tv) {
tableView.getColumns().remove(tableView.getColumns().size() - 1);
}
}
}
return null;
}

@Override
public Object undo() {
return null;
}
}
38 changes: 38 additions & 0 deletions src/main/java/components/comparison/appCommands/MoveColumnCommand.java
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
package components.comparison.appCommands;

import application.history.ModelUserActionCommand;
import javafx.beans.property.StringProperty;
import javafx.scene.control.TableColumn;
import javafx.scene.control.TableView;

import java.util.List;

public class MoveColumnCommand extends ModelUserActionCommand {
private final TableView<List<StringProperty>> tableView;
private final int fromIndex;
private final int toIndex;

public MoveColumnCommand(TableView<List<StringProperty>> tableView, int fromIndex, int toIndex) {
this.tableView = tableView;
this.fromIndex = fromIndex;
this.toIndex = toIndex;
}

@Override
public Object execute() {
// Perform the column reordering operation
TableColumn<List<StringProperty>, ?> column = tableView.getColumns().remove(fromIndex);
tableView.getColumns().add(toIndex, column);

return null;
}

@Override
public Object undo() {
// Undo the column reordering operation
TableColumn<List<StringProperty>, ?> column = tableView.getColumns().remove(toIndex);
tableView.getColumns().add(fromIndex, column);

return null;
}
}
102 changes: 57 additions & 45 deletions src/main/java/components/comparison/controllers/ComparisonTableController.java
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,11 @@
package components.comparison.controllers;

import application.configuration.Configuration;
import application.history.HistoryManager;
import components.comparison.*;
import components.comparison.appCommands.AddColumnCommand;
import components.comparison.appCommands.DelColumnCommand;
import components.comparison.appCommands.MoveColumnCommand;
import javafx.application.Platform;
import javafx.beans.property.SimpleStringProperty;
import javafx.beans.property.StringProperty;
Expand All @@ -12,14 +16,19 @@
import javafx.geometry.Orientation;
import javafx.scene.Node;
import javafx.scene.control.*;
import javafx.scene.control.skin.TableColumnHeader;
import javafx.scene.input.ContextMenuEvent;
import javafx.scene.input.KeyCode;
import javafx.scene.input.KeyCodeCombination;
import javafx.scene.input.KeyCombination;
import javafx.scene.layout.VBox;
import javafx.stage.FileChooser;
import javafx.stage.Stage;
import persistency.newSaveSystem.SConcreteCategory;
import persistency.newSaveSystem.SMoment;

//import javax.swing.event.ChangeListener;
import java.beans.EventHandler;
import java.io.File;
import java.io.IOException;
import java.net.URL;
Expand All @@ -30,8 +39,7 @@

public class ComparisonTableController implements Initializable {

@FXML
private VBox table;
private @FXML VBox table;
private ComparisonTable comparisonTable;
private ObservableList<String> selectionInterviews;

Expand All @@ -44,12 +52,32 @@ public ComparisonTableController(ObservableList<String> selectionInterviews) {
initialize(null, null);
}

public void undo() {
HistoryManager.goBack();
}

public void redo() {
HistoryManager.goForward();
}

@Override
public void initialize(URL url, ResourceBundle resourceBundle) {
final KeyCodeCombination keyCombUNDO = new KeyCodeCombination(KeyCode.Z, KeyCombination.SHORTCUT_DOWN);
final KeyCodeCombination keyCombREDO = new KeyCodeCombination(KeyCode.Y, KeyCombination.SHORTCUT_DOWN);
//set the undo method to the undo keyCombination
table.setOnKeyPressed(event -> {
if (keyCombUNDO.match(event)) {
undo();
}
if (keyCombREDO.match(event)) {
redo();
}
});
fillTable(this.selectionInterviews);
Platform.runLater(this::bindScroll);
Platform.runLater(this::setColumnsSizesToBiggest);
//Platform.runLater(this::updateColumnsSizes);
Platform.runLater(() -> {
bindScroll();
setColumnsSizesToBiggest();
});

}

Expand All @@ -76,8 +104,9 @@ public void fillTable(ObservableList<String> selectionInterviews) {
fillLines(b, tv);

//add empty columns at the end if it's shorter than the bigger interview
addToBalance(tv, this.comparisonTable.getMaxTableLength());
completeTable(tv, this.comparisonTable.getMaxTableLength());
setListener(tv); //allow to display the context menu
movingColumnListener(tv); //allow to know when a column is moved
updateColumnsSizes();

int numRows = tv.getItems().size();
Expand Down Expand Up @@ -162,6 +191,20 @@ public void displayTable() throws IOException {
}


///////////////////////////// MOVING COLUMNS /////////////////////////////
//to improve, doesn't work well
public void movingColumnListener(TableView<List<StringProperty>> tv){
tv.setOnDragDone(event -> {
if (event.getGestureSource() instanceof TableColumnHeader) {
TableColumnHeader source = (TableColumnHeader) event.getGestureSource();
TableColumnHeader target = (TableColumnHeader) event.getGestureTarget();
int fromIndex = tv.getColumns().indexOf(source.getTableColumn());
int toIndex = tv.getColumns().indexOf(target.getTableColumn());
MoveColumnCommand moveColumnCommand = new MoveColumnCommand(tv, fromIndex, toIndex);
HistoryManager.addCommand(moveColumnCommand, true);
}
});
}
///////////////////////////// CONTEXT MENU /////////////////////////////
public void setContextMenu(TableView<List<StringProperty>> tv, int columnIndex, ContextMenuEvent event) {
// Create the pop-up menu
Expand Down Expand Up @@ -208,17 +251,12 @@ public void setListener(TableColumn<List<StringProperty>, StringProperty> tc){

public void addColumn(int idx, TableView<List<StringProperty>> tv){
// Handle "Add Column After" action here
TableColumn<List<StringProperty>, StringProperty> tc = new TableColumn<>(" ");
tv.getColumns().add(idx, tc);
tv.getColumns().get(idx).setSortable(false);
setListener(tc);
//then add columns at the end of the other tables for balance
AddColumnCommand addColumnCommand = new AddColumnCommand(idx, tv, getTables());
HistoryManager.addCommand(addColumnCommand, true);
setListener((TableColumn<List<StringProperty>, StringProperty>) tv.getColumns().get(idx));
for (TableView<List<StringProperty>> tableView : getTables()){
if (tableView != tv){
TableColumn<List<StringProperty>, StringProperty> column = new TableColumn<>(" ");
tableView.getColumns().add(column);
tv.getColumns().get(tv.getColumns().size() - 1).setSortable(false);
setListener(column);
setListener((TableColumn<List<StringProperty>, StringProperty>) tv.getColumns().get(tv.getColumns().size() - 1));
}
}
setColumnsSizesToBiggest();
Expand All @@ -227,32 +265,13 @@ public void addColumn(int idx, TableView<List<StringProperty>> tv){

public void deleteColumn(int idx, TableView<List<StringProperty>> tv){
//delete column on right click
System.out.println(tv.getColumns().get(idx).getText());
tv.getColumns().remove(idx);
List<Boolean> easy_balance = new ArrayList<>();
//check if the last column of other tables is empty
for (TableView<?> tableView : getTables()){
if (tableView != tv){
if (tableView.getColumns().get(tableView.getColumns().size() - 1).getText().equals(" ")){
easy_balance.add(false);
System.out.println("false");
} else {
easy_balance.add(true);
System.out.println("true");
}
}
}
if (easy_balance.contains(true)){
tv.getColumns().add(new TableColumn<>(" "));
}
else {
delToBalance(tv);
}
setColumnsSizesToBiggest();
DelColumnCommand delColumnCommand = new DelColumnCommand(idx, tv, getTables());
HistoryManager.addCommand(delColumnCommand, true);
updateColumnsSizes();
}


public void addToBalance(TableView<List<StringProperty>> tv, int length){
public void completeTable(TableView<List<StringProperty>> tv, int length){
int actualLength = tv.getColumns().size();
length += 2; //add 2 because we have the interview name and the legend;
if (actualLength < length){
Expand All @@ -263,13 +282,6 @@ public void addToBalance(TableView<List<StringProperty>> tv, int length){
}
}
}
public void delToBalance(TableView<List<StringProperty>> tv){
for (TableView<?> tableView : getTables()){
if (tableView != tv) {
tableView.getColumns().remove(tableView.getColumns().size() - 1);
}
}
}

public List<TableView<List<StringProperty>>> getTables(){
List<TableView<List<StringProperty>>> tableViews = new ArrayList<>();
Expand Down

0 comments on commit e561363

Please sign in to comment.