From 9662e1f6842d13f429056647de8858c5faca308d Mon Sep 17 00:00:00 2001 From: Hanno Fleischer Date: Sun, 17 Nov 2024 15:34:39 +0100 Subject: [PATCH] fixed a Bug where the import statement thought a package was a class because they where written the same --- Projekte/.run/MdgaApp.run.xml | 2 +- .../java/pp/mdga/client/Animation/MdgaAnimation.java | 4 ---- .../main/java/pp/mdga/client/Board/PileControl.java | 5 ----- .../src/main/java/pp/mdga/client/Dialog/Dialog.java | 5 ----- .../main/java/pp/mdga/client/Dialog/MenuDialog.java | 5 ----- .../src/main/java/pp/mdga/client/Gui/GuiView.java | 5 ----- .../client/src/main/java/pp/mdga/client/MdgaApp.java | 10 +++++----- .../client/{Acoustic => acoustic}/AcousticHandler.java | 2 +- .../mdga/client/{Acoustic => acoustic}/GameMusic.java | 2 +- .../mdga/client/{Acoustic => acoustic}/GameSound.java | 2 +- .../mdga/client/{Acoustic => acoustic}/MdgaSound.java | 2 +- .../mdga/client/{Acoustic => acoustic}/MusicAsset.java | 2 +- .../mdga/client/{Acoustic => acoustic}/SoundAsset.java | 2 +- .../{Acoustic => acoustic}/SoundAssetDelayVolume.java | 2 +- .../client/{Animation => animation}/Animation.java | 2 +- .../{Animation => animation}/AnimationHandler.java | 2 +- .../{Animation => animation}/EmptyAnimation.java | 2 +- .../java/pp/mdga/client/animation/MdgaAnimation.java | 4 ++++ .../pp/mdga/client/{Board => board}/AssetOnMap.java | 2 +- .../pp/mdga/client/{Board => board}/BoardAsset.java | 2 +- .../pp/mdga/client/{Board => board}/BoardView.java | 2 +- .../pp/mdga/client/{Board => board}/MapLoader.java | 2 +- .../pp/mdga/client/{Board => board}/NodeControl.java | 2 +- .../pp/mdga/client/{Board => board}/PieceControl.java | 2 +- .../main/java/pp/mdga/client/board/PileControl.java | 5 +++++ .../src/main/java/pp/mdga/client/dialog/Dialog.java | 5 +++++ .../pp/mdga/client/{Dialog => dialog}/DialogView.java | 2 +- .../client/{Dialog => dialog}/InterruptDialog.java | 2 +- .../main/java/pp/mdga/client/dialog/MenuDialog.java | 5 +++++ .../mdga/client/{Dialog => dialog}/NetworkDialog.java | 2 +- .../pp/mdga/client/{Dialog => dialog}/SoundDialog.java | 2 +- .../pp/mdga/client/{Dialog => dialog}/StartDialog.java | 2 +- .../pp/mdga/client/{Dialog => dialog}/VideoDialog.java | 2 +- .../src/main/java/pp/mdga/client/gui/GuiView.java | 5 +++++ .../mdga/model/src/main/java/pp.mdga/game/Game.java | 2 +- 35 files changed, 53 insertions(+), 53 deletions(-) delete mode 100644 Projekte/mdga/client/src/main/java/pp/mdga/client/Animation/MdgaAnimation.java delete mode 100644 Projekte/mdga/client/src/main/java/pp/mdga/client/Board/PileControl.java delete mode 100644 Projekte/mdga/client/src/main/java/pp/mdga/client/Dialog/Dialog.java delete mode 100644 Projekte/mdga/client/src/main/java/pp/mdga/client/Dialog/MenuDialog.java delete mode 100644 Projekte/mdga/client/src/main/java/pp/mdga/client/Gui/GuiView.java rename Projekte/mdga/client/src/main/java/pp/mdga/client/{Acoustic => acoustic}/AcousticHandler.java (99%) rename Projekte/mdga/client/src/main/java/pp/mdga/client/{Acoustic => acoustic}/GameMusic.java (99%) rename Projekte/mdga/client/src/main/java/pp/mdga/client/{Acoustic => acoustic}/GameSound.java (98%) rename Projekte/mdga/client/src/main/java/pp/mdga/client/{Acoustic => acoustic}/MdgaSound.java (94%) rename Projekte/mdga/client/src/main/java/pp/mdga/client/{Acoustic => acoustic}/MusicAsset.java (98%) rename Projekte/mdga/client/src/main/java/pp/mdga/client/{Acoustic => acoustic}/SoundAsset.java (96%) rename Projekte/mdga/client/src/main/java/pp/mdga/client/{Acoustic => acoustic}/SoundAssetDelayVolume.java (87%) rename Projekte/mdga/client/src/main/java/pp/mdga/client/{Animation => animation}/Animation.java (77%) rename Projekte/mdga/client/src/main/java/pp/mdga/client/{Animation => animation}/AnimationHandler.java (93%) rename Projekte/mdga/client/src/main/java/pp/mdga/client/{Animation => animation}/EmptyAnimation.java (86%) create mode 100644 Projekte/mdga/client/src/main/java/pp/mdga/client/animation/MdgaAnimation.java rename Projekte/mdga/client/src/main/java/pp/mdga/client/{Board => board}/AssetOnMap.java (68%) rename Projekte/mdga/client/src/main/java/pp/mdga/client/{Board => board}/BoardAsset.java (98%) rename Projekte/mdga/client/src/main/java/pp/mdga/client/{Board => board}/BoardView.java (99%) rename Projekte/mdga/client/src/main/java/pp/mdga/client/{Board => board}/MapLoader.java (98%) rename Projekte/mdga/client/src/main/java/pp/mdga/client/{Board => board}/NodeControl.java (92%) rename Projekte/mdga/client/src/main/java/pp/mdga/client/{Board => board}/PieceControl.java (92%) create mode 100644 Projekte/mdga/client/src/main/java/pp/mdga/client/board/PileControl.java create mode 100644 Projekte/mdga/client/src/main/java/pp/mdga/client/dialog/Dialog.java rename Projekte/mdga/client/src/main/java/pp/mdga/client/{Dialog => dialog}/DialogView.java (94%) rename Projekte/mdga/client/src/main/java/pp/mdga/client/{Dialog => dialog}/InterruptDialog.java (52%) create mode 100644 Projekte/mdga/client/src/main/java/pp/mdga/client/dialog/MenuDialog.java rename Projekte/mdga/client/src/main/java/pp/mdga/client/{Dialog => dialog}/NetworkDialog.java (51%) rename Projekte/mdga/client/src/main/java/pp/mdga/client/{Dialog => dialog}/SoundDialog.java (50%) rename Projekte/mdga/client/src/main/java/pp/mdga/client/{Dialog => dialog}/StartDialog.java (97%) rename Projekte/mdga/client/src/main/java/pp/mdga/client/{Dialog => dialog}/VideoDialog.java (50%) create mode 100644 Projekte/mdga/client/src/main/java/pp/mdga/client/gui/GuiView.java diff --git a/Projekte/.run/MdgaApp.run.xml b/Projekte/.run/MdgaApp.run.xml index 051df2ea..0ed782b0 100644 --- a/Projekte/.run/MdgaApp.run.xml +++ b/Projekte/.run/MdgaApp.run.xml @@ -6,7 +6,7 @@