Added fallback for the cases where getLocalName() returns an empty st…

…ring. Added initial dialog before reloading ontology.
viniciusbm · Nov 12, 2019 · b90954f · b90954f
1 parent 798d5da
commit b90954f
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 4 deletions.
diff --git a/pom.xml b/pom.xml
@@ -4,7 +4,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>br.ime.usp.vbm</groupId>
 	<artifactId>sparqlguiwrapper</artifactId>
-	<version>0.1.4</version>
+	<version>0.1.5</version>
 	<name>SPARQL GUI Wrapper</name>
 	<dependencies>
 		<dependency>

diff --git a/src/main/java/sparqlguiwrapper/MainWindow.java b/src/main/java/sparqlguiwrapper/MainWindow.java
@@ -339,6 +339,11 @@ private void showErrorDialog(String error) {
         JOptionPane.showMessageDialog(this, error, "Error", JOptionPane.ERROR_MESSAGE);
     }
 
+    private boolean showQuestionDialog(String question, String title) {
+        return JOptionPane.showConfirmDialog(this, question, title,
+                JOptionPane.YES_NO_OPTION) == JOptionPane.YES_OPTION;
+    }
+
     public static void main(String[] args) {
 
         EventQueue.invokeLater(() -> {
@@ -377,9 +382,21 @@ private void readConfigFile() {
             JsonReader parser = Json.createReader(new StringReader(cfg));
             JsonObject o = parser.readObject();
             String fn = o.getString("ontologyFileName", "");
-            if (fn.isEmpty())
-                fn = null;
-            setOntologyFileName(fn, true);
+            if (fn.isEmpty()) {
+                setOntologyFileName(null, true);
+            } else {
+                if (showQuestionDialog("Do you want to open the following ontology again?\n" + fn, "Reopen ontology?"))
+                    SwingUtilities.invokeLater(new Runnable() {
+
+                        @Override
+                        public void run() {
+                            setOntologyFileName(fn);
+                        }
+                    });
+
+                else
+                    setOntologyFileName(null, true);
+            }
             String lastQuery = o.getString("lastQuery", "");
             qm.setLastQuery(lastQuery);
             port = o.getInt("port", 8080);

diff --git a/src/main/java/sparqlguiwrapper/QueryManager.java b/src/main/java/sparqlguiwrapper/QueryManager.java
@@ -128,6 +128,8 @@ public String runQuery(String queryString) throws FileNotFoundException {
                         Resource r = cell.asResource();
                         String localName = r.getLocalName();
                         String fullName = r.toString();
+                        if (localName.isEmpty())
+                            localName = fullName.substring(fullName.indexOf('#') + 1);
                         row.add(Json.createObjectBuilder().add("isLiteral", false).add("localName", localName)
                                 .add("fullName", fullName));
                     }