StephanRichter/BelegScanner
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

re-ordered methods

Browse Source
This commit is contained in:
Stephan Richter
2022-01-06 02:19:00 +01:00
parent 8751c3fdd0
commit 4f4c105bfc
3 changed files with 29 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pom.xml
View File

@@ -4,7 +4,7 @@
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<groupId>BelegScanner</groupId> <groupId>BelegScanner</groupId>
<artifactId>BelegScanner</artifactId> <artifactId>BelegScanner</artifactId>
<version>0.0.13</version> <version>1.0.0</version>
<name>BelegScanner</name> <name>BelegScanner</name>
<packaging>jar</packaging> <packaging>jar</packaging>

15
src/main/java/de/srsoftware/belegscanner/gui/MainFrame.java
View File

@@ -123,7 +123,7 @@ public class MainFrame extends JFrame {
}; };
private void checkScanButton() { private void checkScanButton() {
toolbar.readyToScanX(!(isScanning || patchedPath==null || patchedPath.isBlank() || patchedPath.contains("$"))); toolbar.readyToScan(!(isScanning || patchedPath==null || patchedPath.isBlank() || patchedPath.contains("$")));
} }
private void performScan(String path, Dimension dimension) { private void performScan(String path, Dimension dimension) {
@@ -232,13 +232,6 @@ public class MainFrame extends JFrame {
docTable.preview(path); docTable.preview(path);
} }
private void setScanning(boolean scanning) {
isScanning = scanning;
checkScanButton();
}
private JPanel preview() { private JPanel preview() {
// https://stackoverflow.com/a/48248739/1285585 // https://stackoverflow.com/a/48248739/1285585
JPanel pane = new JPanel(new BorderLayout()); JPanel pane = new JPanel(new BorderLayout());
@@ -303,6 +296,12 @@ public class MainFrame extends JFrame {
} }
private void setScanning(boolean scanning) {
isScanning = scanning;
checkScanButton();
}
private void updateConfig() { private void updateConfig() {
String prefix = "app.categories."+category+"."; String prefix = "app.categories."+category+".";

36
src/main/java/de/srsoftware/belegscanner/gui/Toolbar.java
View File

@@ -220,6 +220,16 @@ public class Toolbar extends JPanel {
return date; return date;
} }
private List<Object> deleteValue(JSONArray arr, String tx) {
for (int i = 0; i<arr.length(); i++) {
if (arr.get(i).equals(tx)) {
arr.remove(i);
break;
}
}
return arr.toList();
}
private void dropCategory(String catName) { private void dropCategory(String catName) {
LOG.debug("dropCategory({})",catName); LOG.debug("dropCategory({})",catName);
Object o = config.get("app.categories"); Object o = config.get("app.categories");
@@ -234,6 +244,10 @@ public class Toolbar extends JPanel {
return date.getSelectedDate(); return date.getSelectedDate();
} }
public int getResolution() {
return resolution;
}
public SelectComboBox getSelector(JPanel panel) { public SelectComboBox getSelector(JPanel panel) {
if (panel != null && panel.getComponentCount()>1) { if (panel != null && panel.getComponentCount()>1) {
@@ -263,6 +277,10 @@ public class Toolbar extends JPanel {
paths.add("$HOME/$JAHR/$MONAT-$TAG - $KATEGORIE"); paths.add("$HOME/$JAHR/$MONAT-$TAG - $KATEGORIE");
return new SelectComboBox(paths).onUpdateText(this::updatePath); return new SelectComboBox(paths).onUpdateText(this::updatePath);
} }
public void readyToScan(boolean val) {
scanButton.setEnabled(val);
}
private Component scanButton() { private Component scanButton() {
scanButton = new JButton("scannen!"); scanButton = new JButton("scannen!");
@@ -274,9 +292,7 @@ public class Toolbar extends JPanel {
scanListeners.forEach(l->l.actionPerformed(evt)); scanListeners.forEach(l->l.actionPerformed(evt));
} }
public void readyToScanX(boolean val) {
scanButton.setEnabled(val);
}
private void updateCat(String newCat) { private void updateCat(String newCat) {
@@ -313,15 +329,7 @@ public class Toolbar extends JPanel {
} else LOG.debug("newCat is empty!"); } else LOG.debug("newCat is empty!");
} }
private List<Object> deleteValue(JSONArray arr, String tx) {
for (int i = 0; i<arr.length(); i++) {
if (arr.get(i).equals(tx)) {
arr.remove(i);
break;
}
}
return arr.toList();
}
protected void updateDimensions() { protected void updateDimensions() {
@@ -348,7 +356,5 @@ public class Toolbar extends JPanel {
} }
public int getResolution() {
return resolution;
}
} }