From 5119f412d8bed6ffe0d384cfe66d5bf1cd73fefc Mon Sep 17 00:00:00 2001
From: Andrea Enrici <andrea.enrici@nokia.com>
Date: Tue, 24 Mar 2015 15:50:38 +0000
Subject: [PATCH] minor changes to text in ui windows
---
src/tmltranslator/ctranslator/Buffer.java | 2 ++
src/ui/window/JDialogMemoryNode.java | 10 ++--------
src/ui/window/JDialogPortArtifact.java | 2 +-
3 files changed, 5 insertions(+), 9 deletions(-)
diff --git a/src/tmltranslator/ctranslator/Buffer.java b/src/tmltranslator/ctranslator/Buffer.java
index fc5ce337fe..8f4dddb67d 100755
--- a/src/tmltranslator/ctranslator/Buffer.java
+++ b/src/tmltranslator/ctranslator/Buffer.java
@@ -53,6 +53,8 @@ import tmltranslator.*;
public class Buffer {
+ public static final String[] bufferTypesList = { "FEP buffer", "MAPPER buffer", "ADAIF buffer", "INTERLEAVER Buffer", "MAIN MEMORY buffer" };
+
public String CR = "\n";
public String TAB = "\t";
public String TAB2 = "\t\t";
diff --git a/src/ui/window/JDialogMemoryNode.java b/src/ui/window/JDialogMemoryNode.java
index ff9a0be4cf..e957d40c7d 100755
--- a/src/ui/window/JDialogMemoryNode.java
+++ b/src/ui/window/JDialogMemoryNode.java
@@ -53,8 +53,8 @@ import javax.swing.*;
import java.util.*;
import ui.*;
-
import ui.tmldd.*;
+import tmltranslator.ctranslator.*;
public class JDialogMemoryNode extends javax.swing.JDialog implements ActionListener {
@@ -75,7 +75,6 @@ public class JDialogMemoryNode extends javax.swing.JDialog implements ActionList
//Panel3: code generation
protected int bufferType = 0; //it is the index in the ArrayList of String
protected JComboBox bufferTypesCB;
- protected Vector<String> bufferTypesListS = new Vector<String>();
// Main Panel
private JButton closeButton;
@@ -122,11 +121,6 @@ public class JDialogMemoryNode extends javax.swing.JDialog implements ActionList
panel3.setLayout(gridbag3);
panel3.setBorder(new javax.swing.border.TitledBorder("Code generation"));
panel3.setPreferredSize(new Dimension(300, 200));
- bufferTypesListS.add( "FepBuffer" );
- bufferTypesListS.add( "MapperBuffer" );
- bufferTypesListS.add( "AdaifBuffer" );
- bufferTypesListS.add( "InterleaverBuffer" );
- bufferTypesListS.add( "MainMemoryBuffer" );
c1.gridwidth = 1;
c1.gridheight = 1;
@@ -164,7 +158,7 @@ public class JDialogMemoryNode extends javax.swing.JDialog implements ActionList
c3.weightx = 1.0;
panel3.add(new JLabel("Buffer type:"), c3);
c3.gridwidth = GridBagConstraints.REMAINDER; //end row
- bufferTypesCB = new JComboBox( bufferTypesListS );
+ bufferTypesCB = new JComboBox( new Vector<String>( Arrays.asList( Buffer.bufferTypesList ) ) );
bufferTypesCB.setSelectedIndex( bufferType );
panel3.add( bufferTypesCB, c3 );
diff --git a/src/ui/window/JDialogPortArtifact.java b/src/ui/window/JDialogPortArtifact.java
index a67b992911..274fff8721 100755
--- a/src/ui/window/JDialogPortArtifact.java
+++ b/src/ui/window/JDialogPortArtifact.java
@@ -130,7 +130,7 @@ public class JDialogPortArtifact extends javax.swing.JDialog implements ActionLi
panel3 = new JPanel();
panel3.setLayout(gridbag2);
- panel3.setBorder(new javax.swing.border.TitledBorder("Buffer attributes"));
+ panel3.setBorder(new javax.swing.border.TitledBorder("Code generation: buffer attributes"));
panel3.setPreferredSize(new Dimension(650, 350));
c1.gridwidth = 1;
--
GitLab