Renamed main Quest frame classname

This commit is contained in:
jendave
2011-08-06 15:18:31 +00:00
parent 955ba8783d
commit 60e95ee33a
8 changed files with 20 additions and 20 deletions

2
.gitattributes vendored
View File

@@ -6740,7 +6740,7 @@ src/forge/properties/Preferences.java svneol=native#text/plain
src/forge/properties/SavePreferencesListener.java svneol=native#text/plain src/forge/properties/SavePreferencesListener.java svneol=native#text/plain
src/forge/quest/Gui_QuestOptions.java svneol=native#text/plain src/forge/quest/Gui_QuestOptions.java svneol=native#text/plain
src/forge/quest/Gui_Quest_Assignments.java svneol=native#text/plain src/forge/quest/Gui_Quest_Assignments.java svneol=native#text/plain
src/forge/quest/QuestMainFrame.java svneol=native#text/plain src/forge/quest/QuestFrame.java svneol=native#text/plain
src/forge/quest/QuestMainPanel.java svneol=native#text/plain src/forge/quest/QuestMainPanel.java svneol=native#text/plain
src/forge/quest/QuestOpponent.java svneol=native#text/plain src/forge/quest/QuestOpponent.java svneol=native#text/plain
src/forge/quest/bazaar/QuestAbstractBazaarItem.java svneol=native#text/plain src/forge/quest/bazaar/QuestAbstractBazaarItem.java svneol=native#text/plain

View File

@@ -1,6 +1,6 @@
package forge; package forge;
import forge.error.ErrorViewer; import forge.error.ErrorViewer;
import forge.quest.QuestMainFrame; import forge.quest.QuestFrame;
import javax.swing.*; import javax.swing.*;
import javax.swing.border.Border; import javax.swing.border.Border;
@@ -202,7 +202,7 @@ public class Gui_QuestOptions extends JFrame {
if(useNewQuestUI.isSelected()){ if(useNewQuestUI.isSelected()){
AllZone.QuestData.useNewQuestUI = true; AllZone.QuestData.useNewQuestUI = true;
new QuestMainFrame(); new QuestFrame();
} }
else else
{ {
@@ -253,7 +253,7 @@ public class Gui_QuestOptions extends JFrame {
dispose(); dispose();
if(useNewQuestUI.isSelected()){ if(useNewQuestUI.isSelected()){
AllZone.QuestData.useNewQuestUI = true; AllZone.QuestData.useNewQuestUI = true;
new QuestMainFrame(); new QuestFrame();
} }
else{ else{
AllZone.QuestData.useNewQuestUI = false; AllZone.QuestData.useNewQuestUI = false;

View File

@@ -6,7 +6,7 @@ import forge.error.ErrorViewer;
import forge.properties.ForgeProps; import forge.properties.ForgeProps;
import forge.properties.NewConstants; import forge.properties.NewConstants;
import forge.properties.NewConstants.LANG.Gui_WinLose.WINLOSE_TEXT; import forge.properties.NewConstants.LANG.Gui_WinLose.WINLOSE_TEXT;
import forge.quest.QuestMainFrame; import forge.quest.QuestFrame;
import net.miginfocom.swing.MigLayout; import net.miginfocom.swing.MigLayout;
import javax.swing.*; import javax.swing.*;
@@ -488,7 +488,7 @@ public class Gui_WinLose extends JFrame implements NewConstants {
QuestData.saveData(quest); QuestData.saveData(quest);
if (AllZone.QuestData.useNewQuestUI){ if (AllZone.QuestData.useNewQuestUI){
new QuestMainFrame(); new QuestFrame();
} }
else{ else{
new Gui_Quest(); new Gui_Quest();

View File

@@ -196,7 +196,7 @@ public class Gui_QuestOptions extends JFrame {
AllZone.QuestData = QuestData.loadData(); AllZone.QuestData = QuestData.loadData();
AllZone.QuestData.setDifficultyIndex(); AllZone.QuestData.setDifficultyIndex();
dispose(); dispose();
new QuestMainFrame(); new QuestFrame();
} }
void newQuestButton_actionPerformed(ActionEvent e) { void newQuestButton_actionPerformed(ActionEvent e) {
@@ -238,7 +238,7 @@ public class Gui_QuestOptions extends JFrame {
AllZone.QuestData = questData; AllZone.QuestData = questData;
dispose(); dispose();
new QuestMainFrame(); new QuestFrame();
} }
//copy AI decks from old to newData //copy AI decks from old to newData

View File

@@ -270,7 +270,7 @@ public class Gui_Quest_Assignments extends JFrame implements NewConstants{
void quitButton_actionPerformed() { void quitButton_actionPerformed() {
dispose(); dispose();
new QuestMainFrame(); new QuestFrame();
} }

View File

@@ -12,7 +12,7 @@ import java.awt.CardLayout;
import java.awt.Dimension; import java.awt.Dimension;
import java.awt.HeadlessException; import java.awt.HeadlessException;
public class QuestMainFrame extends JFrame { public class QuestFrame extends JFrame {
private static final long serialVersionUID = -2832625381531838412L; private static final long serialVersionUID = -2832625381531838412L;
JPanel visiblePanel; JPanel visiblePanel;
@@ -21,7 +21,7 @@ public class QuestMainFrame extends JFrame {
public static final String MAIN_PANEL = "Main"; public static final String MAIN_PANEL = "Main";
public static final String BAZAAR_PANEL = "Bazaar"; public static final String BAZAAR_PANEL = "Bazaar";
public QuestMainFrame() throws HeadlessException { public QuestFrame() throws HeadlessException {
this.setTitle("Quest Mode"); this.setTitle("Quest Mode");
visiblePanel = new JPanel(new BorderLayout()); visiblePanel = new JPanel(new BorderLayout());

View File

@@ -24,7 +24,7 @@ import java.util.List;
public class QuestMainPanel extends JPanel { public class QuestMainPanel extends JPanel {
private QuestData questData; private QuestData questData;
private QuestMainFrame mainFrame; private QuestFrame mainFrame;
JLabel creditsLabel = new JLabel(); JLabel creditsLabel = new JLabel();
JLabel lifeLabel = new JLabel(); JLabel lifeLabel = new JLabel();
@@ -47,7 +47,7 @@ public class QuestMainPanel extends JPanel {
private static final String NO_DECKS_AVAILABLE = "No decks available"; private static final String NO_DECKS_AVAILABLE = "No decks available";
public QuestMainPanel(QuestMainFrame mainFrame) { public QuestMainPanel(QuestFrame mainFrame) {
questData = AllZone.QuestData; questData = AllZone.QuestData;
this.mainFrame = mainFrame; this.mainFrame = mainFrame;
@@ -334,7 +334,7 @@ public class QuestMainPanel extends JPanel {
//saves all deck data //saves all deck data
QuestData.saveData(AllZone.QuestData); QuestData.saveData(AllZone.QuestData);
new QuestMainFrame(); new QuestFrame();
} }
}; };
@@ -346,7 +346,7 @@ public class QuestMainPanel extends JPanel {
}//deck editor button }//deck editor button
void showBazaar() { void showBazaar() {
mainFrame.showPane(QuestMainFrame.BAZAAR_PANEL); mainFrame.showPane(QuestFrame.BAZAAR_PANEL);
} }
void showCardShop() { void showCardShop() {
@@ -357,7 +357,7 @@ public class QuestMainPanel extends JPanel {
//saves all deck data //saves all deck data
QuestData.saveData(AllZone.QuestData); QuestData.saveData(AllZone.QuestData);
new QuestMainFrame(); new QuestFrame();
} }
}; };

View File

@@ -1,6 +1,6 @@
package forge.quest.bazaar; package forge.quest.bazaar;
import forge.quest.QuestMainFrame; import forge.quest.QuestFrame;
import javax.swing.*; import javax.swing.*;
import java.awt.BorderLayout; import java.awt.BorderLayout;
@@ -16,7 +16,7 @@ import java.util.List;
public class QuestBazaarPanel extends JPanel{ public class QuestBazaarPanel extends JPanel{
private static final long serialVersionUID = 1418913010051869222L; private static final long serialVersionUID = 1418913010051869222L;
QuestMainFrame mainFrame; QuestFrame mainFrame;
static List<QuestAbstractBazaarStall> stallList = new ArrayList<QuestAbstractBazaarStall>(); static List<QuestAbstractBazaarStall> stallList = new ArrayList<QuestAbstractBazaarStall>();
JPanel buttonPanel = new JPanel(new BorderLayout()); JPanel buttonPanel = new JPanel(new BorderLayout());
@@ -28,7 +28,7 @@ public class QuestBazaarPanel extends JPanel{
CardLayout stallLayout = new CardLayout(); CardLayout stallLayout = new CardLayout();
public QuestBazaarPanel(QuestMainFrame mainFrame) { public QuestBazaarPanel(QuestFrame mainFrame) {
this.mainFrame = mainFrame; this.mainFrame = mainFrame;
this.setLayout(new BorderLayout()); this.setLayout(new BorderLayout());
@@ -99,7 +99,7 @@ public class QuestBazaarPanel extends JPanel{
quitButton.setSize(max); quitButton.setSize(max);
quitButton.addActionListener(new ActionListener() { quitButton.addActionListener(new ActionListener() {
public void actionPerformed(ActionEvent e) { public void actionPerformed(ActionEvent e) {
QuestBazaarPanel.this.mainFrame.showPane(QuestMainFrame.MAIN_PANEL); QuestBazaarPanel.this.mainFrame.showPane(QuestFrame.MAIN_PANEL);
} }
}); });