Skip to content

Commit

Permalink
Merge pull request #14 from croydondias/master
Browse files Browse the repository at this point in the history 
Swing input and filter panel updates
  • Loading branch information
@croydondias
croydondias committed Dec 5, 2013
2 parents 7c61a86 + 31ca3a9 commit 1befed2
Show file tree
Hide file tree
Showing 4 changed files with 57 additions and 10 deletions.
2 changes: 1 addition & 1 deletion pom.xml
View file
@@ -1,7 +1,7 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>org.atdl4j</groupId>
<version>1.0-beta-3-SNAPSHOT</version>
<version>1.0-beta-4-SNAPSHOT</version>
<artifactId>atdl4j-ui</artifactId>
<packaging>jar</packaging>
<name>atdl4j-ui</name>
Expand Down
4 changes: 4 additions & 0 deletions src/main/java/org/atdl4j/ui/StrategyUI.java
View file
Expand Up @@ -3,8 +3,10 @@
import java.util.Map;

import org.atdl4j.config.Atdl4jOptions;
import org.atdl4j.config.InputAndFilterData;
import org.atdl4j.data.StrategyRuleset;
import org.atdl4j.data.ValidationRule;
import org.atdl4j.data.exception.Atdl4jClassLoadException;
import org.atdl4j.data.exception.FIXatdlFormatException;
import org.atdl4j.data.exception.ValidationException;
import org.atdl4j.data.fix.FIXMessageBuilder;
Expand Down Expand Up @@ -47,6 +49,8 @@ public interface StrategyUI
public StrategyRuleset getStrategyRuleset();
public Map<String, ValidationRule> getCompleteValidationRuleMap();

public void reloadHiddenFieldsForInputAndFilterData( InputAndFilterData aInputAndFilterData );

public void reinitStrategyPanel();

public void relayoutCollapsibleStrategyPanels();
Expand Down
3 changes: 2 additions & 1 deletion src/main/java/org/atdl4j/ui/impl/AbstractStrategyUI.java
View file
Expand Up @@ -16,6 +16,7 @@
import org.atdl4j.data.StrategyRuleset;
import org.atdl4j.data.TypeConverterFactoryConfig;
import org.atdl4j.data.ValidationRule;
import org.atdl4j.data.exception.Atdl4jClassLoadException;
import org.atdl4j.data.exception.FIXatdlFormatException;
import org.atdl4j.data.exception.ValidationException;
import org.atdl4j.data.fix.FIXMessageBuilder;
Expand Down Expand Up @@ -536,7 +537,7 @@ protected void clearHiddenFieldsForInputAndFilterData()
}
}

protected void reloadHiddenFieldsForInputAndFilterData( InputAndFilterData aInputAndFilterData )
public void reloadHiddenFieldsForInputAndFilterData( InputAndFilterData aInputAndFilterData )
{
clearHiddenFieldsForInputAndFilterData();
addHiddenFieldsForInputAndFilterData( aInputAndFilterData );
Expand Down
58 changes: 50 additions & 8 deletions src/main/java/org/atdl4j/ui/swing/app/impl/SwingAtdl4jInputAndFilterDataPanel.java
View file
Expand Up @@ -4,7 +4,7 @@
import java.awt.GridLayout;

import javax.swing.BorderFactory;
import javax.swing.JButton;
import javax.swing.JCheckBox;
import javax.swing.JComboBox;
import javax.swing.JDialog;
import javax.swing.JLabel;
Expand Down Expand Up @@ -36,6 +36,7 @@ public class SwingAtdl4jInputAndFilterDataPanel
private JComboBox<String> fixFieldExecCombo;
private JComboBox<String> fixFieldTimeInForceCombo;
private JComboBox<String> fixFieldClOrdLinkIDCombo;
private JCheckBox checkboxInputCxlReplaceMode;


/* (non-Javadoc)
Expand Down Expand Up @@ -64,7 +65,7 @@ protected JPanel buildCoreAtdl4jSettingsPanel(JDialog aParentOrShell)
{
JPanel tempPanel = new JPanel();

// tempPanel.add(buildStrategyFilterPanel());
tempPanel.add(buildStrategyFilterPanel());
tempPanel.add(buildStandardFixFieldsPanel());

aParentOrShell.add(tempPanel);
Expand All @@ -77,11 +78,8 @@ protected JPanel buildStrategyFilterPanel()
JPanel strategyFilterPanel = new JPanel(new BorderLayout());
strategyFilterPanel.setBorder(BorderFactory.createTitledBorder( STRATEGY_FILTER_PANEL_NAME ));

strategyFilterPanel.add(new JButton("Button"), BorderLayout.CENTER);
strategyFilterPanel.add(new JButton("Button"), BorderLayout.CENTER);
strategyFilterPanel.add(new JButton("Button"), BorderLayout.CENTER);
strategyFilterPanel.add(new JButton("Button"), BorderLayout.CENTER);

checkboxInputCxlReplaceMode = new JCheckBox("Cxl Replace Mode");
strategyFilterPanel.add(checkboxInputCxlReplaceMode, BorderLayout.CENTER);

return strategyFilterPanel;
}
Expand Down Expand Up @@ -154,6 +152,8 @@ public boolean extractAtdl4jOptionsFromScreen()
// -- Set the StrategyFilterInputData we just built --
getAtdl4jOptions().getInputAndFilterData().setStrategyFilterInputData( tempStrategyFilterInputData );

getAtdl4jOptions().getInputAndFilterData().setInputCxlReplaceMode(checkboxInputCxlReplaceMode.isSelected());

addFixFieldToInputAndFilterData( FIX_FIELD_NAME_ORD_TYPE, fixFieldOrdTypeCombo );
addFixFieldToInputAndFilterData( FIX_FIELD_NAME_SIDE, fixFieldSideCombo );
addFixFieldToInputAndFilterData( FIX_FIELD_NAME_ORDER_QTY, fixFieldOrderQtyCombo );
Expand All @@ -172,7 +172,37 @@ public boolean extractAtdl4jOptionsFromScreen()
@Override
public boolean loadScreenWithAtdl4jOptions()
{
return false;

if ( getAtdl4jOptions().getInputAndFilterData() != null )
{
setCheckboxValue( checkboxInputCxlReplaceMode, getAtdl4jOptions().getInputAndFilterData().getInputCxlReplaceMode(), Boolean.FALSE );

selectDropDownItem( fixFieldOrdTypeCombo, getAtdl4jOptions().getInputAndFilterData().getInputHiddenFieldValue( FIX_FIELD_NAME_ORD_TYPE ) );
selectDropDownItem( fixFieldSideCombo, getAtdl4jOptions().getInputAndFilterData().getInputHiddenFieldValue( FIX_FIELD_NAME_SIDE ) );
selectDropDownItem( fixFieldOrderQtyCombo, getAtdl4jOptions().getInputAndFilterData().getInputHiddenFieldValue( FIX_FIELD_NAME_ORDER_QTY ) );
selectDropDownItem( fixFieldPriceCombo, getAtdl4jOptions().getInputAndFilterData().getInputHiddenFieldValue( FIX_FIELD_NAME_PRICE ) );
selectDropDownItem( fixFieldHandlInstCombo, getAtdl4jOptions().getInputAndFilterData().getInputHiddenFieldValue( FIX_FIELD_NAME_HANDL_INST ) );
selectDropDownItem( fixFieldExecCombo, getAtdl4jOptions().getInputAndFilterData().getInputHiddenFieldValue( FIX_FIELD_NAME_EXEC_INST ) );
selectDropDownItem( fixFieldTimeInForceCombo, getAtdl4jOptions().getInputAndFilterData().getInputHiddenFieldValue( FIX_FIELD_NAME_TIME_IN_FORCE ) );
selectDropDownItem( fixFieldClOrdLinkIDCombo, getAtdl4jOptions().getInputAndFilterData().getInputHiddenFieldValue( FIX_FIELD_NAME_CL_ORD_LINK_ID ) );
return true;
}
else
{
return false;
}
}

public static void setCheckboxValue( JCheckBox aCheckbox, Boolean aValue, boolean aStateIfNull )
{
if ( aValue == null )
{
aCheckbox.setSelected(aStateIfNull);
}
else
{
aCheckbox.setSelected(aValue);
}
}

public static String getDropDownItemSelected( JComboBox<String> aDropDown )
Expand All @@ -188,6 +218,18 @@ public static String getDropDownItemSelected( JComboBox<String> aDropDown )
}
}

public static void selectDropDownItem( JComboBox<String> aDropDown, String aItem )
{
if ( aItem != null )
{
aDropDown.setSelectedItem(aItem);
}
else
{
aDropDown.setSelectedIndex(-1);
}
}

protected void addFixFieldToInputAndFilterData( String aFieldName, JComboBox<String> aDropDown )
{
String tempFieldValue = getDropDownItemSelected( aDropDown );
Expand Down

0 comments on commit 1befed2

Please sign in to comment.