From 108907dd10a62696125d169c1d2c161354865c9f Mon Sep 17 00:00:00 2001
From: sherzinger <sascha.herzinger@uni.lu>
Date: Tue, 19 Feb 2019 08:50:19 +0100
Subject: [PATCH] refactored editor module (maybe I should have just deleted
it?)
---
.../mapviewer/editor/gui/ConverterFilter.java | 104 ++++----
.../editor/gui/OpenProjectListener.java | 252 +++++++++---------
2 files changed, 178 insertions(+), 178 deletions(-)
diff --git a/editor/src/main/java/lcsb/mapviewer/editor/gui/ConverterFilter.java b/editor/src/main/java/lcsb/mapviewer/editor/gui/ConverterFilter.java
index c1352c0d4d..4fecb8d5ab 100644
--- a/editor/src/main/java/lcsb/mapviewer/editor/gui/ConverterFilter.java
+++ b/editor/src/main/java/lcsb/mapviewer/editor/gui/ConverterFilter.java
@@ -1,52 +1,52 @@
-package lcsb.mapviewer.editor.gui;
-
-import java.io.File;
-
-import javax.swing.filechooser.FileFilter;
-
-import org.apache.commons.io.FilenameUtils;
-
-import lcsb.mapviewer.converter.IConverter;
-
-/**
- * This is a {@link FileFilter} that list only files that can be parsed by
- * specific {@link IConverter}.
- *
- * @author Piotr Gawron
- *
- */
-public class ConverterFilter extends FileFilter {
-
- /**
- * Converter (parser) that can parse files returned by filter.
- */
- private IConverter converter;
-
- /**
- * Default constructor.
- *
- * @param converter
- * {@link #converter}
- */
- public ConverterFilter(IConverter converter) {
- this.converter = converter;
- }
-
- @Override
- public boolean accept(File f) {
- return f.isDirectory() || FilenameUtils.getExtension(f.getAbsolutePath()).equalsIgnoreCase(converter.getFileExtension());
- }
-
- @Override
- public String getDescription() {
- return converter.getCommonName() + " (*." + converter.getFileExtension() + ")";
- }
-
- /**
- * @return the converter
- * @see #converter
- */
- public IConverter getConverter() {
- return converter;
- }
-}
+package lcsb.mapviewer.editor.gui;
+
+import java.io.File;
+
+import javax.swing.filechooser.FileFilter;
+
+import org.apache.commons.io.FilenameUtils;
+
+import lcsb.mapviewer.converter.Converter;
+
+/**
+ * This is a {@link FileFilter} that list only files that can be parsed by
+ * specific {@link Converter}.
+ *
+ * @author Piotr Gawron
+ *
+ */
+public class ConverterFilter extends FileFilter {
+
+ /**
+ * Converter (parser) that can parse files returned by filter.
+ */
+ private Converter converter;
+
+ /**
+ * Default constructor.
+ *
+ * @param converter
+ * {@link #converter}
+ */
+ public ConverterFilter(Converter converter) {
+ this.converter = converter;
+ }
+
+ @Override
+ public boolean accept(File f) {
+ return f.isDirectory() || FilenameUtils.getExtension(f.getAbsolutePath()).equalsIgnoreCase(converter.getFileExtension());
+ }
+
+ @Override
+ public String getDescription() {
+ return converter.getCommonName() + " (*." + converter.getFileExtension() + ")";
+ }
+
+ /**
+ * @return the converter
+ * @see #converter
+ */
+ public Converter getConverter() {
+ return converter;
+ }
+}
diff --git a/editor/src/main/java/lcsb/mapviewer/editor/gui/OpenProjectListener.java b/editor/src/main/java/lcsb/mapviewer/editor/gui/OpenProjectListener.java
index 1ffd121fde..f8fc87daf3 100644
--- a/editor/src/main/java/lcsb/mapviewer/editor/gui/OpenProjectListener.java
+++ b/editor/src/main/java/lcsb/mapviewer/editor/gui/OpenProjectListener.java
@@ -1,126 +1,126 @@
-package lcsb.mapviewer.editor.gui;
-
-import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
-import java.io.File;
-import java.io.FileNotFoundException;
-import java.util.ArrayList;
-import java.util.List;
-
-import javax.swing.JFileChooser;
-import javax.swing.JFrame;
-import javax.swing.JOptionPane;
-import javax.swing.filechooser.FileFilter;
-
-import lcsb.mapviewer.converter.ConverterParams;
-import lcsb.mapviewer.converter.IConverter;
-import lcsb.mapviewer.converter.InvalidInputDataExecption;
-import lcsb.mapviewer.converter.model.celldesigner.CellDesignerXmlParser;
-import lcsb.mapviewer.editor.OpenedProject;
-import lcsb.mapviewer.editor.Workspace;
-import lcsb.mapviewer.model.map.model.Model;
-
-import org.apache.log4j.Logger;
-
-/**
- * Listener used to open files with {@link OpenedProject}.
- *
- * @author Piotr Gawron
- *
- */
-public class OpenProjectListener implements ActionListener {
-
- /**
- * Default class logger.
- */
- private final Logger logger = Logger.getLogger(OpenProjectListener.class);
-
- /**
- * {@link Workspace} where opened project should be added.
- */
- private Workspace workspace;
-
- /**
- * {@link JFrame Window} that fire this listener.
- */
- private JFrame window;
-
- /**
- * Selector used to filter files that are available for opening.
- */
- private final JFileChooser fc = new JFileChooser();
-
- /**
- * List of {@link IConverter converters} that can be used to open files.
- */
- private List<IConverter> converters = new ArrayList<>();
-
- /**
- * Default constructor.
- *
- * @param window
- * {@link JFrame window} from which listener will be fired
- * @param workspace
- * {@link #workspace}
- */
- public OpenProjectListener(JFrame window, Workspace workspace) {
- this.workspace = workspace;
- this.window = window;
- fillConverters();
- for (IConverter converter : converters) {
- fc.addChoosableFileFilter(new ConverterFilter(converter));
- }
- fc.setAcceptAllFileFilterUsed(false);
-
- }
-
- /**
- * Adds objects to {@link #converters} list.
- */
- private void fillConverters() {
- CellDesignerXmlParser cellDesignerXmlParser = new CellDesignerXmlParser();
- converters.add(cellDesignerXmlParser);
- }
-
- @Override
- public void actionPerformed(ActionEvent e) {
- try {
- int returnVal = fc.showOpenDialog(window);
- if (returnVal == JFileChooser.APPROVE_OPTION) {
- File file = fc.getSelectedFile();
- FileFilter filter = fc.getFileFilter();
- if (filter instanceof ConverterFilter) {
- Model model = ((ConverterFilter) filter).getConverter().createModel(new ConverterParams().filename(file.getAbsolutePath()));
- OpenedProject project = new OpenedProject();
- project.setFileName(file.getAbsolutePath());
- project.addModel(model);
- workspace.addProject(project);
- } else {
- logger.warn("Unknwon filter type: " + filter);
- }
- } else {
- logger.debug("Open command cancelled by user.");
- }
- } catch (FileNotFoundException e1) {
- showError("File doesn't exist.", e1);
- } catch (InvalidInputDataExecption e1) {
- showError("Problem with input file.", e1);
- } catch (Exception e1) {
- showError("Internal error. More information can be found in log file.", e1);
- }
- }
-
- /**
- * Shows a message error.
- *
- * @param message
- * message error
- * @param exception
- * exception that caused {@link Exception}
- */
- private void showError(String message, Exception exception) {
- logger.error(exception, exception);
- JOptionPane.showMessageDialog(window, message);
- }
-
-}
+package lcsb.mapviewer.editor.gui;
+
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.io.File;
+import java.io.FileNotFoundException;
+import java.util.ArrayList;
+import java.util.List;
+
+import javax.swing.JFileChooser;
+import javax.swing.JFrame;
+import javax.swing.JOptionPane;
+import javax.swing.filechooser.FileFilter;
+
+import lcsb.mapviewer.converter.ConverterParams;
+import lcsb.mapviewer.converter.Converter;
+import lcsb.mapviewer.converter.InvalidInputDataExecption;
+import lcsb.mapviewer.converter.model.celldesigner.CellDesignerXmlParser;
+import lcsb.mapviewer.editor.OpenedProject;
+import lcsb.mapviewer.editor.Workspace;
+import lcsb.mapviewer.model.map.model.Model;
+
+import org.apache.log4j.Logger;
+
+/**
+ * Listener used to open files with {@link OpenedProject}.
+ *
+ * @author Piotr Gawron
+ *
+ */
+public class OpenProjectListener implements ActionListener {
+
+ /**
+ * Default class logger.
+ */
+ private final Logger logger = Logger.getLogger(OpenProjectListener.class);
+
+ /**
+ * {@link Workspace} where opened project should be added.
+ */
+ private Workspace workspace;
+
+ /**
+ * {@link JFrame Window} that fire this listener.
+ */
+ private JFrame window;
+
+ /**
+ * Selector used to filter files that are available for opening.
+ */
+ private final JFileChooser fc = new JFileChooser();
+
+ /**
+ * List of {@link Converter converters} that can be used to open files.
+ */
+ private List<Converter> converters = new ArrayList<>();
+
+ /**
+ * Default constructor.
+ *
+ * @param window
+ * {@link JFrame window} from which listener will be fired
+ * @param workspace
+ * {@link #workspace}
+ */
+ public OpenProjectListener(JFrame window, Workspace workspace) {
+ this.workspace = workspace;
+ this.window = window;
+ fillConverters();
+ for (Converter converter : converters) {
+ fc.addChoosableFileFilter(new ConverterFilter(converter));
+ }
+ fc.setAcceptAllFileFilterUsed(false);
+
+ }
+
+ /**
+ * Adds objects to {@link #converters} list.
+ */
+ private void fillConverters() {
+ CellDesignerXmlParser cellDesignerXmlParser = new CellDesignerXmlParser();
+ converters.add(cellDesignerXmlParser);
+ }
+
+ @Override
+ public void actionPerformed(ActionEvent e) {
+ try {
+ int returnVal = fc.showOpenDialog(window);
+ if (returnVal == JFileChooser.APPROVE_OPTION) {
+ File file = fc.getSelectedFile();
+ FileFilter filter = fc.getFileFilter();
+ if (filter instanceof ConverterFilter) {
+ Model model = ((ConverterFilter) filter).getConverter().createModel(new ConverterParams().filename(file.getAbsolutePath()));
+ OpenedProject project = new OpenedProject();
+ project.setFileName(file.getAbsolutePath());
+ project.addModel(model);
+ workspace.addProject(project);
+ } else {
+ logger.warn("Unknwon filter type: " + filter);
+ }
+ } else {
+ logger.debug("Open command cancelled by user.");
+ }
+ } catch (FileNotFoundException e1) {
+ showError("File doesn't exist.", e1);
+ } catch (InvalidInputDataExecption e1) {
+ showError("Problem with input file.", e1);
+ } catch (Exception e1) {
+ showError("Internal error. More information can be found in log file.", e1);
+ }
+ }
+
+ /**
+ * Shows a message error.
+ *
+ * @param message
+ * message error
+ * @param exception
+ * exception that caused {@link Exception}
+ */
+ private void showError(String message, Exception exception) {
+ logger.error(exception, exception);
+ JOptionPane.showMessageDialog(window, message);
+ }
+
+}
--
GitLab