From ef7e371d0de2c46cf9cee328ce6baf1621378ea7 Mon Sep 17 00:00:00 2001
From: Ludovic Apvrille <ludovic.apvrille@telecom-paristech.fr>
Date: Thu, 21 Apr 2016 14:43:12 +0000
Subject: [PATCH] Update on channel name in avatardd
---
src/ui/avatardd/ADDChannelArtifact.java | 2 +-
src/ui/avatardd/ADDTimerNode.java | 376 ++++++++++++------------
2 files changed, 189 insertions(+), 189 deletions(-)
diff --git a/src/ui/avatardd/ADDChannelArtifact.java b/src/ui/avatardd/ADDChannelArtifact.java
index bd31aee705..bef3b66a2a 100755
--- a/src/ui/avatardd/ADDChannelArtifact.java
+++ b/src/ui/avatardd/ADDChannelArtifact.java
@@ -299,7 +299,7 @@ public class ADDChannelArtifact extends TGCWithoutInternalComponent implements S
}
public String getStatusInformation() {
- return fullChannelName;
+ return "Name of the channel: " + fullChannelName;
}
}
diff --git a/src/ui/avatardd/ADDTimerNode.java b/src/ui/avatardd/ADDTimerNode.java
index 8ce9874d22..73ea734550 100755
--- a/src/ui/avatardd/ADDTimerNode.java
+++ b/src/ui/avatardd/ADDTimerNode.java
@@ -1,48 +1,48 @@
/**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.
-
-/**
- * Class ADDTimerNode
- * Node. To be used in Avatar deployment diagrams.
- * Creation: 22/08/2014
- * @version 1.0 22/08/2014
- * @author Ludovic APVRILLE
- * @see
- */
+ 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.
+
+ /**
+ * Class ADDTimerNode
+ * Node. To be used in Avatar deployment diagrams.
+ * Creation: 22/08/2014
+ * @version 1.0 22/08/2014
+ * @author Ludovic APVRILLE
+ * @see
+ */
package ui.avatardd;
@@ -64,22 +64,22 @@ public class ADDTimerNode extends ADDCommunicationNode implements WithAttributes
private int derivationx = 2;
private int derivationy = 3;
private String stereotype = "Timer";
-
+
private int nIrq = 0;
private int index = 0;
-
-
+
+
public ADDTimerNode(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 = 50;
-
+
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);
@@ -88,7 +88,7 @@ public class ADDTimerNode extends ADDCommunicationNode implements WithAttributes
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);
@@ -97,58 +97,58 @@ public class ADDTimerNode extends ADDCommunicationNode implements WithAttributes
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;
-
- name = tdp.findNodeName("Timer");
- value = "name";
-
+
+ name = tdp.findNodeName("Timer");
+ value = "name";
+
myImageIcon = IconManager.imgic1110;
}
-
+
public void internalDrawing(Graphics g) {
- Color c = g.getColor();
- g.draw3DRect(x, y, width, height, true);
-
+ 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.DMA_BOX);
- g.fill3DRect(x+1, y+1, width-1, height-1, true);
- g.setColor(c);
-
+
+ // Filling color
+ g.setColor(ColorManager.DMA_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));
+ 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.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);
+
+ // 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);
@@ -159,123 +159,123 @@ public class ADDTimerNode extends ADDCommunicationNode implements WithAttributes
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 getNIrq() {
return nIrq;
}
-
+
public boolean editOndoubleClick(JFrame frame) {
- boolean error = false;
- String errors = "";
- int tmp;
- String tmpName;
-
- JDialogADDTimerNode dialog = new JDialogADDTimerNode(frame, "Setting " + stereotype + " attributes", this);
- dialog.setSize(500, 450);
- GraphicLib.centerOnParent(dialog);
- dialog.show(); // 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.getNIrq().length() != 0) {
- try {
- tmp = nIrq;
- nIrq = Integer.decode(dialog.getNIrq()).intValue();
- if (index < 0) {
- nIrq = tmp;
- error = true;
- errors += "nIrq ";
- }
- } catch (Exception e) {
- error = true;
- errors += "nIrq ";
- }
- }
-
- if (error) {
- JOptionPane.showMessageDialog(frame,
- "Invalid value for the following attributes: " + errors,
- "Error",
- JOptionPane.INFORMATION_MESSAGE);
- return false;
- }
-
- return true;
+ boolean error = false;
+ String errors = "";
+ int tmp;
+ String tmpName;
+
+ JDialogADDTimerNode dialog = new JDialogADDTimerNode(frame, "Setting " + stereotype + " attributes", this);
+ dialog.setSize(500, 450);
+ GraphicLib.centerOnParent(dialog);
+ dialog.show(); // 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.getNIrq().length() != 0) {
+ try {
+ tmp = nIrq;
+ nIrq = Integer.decode(dialog.getNIrq()).intValue();
+ if (index < 0) {
+ nIrq = tmp;
+ error = true;
+ errors += "nIrq ";
+ }
+ } catch (Exception e) {
+ error = true;
+ errors += "nIrq ";
+ }
+ }
+
+ if (error) {
+ JOptionPane.showMessageDialog(frame,
+ "Invalid value for the following attributes: " + errors,
+ "Error",
+ JOptionPane.INFORMATION_MESSAGE);
+ return false;
+ }
+
+ return true;
}
-
-
+
+
public int getType() {
return TGComponentManager.ADD_TIMERNODE;
}
-
+
protected String translateExtraParam() {
StringBuffer sb = new StringBuffer("<extraparam>\n");
sb.append("<info stereotype=\"" + stereotype + "\" nodeName=\"" + name);
sb.append("\" />\n");
- sb.append("<attributes");
- sb.append(" index=\"" + index + "\" ");
- sb.append(" nIrq=\"" + nIrq + "\" ");
+ sb.append("<attributes");
+ sb.append(" index=\"" + index + "\" ");
+ sb.append(" nIrq=\"" + nIrq + "\" ");
sb.append("/>\n");
sb.append("</extraparam>\n");
return new String(sb);
}
-
+
public void loadExtraParam(NodeList nl, int decX, int decY, int decId) throws MalformedModelingException{
//System.out.println("*** load extra synchro ***");
try {
-
+
NodeList nli;
Node n1, n2;
Element elt;
int t1id;
String sstereotype = null, snodeName = null;
-
+
for(int i=0; i<nl.getLength(); i++) {
n1 = nl.item(i);
//System.out.println(n1);
@@ -292,46 +292,46 @@ public class ADDTimerNode extends ADDCommunicationNode implements WithAttributes
}
if (sstereotype != null) {
stereotype = sstereotype;
- }
+ }
if (snodeName != null){
name = snodeName;
}
-
- if (elt.getTagName().equals("attributes")) {
+
+ if (elt.getTagName().equals("attributes")) {
nIrq = Integer.decode(elt.getAttribute("nIrq")).intValue();
index = Integer.decode(elt.getAttribute("index")).intValue();
-
+
}
}
}
}
}
-
+
} catch (Exception e) {
throw new MalformedModelingException();
}
}
-
-
- /*public int getByteDataSize(){
- return byteDataSize;
- }
-
- public int getNbOfChannels(){
- return nbOfChannels;
- }*/
-
- public String getAttributes() {
- String attr = "";
- attr += "N irq = " + nIrq + "\n";
- attr += "index = " + index + "\n";
-
- return attr;
- }
-
- public int getDefaultConnector() {
- return TGComponentManager.ADD_CONNECTOR;
- }
-
-
+
+
+ /*public int getByteDataSize(){
+ return byteDataSize;
+ }
+
+ public int getNbOfChannels(){
+ return nbOfChannels;
+ }*/
+
+ public String getAttributes() {
+ String attr = "";
+ attr += "N irq = " + nIrq + "\n";
+ attr += "index = " + index + "\n";
+
+ return attr;
+ }
+
+ public int getDefaultConnector() {
+ return TGComponentManager.ADD_CONNECTOR;
+ }
+
+
}
--
GitLab