Skip to content

Commit

Permalink
a6.8.1
Browse files Browse the repository at this point in the history
  • Loading branch information
@Mararsh
Mararsh committed Mar 19, 2024
1 parent 0c88891 commit 9c160ff
Show file tree
Hide file tree
Showing 70 changed files with 2,236 additions and 2,488 deletions.
13 changes: 7 additions & 6 deletions alpha/MyBox/src/main/java/mara/mybox/controller/BaseData2DColumnsController.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,8 @@
import javafx.scene.paint.Color;
import javafx.util.Callback;
import mara.mybox.data2d.Data2D;
import mara.mybox.data2d.Data2DTools;
import mara.mybox.data2d.tools.Data2DDefinitionTools;
import mara.mybox.data2d.tools.Data2DPageTools;
import mara.mybox.data2d.DataFileCSV;
import mara.mybox.data2d.DataFileExcel;
import mara.mybox.db.data.Data2DColumn;
Expand Down Expand Up @@ -572,7 +573,7 @@ public void sourceFileChanged(File file) {
@Override
protected boolean handle() {
try {
csv = Data2DTools.definitionFromXML(this, myController,
csv = Data2DDefinitionTools.definitionFromXML(this, myController,
TextFileTools.readTexts(this, file));
return csv != null;
} catch (Exception e) {
Expand Down Expand Up @@ -706,7 +707,7 @@ public void exportCSV(Data2D currentData) {
@Override
protected boolean handle() {
try {
csv = Data2DTools.definitionToCSVFile(currentData, file);
csv = Data2DDefinitionTools.definitionToCSVFile(currentData, file);
if (file != null && file.exists()) {
recordFileWritten(file, VisitHistory.FileType.CSV);
return true;
Expand Down Expand Up @@ -743,7 +744,7 @@ public void exportXML(Data2D currentData) {
@Override
protected boolean handle() {
try {
String xml = Data2DTools.definitionToXML(currentData,
String xml = Data2DDefinitionTools.definitionToXML(currentData,
UserConfig.getBoolean("Data2DDefinitionExportAtributes", true),
"");
if (xml == null || xml.isBlank()) {
Expand Down Expand Up @@ -795,7 +796,7 @@ public void exportJSON(Data2D currentData) {
@Override
protected boolean handle() {
try {
String json = Data2DTools.definitionToJSON(currentData,
String json = Data2DDefinitionTools.definitionToJSON(currentData,
UserConfig.getBoolean("Data2DDefinitionExportAtributes", true),
"");
if (json == null || json.isBlank()) {
Expand Down Expand Up @@ -846,7 +847,7 @@ public void exportExcel(Data2D currentData) {
@Override
protected boolean handle() {
try {
excel = Data2DTools.definitionToExcelFile(currentData, file);
excel = Data2DDefinitionTools.definitionToExcelFile(currentData, file);
if (file != null && file.exists()) {
recordFileWritten(file, VisitHistory.FileType.CSV);
return true;
Expand Down
93 changes: 4 additions & 89 deletions alpha/MyBox/src/main/java/mara/mybox/controller/BaseData2DLoadController.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,25 +19,17 @@
import javafx.scene.input.Clipboard;
import mara.mybox.data.StringTable;
import mara.mybox.data2d.Data2D;
import mara.mybox.data2d.Data2DExampleTools;
import mara.mybox.data2d.Data2DMenuTools;
import mara.mybox.data2d.Data2DTools;
import mara.mybox.data2d.DataClipboard;
import mara.mybox.data2d.DataFileCSV;
import mara.mybox.data2d.DataFileExcel;
import mara.mybox.data2d.DataFileText;
import mara.mybox.data2d.DataMatrix;
import mara.mybox.data2d.DataTable;
import mara.mybox.data2d.TmpTable;
import mara.mybox.data2d.tools.Data2DColumnTools;
import mara.mybox.data2d.tools.Data2DExampleTools;
import mara.mybox.data2d.tools.Data2DMenuTools;
import mara.mybox.db.DerbyBase;
import mara.mybox.db.data.Data2DColumn;
import mara.mybox.db.data.Data2DDefinition;
import mara.mybox.db.data.Data2DDefinition.DataType;
import static mara.mybox.db.data.Data2DDefinition.DataType.CSV;
import static mara.mybox.db.data.Data2DDefinition.DataType.Excel;
import static mara.mybox.db.data.Data2DDefinition.DataType.MyBoxClipboard;
import static mara.mybox.db.data.Data2DDefinition.DataType.Texts;
import mara.mybox.db.data.VisitHistory;
import mara.mybox.dev.MyBoxLog;
import mara.mybox.fxml.FxSingletonTask;
import mara.mybox.fxml.FxTask;
Expand Down Expand Up @@ -224,7 +216,7 @@ public void loadData(String name, List<Data2DColumn> cols, List<List<String>> da
column.setIndex(data2D.newColumnIndex());
}
data2D.setColumns(columns);
StringTable validateTable = Data2DTools.validate(columns);
StringTable validateTable = Data2DColumnTools.validate(columns);
List<List<String>> rows = new ArrayList<>();
if (data != null) {
for (int i = 0; i < data.size(); i++) {
Expand Down Expand Up @@ -263,83 +255,6 @@ public boolean displayTmpData(List<List<String>> newData) {
}
}

public void createData(DataFileCSV sourceData, DataType targetType,
String targetName, File targetFile) {
if (sourceData == null || targetType == null
|| sourceData.getFile() == null || !sourceData.getFile().exists()) {
popError("Nonexistent");
return;
}
if (!checkBeforeNextAction()) {
return;
}
task = new FxSingletonTask<Void>(this) {
private Data2D targetData;

@Override
protected boolean handle() {
try {
switch (targetType) {
case Texts:
targetData = DataFileText.toText(this, sourceData, targetName, targetFile);
if (targetData != null) {
recordFileWritten(targetData.getFile(), VisitHistory.FileType.Text);
}
break;
case CSV:
targetData = DataFileCSV.toCSV(this, sourceData, targetName, targetFile);
if (targetData != null) {
recordFileWritten(targetData.getFile(), VisitHistory.FileType.CSV);
}
break;
case Excel: {
targetData = DataFileExcel.toExcel(this, sourceData, targetName, targetFile);
if (targetData != null) {
recordFileWritten(targetData.getFile(), VisitHistory.FileType.Excel);
}
break;
}
case DatabaseTable: {
String name = targetName;
if (name == null || name.isBlank()) {
name = sourceData.dataName();
if (name.startsWith(TmpTable.TmpTablePrefix)
|| name.startsWith(TmpTable.TmpTablePrefix.toLowerCase())) {
name = name.substring(TmpTable.TmpTablePrefix.length());
}
}
DataTable dataTable = sourceData.toTable(this, name);
targetData = dataTable;
break;
}
case MyBoxClipboard: {
DataClipboard clip = DataClipboard.toClip(this, sourceData, targetName);
targetData = clip;
break;
}
case Matrix: {
DataMatrix matrix = DataMatrix.toMatrix(this, sourceData, targetName);
targetData = matrix;
break;
}
}
return targetData != null;
} catch (Exception e) {
error = e.toString();
MyBoxLog.console(error);
return false;
}
}

@Override
protected void whenSucceeded() {
loadDef(targetData);
}

};
start(task, thisPane);
}

public void loadMatrix(double[][] matrix) {
if (matrix == null || matrix.length == 0) {
loadNull();
Expand Down
11 changes: 3 additions & 8 deletions alpha/MyBox/src/main/java/mara/mybox/controller/BaseData2DSaveAsController.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@

import mara.mybox.data2d.Data2D;
import mara.mybox.data2d.Data2D_Attributes.TargetType;
import mara.mybox.data2d.DataTable;
import mara.mybox.data2d.TmpTable;
import mara.mybox.data2d.operate.Data2DExport;
import mara.mybox.data2d.tools.Data2DConvertTools;
import mara.mybox.db.data.ColumnDefinition.InvalidAs;
import mara.mybox.dev.MyBoxLog;
import mara.mybox.fxml.WindowTools;
Expand All @@ -24,7 +24,6 @@ public class BaseData2DSaveAsController extends BaseDataConvertController {
protected TargetType format;
protected String targetName;
protected InvalidAs invalidAs = InvalidAs.Blank;
protected DataTable dataTable;

public BaseData2DSaveAsController() {
baseTitle = message("SaveAs");
Expand All @@ -41,7 +40,7 @@ public void checkParameters() {
targetName = targetName.substring(TmpTable.TmpTablePrefix.length());
}
if (targetFile == null) {
targetFile = Data2D.targetFile(targetName, format);
targetFile = Data2DConvertTools.targetFile(targetName, format);
}
}

Expand All @@ -55,11 +54,7 @@ public void beforeTask() {

@Override
public void afterSuccess() {
if (format == TargetType.DatabaseTable) {
if (dataTable != null) {
Data2DManufactureController.openDef(dataTable);
}
} else if (export != null) {
if (export != null) {
export.openResults();
}
}
Expand Down
5 changes: 4 additions & 1 deletion alpha/MyBox/src/main/java/mara/mybox/controller/BaseData2DSelectRowsController.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
import javafx.scene.layout.FlowPane;
import mara.mybox.data2d.DataFilter;
import mara.mybox.data2d.writer.ListWriter;
import mara.mybox.db.data.ColumnDefinition.InvalidAs;
import mara.mybox.db.data.Data2DColumn;
import mara.mybox.dev.MyBoxLog;
import mara.mybox.fxml.FxTask;
Expand Down Expand Up @@ -698,7 +699,9 @@ public List<List<String>> selectedData(FxTask task) {
if (isAllPages()) {
ListWriter writer = new ListWriter();
data2D.copy(task, writer, checkedColsIndices,
false, true, formatValuesCheck != null && formatValuesCheck.isSelected());
false, true,
formatValuesCheck != null && formatValuesCheck.isSelected(),
InvalidAs.Blank);
data = writer.getRows();
} else {
data = tableFiltered(false);
Expand Down
14 changes: 7 additions & 7 deletions alpha/MyBox/src/main/java/mara/mybox/controller/BaseData2DTargetsController.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@
import javafx.beans.value.ObservableValue;
import javafx.fxml.FXML;
import javafx.scene.control.ComboBox;
import mara.mybox.data2d.Data2D;
import mara.mybox.data2d.Data2D_Attributes;
import mara.mybox.data2d.DataTable;
import mara.mybox.data2d.tools.Data2DTableTools;
import mara.mybox.data2d.writer.Data2DWriter;
import mara.mybox.db.data.Data2DColumn;
import mara.mybox.dev.MyBoxLog;
Expand Down Expand Up @@ -168,7 +168,7 @@ public void handleAllTask() {
@Override
protected boolean handle() {
data2D.startTask(this, filterController.filter);
return generatedResult(this, writer);
return handleAllData(this, writer);
}

@Override
Expand All @@ -187,7 +187,7 @@ protected void finalAction() {
start(task);
}

public boolean generatedResult(FxTask currentTask, Data2DWriter writer) {
public boolean handleAllData(FxTask currentTask, Data2DWriter writer) {
return false;
}

Expand Down Expand Up @@ -252,7 +252,7 @@ public void ouputRows() {
if (targetController == null || targetController.inTable()) {
updateTable();
} else {
outputExternal();
outputRowsToExternal();
}
}

Expand Down Expand Up @@ -305,7 +305,7 @@ public boolean updateTable() {
}
}

public void outputExternal() {
public void outputRowsToExternal() {
if (outputData == null || outputData.isEmpty()) {
popError(message("NoData"));
return;
Expand All @@ -325,8 +325,8 @@ public void outputExternal() {
protected boolean handle() {
data2D.startTask(this, null);
if (targetController.format == Data2D_Attributes.TargetType.DatabaseTable) {
dataTable = Data2D.createTable(this,
outputColumns, outputData, writer.getDataName(), invalidAs);
dataTable = Data2DTableTools.importTable(this, writer.getDataName(),
outputColumns, outputData, invalidAs);
return dataTable != null;
} else {
writer.openWriter();
Expand Down
6 changes: 3 additions & 3 deletions alpha/MyBox/src/main/java/mara/mybox/controller/BaseData2DViewController.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
import javafx.scene.layout.FlowPane;
import javafx.scene.layout.Priority;
import javafx.scene.layout.VBox;
import mara.mybox.data2d.Data2DTools;
import mara.mybox.data2d.tools.Data2DPageTools;
import mara.mybox.dev.MyBoxLog;
import mara.mybox.fxml.FxSingletonTask;
import mara.mybox.fxml.style.StyleTools;
Expand Down Expand Up @@ -275,7 +275,7 @@ public void loadHtml(boolean pop) {

@Override
protected boolean handle() {
html = Data2DTools.pageToHtml(data2D, styleFilter,
html = Data2DPageTools.pageToHtml(data2D, styleFilter,
UserConfig.getBoolean(baseName + "HtmlShowForm", false),
UserConfig.getBoolean(baseName + "HtmlShowColumns", true),
UserConfig.getBoolean(baseName + "HtmlShowRowNumber", true),
Expand Down Expand Up @@ -337,7 +337,7 @@ public void loadTexts(boolean pop) {

@Override
protected boolean handle() {
texts = Data2DTools.pageToTexts(data2D, delimiterName,
texts = Data2DPageTools.pageToTexts(data2D, delimiterName,
UserConfig.getBoolean(baseName + "TextsShowForm", false),
UserConfig.getBoolean(baseName + "TextsShowColumns", true),
UserConfig.getBoolean(baseName + "TextsShowRowNumber", true),
Expand Down
4 changes: 2 additions & 2 deletions alpha/MyBox/src/main/java/mara/mybox/controller/BaseDataConvertController.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,10 @@
import static mara.mybox.data2d.Data2D_Attributes.TargetType.Text;
import static mara.mybox.data2d.Data2D_Attributes.TargetType.XML;
import mara.mybox.data2d.writer.Data2DWriter;
import mara.mybox.data2d.writer.DataBaseTableWriter;
import mara.mybox.data2d.writer.DataFileCSVWriter;
import mara.mybox.data2d.writer.DataFileExcelWriter;
import mara.mybox.data2d.writer.DataFileTextWriter;
import mara.mybox.data2d.writer.DataTableWriter;
import mara.mybox.data2d.writer.HtmlWriter;
import mara.mybox.data2d.writer.JsonWriter;
import mara.mybox.data2d.writer.MatrixWriter;
Expand Down Expand Up @@ -216,7 +216,7 @@ public Data2DWriter pickWriter(TargetType format) {
writer = pickTextWriter();
break;
case DatabaseTable:
writer = new DataBaseTableWriter();
writer = new DataTableWriter();
break;
case Matrix:
writer = new MatrixWriter();
Expand Down
5 changes: 3 additions & 2 deletions alpha/MyBox/src/main/java/mara/mybox/controller/BaseTableViewController.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,8 @@
import javafx.scene.input.MouseButton;
import javafx.scene.input.MouseEvent;
import mara.mybox.data.StringTable;
import mara.mybox.data2d.Data2DTools;
import mara.mybox.data2d.tools.Data2DColumnTools;
import mara.mybox.data2d.tools.Data2DPageTools;
import mara.mybox.dev.MyBoxLog;
import mara.mybox.fximage.FxImageTools;
import mara.mybox.fxml.FxTask;
Expand Down Expand Up @@ -562,7 +563,7 @@ protected boolean handle() {

@Override
protected void whenSucceeded() {
Data2DManufactureController.openData(baseTitle, Data2DTools.toColumns(names), data);
Data2DManufactureController.openData(baseTitle, Data2DColumnTools.toColumns(names), data);
}
};
start(dataTask, false, message("LoadingTableData"));
Expand Down
8 changes: 5 additions & 3 deletions alpha/MyBox/src/main/java/mara/mybox/controller/ControlData2DColumns.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,9 @@
import javafx.util.Callback;
import mara.mybox.data.StringTable;
import mara.mybox.data2d.Data2D;
import mara.mybox.data2d.Data2DTools;
import mara.mybox.data2d.tools.Data2DColumnTools;
import mara.mybox.data2d.tools.Data2DDefinitionTools;
import mara.mybox.data2d.tools.Data2DPageTools;
import mara.mybox.db.DerbyBase;
import mara.mybox.db.data.Data2DColumn;
import mara.mybox.db.data.InfoNode;
Expand Down Expand Up @@ -228,7 +230,7 @@ public void checkButtons() {
@Override
public void okAction() {
try {
StringTable validateTable = Data2DTools.validate(tableData);
StringTable validateTable = Data2DColumnTools.validate(tableData);
if (validateTable != null && !validateTable.isEmpty()) {
validateTable.htmlTable();
return;
Expand Down Expand Up @@ -277,7 +279,7 @@ public void changed(ObservableValue ov, Boolean oldValue, Boolean newValue) {
if (node == null) {
return;
}
addColumns(Data2DTools.definitionFromXML(null, myController, node.getInfo()));
addColumns(Data2DDefinitionTools.definitionFromXML(null, myController, node.getInfo()));
controller.close();
}
});
Expand Down
Loading

0 comments on commit 9c160ff

Please sign in to comment.