diff --git a/src/main/java/ui/ActionPerformer.java b/src/main/java/ui/ActionPerformer.java
index f45d6d6bb62d5fb7df9229568a8be17a48e4000e..635e8c508e115c852ec37ef0df167f3420458eec 100755
--- a/src/main/java/ui/ActionPerformer.java
+++ b/src/main/java/ui/ActionPerformer.java
@@ -923,6 +923,22 @@ public class ActionPerformer {
} else if (command.equals(mgui.actions[TGUIAction.ATD_COUNTERMEASURE_CONNECTOR].getActionCommand())) {
mgui.actionOnButton(TGComponentManager.CONNECTOR, TGComponentManager.ATD_COUNTERMEASURE_CONNECTOR);
+ // Fault Tree Diagrams
+ } else if (command.equals(mgui.actions[TGUIAction.FTD_BLOCK].getActionCommand())) {
+ mgui.actionOnButton(TGComponentManager.COMPONENT, TGComponentManager.FTD_BLOCK);
+ } else if (command.equals(mgui.actions[TGUIAction.FTD_FAULT].getActionCommand())) {
+ mgui.actionOnButton(TGComponentManager.COMPONENT, TGComponentManager.FTD_FAULT);
+ } else if (command.equals(mgui.actions[TGUIAction.FTD_COUNTERMEASURE].getActionCommand())) {
+ mgui.actionOnButton(TGComponentManager.COMPONENT, TGComponentManager.FTD_COUNTERMEASURE);
+ } else if (command.equals(mgui.actions[TGUIAction.FTD_CONSTRAINT].getActionCommand())) {
+ mgui.actionOnButton(TGComponentManager.COMPONENT, TGComponentManager.FTD_CONSTRAINT);
+ } else if (command.equals(mgui.actions[TGUIAction.FTD_COMPOSITION_CONNECTOR].getActionCommand())) {
+ mgui.actionOnButton(TGComponentManager.CONNECTOR, TGComponentManager.FTD_COMPOSITION_CONNECTOR);
+ } else if (command.equals(mgui.actions[TGUIAction.FTD_FAULT_CONNECTOR].getActionCommand())) {
+ mgui.actionOnButton(TGComponentManager.CONNECTOR, TGComponentManager.FTD_FAULT_CONNECTOR);
+ } else if (command.equals(mgui.actions[TGUIAction.FTD_COUNTERMEASURE_CONNECTOR].getActionCommand())) {
+ mgui.actionOnButton(TGComponentManager.CONNECTOR, TGComponentManager.FTD_COUNTERMEASURE_CONNECTOR);
+
// TURTLE-OS
} else if (command.equals(mgui.actions[TGUIAction.TOS_TCLASS].getActionCommand())) {
mgui.actionOnButton(TGComponentManager.COMPONENT, TGComponentManager.TOSCD_TCLASS);
diff --git a/src/main/java/ui/ColorManager.java b/src/main/java/ui/ColorManager.java
index e485d0fb6b25a18e0aaa6e85d67fc664f1c64b70..a454f3a88d285700308620b3a398088dd8810e39 100755
--- a/src/main/java/ui/ColorManager.java
+++ b/src/main/java/ui/ColorManager.java
@@ -154,6 +154,13 @@ public class ColorManager {
public static Color ATD_CONSTRAINT = new Color(191, 153, 161);
public static Color ATD_COUNTERMEASURE = new Color(209, 218, 174);
+ public static Color FTD_BLOCK = new Color(218, 218, 218);
+ public static Color FTD_FAULT = new Color(214, 187, 158);
+ public static Color FTD_FAULT_DISABLED = new Color(214, 206, 198);
+ public static Color FTD_ROOT_FAULT = new Color(243, 131, 10);
+ public static Color FTD_CONSTRAINT = new Color(191, 153, 161);
+ public static Color FTD_COUNTERMEASURE = new Color(209, 218, 174);
+
//public static final Color AVATAR_BLOCK = new Color(128, 180, 205);
//public static final Color AVATAR_BLOCK = new Color(158, 218, 227);
//public static final Color AVATAR_BLOCK = new Color(149, 193, 210);
diff --git a/src/main/java/ui/FaultTreePanel.java b/src/main/java/ui/FaultTreePanel.java
new file mode 100755
index 0000000000000000000000000000000000000000..789607b905f00b7ceeb95d4265716269d0ad3b2e
--- /dev/null
+++ b/src/main/java/ui/FaultTreePanel.java
@@ -0,0 +1,189 @@
+/* Copyright or (C) or Copr. GET / ENST, Telecom-Paris, Ludovic Apvrille
+ *
+ * ludovic.apvrille AT enst.fr
+ *
+ * This software is a computer program whose purpose is to allow the
+ * edition of TURTLE analysis, design and deployment diagrams, to
+ * allow the generation of RT-LOTOS or Java code from this diagram,
+ * and at last to allow the analysis of formal validation traces
+ * obtained from external tools, e.g. RTL from LAAS-CNRS and CADP
+ * from INRIA Rhone-Alpes.
+ *
+ * This software is governed by the CeCILL license under French law and
+ * abiding by the rules of distribution of free software. You can use,
+ * modify and/ or redistribute the software under the terms of the CeCILL
+ * license as circulated by CEA, CNRS and INRIA at the following URL
+ * "http://www.cecill.info".
+ *
+ * As a counterpart to the access to the source code and rights to copy,
+ * modify and redistribute granted by the license, users are provided only
+ * with a limited warranty and the software's author, the holder of the
+ * economic rights, and the successive licensors have only limited
+ * liability.
+ *
+ * In this respect, the user's attention is drawn to the risks associated
+ * with loading, using, modifying and/or developing or reproducing the
+ * software by the user in light of its specific status of free software,
+ * that may mean that it is complicated to manipulate, and that also
+ * therefore means that it is reserved for developers and experienced
+ * professionals having in-depth computer knowledge. Users are therefore
+ * encouraged to load and test the software's suitability as regards their
+ * requirements in conditions enabling the security of their systems and/or
+ * data to be ensured and, more generally, to use and operate it in the
+ * same conditions as regards security.
+ *
+ * The fact that you are presently reading this means that you have had
+ * knowledge of the CeCILL license and that you accept its terms.
+ */
+
+
+
+
+package ui;
+
+import myutil.GraphicLib;
+import ui.ftd.FaultTreeDiagramPanel;
+import ui.ftd.FaultTreeDiagramToolbar;
+import ui.util.IconManager;
+
+import javax.swing.*;
+import javax.swing.event.ChangeEvent;
+import javax.swing.event.ChangeListener;
+import java.awt.*;
+import java.util.Iterator;
+import java.util.ArrayList;
+
+/**
+ * Class FaultTreePanel
+ * Management of fault trees
+ * Creation: 14/12/2017
+ * @version 1.0 14/12/2017
+ * @author Ludovic APVRILLE
+ * @see MainGUI
+ */
+public class FaultTreePanel extends TURTLEPanel {
+ public FaultTreeDiagramPanel ftdp;
+
+ public FaultTreePanel(MainGUI _mgui) {
+ super(_mgui);
+
+ // Issue #41 Ordering of tabbed panes
+ tabbedPane = GraphicLib.createTabbedPane();//new JTabbedPane();
+ UIManager.put("TabbedPane.tabAreaBackground", MainGUI.BACK_COLOR);
+ UIManager.put("TabbedPane.selected", MainGUI.BACK_COLOR);
+ SwingUtilities.updateComponentTreeUI(tabbedPane);
+ //tabbedPane.setOpaque(true);
+
+ cl = new ChangeListener() {
+ public void stateChanged(ChangeEvent e){
+ mgui.paneRequirementAction(e);
+ }
+ };
+ tabbedPane.addChangeListener(cl);
+ tabbedPane.addMouseListener(new TURTLEPanelPopupListener(this, mgui));
+
+ }
+
+ public void init() {
+ mgui.changeMade(null, TDiagramPanel.NEW_COMPONENT);
+ // Requirement Diagram toolbar
+ //addRequirementDiagram("Requirement Diagram");
+
+ //jsp.setVisible(true);
+ }
+
+ public boolean addFaultTreeDiagram(String s) {
+ FaultTreeDiagramToolbar toolBarAt = new FaultTreeDiagramToolbar(mgui);
+ toolbars.add(toolBarAt);
+
+ toolBarPanel = new JPanel();
+ //toolBarPanel.setBackground(Color.red);
+ toolBarPanel.setLayout(new BorderLayout());
+ //toolBarPanel.setBackground(ColorManager.MainTabbedPaneSelect);
+
+ //The diagram
+ ftdp = new FaultTreeDiagramPanel(mgui, toolBarAt);
+ ftdp.setName(s);
+ ftdp.tp = this;
+ tdp = ftdp;
+ panels.add(ftdp);
+ JScrollDiagramPanel jsp = new JScrollDiagramPanel(ftdp);
+ ftdp.jsp = jsp;
+ jsp.setWheelScrollingEnabled(true);
+ jsp.getVerticalScrollBar().setUnitIncrement(MainGUI.INCREMENT);
+ toolBarPanel.add(toolBarAt, BorderLayout.NORTH);
+ toolBarPanel.add(jsp, BorderLayout.CENTER);
+ tabbedPane.addTab(s, IconManager.imgic1074, toolBarPanel, "Open Fault Tree Diagram");
+ tabbedPane.setSelectedIndex(0);
+ JPanel toolBarPanel = new JPanel();
+ toolBarPanel.setLayout(new BorderLayout());
+
+ return true;
+ }
+
+ public String saveHeaderInXml(String extensionToName) {
+ if (extensionToName == null) {
+ return "<Modeling type=\"FaultTree\" nameTab=\"" + mgui.getTabName(this) + "\" >\n";
+ }
+ return "<Modeling type=\"FaultTree\" nameTab=\"" + mgui.getTabName(this) + extensionToName + "\" >\n";
+ }
+
+ public String saveTailInXml() {
+ return "</Modeling>\n\n\n";
+ }
+
+ public String toString() {
+ return mgui.getTitleAt(this) + " (SysML Parametric Diagram)";
+ }
+
+ public boolean canFirstDiagramBeMoved() {
+ return true;
+ }
+
+ public boolean removeEnabled(int index) {
+ return panels.size() > 1;
+ }
+
+ public boolean renameEnabled(int index) {
+ if (panels.size() == 0) {
+ return false;
+ }
+ return (panels.elementAt(index) instanceof FaultTreeDiagramPanel);
+
+ }
+
+ public boolean isFTDEnabled() {
+ return true;
+ }
+
+ public ArrayList<TGComponent> getAllFaults(){
+ ArrayList<TGComponent> list = new ArrayList<TGComponent>();
+ TDiagramPanel tp;
+ for(int i=0; i<panels.size(); i++) {
+ tp = panels.get(i);
+ if (tp instanceof FaultTreeDiagramPanel) {
+ for (TGComponent s:((FaultTreeDiagramPanel)tp).getAllFaults()){
+ list.add(s);
+ }
+ }
+ }
+ return list;
+
+ }
+ public void resetMetElements() {
+ //TraceManager.addDev("Reset met elements");
+ TGComponent tgc;
+
+ for(int i=0; i<panels.size(); i++) {
+ Iterator<TGComponent> iterator = panels.get(i).getComponentList().listIterator();
+
+ while(iterator.hasNext()) {
+ tgc = iterator.next();
+ tgc.setAVATARMet(0);
+ tgc.setInternalAvatarMet(0);
+ }
+ }
+
+ }
+
+}
diff --git a/src/main/java/ui/GTURTLEModeling.java b/src/main/java/ui/GTURTLEModeling.java
index 902ccbf750cf02997b5d7df5a252bc9644744ac4..6f030b43dbcb5ad59c6b391b7fd7cc47762dadba 100755
--- a/src/main/java/ui/GTURTLEModeling.java
+++ b/src/main/java/ui/GTURTLEModeling.java
@@ -85,6 +85,7 @@ import translator.touppaal.RelationTIFUPPAAL;
import translator.touppaal.TURTLE2UPPAAL;
import ui.ad.TActivityDiagramPanel;
import ui.atd.AttackTreeDiagramPanel;
+import ui.ftd.FaultTreeDiagramPanel;
import ui.avatarad.AvatarADPanel;
import ui.avatarbd.*;
import ui.avatarcd.AvatarCDPanel;
@@ -3081,6 +3082,7 @@ public class GTURTLEModeling {
}
}
}
+
return listQ;
}
@@ -5196,6 +5198,41 @@ public class GTURTLEModeling {
makePostLoading(atdp, beginIndex);
}
}
+
+ } else if (tdp instanceof FaultTreeDiagramPanel) {
+ nl = doc.getElementsByTagName("FaultTreeDiagramPanelCopy");
+
+ if (nl == null) {
+ return;
+ }
+
+ FaultTreeDiagramPanel ftdp = (FaultTreeDiagramPanel)tdp;
+
+ for(i=0; i<nl.getLength(); i++) {
+ adn = nl.item(i);
+ if (adn.getNodeType() == Node.ELEMENT_NODE) {
+ elt = (Element) adn;
+
+ if (ftdp == null) {
+ throw new MalformedModelingException();
+ }
+
+ //int xSel = Integer.decode(elt.getAttribute("xSel")).intValue();
+ //int ySel = Integer.decode(elt.getAttribute("ySel")).intValue();
+ //int widthSel = Integer.decode(elt.getAttribute("widthSel")).intValue();
+ //int heightSel = Integer.decode(elt.getAttribute("heightSel")).intValue();
+
+ decX = _decX;
+ decY = _decY;
+
+ makeXMLComponents(elt.getElementsByTagName("COMPONENT"), ftdp);
+ makeXMLConnectors(elt.getElementsByTagName("CONNECTOR"), ftdp);
+ makeXMLComponents(elt.getElementsByTagName("SUBCOMPONENT"), ftdp);
+ connectConnectorsToRealPoints(ftdp);
+ ftdp.structureChanged();
+ makePostLoading(ftdp, beginIndex);
+ }
+ }
} else if (tdp instanceof TMLTaskDiagramPanel) {
nl = doc.getElementsByTagName("TMLTaskDiagramPanelCopy");
docCopy = doc;
@@ -6384,6 +6421,8 @@ public class GTURTLEModeling {
loadRequirement(node);
} else if (type.compareTo("AttackTree") == 0) {
loadAttackTree(node);
+ } else if (type.compareTo("FaultTree") == 0) {
+ loadFaultTree(node);
} else if (type.compareTo("Diplodocus Methodology") == 0) {
loadDiplodocusMethodology(node);
} else if (type.compareTo("Avatar Methodology") == 0) {
@@ -6533,6 +6572,33 @@ public class GTURTLEModeling {
}
}
+ public void loadFaultTree(Node node) throws MalformedModelingException, SAXException {
+ Element elt = (Element) node;
+ String nameTab;
+ NodeList diagramNl;
+ int indexTree;
+ int cpttdp = 0;
+
+
+ nameTab = elt.getAttribute("nameTab");
+
+ indexTree = mgui.createFaultTree(nameTab);
+
+ diagramNl = node.getChildNodes();
+
+ for(int j=0; j<diagramNl.getLength(); j++) {
+ //TraceManager.addDev("Deployment nodes: " + j);
+ node = diagramNl.item(j);
+ if (node.getNodeType() == Node.ELEMENT_NODE) {
+ elt = (Element)node;
+ if (elt.getTagName().compareTo("FaultTreeDiagramPanel") == 0) {
+ loadFaultTreeDiagram(elt, indexTree, cpttdp);
+ cpttdp ++;
+ }
+ }
+ }
+ }
+
public void loadAvatarMADs(Node node) throws MalformedModelingException, SAXException {
Element elt = (Element) node;
String nameTab;
@@ -7168,6 +7234,11 @@ public class GTURTLEModeling {
((AttackTreeDiagramPanel)tdp).setConnectorsToFront();
}
+ if (tdp instanceof FaultTreeDiagramPanel) {
+ //TraceManager.addDev("Connectors...");
+ ((FaultTreeDiagramPanel)tdp).setConnectorsToFront();
+ }
+
if (tdp instanceof AvatarBDPanel) {
//TraceManager.addDev("Connectors...");
((AvatarBDPanel)tdp).setConnectorsToFront();
@@ -7674,6 +7745,24 @@ public class GTURTLEModeling {
loadDiagram(elt, tdp);
}
+ public void loadFaultTreeDiagram(Element elt, int indexDiag, int indexTab) throws MalformedModelingException, SAXException {
+ String name;
+
+ //TraceManager.addDev("indexDiag=" + indexDiag);
+
+ name = elt.getAttribute("name");
+ mgui.createFaultTreeDiagram(indexDiag, name);
+
+ TDiagramPanel tdp = mgui.getFaultTreeDiagramPanel(indexDiag, indexTab, name);
+
+ if (tdp == null) {
+ throw new MalformedModelingException();
+ }
+ tdp.removeAll();
+
+ loadDiagram(elt, tdp);
+ }
+
public void loadSequenceDiagram(Element elt, int indexAnalysis) throws MalformedModelingException, SAXException {
String name;
diff --git a/src/main/java/ui/MainGUI.java b/src/main/java/ui/MainGUI.java
index 4867432f83f69f675b688a9a8e209f947d03e15f..12449ee3535afb1730a91651161a44ff2a7ac1dc 100644
--- a/src/main/java/ui/MainGUI.java
+++ b/src/main/java/ui/MainGUI.java
@@ -53,6 +53,7 @@ import translator.CheckingError;
import translator.MasterGateManager;
import ui.ad.TActivityDiagramPanel;
import ui.atd.AttackTreeDiagramPanel;
+import ui.ftd.FaultTreeDiagramPanel;
import ui.avatarad.AvatarADPanel;
import ui.avatarbd.AvatarBDLibraryFunction;
import ui.avatarbd.AvatarBDPortConnector;
@@ -790,6 +791,20 @@ public class MainGUI implements ActionListener, WindowListener, KeyListener, Pe
return index;
}
+ private int addFaultTreePanel(String name, int index) {
+ if (index == -1) {
+ index = tabs.size();
+ }
+ FaultTreePanel ftp = new FaultTreePanel(this);
+ tabs.add(index, ftp); // should look for the first
+ mainTabbedPane.add(ftp.tabbedPane, index);
+ mainTabbedPane.setToolTipTextAt(index, "Open fault tree diagrams");
+ mainTabbedPane.setTitleAt(index, name);
+ mainTabbedPane.setIconAt(index, IconManager.imgic1074);
+ ftp.init();
+ return index;
+ }
+
private int addRequirementPanel(String name, int index) {
if (index == -1) {
index = tabs.size();
@@ -1465,6 +1480,12 @@ public class MainGUI implements ActionListener, WindowListener, KeyListener, Pe
return index;
}
+ public int createFaultTree(String name) {
+ int index = addFaultTreePanel(name, -1);
+ mainTabbedPane.setSelectedIndex(index);
+ return index;
+ }
+
public void setIODName(int analysisIndex, String name) {
AnalysisPanel ap = (AnalysisPanel)(tabs.elementAt(analysisIndex));
ap.tabbedPane.setTitleAt(0, name);
@@ -1863,6 +1884,15 @@ public class MainGUI implements ActionListener, WindowListener, KeyListener, Pe
//frame.repaint();
}
+ public void newFaultTree() {
+ //TraceManager.addDev("NEW ANALYSIS");
+ addFaultTreePanel("Fault Trees", 0);
+ //((TURTLEPanel)tabs.elementAt(0)).tabbedPane.setSelectedIndex(0);
+ mainTabbedPane.setSelectedIndex(0);
+ //paneAction(null);
+ //frame.repaint();
+ }
+
public void newRequirement() {
//TraceManager.addDev("NEW ANALYSIS");
addRequirementPanel("Requirements", 0);
@@ -3821,6 +3851,22 @@ public class MainGUI implements ActionListener, WindowListener, KeyListener, Pe
}
+ public ArrayList<TGComponent> getAllFaults(){
+ TURTLEPanel tp;
+ ArrayList<TGComponent> list = new ArrayList<TGComponent>();
+
+ for(int i=0; i<tabs.size(); i++) {
+ tp = tabs.elementAt(i);
+ if (tp instanceof FaultTreePanel) {
+ for (TGComponent s:((FaultTreePanel)tp).getAllFaults()){
+ list.add(s);
+ }
+ }
+ }
+ return list;
+
+ }
+
public ArrayList<TGComponent> getAllRequirements(){
TURTLEPanel tp;
ArrayList<TGComponent> list = new ArrayList<TGComponent>();
@@ -6116,6 +6162,26 @@ public class MainGUI implements ActionListener, WindowListener, KeyListener, Pe
return null;*/
}
+ public FaultTreeDiagramPanel getFaultTreeDiagramPanel(int index, int indexTab, String s) {
+ //TraceManager.addDev("Searching for " + s);
+ TURTLEPanel tp = tabs.elementAt(index);
+ return getFaultTreeDiagramPanel(tp, indexTab, s);
+ }
+
+ public FaultTreeDiagramPanel getFaultTreeDiagramPanel(TURTLEPanel tp, int indexTab, String s) {
+ if(tp.tabbedPane.getTitleAt(indexTab).equals(s)) {
+ return (FaultTreeDiagramPanel)(tp.panelAt(indexTab));
+ }
+ return null;
+ /*for(int i=0; i<tp.tabbedPane.getTabCount(); i++) {
+ if (tp.tabbedPane.getTitleAt(indexTab).equals(s)) {
+ if (tp.panelAt(i) instanceof AttackTreeDiagramPanel)
+ return (AttackTreeDiagramPanel)(tp.panelAt(i));
+ }
+ }
+ return null;*/
+ }
+
public TMLCPPanel getTMLCPDiagramPanel(int index, String s) {
//TraceManager.addDev("Searching for " + s);
@@ -6567,6 +6633,20 @@ public class MainGUI implements ActionListener, WindowListener, KeyListener, Pe
return true;
}
+ public boolean createFaultTreeDiagram(int index, String s) {
+ return createFaultTreeDiagram(tabs.elementAt(index), s);
+ }
+
+ public boolean createFaultTreeDiagram(TURTLEPanel tp, String s) {
+ if (!(tp instanceof FaultTreePanel)) {
+ return false;
+ }
+
+ ((FaultTreePanel)tp).addFaultTreeDiagram(s);
+ setPanelMode();
+ return true;
+ }
+
public boolean createEBRDD(int index, String s) {
return createEBRDD(tabs.elementAt(index), s);
}
@@ -7182,7 +7262,7 @@ public class MainGUI implements ActionListener, WindowListener, KeyListener, Pe
paneDeployAction(e);
}
- if ((getCurrentTURTLEPanel() instanceof AvatarDesignPanel) || (getCurrentTURTLEPanel() instanceof AvatarRequirementPanel) || (getCurrentTURTLEPanel() instanceof AttackTreePanel) || (getCurrentTURTLEPanel() instanceof ADDPanel)) {
+ if ((getCurrentTURTLEPanel() instanceof AvatarDesignPanel) || (getCurrentTURTLEPanel() instanceof AvatarRequirementPanel) || (getCurrentTURTLEPanel() instanceof AttackTreePanel) || (getCurrentTURTLEPanel() instanceof FaultTreePanel) || (getCurrentTURTLEPanel() instanceof ADDPanel)) {
mainBar.showAvatarActions(true);
} else if ((getCurrentTURTLEPanel() instanceof TMLDesignPanel) || (getCurrentTURTLEPanel() instanceof TMLComponentDesignPanel) || (getCurrentTURTLEPanel() instanceof TMLArchiPanel)){
mainBar.showDiplodocusActions(true);
@@ -8230,7 +8310,7 @@ public class MainGUI implements ActionListener, WindowListener, KeyListener, Pe
private JPopupMenu menu;
private JMenuItem rename, remove, moveRight, moveLeft, newDesign, newAnalysis, newDeployment, newRequirement/*, newTMLDesign*/, newTMLComponentDesign, newTMLArchi, newProactiveDesign, newTURTLEOSDesign,
- newNCDesign, sort, clone, newAttackTree, newAVATARBD, newAVATARRequirement, newMAD, newTMLCP, newTMLMethodo, newAvatarMethodo, newAVATARDD, newSysmlsecMethodo, newSystemCAMS;
+ newNCDesign, sort, clone, newAttackTree, newFaultTree, newAVATARBD, newAVATARRequirement, newMAD, newTMLCP, newTMLMethodo, newAvatarMethodo, newAVATARDD, newSysmlsecMethodo, newSystemCAMS;
private JMenuItem newAVATARAnalysis;
public PopupListener(MainGUI _mgui) {
@@ -8275,6 +8355,8 @@ public class MainGUI implements ActionListener, WindowListener, KeyListener, Pe
newDeployment = createMenuItem("New TURTLE Deployment");
newAttackTree = createMenuItem("New Attack Tree");
+ newFaultTree = createMenuItem("New Fault Tree");
+
newRequirement = createMenuItem("New TURTLE Requirement Diagram");
newTMLMethodo = createMenuItem("New DIPLODOCUS Methodology");
@@ -8383,6 +8465,7 @@ public class MainGUI implements ActionListener, WindowListener, KeyListener, Pe
menu.add(newMAD);
menu.add(newAVATARRequirement);
menu.add(newAttackTree);
+ menu.add(newFaultTree);
menu.add(newAVATARAnalysis);
menu.add(newAVATARBD);
if (experimentalOn) {
@@ -8464,6 +8547,8 @@ public class MainGUI implements ActionListener, WindowListener, KeyListener, Pe
mgui.newDeployment();
} else if (e.getSource() == newAttackTree) {
mgui.newAttackTree();
+ } else if (e.getSource() == newFaultTree) {
+ mgui.newFaultTree();
} else if (ac.equals("New TURTLE Requirement Diagram")) {
mgui.newRequirement();
} else if (e.getSource() == newTMLMethodo) {
diff --git a/src/main/java/ui/TGComponentManager.java b/src/main/java/ui/TGComponentManager.java
index c09f81416eb3445209602c3141acbb810b5f1846..afba76dcd7f9d49a81e9fbdcca4f71cece332368 100755
--- a/src/main/java/ui/TGComponentManager.java
+++ b/src/main/java/ui/TGComponentManager.java
@@ -46,6 +46,7 @@ package ui;
import ui.ad.*;
import ui.atd.*;
+import ui.ftd.*;
import ui.avatarad.*;
import ui.avatarbd.*;
import ui.avatarcd.*;
@@ -155,6 +156,10 @@ public class TGComponentManager {
public static final int ATD_ATTACK_CONNECTOR = 133;
public static final int ATD_COUNTERMEASURE_CONNECTOR = 137;
+ public static final int FTD_COMPOSITION_CONNECTOR = 6000;
+ public static final int FTD_FAULT_CONNECTOR = 6001;
+ public static final int FTD_COUNTERMEASURE_CONNECTOR = 6002;
+
public static final int CONNECTOR_MESSAGE_ASYNC_SDZV = 134;
public static final int CONNECTOR_MESSAGE_SYNC_SDZV = 135;
public static final int CONNECTOR_RELATIVE_TIME_SDZV = 136;
@@ -305,6 +310,11 @@ public class TGComponentManager {
public static final int ATD_CONSTRAINT = 1402;
public static final int ATD_COUNTERMEASURE = 1403;
+ public static final int FTD_BLOCK = 6100;
+ public static final int FTD_FAULT = 6101;
+ public static final int FTD_CONSTRAINT = 6102;
+ public static final int FTD_COUNTERMEASURE = 6103;
+
// TML Communication patterns and TMLSD
public static final int TMLCP_CHOICE = 1500;
public static final int CONNECTOR_TMLCP = 1501;
@@ -1022,6 +1032,18 @@ public class TGComponentManager {
case ATD_COUNTERMEASURE:
tgc = new ATDCountermeasure(x, y, tdp.getMinX(), tdp.getMaxX(), tdp.getMinY(), tdp.getMaxY(), false, null, tdp);
break;
+ case FTD_BLOCK:
+ tgc = new FTDBlock(x, y, tdp.getMinX(), tdp.getMaxX(), tdp.getMinY(), tdp.getMaxY(), false, null, tdp);
+ break;
+ case FTD_FAULT:
+ tgc = new FTDFault(x, y, tdp.getMinX(), tdp.getMaxX(), tdp.getMinY(), tdp.getMaxY(), false, null, tdp);
+ break;
+ case FTD_CONSTRAINT:
+ tgc = new FTDConstraint(x, y, tdp.getMinX(), tdp.getMaxX(), tdp.getMinY(), tdp.getMaxY(), false, null, tdp);
+ break;
+ case FTD_COUNTERMEASURE:
+ tgc = new FTDCountermeasure(x, y, tdp.getMinX(), tdp.getMaxX(), tdp.getMinY(), tdp.getMaxY(), false, null, tdp);
+ break;
case DIPLODODUSMETHODOLOGY_REF_APPLICATION:
tgc = new DiplodocusMethodologyDiagramReferenceToApplication(x, y, tdp.getMinX(), tdp.getMaxX(), tdp.getMinY(), tdp.getMaxY(), false, null, tdp);
break;
@@ -1778,6 +1800,7 @@ public class TGComponentManager {
return EBRDD_ESO;
} else if (tgc instanceof EBRDDERB) {
return EBRDD_ERB;
+
} else if (tgc instanceof ATDBlock) {
return ATD_BLOCK;
} else if (tgc instanceof ATDAttack) {
@@ -1792,6 +1815,22 @@ public class TGComponentManager {
return ATD_ATTACK_CONNECTOR;
} else if (tgc instanceof ATDCountermeasureConnector) {
return ATD_COUNTERMEASURE_CONNECTOR;
+
+ } else if (tgc instanceof FTDBlock) {
+ return FTD_BLOCK;
+ } else if (tgc instanceof FTDFault) {
+ return FTD_FAULT;
+ } else if (tgc instanceof FTDCountermeasure) {
+ return FTD_COUNTERMEASURE;
+ } else if (tgc instanceof FTDConstraint) {
+ return FTD_CONSTRAINT;
+ } else if (tgc instanceof FTDCompositionConnector) {
+ return FTD_COMPOSITION_CONNECTOR;
+ } else if (tgc instanceof FTDFaultConnector) {
+ return FTD_FAULT_CONNECTOR;
+ } else if (tgc instanceof FTDCountermeasureConnector) {
+ return FTD_COUNTERMEASURE_CONNECTOR;
+
} else if (tgc instanceof DiplodocusMethodologyDiagramReferenceToApplication) {
return DIPLODODUSMETHODOLOGY_REF_APPLICATION;
} else if (tgc instanceof DiplodocusMethodologyDiagramReferenceToCP) {
@@ -2256,6 +2295,16 @@ public class TGComponentManager {
case ATD_COUNTERMEASURE_CONNECTOR:
tgc = new ATDCountermeasureConnector(x, y, tdp.getMinX(), tdp.getMaxX(), tdp.getMinY(), tdp.getMaxY(), false, null, tdp, p1, p2, listPoint);
break;
+
+ case FTD_COMPOSITION_CONNECTOR:
+ tgc = new FTDCompositionConnector(x, y, tdp.getMinX(), tdp.getMaxX(), tdp.getMinY(), tdp.getMaxY(), false, null, tdp, p1, p2, listPoint);
+ break;
+ case FTD_FAULT_CONNECTOR:
+ tgc = new FTDFaultConnector(x, y, tdp.getMinX(), tdp.getMaxX(), tdp.getMinY(), tdp.getMaxY(), false, null, tdp, p1, p2, listPoint);
+ break;
+ case FTD_COUNTERMEASURE_CONNECTOR:
+ tgc = new FTDCountermeasureConnector(x, y, tdp.getMinX(), tdp.getMaxX(), tdp.getMinY(), tdp.getMaxY(), false, null, tdp, p1, p2, listPoint);
+ break;
case DIPLODOCUSMETHODOLOGY_CONNECTOR:
diff --git a/src/main/java/ui/TGUIAction.java b/src/main/java/ui/TGUIAction.java
index 3c8a642dd9470a51fda5254572dd6fab26283eca..61b4ccb0908525ec6b24a47c8d4e1a66f6f4ca1c 100755
--- a/src/main/java/ui/TGUIAction.java
+++ b/src/main/java/ui/TGUIAction.java
@@ -363,6 +363,14 @@ public class TGUIAction extends AbstractAction {
public static final int ATD_COUNTERMEASURE = 456;
public static final int ATD_COUNTERMEASURE_CONNECTOR = 457;
+ public static final int FTD_BLOCK = 465;
+ public static final int FTD_FAULT = 466;
+ public static final int FTD_FAULT_CONNECTOR = 467;
+ public static final int FTD_COMPOSITION_CONNECTOR = 468;
+ public static final int FTD_CONSTRAINT = 469;
+ public static final int FTD_COUNTERMEASURE = 470;
+ public static final int FTD_COUNTERMEASURE_CONNECTOR = 470;
+
// AVATAR Block Diagram
public static final int ABD_BLOCK = 289;
public static final int ABD_CRYPTOBLOCK = 332;
@@ -619,7 +627,7 @@ public class TGUIAction extends AbstractAction {
public static final int MOVE_ENABLED = 463;
public static final int FIRST_DIAGRAM = 464;
- public static final int NB_ACTION = 465;
+ public static final int NB_ACTION = 471;
private static final TAction [] actions = new TAction[NB_ACTION];
@@ -1110,10 +1118,19 @@ public class TGUIAction extends AbstractAction {
actions[ATD_ATTACK] = new TAction("atd-attack", "Add an attack", IconManager.imgic1072, IconManager.imgic1072, "Attack", "Add an attack (i.e. a SysML value type) to the currently opened attack tree diagram", 0);
actions[ATD_ATTACK_CONNECTOR] = new TAction("atd-attack-connector", "Add a connector between attacks /constraints", IconManager.imgic1080, IconManager.imgic1080, "Connector", "Add a connector between attacks / constraints of the currently opened attack tree diagram", 0);
actions[ATD_COMPOSITION_CONNECTOR] = new TAction("atd-composition-connector", "Add a composition connector between blocks", IconManager.imgic1076, IconManager.imgic1076, "Composition connector", "Add a composition between blocks of the currently opened attack tree diagram", 0);
- actions[ATD_CONSTRAINT] = new TAction("atd-constraint", "Add an constraint", IconManager.imgic1078, IconManager.imgic1078, "Constraint", "Add a constraint to the currently opened attack tree diagram", 0);
+ actions[ATD_CONSTRAINT] = new TAction("atd-constraint", "Add a constraint", IconManager.imgic1078, IconManager.imgic1078, "Constraint", "Add a constraint to the currently opened attack tree diagram", 0);
actions[ATD_COUNTERMEASURE] = new TAction("atd-countermeasure", "Add a countermeasure", IconManager.imgic1082, IconManager.imgic1082, "Countermeasure", "Add a countermeasure to the currently opened attack tree diagram", 0);
actions[ATD_COUNTERMEASURE_CONNECTOR] = new TAction("atd-countermeasure-connector", "Add a connector between attacks / countermeasures", IconManager.imgic1084, IconManager.imgic1084, "Connect countermeasure", "Add a connector between attacks / countermeasures of the currently opened attack tree diagram", 0);
+ // Fault Tree Diagrams
+ actions[FTD_BLOCK] = new TAction("ftd-block", "Add a block", IconManager.imgic1070, IconManager.imgic1070, "Block", "Add a SysML Block to the currently opened fault tree diagram", 0);
+ actions[FTD_FAULT] = new TAction("ftd-fault", "Add a fault", IconManager.imgic1072, IconManager.imgic1072, "Fault", "Add a fault (i.e. a SysML value type) to the currently opened fault tree diagram", 0);
+ actions[FTD_FAULT_CONNECTOR] = new TAction("ftd-fault-connector", "Add a connector between faults /constraints", IconManager.imgic1080, IconManager.imgic1080, "Connector", "Add a connector between faults / constraints of the currently opened fault tree diagram", 0);
+ actions[FTD_COMPOSITION_CONNECTOR] = new TAction("ftd-composition-connector", "Add a composition connector between blocks", IconManager.imgic1076, IconManager.imgic1076, "Composition connector", "Add a composition between blocks of the currently opened fault tree diagram", 0);
+ actions[FTD_CONSTRAINT] = new TAction("ftd-constraint", "Add a constraint", IconManager.imgic1078, IconManager.imgic1078, "Constraint", "Add a constraint to the currently opened fault tree diagram", 0);
+ actions[FTD_COUNTERMEASURE] = new TAction("ftd-countermeasure", "Add a countermeasure", IconManager.imgic1082, IconManager.imgic1082, "Countermeasure", "Add a countermeasure to the currently opened fault tree diagram", 0);
+ actions[FTD_COUNTERMEASURE_CONNECTOR] = new TAction("ftd-countermeasure-connector", "Add a connector between faults / countermeasures", IconManager.imgic1084, IconManager.imgic1084, "Connect countermeasures", "Add a connector between faults / countermeasures of the currently opened fault tree diagram", 0);
+
// TURTLE-OS
actions[TOS_TCLASS] = new TAction("add-tclass-os", "Add Tclass", IconManager.imgic104, IconManager.imgic104, "Tclass", "Add a TClass to the currently opened class diagram", 0);
actions[TOS_ASSOCIATION] = new TAction("add-association-tos", "Add association", IconManager.imgic102, IconManager.imgic102, "Association", "Add an association between two tclasses of the currently opened TURTLE-OS class diagram", 0);
diff --git a/src/main/java/ui/TURTLEPanel.java b/src/main/java/ui/TURTLEPanel.java
index 97129885c9a6d8c6f3c51e4e1c4b9c929644e45f..0995f4f84d39db03658eb6451e5fdf8d762ba3db 100755
--- a/src/main/java/ui/TURTLEPanel.java
+++ b/src/main/java/ui/TURTLEPanel.java
@@ -335,6 +335,10 @@ public abstract class TURTLEPanel implements GenericTree {
return false;
}
+ public boolean isFTDEnabled() {
+ return false;
+ }
+
public boolean isAvatarRDEnabled() {
return false;
}
diff --git a/src/main/java/ui/TURTLEPanelPopupListener.java b/src/main/java/ui/TURTLEPanelPopupListener.java
index 3cd707e5151e401b0bdd41f43e75c90f3750e5a1..31058db5c3bc969004eab97f4c9f0fdd4f1fc4a3 100755
--- a/src/main/java/ui/TURTLEPanelPopupListener.java
+++ b/src/main/java/ui/TURTLEPanelPopupListener.java
@@ -1,26 +1,26 @@
/* Copyright or (C) or Copr. GET / ENST, Telecom-Paris, Ludovic Apvrille
- *
+ *
* ludovic.apvrille AT enst.fr
- *
+ *
* This software is a computer program whose purpose is to allow the
* edition of TURTLE analysis, design and deployment diagrams, to
* allow the generation of RT-LOTOS or Java code from this diagram,
* and at last to allow the analysis of formal validation traces
* obtained from external tools, e.g. RTL from LAAS-CNRS and CADP
* from INRIA Rhone-Alpes.
- *
+ *
* This software is governed by the CeCILL license under French law and
* abiding by the rules of distribution of free software. You can use,
* modify and/ or redistribute the software under the terms of the CeCILL
* license as circulated by CEA, CNRS and INRIA at the following URL
* "http://www.cecill.info".
- *
+ *
* As a counterpart to the access to the source code and rights to copy,
* modify and redistribute granted by the license, users are provided only
* with a limited warranty and the software's author, the holder of the
* economic rights, and the successive licensors have only limited
* liability.
- *
+ *
* In this respect, the user's attention is drawn to the risks associated
* with loading, using, modifying and/or developing or reproducing the
* software by the user in light of its specific status of free software,
@@ -31,7 +31,7 @@
* requirements in conditions enabling the security of their systems and/or
* data to be ensured and, more generally, to use and operate it in the
* same conditions as regards security.
- *
+ *
* The fact that you are presently reading this means that you have had
* knowledge of the CeCILL license and that you accept its terms.
*/
@@ -52,12 +52,12 @@ import java.awt.event.MouseEvent;
/**
- * Class TURTLEPanelPopupListener
- * Management of TURTLE panels
- * Creation: 14/01/2005
- * @version 1.0 14/01/2005
- * @author Ludovic APVRILLE
- * @see MainGUI
+ * Class TURTLEPanelPopupListener
+ * Management of TURTLE panels
+ * Creation: 14/01/2005
+ * @version 1.0 14/01/2005
+ * @author Ludovic APVRILLE
+ * @see MainGUI
*/
public class TURTLEPanelPopupListener extends MouseAdapter /* popup menus onto tabs */ {
private TURTLEPanel tp;
@@ -66,7 +66,7 @@ public class TURTLEPanelPopupListener extends MouseAdapter /* popup menus onto t
private JMenuItem rename, remove, moveRight, moveLeft, sort, newucd, newsd, newsdzv, newsdfromucd, newreq,
newebrdd, newprosmd, newavatarrd, newavatarpd, newavatarcd, newavatarad, newavatarmad;
- private JMenuItem newatd;
+ private JMenuItem newatd, newftd;
public TURTLEPanelPopupListener(TURTLEPanel _tp, MainGUI _mgui) {
tp = _tp;
@@ -75,20 +75,20 @@ public class TURTLEPanelPopupListener extends MouseAdapter /* popup menus onto t
}
public void mousePressed(MouseEvent e) {
- if (mgui.getCurrentTDiagramPanel() != null)
- mgui.getCurrentTDiagramPanel().getMouseManager().setSelection(-1, -1);
+ if (mgui.getCurrentTDiagramPanel() != null)
+ mgui.getCurrentTDiagramPanel().getMouseManager().setSelection(-1, -1);
checkForPopup(e);
}
-
+
public void mouseReleased(MouseEvent e) {
- if (mgui.getCurrentTDiagramPanel() != null)
- mgui.getCurrentTDiagramPanel().getMouseManager().setSelection(-1, -1);
+ if (mgui.getCurrentTDiagramPanel() != null)
+ mgui.getCurrentTDiagramPanel().getMouseManager().setSelection(-1, -1);
checkForPopup(e);
}
-
+
public void mouseClicked(MouseEvent e) {
- if (mgui.getCurrentTDiagramPanel() != null)
- mgui.getCurrentTDiagramPanel().getMouseManager().setSelection(-1, -1);
+ if (mgui.getCurrentTDiagramPanel() != null)
+ mgui.getCurrentTDiagramPanel().getMouseManager().setSelection(-1, -1);
checkForPopup(e);
}
@@ -114,6 +114,7 @@ public class TURTLEPanelPopupListener extends MouseAdapter /* popup menus onto t
newebrdd = createMenuItem("New Event-Based Requirement Description Diagram");
newprosmd = createMenuItem("New ProActive State Machine Diagram");
newatd = createMenuItem("New Attack Tree Diagram");
+ newftd = createMenuItem("New Fault Tree Diagram");
newavatarrd = createMenuItem("New AVATAR Requirement Diagram");
newavatarpd = createMenuItem("New AVATAR Property Diagram");
newavatarcd = createMenuItem("New Context Diagram");
@@ -130,19 +131,20 @@ public class TURTLEPanelPopupListener extends MouseAdapter /* popup menus onto t
menu.add(sort);
menu.addSeparator();
menu.add(newucd);
-
+
if (mgui.isAvatarOn()) {
menu.add(newavatarcd);
menu.add(newavatarad);
}
menu.add(newsd);
menu.add(newsdzv);
-
+
menu.add(newsdfromucd);
menu.addSeparator();
menu.add(newreq);
menu.add(newebrdd);
menu.add(newatd);
+ menu.add(newftd);
menu.addSeparator();
menu.add(newprosmd);
if (mgui.isAvatarOn()) {
@@ -207,6 +209,7 @@ public class TURTLEPanelPopupListener extends MouseAdapter /* popup menus onto t
newebrdd.setEnabled(tp.isReqEnabled());
newprosmd.setEnabled(tp.isProSMDEnabled());
newatd.setEnabled(tp.isATDEnabled());
+ newftd.setEnabled(tp.isFTDEnabled());
newavatarrd.setEnabled(tp.isAvatarRDEnabled());
newavatarpd.setEnabled(tp.isAvatarPDEnabled());
newavatarcd.setEnabled(tp.isAvatarCDEnabled());
@@ -216,61 +219,64 @@ public class TURTLEPanelPopupListener extends MouseAdapter /* popup menus onto t
private Action listener = new AbstractAction() {
- @Override
- public void actionPerformed(ActionEvent e) {
- JMenuItem item = (JMenuItem)e.getSource();
- String ac = item.getActionCommand();
- if(ac.equals("Rename")) {
- tp.requestRenameTab(tp.tabbedPane.getSelectedIndex());
- } else if (ac.equals("Remove")) {
- tp.requestRemoveTab(tp.tabbedPane.getSelectedIndex());
- } else if (ac.equals("Move to the left")) {
- tp.requestMoveLeftTab(tp.tabbedPane.getSelectedIndex());
- } else if (ac.equals("Move to the right")) {
- tp.requestMoveRightTab(tp.tabbedPane.getSelectedIndex());
- } else if (ac.equals("Sort")) {
- GraphicLib.sortJTabbedPane(tp.tabbedPane, tp.panels, 1, tp.tabbedPane.getTabCount());
- mgui.changeMade(null, -1);
- } else if (ac.equals("New Use Case Diagram")) {
- mgui.createUniqueUseCaseDiagram(tp, "Use Case Diagram");
- mgui.changeMade(null, -1);
- } else if (item == newsd) {
- mgui.createUniqueSequenceDiagram(tp, "MyScenario");
- mgui.changeMade(null, -1);
- } else if (item == newsdzv) {
- mgui.createUniqueSequenceDiagramZV(tp, "MyScenario");
- mgui.changeMade(null, -1);
- } else if (item == newsdfromucd) {
- mgui.createSequenceDiagramFromUCD(tp, "ScenarioFromUCD", (UseCaseDiagramPanel)(mgui.getCurrentTDiagramPanel()));
- mgui.changeMade(null, -1);
- } else if (ac.equals("New Requirement Diagram")) {
- mgui.createRequirementDiagram(tp, "Requirement Diagram");
- mgui.changeMade(null, -1);
- } else if (ac.equals("New Attack Tree Diagram")) {
- mgui.createAttackTreeDiagram(tp, "Attack Tree");
- mgui.changeMade(null, -1);
- } else if (ac.equals("New Event-Based Requirement Description Diagram")) {
- mgui.createEBRDD(tp, "EBRDD");
- mgui.changeMade(null, -1);
- } else if (ac.equals("New ProActive State Machine Diagram")) {
- mgui.createProActiveSMD(tp, "ProActive SMD");
- mgui.changeMade(null, -1);
- } else if (e.getSource() == newavatarrd) {
- mgui.createAvatarRD(tp, "AVATAR RD");
- mgui.changeMade(null, -1);
- } else if (e.getSource() == newavatarpd) {
- mgui.createAvatarPD(tp, "AVATAR PD");
- mgui.changeMade(null, -1);
- } else if (e.getSource() == newavatarcd) {
- mgui.createUniqueAvatarCD(tp, "Context Diagram");
- mgui.changeMade(null, -1);
- } else if (e.getSource() == newavatarad) {
- mgui.createUniqueAvatarAD(tp, "Activity Diagram");
- mgui.changeMade(null, -1);
- } else if (e.getSource() == newavatarmad) {
- mgui.createAvatarMAD(tp, "Modeling Assumptions Diagram");
- mgui.changeMade(null, -1);
+ @Override
+ public void actionPerformed(ActionEvent e) {
+ JMenuItem item = (JMenuItem)e.getSource();
+ String ac = item.getActionCommand();
+ if(ac.equals("Rename")) {
+ tp.requestRenameTab(tp.tabbedPane.getSelectedIndex());
+ } else if (ac.equals("Remove")) {
+ tp.requestRemoveTab(tp.tabbedPane.getSelectedIndex());
+ } else if (ac.equals("Move to the left")) {
+ tp.requestMoveLeftTab(tp.tabbedPane.getSelectedIndex());
+ } else if (ac.equals("Move to the right")) {
+ tp.requestMoveRightTab(tp.tabbedPane.getSelectedIndex());
+ } else if (ac.equals("Sort")) {
+ GraphicLib.sortJTabbedPane(tp.tabbedPane, tp.panels, 1, tp.tabbedPane.getTabCount());
+ mgui.changeMade(null, -1);
+ } else if (ac.equals("New Use Case Diagram")) {
+ mgui.createUniqueUseCaseDiagram(tp, "Use Case Diagram");
+ mgui.changeMade(null, -1);
+ } else if (item == newsd) {
+ mgui.createUniqueSequenceDiagram(tp, "MyScenario");
+ mgui.changeMade(null, -1);
+ } else if (item == newsdzv) {
+ mgui.createUniqueSequenceDiagramZV(tp, "MyScenario");
+ mgui.changeMade(null, -1);
+ } else if (item == newsdfromucd) {
+ mgui.createSequenceDiagramFromUCD(tp, "ScenarioFromUCD", (UseCaseDiagramPanel)(mgui.getCurrentTDiagramPanel()));
+ mgui.changeMade(null, -1);
+ } else if (ac.equals("New Requirement Diagram")) {
+ mgui.createRequirementDiagram(tp, "Requirement Diagram");
+ mgui.changeMade(null, -1);
+ } else if (ac.equals("New Attack Tree Diagram")) {
+ mgui.createAttackTreeDiagram(tp, "Attack Tree");
+ mgui.changeMade(null, -1);
+ } else if (e.getSource() == newftd) {
+ mgui.createFaultTreeDiagram(tp, "Fault Tree");
+ mgui.changeMade(null, -1);
+ } else if (ac.equals("New Event-Based Requirement Description Diagram")) {
+ mgui.createEBRDD(tp, "EBRDD");
+ mgui.changeMade(null, -1);
+ } else if (ac.equals("New ProActive State Machine Diagram")) {
+ mgui.createProActiveSMD(tp, "ProActive SMD");
+ mgui.changeMade(null, -1);
+ } else if (e.getSource() == newavatarrd) {
+ mgui.createAvatarRD(tp, "AVATAR RD");
+ mgui.changeMade(null, -1);
+ } else if (e.getSource() == newavatarpd) {
+ mgui.createAvatarPD(tp, "AVATAR PD");
+ mgui.changeMade(null, -1);
+ } else if (e.getSource() == newavatarcd) {
+ mgui.createUniqueAvatarCD(tp, "Context Diagram");
+ mgui.changeMade(null, -1);
+ } else if (e.getSource() == newavatarad) {
+ mgui.createUniqueAvatarAD(tp, "Activity Diagram");
+ mgui.changeMade(null, -1);
+ } else if (e.getSource() == newavatarmad) {
+ mgui.createAvatarMAD(tp, "Modeling Assumptions Diagram");
+ mgui.changeMade(null, -1);
+ }
}
- }
- };
+ };
}
diff --git a/src/main/java/ui/ftd/FTDBlock.java b/src/main/java/ui/ftd/FTDBlock.java
index 54eeeeb7635089b7405a6b6f4e6d1831c52902a1..a9a4efa572f9ba0de856d84bbdc12f9407a533ac 100644
--- a/src/main/java/ui/ftd/FTDBlock.java
+++ b/src/main/java/ui/ftd/FTDBlock.java
@@ -1,26 +1,26 @@
/* Copyright or (C) or Copr. GET / ENST, Telecom-Paris, Ludovic Apvrille
- *
+ *
* ludovic.apvrille AT enst.fr
- *
+ *
* This software is a computer program whose purpose is to allow the
* edition of TURTLE analysis, design and deployment diagrams, to
* allow the generation of RT-LOTOS or Java code from this diagram,
* and at last to allow the analysis of formal validation traces
* obtained from external tools, e.g. RTL from LAAS-CNRS and CADP
* from INRIA Rhone-Alpes.
- *
+ *
* This software is governed by the CeCILL license under French law and
* abiding by the rules of distribution of free software. You can use,
* modify and/ or redistribute the software under the terms of the CeCILL
* license as circulated by CEA, CNRS and INRIA at the following URL
* "http://www.cecill.info".
- *
+ *
* As a counterpart to the access to the source code and rights to copy,
* modify and redistribute granted by the license, users are provided only
* with a limited warranty and the software's author, the holder of the
* economic rights, and the successive licensors have only limited
* liability.
- *
+ *
* In this respect, the user's attention is drawn to the risks associated
* with loading, using, modifying and/or developing or reproducing the
* software by the user in light of its specific status of free software,
@@ -31,7 +31,7 @@
* requirements in conditions enabling the security of their systems and/or
* data to be ensured and, more generally, to use and operate it in the
* same conditions as regards security.
- *
+ *
* The fact that you are presently reading this means that you have had
* knowledge of the CeCILL license and that you accept its terms.
*/
@@ -51,11 +51,11 @@ import java.util.Vector;
/**
- * Class FTDBlock
- * Node. To be used in Fault Tree Diagrams
- * Creation: 14/12/2017
- * @version 1.1 14/12/2017
- * @author Ludovic APVRILLE
+ * Class FTDBlock
+ * Node. To be used in Fault Tree Diagrams
+ * Creation: 14/12/2017
+ * @version 1.1 14/12/2017
+ * @author Ludovic APVRILLE
*/
public class FTDBlock extends TGCScalableWithInternalComponent implements SwallowTGComponent {
private int textY1 = 3;
@@ -302,11 +302,11 @@ public class FTDBlock extends TGCScalableWithInternalComponent implements Swallo
}
- public Vector<FTDAttack> getAttackList() {
- Vector<FTDAttack> v = new Vector<>();
+ public Vector<FTDFault> getFaultList() {
+ Vector<FTDFault> v = new Vector<>();
for(int i=0; i<nbInternalTGComponent; i++) {
if (tgcomponent[i] instanceof FTDFault) {
- v.add((FTDAttack) tgcomponent[i]);
+ v.add((FTDFault) tgcomponent[i]);
}
}
return v;
diff --git a/src/main/java/ui/ftd/FTDConstraint.java b/src/main/java/ui/ftd/FTDConstraint.java
index 1737363c7ae7e49a19ed711142708e645927b4ac..a66f86098012594be43174b08ebc13510f9fa4a7 100644
--- a/src/main/java/ui/ftd/FTDConstraint.java
+++ b/src/main/java/ui/ftd/FTDConstraint.java
@@ -63,7 +63,7 @@ public class FTDConstraint extends TGCScalableWithInternalComponent implements
private int textY1 = 5;
//private int textY2 = 30;
- public static final String[] STEREOTYPES = {"<<OR>>", "<<XOR>>", "<<AND>>", "NOT", "<<SEQUENCE>>", "AFTER", "BEFORE", "VOTE"};
+ public static final String[] STEREOTYPES = {"<<OR>>", "<<XOR>>", "<<AND>>", "<<NOT>>", "<<SEQUENCE>>", "<<AFTER>>", "<<BEFORE>>", "<<VOTE>>"};
protected String oldValue = "";
@@ -87,18 +87,18 @@ public class FTDConstraint extends TGCScalableWithInternalComponent implements
nbConnectingPoint = 12;
connectingPoint = new TGConnectingPoint[12];
- connectingPoint[0] = new FTDAttackConnectingPoint(this, 0, 0, true, true, 0.5, 0.0);
- connectingPoint[1] = new FTDAttackConnectingPoint(this, 0, 0, true, true, 0.0, 0.5);
- connectingPoint[2] = new FTDAttackConnectingPoint(this, 0, 0, true, true, 1.0, 0.5);
- connectingPoint[3] = new FTDAttackConnectingPoint(this, 0, 0, true, true, 0.5, 1.0);
- connectingPoint[4] = new FTDAttackConnectingPoint(this, 0, 0, true, true, 0.25, 0.0);
- connectingPoint[5] = new FTDAttackConnectingPoint(this, 0, 0, true, true, 0.75, 0.0);
- connectingPoint[6] = new FTDAttackConnectingPoint(this, 0, 0, true, true, 0.0, 0.25);
- connectingPoint[7] = new FTDAttackConnectingPoint(this, 0, 0, true, true, 1.0, 0.25);
- connectingPoint[8] = new FTDAttackConnectingPoint(this, 0, 0, true, true, 0.0, 0.75);
- connectingPoint[9] = new FTDAttackConnectingPoint(this, 0, 0, true, true, 1.0, 0.75);
- connectingPoint[10] = new FTDAttackConnectingPoint(this, 0, 0, true, true, 0.25, 1.0);
- connectingPoint[11] = new FTDAttackConnectingPoint(this, 0, 0, true, true, 0.75, 1.0);
+ connectingPoint[0] = new FTDFaultConnectingPoint(this, 0, 0, true, true, 0.5, 0.0);
+ connectingPoint[1] = new FTDFaultConnectingPoint(this, 0, 0, true, true, 0.0, 0.5);
+ connectingPoint[2] = new FTDFaultConnectingPoint(this, 0, 0, true, true, 1.0, 0.5);
+ connectingPoint[3] = new FTDFaultConnectingPoint(this, 0, 0, true, true, 0.5, 1.0);
+ connectingPoint[4] = new FTDFaultConnectingPoint(this, 0, 0, true, true, 0.25, 0.0);
+ connectingPoint[5] = new FTDFaultConnectingPoint(this, 0, 0, true, true, 0.75, 0.0);
+ connectingPoint[6] = new FTDFaultConnectingPoint(this, 0, 0, true, true, 0.0, 0.25);
+ connectingPoint[7] = new FTDFaultConnectingPoint(this, 0, 0, true, true, 1.0, 0.25);
+ connectingPoint[8] = new FTDFaultConnectingPoint(this, 0, 0, true, true, 0.0, 0.75);
+ connectingPoint[9] = new FTDFaultConnectingPoint(this, 0, 0, true, true, 1.0, 0.75);
+ connectingPoint[10] = new FTDFaultConnectingPoint(this, 0, 0, true, true, 0.25, 1.0);
+ connectingPoint[11] = new FTDFaultConnectingPoint(this, 0, 0, true, true, 0.75, 1.0);
//addTGConnectingPointsComment();
moveable = true;
diff --git a/src/main/java/ui/ftd/FTDCountermeasure.java b/src/main/java/ui/ftd/FTDCountermeasure.java
index 7105b2bc778399e874e7b088529986d7f6b1cb05..752a54e378eb0b8eeb6ae92d62868a277d6150fe 100644
--- a/src/main/java/ui/ftd/FTDCountermeasure.java
+++ b/src/main/java/ui/ftd/FTDCountermeasure.java
@@ -48,7 +48,7 @@ import org.w3c.dom.Node;
import org.w3c.dom.NodeList;
import ui.*;
import ui.util.IconManager;
-import ui.window.JDialogCountermeasure;
+import ui.window.JDialogFaultCountermeasure;
import javax.swing.*;
import java.awt.*;
@@ -258,7 +258,7 @@ public class FTDCountermeasure extends TGCScalableWithInternalComponent implemen
String tmp;
boolean error = false;
- JDialogCountermeasure dialog = new JDialogCountermeasure(frame, "Setting countermeasure attributes", this);
+ JDialogFaultCountermeasure dialog = new JDialogFaultCountermeasure(frame, "Setting countermeasure attributes", this);
// dialog.setSize(450, 350);
GraphicLib.centerOnParent(dialog, 450, 350);
dialog.setVisible( true ); // blocked until dialog has been closed
diff --git a/src/main/java/ui/ftd/FTDCountermeasureConnectingPoint.java b/src/main/java/ui/ftd/FTDCountermeasureConnectingPoint.java
index f1711a3de954f5fdc40200a8bd48740590515950..6e12228299fdf6ec0344592ae1dceb768bab0b28 100644
--- a/src/main/java/ui/ftd/FTDCountermeasureConnectingPoint.java
+++ b/src/main/java/ui/ftd/FTDCountermeasureConnectingPoint.java
@@ -39,7 +39,7 @@
-package ui.atd;
+package ui.ftd;
import ui.CDElement;
@@ -49,18 +49,18 @@ import ui.TGConnectingPointWidthHeight;
/**
* Class ATDCountermeasureConnectingPoint
* Definition of connecting points on which countermeasures connectors can be connected
- * Creation: 06/06/2017
- * @version 1.0 06/06/2017
+ * Creation: 14/12/2017
+ * @version 1.0 14/12/2017
* @author Ludovic APVRILLE
*/
-public class ATDCountermeasureConnectingPoint extends TGConnectingPointWidthHeight {
+public class FTDCountermeasureConnectingPoint extends TGConnectingPointWidthHeight {
- public ATDCountermeasureConnectingPoint(CDElement _container, int _x, int _y, boolean _in, boolean _out, double _w, double _h) {
+ public FTDCountermeasureConnectingPoint(CDElement _container, int _x, int _y, boolean _in, boolean _out, double _w, double _h) {
super(_container, _x, _y, _in, _out, _w, _h);
}
public boolean isCompatibleWith(int type) {
- return type == TGComponentManager.ATD_COUNTERMEASURE_CONNECTOR;
+ return type == TGComponentManager.FTD_COUNTERMEASURE_CONNECTOR;
}
}
diff --git a/src/main/java/ui/ftd/FTDFault.java b/src/main/java/ui/ftd/FTDFault.java
index a6176e0db21f66aed9ba1b212f12c3bbac597f5c..a13ce491804a9741e3a6f80a898e048ba4481613 100644
--- a/src/main/java/ui/ftd/FTDFault.java
+++ b/src/main/java/ui/ftd/FTDFault.java
@@ -39,16 +39,21 @@
-package ui.atd;
+package ui.ftd;
-//import java.awt.*;
+import myutil.GraphicLib;
+import myutil.TraceManager;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
import ui.*;
+import ui.util.IconManager;
+import ui.window.JDialogFault;
+
+import javax.swing.*;
+import java.awt.*;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.LinkedList;
-import java.util.ListIterator;
//import org.w3c.dom.*;
//import org.xml.sax.*;
@@ -71,8 +76,8 @@ public class FTDFault extends TGCScalableWithInternalComponent implements Swallo
protected String oldValue = "";
protected String description = "";
- private String stereotype = "attack";
- private String rootStereotype = "root attack";
+ private String stereotype = "fault";
+ private String rootStereotype = "root fault";
private boolean isRootFault = false;
private static int maxFontSize = 14;
diff --git a/src/main/java/ui/ftd/FaultTreeDiagramPanel.java b/src/main/java/ui/ftd/FaultTreeDiagramPanel.java
index 8e6472e60cd511d5b204bed5ea14b8dfdbd22abf..ffbd2aee6ab17a31d4cdcf40b7c2f6976fef84a4 100644
--- a/src/main/java/ui/ftd/FaultTreeDiagramPanel.java
+++ b/src/main/java/ui/ftd/FaultTreeDiagramPanel.java
@@ -39,7 +39,7 @@
-package ui.atd;
+package ui.ftd;
//import java.awt.*;
diff --git a/src/main/java/ui/ftd/FaultTreeDiagramToolbar.java b/src/main/java/ui/ftd/FaultTreeDiagramToolbar.java
index e32a9122bb42a65b78dec4e561cc3fcc79c56d6b..af9079a841fa3647ff9a7bb1e0dadf5f33575081 100644
--- a/src/main/java/ui/ftd/FaultTreeDiagramToolbar.java
+++ b/src/main/java/ui/ftd/FaultTreeDiagramToolbar.java
@@ -79,9 +79,9 @@ public class FaultTreeDiagramToolbar extends TToolBar {
mgui.actions[TGUIAction.FTD_BLOCK].setEnabled(b);
mgui.actions[TGUIAction.FTD_COMPOSITION_CONNECTOR].setEnabled(b);
- mgui.actions[TGUIAction.FTD_ATTACK].setEnabled(b);
+ mgui.actions[TGUIAction.FTD_FAULT].setEnabled(b);
- mgui.actions[TGUIAction.FTD_ATTACK_CONNECTOR].setEnabled(b);
+ mgui.actions[TGUIAction.FTD_FAULT_CONNECTOR].setEnabled(b);
mgui.actions[TGUIAction.FTD_CONSTRAINT].setEnabled(b);
@@ -117,7 +117,7 @@ public class FaultTreeDiagramToolbar extends TToolBar {
this.addSeparator();
- button = this.add(mgui.actions[TGUIAction.FTD_ATTACK]);
+ button = this.add(mgui.actions[TGUIAction.FTD_FAULT]);
button.addMouseListener(mgui.mouseHandler);
this.addSeparator();
@@ -127,7 +127,7 @@ public class FaultTreeDiagramToolbar extends TToolBar {
this.addSeparator();
- button = this.add(mgui.actions[TGUIAction.FTD_ATTACK_CONNECTOR]);
+ button = this.add(mgui.actions[TGUIAction.FTD_FAULT_CONNECTOR]);
button.addMouseListener(mgui.mouseHandler);
this.addSeparator();
diff --git a/src/main/java/ui/tree/DiagramTreeRenderer.java b/src/main/java/ui/tree/DiagramTreeRenderer.java
index ef9af53b2862767168dce4efa8e7968794feb7ef..283beed298474a6999f713603e91501bf1aec510 100755
--- a/src/main/java/ui/tree/DiagramTreeRenderer.java
+++ b/src/main/java/ui/tree/DiagramTreeRenderer.java
@@ -46,6 +46,7 @@ import translator.GroupOfGates;
import ui.*;
import ui.ad.TActivityDiagramPanel;
import ui.atd.AttackTreeDiagramPanel;
+import ui.ftd.FaultTreeDiagramPanel;
import ui.avatarad.AvatarADPanel;
import ui.avatarbd.AvatarBDPanel;
import ui.avatarcd.AvatarCDPanel;
@@ -185,7 +186,10 @@ public class DiagramTreeRenderer extends DefaultTreeCellRenderer {
setToolTipText("TURTLE Requirement");
} else if (value instanceof AttackTreePanel) {
setIcon(IconManager.imgic1074);
- setToolTipText("TURTLE Requirement");
+ setToolTipText("Attack tree");
+ } else if (value instanceof FaultTreePanel) {
+ setIcon(IconManager.imgic1074);
+ setToolTipText("Fault tree");
} else if (value instanceof TClassDiagramPanel) {
setIcon(IconManager.imgic14);
setToolTipText("TURTLE Class diagram");
@@ -219,6 +223,9 @@ public class DiagramTreeRenderer extends DefaultTreeCellRenderer {
} else if (value instanceof AttackTreeDiagramPanel) {
setIcon(IconManager.imgic1074);
setToolTipText("Attack Tree Diagram (SysML Parametric diagram)");
+ } else if (value instanceof FaultTreeDiagramPanel) {
+ setIcon(IconManager.imgic1074);
+ setToolTipText("Fault Tree Diagram (SysML Parametric diagram)");
} else if (value instanceof EBRDDPanel) {
setIcon(IconManager.imgic1058);
setToolTipText("Event-Based Requirement Description Diagram");
diff --git a/src/main/java/ui/window/JDialogFault.java b/src/main/java/ui/window/JDialogFault.java
new file mode 100755
index 0000000000000000000000000000000000000000..f51a0dc8c032391d3210dcb99178979ebf322c0a
--- /dev/null
+++ b/src/main/java/ui/window/JDialogFault.java
@@ -0,0 +1,184 @@
+/* Copyright or (C) or Copr. GET / ENST, Telecom-Paris, Ludovic Apvrille
+ *
+ * ludovic.apvrille AT enst.fr
+ *
+ * This software is a computer program whose purpose is to allow the
+ * edition of TURTLE analysis, design and deployment diagrams, to
+ * allow the generation of RT-LOTOS or Java code from this diagram,
+ * and at last to allow the analysis of formal validation traces
+ * obtained from external tools, e.g. RTL from LAAS-CNRS and CADP
+ * from INRIA Rhone-Alpes.
+ *
+ * This software is governed by the CeCILL license under French law and
+ * abiding by the rules of distribution of free software. You can use,
+ * modify and/ or redistribute the software under the terms of the CeCILL
+ * license as circulated by CEA, CNRS and INRIA at the following URL
+ * "http://www.cecill.info".
+ *
+ * As a counterpart to the access to the source code and rights to copy,
+ * modify and redistribute granted by the license, users are provided only
+ * with a limited warranty and the software's author, the holder of the
+ * economic rights, and the successive licensors have only limited
+ * liability.
+ *
+ * In this respect, the user's attention is drawn to the risks associated
+ * with loading, using, modifying and/or developing or reproducing the
+ * software by the user in light of its specific status of free software,
+ * that may mean that it is complicated to manipulate, and that also
+ * therefore means that it is reserved for developers and experienced
+ * professionals having in-depth computer knowledge. Users are therefore
+ * encouraged to load and test the software's suitability as regards their
+ * requirements in conditions enabling the security of their systems and/or
+ * data to be ensured and, more generally, to use and operate it in the
+ * same conditions as regards security.
+ *
+ * The fact that you are presently reading this means that you have had
+ * knowledge of the CeCILL license and that you accept its terms.
+ */
+
+
+
+
+package ui.window;
+
+import ui.util.IconManager;
+import ui.ftd.FTDFault;
+
+import javax.swing.*;
+import java.awt.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+
+//import javax.swing.event.*;
+
+
+/**
+ * Class JDialogFault
+ * Dialog for managing fault attributes
+ * Creation: 14/12/2009
+ * @version 1.0 14/12/2009
+ * @author Ludovic APVRILLE
+ */
+public class JDialogFault extends JDialogBase implements ActionListener {
+
+ private boolean regularClose;
+
+ private JPanel panel2;
+ private Frame frame;
+
+ //protected JTextField taskName;
+ protected JTextField name, description;
+ protected JCheckBox isRootFault;
+
+ private FTDFault fault;
+
+ /** Creates new form */
+ public JDialogFault(Frame _frame, String _title, FTDFault _fault) {
+ super(_frame, _title, true);
+ frame = _frame;
+ fault = _fault;
+
+ initComponents();
+ myInitComponents();
+ pack();
+ }
+
+ private void myInitComponents() {
+ }
+
+ private void initComponents() {
+ Container c = getContentPane();
+ GridBagLayout gridbag0 = new GridBagLayout();
+ GridBagLayout gridbag1 = new GridBagLayout();
+ GridBagLayout gridbag2 = new GridBagLayout();
+ GridBagConstraints c0 = new GridBagConstraints();
+ GridBagConstraints c1 = new GridBagConstraints();
+ GridBagConstraints c2 = new GridBagConstraints();
+
+ setFont(new Font("Helvetica", Font.PLAIN, 14));
+ c.setLayout(gridbag0);
+
+ setDefaultCloseOperation(JFrame.DISPOSE_ON_CLOSE);
+
+
+ panel2 = new JPanel();
+ panel2.setLayout(gridbag2);
+ panel2.setBorder(new javax.swing.border.TitledBorder("Fault attributes"));
+ panel2.setPreferredSize(new Dimension(350, 250));
+
+ c1.gridwidth = 1;
+ c1.gridheight = 1;
+ c1.weighty = 1.0;
+ c1.weightx = 1.0;
+ c1.gridwidth = GridBagConstraints.REMAINDER; //end row
+ isRootFault = new JCheckBox("root fault");
+ isRootFault.setSelected(fault.isRootFault());
+ panel2.add(isRootFault, c1);
+
+ c1.gridwidth = 1;
+ c1.fill = GridBagConstraints.HORIZONTAL;
+ panel2.add(new JLabel("Name:"), c2);
+ c1.gridwidth = GridBagConstraints.REMAINDER; //end row
+ name = new JTextField(fault.getFaultName());
+ panel2.add(name, c1);
+
+ c1.gridwidth = 1;
+ c1.fill = GridBagConstraints.HORIZONTAL;
+ panel2.add(new JLabel("Description:"), c2);
+ c1.gridwidth = GridBagConstraints.REMAINDER; //end row
+ description = new JTextField(fault.getDescription());
+ panel2.add(description, c1);
+
+ // main panel;
+ c0.gridheight = 10;
+ c0.weighty = 1.0;
+ c0.weightx = 1.0;
+ c0.gridwidth = GridBagConstraints.REMAINDER; //end row
+ c.add(panel2, c0);
+
+ c0.gridwidth = 1;
+ c0.gridheight = 1;
+ c0.fill = GridBagConstraints.HORIZONTAL;
+
+ initButtons(c0, c, this);
+ }
+
+ public void actionPerformed(ActionEvent evt) {
+ String command = evt.getActionCommand();
+
+ // Compare the action command to the known actions.
+ if (command.equals("Save and Close")) {
+ closeDialog();
+ } else if (command.equals("Cancel")) {
+ cancelDialog();
+ }
+ }
+
+ public void closeDialog() {
+ regularClose = true;
+ dispose();
+ }
+
+ public void cancelDialog() {
+ dispose();
+ }
+
+ public boolean isRegularClose() {
+ return regularClose;
+ }
+
+ public String getDescription() {
+ return description.getText();
+ }
+
+ public String getName() {
+ return name.getText();
+ }
+
+ public boolean isRootFault() {
+ return isRootFault.isSelected();
+ }
+
+
+
+}
diff --git a/src/main/java/ui/window/JDialogFaultCountermeasure.java b/src/main/java/ui/window/JDialogFaultCountermeasure.java
new file mode 100755
index 0000000000000000000000000000000000000000..df37746325b413b49b71e29050d3419b71702039
--- /dev/null
+++ b/src/main/java/ui/window/JDialogFaultCountermeasure.java
@@ -0,0 +1,173 @@
+/* Copyright or (C) or Copr. GET / ENST, Telecom-Paris, Ludovic Apvrille
+ *
+ * ludovic.apvrille AT enst.fr
+ *
+ * This software is a computer program whose purpose is to allow the
+ * edition of TURTLE analysis, design and deployment diagrams, to
+ * allow the generation of RT-LOTOS or Java code from this diagram,
+ * and at last to allow the analysis of formal validation traces
+ * obtained from external tools, e.g. RTL from LAAS-CNRS and CADP
+ * from INRIA Rhone-Alpes.
+ *
+ * This software is governed by the CeCILL license under French law and
+ * abiding by the rules of distribution of free software. You can use,
+ * modify and/ or redistribute the software under the terms of the CeCILL
+ * license as circulated by CEA, CNRS and INRIA at the following URL
+ * "http://www.cecill.info".
+ *
+ * As a counterpart to the access to the source code and rights to copy,
+ * modify and redistribute granted by the license, users are provided only
+ * with a limited warranty and the software's author, the holder of the
+ * economic rights, and the successive licensors have only limited
+ * liability.
+ *
+ * In this respect, the user's attention is drawn to the risks associated
+ * with loading, using, modifying and/or developing or reproducing the
+ * software by the user in light of its specific status of free software,
+ * that may mean that it is complicated to manipulate, and that also
+ * therefore means that it is reserved for developers and experienced
+ * professionals having in-depth computer knowledge. Users are therefore
+ * encouraged to load and test the software's suitability as regards their
+ * requirements in conditions enabling the security of their systems and/or
+ * data to be ensured and, more generally, to use and operate it in the
+ * same conditions as regards security.
+ *
+ * The fact that you are presently reading this means that you have had
+ * knowledge of the CeCILL license and that you accept its terms.
+ */
+
+
+
+
+package ui.window;
+
+import ui.util.IconManager;
+import ui.ftd.FTDCountermeasure;
+
+import javax.swing.*;
+import java.awt.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+
+//import javax.swing.event.*;
+
+
+/**
+ * Class JDialogFaultCountermeasure
+ * Dialog for managing atatck attributes
+ * Creation: 14/12/2017
+ * @version 1.0 14/12/2017
+ * @author Ludovic APVRILLE
+ */
+public class JDialogFaultCountermeasure extends JDialogBase implements ActionListener {
+
+ private boolean regularClose;
+
+ private JPanel panel2;
+ private Frame frame;
+
+ //protected JTextField taskName;
+ protected JTextField name, description;
+
+ private FTDCountermeasure countermeasure;
+
+ /** Creates new form */
+ public JDialogFaultCountermeasure(Frame _frame, String _title, FTDCountermeasure _countermeasure) {
+ super(_frame, _title, true);
+ frame = _frame;
+ countermeasure = _countermeasure;
+
+ initComponents();
+ myInitComponents();
+ pack();
+ }
+
+ private void myInitComponents() {
+ }
+
+ private void initComponents() {
+ Container c = getContentPane();
+ GridBagLayout gridbag0 = new GridBagLayout();
+ GridBagLayout gridbag1 = new GridBagLayout();
+ GridBagLayout gridbag2 = new GridBagLayout();
+ GridBagConstraints c0 = new GridBagConstraints();
+ GridBagConstraints c1 = new GridBagConstraints();
+ GridBagConstraints c2 = new GridBagConstraints();
+
+ setFont(new Font("Helvetica", Font.PLAIN, 14));
+ c.setLayout(gridbag0);
+
+ setDefaultCloseOperation(JFrame.DISPOSE_ON_CLOSE);
+
+
+ panel2 = new JPanel();
+ panel2.setLayout(gridbag2);
+ panel2.setBorder(new javax.swing.border.TitledBorder("Attack attributes"));
+ panel2.setPreferredSize(new Dimension(350, 250));
+
+ c1.gridwidth = 1;
+ c1.gridheight = 1;
+ c1.weighty = 1.0;
+ c1.weightx = 1.0;
+ c1.gridwidth = 1;
+ c1.fill = GridBagConstraints.HORIZONTAL;
+ panel2.add(new JLabel("Name:"), c2);
+ c1.gridwidth = GridBagConstraints.REMAINDER; //end row
+ name = new JTextField(countermeasure.getCountermeasureName());
+ panel2.add(name, c1);
+
+ c1.gridwidth = 1;
+ c1.fill = GridBagConstraints.HORIZONTAL;
+ panel2.add(new JLabel("Description:"), c2);
+ c1.gridwidth = GridBagConstraints.REMAINDER; //end row
+ description = new JTextField(countermeasure.getDescription());
+ panel2.add(description, c1);
+
+ // main panel;
+ c0.gridheight = 10;
+ c0.weighty = 1.0;
+ c0.weightx = 1.0;
+ c0.gridwidth = GridBagConstraints.REMAINDER; //end row
+ c.add(panel2, c0);
+
+ c0.gridwidth = 1;
+ c0.gridheight = 1;
+ c0.fill = GridBagConstraints.HORIZONTAL;
+
+ initButtons(c0, c, this);
+ }
+
+ public void actionPerformed(ActionEvent evt) {
+ String command = evt.getActionCommand();
+
+ // Compare the action command to the known actions.
+ if (command.equals("Save and Close")) {
+ closeDialog();
+ } else if (command.equals("Cancel")) {
+ cancelDialog();
+ }
+ }
+
+ public void closeDialog() {
+ regularClose = true;
+ dispose();
+ }
+
+ public void cancelDialog() {
+ dispose();
+ }
+
+ public boolean isRegularClose() {
+ return regularClose;
+ }
+
+ public String getDescription() {
+ return description.getText();
+ }
+
+ public String getName() {
+ return name.getText();
+ }
+
+
+}