You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hop.apache.org by ha...@apache.org on 2021/01/27 11:15:34 UTC
[incubator-hop] branch master updated: HOP-2460 : XML Output still
uses file system dialog HOP-2461 : XML Input Stream still uses file system
dialog HOP-2462 : Get Data from XML still uses file system dialog
This is an automated email from the ASF dual-hosted git repository.
hansva pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-hop.git
The following commit(s) were added to refs/heads/master by this push:
new cd77f8d HOP-2460 : XML Output still uses file system dialog HOP-2461 : XML Input Stream still uses file system dialog HOP-2462 : Get Data from XML still uses file system dialog
new 28c660f Merge pull request #583 from sramazzina/master
cd77f8d is described below
commit cd77f8d8626936c9d48384649f4a9608001be365
Author: sergio.ramazzina <se...@serasoft.it>
AuthorDate: Wed Jan 27 10:47:16 2021 +0100
HOP-2460 : XML Output still uses file system dialog
HOP-2461 : XML Input Stream still uses file system dialog
HOP-2462 : Get Data from XML still uses file system dialog
---
.../xml/getxmldata/GetXmlDataDialog.java | 48 ++++------------------
.../xml/xmlinputstream/XmlInputStreamDialog.java | 32 ++++-----------
.../transforms/xml/xmloutput/XmlOutputDialog.java | 25 ++++-------
3 files changed, 24 insertions(+), 81 deletions(-)
diff --git a/plugins/transforms/xml/src/main/java/org/apache/hop/pipeline/transforms/xml/getxmldata/GetXmlDataDialog.java b/plugins/transforms/xml/src/main/java/org/apache/hop/pipeline/transforms/xml/getxmldata/GetXmlDataDialog.java
index 191013a..6acc45d 100644
--- a/plugins/transforms/xml/src/main/java/org/apache/hop/pipeline/transforms/xml/getxmldata/GetXmlDataDialog.java
+++ b/plugins/transforms/xml/src/main/java/org/apache/hop/pipeline/transforms/xml/getxmldata/GetXmlDataDialog.java
@@ -35,12 +35,7 @@ import org.apache.hop.pipeline.PipelineMeta;
import org.apache.hop.pipeline.PipelinePreviewFactory;
import org.apache.hop.pipeline.transform.BaseTransformMeta;
import org.apache.hop.pipeline.transform.ITransformDialog;
-import org.apache.hop.ui.core.dialog.EnterNumberDialog;
-import org.apache.hop.ui.core.dialog.EnterSelectionDialog;
-import org.apache.hop.ui.core.dialog.EnterStringDialog;
-import org.apache.hop.ui.core.dialog.EnterTextDialog;
-import org.apache.hop.ui.core.dialog.ErrorDialog;
-import org.apache.hop.ui.core.dialog.PreviewRowsDialog;
+import org.apache.hop.ui.core.dialog.*;
import org.apache.hop.ui.core.widget.ColumnInfo;
import org.apache.hop.ui.core.widget.TableView;
import org.apache.hop.ui.core.widget.TextVar;
@@ -1105,42 +1100,13 @@ public class GetXmlDataDialog extends BaseTransformDialog implements ITransformD
// Whenever something changes, set the tooltip to the expanded version of the filename:
wFilename.addModifyListener( e -> wFilename.setToolTipText( wFilename.getText() ) );
- // wbbFilename.addSelectionListener( new SelectionAdapterFileDialogTextVar( log, wFilename, pipelineMeta,
- // new SelectionAdapterOptions( SelectionOperation.FILE_OR_FOLDER,
- // new FilterType[] { FilterType.ALL, FilterType.XML }, FilterType.XML ) ) );
- wbbFilename.addSelectionListener( new SelectionAdapter() {
- public void widgetSelected( SelectionEvent e ) {
- if ( !Utils.isEmpty( wFilemask.getText() ) || !Utils.isEmpty( wExcludeFilemask.getText() ) ) { // A mask: a
- // directory!
- DirectoryDialog dialog = new DirectoryDialog( shell, SWT.OPEN );
- if ( wFilename.getText() != null ) {
- String fpath = variables.resolve( wFilename.getText() );
- dialog.setFilterPath( fpath );
- }
-
- if ( dialog.open() != null ) {
- String str = dialog.getFilterPath();
- wFilename.setText( str );
- }
- } else {
- FileDialog dialog = new FileDialog( shell, SWT.OPEN );
- dialog.setFilterExtensions( new String[] { "*.xml;*.XML", "*" } );
- if ( wFilename.getText() != null ) {
- String fname = variables.resolve( wFilename.getText() );
- dialog.setFileName( fname );
- }
- dialog.setFilterNames( new String[] {
- BaseMessages.getString( PKG, "System.FileType.JsonFiles" ),
- BaseMessages.getString( PKG, "System.FileType.AllFiles" ) } );
-
- if ( dialog.open() != null ) {
- String str = dialog.getFilterPath() + System.getProperty( "file.separator" ) + dialog.getFileName();
- wFilename.setText( str );
- }
- }
- }
- } );
+ wbbFilename.addListener( SWT.Selection, e-> BaseDialog.presentFileDialog( shell, wFilename, variables,
+ new String[] { "*.xml", "*.XML", "*" },
+ new String[] { BaseMessages.getString( PKG, "System.FileType.XMLFiles" ),
+ BaseMessages.getString( PKG, "System.FileType.AllFiles" ) },
+ true )
+ );
// Detect X or ALT-F4 or something that kills this window...
shell.addShellListener( new ShellAdapter() {
diff --git a/plugins/transforms/xml/src/main/java/org/apache/hop/pipeline/transforms/xml/xmlinputstream/XmlInputStreamDialog.java b/plugins/transforms/xml/src/main/java/org/apache/hop/pipeline/transforms/xml/xmlinputstream/XmlInputStreamDialog.java
index 4f365dc..0cae1fc 100644
--- a/plugins/transforms/xml/src/main/java/org/apache/hop/pipeline/transforms/xml/xmlinputstream/XmlInputStreamDialog.java
+++ b/plugins/transforms/xml/src/main/java/org/apache/hop/pipeline/transforms/xml/xmlinputstream/XmlInputStreamDialog.java
@@ -30,10 +30,7 @@ import org.apache.hop.pipeline.PipelineMeta;
import org.apache.hop.pipeline.PipelinePreviewFactory;
import org.apache.hop.pipeline.transform.BaseTransformMeta;
import org.apache.hop.pipeline.transform.ITransformDialog;
-import org.apache.hop.ui.core.dialog.EnterNumberDialog;
-import org.apache.hop.ui.core.dialog.EnterTextDialog;
-import org.apache.hop.ui.core.dialog.ErrorDialog;
-import org.apache.hop.ui.core.dialog.PreviewRowsDialog;
+import org.apache.hop.ui.core.dialog.*;
import org.apache.hop.ui.core.widget.TextVar;
import org.apache.hop.ui.pipeline.dialog.PipelinePreviewProgressDialog;
import org.apache.hop.ui.pipeline.transform.BaseTransformDialog;
@@ -968,26 +965,13 @@ public class XmlInputStreamDialog extends BaseTransformDialog implements ITransf
} else {
wFilename.addSelectionListener( lsDef );
// Listen to the browse button next to the file name
- wbbFilename.addSelectionListener( new SelectionAdapter() {
- @Override
- public void widgetSelected( SelectionEvent e ) {
- FileDialog dialog = new FileDialog( shell, SWT.OPEN );
- dialog.setFilterExtensions( new String[] { "*.xml;*.XML", "*" } );
- if ( wFilename.getText() != null ) {
- String fname = variables.resolve( wFilename.getText() );
- dialog.setFileName( fname );
- }
-
- dialog.setFilterNames( new String[] {
- BaseMessages.getString( PKG, "System.FileType.XMLFiles" ),
- BaseMessages.getString( PKG, "System.FileType.AllFiles" ) } );
-
- if ( dialog.open() != null ) {
- String str = dialog.getFilterPath() + System.getProperty( "file.separator" ) + dialog.getFileName();
- wFilename.setText( str );
- }
- }
- } );
+
+ wbbFilename.addListener( SWT.Selection, e-> BaseDialog.presentFileDialog( shell, wFilename, variables,
+ new String[] { "*.xml; *.XML", "*" },
+ new String[] { BaseMessages.getString( PKG, "System.FileType.XMLFiles" ),
+ BaseMessages.getString( PKG, "System.FileType.AllFiles" ) },
+ true )
+ );
}
// Detect X or ALT-F4 or something that kills this window...
diff --git a/plugins/transforms/xml/src/main/java/org/apache/hop/pipeline/transforms/xml/xmloutput/XmlOutputDialog.java b/plugins/transforms/xml/src/main/java/org/apache/hop/pipeline/transforms/xml/xmloutput/XmlOutputDialog.java
index ecb2b2c..ad23b81 100644
--- a/plugins/transforms/xml/src/main/java/org/apache/hop/pipeline/transforms/xml/xmloutput/XmlOutputDialog.java
+++ b/plugins/transforms/xml/src/main/java/org/apache/hop/pipeline/transforms/xml/xmloutput/XmlOutputDialog.java
@@ -30,6 +30,7 @@ import org.apache.hop.pipeline.PipelineMeta;
import org.apache.hop.pipeline.transform.BaseTransformMeta;
import org.apache.hop.pipeline.transform.ITransformDialog;
import org.apache.hop.pipeline.transform.TransformMeta;
+import org.apache.hop.ui.core.dialog.BaseDialog;
import org.apache.hop.ui.core.dialog.EnterSelectionDialog;
import org.apache.hop.ui.core.dialog.ErrorDialog;
import org.apache.hop.ui.core.widget.ColumnInfo;
@@ -755,22 +756,14 @@ public class XmlOutputDialog extends BaseTransformDialog implements ITransformDi
// Whenever something changes, set the tooltip to the expanded version:
wFilename.addModifyListener( e -> wFilename.setToolTipText( variables.resolve( wFilename.getText() ) ) );
- wbFilename.addSelectionListener(new SelectionAdapter() {
- public void widgetSelected( SelectionEvent e ) {
- FileDialog dialog = new FileDialog( shell, SWT.SAVE );
- dialog.setFilterExtensions( new String[] { "*.xml", "*.txt", "*.csv", "*" } );
- if ( wFilename.getText() != null ) {
- dialog.setFileName( variables.resolve( wFilename.getText() ) );
- }
- dialog.setFilterNames( new String[] { BaseMessages.getString( PKG, "System.FileType.XMLFiles" ),
- BaseMessages.getString( PKG, "System.FileType.TextFiles" ),
- BaseMessages.getString( PKG, "System.FileType.CSVFiles" ),
- BaseMessages.getString( PKG, "System.FileType.AllFiles" ) } );
- if ( dialog.open() != null ) {
- wFilename.setText( dialog.getFilterPath() + System.getProperty( "file.separator" ) + dialog.getFileName() );
- }
- }
- } );
+
+ wbFilename.addListener( SWT.Selection, e-> BaseDialog.presentFileDialog( true, shell, wFilename, variables,
+ new String[] {"*.xml", "*"},
+ new String[] {
+ BaseMessages.getString( PKG, "System.FileType.XMLFiles" ),
+ BaseMessages.getString( PKG, "System.FileType.AllFiles" ) },
+ true )
+ );
// Detect X or ALT-F4 or something that kills this window...
shell.addShellListener( new ShellAdapter() {