From 0c741c06bf4400e6c32ef67fe17a16568ddb069f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Adri=C3=A1n=20Romero?=
 <adrianromero@users.noreply.github.com>
Date: Mon, 22 Jul 2019 23:45:32 +0200
Subject: [PATCH] Cosmetic changes in View, Send and Edit

---
 .../adr/helloiot/topicinfo/TopicInfoEditNode.java    |  6 +-----
 .../topicinfo/TopicInfoPublicationSubscription.java  |  2 +-
 .../com/adr/helloiot/topicinfo/TopicInfoSend.java    |  2 +-
 .../com/adr/helloiot/fxml/topicinfoeditnode.fxml     |  8 ++++----
 .../adr/helloiot/fxml/topicinfoeditnode.properties   |  2 --
 .../helloiot/fxml/topicinfoeditnode_es.properties    |  2 --
 .../adr/helloiot/fxml/topicinfoeditnode_mobile.fxml  | 12 ++++++------
 7 files changed, 13 insertions(+), 21 deletions(-)

diff --git a/src/main/java/com/adr/helloiot/topicinfo/TopicInfoEditNode.java b/src/main/java/com/adr/helloiot/topicinfo/TopicInfoEditNode.java
index 0dfdf86..cffe19e 100644
--- a/src/main/java/com/adr/helloiot/topicinfo/TopicInfoEditNode.java
+++ b/src/main/java/com/adr/helloiot/topicinfo/TopicInfoEditNode.java
@@ -162,11 +162,7 @@ public EditNodeFormat fromString(String value) {
         editqos.setConverter(new StringConverter<Integer>() {
             @Override
             public String toString(Integer object) {
-                if (object < 0) {
-                    return resources.getString("label.default");
-                } else {
-                    return object.toString();
-                }
+                return object.toString();
             }
 
             @Override
diff --git a/src/main/java/com/adr/helloiot/topicinfo/TopicInfoPublicationSubscription.java b/src/main/java/com/adr/helloiot/topicinfo/TopicInfoPublicationSubscription.java
index c371ec1..0aecb05 100644
--- a/src/main/java/com/adr/helloiot/topicinfo/TopicInfoPublicationSubscription.java
+++ b/src/main/java/com/adr/helloiot/topicinfo/TopicInfoPublicationSubscription.java
@@ -73,7 +73,7 @@ public void load(SubProperties properties) {
         color = c == null ? null : Color.valueOf(c);
         c = properties.getProperty(".background", null);
         background = c == null ? null : Color.valueOf(c);    
-        qos = Integer.parseInt(properties.getProperty(".qos", ""));
+        qos = Integer.parseInt(properties.getProperty(".qos", "0"));
         retained = Boolean.parseBoolean(properties.getProperty(".retained", "false"));
    }
     
diff --git a/src/main/java/com/adr/helloiot/topicinfo/TopicInfoSend.java b/src/main/java/com/adr/helloiot/topicinfo/TopicInfoSend.java
index 64a489c..374c848 100644
--- a/src/main/java/com/adr/helloiot/topicinfo/TopicInfoSend.java
+++ b/src/main/java/com/adr/helloiot/topicinfo/TopicInfoSend.java
@@ -51,7 +51,7 @@ public DevicesUnits getDevicesUnits() throws HelloIoTException {
         EditEvent u = multiline ? new EditAreaEvent() : new EditEvent();
         u.setPrefWidth(320.0);
         u.setLabel(getLabel().getValue());
-        u.setFooter(topic + getQOSBadge(qos));
+        u.setFooter(topicpub + getQOSBadge(qos));
         setStyle(u);
         u.setDevice(d);
         UnitPage.setPage(u, page);
diff --git a/src/main/resources/com/adr/helloiot/fxml/topicinfoeditnode.fxml b/src/main/resources/com/adr/helloiot/fxml/topicinfoeditnode.fxml
index 2fc58ab..f54ed8d 100644
--- a/src/main/resources/com/adr/helloiot/fxml/topicinfoeditnode.fxml
+++ b/src/main/resources/com/adr/helloiot/fxml/topicinfoeditnode.fxml
@@ -42,10 +42,10 @@
       <TextField fx:id="edittopic" styleClass="unitinput" GridPane.columnIndex="1" GridPane.columnSpan="2" GridPane.rowIndex="2" />
       <Label fx:id="labeltopicpub" styleClass="unitlabel" text="%label.topicpub" GridPane.rowIndex="3" />
       <TextField fx:id="edittopicpub" styleClass="unitinput" GridPane.columnIndex="1" GridPane.columnSpan="2" GridPane.rowIndex="3" />
-      <Label fx:id="labeljsonpath" styleClass="unitlabel" text="%label.jsonpath" GridPane.rowIndex="4" />
-      <TextField fx:id="editjsonpath" styleClass="unitinput" GridPane.columnIndex="1" GridPane.rowIndex="4" />
-      <Label styleClass="unitlabel" text="%label.format" GridPane.rowIndex="5" />
-      <ChoiceBox fx:id="editformat" maxWidth="1.7976931348623157E308" styleClass="unitinput" GridPane.columnIndex="1" GridPane.rowIndex="5" />
+      <Label styleClass="unitlabel" text="%label.format" GridPane.rowIndex="4" />
+      <ChoiceBox fx:id="editformat" maxWidth="1.7976931348623157E308" styleClass="unitinput" GridPane.columnIndex="1" GridPane.rowIndex="4" />
+      <Label fx:id="labeljsonpath" styleClass="unitlabel" text="%label.jsonpath" GridPane.rowIndex="5" />
+      <TextField fx:id="editjsonpath" styleClass="unitinput" GridPane.columnIndex="1" GridPane.rowIndex="5" />
       <Label styleClass="unitlabel" text="%label.color" GridPane.rowIndex="6" />
       <ColorPicker fx:id="editcolor" maxWidth="1.7976931348623157E308" styleClass="unitinput" GridPane.columnIndex="1" GridPane.rowIndex="6" />
       <Button fx:id="clearcolor" mnemonicParsing="false" onAction="#onClearColor" styleClass="unitbutton" GridPane.columnIndex="2" GridPane.rowIndex="6" />
diff --git a/src/main/resources/com/adr/helloiot/fxml/topicinfoeditnode.properties b/src/main/resources/com/adr/helloiot/fxml/topicinfoeditnode.properties
index 80fa4e7..593e8b8 100644
--- a/src/main/resources/com/adr/helloiot/fxml/topicinfoeditnode.properties
+++ b/src/main/resources/com/adr/helloiot/fxml/topicinfoeditnode.properties
@@ -16,8 +16,6 @@
 #    You should have received a copy of the GNU General Public License
 #    along with HelloIot.  If not, see <http://www.gnu.org/licenses/>.
 #
-label.default = Default
-label.empty = Empty
 label.no=No
 label.yes=Yes
 
diff --git a/src/main/resources/com/adr/helloiot/fxml/topicinfoeditnode_es.properties b/src/main/resources/com/adr/helloiot/fxml/topicinfoeditnode_es.properties
index 5803757..12f200a 100644
--- a/src/main/resources/com/adr/helloiot/fxml/topicinfoeditnode_es.properties
+++ b/src/main/resources/com/adr/helloiot/fxml/topicinfoeditnode_es.properties
@@ -16,8 +16,6 @@
 #    You should have received a copy of the GNU General Public License
 #    along with HelloIot.  If not, see <http://www.gnu.org/licenses/>.
 #
-label.default = Defecto
-label.empty = Vac\u00edo
 label.no=No
 label.yes=S\u00ed
 
diff --git a/src/main/resources/com/adr/helloiot/fxml/topicinfoeditnode_mobile.fxml b/src/main/resources/com/adr/helloiot/fxml/topicinfoeditnode_mobile.fxml
index db24327..835b57d 100644
--- a/src/main/resources/com/adr/helloiot/fxml/topicinfoeditnode_mobile.fxml
+++ b/src/main/resources/com/adr/helloiot/fxml/topicinfoeditnode_mobile.fxml
@@ -46,14 +46,14 @@
       <TextField fx:id="editname" styleClass="unitinput" GridPane.rowIndex="1" />       
       <Label styleClass="unitlabel" text="%label.page" GridPane.rowIndex="2" />
       <ComboBox fx:id="editpage" editable="true" maxWidth="1.7976931348623157E308" styleClass="unitcombobox" GridPane.rowIndex="3" />
-      <Label styleClass="unitlabel" text="%label.topic" GridPane.rowIndex="4" />
+      <Label fx:id="labeltopic" styleClass="unitlabel" text="%label.topic" GridPane.rowIndex="4" />
       <TextField fx:id="edittopic" styleClass="unitinput" GridPane.rowIndex="5" />
-      <Label styleClass="unitlabel" text="%label.topicpub" GridPane.rowIndex="6" />
+      <Label fx:id="labeltopicpub" styleClass="unitlabel" text="%label.topicpub" GridPane.rowIndex="6" />
       <TextField fx:id="edittopicpub" styleClass="unitinput" GridPane.rowIndex="7" />
-      <Label styleClass="unitlabel" text="%label.jsonpath" GridPane.rowIndex="8" />
-      <TextField fx:id="editjsonpath" styleClass="unitinput" GridPane.rowIndex="9" />
-      <Label styleClass="unitlabel" text="%label.format" GridPane.rowIndex="10" />
-      <ChoiceBox fx:id="editformat" maxWidth="1.7976931348623157E308" styleClass="unitinput" GridPane.rowIndex="11" />
+      <Label styleClass="unitlabel" text="%label.format" GridPane.rowIndex="8" />
+      <ChoiceBox fx:id="editformat" maxWidth="1.7976931348623157E308" styleClass="unitinput" GridPane.rowIndex="9" />
+      <Label styleClass="unitlabel" text="%label.jsonpath" GridPane.rowIndex="10" />
+      <TextField fx:id="editjsonpath" styleClass="unitinput" GridPane.rowIndex="11" />
       <Label styleClass="unitlabel" text="%label.color" GridPane.rowIndex="12" />
       <HBox alignment="CENTER_LEFT" spacing="10.0" GridPane.rowIndex="13">
          <children>