Merge pull request #5 from derekprovance/move-dictionary

Move dictionary
TomoyukiUno · May 11, 2016 · 155c548 · 155c548
2 parents 7d42929 + 2cc8b05
commit 155c548
Show file tree

Hide file tree

Showing 14 changed files with 11 additions and 15 deletions.
diff --git a/build.xml b/build.xml
@@ -225,8 +225,8 @@
         <include name="freemind.sh"/>
         <include name="license"/>
         <include name="patterns.xml"/>
-        <include name="dictionaries.properties"/>
-        <include name="dictionary_??.ortho"/>
+        <include name="dictionaries/dictionaries.properties"/>
+        <include name="dictionaries/dictionary_??.ortho"/>
       </fileset>
     </copy>
     <chmod file="${dist}/freemind.sh" perm="u+rx"/>
@@ -322,7 +322,7 @@
     <copy todir="${dist_macos_contents}/Resources/Java">
       <fileset dir="${dist}">
         <include name="doc/*" />
-        <include name="dictionar*" />
+        <include name="dictionaries/**" />
       </fileset>
     </copy>
     <!-- change freemind.properties -->

diff --git a/dictionaries.properties → dictionaries/dictionaries.properties b/dictionaries.properties → dictionaries/dictionaries.properties
diff --git a/dictionary_ar.ortho → dictionaries/dictionary_ar.ortho b/dictionary_ar.ortho → dictionaries/dictionary_ar.ortho
diff --git a/dictionary_de.ortho → dictionaries/dictionary_de.ortho b/dictionary_de.ortho → dictionaries/dictionary_de.ortho
diff --git a/dictionary_en.ortho → dictionaries/dictionary_en.ortho b/dictionary_en.ortho → dictionaries/dictionary_en.ortho
diff --git a/dictionary_es.ortho → dictionaries/dictionary_es.ortho b/dictionary_es.ortho → dictionaries/dictionary_es.ortho
diff --git a/dictionary_fr.ortho → dictionaries/dictionary_fr.ortho b/dictionary_fr.ortho → dictionaries/dictionary_fr.ortho
diff --git a/dictionary_it.ortho → dictionaries/dictionary_it.ortho b/dictionary_it.ortho → dictionaries/dictionary_it.ortho
diff --git a/dictionary_nl.ortho → dictionaries/dictionary_nl.ortho b/dictionary_nl.ortho → dictionaries/dictionary_nl.ortho
diff --git a/dictionary_pl.ortho → dictionaries/dictionary_pl.ortho b/dictionary_pl.ortho → dictionaries/dictionary_pl.ortho
diff --git a/dictionary_ru.ortho → dictionaries/dictionary_ru.ortho b/dictionary_ru.ortho → dictionaries/dictionary_ru.ortho
diff --git a/freemind/main/FreeMind.java b/freemind/main/FreeMind.java
@@ -589,7 +589,7 @@ private void setupSpellChecking() {
 			Tools.safeEquals("true", props.getProperty(FreeMindCommon.CHECK_SPELLING));
 		if (checkSpelling) {
 			try {
-				String decodedPath = Tools.getFreeMindBasePath();
+				String decodedPath = Tools.getFreeMindBasePath() + "dictionaries/";
 				URL url = null;
 				if (new File (decodedPath).exists()) {
 					url = new URL("file", null, decodedPath);

diff --git a/freemind/main/Tools.java b/freemind/main/Tools.java
@@ -2020,21 +2020,17 @@ public static void invokeAndWait(Runnable pRunnable)
 		}
 	}
 
-	public static String getFreeMindBasePath()
-			throws UnsupportedEncodingException {
-		String path = FreeMindStarter.class.getProtectionDomain()
-				.getCodeSource().getLocation().getPath();
+	public static String getFreeMindBasePath() throws UnsupportedEncodingException {
+		String path = FreeMindStarter.class.getProtectionDomain().getCodeSource().getLocation().getPath();
 		String decodedPath = URLDecoder.decode(path, "UTF-8");
 		logger.info("Path: " + decodedPath);
 		if (decodedPath.endsWith(CONTENTS_JAVA_FREEMIND_JAR)) {
-			decodedPath = decodedPath.substring(0, decodedPath.length()
-					- CONTENTS_JAVA_FREEMIND_JAR.length());
+			decodedPath = decodedPath.substring(0, decodedPath.length() - CONTENTS_JAVA_FREEMIND_JAR.length());
 			decodedPath = decodedPath + FREE_MIND_APP_CONTENTS_RESOURCES_JAVA;
 			logger.info("macPath: " + decodedPath);
 		} else if (decodedPath.endsWith(FREEMIND_LIB_FREEMIND_JAR)) {
-			decodedPath = decodedPath.substring(0, decodedPath.length()
-					- FREEMIND_LIB_FREEMIND_JAR.length());
-			logger.info("reducded Path: " + decodedPath);
+			decodedPath = decodedPath.substring(0, decodedPath.length() - FREEMIND_LIB_FREEMIND_JAR.length());
+			logger.info("reduced Path: " + decodedPath);
 		}
 		return decodedPath;
 	}

diff --git a/version.properties b/version.properties
@@ -1,3 +1,3 @@
 #Build Number for ANT. Do not edit!
-#Wed May 11 16:02:16 CDT 2016
-build.number=310
+#Wed May 11 16:37:20 CDT 2016
+build.number=320