Bug Fixes and 1.0 released

* Bug Fixes and 1.0 released.

README.ja.md

@@ -44,6 +44,7 @@ MR<sup>3</sup>はフリーソフトウェアです．Free Software Foundation 
 * [JFontChooser](http://jfontchooser.sourceforge.jp/)([License](http://sourceforge.jp/softwaremap/trove_list.php?form_cat=188))
 * [Apache ORO](http://attic.apache.org/projects/jakarta-oro.html)([License](http://www.apache.org/licenses/LICENSE-2.0))
 * [Silk Icons](http://www.famfamfam.com)([License](http://creativecommons.org/licenses/by/2.5/))
+* [exewrap](http://exewrap.sourceforge.jp/)([License](http://exewrap.sourceforge.jp/#license))
 
 ## プロジェクトメンバー
 * 森田 武史 (青山学院大学 社会情報学部)
@@ -52,5 +53,5 @@ MR<sup>3</sup>はフリーソフトウェアです．Free Software Foundation 
 * 山口 高平 (慶應義塾大学 理工学部)
 
 ## 連絡先
-* 森田 武史 (t_morita@si.aoyama.ac.jp)
+* 森田 武史 (t_morita@ae.keio.ac.jp)
 

README.md

@@ -43,6 +43,7 @@ MR<sup>3</sup> uses the following libraries.
 * [JFontChooser](http://jfontchooser.sourceforge.jp/)([License](http://sourceforge.jp/softwaremap/trove_list.php?form_cat=188))
 * [Apache ORO](http://attic.apache.org/projects/jakarta-oro.html)([License](http://www.apache.org/licenses/LICENSE-2.0))
 * [Silk Icons](http://www.famfamfam.com)([License](http://creativecommons.org/licenses/by/2.5/))
+* [exewrap](http://exewrap.sourceforge.jp/)([License](http://exewrap.sourceforge.jp/#license))
 
 ## Project Member
 * Takeshi Morita (School of Social Informatics, Aoyama Gakuin University, Japan)
@@ -51,5 +52,5 @@ MR<sup>3</sup> uses the following libraries.
 * Takahira Yamaguchi (Faculty of Science and Technology, Keio University, Japan)
 
 ## Contact
-* Takeshi Morita (t_morita@si.aoyama.ac.jp)
+* Takeshi Morita (t_morita@ae.keio.ac.jp)
 

pom.xml

@@ -181,6 +181,15 @@
 			<name>JFontChooser Repository</name>
 			<url>http://jfontchooser.sourceforge.jp/repository/</url>
 		</repository>
+		<repository>
+			<id>net.sourceforge.doddle-owl</id>
+			<url>http://doddle-owl.sourceforge.net/m2repository</url>
+		</repository>
+		<repository>
+			<id>repository.apache.org</id>
+			<name>Apache Jena Repository</name>
+			<url>https://repository.apache.org/content/repositories/releases/</url>
+		</repository>
 	</repositories>
 	<dependencies>
 		<dependency>
@@ -199,11 +208,6 @@
 			<artifactId>jgraphaddons</artifactId>
 			<version>1.0.2</version>
 		</dependency>
-		<dependency>
-			<groupId>net.infonode</groupId>
-			<artifactId>idw</artifactId>
-			<version>1.6.1_gpl</version>
-		</dependency>
 		<dependency>
 			<groupId>oro</groupId>
 			<artifactId>oro</artifactId>
@@ -215,6 +219,11 @@
 			<version>2.12.1</version>
 			<type>pom</type>
 		</dependency>
+   	    <dependency>
+			<groupId>net.infonode</groupId>
+			<artifactId>idw</artifactId>
+			<version>1.6.1_gpl</version>
+		</dependency>
 		<dependency>
 			<groupId>say.swing</groupId>
 			<artifactId>jfontchooser</artifactId>

src/main/assembly/descriptor-bin.xml

@@ -26,14 +26,14 @@
 			<includes>
 				<include>*.xml</include>
 				<include>*.jar</include>
+				<include>License.txt</include>
 			</includes>
 		</fileSet>
 		<fileSet>
 			<directory>./</directory>
 			<outputDirectory>./</outputDirectory>
 			<includes>
 				<include>*.md</include>
-				<include>License.txt</include>
 			</includes>
 		</fileSet>
 	</fileSets>

src/main/java/net/sourceforge/mr3/actions/AbstractActionFile.java

@@ -126,9 +126,9 @@ protected InputStream getInputStream(String ext) {
 	}
 
 	private static ProjectFileFilter mr3FileFilter = new ProjectFileFilter();
-	private static OWLFileFilter owlFileFilter = new OWLFileFilter();
-	private static RDFsFileFilter rdfsFileFilter = new RDFsFileFilter();
-	private static NTripleFileFilter n3FileFilter = new NTripleFileFilter();
+	private static OWLFileFilter owlFileFilter = new OWLFileFilter(true);
+	private static RDFsFileFilter rdfsFileFilter = new RDFsFileFilter(true);
+	private static NTripleFileFilter n3FileFilter = new NTripleFileFilter(true);
 	private static PNGFileFilter pngFileFilter = new PNGFileFilter();
 
 	protected File getFile(boolean isOpenFile, String extension) {
@@ -173,8 +173,8 @@ private String complementMR3Extension(String tmp, String extension) {
 
 	private String complementRDFsExtension(String tmp, String extension) {
 		String ext = (extension != null) ? "." + extension.toLowerCase() : "";
-		if (extension != null && !tmp.toLowerCase().endsWith(".rdf")
-				&& !tmp.toLowerCase().endsWith(".rdfs") && !tmp.toLowerCase().endsWith(".n3")) {
+		if (extension != null && !tmp.toLowerCase().endsWith(".rdf") && !tmp.toLowerCase().endsWith(".rdfs")
+				&& !tmp.toLowerCase().endsWith(".n3")) {
 			tmp += ext;
 		}
 		return tmp;
@@ -190,8 +190,7 @@ protected void saveProject(File file) {
 			MR3.getCurrentProject().setCurrentProjectFile(file);
 			MR3.setCurrentProjectName();
 		} catch (FileNotFoundException e2) {
-			JOptionPane.showMessageDialog(null, "FileNotFound", "Warning",
-					JOptionPane.ERROR_MESSAGE);
+			JOptionPane.showMessageDialog(null, "FileNotFound", "Warning", JOptionPane.ERROR_MESSAGE);
 		} catch (UnsupportedEncodingException e3) {
 			e3.printStackTrace();
 		}
@@ -209,8 +208,8 @@ protected void saveProjectAs() {
 	}
 
 	protected void exitProgram(Frame frame) {
-		int messageType = JOptionPane.showConfirmDialog(frame, Translator.getString("SaveChanges"),
-				"MR^3 - " + Translator.getString("ExitProgram"), JOptionPane.YES_NO_CANCEL_OPTION,
+		int messageType = JOptionPane.showConfirmDialog(frame, Translator.getString("SaveChanges"), "MR^3 - "
+				+ Translator.getString("ExitProgram"), JOptionPane.YES_NO_CANCEL_OPTION,
 				JOptionPane.INFORMATION_MESSAGE);
 		if (messageType == JOptionPane.YES_OPTION) {
 			confirmAllExitProject(frame);
@@ -229,12 +228,10 @@ protected void exitProject(MR3Project project) {
 		File currentProjectFile = project.getCurrentProjectFile();
 		if (isNewProjectFile(project)) {
 			saveProjectAs();
-			HistoryManager.saveHistory(HistoryType.SAVE_PROJECT_AS,
-					currentProjectFile.getAbsolutePath());
+			HistoryManager.saveHistory(HistoryType.SAVE_PROJECT_AS, currentProjectFile.getAbsolutePath());
 		} else {
 			saveProject(currentProjectFile);
-			HistoryManager.saveHistory(HistoryType.SAVE_PROJECT,
-					currentProjectFile.getAbsolutePath());
+			HistoryManager.saveHistory(HistoryType.SAVE_PROJECT, currentProjectFile.getAbsolutePath());
 		}
 	}
 
@@ -260,9 +257,8 @@ protected boolean isNewProjectFile(MR3Project currentProject) {
 
 	protected int confirmExitProject(Frame root, MR3Project project) {
 		String title = project.getTitle();
-		int messageType = JOptionPane.showConfirmDialog(root,
-				title + "\n" + Translator.getString("SaveChanges"), "MR^3 - " + title,
-				JOptionPane.YES_NO_OPTION, JOptionPane.INFORMATION_MESSAGE);
+		int messageType = JOptionPane.showConfirmDialog(root, title + "\n" + Translator.getString("SaveChanges"),
+				"MR^3 - " + title, JOptionPane.YES_NO_OPTION, JOptionPane.INFORMATION_MESSAGE);
 		if (messageType == JOptionPane.YES_OPTION) {
 			exitProject(project);
 		}