Revert "started functionality for creating empty puzzles"

This reverts commit afceb4d.
Bram-Hub · Jun 24, 2022 · f385d60 · f385d60
1 parent afceb4d
commit f385d60
Show file tree

Hide file tree

Showing 6 changed files with 5 additions and 60 deletions.
diff --git a/src/main/java/edu/rpi/legup/app/GameBoardFacade.java b/src/main/java/edu/rpi/legup/app/GameBoardFacade.java
@@ -96,41 +96,6 @@ public void setConfig(Config config) {
         this.config = config;
     }
 
-    /**
-     * Loads an empty puzzle
-     *
-     * @param game name of the puzzle
-     * @param width width of the puzzle
-     * @param height height of the puzzle
-     */
-    public void loadPuzzle(String game, int width, int height) throws RuntimeException {
-        setWindowTitle(puzzle.getName(), "New " + puzzle.getName() + " Puzzle");
-        String qualifiedClassName = config.getPuzzleClassForName(game);
-        LOGGER.debug("Loading " + qualifiedClassName);
-
-        try {
-            Class<?> c = Class.forName(qualifiedClassName);
-            Constructor<?> cons = c.getConstructor();
-            Puzzle puzzle = (Puzzle) cons.newInstance();
-
-            PuzzleImporter importer = puzzle.getImporter();
-            if (importer == null) {
-                LOGGER.error("Puzzle importer is null");
-                throw new RuntimeException("Puzzle importer null");
-            }
-
-            importer.initializePuzzle(width, height);
-            puzzle.initializeView();
-            puzzle.getBoardView().onTreeElementChanged(puzzle.getTree().getRootNode());
-            setPuzzle(puzzle);
-        }
-        catch(ClassNotFoundException | NoSuchMethodException | InvocationTargetException |
-              IllegalAccessException | InstantiationException e) {
-            LOGGER.error(e);
-            throw new RuntimeException("Puzzle creation error");
-        }
-    }
-
     /**
      * Loads a puzzle file
      *

diff --git a/src/main/java/edu/rpi/legup/model/PuzzleImporter.java b/src/main/java/edu/rpi/legup/model/PuzzleImporter.java
@@ -29,17 +29,6 @@ public PuzzleImporter(Puzzle puzzle) {
         this.puzzle = puzzle;
     }
 
-    /**
-     * Initializes an empty puzzle
-     *
-     * @param width width of puzzle
-     * @param height height of puzzle
-     * @throws RuntimeException
-     */
-    public void initializePuzzle(int width, int height) throws RuntimeException {
-
-    }
-
     /**
      * Initializes the puzzle attributes
      *

diff --git a/src/main/java/edu/rpi/legup/ui/CreatePuzzleDialog.java b/src/main/java/edu/rpi/legup/ui/CreatePuzzleDialog.java
@@ -77,7 +77,7 @@ public void initPuzzles() {
     public void actionPerformed(ActionEvent e) {
         if (e.getSource() == ok) {
             String game = (String) gameBox.getSelectedItem();
-            this.homePanel.openEditorWithNewPuzzle(game, Integer.valueOf(width.getText()), Integer.valueOf(height.getText()));
+            this.homePanel.openEditorWithNewPuzzle(game);
             setVisible(false);
         }
         else if (e.getSource() == cancel) {

diff --git a/src/main/java/edu/rpi/legup/ui/HomePanel.java b/src/main/java/edu/rpi/legup/ui/HomePanel.java
@@ -149,9 +149,8 @@ private void openNewPuzzleDialog() {
         cpd.setVisible(true);
     }
 
-    public void openEditorWithNewPuzzle(String game, int width, int height) {
+    public void openEditorWithNewPuzzle(String game) {
         // Set game type on the puzzle editor
         this.legupUI.displayPanel(2);
-        this.legupUI.getPuzzleEditor().loadPuzzleFromHome(game, width, height);
     }
 }
diff --git a/src/main/java/edu/rpi/legup/ui/LegupUI.java b/src/main/java/edu/rpi/legup/ui/LegupUI.java
@@ -157,8 +157,6 @@ public PuzzleEditorPanel getPuzzleEditor() {
         return (PuzzleEditorPanel) panels[2];
     }
 
-    public PuzzleEditorPanel getPuzzleEditor() { return (PuzzleEditorPanel) panels[2]; }
-
     public static boolean profFlag(int flag) {
         return !((PROF_FLAGS[CONFIG_INDEX] & flag) == 0);
     }

diff --git a/src/main/java/edu/rpi/legup/ui/PuzzleEditorPanel.java b/src/main/java/edu/rpi/legup/ui/PuzzleEditorPanel.java
@@ -4,11 +4,13 @@
 import edu.rpi.legup.controller.BoardController;
 import edu.rpi.legup.controller.EditorElementController;
 import edu.rpi.legup.controller.ElementController;
+import edu.rpi.legup.controller.RuleController;
 import edu.rpi.legup.history.ICommand;
 import edu.rpi.legup.history.IHistoryListener;
 import edu.rpi.legup.model.Puzzle;
 import edu.rpi.legup.save.InvalidFileFormatException;
 import edu.rpi.legup.ui.boardview.BoardView;
+import edu.rpi.legup.ui.proofeditorui.rulesview.RuleFrame;
 import edu.rpi.legup.ui.puzzleeditorui.elementsview.ElementFrame;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
@@ -170,15 +172,7 @@ private void setupToolBar() {
 
         this.add(toolBar, BorderLayout.NORTH);
     }
-    public void loadPuzzleFromHome(String game, int width, int height) {
-        GameBoardFacade facade = GameBoardFacade.getInstance();
-        try {
-            facade.loadPuzzle(game, width, height);
-        }
-        catch (RuntimeException e){
-            LOGGER.error(e.getMessage());
-        }
-    }
+
     public void promptPuzzle() {
         GameBoardFacade facade = GameBoardFacade.getInstance();
         if (facade.getBoard() != null) {