From 5063d4d15787f865a70b15229ac46d38b3e81ef9 Mon Sep 17 00:00:00 2001 From: "DozorovaA.A" Date: Sat, 3 Dec 2022 15:25:35 +0400 Subject: [PATCH] add filter --- .vs/slnx.sqlite | Bin 118784 -> 118784 bytes ArmoredVehicle/src/FormMapWithSetMachine.form | 1 - ArmoredVehicle/src/FormMapWithSetMachine.java | 46 ++++++------------ 3 files changed, 14 insertions(+), 33 deletions(-) diff --git a/.vs/slnx.sqlite b/.vs/slnx.sqlite index c88d1f468e44c5364f1dacde032356c1cad119e8..5fea80622102b61d7fdd92b923da2b004c02dc62 100644 GIT binary patch delta 2067 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 diff --git a/ArmoredVehicle/src/FormMapWithSetMachine.form b/ArmoredVehicle/src/FormMapWithSetMachine.form index ba866ff..232fa8a 100644 --- a/ArmoredVehicle/src/FormMapWithSetMachine.form +++ b/ArmoredVehicle/src/FormMapWithSetMachine.form @@ -25,7 +25,6 @@ - diff --git a/ArmoredVehicle/src/FormMapWithSetMachine.java b/ArmoredVehicle/src/FormMapWithSetMachine.java index 9ce8c92..4409512 100644 --- a/ArmoredVehicle/src/FormMapWithSetMachine.java +++ b/ArmoredVehicle/src/FormMapWithSetMachine.java @@ -13,6 +13,7 @@ import java.util.HashMap; import java.util.Queue; import javax.swing.event.ListSelectionEvent; import javax.swing.event.ListSelectionListener; +import javax.swing.filechooser.FileNameExtensionFilter; public class FormMapWithSetMachine extends javax.swing.JFrame { @@ -34,25 +35,7 @@ private Image img; for (String elem : _mapsDict.keySet()) { MapComboBox.addItem(elem); } - _mapCollection = new MapsCollection(PicturePanel.getWidth(), PicturePanel.getHeight()); - jMenuSaveObj.addActionListener(e -> { - JFileChooser fs = new JFileChooser(); - fs.setDialogTitle("Сохранение"); - int result = fs.showSaveDialog(null); - if (result == JFileChooser.APPROVE_OPTION) { - File selectedFile = fs.getSelectedFile(); - if (_mapCollection.SaveData(selectedFile.getPath())) - { - JOptionPane.showMessageDialog(null, "Сохранение прошло успешно", "Результат",JOptionPane.INFORMATION_MESSAGE); - } - else - { - JOptionPane.showMessageDialog(null, "Не сохранилось", "Результат",JOptionPane.ERROR_MESSAGE); - } - } - }); - - + _mapCollection = new MapsCollection(PicturePanel.getWidth(), PicturePanel.getHeight()); } @@ -299,15 +282,6 @@ private Image img; MenuBar.add(jMenuLoad); jMenuSaveObj.setText("Сохранить объект"); - jMenuSaveObj.addMenuListener(new javax.swing.event.MenuListener() { - public void menuCanceled(javax.swing.event.MenuEvent evt) { - } - public void menuDeselected(javax.swing.event.MenuEvent evt) { - } - public void menuSelected(javax.swing.event.MenuEvent evt) { - jMenuSaveObjMenuSelected(evt); - } - }); jMenuSaveObj.addMouseListener(new java.awt.event.MouseAdapter() { public void mouseClicked(java.awt.event.MouseEvent evt) { jMenuSaveObjMouseClicked(evt); @@ -541,12 +515,11 @@ private void ReloadMaps() { }//GEN-LAST:event_DeletedFormOpenMouseClicked - private void jMenuSaveObjMenuSelected(javax.swing.event.MenuEvent evt) {//GEN-FIRST:event_jMenuSaveObjMenuSelected - - }//GEN-LAST:event_jMenuSaveObjMenuSelected - private void jMenuSaveMouseClicked(java.awt.event.MouseEvent evt) {//GEN-FIRST:event_jMenuSaveMouseClicked JFileChooser fs = new JFileChooser(); + fs.setAcceptAllFileFilterUsed(false); + FileNameExtensionFilter filter = new FileNameExtensionFilter(".txt file", "txt"); + fs.addChoosableFileFilter(filter); fs.setDialogTitle("Сохранение карты"); int result = fs.showSaveDialog(null); if (result == JFileChooser.APPROVE_OPTION) { @@ -564,6 +537,9 @@ private void ReloadMaps() { private void jMenuLoadMouseClicked(java.awt.event.MouseEvent evt) {//GEN-FIRST:event_jMenuLoadMouseClicked JFileChooser fs = new JFileChooser(); + fs.setAcceptAllFileFilterUsed(false); + FileNameExtensionFilter filter = new FileNameExtensionFilter(".txt file", "txt"); + fs.addChoosableFileFilter(filter); fs.setDialogTitle("Сохранение карты"); int result = fs.showSaveDialog(null); if (result == JFileChooser.APPROVE_OPTION) { @@ -582,6 +558,9 @@ private void ReloadMaps() { private void jMenuLoadObjMouseClicked(java.awt.event.MouseEvent evt) {//GEN-FIRST:event_jMenuLoadObjMouseClicked JFileChooser fs = new JFileChooser(); + fs.setAcceptAllFileFilterUsed(false); + FileNameExtensionFilter filter = new FileNameExtensionFilter(".txt file", "txt"); + fs.addChoosableFileFilter(filter); fs.setDialogTitle("Загрузка"); int result = fs.showSaveDialog(null); if (result == JFileChooser.APPROVE_OPTION) { @@ -600,6 +579,9 @@ private void ReloadMaps() { private void jMenuSaveObjMouseClicked(java.awt.event.MouseEvent evt) {//GEN-FIRST:event_jMenuSaveObjMouseClicked JFileChooser fs = new JFileChooser(); + fs.setAcceptAllFileFilterUsed(false); + FileNameExtensionFilter filter = new FileNameExtensionFilter(".txt file", "txt"); + fs.addChoosableFileFilter(filter); fs.setDialogTitle("Сохранение"); int result = fs.showSaveDialog(null); if (result == JFileChooser.APPROVE_OPTION) {