diff --git a/src/main/java/ui/window/JDialogCommPatternMapping.java b/src/main/java/ui/window/JDialogCommPatternMapping.java
index 98a5eb9a049cf046d4fe9af624a8e68f0cdb2256..f853d3acc1ae8a38ae8ee02922aff5d4fb7eaecf 100644
--- a/src/main/java/ui/window/JDialogCommPatternMapping.java
+++ b/src/main/java/ui/window/JDialogCommPatternMapping.java
@@ -690,7 +690,7 @@ public class JDialogCommPatternMapping extends JDialog /* implements ActionListe
if( cpMEC.equals( "VOID" ) || cpMEC.equals( "" ) ) {
cpMECsCB.setSelectedIndex( 0 );
- cpMEC = CPMEC.MemoryCopy;
+ cpMEC = CPMEC.MEMORY_COPY;
}
else {
cpMECsCB.setSelectedIndex( new Vector<String>( Arrays.asList( CPMEC.CP_TYPES ) ).indexOf( cpMEC ) );
@@ -1459,7 +1459,7 @@ public class JDialogCommPatternMapping extends JDialog /* implements ActionListe
name = nameOfCP.getText();
cpMEC = (String)cpMECsCB.getSelectedItem();
if( cpMEC.equals( "VOID" ) || cpMEC.equals( "" ) ) {
- cpMEC = CPMEC.MemoryCopy;
+ cpMEC = CPMEC.MEMORY_COPY;
}
transferType1 = Arrays.asList( CPMEC.TRANSFER_TYPES ).indexOf(transferTypeCB1.getSelectedItem());
transferType2 = Arrays.asList( CPMEC.TRANSFER_TYPES ).indexOf(transferTypeCB2.getSelectedItem());
diff --git a/src/main/java/ui/window/JDialogMemoryNode.java b/src/main/java/ui/window/JDialogMemoryNode.java
index f27d1510664ed9b179acba7cc9245888dbdf8c37..a3156093e24760ecdca3085b9050ba94623c3e14 100755
--- a/src/main/java/ui/window/JDialogMemoryNode.java
+++ b/src/main/java/ui/window/JDialogMemoryNode.java
@@ -36,14 +36,10 @@
* knowledge of the CeCILL license and that you accept its terms.
*/
-
-
-
package ui.window;
import myutil.GraphicLib;
import tmltranslator.modelcompiler.Buffer;
-import ui.util.IconManager;
import ui.tmldd.TMLArchiMemoryNode;
import javax.swing.*;
@@ -53,8 +49,6 @@ import java.awt.event.ActionListener;
import java.util.Arrays;
import java.util.Vector;
-//import javax.swing.event.*;
-
/**
* Class JDialogMemoryNode
@@ -178,7 +172,7 @@ public class JDialogMemoryNode extends JDialogBase implements ActionListener {
c3.weightx = 1.0;
panel3.add(new JLabel("<html>Memory Extension<br>Construct:</html>"), c3);
c3.gridwidth = GridBagConstraints.REMAINDER; //end row
- bufferTypesCB = new JComboBox<String>( new Vector<String>( Arrays.asList( Buffer.memoryTypesList ) ) );
+ bufferTypesCB = new JComboBox<String>( new Vector<String>( Arrays.asList( Buffer.MEMORY_TYPES ) ) );
bufferTypesCB.setSelectedIndex( bufferType );
panel3.add( bufferTypesCB, c3 );
@@ -210,9 +204,9 @@ public class JDialogMemoryNode extends JDialogBase implements ActionListener {
return;
}*/
- if (evt.getSource() == tracemode) {
+ if (evt.getSource() == tracemode) {
selectedTracemode = tracemode.getSelectedIndex();
- }
+ }
String command = evt.getActionCommand();
@@ -257,5 +251,4 @@ public class JDialogMemoryNode extends JDialogBase implements ActionListener {
public int getBufferType() {
return bufferType;
}
-
}
diff --git a/src/main/java/ui/window/JDialogPortArtifact.java b/src/main/java/ui/window/JDialogPortArtifact.java
old mode 100755
new mode 100644
index cc934a31304f9e2f5a2b98e84a82325d9258d748..52e3f165c5f969d5472a0e0ecc051edf515a26f2
--- a/src/main/java/ui/window/JDialogPortArtifact.java
+++ b/src/main/java/ui/window/JDialogPortArtifact.java
@@ -43,20 +43,28 @@
package ui.window;
-import tmltranslator.modelcompiler.*;
-import ui.util.IconManager;
-import ui.TGComponent;
-import ui.tmldd.TMLArchiMemoryNode;
-import ui.tmldd.TMLArchiPortArtifact;
-
-import javax.swing.*;
-import java.awt.*;
+import java.awt.Container;
+import java.awt.Dimension;
+import java.awt.Font;
+import java.awt.Frame;
+import java.awt.GridBagConstraints;
+import java.awt.GridBagLayout;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
import java.util.ArrayList;
import java.util.List;
import java.util.Vector;
+import javax.swing.JComboBox;
+import javax.swing.JFrame;
+import javax.swing.JLabel;
+import javax.swing.JPanel;
+import javax.swing.JTextField;
+
+import ui.TGComponent;
+import ui.tmldd.TMLArchiMemoryNode;
+import ui.tmldd.TMLArchiPortArtifact;
+
/**
* Class JDialogTMLTaskArtifact
@@ -71,7 +79,7 @@ public class JDialogPortArtifact extends JDialogBase implements ActionListener
private boolean emptyPortsList = false;
private JPanel panel2;
- private Frame frame;
+ //private Frame frame;
private TMLArchiPortArtifact artifact;
private String mappedMemory = "VOID";
@@ -109,14 +117,14 @@ public class JDialogPortArtifact extends JDialogBase implements ActionListener
//Code generation
private JPanel panel3;//, panel4, panel5;
//private JTabbedPane tabbedPane;
- private String HALUnitName = "";
+ //private String HALUnitName = "";
private Vector<String> portsList;
//private String appName = "";
/** Creates new form */
public JDialogPortArtifact(Frame _frame, String _title, TMLArchiPortArtifact _artifact, String _mappedMemory, Vector<String> _portsList, String _mappedPort ) {
super(_frame, _title, true);
- frame = _frame;
+ //frame = _frame;
artifact = _artifact;
mappedMemory = _mappedMemory;
portsList = _portsList;
@@ -214,22 +222,22 @@ public class JDialogPortArtifact extends JDialogBase implements ActionListener
initButtons(c0, c, this);
}
-
- private String getBufferTypeFromSelectedMemory( String mappedMemory ) {
-
- List<TGComponent> componentList = artifact.getTDiagramPanel().getComponentList();
- //Vector<String> list = new Vector<String>();
-
- for( int k = 0; k < componentList.size(); k++ ) {
- if( componentList.get(k) instanceof TMLArchiMemoryNode ) {
- TMLArchiMemoryNode memoryNode = (TMLArchiMemoryNode)componentList.get(k);
- if( memoryNode.getName().equals( mappedMemory ) ) {
- return memoryNode.getName();
- }
- }
- }
- return "NO MEC"; //default: the main memory buffer
- }
+//
+// private String getBufferTypeFromSelectedMemory( String mappedMemory ) {
+//
+// List<TGComponent> componentList = artifact.getTDiagramPanel().getComponentList();
+// //Vector<String> list = new Vector<String>();
+//
+// for( int k = 0; k < componentList.size(); k++ ) {
+// if( componentList.get(k) instanceof TMLArchiMemoryNode ) {
+// TMLArchiMemoryNode memoryNode = (TMLArchiMemoryNode)componentList.get(k);
+// if( memoryNode.getName().equals( mappedMemory ) ) {
+// return memoryNode.getName();
+// }
+// }
+// }
+// return "NO MEC"; //default: the main memory buffer
+// }
public void actionPerformed(ActionEvent evt) {
@@ -306,42 +314,41 @@ public class JDialogPortArtifact extends JDialogBase implements ActionListener
// }
public void closeDialog() {
-
regularClose = true;
- mappedMemory = memoryCB.getItemAt( memoryCB.getSelectedIndex() );
- HALUnitName = getBufferTypeFromSelectedMemory(memoryCB.getItemAt( memoryCB.getSelectedIndex() ));
- switch ( HALUnitName ) {
- case "FEP_BUFFER":
- if( !FepBuffer.closePanel( frame ) ) {
- return;
- }
- break;
- case "MAPPER_BUFFER":
- if( !MapperBuffer.closePanel( frame ) ) {
- return;
- }
- break;
- case "ADAIF_BUFFER":
- if( !AdaifBuffer.closePanel( frame ) ) {
- return;
- }
- break;
- case "INTERLEAVER_BUFFER":
- if( !InterleaverBuffer.closePanel( frame ) ) {
- return;
- }
- break;
- case "MAIN_MEMORY_BUFFER":
- if( !MMBuffer.closePanel( frame ) ) {
- return;
- }
- break;
- default: //the main memory buffer
- if( !FepBuffer.closePanel( frame ) ) {
- return;
- }
- break;
- }
+// mappedMemory = memoryCB.getItemAt( memoryCB.getSelectedIndex() );
+// HALUnitName = getBufferTypeFromSelectedMemory(memoryCB.getItemAt( memoryCB.getSelectedIndex() ));
+// switch ( HALUnitName ) {
+// case "FEP_BUFFER":
+// if( !FepBuffer.closePanel( frame ) ) {
+// return;
+// }
+// break;
+// case "MAPPER_BUFFER":
+// if( !MapperBuffer.closePanel( frame ) ) {
+// return;
+// }
+// break;
+// case "ADAIF_BUFFER":
+// if( !AdaifBuffer.closePanel( frame ) ) {
+// return;
+// }
+// break;
+// case "INTERLEAVER_BUFFER":
+// if( !InterleaverBuffer.closePanel( frame ) ) {
+// return;
+// }
+// break;
+// case "MAIN_MEMORY_BUFFER":
+// if( !MMBuffer.closePanel( frame ) ) {
+// return;
+// }
+// break;
+// default: //the main memory buffer
+// if( !FepBuffer.closePanel( frame ) ) {
+// return;
+// }
+// break;
+// }
dispose();
}
@@ -418,32 +425,32 @@ public class JDialogPortArtifact extends JDialogBase implements ActionListener
return 0;
}
- public ArrayList<String> getBufferParameters() {
-
- ArrayList<String> params = new ArrayList<String>();
- params.add( String.valueOf( HALUnitName ) );
- switch( HALUnitName ) {
- case "FEP_BUFFER":
- params = FepBuffer.getBufferParameters();
- break;
- case "INTERLEAVER_BUFFER":
- params = InterleaverBuffer.getBufferParameters();
- break;
- case "ADAIF_BUFFER":
- params = AdaifBuffer.getBufferParameters();
- break;
- case "MAPPER_BUFFER":
- params = MapperBuffer.getBufferParameters();
- break;
- case "MAIN_MEMORY_BUFFER":
- params = MMBuffer.getBufferParameters();
- break;
- default: //the main memory buffer
- params = FepBuffer.getBufferParameters();
- break;
- }
- return params;
- }
+// public List<String> getBufferParameters() {
+//
+// List<String> params = new ArrayList<String>();
+ //params.add( String.valueOf( HALUnitName ) );
+// switch( HALUnitName ) {
+// case "FEP_BUFFER":
+// params = FepBuffer.getBufferParameters();
+// break;
+// case "INTERLEAVER_BUFFER":
+// params = InterleaverBuffer.getBufferParameters();
+// break;
+// case "ADAIF_BUFFER":
+// params = AdaifBuffer.getBufferParameters();
+// break;
+// case "MAPPER_BUFFER":
+// params = MapperBuffer.getBufferParameters();
+// break;
+// case "MAIN_MEMORY_BUFFER":
+// params = MMBuffer.getBufferParameters();
+// break;
+// default: //the main memory buffer
+// params = FepBuffer.getBufferParameters();
+// break;
+// }
+// return params;
+// }
//
// private void cleanPanels() {
// panel3.removeAll();
diff --git a/src/main/java/ui/window/JDialogTMLTaskArtifact.java b/src/main/java/ui/window/JDialogTMLTaskArtifact.java
index f8dbcaea81286318120f3c5aa5b9632d68c5ca96..3864766c79b67bcbf9da305ce958b3099ebd4372 100755
--- a/src/main/java/ui/window/JDialogTMLTaskArtifact.java
+++ b/src/main/java/ui/window/JDialogTMLTaskArtifact.java
@@ -169,19 +169,19 @@ public class JDialogTMLTaskArtifact extends JDialogBase implements ActionListene
int indexOp = 0;
TraceManager.addDev( "Inside JDialogTMLTaskArtifact: " + MECType );
if( MECType instanceof FepMEC ) {
- operationsListS = FepMEC.operationsList;
+ operationsListS = FepMEC.OPERATIONS_LIST;
indexOp = operationsListS.indexOf( operation );
}
else if( MECType instanceof MapperMEC ) {
- operationsListS.add( MapperMEC.Operation );
+ operationsListS.add( MapperMEC.OPERATION );
indexOp = operationsListS.indexOf( operation );
}
else if( MECType instanceof InterleaverMEC ) {
- operationsListS.add( InterleaverMEC.Operation );
+ operationsListS.add( InterleaverMEC.OPERATION );
indexOp = operationsListS.indexOf( operation );
}
else if( MECType instanceof AdaifMEC ) {
- operationsListS.add( AdaifMEC.Operation );
+ operationsListS.add( AdaifMEC.OPERATION );
indexOp = operationsListS.indexOf( operation );
}
else if( MECType instanceof CpuMEC ) {