RedGuy/easy-18in
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update to new data structure

Browse Source
This commit is contained in:
marhali 2022-04-11 22:10:45 +02:00
parent 6887a4e416
commit df3d5d8dfd
1 changed files with 16 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/main/java/de/marhali/easyi18n/tabs/mapper/TableModelMapper.java
View File

@ -1,8 +1,13 @@
package de.marhali.easyi18n.tabs.mapper; package de.marhali.easyi18n.tabs.mapper;
import de.marhali.easyi18n.model.*; import de.marhali.easyi18n.model.TranslationData;
import de.marhali.easyi18n.model.action.TranslationUpdate;
import de.marhali.easyi18n.model.bus.FilterMissingTranslationsListener; import de.marhali.easyi18n.model.bus.FilterMissingTranslationsListener;
import de.marhali.easyi18n.model.bus.SearchQueryListener; import de.marhali.easyi18n.model.bus.SearchQueryListener;
import de.marhali.easyi18n.model.KeyPath;
import de.marhali.easyi18n.model.Translation;
import de.marhali.easyi18n.model.TranslationValue;
import de.marhali.easyi18n.util.KeyPathConverter;
import org.jetbrains.annotations.Nls; import org.jetbrains.annotations.Nls;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
@ -50,10 +55,10 @@ public class TableModelMapper implements TableModel, SearchQueryListener, Filter
List<KeyPath> matches = new ArrayList<>(); List<KeyPath> matches = new ArrayList<>();
for(KeyPath key : this.data.getFullKeys()) { for(KeyPath key : this.data.getFullKeys()) {
if(this.converter.concat(key).toLowerCase().contains(query)) { if(this.converter.toString(key).toLowerCase().contains(query)) {
matches.add(key); matches.add(key);
} else { } else {
for(String content : this.data.getTranslation(key).values()) { for(String content : this.data.getTranslation(key).getLocaleContents()) {
if(content.toLowerCase().contains(query)) { if(content.toLowerCase().contains(query)) {
matches.add(key); matches.add(key);
} }
@ -74,7 +79,7 @@ public class TableModelMapper implements TableModel, SearchQueryListener, Filter
List<KeyPath> matches = new ArrayList<>(); List<KeyPath> matches = new ArrayList<>();
for(KeyPath key : this.data.getFullKeys()) { for(KeyPath key : this.data.getFullKeys()) {
if(this.data.getTranslation(key).values().size() != this.locales.size()) { if(this.data.getTranslation(key).getLocaleContents().size() != this.locales.size()) {
matches.add(key); matches.add(key);
} }
} }
@ -117,25 +122,25 @@ public class TableModelMapper implements TableModel, SearchQueryListener, Filter
KeyPath key = this.fullKeys.get(rowIndex); KeyPath key = this.fullKeys.get(rowIndex);
if(columnIndex == 0) { // Keys if(columnIndex == 0) { // Keys
return this.converter.concat(key); return this.converter.toString(key);
} }
String locale = this.locales.get(columnIndex - 1); String locale = this.locales.get(columnIndex - 1);
Translation translation = this.data.getTranslation(key); TranslationValue value = this.data.getTranslation(key);
return translation == null ? null : translation.get(locale); return value == null ? null : value.get(locale);
} }
@Override @Override
public void setValueAt(Object aValue, int rowIndex, int columnIndex) { public void setValueAt(Object aValue, int rowIndex, int columnIndex) {
KeyPath key = this.fullKeys.get(rowIndex); KeyPath key = this.fullKeys.get(rowIndex);
Translation translation = this.data.getTranslation(key); TranslationValue translation = this.data.getTranslation(key);
if(translation == null) { // Unknown cell if(translation == null) { // Unknown cell
return; return;
} }
KeyPath newKey = columnIndex == 0 ? this.converter.split(String.valueOf(aValue)) : key; KeyPath newKey = columnIndex == 0 ? this.converter.fromString(String.valueOf(aValue)) : key;
// Translation content update // Translation content update
if(columnIndex > 0) { if(columnIndex > 0) {
@ -146,8 +151,8 @@ public class TableModelMapper implements TableModel, SearchQueryListener, Filter
} }
} }
TranslationUpdate update = new TranslationUpdate(new KeyedTranslation(key, translation), TranslationUpdate update = new TranslationUpdate(new Translation(key, translation),
new KeyedTranslation(newKey, translation)); new Translation(newKey, translation));
this.updater.accept(update); this.updater.accept(update);
} }