CompRes Charts SI-Ratio:added textfield with seasonal filters

Options: tooltip grammar fix

Author: JanGerhardt

JD_ConCur/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <groupId>de.bundesbank</groupId>
         <artifactId>concur-parent</artifactId>
-        <version>1.3.1</version>
+        <version>1.3.2</version>
     </parent>
 
 

JD_ConCur/src/main/java/de/bbk/concur/BBKOutputViewFactory.java

@@ -20,7 +20,6 @@
  */
 package de.bbk.concur;
 
-import de.bbk.concur.util.SIViewSaved;
 import de.bbk.concur.util.SavedTables;
 import de.bbk.concur.view.*;
 import ec.satoolkit.x13.X13Specification;
@@ -164,9 +163,9 @@ public ChartSIRatioFactory() {
                 public X13Document retrieve(X13Document source) {
                     return source;
                 }
-            }, new PooledItemUI<View, X13Document, SIViewSaved>(SIViewSaved.class) {
+            }, new PooledItemUI<View, X13Document, SIRatioView>(SIRatioView.class) {
                 @Override
-                protected void init(SIViewSaved c, View host, X13Document information) {
+                protected void init(SIRatioView c, View host, X13Document information) {
                     c.setDoc(information);
                 }
             });

JD_ConCur/src/main/java/de/bbk/concur/html/HtmlCCA.java

@@ -29,7 +29,9 @@
 import ec.tstoolkit.algorithm.IProcSpecification;
 import ec.tstoolkit.modelling.arima.x13.RegArimaSpecification;
 import java.io.IOException;
+import java.io.StringWriter;
 import java.util.Arrays;
+import org.openide.util.Exceptions;
 
 /**
  *
@@ -95,6 +97,21 @@ private void writeTitle(HtmlStream stream) throws IOException {
         }
     }
 
+    public String writeFilters() {
+        StringWriter sbuilder = new StringWriter();
+        HtmlStream stream = new HtmlStream(sbuilder);
+
+        try {
+            stream.open();
+            writeFinalFilters(stream);
+            stream.close();
+        } catch (IOException ex) {
+            Exceptions.printStackTrace(ex);
+        }
+
+        return sbuilder.toString();
+    }
+
     private void writeFinalFilters(HtmlStream stream) throws IOException {
         if (decomposition instanceof X11Results) {
             X11Results x11Results = (X11Results) decomposition;

JD_ConCur/src/main/java/de/bbk/concur/view/SIRatioView.java

@@ -0,0 +1,65 @@
+/*
+ * To change this license header, choose License Headers in Project Properties.
+ * To change this template file, choose Tools | Templates
+ * and open the template in the editor.
+ */
+package de.bbk.concur.view;
+
+import de.bbk.concur.html.HtmlCCA;
+import de.bbk.concur.util.SIViewSaved;
+import ec.nbdemetra.ui.NbComponents;
+import ec.tss.Ts;
+import ec.tss.sa.documents.X13Document;
+import ec.tss.tsproviders.utils.MultiLineNameUtil;
+import ec.ui.interfaces.IDisposable;
+import java.awt.BorderLayout;
+import java.awt.Dimension;
+import javax.swing.JComponent;
+import javax.swing.JLabel;
+import javax.swing.JSplitPane;
+
+/**
+ *
+ * @author s4504gj
+ */
+public class SIRatioView extends JComponent implements IDisposable {
+
+    private final JLabel lblFilters;
+    private static final int WIDTH_SIVIEWS = 450, HEIGHT_SIVIEWS = 250;
+    private final SIViewSaved siViewSavedLast;
+
+    public SIRatioView() {
+        setLayout(new BorderLayout());
+        this.siViewSavedLast = new SIViewSaved(true);
+
+        siViewSavedLast.setSize(new Dimension(WIDTH_SIVIEWS, HEIGHT_SIVIEWS));
+        siViewSavedLast.setPreferredSize(new Dimension(WIDTH_SIVIEWS, HEIGHT_SIVIEWS));
+
+        lblFilters = new JLabel("", JLabel.LEFT);
+        lblFilters.setMinimumSize(new Dimension(0, 40));
+        JSplitPane filterSplit = NbComponents.newJSplitPane(JSplitPane.VERTICAL_SPLIT, lblFilters, siViewSavedLast);
+        filterSplit.setDividerLocation(60);
+
+        filterSplit.setOneTouchExpandable(true);
+        filterSplit.setDividerSize(10);
+        filterSplit.setDividerLocation(60);
+        filterSplit.setResizeWeight(.5);
+
+        add(filterSplit, BorderLayout.CENTER);
+    }
+
+    public void setDoc(X13Document doc) {
+        if (doc == null || doc.getResults() == null) {
+            return;
+        }
+        HtmlCCA ccaFilters = new HtmlCCA(MultiLineNameUtil.join(((Ts) doc.getInput()).getName()), doc);
+        lblFilters.setText(ccaFilters.writeFilters());
+        siViewSavedLast.setDoc(doc);
+    }
+
+    @Override
+    public void dispose() {
+        siViewSavedLast.dispose();
+    }
+
+}

JD_ConCur/src/main/resources/de/bbk/concur/options/Bundle.properties

@@ -1,7 +1,7 @@
 DatasourceUpdateOptionsPanel.checkBoxDefaultDataSource.text=use default data source (WS) for update
 DatasourceUpdateOptionsPanel.jPanel1.border.title=Recommendations: Special Cases
 DatasourceUpdateOptionsPanel.jPanel2.border.title=Data Source
-DatasourceUpdateOptionsPanel.checkBoxMissingCF.toolTipText=Consider a SA model without calendar factors if no saved calendar factors are provided.
+DatasourceUpdateOptionsPanel.checkBoxMissingCF.toolTipText=Consider an SA model without calendar factors if no saved calendar factors are provided.
 DatasourceUpdateOptionsPanel.checkBoxMissingCF.text=Missing CF: SA = Y \u2218 SF
 DatasourceUpdateOptionsPanel.checkBoxConstantSF.toolTipText=Always recommend "Keep" if saved seasonal factors are constant.
 DatasourceUpdateOptionsPanel.checkBoxConstantSF.text=SF constant: Keep

JD_ConCurReport/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <groupId>de.bundesbank</groupId>
         <artifactId>concur-parent</artifactId>
-        <version>1.3.1</version>
+        <version>1.3.2</version>
     </parent>
 
     <groupId>de.bbk</groupId>

pom.xml

@@ -4,7 +4,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>de.bundesbank</groupId>
     <artifactId>concur-parent</artifactId>
-    <version>1.3.1</version>
+    <version>1.3.2</version>
     <packaging>pom</packaging>
     <name>CompRes - Parent</name>