TheCloud/Digital
1
0
Fork 0
mirror of https://github.com/hneemann/Digital.git synced 2025-09-29 16:01:19 -04:00
Code Issues Packages Projects Releases Wiki Activity

refactoring of ExpressionCreator usage

Browse Source
This commit is contained in:
hneemann 2017-03-04 13:57:47 +01:00
parent 009cbcf987
commit a8259aba99
2 changed files with 48 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/main/java/de/neemann/digital/gui/components/table/ExpressionListenerJK.java
View File

@ -48,6 +48,7 @@ public class ExpressionListenerJK implements ExpressionListener {
} }
@Override @Override
public void close() { public void close() throws FormatterException, ExpressionException {
parent.close();
} }
} }

104
src/main/java/de/neemann/digital/gui/components/table/TableDialog.java
View File

@ -256,9 +256,10 @@ public class TableDialog extends JDialog {
@Override @Override
public void actionPerformed(ActionEvent e) { public void actionPerformed(ActionEvent e) {
try { try {
String text = new TruthTableFormatterLaTeX().format(model.getTable()); ExpressionListener expressionListener = new LaTeXExpressionListener(model);
text += getExpressionsLaTeX(); if (createJK.isSelected())
new ShowStringDialog(TableDialog.this, Lang.get("win_table_exportDialog"), text).setVisible(true); expressionListener = new ExpressionListenerJK(expressionListener);
new ExpressionCreator(model.getTable()).create(expressionListener);
} catch (ExpressionException | FormatterException e1) { } catch (ExpressionException | FormatterException e1) {
new ErrorMessage(Lang.get("msg_errorDuringCalculation")).addCause(e1).show(TableDialog.this); new ErrorMessage(Lang.get("msg_errorDuringCalculation")).addCause(e1).show(TableDialog.this);
} }
@ -560,59 +561,18 @@ public class TableDialog extends JDialog {
private void calculateExpressions() { private void calculateExpressions() {
try { try {
final HTMLExpressionListener html = new HTMLExpressionListener(); ExpressionListener expressionListener = new HTMLExpressionListener();
ExpressionListener expressionListener = html;
if (createJK.isSelected()) if (createJK.isSelected())
expressionListener = new ExpressionListenerJK(expressionListener); expressionListener = new ExpressionListenerJK(expressionListener);
new ExpressionCreator(model.getTable()).create(expressionListener); new ExpressionCreator(model.getTable()).create(expressionListener);
switch (html.getExpressionsCount()) {
case 0:
label.setText("");
allSolutionsDialog.setVisible(false);
break;
case 1:
label.setText(html.getFirstExp());
allSolutionsDialog.setVisible(false);
break;
default:
label.setText("");
allSolutionsDialog.setText(html.getHtml());
if (!allSolutionsDialog.isVisible())
allSolutionsDialog.setVisible(true);
}
} catch (ExpressionException | FormatterException e1) { } catch (ExpressionException | FormatterException e1) {
new ErrorMessage(Lang.get("msg_errorDuringCalculation")).addCause(e1).show(); new ErrorMessage(Lang.get("msg_errorDuringCalculation")).addCause(e1).show();
} }
} }
private String getExpressionsLaTeX() throws ExpressionException, FormatterException {
StringBuilder sb = new StringBuilder();
ExpressionListener expressionListener = new ExpressionListener() {
@Override
public void resultFound(String name, Expression expression) throws FormatterException, ExpressionException {
sb.append(FormatToTableLatex.formatIdentifier(name))
.append("&=&")
.append(FormatToExpression.FORMATTER_LATEX.format(expression))
.append("\\\\\n");
}
@Override
public void close() {
}
};
if (createJK.isSelected())
expressionListener = new ExpressionListenerJK(expressionListener);
sb.append("\\begin{eqnarray*}\n");
new ExpressionCreator(model.getTable()).create(expressionListener);
sb.append("\\end{eqnarray*}\n");
return sb.toString();
}
private final class SizeAction extends AbstractAction { private final class SizeAction extends AbstractAction {
private int n; private int n;
@ -725,7 +685,7 @@ public class TableDialog extends JDialog {
} }
} }
private static final class HTMLExpressionListener implements ExpressionListener { private final class HTMLExpressionListener implements ExpressionListener {
private FormatToExpression htmlFormatter = new HTMLFormatter(FormatToExpression.getDefaultFormat()); private FormatToExpression htmlFormatter = new HTMLFormatter(FormatToExpression.getDefaultFormat());
private final StringBuilder html; private final StringBuilder html;
private int count; private int count;
@ -748,21 +708,25 @@ public class TableDialog extends JDialog {
count++; count++;
} }
private int getExpressionsCount() {
return count;
}
private String getFirstExp() {
return firstExp;
}
private String getHtml() {
return html.toString();
}
@Override @Override
public void close() { public void close() {
html.append("</table></html>"); html.append("</table></html>");
switch (count) {
case 0:
label.setText("");
allSolutionsDialog.setVisible(false);
break;
case 1:
label.setText(firstExp);
allSolutionsDialog.setVisible(false);
break;
default:
label.setText("");
allSolutionsDialog.setText(html.toString());
if (!allSolutionsDialog.isVisible())
allSolutionsDialog.setVisible(true);
}
} }
} }
@ -808,4 +772,28 @@ public class TableDialog extends JDialog {
table.changeSelection(r, c, false, false); table.changeSelection(r, c, false, false);
} }
} }
private final class LaTeXExpressionListener implements ExpressionListener {
private final StringBuilder sb;
private LaTeXExpressionListener(TruthTableTableModel model) throws ExpressionException {
String text = new TruthTableFormatterLaTeX().format(model.getTable());
sb = new StringBuilder(text);
sb.append("\\begin{eqnarray*}\n");
}
@Override
public void resultFound(String name, Expression expression) throws FormatterException, ExpressionException {
sb.append(FormatToTableLatex.formatIdentifier(name))
.append("&=&")
.append(FormatToExpression.FORMATTER_LATEX.format(expression))
.append("\\\\\n");
}
@Override
public void close() {
sb.append("\\end{eqnarray*}\n");
new ShowStringDialog(TableDialog.this, Lang.get("win_table_exportDialog"), sb.toString()).setVisible(true);
}
}
} }