From f529796ca98eb10a857589a9f8a296ad58bb0a21 Mon Sep 17 00:00:00 2001
From: Adrian Stoica <george.a.stoica@ntnu.no>
Date: Mon, 21 Oct 2019 11:57:09 +0200
Subject: [PATCH] MetaDataEditorController fixes related to MR !6
* fixed removal of items by using the iterator method
* removed couple of unnecessary if (iterator.hasnext ...) that were
surrounding a while (iterator.hasnext ...)
---
.../simpleex/ui/MetaDataEditorController.java | 28 ++++++++-----------
1 file changed, 12 insertions(+), 16 deletions(-)
diff --git a/simpleexample2/fxui/src/main/java/simpleex/ui/MetaDataEditorController.java b/simpleexample2/fxui/src/main/java/simpleex/ui/MetaDataEditorController.java
index db7af68..ecfd913 100644
--- a/simpleexample2/fxui/src/main/java/simpleex/ui/MetaDataEditorController.java
+++ b/simpleexample2/fxui/src/main/java/simpleex/ui/MetaDataEditorController.java
@@ -138,16 +138,14 @@ public class MetaDataEditorController {
ObservableList<Pair<String, String>> props = propertiesTableView.getItems();
final Iterator<String> propertyNames = latlong.getMetaData().propertyNames();
- if (propertyNames.hasNext()) {
- while(propertyNames.hasNext()) {
- final String propName = propertyNames.next();
- if((propName==MetaData.NAME_PROPERTY)||(propName==MetaData.DESCRIPTION_PROPERTY)) {
- continue;
- } else {
- latlong.getMetaData().removeProperty(propName);
- }
- }
- }
+ while(propertyNames.hasNext()) {
+ final String propName = propertyNames.next();
+ if((propName==MetaData.NAME_PROPERTY)||(propName==MetaData.DESCRIPTION_PROPERTY)) {
+ continue;
+ } else {
+ propertyNames.remove();
+ }
+ }
for (Pair<String, String> pair : props) {
latlong.getMetaData().setProperty(pair.getKey(), pair.getValue());
}
@@ -190,6 +188,7 @@ public class MetaDataEditorController {
private void updatePropertiesTable() {
MetaData metaData = latlong.getMetaData();
+ propertiesTableView.getItems().clear();
final Iterator<String> propertyNames = metaData.propertyNames();
Collection<Pair<String, String>> locationProperties = new ArrayList<Pair<String,String>>();
if( propertyNames.hasNext()) {
@@ -203,7 +202,6 @@ public class MetaDataEditorController {
locationProperties.add(p);
}
}
- propertiesTableView.getItems().clear();
propertiesTableView.getItems().addAll(locationProperties);
}
}
@@ -212,11 +210,9 @@ public class MetaDataEditorController {
tagsBar.clearAllTags();
MetaData metaData = latlong.getMetaData();
final Iterator<String> tags = metaData.tags();
- if(tags.hasNext()) {
- while(tags.hasNext()) {
- final String tag = tags.next();
- tagsBar.addTag(tag);
- }
+ while(tags.hasNext()) {
+ final String tag = tags.next();
+ tagsBar.addTag(tag);
}
}
--
GitLab