Commit b919bd5b authored by Sabrina Oralkova's avatar Sabrina Oralkova
Browse files

Fix: rebase errors

parent ab42b723

GUI/src/main/java/cz/fidentis/analyst/gui/elements/heatmaptable/Heatmap.java

+0 −6
Original line number Diff line number Diff line 
/*

 * Click nbfs://nbhost/SystemFileSystem/Templates/Licenses/license-default.txt to change this license

 * Click nbfs://nbhost/SystemFileSystem/Templates/Classes/Class.java to edit this template

 */

package cz.fidentis.analyst.gui.elements.heatmaptable;



import cz.fidentis.analyst.gui.project.ProjectPanel;

import cz.fidentis.analyst.gui.task.batch.distanceheatmap.MouseColumnHandler;

import cz.fidentis.analyst.project.FacesProxy;



import javax.swing.*;
@@ -341,7 +336,6 @@ public class Heatmap { 
     * Saves values of their cells to corresponding cell

     */

    public void saveValuesToCells() {

        System.out.println(distances.length);

        for (int row = 0; row < distances.length; row++) {

            for (int col = row; col < distances.length; col++) {

                if (row == col) {

GUI/src/main/java/cz/fidentis/analyst/gui/task/batch/distanceheatmap/MouseColumnHandler.java→GUI/src/main/java/cz/fidentis/analyst/gui/elements/heatmaptable/MouseColumnHandler.java

+1 −1
Original line number Diff line number Diff line 
package cz.fidentis.analyst.gui.task.batch.distanceheatmap;

package cz.fidentis.analyst.gui.elements.heatmaptable;



import javax.swing.*;

import javax.swing.table.DefaultTableModel;

GUI/src/main/java/cz/fidentis/analyst/gui/task/batch/distanceheatmap/MouseHandler.java→GUI/src/main/java/cz/fidentis/analyst/gui/elements/heatmaptable/MouseHandler.java

+1 −1
Original line number Diff line number Diff line 
package cz.fidentis.analyst.gui.task.batch.distanceheatmap;

package cz.fidentis.analyst.gui.elements.heatmaptable;



import javax.swing.*;

import javax.swing.table.DefaultTableModel;

GUI/src/main/java/cz/fidentis/analyst/gui/elements/heatmaptable/RowHeader.java

+0 −2
Original line number Diff line number Diff line 
package cz.fidentis.analyst.gui.elements.heatmaptable;



import cz.fidentis.analyst.gui.task.batch.distanceheatmap.MouseHandler;



import javax.swing.*;

import javax.swing.table.DefaultTableColumnModel;

import javax.swing.table.DefaultTableModel;

GUI/src/main/java/cz/fidentis/analyst/gui/task/batch/distance/BatchDistanceTask.java

+3 −3
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ import javax.swing.*; 
public abstract class BatchDistanceTask extends SwingWorker<Void, Integer> {



    private final ProgressDialog<Void, Integer> progressDialog;

    private final BatchDistancePanel controlPanel;

    private final BatchControlPanel controlPanel;



    private BatchDistance batchDistance;
@@ -24,7 +24,7 @@ public abstract class BatchDistanceTask extends SwingWorker<Void, Integer> { 
     * @param progressDialog A window that show the progress of the computation. Must not be {@code null}

     * @param controlPanel A control panel with computation parameters. Must not be {@code null}

     **/

    public BatchDistanceTask(ProgressDialog<Void, Integer> progressDialog, BatchDistancePanel controlPanel) {

    public BatchDistanceTask(ProgressDialog<Void, Integer> progressDialog, BatchControlPanel controlPanel) {

        this.progressDialog = progressDialog;

        this.controlPanel = controlPanel;

    }
@@ -57,7 +57,7 @@ public abstract class BatchDistanceTask extends SwingWorker<Void, Integer> { 
        return progressDialog;

    }



    protected final BatchDistancePanel getControlPanel() {

    protected final BatchControlPanel getControlPanel() {

        return controlPanel;

    }