Merge branch 'develop'

mr-3 · May 27, 2020 · 61cd6b0 · 61cd6b0
2 parents d7ac914 + 287921c
commit 61cd6b0
Show file tree

Hide file tree

Showing 131 changed files with 180 additions and 166 deletions.
diff --git a/README.ja.md b/README.ja.md
@@ -37,18 +37,19 @@ MR<sup>3</sup>には主に以下の3つの特徴があります．
 MR<sup>3</sup>はフリーソフトウェアです．Free Software Foundation による [GNU Generic Public License](http://www.gnu.org/copyleft/gpl.html) のバージョン2 （または，それ以降のバージョン）に従う限り自由に変更し再配布することができます．
 
 ## 利用ライブラリとライセンス
+* [FlatLaf - Flat Look and Feel](https://www.formdev.com/flatlaf/)([License](http://www.apache.org/licenses/LICENSE-2.0))
 * [JGraph and JGraphAddons](http://www.jgraph.com/)([License](https://github.com/jgraph/legacy-jgraph5/blob/master/LICENSE)]
 * [Apache Jena](https://jena.apache.org/)([License](http://www.apache.org/licenses/LICENSE-2.0))
 * [Apache Batik SVG Toolkit](https://xmlgraphics.apache.org/batik/)([License](https://xmlgraphics.apache.org/batik/license.html))
 * [Drawing Graphs with VGJ](http://www.eng.auburn.edu/department/cse/research/graph_drawing/graph_drawing.html)([License](http://www.eng.auburn.edu/department/cse/research/graph_drawing/COPYING))
 * [Material Design icons by Google](https://github.com/google/material-design-icons)([License](https://www.apache.org/licenses/LICENSE-2.0.txt))
 
 ## プロジェクトメンバー
-* 森田 武史 (慶應義塾大学 理工学部)
-* 福田 直樹 (静岡大学 情報学部)
-* 和泉 憲明 (産業技術総合研究所)
-* 山口 高平 (慶應義塾大学 理工学部)
+* 森田武史 (青山学院大学理工学部)
+* 福田直樹 (静岡大学情報学部)
+* 和泉憲明 (産業技術総合研究所)
+* 山口高平 (慶應義塾大学理工学部)
 
 ## 連絡先
-* 森田 武史 (t_morita@keio.jp)
+* 森田武史 (morita@it.aoyama.ac.jp)
 
diff --git a/README.md b/README.md
@@ -36,18 +36,19 @@ MR<sup>3</sup> is Free Software; you may redistribute it and/or modify it under
 ## Acknowledgements
 MR<sup>3</sup> uses the following libraries.
 
+* [FlatLaf - Flat Look and Feel](https://www.formdev.com/flatlaf/)([License](http://www.apache.org/licenses/LICENSE-2.0))
 * [JGraph and JGraphAddons](http://www.jgraph.com/)([License](https://github.com/jgraph/legacy-jgraph5/blob/master/LICENSE)]
 * [Apache Jena](https://jena.apache.org/)([License](http://www.apache.org/licenses/LICENSE-2.0))
 * [Apache Batik SVG Toolkit](https://xmlgraphics.apache.org/batik/)([License](https://xmlgraphics.apache.org/batik/license.html))
 * [Drawing Graphs with VGJ](http://www.eng.auburn.edu/department/cse/research/graph_drawing/graph_drawing.html)([License](http://www.eng.auburn.edu/department/cse/research/graph_drawing/COPYING))
 * [Material Design icons by Google](https://github.com/google/material-design-icons)([License](https://www.apache.org/licenses/LICENSE-2.0.txt))
 
 ## Project Member
-* Takeshi Morita (Faculty of Science and Technology, Keio University, Japan)
+* Takeshi Morita (College of Science and Engineering, Aoyama Gakuin University, Japan)
 * Naoki Fukuta (Department of Computer Science, Shizuoka University, Japan)
 * Noriaki Izumi (National Institute of Advanced Industrial Science and Technology, Japan)
 * Takahira Yamaguchi (Faculty of Science and Technology, Keio University, Japan)
 
 ## Contact
-* Takeshi Morita (t_morita@keio.jp)
+* Takeshi Morita (morita@it.aoyama.ac.jp)
 
diff --git a/build.gradle b/build.gradle
@@ -1,15 +1,15 @@
 plugins {
     id 'java'
     id 'application'
-    id 'com.github.johnrengelman.shadow' version '4.0.2'
-    id 'org.beryx.runtime' version '1.1.2'
+    id "com.github.johnrengelman.shadow" version "5.2.0"
+    id "org.beryx.runtime" version "1.8.4"
     id "com.jfrog.bintray" version "1.8.4"
     id 'maven-publish'
     id 'idea'
 }
 
 group 'org.mrcube'
-version = '2019.05_1'
+version = '20.5.1'
 mainClassName = 'org.mrcube.MR3'
 sourceCompatibility = targetCompatibility = '11'
 
@@ -24,7 +24,7 @@ repositories {
 }
 
 wrapper {
-    gradleVersion = '5.0'
+    gradleVersion = '6.4.1'
 }
 
 jar {
@@ -54,14 +54,30 @@ shadowJar {
     manifest {
         attributes 'Main-Class': 'org.mrcube.MR3'
     }
-    archiveName = "mrcube.jar"
+    archiveFileName = "mrcube-${version}.jar"
 }
 
 runtime {
     options = ['--strip-debug', '--compress', '2', '--no-header-files', '--no-man-pages']
     modules = ['java.desktop', 'java.logging']
     imageDir = file("$buildDir/mrcube-${version}")
     imageZip = file("$buildDir/mrcube-${version}.zip")
+
+    jpackage {
+        // macOS
+//        jpackageHome = '/Library/Java/JavaVirtualMachines/jdk-14.0.1.jdk/Contents/Home'
+//        imageOptions = ['--icon', './src/main/resources/images/mr3.icns']
+        outputDir = 'my-packaging'
+        mainJar = "mrcube-${version}.jar"
+        imageName = "mrcube-${version}"
+        skipInstaller = false
+        installerName = "mrcube"
+        // Windows
+        jpackageHome = 'C://jdk-14.0.1'
+        installerType = 'msi'
+        imageOptions = ['--icon', './src/main/resources/images/mr3.ico']
+        installerOptions = ['--vendor', 'Takeshi Morita', '--win-shortcut']
+    }
 }
 
 tasks.runtime.doLast {
@@ -80,14 +96,15 @@ tasks.runtime.doLast {
 }
 
 dependencies {
+    compile 'com.formdev:flatlaf:0.35'
     compile 'jgraph:jgraph:5.13.0.0'
-    compile 'org.apache.jena:jena-core:3.11.0'
-    compile 'org.apache.jena:jena-arq:3.11.0'
-    compile 'org.slf4j:slf4j-simple:1.7.25'
-    compile 'org.apache.xmlgraphics:batik-svg-dom:1.11'
-    compile 'org.apache.xmlgraphics:batik-svggen:1.11'
-    testImplementation 'org.junit.jupiter:junit-jupiter-api:5.3.2'
-    testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.3.2'
+    compile 'org.apache.jena:jena-core:3.15.0'
+    compile 'org.apache.jena:jena-arq:3.15.0'
+    compile 'org.slf4j:slf4j-simple:1.7.30'
+    compile 'org.apache.xmlgraphics:batik-svg-dom:1.13'
+    compile 'org.apache.xmlgraphics:batik-svggen:1.13'
+    testImplementation 'org.junit.jupiter:junit-jupiter-api:5.6.2'
+    testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.6.2'
 }
 
 publishing {
@@ -111,7 +128,7 @@ publishing {
                     developer {
                         id = 't-morita'
                         name = 'Takeshi Morita'
-                        email = 't_morita@ae.keio.ac.jp'
+                        email = 'morita@it.aoyama.ac.jp'
                     }
                 }
             }
@@ -139,3 +156,4 @@ bintray {
         }
     }
 }
+
diff --git a/src/main/java/org/mrcube/MR3.java b/src/main/java/org/mrcube/MR3.java
@@ -2,7 +2,7 @@
  * Project Name: MR^3 (Meta-Model Management based on RDFs Revision Reflection)
  * Project Website: http://mrcube.org/
  *
- * Copyright (C) 2003-2019 Yamaguchi Laboratory, Keio University. All rights reserved.
+ * Copyright (C) 2003-2020 Takeshi Morita. All rights reserved.
  *
  * This file is part of MR^3.
  *
@@ -23,6 +23,7 @@
 
 package org.mrcube;
 
+import com.formdev.flatlaf.FlatLightLaf;
 import org.apache.jena.sys.JenaSystem;
 import org.mrcube.actions.*;
 import org.mrcube.editors.ClassEditor;
@@ -134,6 +135,7 @@ public MR3() {
                 });
             }
         }
+        setIconImage(MR3Constants.SPLASH_LOGO.getImage());
         setDefaultCloseOperation(WindowConstants.DO_NOTHING_ON_CLOSE);
         addWindowListener(new WindowAdapter() {
             public void windowClosing(WindowEvent e) {
@@ -638,24 +640,11 @@ public String getBaseURI() {
     }
 
     public static void initialize(Class cls) {
+        FlatLightLaf.install();
         JenaSystem.init();
         userPrefs = Preferences.userNodeForPackage(cls);
         Translator.loadResourceBundle(userPrefs);
         UIManager.put("TitledBorder.border", new LineBorder(new Color(200, 200, 200), 1));
-        try {
-            try {
-                for (UIManager.LookAndFeelInfo info : UIManager.getInstalledLookAndFeels()) {
-                    if ("Nimbus".equals(info.getName())) {
-                        UIManager.setLookAndFeel(info.getClassName());
-                        break;
-                    }
-                }
-            } catch (Exception e) {
-                e.printStackTrace();
-            }
-        } catch (Exception ex) {
-            ex.printStackTrace();
-        }
         StringSelection ss = new StringSelection("");
         Clipboard clipboard = Toolkit.getDefaultToolkit().getSystemClipboard();
         clipboard.setContents(ss, null);

diff --git a/src/main/java/org/mrcube/actions/AbstractActionFile.java b/src/main/java/org/mrcube/actions/AbstractActionFile.java
@@ -2,7 +2,7 @@
  * Project Name: MR^3 (Meta-Model Management based on RDFs Revision Reflection)
  * Project Website: http://mrcube.org/
  *
- * Copyright (C) 2003-2019 Yamaguchi Laboratory, Keio University. All rights reserved.
+ * Copyright (C) 2003-2020 Takeshi Morita. All rights reserved.
  *
  * This file is part of MR^3.
  *

diff --git a/src/main/java/org/mrcube/actions/CopyAction.java b/src/main/java/org/mrcube/actions/CopyAction.java
@@ -2,7 +2,7 @@
  * Project Name: MR^3 (Meta-Model Management based on RDFs Revision Reflection)
  * Project Website: http://mrcube.org/
  *
- * Copyright (C) 2003-2019 Yamaguchi Laboratory, Keio University. All rights reserved.
+ * Copyright (C) 2003-2020 Takeshi Morita. All rights reserved.
  *
  * This file is part of MR^3.
  *

diff --git a/src/main/java/org/mrcube/actions/CutAction.java b/src/main/java/org/mrcube/actions/CutAction.java
@@ -2,7 +2,7 @@
  * Project Name: MR^3 (Meta-Model Management based on RDFs Revision Reflection)
  * Project Website: http://mrcube.org/
  *
- * Copyright (C) 2003-2019 Yamaguchi Laboratory, Keio University. All rights reserved.
+ * Copyright (C) 2003-2020 Takeshi Morita. All rights reserved.
  *
  * This file is part of MR^3.
  *

diff --git a/src/main/java/org/mrcube/actions/DeployWindows.java b/src/main/java/org/mrcube/actions/DeployWindows.java
@@ -2,7 +2,7 @@
  * Project Name: MR^3 (Meta-Model Management based on RDFs Revision Reflection)
  * Project Website: http://mrcube.org/
  *
- * Copyright (C) 2003-2019 Yamaguchi Laboratory, Keio University. All rights reserved.
+ * Copyright (C) 2003-2020 Takeshi Morita. All rights reserved.
  *
  * This file is part of MR^3.
  *

diff --git a/src/main/java/org/mrcube/actions/EditConceptAction.java b/src/main/java/org/mrcube/actions/EditConceptAction.java
@@ -2,7 +2,7 @@
  * Project Name: MR^3 (Meta-Model Management based on RDFs Revision Reflection)
  * Project Website: http://mrcube.org/
  *
- * Copyright (C) 2003-2019 Yamaguchi Laboratory, Keio University. All rights reserved.
+ * Copyright (C) 2003-2020 Takeshi Morita. All rights reserved.
  *
  * This file is part of MR^3.
  *

diff --git a/src/main/java/org/mrcube/actions/EditRDFPropertyAction.java b/src/main/java/org/mrcube/actions/EditRDFPropertyAction.java
@@ -2,7 +2,7 @@
  * Project Name: MR^3 (Meta-Model Management based on RDFs Revision Reflection)
  * Project Website: http://mrcube.org/
  *
- * Copyright (C) 2003-2019 Yamaguchi Laboratory, Keio University. All rights reserved.
+ * Copyright (C) 2003-2020 Takeshi Morita. All rights reserved.
  *
  * This file is part of MR^3.
  *

diff --git a/src/main/java/org/mrcube/actions/FindResAction.java b/src/main/java/org/mrcube/actions/FindResAction.java
@@ -2,7 +2,7 @@
  * Project Name: MR^3 (Meta-Model Management based on RDFs Revision Reflection)
  * Project Website: http://mrcube.org/
  *
- * Copyright (C) 2003-2019 Yamaguchi Laboratory, Keio University. All rights reserved.
+ * Copyright (C) 2003-2020 Takeshi Morita. All rights reserved.
  *
  * This file is part of MR^3.
  *

diff --git a/src/main/java/org/mrcube/actions/GraphLayoutAction.java b/src/main/java/org/mrcube/actions/GraphLayoutAction.java
@@ -2,7 +2,7 @@
  * Project Name: MR^3 (Meta-Model Management based on RDFs Revision Reflection)
  * Project Website: http://mrcube.org/
  *
- * Copyright (C) 2003-2019 Yamaguchi Laboratory, Keio University. All rights reserved.
+ * Copyright (C) 2003-2020 Takeshi Morita. All rights reserved.
  *
  * This file is part of MR^3.
  *

diff --git a/src/main/java/org/mrcube/actions/GroupAction.java b/src/main/java/org/mrcube/actions/GroupAction.java
@@ -2,7 +2,7 @@
  * Project Name: MR^3 (Meta-Model Management based on RDFs Revision Reflection)
  * Project Website: http://mrcube.org/
  *
- * Copyright (C) 2003-2019 Yamaguchi Laboratory, Keio University. All rights reserved.
+ * Copyright (C) 2003-2020 Takeshi Morita. All rights reserved.
  *
  * This file is part of MR^3.
  *

diff --git a/src/main/java/org/mrcube/actions/MR3AbstractAction.java b/src/main/java/org/mrcube/actions/MR3AbstractAction.java
@@ -2,7 +2,7 @@
  * Project Name: MR^3 (Meta-Model Management based on RDFs Revision Reflection)
  * Project Website: http://mrcube.org/
  *
- * Copyright (C) 2003-2019 Yamaguchi Laboratory, Keio University. All rights reserved.
+ * Copyright (C) 2003-2020 Takeshi Morita. All rights reserved.
  *
  * This file is part of MR^3.
  *

diff --git a/src/main/java/org/mrcube/actions/NewProject.java b/src/main/java/org/mrcube/actions/NewProject.java
@@ -2,7 +2,7 @@
  * Project Name: MR^3 (Meta-Model Management based on RDFs Revision Reflection)
  * Project Website: http://mrcube.org/
  *
- * Copyright (C) 2003-2019 Yamaguchi Laboratory, Keio University. All rights reserved.
+ * Copyright (C) 2003-2020 Takeshi Morita. All rights reserved.
  *
  * This file is part of MR^3.
  *

diff --git a/src/main/java/org/mrcube/actions/OpenFileAction.java b/src/main/java/org/mrcube/actions/OpenFileAction.java
@@ -2,7 +2,7 @@
  * Project Name: MR^3 (Meta-Model Management based on RDFs Revision Reflection)
  * Project Website: http://mrcube.org/
  *
- * Copyright (C) 2003-2019 Yamaguchi Laboratory, Keio University. All rights reserved.
+ * Copyright (C) 2003-2020 Takeshi Morita. All rights reserved.
  *
  * This file is part of MR^3.
  *

diff --git a/src/main/java/org/mrcube/actions/OpenResourceAction.java b/src/main/java/org/mrcube/actions/OpenResourceAction.java
@@ -2,7 +2,7 @@
  * Project Name: MR^3 (Meta-Model Management based on RDFs Revision Reflection)
  * Project Website: http://mrcube.org/
  *
- * Copyright (C) 2003-2019 Yamaguchi Laboratory, Keio University. All rights reserved.
+ * Copyright (C) 2003-2020 Takeshi Morita. All rights reserved.
  *
  * This file is part of MR^3.
  *

diff --git a/src/main/java/org/mrcube/actions/PasteAction.java b/src/main/java/org/mrcube/actions/PasteAction.java
@@ -2,7 +2,7 @@
  * Project Name: MR^3 (Meta-Model Management based on RDFs Revision Reflection)
  * Project Website: http://mrcube.org/
  *
- * Copyright (C) 2003-2019 Yamaguchi Laboratory, Keio University. All rights reserved.
+ * Copyright (C) 2003-2020 Takeshi Morita. All rights reserved.
  *
  * This file is part of MR^3.
  *

diff --git a/src/main/java/org/mrcube/actions/QuitAction.java b/src/main/java/org/mrcube/actions/QuitAction.java
@@ -2,7 +2,7 @@
  * Project Name: MR^3 (Meta-Model Management based on RDFs Revision Reflection)
  * Project Website: http://mrcube.org/
  *
- * Copyright (C) 2003-2019 Yamaguchi Laboratory, Keio University. All rights reserved.
+ * Copyright (C) 2003-2020 Takeshi Morita. All rights reserved.
  *
  * This file is part of MR^3.
  *

diff --git a/src/main/java/org/mrcube/actions/RemoveAction.java b/src/main/java/org/mrcube/actions/RemoveAction.java
@@ -2,7 +2,7 @@
  * Project Name: MR^3 (Meta-Model Management based on RDFs Revision Reflection)
  * Project Website: http://mrcube.org/
  * 
- * Copyright (C) 2003-2019 Yamaguchi Laboratory, Keio University. All rights reserved.
+ * Copyright (C) 2003-2020 Takeshi Morita. All rights reserved.
  * 
  * This file is part of MR^3.
  * 

diff --git a/src/main/java/org/mrcube/actions/SaveFileAction.java b/src/main/java/org/mrcube/actions/SaveFileAction.java
@@ -2,7 +2,7 @@
  * Project Name: MR^3 (Meta-Model Management based on RDFs Revision Reflection)
  * Project Website: http://mrcube.org/
  *
- * Copyright (C) 2003-2019 Yamaguchi Laboratory, Keio University. All rights reserved.
+ * Copyright (C) 2003-2020 Takeshi Morita. All rights reserved.
  *
  * This file is part of MR^3.
  *

diff --git a/src/main/java/org/mrcube/actions/SaveGraphImageAction.java b/src/main/java/org/mrcube/actions/SaveGraphImageAction.java
@@ -2,7 +2,7 @@
  * Project Name: MR^3 (Meta-Model Management based on RDFs Revision Reflection)
  * Project Website: http://mrcube.org/
  *
- * Copyright (C) 2003-2019 Yamaguchi Laboratory, Keio University. All rights reserved.
+ * Copyright (C) 2003-2020 Takeshi Morita. All rights reserved.
  *
  * This file is part of MR^3.
  *

diff --git a/src/main/java/org/mrcube/actions/SelectAllNodesAction.java b/src/main/java/org/mrcube/actions/SelectAllNodesAction.java
@@ -2,7 +2,7 @@
  * Project Name: MR^3 (Meta-Model Management based on RDFs Revision Reflection)
  * Project Website: http://mrcube.org/
  *
- * Copyright (C) 2003-2019 Yamaguchi Laboratory, Keio University. All rights reserved.
+ * Copyright (C) 2003-2020 Takeshi Morita. All rights reserved.
  *
  * This file is part of MR^3.
  *

diff --git a/src/main/java/org/mrcube/actions/SelectEditorAction.java b/src/main/java/org/mrcube/actions/SelectEditorAction.java
@@ -2,7 +2,7 @@
  * Project Name: MR^3 (Meta-Model Management based on RDFs Revision Reflection)
  * Project Website: http://mrcube.org/
  *
- * Copyright (C) 2003-2019 Yamaguchi Laboratory, Keio University. All rights reserved.
+ * Copyright (C) 2003-2020 Takeshi Morita. All rights reserved.
  *
  * This file is part of MR^3.
  *

diff --git a/src/main/java/org/mrcube/actions/ShowAttrDialog.java b/src/main/java/org/mrcube/actions/ShowAttrDialog.java
@@ -2,7 +2,7 @@
  * Project Name: MR^3 (Meta-Model Management based on RDFs Revision Reflection)
  * Project Website: http://mrcube.org/
  *
- * Copyright (C) 2003-2019 Yamaguchi Laboratory, Keio University. All rights reserved.
+ * Copyright (C) 2003-2020 Takeshi Morita. All rights reserved.
  *
  * This file is part of MR^3.
  *

diff --git a/src/main/java/org/mrcube/actions/ShowHistoryManager.java b/src/main/java/org/mrcube/actions/ShowHistoryManager.java
@@ -2,7 +2,7 @@
  * Project Name: MR^3 (Meta-Model Management based on RDFs Revision Reflection)
  * Project Website: http://mrcube.org/
  *
- * Copyright (C) 2003-2019 Yamaguchi Laboratory, Keio University. All rights reserved.
+ * Copyright (C) 2003-2020 Takeshi Morita. All rights reserved.
  *
  * This file is part of MR^3.
  *