Merge branch 'dev' of https://github.com/databrary/datavyu into dev

databrary · Sep 30, 2020 · 19129a1 · 19129a1
2 parents 68668e4 + 376716d
commit 19129a1
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 8 deletions.
diff --git a/src/main/java/org/datavyu/controllers/ExportDatabaseFileController.java b/src/main/java/org/datavyu/controllers/ExportDatabaseFileController.java
@@ -417,7 +417,7 @@ public void exportAsJSON(String dbFileName, DataStore dataStore) throws UserWarn
 
                 column.getRootNode().childArguments.forEach(argument -> {
                     try {
-                        g.writeStringField(argument.type.name(), argument.name);
+                        g.writeStringField(argument.name, argument.type.name());
                     } catch (IOException e) {
                         e.printStackTrace();
                     }

diff --git a/src/main/java/org/datavyu/controllers/OpenDataStoreFileController.java b/src/main/java/org/datavyu/controllers/OpenDataStoreFileController.java
@@ -219,8 +219,7 @@ public void importJSONToSpreadsheet(File file, SpreadSheetPanel spreadSheet) thr
                                                 while (!JsonToken.END_OBJECT.equals(token)) {
                                                     token = parser.nextToken();
                                                     if (token == null) { break; }
-                                                    if (JsonToken.START_OBJECT.equals(token) || JsonToken
-                                                            .START_OBJECT.equals(token) || JsonToken.END_OBJECT
+                                                    if (JsonToken.START_OBJECT.equals(token) || JsonToken.END_OBJECT
                                                             .equals(token)) {
                                                         break;
                                                     }
@@ -233,10 +232,10 @@ public void importJSONToSpreadsheet(File file, SpreadSheetPanel spreadSheet) thr
                                                         variableArg.name = parser.getValueAsString();
                                                     }
                                                     if (variableType == Argument.Type.MATRIX) {
-                                                        if (getVarType(parser.getCurrentName()) != null) {
+                                                        if (getVarType(parser.getValueAsString()) != null) {
                                                             variableArg.childArguments.add(new Argument(parser
-                                                                    .getValueAsString(), getVarType(parser
-                                                                    .getCurrentName())));
+                                                                    .getCurrentName(), getVarType(parser
+                                                                    .getValueAsString())));
                                                         } else {
                                                             logger.warn("Unknown argument ('" + parser.getCurrentName
                                                                     () + "' line " + parser.getCurrentLocation()

diff --git a/src/main/java/org/datavyu/views/DatavyuView.java b/src/main/java/org/datavyu/views/DatavyuView.java
@@ -2603,13 +2603,13 @@ private void spreadsheetMenuSelected(final MenuEvent evt) {
         if (totalNumberOfVisibleColumns == 0) {
             newCellMenuItem.setEnabled(false);
             exportJSON.setEnabled(false);
-            importJSON.setEnabled(false);
         } else {
             newCellMenuItem.setEnabled(true);
             exportJSON.setEnabled(true);
-            importJSON.setEnabled(true);
         }
 
+        importJSON.setEnabled(true);
+
         List<Variable> selectedCols = Datavyu.getProjectController().getDataStore().getSelectedVariables();
 
         if (selectedCols.isEmpty()) {