Skip to content

Commit

Permalink
Merge pull request #1133 from Marketcetera/MATP-1133
Browse files Browse the repository at this point in the history 
MATP-1133 Can't view FIX messages in FIX Message Detail View
  • Loading branch information
@colinduplantis
colinduplantis committed Mar 31, 2023
2 parents 3b5382c + d70eb35 commit 067e50a
Show file tree
Hide file tree
Showing 3 changed files with 36 additions and 36 deletions.
55 changes: 26 additions & 29 deletions photon/src/main/java/org/marketcetera/ui/service/WindowManagerService.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -120,8 +120,9 @@ public void onLogin(LoginEvent inEvent)
public void onNewWindow(NewWindowEvent inEvent)
{
SLF4JLoggerProxy.debug(this,
"onWindow: {}",
inEvent.getWindowTitle());
"onWindow: {} {}",
inEvent.getWindowTitle(),
inEvent.getProperties());
// create the new window content - initially, the properties will be mostly or completely empty, one would expect
// the content view factory will be used to create the new window content
ContentViewFactory viewFactory = applicationContext.getBean(inEvent.getViewFactoryType());
Expand Down Expand Up @@ -427,7 +428,7 @@ private WindowLayout(NewWindowEvent inEvent,
{
newWindowEventProperty.set(inEvent);
viewFactoryProperty.set(inViewFactory);
properties = inEvent.getProperties();
windowProperties = inEvent.getProperties();
uuidProperty.set(UUID.randomUUID().toString());
setWindowStaticProperties();
windowLayout = new VBox();
Expand Down Expand Up @@ -500,41 +501,41 @@ public void onResize(Node inNode,
// windowLayout.setPickOnBounds(false);
setupWindowListeners();
Pair<Double,Double> suggestedWindowSize = inEvent.getWindowSize();
String rawProperty = StringUtils.trimToNull(properties.getProperty(windowWidthProp));
String rawProperty = StringUtils.trimToNull(windowProperties.getProperty(windowWidthProp));
if(rawProperty == null) {
setWidth(suggestedWindowSize.getFirstMember());
} else {
setWidth(Double.parseDouble(rawProperty));
}
rawProperty = StringUtils.trimToNull(properties.getProperty(windowHeightProp));
rawProperty = StringUtils.trimToNull(windowProperties.getProperty(windowHeightProp));
if(rawProperty == null) {
setHeight(suggestedWindowSize.getSecondMember());
} else {
setHeight(Double.parseDouble(rawProperty));
}
rawProperty = StringUtils.trimToNull(properties.getProperty(windowPosXProp));
rawProperty = StringUtils.trimToNull(windowProperties.getProperty(windowPosXProp));
if(rawProperty == null) {
setX(200);
} else {
setX(Double.parseDouble(rawProperty));
}
rawProperty = StringUtils.trimToNull(properties.getProperty(windowPosYProp));
rawProperty = StringUtils.trimToNull(windowProperties.getProperty(windowPosYProp));
if(rawProperty == null) {
setY(200);
} else {
setY(Double.parseDouble(rawProperty));
}
rawProperty = StringUtils.trimToNull(properties.getProperty(windowTitleProp));
rawProperty = StringUtils.trimToNull(windowProperties.getProperty(windowTitleProp));
if(rawProperty == null) {
setTitle(inEvent.getWindowTitle());
} else {
setTitle(rawProperty);
}
rawProperty = StringUtils.trimToNull(properties.getProperty(windowHorizontalScrollProp));
rawProperty = StringUtils.trimToNull(windowProperties.getProperty(windowHorizontalScrollProp));
if(rawProperty != null) {
setHorizontalScroll(Double.parseDouble(rawProperty));
}
rawProperty = StringUtils.trimToNull(properties.getProperty(windowVerticalScrollProp));
rawProperty = StringUtils.trimToNull(windowProperties.getProperty(windowVerticalScrollProp));
if(rawProperty != null) {
setVerticalScroll(Double.parseDouble(rawProperty));
}
Expand All @@ -558,49 +559,49 @@ private void setupWindowListeners()
windowLayout.viewOrderProperty().set(-1.0);
});
xProperty.addListener((observableValue,oldValue,newValue) -> {
properties.setProperty(windowPosXProp,
windowProperties.setProperty(windowPosXProp,
String.valueOf(newValue));
});
yProperty.addListener((observableValue,oldValue,newValue) -> {
properties.setProperty(windowPosYProp,
windowProperties.setProperty(windowPosYProp,
String.valueOf(newValue));
});
heightProperty.addListener((observableValue,oldValue,newValue) -> {
properties.setProperty(windowHeightProp,
windowProperties.setProperty(windowHeightProp,
String.valueOf(newValue));
});
widthProperty.addListener((observableValue,oldValue,newValue) -> {
properties.setProperty(windowWidthProp,
windowProperties.setProperty(windowWidthProp,
String.valueOf(newValue));
});
windowTitleProperty.addListener((observableValue,oldValue,newValue) -> {
if(newValue == null) {
properties.remove(windowTitleProp);
windowProperties.remove(windowTitleProp);
} else {
properties.setProperty(windowTitleProp,
windowProperties.setProperty(windowTitleProp,
getTitle());
}
});
draggableProperty.addListener((observableValue,oldValue,newValue) -> {
properties.setProperty(windowDraggableProp,
windowProperties.setProperty(windowDraggableProp,
String.valueOf(newValue));
});
resizableProperty.addListener((observableValue,oldValue,newValue) -> {
properties.setProperty(windowResizableProp,
windowProperties.setProperty(windowResizableProp,
String.valueOf(newValue));
});
scrollVerticalProperty.addListener((observableValue,oldValue,newValue) -> {
properties.setProperty(windowVerticalScrollProp,
windowProperties.setProperty(windowVerticalScrollProp,
String.valueOf(newValue));
getCurrentUserRegistry().updateDisplayLayout();
});
scrollHorizontalProperty.addListener((observableValue,oldValue,newValue) -> {
properties.setProperty(windowHorizontalScrollProp,
windowProperties.setProperty(windowHorizontalScrollProp,
String.valueOf(newValue));
getCurrentUserRegistry().updateDisplayLayout();
});
viewOrderProperty.addListener((observableValue,oldValue,newValue) -> {
properties.setProperty(windowViewOrderProp,
windowProperties.setProperty(windowViewOrderProp,
String.valueOf(newValue));
});
// TODO
Expand Down Expand Up @@ -897,16 +898,16 @@ private String getUuid()
*/
private String getStorableValue()
{
return Util.propertiesToString(properties);
return Util.propertiesToString(windowProperties);
}
/**
* Set the immutable properties of this window to the underlying properties storage.
*/
private void setWindowStaticProperties()
{
properties.setProperty(windowContentViewFactoryProp,
windowProperties.setProperty(windowContentViewFactoryProp,
viewFactoryProperty.get().getClass().getCanonicalName());
properties.setProperty(windowUuidProp,
windowProperties.setProperty(windowUuidProp,
uuidProperty.get());
}
/**
Expand All @@ -928,7 +929,7 @@ private void setWindowStaticProperties()
/**
* properties used to record details about this window
*/
private final Properties properties;
private final Properties windowProperties;
/**
* holds the window content view factory value
*/
Expand Down Expand Up @@ -973,10 +974,6 @@ private void setWindowStaticProperties()
* holds the window modality property
*/
private final ObjectProperty<Modality> modalityProperty = new SimpleObjectProperty<>();
/**
* holds all the window's properties
*/
private final Properties windowProperties = new Properties();
/**
* holds the window title property
*/
Expand Down
14 changes: 8 additions & 6 deletions ...src/main/java/org/marketcetera/ui/trade/fixmessagedetails/view/FixMessageDetailsView.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -141,6 +141,9 @@ private void initializeTable()
fixMessageTable = new TableView<>();
initializeColumns();
fixMessageTable.setPlaceholder(new Label("no fields to display"));
fixMessageTable.prefWidthProperty().bind(getParentWindow().widthProperty());
fixMessageTable.setColumnResizePolicy(TableView.CONSTRAINED_RESIZE_POLICY);
mainLayout.prefHeightProperty().bind(getParentWindow().heightProperty());
}
/**
* Initialize the table columns
Expand Down Expand Up @@ -171,8 +174,7 @@ private void initializeColumns()
* @version $Id$
* @since $Release$
*/
@SuppressWarnings("unused")
private static class DisplayFixMessageValue
public static class DisplayFixMessageValue
{
/* (non-Javadoc)
* @see java.lang.Object#toString()
Expand Down Expand Up @@ -208,7 +210,7 @@ private DisplayFixMessageValue(int inTag,
*
* @return a <code>ReadOnlyIntegerProperty</code> value
*/
private ReadOnlyIntegerProperty tagProperty()
public ReadOnlyIntegerProperty tagProperty()
{
return tagProperty;
}
Expand All @@ -217,7 +219,7 @@ private ReadOnlyIntegerProperty tagProperty()
*
* @return a <code>ReadOnlyStringProperty</code> value
*/
private ReadOnlyStringProperty nameProperty()
public ReadOnlyStringProperty nameProperty()
{
return nameProperty;
}
Expand All @@ -226,7 +228,7 @@ private ReadOnlyStringProperty nameProperty()
*
* @return a <code>ReadOnlyStringProperty</code> value
*/
private ReadOnlyStringProperty typeProperty()
public ReadOnlyStringProperty typeProperty()
{
return typeProperty;
}
Expand All @@ -235,7 +237,7 @@ private ReadOnlyStringProperty typeProperty()
*
* @return a <code>ReadOnlyStringProperty</code> value
*/
private ReadOnlyStringProperty valueProperty()
public ReadOnlyStringProperty valueProperty()
{
return valueProperty;
}
Expand Down
3 changes: 2 additions & 1 deletion photon/src/main/java/org/marketcetera/ui/view/ApplicationMenu.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -151,7 +151,8 @@ private void initMenu()
MenuItem newChildItem = new MenuItem();
newChildItem.setText(childItem.getMenuCaption());
if(childItem.getMenuIcon() != null) {
newChildItem.setGraphic(PhotonServices.getSvgResource(childItem.getMenuIcon()));
newChildItem.setGraphic(PhotonServices.getSvgResource(childItem.getMenuIcon(),
0.75));
}
newChildItem.setOnAction(e -> childItem.getCommand().run());
parent.getItems().add(newChildItem);
Expand Down

0 comments on commit 067e50a

Please sign in to comment.