diff --git a/.idea/misc.xml b/.idea/misc.xml index b755d8ca46c060cb7a2b6b29b7ec83e02b8b71e2..51e5191ed4bd4e6ffe2a1823753c5d6f92894ab9 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -38,7 +38,7 @@ <property name="caretWidth" class="java.lang.Integer" /> </properties> </component> - <component name="ProjectRootManager" version="2" languageLevel="JDK_1_7" default="false" project-jdk-name="1.7" project-jdk-type="JavaSDK"> + <component name="ProjectRootManager" version="2" languageLevel="JDK_1_7" default="false" project-jdk-name="1.8" project-jdk-type="JavaSDK"> <output url="file://$PROJECT_DIR$/build" /> </component> </project> \ No newline at end of file diff --git a/Makefile b/Makefile index 69cabd0fef3af27430a8e6a4a079fa42111732ff..73827b20046b682ca3e9130e07e4855b9e4def9f 100755 --- a/Makefile +++ b/Makefile @@ -225,7 +225,6 @@ RELEASE_STD_FILES_XML = $(patsubst %,$(TTOOL_MODELING)/%,\ TURTLE/BasicExchange.xml \ DIPLODOCUS/SmartCardProtocol.xml \ TURTLE/ProtocolPatterns.xml \ - CTTool/COCOME_V50.xml \ AVATAR/CoffeeMachine_Avatar.xml \ AVATAR/Network_Avatar.xml \ AVATAR/MicroWaveOven_SafetySecurity_fullMethodo.xml) diff --git a/build.txt b/build.txt index 0a07ce47e6eebe57031435956137004e8bcbb626..8e8f3bcfd9230a7f86630a3a5622320e1b1e33f2 100644 --- a/build.txt +++ b/build.txt @@ -1 +1 @@ -12529 \ No newline at end of file +12530 \ No newline at end of file diff --git a/src/main/java/ui/MainGUI.java b/src/main/java/ui/MainGUI.java index 260b9e2e5c5e3cc96e3805296ccfb5eb8970c4c8..3d8aed1dcf0d208318e9b0bafbae4de7058c0da1 100644 --- a/src/main/java/ui/MainGUI.java +++ b/src/main/java/ui/MainGUI.java @@ -715,6 +715,25 @@ public class MainGUI implements ActionListener, WindowListener, KeyListener, Per jfm.setVisible(true); } + public void showInFinder(RG inputGraph) { + TraceManager.addDev("in show in finder"); + if (inputGraph.fileName == null) { + return; + } + if (!Desktop.isDesktopSupported()) { + return; + } + File file = new File (SpecConfigTTool.TGraphPath ); + TraceManager.addDev("Getting desktop"); + Desktop desktop = Desktop.getDesktop(); + try { + TraceManager.addDev("opening in desktop"); + desktop.open(file); + } catch (Exception e) { + TraceManager.addDev("Exception in opening explorer: " + e.getMessage()); + } + } + public void setCurrentInvariant(Invariant inv) { currentInvariant = inv; diff --git a/src/main/java/ui/tree/JDiagramTree.java b/src/main/java/ui/tree/JDiagramTree.java index 3ecc2a5b365a5a3c931e7fc0ba646aefce0f65f5..dfa864ac81e011997dd919815acff173b3da9e34 100755 --- a/src/main/java/ui/tree/JDiagramTree.java +++ b/src/main/java/ui/tree/JDiagramTree.java @@ -88,6 +88,7 @@ public class JDiagramTree extends javax.swing.JTree implements ActionListener, M protected JMenuItem jmiMinimize; protected JMenuItem jmiRefusalGraph; protected JMenuItem jmiRemove; + protected JMenuItem jmiShowInFinder; protected JPopupMenu popupTree; protected RG selectedRG; @@ -201,12 +202,15 @@ public class JDiagramTree extends javax.swing.JTree implements ActionListener, M jmiRefusalGraph.addActionListener(this); jmiRemove = new JMenuItem("Remove from tree"); jmiRemove.addActionListener(this); + jmiShowInFinder = new JMenuItem("Show in File Explorer"); + jmiShowInFinder.addActionListener(this); popupTree.add(jmiAnalyze); popupTree.add(jmiShow); popupTree.add(jmiMinimize); popupTree.add(jmiRefusalGraph); popupTree.addSeparator(); popupTree.add(jmiRemove); + popupTree.add(jmiShowInFinder); } popupTree.show(tree, x, y); } @@ -413,6 +417,10 @@ public class JDiagramTree extends javax.swing.JTree implements ActionListener, M if (selectedRG != null) { mgui.makeRefusalGraph(selectedRG); } + } else if (ae.getSource() == jmiShowInFinder) { + if (selectedRG != null) { + mgui.showInFinder(selectedRG); + } } } diff --git a/src/main/java/ui/util/DefaultText.java b/src/main/java/ui/util/DefaultText.java index f56785522155bb25141360f60ca5020f378947db..8d67d720a18f31f1703dc68098154066e6b28526 100755 --- a/src/main/java/ui/util/DefaultText.java +++ b/src/main/java/ui/util/DefaultText.java @@ -50,8 +50,8 @@ package ui.util; */ public class DefaultText { - public static String BUILD = "12528"; - public static String DATE = "2018/01/17 02:01:52 CET"; + public static String BUILD = "12529"; + public static String DATE = "2018/01/18 02:01:41 CET"; public static StringBuffer sbAbout = makeAbout();