From cd009ff938a505223733dba81838fb7ce9fa285e Mon Sep 17 00:00:00 2001
From: Adrian Stoica <george.a.stoica@ntnu.no>
Date: Wed, 23 Oct 2019 13:07:24 +0200
Subject: [PATCH] more fixes related to MR !6
changed isCustomProperty to static
minor changes for formatting
---
simpleexample2/core/src/main/java/simpleex/core/MetaData.java | 4 ++--
.../src/main/java/simpleex/ui/MetaDataEditorController.java | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/simpleexample2/core/src/main/java/simpleex/core/MetaData.java b/simpleexample2/core/src/main/java/simpleex/core/MetaData.java
index cd97791..e81a250 100644
--- a/simpleexample2/core/src/main/java/simpleex/core/MetaData.java
+++ b/simpleexample2/core/src/main/java/simpleex/core/MetaData.java
@@ -21,7 +21,7 @@ public class MetaData {
/**
* the list containing standard properties associated to location metadata
*/
- final public static List<String> STD_PROPERTIES = Collections.unmodifiableList(Arrays.asList(NAME_PROPERTY, DESCRIPTION_PROPERTY));
+ public final static List<String> STD_PROPERTIES = Collections.unmodifiableList(Arrays.asList(NAME_PROPERTY, DESCRIPTION_PROPERTY));
private Collection<String> tags;
@@ -291,7 +291,7 @@ public class MetaData {
* @param propertyName the property name to check
* @return true if custom false if standard prop
*/
- public boolean isCustomProperty(String propertyName) {
+ public static boolean isCustomProperty(String propertyName) {
return !(STD_PROPERTIES.contains(propertyName));
}
diff --git a/simpleexample2/fxui/src/main/java/simpleex/ui/MetaDataEditorController.java b/simpleexample2/fxui/src/main/java/simpleex/ui/MetaDataEditorController.java
index 9b6f082..88851ac 100644
--- a/simpleexample2/fxui/src/main/java/simpleex/ui/MetaDataEditorController.java
+++ b/simpleexample2/fxui/src/main/java/simpleex/ui/MetaDataEditorController.java
@@ -179,7 +179,7 @@ public class MetaDataEditorController {
public void onAddUpdateProperty(ActionEvent event) {
final String newKey = newKeyInput.getText();
final String newValue = newValueInput.getText();
- if(!newKey.isBlank() && (!MetaData.STD_PROPERTIES.contains(newKey))) {
+ if(!newKey.isBlank() && (MetaData.isCustomProperty(newKey))) {
latlong.getMetaData().setProperty(newKey, newValue);
updatePropertiesTable();
}
--
GitLab