Skip to content

Export file dialog shows directories. Small refactoring. #168

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Apr 19, 2016
Merged

Export file dialog shows directories. Small refactoring. #168

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c98856a
Export file dialog shows directories. Small refactoring.
OndroMih Apr 15, 2016
3079c55
Fix of filtering on file extension in export dialog.
OndroMih Apr 17, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
50 changes: 25 additions & 25 deletions src/main/java/com/tagtraum/perf/gcviewer/ctrl/action/Export.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
import com.tagtraum.perf.gcviewer.view.ChartPanelView;
import com.tagtraum.perf.gcviewer.view.GCDocument;
import com.tagtraum.perf.gcviewer.view.GCViewerGui;
import com.tagtraum.perf.gcviewer.view.util.ExtensionFileFilter;
import com.tagtraum.perf.gcviewer.view.util.ImageHelper;

/**
Expand All @@ -27,6 +28,7 @@
* Time: 2:01:07 PM
*/
public class Export extends AbstractAction {

private GCViewerGui gcViewer;
private JFileChooser saveDialog;

Expand All @@ -43,14 +45,12 @@ public Export(final GCViewerGui gcViewer) {
saveDialog = new JFileChooser();
saveDialog.setDialogTitle(LocalisationHelper.getString("fileexport_dialog_title"));
saveDialog.removeChoosableFileFilter(saveDialog.getAcceptAllFileFilter());
saveDialog.addChoosableFileFilter(new ExtensionFileFilter(".csv", LocalisationHelper.getString("fileexport_dialog_csv"), DataWriterType.CSV));
saveDialog.addChoosableFileFilter(new ExtensionFileFilter(".csv", LocalisationHelper.getString("fileexport_dialog_csv_ts"), DataWriterType.CSV_TS));
saveDialog.addChoosableFileFilter(new ExtensionFileFilter(".txt", LocalisationHelper.getString("fileexport_dialog_txt"), DataWriterType.PLAIN));
saveDialog.addChoosableFileFilter(new ExtensionFileFilter(".simple.log", LocalisationHelper.getString("fileexport_dialog_simplelog"), DataWriterType.SIMPLE));
saveDialog.addChoosableFileFilter(new ExtensionFileFilter(".csv", LocalisationHelper.getString("fileexport_dialog_summarylog"), DataWriterType.SUMMARY));
saveDialog.addChoosableFileFilter(new ExtensionFileFilter(".png", LocalisationHelper.getString("fileexport_dialog_png"), DataWriterType.PNG));
for (ExportExtensionFileFilter filter : ExportExtensionFileFilter.EXT_FILE_FILTERS) {
saveDialog.addChoosableFileFilter(filter);
}
}

@Override
public void actionPerformed(final ActionEvent e) {
final GCDocument gcDocument = gcViewer.getSelectedGCDocument();
for (int i=0; i<gcDocument.getChartPanelViewCount(); i++) {
Expand All @@ -60,10 +60,10 @@ public void actionPerformed(final ActionEvent e) {
saveDialog.setSelectedFile(file);
final int val = saveDialog.showSaveDialog(gcViewer);
if (val == JFileChooser.APPROVE_OPTION) {
ExtensionFileFilter fileFilter = (ExtensionFileFilter) saveDialog.getFileFilter();
ExportExtensionFileFilter fileFilter = (ExportExtensionFileFilter) saveDialog.getFileFilter();
// On OS/X if you don't select one of the filters and just press "Save" the filter may be null. Use the CSV one then
if (fileFilter==null) {
fileFilter = (ExtensionFileFilter) saveDialog.getChoosableFileFilters()[0];
fileFilter = (ExportExtensionFileFilter) saveDialog.getChoosableFileFilters()[0];
}
exportFile(chartPanelView.getGCResource().getModel(),
saveDialog.getSelectedFile(),
Expand Down Expand Up @@ -96,31 +96,31 @@ public void exportFile(final GCModel model, File file, final String extension, f
}
}

private static class ExtensionFileFilter extends FileFilter {
private String extension;
private String description;
private DataWriterType dataWriterType;
private static class ExportExtensionFileFilter extends ExtensionFileFilter {

public static final ExportExtensionFileFilter[] EXT_FILE_FILTERS = {
new ExportExtensionFileFilter("csv", LocalisationHelper.getString("fileexport_dialog_csv"), DataWriterType.CSV),
new ExportExtensionFileFilter("csv", LocalisationHelper.getString("fileexport_dialog_csv_ts"), DataWriterType.CSV_TS),
new ExportExtensionFileFilter("txt", LocalisationHelper.getString("fileexport_dialog_txt"), DataWriterType.PLAIN),
new ExportExtensionFileFilter("simple.log", LocalisationHelper.getString("fileexport_dialog_simplelog"), DataWriterType.SIMPLE),
new ExportExtensionFileFilter("csv", LocalisationHelper.getString("fileexport_dialog_summarylog"), DataWriterType.SUMMARY),
new ExportExtensionFileFilter("png", LocalisationHelper.getString("fileexport_dialog_png"), DataWriterType.PNG)
};

private final String description;
private final DataWriterType dataWriterType;

public ExtensionFileFilter(final String extension, final String description, final DataWriterType dataWriterType) {
this.extension = extension.toLowerCase();
public ExportExtensionFileFilter(final String extension, final String description, final DataWriterType dataWriterType) {
super(extension.toLowerCase());
this.description = description;
this.dataWriterType = dataWriterType;
}

public boolean accept(final File file) {
// TODO refactor
try {
return file.toString().toLowerCase().endsWith(extension);
}
catch (NullPointerException e) {
return false;
}
}

public String getExtension() {
return extension;
return super.extension;
}

@Override
public String getDescription() {
return description;
}
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/com/tagtraum/perf/gcviewer/view/util/ExtensionFileFilter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ public class ExtensionFileFilter extends FileFilter {
new ExtensionFileFilter("txt.gz"), new ExtensionFileFilter("gc.gz"), new ExtensionFileFilter("log.gz")
};

private final String extension;
protected final String extension;

public ExtensionFileFilter(String extension) {
this.extension = extension;
Expand Down