Planned/6.1.0 (#33)

merge planned/6.1.0 into master

Author: NinjaManatee

README.md

@@ -11,19 +11,22 @@ You can build the JAR files and the launch4j executable file using the `mvn pack
 **Note:** The executable generated by launch4j is experimental and may not work correctly. Reach out to <a href="mailto:[email protected]">[email protected]</a> to receive Client Success support if you encounter difficulties.
 
 ## Examples provided
+
 - JavaExample - Example JavaFX application
 - JavaSwingExample - Example Java Swing application
 - JavaHeadlessExample - Example of a window-less Java application
 - AuthenticationExample - Example component that performs authentication from within Java
 - MultiWindow - JavaSwingExample - Same as JavaSwingExample but running in multi-window (several windows running under the same
   process)
 - MultiWindow - AuthenticationExample - Same as AuthenticationExample but running in multi-window (several windows running under the same
-      process) 
+  process)
 - InteropServiceExample - Example of JavaFX FDC3 Desktop Agent client
 
-## Configuring the Java examples 
+## Configuring the Java examples
+
 Copy the _java-example.json_ included in the project to _src/components/java-example/java-example.json_. Update the application manifest to include:
-``` JSON
+
+```JSON
     "finsemble": {
         ...,
         "custom": {
@@ -37,11 +40,10 @@ Copy the _java-example.json_ included in the project to _src/components/java-exa
 ```
 
 **NOTE:**
-- The _java-example.json_ file includes two copies of the JavaFX example: 
+
+- The _java-example.json_ file includes two copies of the JavaFX example:
   - Java Example (local)
-  - Java Example (asset). 
+  - Java Example (asset).
 
 The "local" component uses `javaExampleRoot` to specify the path to the JAR file on the local system. The "asset" component uses the `appAsset` to download and run the application - Please refer to our tutorial
 on [integrating native applications](https://documentation.finsemble.com/tutorial-integratingNativeApplications.html) for more details.
-
-

pom.xml

@@ -6,7 +6,7 @@
 
     <groupId>ChartIQ</groupId>
     <artifactId>finesmble-java-example</artifactId>
-    <version>6.2.0-SNAPSHOT</version>
+    <version>6.1.0</version>
 
     <repositories>
         <repository>
@@ -26,7 +26,7 @@
         <dependency>
             <groupId>com.chartiq.finsemble</groupId>
             <artifactId>finsemble</artifactId>
-            <version>6.2.0</version>
+            <version>6.1.0</version>
         </dependency>
         <dependency>
             <groupId>it.sauronsoftware</groupId>

src/main/java/com/chartiq/finsemble/example/JavaSwingExample.java

@@ -7,6 +7,7 @@
 import com.chartiq.finsemble.Finsemble;
 import com.chartiq.finsemble.interfaces.ConnectionEventGenerator;
 import com.chartiq.finsemble.interfaces.ConnectionListener;
+import org.json.JSONArray;
 import org.json.JSONObject;
 
 import javax.swing.*;
@@ -19,6 +20,7 @@
 import java.io.*;
 import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.HashMap;
 import java.util.List;
 import java.util.logging.*;
 import java.util.stream.Collectors;
@@ -46,6 +48,8 @@ public class JavaSwingExample extends JFrame implements WindowListener {
     private JButton group5Button;
     private JButton group6Button;
 
+    private HashMap<String, JButton> linkerButtons = new HashMap<>();
+
     private Finsemble fsbl;
 
     /**
@@ -89,82 +93,88 @@ private void createForm() {
         contentPane = getContentPane();
         contentPane.setLayout(new GridBagLayout());
         final GridBagConstraints constraints = new GridBagConstraints();
-        constraints.insets= new Insets(10,10,0,10);
+        constraints.insets = new Insets(10, 10, 0, 10);
 
         // region Linker buttons
         group1Button = new JButton();
-        group1Button.setBackground(new Color(135,129,189));
-        group1Button.setForeground(new Color(187,187,187));
+        group1Button.setBackground(new Color(135, 129, 189));
+        group1Button.setForeground(new Color(187, 187, 187));
         group1Button.setName("group1");
-        constraints.insets= new Insets(10,10,0,0);
+        constraints.insets = new Insets(10, 10, 0, 0);
         constraints.ipady = 40;
         constraints.weightx = 0.5;
         constraints.fill = GridBagConstraints.HORIZONTAL;
         constraints.gridx = 0;
         constraints.gridy = 0;
         contentPane.add(group1Button, constraints);
+        linkerButtons.put("group1", group1Button);
 
         group2Button = new JButton();
-        group2Button.setBackground(new Color(255,224,53));
-        group2Button.setForeground(new Color(187,187,187));
+        group2Button.setBackground(new Color(255, 224, 53));
+        group2Button.setForeground(new Color(187, 187, 187));
         group2Button.setName("group2");
-        constraints.insets= new Insets(10,0,0,0);
+        constraints.insets = new Insets(10, 0, 0, 0);
         constraints.weightx = 0.5;
         constraints.fill = GridBagConstraints.HORIZONTAL;
         constraints.gridx = 1;
         constraints.gridy = 0;
         contentPane.add(group2Button, constraints);
+        linkerButtons.put("group2", group2Button);
 
         group3Button = new JButton();
-        group3Button.setBackground(new Color(137,216,3));
-        group3Button.setForeground(new Color(187,187,187));
+        group3Button.setBackground(new Color(137, 216, 3));
+        group3Button.setForeground(new Color(187, 187, 187));
         group3Button.setName("group3");
-        constraints.insets= new Insets(10,0,0,0);
+        constraints.insets = new Insets(10, 0, 0, 0);
         constraints.weightx = 0.5;
         constraints.fill = GridBagConstraints.HORIZONTAL;
         constraints.gridx = 2;
         constraints.gridy = 0;
         contentPane.add(group3Button, constraints);
+        linkerButtons.put("group3", group3Button);
 
         group4Button = new JButton();
-        group4Button.setBackground(new Color(254,98,98));
-        group4Button.setForeground(new Color(187,187,187));
+        group4Button.setBackground(new Color(254, 98, 98));
+        group4Button.setForeground(new Color(187, 187, 187));
         group4Button.setName("group4");
-        constraints.insets= new Insets(10,0,0,0);
+        constraints.insets = new Insets(10, 0, 0, 0);
         constraints.weightx = 0.5;
         constraints.fill = GridBagConstraints.HORIZONTAL;
         constraints.gridx = 3;
         constraints.gridy = 0;
         contentPane.add(group4Button, constraints);
+        linkerButtons.put("group4", group4Button);
 
         group5Button = new JButton();
-        group5Button.setBackground(new Color(45,172,255));
-        group5Button.setForeground(new Color(187,187,187));
+        group5Button.setBackground(new Color(45, 172, 255));
+        group5Button.setForeground(new Color(187, 187, 187));
         group5Button.setName("group5");
-        constraints.insets= new Insets(10,0,0,0);
+        constraints.insets = new Insets(10, 0, 0, 0);
         constraints.weightx = 0.5;
         constraints.fill = GridBagConstraints.HORIZONTAL;
         constraints.gridx = 4;
         constraints.gridy = 0;
         contentPane.add(group5Button, constraints);
+        linkerButtons.put("group5", group5Button);
 
         group6Button = new JButton();
-        group6Button.setBackground(new Color(255,162,0));
-        group6Button.setForeground(new Color(187,187,187));
+        group6Button.setBackground(new Color(255, 162, 0));
+        group6Button.setForeground(new Color(187, 187, 187));
         group6Button.setName("group6");
-        constraints.insets= new Insets(10,0,0,10);
+        constraints.insets = new Insets(10, 0, 0, 10);
         constraints.weightx = 0.5;
         constraints.fill = GridBagConstraints.HORIZONTAL;
         constraints.gridx = 5;
         constraints.gridy = 0;
         contentPane.add(group6Button, constraints);
+        linkerButtons.put("group6", group6Button);
         // endregion
 
         // region Symbol
         symbolTextField = new JTextField("MSFT");
         symbolTextField.setEditable(true);
         symbolTextField.setEnabled(false);
-        constraints.insets= new Insets(10,10,0,10);
+        constraints.insets = new Insets(10, 10, 0, 10);
         constraints.fill = GridBagConstraints.HORIZONTAL;
         constraints.ipady = 10;
         constraints.gridx = 0;
@@ -219,7 +229,7 @@ private void createForm() {
 
         messages = new JTextArea();
         messages.setVisible(false);
-        constraints.insets= new Insets(10,10,10,10);
+        constraints.insets = new Insets(10, 10, 10, 10);
         constraints.fill = GridBagConstraints.BOTH;
         constraints.weighty = 1;
         constraints.gridx = 0;
@@ -331,6 +341,55 @@ private void initForm() {
         group4Button.addActionListener(this::toggleLinker);
         group5Button.addActionListener(this::toggleLinker);
         group6Button.addActionListener(this::toggleLinker);
+
+        //GetComponentState
+        final JSONArray componentStateFields = new JSONArray() {{
+            put("Finsemble_Linker");
+            put("symbol");
+        }};
+        final JSONObject getComponentStateParam = new JSONObject() {{
+            put("fields", componentStateFields);
+        }};
+        fsbl.getClients().getWindowClient().getComponentState(getComponentStateParam, this::handleGetComponentStateCb);
+    }
+
+    private void handleGetComponentStateCb(JSONObject err, JSONObject res) {
+        if (err != null) {
+            LOGGER.log(Level.SEVERE, "Error in handleGetComponentStateCb", err);
+        } else {
+            //Set subscribe linker channel
+            if (res.has("Finsemble_Linker")) {
+                final JSONArray channelToLink = res.getJSONArray("Finsemble_Linker");
+                final JSONObject windowIdentifier = fsbl.getClients().getWindowClient().getWindowIdentifier();
+                for (int i = 0; i < channelToLink.length(); i++) {
+                    try {
+                        String currentChannel = channelToLink.getString(i);
+                        JButton lkrBtn = linkerButtons.get(currentChannel);
+                        fsbl.getClients().getLinkerClient().linkToChannel(currentChannel, windowIdentifier, (error, response) -> {
+                            if (error != null) {
+                                LOGGER.log(Level.SEVERE, String.format("Error linking to channel: %s", currentChannel), err);
+                            } else {
+                                LOGGER.info((String.format("Linked to channel: %s", currentChannel)));
+                            }
+                        });
+                        lkrBtn.setText("X");
+                        lkrBtn.updateUI();
+                    } catch (Exception ex) {
+                        String errorMsg = String.format("Error linking channel %s to group", channelToLink);
+                        LOGGER.log(Level.SEVERE, errorMsg, ex.getMessage());
+                        fsbl.getClients().getLoggerClient().system().error(errorMsg + " cause: " + ex.getMessage());
+                    }
+                }
+            }
+
+            //Set symbol value
+            if (res.has("symbol")) {
+                final String symbol = res.getString("symbol");
+                if (!symbol.equals("")) {
+                    symbolLabel.setText(symbol);
+                }
+            }
+        }
     }
 
     private void handleSymbol(JSONObject err, JSONObject res) {

src/main/java/com/chartiq/finsemble/example/fdc3/InteropServiceExample.java

@@ -420,6 +420,10 @@ public void onWindowStateReady(ConnectionEventGenerator from) {
                     appendMessage("Window window state: READY");
                     try {
                         appendMessage("Registering with InteropService...");
+                        // Added this to allow for Finsemble to send the correct active descriptors.
+                        // Seems that we have a bug that the onReady event gets fired before the
+                        // activeDescriptors object gets updated
+                        Thread.sleep(200);
                         registerWithInteropService();
                     } catch (Exception e) {
                         e.printStackTrace();

src/main/java/com/chartiq/finsemble/example/fdc3/InteropServiceExampleApplication.java

@@ -95,7 +95,7 @@ public void start(Stage primaryStage) {
             final VBox anchorPane = loader.load();
             LOGGER.info("Parent loaded from resource");
             primaryStage.setTitle("InteropServiceExampleApplication");
-            primaryStage.setResizable(false);
+            primaryStage.setResizable(true);
             final Scene scene = new Scene(anchorPane, 265, 400);
 
             LOGGER.info("Scene created");

src/main/resources/com/chartiq/finsemble/example/InteropService.fxml

@@ -13,8 +13,11 @@
 <?import javafx.scene.shape.Circle?>
 <?import javafx.scene.text.Font?>
 
+<?import javafx.scene.control.ScrollPane?>
 <VBox maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="800.0" prefWidth="1280.0" xmlns="http://javafx.com/javafx/8.0.171" xmlns:fx="http://javafx.com/fxml/1" fx:controller="com.chartiq.finsemble.example.fdc3.InteropServiceExample">
    <children>
+      <ScrollPane xmlns="http://javafx.com/javafx/8.0.171" xmlns:fx="http://javafx.com/fxml/1">
+      <content>
       <SplitPane dividerPositions="0.6" prefHeight="803.0" prefWidth="1280.0">
         <items>
           <AnchorPane fx:id="controlsPanel" minHeight="0.0" minWidth="0.0" prefHeight="798.0" prefWidth="454.0" style="-fx-background-color: #22262f;">
@@ -163,5 +166,7 @@
             </AnchorPane>
         </items>
       </SplitPane>
+      </content>
+      </ScrollPane>
    </children>
 </VBox>