From 98c79ee035e686d0c1993d82f511811aee82a849 Mon Sep 17 00:00:00 2001
From: Daniela Genius <genius@debussy.soc.lip6.fr>
Date: Wed, 22 May 2019 16:10:53 +0200
Subject: [PATCH] deleted 2 files
---
.../java/ui/avatardd/ADDMemoryNode.java-new | 335 ------------------
src/main/java/ui/avatardd/ADDRAMNode.java-new | 167 ---------
2 files changed, 502 deletions(-)
delete mode 100755 src/main/java/ui/avatardd/ADDMemoryNode.java-new
delete mode 100755 src/main/java/ui/avatardd/ADDRAMNode.java-new
diff --git a/src/main/java/ui/avatardd/ADDMemoryNode.java-new b/src/main/java/ui/avatardd/ADDMemoryNode.java-new
deleted file mode 100755
index 403be2baaf..0000000000
--- a/src/main/java/ui/avatardd/ADDMemoryNode.java-new
+++ /dev/null
@@ -1,335 +0,0 @@
-/* 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.avatardd;
-
-import myutil.GraphicLib;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-import tmltranslator.HwMemory;
-import ui.*;
-import ui.util.IconManager;
-import ui.window.JDialogADDMemoryNode;
-
-import javax.swing.*;
-import java.awt.*;
-
-/**
- * Class ADDMemoryNode
- * Node. To be used in avatar deployment diagrams.
- * Creation: 21/08/2014
- * @version 1.0 21/08/2014
- * @author Ludovic APVRILLE
- */
-
-public abstract class ADDMemoryNode extends ADDCommunicationNode implements WithAttributes {
- protected int textY1 = 15;
- protected int textY2 = 30;
- protected int derivationx = 2;
- protected int derivationy = 3;
- protected String stereotype = "RAM";
-
- protected int index = 0;
- protected int cluster_index = 0;
- protected int monitored = 0;
- protected int byteDataSize = HwMemory.DEFAULT_BYTE_DATA_SIZE;
-
- private String processCode;
-
- public ADDMemoryNode(int _x, int _y, int _minX, int _maxX, int _minY, int _maxY, boolean _pos, TGComponent _father, TDiagramPanel _tdp) {
- super(_x, _y, _minX, _maxX, _minY, _maxY, _pos, _father, _tdp);
-
- setProcessCode("");
- }
-
- public void internalDrawing(Graphics g) {
- Color c = g.getColor();
- g.draw3DRect(x, y, width, height, true);
-
- // Top lines
- g.drawLine(x, y, x + derivationx, y - derivationy);
- g.drawLine(x + width, y, x + width + derivationx, y - derivationy);
- g.drawLine(x + derivationx, y - derivationy, x + width + derivationx, y - derivationy);
-
- // Right lines
- g.drawLine(x + width, y + height, x + width + derivationx, y - derivationy + height);
- g.drawLine(x + derivationx + width, y - derivationy, x + width + derivationx, y - derivationy + height);
-
- // Filling color
- g.setColor(ColorManager.MEMORY_BOX);
- g.fill3DRect(x+1, y+1, width-1, height-1, true);
- g.setColor(c);
-
- // Strings
- String ster = "<<" + stereotype + ">>";
- int w = g.getFontMetrics().stringWidth(ster);
- Font f = g.getFont();
- g.setFont(f.deriveFont(Font.BOLD));
- g.drawString(ster, x + (width - w)/2, y + textY1);
- w = g.getFontMetrics().stringWidth(name);
- g.setFont(f);
- g.drawString(name, x + (width - w)/2, y + textY2);
-
- // Icon
- //g.drawImage(IconManager.imgic1108.getImage(), x + width - 20, y + 4, null);
- g.drawImage(IconManager.imgic1108.getImage(), x + 4, y + 4, null);
- g.drawImage(IconManager.img9, x + width - 20, y + 4, null);
- }
-
- public TGComponent isOnOnlyMe(int x1, int y1) {
- Polygon pol = new Polygon();
- pol.addPoint(x, y);
- pol.addPoint(x + derivationx, y - derivationy);
- pol.addPoint(x + derivationx + width, y - derivationy);
- pol.addPoint(x + derivationx + width, y + height - derivationy);
- pol.addPoint(x + width, y + height);
- pol.addPoint(x, y + height);
- if (pol.contains(x1, y1)) {
- return this;
- }
- return null;
- }
-
- public String getStereotype() {
- return stereotype;
- }
-
- public String getNodeName() {
- return name;
- }
-
- public int getIndex() {
- return index;
- }
-
- public int getClusterIndex() {
- return cluster_index;
- }
-
- public int getDataSize() {
- return byteDataSize;
- }
-
- public int getMonitored() {
- return monitored;
- }
-
- public boolean editOndoubleClick(JFrame frame) {
- boolean error = false;
- String errors = "";
- int tmp;
- String tmpName;
-
- JDialogADDMemoryNode dialog = new JDialogADDMemoryNode(frame, "Setting " + stereotype + " attributes", this);
- // dialog.setSize(500, 450);
- GraphicLib.centerOnParent(dialog, 500, 450);
- dialog.setVisible( true ); // blocked until dialog has been closed
-
- if (!dialog.isRegularClose()) {
- return false;
- }
-
- if (dialog.getNodeName().length() != 0) {
- tmpName = dialog.getNodeName();
- tmpName = tmpName.trim();
- if (!TAttribute.isAValidId(tmpName, false, false)) {
- error = true;
- errors += "Name of the node ";
- } else {
- name = tmpName;
- }
- }
-
- if (dialog.getIndex().length() != 0) {
- try {
- tmp = index;
- index = Integer.decode(dialog.getIndex()).intValue();
- if (index < 0) {
- index = tmp;
- error = true;
- errors += "index ";
- }
- } catch (Exception e) {
- error = true;
- errors += "index ";
- }
- }
-
- if (dialog.getClusterIndex().length() != 0) {
- try {
- tmp = cluster_index;
- index = Integer.decode(dialog.getClusterIndex()).intValue();
- if (index < 0) {
- index = tmp;
- error = true;
- errors += "cluster index ";
- }
- } catch (Exception e) {
- error = true;
- errors += "cluster index ";
- }
- }
-
-
-
- if (dialog.getDataSize().length() != 0) {
- try {
- tmp = byteDataSize;
- byteDataSize = Integer.decode(dialog.getDataSize()).intValue();
- if (index < 0) {
- byteDataSize = tmp;
- error = true;
- errors += "byteDataSize ";
- }
- } catch (Exception e) {
- error = true;
- errors += "byteDataSize ";
- }
- }
-
- //if (dialog.getMonitored().length() != 0) {
- if (dialog.getMonitored() != 0) {
- try {
- tmp = monitored;
- monitored = dialog.getMonitored();//Integer.decode(dialog.getMonitored()).intValue();
- if (index < 0) {
- monitored = tmp;
- error = true;
- errors += "monitored ";
- }
- } catch (Exception e) {
- error = true;
- errors += "monitored ";
- }
- }
-
- if (error) {
- JOptionPane.showMessageDialog(frame,
- "Invalid value for the following attributes: " + errors,
- "Error",
- JOptionPane.INFORMATION_MESSAGE);
- return false;
- }
- return true;
- }
-
- protected String translateExtraParam() {
- StringBuffer sb = new StringBuffer("<extraparam>\n");
- sb.append("<info stereotype=\"" + stereotype + "\" nodeName=\"" + name);
- sb.append("\" />\n");
- sb.append("<attributes byteDataSize=\"" + byteDataSize + "\" ");
- sb.append(" index=\"" + index + "\" ");
- sb.append(" cluster_index=\"" + cluster_index + "\" ");
- if (stereotype.equals("RAM")) {
- sb.append(" processCode=\"" + getProcessCode() + "\" ");
- }
- sb.append("/>\n");
- sb.append("</extraparam>\n");
- return new String(sb);
- }
-
- public void loadExtraParam(NodeList nl, int decX, int decY, int decId) throws MalformedModelingException{
- //
- try {
- NodeList nli;
- Node n1, n2;
- Element elt;
- //int t1id;
- String sstereotype = null, snodeName = null;
- monitored = 0;
- String processCode;
-
- for(int i=0; i<nl.getLength(); i++) {
- n1 = nl.item(i);
- //
- if (n1.getNodeType() == Node.ELEMENT_NODE) {
- nli = n1.getChildNodes();
- for(int j=0; j<nli.getLength(); j++) {
- n2 = nli.item(j);
- //
- if (n2.getNodeType() == Node.ELEMENT_NODE) {
- elt = (Element) n2;
- if (elt.getTagName().equals("info")) {
- sstereotype = elt.getAttribute("stereotype");
- snodeName = elt.getAttribute("nodeName");
- }
- if (sstereotype != null) {
- stereotype = sstereotype;
- }
- if (snodeName != null){
- name = snodeName;
- }
- if (elt.getTagName().equals("attributes")) {
- byteDataSize = Integer.decode(elt.getAttribute("byteDataSize")).intValue();
- //monitored = Integer.decode(elt.getAttribute("monitored")).intValue();
- index = Integer.decode(elt.getAttribute("index")).intValue();
- //cluster_index = Integer.decode(elt.getAttribute("cluster_index")).intValue();
- if (sstereotype.equals("RAM")) {
- processCode = elt.getAttribute("processCode");
- setProcessCode(processCode);
- }
- }
- }
- }
- }
- }
- } catch (Exception e) {
- throw new MalformedModelingException();
- }
- }
-
- public int getByteDataSize(){
- return byteDataSize;
- }
-
- public String getAttributes() {
- String attr = "";
- attr += "Data size (in byte) = " + byteDataSize + "\n";
- attr += "Index = " + index + "\n";
- return attr;
- }
-
- public String getProcessCode() {
- return processCode;
- }
-
- public void setProcessCode(String _processCode) {
- processCode = _processCode;
- }
-}
diff --git a/src/main/java/ui/avatardd/ADDRAMNode.java-new b/src/main/java/ui/avatardd/ADDRAMNode.java-new
deleted file mode 100755
index 6fee322b5a..0000000000
--- a/src/main/java/ui/avatardd/ADDRAMNode.java-new
+++ /dev/null
@@ -1,167 +0,0 @@
-/* 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.avatardd;
-
-import ui.*;
-import ui.util.IconManager;
-
-import java.util.Vector;
-
-/**
- * Class ADDRAMNode
- * Node. To be used in avatar deployment diagrams.
- * Creation: 01/07/2014
- * @version 1.0 01/07/2014
- * @author Ludovic APVRILLE
- */
-
-public class ADDRAMNode extends ADDMemoryNode implements SwallowTGComponent, WithAttributes {
-
- protected int monitored = 0;
- protected int index = 0;
- protected int cluster_index = 0;
-
- public ADDRAMNode(int _x, int _y, int _minX, int _maxX, int _minY, int _maxY, boolean _pos, TGComponent _father, TDiagramPanel _tdp) {
- super(_x, _y, _minX, _maxX, _minY, _maxY, _pos, _father, _tdp);
-
- width = 200;
- height = 200;
- minWidth = 100;
- minHeight = 35;
-
- nbConnectingPoint = 16;
- connectingPoint = new TGConnectingPoint[16];
-
- connectingPoint[0] = new ADDConnectingPoint(this, 0, 0, false, true, 0.0, 0.0);
- connectingPoint[1] = new ADDConnectingPoint(this, 0, 0, false, true, 0.5, 0.0);
- connectingPoint[2] = new ADDConnectingPoint(this, 0, 0, false, true, 1.0, 0.0);
- connectingPoint[3] = new ADDConnectingPoint(this, 0, 0, false, true, 0.0, 0.5);
- connectingPoint[4] = new ADDConnectingPoint(this, 0, 0, false, true, 1.0, 0.5);
- connectingPoint[5] = new ADDConnectingPoint(this, 0, 0, false, true, 0.0, 1.0);
- connectingPoint[6] = new ADDConnectingPoint(this, 0, 0, false, true, 0.5, 1.0);
- connectingPoint[7] = new ADDConnectingPoint(this, 0, 0, false, true, 1.0, 1.0);
-
- connectingPoint[8] = new ADDConnectingPoint(this, 0, 0, false, true, 0.25, 0.0);
- connectingPoint[9] = new ADDConnectingPoint(this, 0, 0, false, true, 0.75, 0.0);
- connectingPoint[10] = new ADDConnectingPoint(this, 0, 0, false, true, 0.0, 0.25);
- connectingPoint[11] = new ADDConnectingPoint(this, 0, 0, false, true, 1.0, 0.25);
- connectingPoint[12] = new ADDConnectingPoint(this, 0, 0, false, true, 0.0, 0.75);
- connectingPoint[13] = new ADDConnectingPoint(this, 0, 0, false, true, 1.0, 0.75);
- connectingPoint[14] = new ADDConnectingPoint(this, 0, 0, false, true, 0.25, 1.0);
- connectingPoint[15] = new ADDConnectingPoint(this, 0, 0, false, true, 0.75, 1.0);
-
- addTGConnectingPointsComment();
-
- nbInternalTGComponent = 0;
-
- moveable = true;
- editable = true;
- removable = true;
- userResizable = true;
-
- stereotype = "RAM";
-
- name = tdp.findNodeName("Memory");
- value = "name";
-
- myImageIcon = IconManager.imgic700;
- }
-
- public int getType() {
- return TGComponentManager.ADD_RAMNODE;
- }
-
- public boolean acceptSwallowedTGComponent(TGComponent tgc) {
- //TraceManager.addDev("Accept swallowed?");
- return tgc instanceof ADDBlockArtifact;
- }
-
- public boolean addSwallowedTGComponent(TGComponent tgc, int x, int y) {
- //TraceManager.addDev("Add swallowed?");
- //Set its coordinates
- if (tgc instanceof ADDChannelArtifact) {
- tgc.setFather(this);
- tgc.setDrawingZone(true);
- tgc.resizeWithFather();
- //TraceManager.addDev("Add swallowed!!!");
- addInternalComponent(tgc, 0);
- return true;
- }
- return false;
- }
-
- public void removeSwallowedTGComponent(TGComponent tgc) {
- removeInternalComponent(tgc);
- }
-
- public Vector<ADDChannelArtifact> getArtifactList() {
- Vector<ADDChannelArtifact> v = new Vector<ADDChannelArtifact>();
-
- for(int i=0; i<nbInternalTGComponent; i++) {
- if (tgcomponent[i] instanceof ADDChannelArtifact) {
- v.add( (ADDChannelArtifact) tgcomponent[i] );
- }
- }
- return v;
- }
-
- public void hasBeenResized() {
- for(int i=0; i<nbInternalTGComponent; i++) {
- if (tgcomponent[i] instanceof ADDChannelArtifact) {
- tgcomponent[i].resizeWithFather();
- }
- }
- }
-
- public int getIndex() {
- return index;
- }
-
- public int getClusterIndex() {
- return cluster_index;
- }
-
- public int getMonitored() {
- return monitored;
- }
-
- public void setMonitored(int _monitored){
- monitored = _monitored;
- }
-}
--
GitLab