diff --git a/src/main/java/com/mmz/specs/application/gui/client/ClientMainWindow.java b/src/main/java/com/mmz/specs/application/gui/client/ClientMainWindow.java index a582ebd..3910115 100644 --- a/src/main/java/com/mmz/specs/application/gui/client/ClientMainWindow.java +++ b/src/main/java/com/mmz/specs/application/gui/client/ClientMainWindow.java @@ -35,7 +35,9 @@ import com.mmz.specs.connection.DaoConstants; import com.mmz.specs.dao.ConstantsDaoImpl; import com.mmz.specs.dao.NoticeDaoImpl; -import com.mmz.specs.model.*; +import com.mmz.specs.model.ConstantsEntity; +import com.mmz.specs.model.NoticeEntity; +import com.mmz.specs.model.UsersEntity; import com.mmz.specs.service.ConstantsService; import com.mmz.specs.service.ConstantsServiceImpl; import com.mmz.specs.service.NoticeServiceImpl; @@ -695,12 +697,6 @@ private void onEditDataButton(boolean select) { mainWindowUtils.updateMessage("/img/gui/animated/sync.gif", "Открываем редактирование данных..."); new Thread(() -> { try { - SessionUtils.refreshSession(session, DetailTitleEntity.class); - SessionUtils.refreshSession(session, MaterialEntity.class); - SessionUtils.refreshSession(session, DetailEntity.class); - SessionUtils.refreshSession(session, NoticeEntity.class); - SessionUtils.refreshSession(session, TechProcessEntity.class); - ImageIcon icon = new ImageIcon(Toolkit.getDefaultToolkit().getImage(getClass().getResource("/img/gui/databaseEdit16.png"))); addTab("Редактирование данных", icon, new EditDataPanel(), select); mainWindowUtils.updateMessage(null, null); diff --git a/src/main/java/com/mmz/specs/application/gui/panels/EditDataPanel.java b/src/main/java/com/mmz/specs/application/gui/panels/EditDataPanel.java index 6431d54..b5d603b 100644 --- a/src/main/java/com/mmz/specs/application/gui/panels/EditDataPanel.java +++ b/src/main/java/com/mmz/specs/application/gui/panels/EditDataPanel.java @@ -29,7 +29,6 @@ import com.mmz.specs.application.utils.SessionUtils; import com.mmz.specs.application.utils.client.CommonWindowUtils; import com.mmz.specs.application.utils.client.MainWindowUtils; -import com.mmz.specs.dao.DetailDaoImpl; import com.mmz.specs.dao.DetailTitleDaoImpl; import com.mmz.specs.dao.MaterialDaoImpl; import com.mmz.specs.model.DetailEntity; @@ -288,7 +287,7 @@ private void fillTitleList() { private int getTitleUsage(DetailTitleEntity selectedValue) { if (selectedValue != null) { - DetailService service = new DetailServiceImpl(new DetailDaoImpl(session)); + DetailService service = new DetailServiceImpl(session); final ArrayList detailsByTitle = (ArrayList) service.getDetailsByTitle(selectedValue); if (detailsByTitle != null) { return detailsByTitle.size(); @@ -321,10 +320,10 @@ private void initEditTitleTabButtons() { final DetailTitleEntity selectedValue = titleList.getSelectedValue(); final int selectedIndex = titleList.getSelectedIndex(); if (selectedValue != null) { - DetailService service = new DetailServiceImpl(new DetailDaoImpl(session)); + DetailService service = new DetailServiceImpl(session); final ArrayList detailsByTitle = (ArrayList) service.getDetailsByTitle(selectedValue); if (detailsByTitle.isEmpty()) { - new DetailTitleServiceImpl(new DetailTitleDaoImpl(session)).removeDetailTitle(selectedValue.getId()); + new DetailTitleServiceImpl(session).removeDetailTitle(selectedValue.getId()); final DefaultListModel model = (DefaultListModel) titleList.getModel(); model.removeElement(selectedValue); @@ -370,7 +369,7 @@ private void initEditMaterialTab() { private void fillMaterialList() { DefaultListModel model = new DefaultListModel<>(); - MaterialService service = new MaterialServiceImpl(new MaterialDaoImpl(session)); + MaterialService service = new MaterialServiceImpl(session); final ArrayList materialListEntities = (ArrayList) service.listMaterials(); Collections.sort(materialListEntities);