From 6d6d0f4c652438bdb82577ef7d6f1984006aee75 Mon Sep 17 00:00:00 2001 From: Ludovic Apvrille <ludovic.apvrille@telecom-paristech.fr> Date: Mon, 9 Jul 2018 10:32:13 +0200 Subject: [PATCH] Adding TPT logo to AVATAR documentation --- doc/AVATAR/fig/logotpt.pdf | Bin 0 -> 32668 bytes src/main/java/ui/avatarbd/AvatarBDBlock.java | 96 +++++++++++++----- .../java/ui/avatarrd/AvatarRDRequirement.java | 2 +- .../ui/window/JDialogIDAndStereotype.java | 8 +- 4 files changed, 74 insertions(+), 32 deletions(-) create mode 100644 doc/AVATAR/fig/logotpt.pdf diff --git a/doc/AVATAR/fig/logotpt.pdf b/doc/AVATAR/fig/logotpt.pdf new file mode 100644 index 0000000000000000000000000000000000000000..47bcada07880a6f6e21347293a9dd79197a0f34c GIT binary patch literal 32668 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 literal 0 HcmV?d00001 diff --git a/src/main/java/ui/avatarbd/AvatarBDBlock.java b/src/main/java/ui/avatarbd/AvatarBDBlock.java index d2741139f1..deda218d01 100644 --- a/src/main/java/ui/avatarbd/AvatarBDBlock.java +++ b/src/main/java/ui/avatarbd/AvatarBDBlock.java @@ -50,6 +50,7 @@ import ui.*; import ui.avatarsmd.AvatarSMDPanel; import ui.util.IconManager; import ui.window.JDialogAvatarBlock; +import ui.window.JDialogIDAndStereotype; import javax.swing.*; import java.awt.*; @@ -185,7 +186,8 @@ public class AvatarBDBlock extends TGCScalableWithInternalComponent implements S graph.drawRect(this.x, this.y, this.width, this.height); // Draw inner rectangle - graph.setColor(ColorManager.AVATAR_BLOCK); + //graph.setColor(ColorManager.AVATAR_BLOCK); + graph.setColor(BLOCK_TYPE_COLOR.get(typeStereotype)); graph.fillRect(this.x + 1, this.y + 1, this.width - 1, this.height - 1); graph.setColor(c); @@ -209,11 +211,8 @@ public class AvatarBDBlock extends TGCScalableWithInternalComponent implements S Font font = graph.getFont(); - String ster; - if (!this.isCryptoBlock()) - ster = "<<" + stereotype + ">>"; - else - ster = "<<" + stereotypeCrypto + ">>"; + + String ster = BLOCK_TYPE_STR.get(typeStereotype); if (this.rescaled && !this.tdp.isScaled()) { this.rescaled = false; @@ -574,45 +573,84 @@ public class AvatarBDBlock extends TGCScalableWithInternalComponent implements S } // On the name ? if ((limitName == -1 && _y <= y + 2 * currentFontSize) || _y < limitName) { + JDialogIDAndStereotype dialog = new JDialogIDAndStereotype(frame, "Setting Block ID", BLOCK_TYPE_STR.toArray(new String[0]), getValue + (), typeStereotype, BLOCK_TYPE_COLOR.toArray(new Color[0]), ColorManager.AVATAR_BLOCK); + //dialog.setSize(400, 300); + GraphicLib.centerOnParent(dialog, 400, 300); + // dialog.show(); // blocked until dialog has been closed oldValue = value; + dialog.setVisible(true); + + if (dialog.hasBeenCancelled()) { + return false; + } - //String text = getName() + ": "; - String s = (String) JOptionPane.showInputDialog(frame, "Block name", - "setting value", JOptionPane.PLAIN_MESSAGE, IconManager.imgic101, - null, - getValue()); + String s = dialog.getName(); - if ((s != null) && (s.length() > 0) && (!s.equals(oldValue))) { + if ((s != null) && (s.length() > 0)){ //boolean b; - if (!TAttribute.isAValidId(s, false, false)) { + if (!s.equals(oldValue)) { + if (!TAttribute.isAValidId(s, false, false)) { + JOptionPane.showMessageDialog(frame, + "Could not change the name of the Block: the new name is not a valid name", + "Error", + JOptionPane.INFORMATION_MESSAGE); + return false; + } + + if (!tdp.isAvatarBlockNameUnique(s)) { + JOptionPane.showMessageDialog(frame, + "Could not change the name of the Block: the new name is already in use", + "Error", + JOptionPane.INFORMATION_MESSAGE); + return false; + } + + setValue(s); + recalculateSize(); + + } + + /*if (!(tdp.actionOnDoubleClick(this))) { JOptionPane.showMessageDialog(frame, - "Could not change the name of the Block: the new name is not a valid name", + "Could not change the name of the Requirement: this name is already in use", "Error", JOptionPane.INFORMATION_MESSAGE); + setValue(oldValue); return false; - } + }*/ + + // Setting stereotype + s = dialog.getStereotype().trim(); - if (!tdp.isAvatarBlockNameUnique(s)) { + if (!TAttribute.isAValidId(s, false, false)) { JOptionPane.showMessageDialog(frame, - "Could not change the name of the Block: the new name is already in use", + "Could not use the new stereotype: the new stereotype name is not valid", "Error", JOptionPane.INFORMATION_MESSAGE); return false; } - setValue(s); - recalculateSize(); + int rgb = dialog.getColor(); - if (tdp.actionOnDoubleClick(this)) { - return true; + TraceManager.addDev("RGBColor:" + rgb + " vs default color:" + ColorManager.AVATAR_BLOCK.getRGB()); + + addStereotype(s, rgb); + + TraceManager.addDev("My stereotype=" + BLOCK_TYPE_STR.get(typeStereotype) + " color=" + BLOCK_TYPE_COLOR.get(typeStereotype).getRGB()); + + + if (isCryptoBlock()) { + addCryptoElements(); } else { - JOptionPane.showMessageDialog(frame, - "Could not change the name of the Block: frame error", - "Error", - JOptionPane.INFORMATION_MESSAGE); - setValue(oldValue); + removeCryptoElements(); } + + return true; + } + + return false; } @@ -809,7 +847,7 @@ public class AvatarBDBlock extends TGCScalableWithInternalComponent implements S protected String translateExtraParam() { StringBuffer sb = new StringBuffer("<extraparam>\n"); - sb.append("<reqType data=\""); + sb.append("<blockType data=\""); sb.append(BLOCK_TYPE_STR.get(typeStereotype)); sb.append("\" color=\""); sb.append(BLOCK_TYPE_COLOR.get(typeStereotype).getRGB()); @@ -921,10 +959,11 @@ public class AvatarBDBlock extends TGCScalableWithInternalComponent implements S this.myAttributes.add(ta); } } - if (elt.getTagName().equals("reqType")) { + if (elt.getTagName().equals("blockType")) { // s = elt.getAttribute("data"); String tmp3 = elt.getAttribute("color"); + TraceManager.addDev("stereotype=" + s + " color=" + tmp3); int rgb = ColorManager.AVATAR_REQUIREMENT_TOP.getRGB(); try { rgb = Integer.decode(tmp3).intValue(); @@ -1025,6 +1064,7 @@ public class AvatarBDBlock extends TGCScalableWithInternalComponent implements S } public boolean addStereotype(String s, int rgb) { + TraceManager.addDev("Adding stereotype for " + s + " with color " + rgb); int index = -1; String sLower = s.toLowerCase(); for (int i=0; i<BLOCK_TYPE_STR.size(); i++) { diff --git a/src/main/java/ui/avatarrd/AvatarRDRequirement.java b/src/main/java/ui/avatarrd/AvatarRDRequirement.java index 659c305ed6..77da73244b 100755 --- a/src/main/java/ui/avatarrd/AvatarRDRequirement.java +++ b/src/main/java/ui/avatarrd/AvatarRDRequirement.java @@ -397,7 +397,7 @@ public class AvatarRDRequirement extends TGCScalableWithInternalComponent implem getValue());*/ JDialogIDAndStereotype dialog = new JDialogIDAndStereotype(frame, "Setting Requirement ID", REQ_TYPE_STR.toArray(new String[0]), getValue - (), reqType, REQ_TYPE_COLOR.toArray(new Color[0])); + (), reqType, REQ_TYPE_COLOR.toArray(new Color[0]),ColorManager.AVATAR_REQUIREMENT_TOP); //dialog.setSize(400, 300); GraphicLib.centerOnParent(dialog, 400, 300); // dialog.show(); // blocked until dialog has been closed diff --git a/src/main/java/ui/window/JDialogIDAndStereotype.java b/src/main/java/ui/window/JDialogIDAndStereotype.java index 1c9809ad4a..c941478b48 100644 --- a/src/main/java/ui/window/JDialogIDAndStereotype.java +++ b/src/main/java/ui/window/JDialogIDAndStereotype.java @@ -67,6 +67,7 @@ public class JDialogIDAndStereotype extends JDialogBase implements ActionListene private Color[] colors; private String currentName; private int currentStereotype; + private Color defaultColor; private JPanel panel1; @@ -84,7 +85,7 @@ public class JDialogIDAndStereotype extends JDialogBase implements ActionListene /** Creates new form */ public JDialogIDAndStereotype(Frame _f, String _title, String[] _availableStereotypes, String _currentName, - int _currentStereotype, Color[] _colors) { + int _currentStereotype, Color[] _colors, Color _defaultColor) { super(_f, _title, true); @@ -92,6 +93,7 @@ public class JDialogIDAndStereotype extends JDialogBase implements ActionListene colors = _colors; currentName = _currentName; currentStereotype = _currentStereotype; + defaultColor = _defaultColor; initComponents(); myInitComponents(); @@ -158,7 +160,7 @@ public class JDialogIDAndStereotype extends JDialogBase implements ActionListene panel1.add(colorButton, c1); useDefaultColor = new JButton("Use default color"); - useDefaultColor.setBackground(ColorManager.AVATAR_REQUIREMENT_TOP); + useDefaultColor.setBackground(defaultColor); useDefaultColor.addActionListener(this); panel1.add(useDefaultColor, c1); //panel1.setEditable(true); @@ -200,7 +202,7 @@ public class JDialogIDAndStereotype extends JDialogBase implements ActionListene } public void selectDefaultColor() { - colorButton.setBackground(ColorManager.AVATAR_REQUIREMENT_TOP); + colorButton.setBackground(defaultColor); } public void selectStereotype() { -- GitLab