Merge branch 'release/1.1.2'

* release/1.1.2: fixed #59 1.1.2 translation strings showing indeterminate progress bar when saving Re-arranged some dependencies to exclude old dkpro versins Now overwriting We now ask before overwriting
nilsreiter · Mar 7, 2018 · 35d53c8 · 35d53c8
2 parents 54d64ef + ecf008a
commit 35d53c8
Show file tree

Hide file tree

Showing 7 changed files with 2,064 additions and 2,046 deletions.
diff --git a/pom.xml b/pom.xml
@@ -3,7 +3,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>de.unistuttgart.ims</groupId>
 	<artifactId>coref.annotator</artifactId>
-	<version>1.1.1</version>
+	<version>1.1.2</version>
 	<packaging>jar</packaging>
 	<name>CorefAnnotator</name>
 	<url>http://maven.apache.org</url>
@@ -190,6 +190,13 @@
 			<artifactId>commons-collections4</artifactId>
 			<version>4.1</version>
 		</dependency>
+		<dependency>
+			<groupId>de.tudarmstadt.ukp.dkpro.core</groupId>
+			<artifactId>
+				de.tudarmstadt.ukp.dkpro.core.api.coref-asl
+			</artifactId>
+			<version>${version.dkpro}</version>
+		</dependency>
 		<dependency>
 			<groupId>de.tudarmstadt.ukp.dkpro.core</groupId>
 			<artifactId>
@@ -235,28 +242,13 @@
 			<artifactId>log4j-api</artifactId>
 			<version>2.3</version>
 		</dependency>
-		<dependency>
-			<groupId>de.unistuttgart.ims</groupId>
-			<artifactId>uimautil</artifactId>
-			<version>0.7.4</version>
-		</dependency>
-		<dependency>
-			<groupId>de.unistuttgart.ims</groupId>
-			<artifactId>creta.api</artifactId>
-			<version>1.3.0</version>
-		</dependency>
+
 		<dependency>
 			<groupId>com.google.guava</groupId>
 			<artifactId>guava</artifactId>
 			<version>24.0-jre</version>
 		</dependency>
-		<dependency>
-			<groupId>de.tudarmstadt.ukp.dkpro.core</groupId>
-			<artifactId>
-				de.tudarmstadt.ukp.dkpro.core.api.coref-asl
-			</artifactId>
-			<version>${version.dkpro}</version>
-		</dependency>
+
 		<dependency>
 			<groupId>org.kordamp.ikonli</groupId>
 			<artifactId>ikonli-materialdesign-pack</artifactId>
@@ -321,5 +313,15 @@
 			</artifactId>
 			<version>${version.dkpro}</version>
 		</dependency>
+		<dependency>
+			<groupId>de.unistuttgart.ims</groupId>
+			<artifactId>creta.api</artifactId>
+			<version>1.3.0</version>
+		</dependency>
+		<dependency>
+			<groupId>de.unistuttgart.ims</groupId>
+			<artifactId>uimautil</artifactId>
+			<version>0.7.4</version>
+		</dependency>
 	</dependencies>
 </project>
diff --git a/src/main/java/de/unistuttgart/ims/coref/annotator/Constants.java b/src/main/java/de/unistuttgart/ims/coref/annotator/Constants.java
@@ -55,6 +55,7 @@ public static class Strings {
 		public static final String DIALOG_CHANGE_KEY_INVALID_STRING_TITLE = "dialog.change_key.invalid_string.title";
 		public static final String DIALOG_CHANGE_KEY_PROMPT = "dialog.change_key.prompt";
 		public static final String DIALOG_EXPORT_AS_TITLE = "dialog.export_as.title";
+		public static final String DIALOG_FILE_EXISTS_OVERWRITE = "dialog.file_exists.overwrite";
 		public static final String DIALOG_RENAME_ENTITY_PROMPT = "dialog.rename_entity.prompt";
 		public static final String DIALOG_SAVE_AS_TITLE = "dialog.save_as.title";
 		public static final String DIALOG_UNSAVED_CHANGES_MESSAGE = "dialog.unsaved_changes.message";