Skip to content
Snippets Groups Projects
Commit d516d9e2 authored by Dominique Blouin's avatar Dominique Blouin
Browse files

Issue #98: Proper naming of static final variables

parent 178a753d
No related branches found
No related tags found
1 merge request!24Resolve "C code generated for ZigBee tutorial"
Hide whitespace changes
Inline Side-by-side
src/main/java/ui/window/JDialogCommPatternMapping.java
+ 2
− 2
View file @ d516d9e2
......@@ -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());
......
src/main/java/ui/window/JDialogMemoryNode.java
+ 3
− 10
View file @ d516d9e2
......@@ -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;
}
}
src/main/java/ui/window/JDialogPortArtifact.java 100755 → 100644
+ 95
− 88
View file @ d516d9e2
......@@ -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();
......
src/main/java/ui/window/JDialogTMLTaskArtifact.java
+ 4
− 4
View file @ d516d9e2
......@@ -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 ) {
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment