From f6fbb0f5a397e936cafc79fcf592e3abb5618a3a Mon Sep 17 00:00:00 2001 From: OMGeeky <> Date: Thu, 17 Jul 2025 20:11:51 +0200 Subject: [PATCH] Remove unused SavedGame references and related functionality it didn't really work for a long time anyway and was extremely outdated --- .../rpg/atcontentstudio/model/Project.java | 12 - .../model/saves/SavedGame.java | 185 ----------- .../model/saves/SavedGamesSet.java | 188 ----------- .../rpg/atcontentstudio/ui/EditorsArea.java | 11 - .../rpg/atcontentstudio/ui/ProjectsTree.java | 298 ------------------ .../rpg/atcontentstudio/ui/StudioFrame.java | 6 - .../atcontentstudio/ui/WorkspaceActions.java | 18 -- .../ui/saves/SavedGameEditor.java | 30 -- 8 files changed, 748 deletions(-) delete mode 100644 src/com/gpl/rpg/atcontentstudio/model/saves/SavedGame.java delete mode 100644 src/com/gpl/rpg/atcontentstudio/model/saves/SavedGamesSet.java delete mode 100644 src/com/gpl/rpg/atcontentstudio/ui/saves/SavedGameEditor.java diff --git a/src/com/gpl/rpg/atcontentstudio/model/Project.java b/src/com/gpl/rpg/atcontentstudio/model/Project.java index d9adcca..32cf9fc 100644 --- a/src/com/gpl/rpg/atcontentstudio/model/Project.java +++ b/src/com/gpl/rpg/atcontentstudio/model/Project.java @@ -62,8 +62,6 @@ public class Project implements ProjectTreeNode, Serializable, JsonSerializable public transient BookmarksRoot bookmarks; - public SavedGamesSet saves; //For simulations. - public transient SavedSlotCollection v; public transient Workspace parent; @@ -140,13 +138,11 @@ public class Project implements ProjectTreeNode, Serializable, JsonSerializable createdContent = new GameSource(this, Type.created); bookmarks = new BookmarksRoot(this); - saves = new SavedGamesSet(this); v.add(createdContent); v.add(alteredContent); // v.add(referencedContent); v.add(baseContent); - v.add(saves); v.add(bookmarks); } @@ -269,14 +265,11 @@ public class Project implements ProjectTreeNode, Serializable, JsonSerializable createdContent = new GameSource(this, GameSource.Type.created); bookmarks = new BookmarksRoot(this); - saves.refreshTransients(); - v = new SavedSlotCollection(); v.add(createdContent); v.add(alteredContent); // v.add(referencedContent); v.add(baseContent); - v.add(saves); v.add(bookmarks); @@ -1016,11 +1009,6 @@ public class Project implements ProjectTreeNode, Serializable, JsonSerializable } - public void addSave(File selectedFile) { - saves.addSave(selectedFile); - } - - public List getSpawnGroup(String spawngroup_id) { List result = new ArrayList(); int i = getNPCCount(); diff --git a/src/com/gpl/rpg/atcontentstudio/model/saves/SavedGame.java b/src/com/gpl/rpg/atcontentstudio/model/saves/SavedGame.java deleted file mode 100644 index 271314f..0000000 --- a/src/com/gpl/rpg/atcontentstudio/model/saves/SavedGame.java +++ /dev/null @@ -1,185 +0,0 @@ -package com.gpl.rpg.atcontentstudio.model.saves; - -import com.gpl.rpg.andorstrainer.io.SavedGameIO; -import com.gpl.rpg.atcontentstudio.model.GameDataElement; -import com.gpl.rpg.atcontentstudio.model.GameSource.Type; -import com.gpl.rpg.atcontentstudio.model.Project; -import com.gpl.rpg.atcontentstudio.model.ProjectTreeNode; -import com.gpl.rpg.atcontentstudio.model.SaveEvent; -import com.gpl.rpg.atcontentstudio.model.gamedata.GameDataSet; -import com.gpl.rpg.atcontentstudio.ui.DefaultIcons; - -import javax.swing.tree.TreeNode; -import java.awt.*; -import java.io.File; -import java.io.IOException; -import java.util.ArrayList; -import java.util.Enumeration; -import java.util.List; - -public class SavedGame extends GameDataElement { - - private static final long serialVersionUID = -6443495534761084990L; - - public File savedFile; - transient public com.gpl.rpg.andorstrainer.model.SavedGame loadedSave = null; - transient public SavedGamesSet parent; - - public SavedGame(SavedGamesSet parent, File f) throws IOException { - savedFile = f; - refreshTransients(parent); - } - - public void refreshTransients(SavedGamesSet parent) throws IOException { - this.parent = parent; - this.loadedSave = SavedGameIO.loadFile(savedFile); - if (this.loadedSave == null) { - throw new IOException("Unable to load save: " + savedFile.getAbsolutePath()); - } - } - - @Override - public Enumeration children() { - return null; - } - - @Override - public boolean getAllowsChildren() { - return false; - } - - @Override - public TreeNode getChildAt(int arg0) { - return null; - } - - @Override - public int getChildCount() { - return 0; - } - - @Override - public int getIndex(TreeNode arg0) { - return 0; - } - - @Override - public TreeNode getParent() { - return parent; - } - - @Override - public boolean isLeaf() { - return true; - } - - @Override - public void childrenAdded(List path) { - path.add(0, this); - parent.childrenAdded(path); - } - - @Override - public void childrenChanged(List path) { - path.add(0, this); - parent.childrenChanged(path); - } - - @Override - public void childrenRemoved(List path) { - path.add(0, this); - parent.childrenRemoved(path); - } - - @Override - public void notifyCreated() { - childrenAdded(new ArrayList()); - } - - @Override - public String getDesc() { - return (needsSaving() ? "*" : "") + loadedSave.displayInfo; - } - - @Override - public Project getProject() { - return parent.getProject(); - } - - @Override - public Image getIcon() { - return DefaultIcons.getHeroIcon(); - } - - @Override - public Image getLeafIcon() { - return DefaultIcons.getHeroIcon(); - } - - @Override - public Image getClosedIcon() { - return null; - } - - @Override - public Image getOpenIcon() { - return null; - } - - @Override - public GameDataSet getDataSet() { - return null; - } - - @Override - public Type getDataType() { - return null; - } - - @Override - public boolean isEmpty() { - return false; - } - - @Override - public void parse() { - // TODO Auto-generated method stub - - } - - @Override - public void link() { - // TODO Auto-generated method stub - - } - - @Override - public GameDataElement clone() { - // TODO Auto-generated method stub - return null; - } - - @Override - public void elementChanged(GameDataElement oldOne, GameDataElement newOne) { - // TODO Auto-generated method stub - - } - - @Override - public String getProjectFilename() { - // TODO Auto-generated method stub - return null; - } - - @Override - public void save() { - // TODO Auto-generated method stub - - } - - @Override - public List attemptSave() { - // TODO Auto-generated method stub - return null; - } -} diff --git a/src/com/gpl/rpg/atcontentstudio/model/saves/SavedGamesSet.java b/src/com/gpl/rpg/atcontentstudio/model/saves/SavedGamesSet.java deleted file mode 100644 index 2964304..0000000 --- a/src/com/gpl/rpg/atcontentstudio/model/saves/SavedGamesSet.java +++ /dev/null @@ -1,188 +0,0 @@ -package com.gpl.rpg.atcontentstudio.model.saves; - -import com.gpl.rpg.atcontentstudio.Notification; -import com.gpl.rpg.atcontentstudio.model.GameSource.Type; -import com.gpl.rpg.atcontentstudio.model.Project; -import com.gpl.rpg.atcontentstudio.model.ProjectTreeNode; -import com.gpl.rpg.atcontentstudio.model.gamedata.GameDataSet; -import com.gpl.rpg.atcontentstudio.ui.DefaultIcons; - -import javax.swing.tree.TreeNode; -import java.awt.*; -import java.io.File; -import java.io.IOException; -import java.io.Serializable; -import java.util.ArrayList; -import java.util.Enumeration; -import java.util.List; -import java.util.Vector; - -public class SavedGamesSet implements ProjectTreeNode, Serializable { - - private static final long serialVersionUID = -6565834239789184087L; - - public Vector saves; //For simulations. - - public Project parent; - - public SavedGamesSet(Project parent) { - this.parent = parent; - saves = new Vector(); - } - - public void refreshTransients() { - for (SavedGame save : saves) { - try { - save.refreshTransients(this); - } catch (IOException e) { - Notification.addError(e.getMessage()); - } - } - } - - public void addSave(File f) { - try { - ProjectTreeNode higherEmptyParent = this; - while (higherEmptyParent != null) { - if (higherEmptyParent.getParent() != null && ((ProjectTreeNode) higherEmptyParent.getParent()).isEmpty()) - higherEmptyParent = (ProjectTreeNode) higherEmptyParent.getParent(); - else break; - } - if (higherEmptyParent == this && !this.isEmpty()) higherEmptyParent = null; - SavedGame node = new SavedGame(this, f); - saves.add(node); - if (higherEmptyParent != null) higherEmptyParent.notifyCreated(); - else node.notifyCreated(); - } catch (IOException e) { - Notification.addError(e.getMessage()); - } - } - - public SavedGame getSave(File f) { - for (SavedGame save : saves) { - if (save.savedFile.equals(f)) return save; - } - return null; - } - - @Override - public Enumeration children() { - return saves.elements(); - } - - @Override - public boolean getAllowsChildren() { - return true; - } - - @Override - public TreeNode getChildAt(int arg0) { - return saves.elementAt(arg0); - } - - @Override - public int getChildCount() { - return saves.size(); - } - - @Override - public int getIndex(TreeNode arg0) { - return saves.indexOf(arg0); - } - - @Override - public TreeNode getParent() { - return parent; - } - - @Override - public boolean isLeaf() { - return false; - } - - @Override - public void childrenAdded(List path) { - path.add(0, this); - parent.childrenAdded(path); - } - - @Override - public void childrenChanged(List path) { - path.add(0, this); - parent.childrenChanged(path); - } - - @Override - public void childrenRemoved(List path) { - if (path.size() == 1 && this.getChildCount() == 1) { - childrenRemoved(new ArrayList()); - } else { - path.add(0, this); - parent.childrenRemoved(path); - } - } - - @Override - public void notifyCreated() { - childrenAdded(new ArrayList()); - for (SavedGame s : saves) { - s.notifyCreated(); - } - } - - @Override - public String getDesc() { - return (needsSaving() ? "*" : "") + "Saved games"; - } - - @Override - public Project getProject() { - return parent.getProject(); - } - - - @Override - public Image getIcon() { - return getOpenIcon(); - } - - @Override - public Image getClosedIcon() { - return DefaultIcons.getSavClosedIcon(); - } - - @Override - public Image getLeafIcon() { - return DefaultIcons.getSavClosedIcon(); - } - - @Override - public Image getOpenIcon() { - return DefaultIcons.getSavOpenIcon(); - } - - - @Override - public GameDataSet getDataSet() { - return null; - } - - @Override - public Type getDataType() { - return null; - } - - @Override - public boolean isEmpty() { - return saves.isEmpty(); - } - - - @Override - public boolean needsSaving() { - for (ProjectTreeNode node : saves) { - if (node.needsSaving()) return true; - } - return false; - } -} diff --git a/src/com/gpl/rpg/atcontentstudio/ui/EditorsArea.java b/src/com/gpl/rpg/atcontentstudio/ui/EditorsArea.java index e815676..349a21d 100644 --- a/src/com/gpl/rpg/atcontentstudio/ui/EditorsArea.java +++ b/src/com/gpl/rpg/atcontentstudio/ui/EditorsArea.java @@ -4,13 +4,11 @@ import com.gpl.rpg.atcontentstudio.model.ProjectTreeNode; import com.gpl.rpg.atcontentstudio.model.gamedata.*; import com.gpl.rpg.atcontentstudio.model.maps.TMXMap; import com.gpl.rpg.atcontentstudio.model.maps.WorldmapSegment; -import com.gpl.rpg.atcontentstudio.model.saves.SavedGame; import com.gpl.rpg.atcontentstudio.model.sprites.Spritesheet; import com.gpl.rpg.atcontentstudio.model.tools.writermode.WriterModeData; import com.gpl.rpg.atcontentstudio.ui.gamedataeditors.*; import com.gpl.rpg.atcontentstudio.ui.map.TMXMapEditor; import com.gpl.rpg.atcontentstudio.ui.map.WorldMapEditor; -import com.gpl.rpg.atcontentstudio.ui.saves.SavedGameEditor; import com.gpl.rpg.atcontentstudio.ui.sprites.SpritesheetEditor; import com.gpl.rpg.atcontentstudio.ui.tools.writermode.WriterModeEditor; import com.jidesoft.swing.JideTabbedPane; @@ -129,15 +127,6 @@ public class EditorsArea extends JPanel { } - public void openEditor(SavedGame save) { - if (editors.containsKey(save)) { - tabHolder.setSelectedComponent(editors.get(save)); - return; - } - openEditor(new SavedGameEditor(save)); - } - - public void openEditor(WorldmapSegment node) { if (editors.containsKey(node)) { tabHolder.setSelectedComponent(editors.get(node)); diff --git a/src/com/gpl/rpg/atcontentstudio/ui/ProjectsTree.java b/src/com/gpl/rpg/atcontentstudio/ui/ProjectsTree.java index ffeab2f..e547891 100644 --- a/src/com/gpl/rpg/atcontentstudio/ui/ProjectsTree.java +++ b/src/com/gpl/rpg/atcontentstudio/ui/ProjectsTree.java @@ -8,7 +8,6 @@ import com.gpl.rpg.atcontentstudio.model.bookmarks.BookmarkEntry; import com.gpl.rpg.atcontentstudio.model.gamedata.JSONElement; import com.gpl.rpg.atcontentstudio.model.maps.TMXMap; import com.gpl.rpg.atcontentstudio.model.maps.WorldmapSegment; -import com.gpl.rpg.atcontentstudio.model.saves.SavedGame; import com.gpl.rpg.atcontentstudio.model.sprites.Spritesheet; import com.gpl.rpg.atcontentstudio.model.tools.writermode.WriterModeData; import com.jidesoft.swing.TreeSearchable; @@ -198,10 +197,6 @@ public class ProjectsTree extends JPanel { addNextSeparator = true; popupMenu.add(new JMenuItem(actions.createWorldmap)); } - if (actions.loadSave.isEnabled()) { - addNextSeparator = true; - popupMenu.add(new JMenuItem(actions.loadSave)); - } if (addNextSeparator) { popupMenu.add(new JSeparator()); addNextSeparator = false; @@ -261,295 +256,6 @@ public class ProjectsTree extends JPanel { } }); } - -// if (projectsTree.getSelectionPath() == null || projectsTree.getSelectionPath().getLastPathComponent() == null) { -// JMenuItem addProject = new JMenuItem("Create project..."); -// popupMenu.add(addProject); -// addProject.addActionListener(new ActionListener() { -// @Override -// public void actionPerformed(ActionEvent e) { -// new ProjectCreationWizard().setVisible(true); -// } -// }); -// popupMenu.addSeparator(); -// } else if (projectsTree.getSelectionPaths().length > 1) { -// boolean deleteAll = false; -// final List elementsToDelete = new ArrayList(); -// for (TreePath selected : projectsTree.getSelectionPaths()) { -// if (selected.getLastPathComponent() instanceof GameDataElement && ((GameDataElement)selected.getLastPathComponent()).writable) { -// elementsToDelete.add((GameDataElement) selected.getLastPathComponent()); -// deleteAll = true; -// } else { -// deleteAll = false; -// break; -// } -// } -// if (deleteAll) { -// JMenuItem deleteItems = new JMenuItem("Delete all selected elements"); -// popupMenu.add(deleteItems); -// deleteItems.addActionListener(new ActionListener() { -// @Override -// public void actionPerformed(ActionEvent e) { -// final Map, Set> impactedCategories = new IdentityHashMap, Set>(); -// for (GameDataElement element : elementsToDelete) { -// ATContentStudio.frame.closeEditor(element); -// element.childrenRemoved(new ArrayList()); -// if (element instanceof JSONElement) { -// @SuppressWarnings("unchecked") -// GameDataCategory category = (GameDataCategory) element.getParent(); -// category.remove(element); -// if (impactedCategories.get(category) == null) { -// impactedCategories.put(category, new HashSet()); -// } -// impactedCategories.get(category).add(((JSONElement) element).jsonFile); -// } else if (element instanceof TMXMap) { -// TMXMapSet parent = (TMXMapSet) element.getParent(); -// parent.tmxMaps.remove(element); -// } -// } -// new Thread() { -// @Override -// public void run() { -// final List events = new ArrayList(); -// List catEvents = null; -// for (GameDataCategory category : impactedCategories.keySet()) { -// for (File f : impactedCategories.get(category)) { -// catEvents = category.attemptSave(true, f.getName()); -// if (catEvents.isEmpty()) { -// category.save(f); -// } else { -// events.addAll(catEvents); -// } -// } -// } -// if (!events.isEmpty()) { -// new SaveItemsWizard(events, null).setVisible(true); -// } -// } -// }.start(); -// } -// }); -// } -// -// popupMenu.addSeparator(); -// } else { -// final ProjectTreeNode selected = (ProjectTreeNode) projectsTree.getSelectionPath().getLastPathComponent(); -// if (selected instanceof Project) { -// JMenuItem closeProject = new JMenuItem("Close Project..."); -// JMenuItem deleteProject = new JMenuItem("Delete Project..."); -// popupMenu.add(closeProject); -// popupMenu.add(deleteProject); -// popupMenu.addSeparator(); -// closeProject.addActionListener(new ActionListener() { -// @Override -// public void actionPerformed(ActionEvent e) { -// Workspace.closeProject((Project) selected); -// } -// }); -// deleteProject.addActionListener(new ActionListener() { -// @Override -// public void actionPerformed(ActionEvent e) { -// int confirm = JOptionPane.showConfirmDialog(ProjectsTree.this, "Are you sure you wish to delete this project ?\nAll files created for it will be deleted too...", "Delete this project ?", JOptionPane.OK_CANCEL_OPTION); -// if (confirm == JOptionPane.OK_OPTION) { -// Workspace.deleteProject(((Project)projectsTree.getSelectionPath().getLastPathComponent())); -// } -// } -// }); -// } -// if (selected instanceof ClosedProject) { -// JMenuItem openProject = new JMenuItem("Open Project..."); -// JMenuItem deleteProject = new JMenuItem("Delete Project..."); -// popupMenu.add(openProject); -// popupMenu.add(deleteProject); -// popupMenu.addSeparator(); -// openProject.addActionListener(new ActionListener() { -// @Override -// public void actionPerformed(ActionEvent e) { -// Workspace.openProject(((ClosedProject)selected)); -// } -// }); -// deleteProject.addActionListener(new ActionListener() { -// @Override -// public void actionPerformed(ActionEvent e) { -// int confirm = JOptionPane.showConfirmDialog(ProjectsTree.this, "Are you sure you wish to delete this project ?\nAll files created for it will be deleted too...", "Delete this project ?", JOptionPane.OK_CANCEL_OPTION); -// if (confirm == JOptionPane.OK_OPTION) { -// Workspace.deleteProject(((ClosedProject)selected)); -// } -// } -// }); -// } -// if (selected.getProject() != null) { -// final Project proj = ((ProjectTreeNode)selected).getProject(); -// JMenuItem createGDE = new JMenuItem("Create Game Data Element (JSON)"); -// popupMenu.add(createGDE); -// createGDE.addActionListener(new ActionListener() { -// @Override -// public void actionPerformed(ActionEvent e) { -// new JSONCreationWizard(proj).setVisible(true); -// } -// }); -// JMenuItem importJson = new JMenuItem("Import JSON data"); -// popupMenu.add(importJson); -// importJson.addActionListener(new ActionListener() { -// @Override -// public void actionPerformed(ActionEvent e) { -// new JSONImportWizard(proj).setVisible(true); -// } -// }); -// //TODO move somewhere else -// JMenu compareElementsMenu = new JMenu("Open comparator for..."); -// JMenuItem compareItems = new JMenuItem("Items"); -// compareElementsMenu.add(compareItems); -// compareItems.addActionListener(new ActionListener() { -// @Override -// public void actionPerformed(ActionEvent e) { -// ATContentStudio.frame.editors.openEditor(new ItemsTableView(selected.getProject())); -// } -// }); -// JMenuItem compareNPCs = new JMenuItem("NPCs"); -// compareElementsMenu.add(compareNPCs); -// compareNPCs.addActionListener(new ActionListener() { -// @Override -// public void actionPerformed(ActionEvent e) { -// ATContentStudio.frame.editors.openEditor(new NPCsTableView(selected.getProject())); -// } -// }); -// popupMenu.add(compareElementsMenu); -// -// JMenuItem exportProjectPackage = new JMenuItem("Export project"); -// exportProjectPackage.addActionListener(new ActionListener() { -// @Override -// public void actionPerformed(ActionEvent e) { -// JFileChooser chooser = new JFileChooser() { -// private static final long serialVersionUID = 8039332384370636746L; -// public boolean accept(File f) { -// return f.isDirectory() || f.getName().endsWith(".zip") || f.getName().endsWith(".ZIP"); -// } -// }; -// chooser.setMultiSelectionEnabled(false); -// int result = chooser.showSaveDialog(ATContentStudio.frame); -// if (result == JFileChooser.APPROVE_OPTION) { -// selected.getProject().generateExportPackage(chooser.getSelectedFile()); -// } -// } -// }); -// popupMenu.add(exportProjectPackage); -// popupMenu.addSeparator(); -// } -// if (selected instanceof GameDataElement) { -// final GameDataElement node = ((GameDataElement)selected); -// if (node.state == GameDataElement.State.modified){ -// JMenuItem saveItem = new JMenuItem("Save this element"); -// saveItem.addActionListener(new ActionListener() { -// @Override -// public void actionPerformed(ActionEvent e) { -// node.save(); -// ATContentStudio.frame.nodeChanged(node); -// } -// }); -// popupMenu.add(saveItem); -// } -// -// JMenuItem deleteItem = null; -// if (node.getDataType() == GameSource.Type.created) { -// deleteItem = new JMenuItem("Delete this element"); -// } else if (node.getDataType() == GameSource.Type.altered) { -// deleteItem = new JMenuItem("Revert to original"); -// } -// if (deleteItem != null) { -// popupMenu.add(deleteItem); -// deleteItem.addActionListener(new ActionListener() { -// @SuppressWarnings("unchecked") -// @Override -// public void actionPerformed(ActionEvent e) { -// ATContentStudio.frame.closeEditor(node); -// new Thread() { -// @Override -// public void run() { -// node.childrenRemoved(new ArrayList()); -// if (node.getParent() instanceof GameDataCategory) { -// ((GameDataCategory)node.getParent()).remove(node); -// List events = node.attemptSave(); -// if (events == null || events.isEmpty()) { -// node.save(); -// } else { -// new SaveItemsWizard(events, null).setVisible(true); -// } -// } -// } -// }.start(); -// } -// }); -// } -// popupMenu.addSeparator(); -// -// } -// if (selected instanceof Project || selected instanceof SavedGamesSet) { -// JMenuItem addSave = new JMenuItem("Load saved game..."); -// popupMenu.add(addSave); -// popupMenu.addSeparator(); -// addSave.addActionListener(new ActionListener() { -// @Override -// public void actionPerformed(ActionEvent e) { -// JFileChooser chooser = new JFileChooser("Select an Andor's Trail save file"); -// if (chooser.showOpenDialog(ATContentStudio.frame) == JFileChooser.APPROVE_OPTION) { -// selected.getProject().addSave(chooser.getSelectedFile()); -// selected.getProject().save(); -// } -// } -// }); -// -// } -// } -// if (konamiCodeEntered) { -// JMenuItem openTrainer = new JMenuItem("Start Andor's Trainer..."); -// popupMenu.add(openTrainer); -// popupMenu.addSeparator(); -// openTrainer.addActionListener(new ActionListener() { -// @Override -// public void actionPerformed(ActionEvent e) { -// new Thread() { -// public void run() { -// AndorsTrainer.startApp(false); -// } -// }.start(); -// } -// }); -// } -// JMenu changeLaF = new JMenu("Change Look and Feel"); -// for (final LookAndFeelInfo i : UIManager.getInstalledLookAndFeels()) { -// final JMenuItem lafItem = new JMenuItem("Switch to "+i.getName()); -// changeLaF.add(lafItem); -// lafItem.addActionListener(new ActionListener() { -// @Override -// public void actionPerformed(ActionEvent e) { -// try { -// UIManager.setLookAndFeel(i.getClassName()); -// SwingUtilities.updateComponentTreeUI(ATContentStudio.frame); -// ConfigCache.setFavoriteLaFClassName(i.getClassName()); -// } catch (ClassNotFoundException e1) { -// e1.printStackTrace(); -// } catch (InstantiationException e1) { -// e1.printStackTrace(); -// } catch (IllegalAccessException e1) { -// e1.printStackTrace(); -// } catch (UnsupportedLookAndFeelException e1) { -// e1.printStackTrace(); -// } -// } -// }); -// } -// popupMenu.add(changeLaF); -// popupMenu.addSeparator(); -// JMenuItem showAbout = new JMenuItem("About..."); -// popupMenu.add(showAbout); -// popupMenu.addSeparator(); -// showAbout.addActionListener(new ActionListener() { -// @Override -// public void actionPerformed(ActionEvent e) { -// ATContentStudio.frame.showAbout(); -// } -// }); } public void popupActivated(MouseEvent e) { @@ -584,10 +290,6 @@ public class ProjectsTree extends JPanel { ATContentStudio.frame.openEditor((WriterModeData) node); } else if (node instanceof BookmarkEntry) { ATContentStudio.frame.openEditor(((BookmarkEntry) node).bookmarkedElement); - } else if (node instanceof SavedGame) { - if (konamiCodeEntered) { - ATContentStudio.frame.openEditor((SavedGame) node); - } } } diff --git a/src/com/gpl/rpg/atcontentstudio/ui/StudioFrame.java b/src/com/gpl/rpg/atcontentstudio/ui/StudioFrame.java index 3fa2e14..009d790 100644 --- a/src/com/gpl/rpg/atcontentstudio/ui/StudioFrame.java +++ b/src/com/gpl/rpg/atcontentstudio/ui/StudioFrame.java @@ -8,7 +8,6 @@ import com.gpl.rpg.atcontentstudio.model.Workspace; import com.gpl.rpg.atcontentstudio.model.gamedata.JSONElement; import com.gpl.rpg.atcontentstudio.model.maps.TMXMap; import com.gpl.rpg.atcontentstudio.model.maps.WorldmapSegment; -import com.gpl.rpg.atcontentstudio.model.saves.SavedGame; import com.gpl.rpg.atcontentstudio.model.sprites.Spritesheet; import com.gpl.rpg.atcontentstudio.model.tools.writermode.WriterModeData; @@ -127,7 +126,6 @@ public class StudioFrame extends JFrame { projectMenu.add(new JMenuItem(actions.importJSON)); projectMenu.add(new JMenuItem(actions.createMap)); projectMenu.add(new JMenuItem(actions.createWorldmap)); - projectMenu.add(new JMenuItem(actions.loadSave)); getJMenuBar().add(projectMenu); JMenu toolsMenu = new JMenu("Tools"); @@ -204,10 +202,6 @@ public class StudioFrame extends JFrame { } } - public void openEditor(SavedGame save) { - editors.openEditor(save); - } - public void openEditor(WorldmapSegment node) { editors.openEditor(node); } diff --git a/src/com/gpl/rpg/atcontentstudio/ui/WorkspaceActions.java b/src/com/gpl/rpg/atcontentstudio/ui/WorkspaceActions.java index b797632..5679f6b 100644 --- a/src/com/gpl/rpg/atcontentstudio/ui/WorkspaceActions.java +++ b/src/com/gpl/rpg/atcontentstudio/ui/WorkspaceActions.java @@ -6,7 +6,6 @@ import com.gpl.rpg.atcontentstudio.model.gamedata.*; import com.gpl.rpg.atcontentstudio.model.maps.TMXMap; import com.gpl.rpg.atcontentstudio.model.maps.Worldmap; import com.gpl.rpg.atcontentstudio.model.maps.WorldmapSegment; -import com.gpl.rpg.atcontentstudio.model.saves.SavedGamesSet; import com.gpl.rpg.atcontentstudio.model.tools.writermode.WriterModeData; import com.gpl.rpg.atcontentstudio.model.tools.writermode.WriterModeDataSet; import com.gpl.rpg.atcontentstudio.ui.tools.BeanShellView; @@ -315,22 +314,6 @@ public class WorkspaceActions { } }; - public ATCSAction loadSave = new ATCSAction("Load saved game...", "Opens the saved game loading wizard") { - public void actionPerformed(ActionEvent e) { - if (!(selectedNode instanceof Project || selectedNode instanceof SavedGamesSet)) return; - JFileChooser chooser = new JFileChooser("Select an Andor's Trail save file"); - if (chooser.showOpenDialog(ATContentStudio.frame) == JFileChooser.APPROVE_OPTION) { - selectedNode.getProject().addSave(chooser.getSelectedFile()); - selectedNode.getProject().save(); - } - } - - public void selectionChanged(ProjectTreeNode selectedNode, TreePath[] selectedPaths) { - setEnabled(selectedNode instanceof Project || selectedNode instanceof SavedGamesSet); - } - - }; - public ATCSAction compareItems = new ATCSAction("Items comparator", "Opens an editor showing all the items of the project in a table") { public void actionPerformed(ActionEvent e) { if (selectedNode == null || selectedNode.getProject() == null) return; @@ -466,7 +449,6 @@ public class WorkspaceActions { actions.add(createGDE); actions.add(createMap); actions.add(importJSON); - actions.add(loadSave); actions.add(compareItems); actions.add(compareNPCs); actions.add(exportProject); diff --git a/src/com/gpl/rpg/atcontentstudio/ui/saves/SavedGameEditor.java b/src/com/gpl/rpg/atcontentstudio/ui/saves/SavedGameEditor.java deleted file mode 100644 index ff4b6b0..0000000 --- a/src/com/gpl/rpg/atcontentstudio/ui/saves/SavedGameEditor.java +++ /dev/null @@ -1,30 +0,0 @@ -package com.gpl.rpg.atcontentstudio.ui.saves; - -import com.gpl.rpg.atcontentstudio.ATContentStudio; -import com.gpl.rpg.atcontentstudio.model.saves.SavedGame; -import com.gpl.rpg.atcontentstudio.ui.DefaultIcons; -import com.gpl.rpg.atcontentstudio.ui.Editor; - -import javax.swing.*; -import java.awt.*; - -public class SavedGameEditor extends Editor { - - private static final long serialVersionUID = 6055910379650778737L; - - public SavedGameEditor(SavedGame save) { - this.name = save.loadedSave.displayInfo; - this.icon = new ImageIcon(DefaultIcons.getHeroIcon()); - this.target = save; - setLayout(new BorderLayout()); - add(new JScrollPane(new com.gpl.rpg.andorstrainer.ui.SavedGameEditor(save.loadedSave, ATContentStudio.frame)), BorderLayout.CENTER); - - } - - @Override - public void targetUpdated() { - // TODO Auto-generated method stub - - } - -}