Change yes/no dialogs to ok/cancel

NCIEVS · Jul 28, 2020 · 62266f3 · 62266f3
1 parent 8a9dad0
commit 62266f3
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 9 deletions.
diff --git a/pom.xml b/pom.xml
@@ -10,7 +10,7 @@
 
 	<groupId>gov.nih.nci</groupId>
 	<artifactId>nci-edit-tab</artifactId>
-	<version>1.1.3-SNAPSHOT</version>
+	<version>1.1.4-SNAPSHOT</version>
 	<name>Edit Tab</name> 
 	<description>An editing tab for NCI's complex editing operations</description>
 	<packaging>bundle</packaging>
@@ -65,7 +65,7 @@
         <dependency>
         	<groupId>gov.nih.nci</groupId>
     	    <artifactId>nci-curator</artifactId>
-            <version>0.0.1-SNAPSHOT</version>
+            <version>0.0.2-SNAPSHOT</version>
         </dependency>
 	</dependencies>
 

diff --git a/src/main/java/gov/nih/nci/utils/CuratorChecks.java b/src/main/java/gov/nih/nci/utils/CuratorChecks.java
@@ -65,7 +65,7 @@ public boolean checkOk(List<OWLOntologyChange> changes) {
 			if (change.isAddAxiom()) {
 
 					OWLAxiom ax = change.getAxiom();
-					ok = checkOkAxiom(ax, ont);
+					ok = ok && checkOkAxiom(ax, ont);
 
 			}
 		}
@@ -78,7 +78,7 @@ private boolean checkOkAxiom(OWLAxiom ax, OWLOntology ont) {
 		if (ax.isOfType(AxiomType.SUBCLASS_OF)) {
 			OWLSubClassOfAxiom subax = (OWLSubClassOfAxiom) ax;
 			if (subax.getSuperClass().isOWLClass()) {
-				OWLClass cls = subax.getSuperClass().asOWLClass(); 
+				OWLClass cls = subax.getSubClass().asOWLClass(); 
 				boolean redundantParentsOk = true;
 				boolean disjointRootsOk = true;
 
@@ -115,7 +115,7 @@ private boolean checkUnsupportedConstructs(List<OWLOntologyChange> changes) {
 				if (JOptionPane.showConfirmDialog(null,
 						"NCI Curator does not support these language constructs!",
 						"Ontology Project Changed",
-						JOptionPane.YES_NO_OPTION,
+						JOptionPane.OK_CANCEL_OPTION,
 						JOptionPane.WARNING_MESSAGE) ==
 						JOptionPane.OK_OPTION) {
 					return true;
@@ -158,7 +158,7 @@ private boolean checkRedundantParents(OWLClass cls, OWLClass newParent) {
 			if (JOptionPane.showConfirmDialog(null,
 					"Asserted parent is already parent of existing parent!",
 					"Ontology Project changed",
-					JOptionPane.YES_NO_OPTION,
+					JOptionPane.OK_CANCEL_OPTION,
 					JOptionPane.WARNING_MESSAGE) ==
 					JOptionPane.OK_OPTION) {
 				return true;
@@ -177,7 +177,7 @@ private boolean checkDisjointRoots(OWLClass cls) {
 			if (JOptionPane.showConfirmDialog(null,
 					"Adding this parent creates multiple disjoint roots!",
 					"Ontology Project changed",
-					JOptionPane.YES_NO_OPTION,
+					JOptionPane.OK_CANCEL_OPTION,
 					JOptionPane.WARNING_MESSAGE) ==
 					JOptionPane.OK_OPTION) {
 				return true;

diff --git a/src/main/resources/update.properties b/src/main/resources/update.properties
@@ -1,6 +1,6 @@
 id=nci-edit-tab
-version=1.1.3
-download=https://github.com/ncievs/nci-edit-tab/releases/download/nci-edit-tab-1.1.3/nci-edit-tab-1.1.3-SNAPSHOT.jar
+version=1.1.4
+download=https://github.com/ncievs/nci-edit-tab/releases/download/nci-edit-tab-1.1.4/nci-edit-tab-1.1.4-SNAPSHOT.jar
 name=NCI Edit Tab
 readme=https://raw.githubusercontent.com/ncievs/nci-edit-tab/master/src/main/resources/readme.html
 license=https://raw.githubusercontent.com/ncievs/nci-edit-tab/master/LICENSE