github/mage
1
0
Fork 0
mirror of https://github.com/correl/mage.git synced 2025-04-10 01:01:05 -09:00
Code Issues Projects Releases Packages Wiki Activity

clean

Browse source
This commit is contained in:
Li REN 2013-06-17 00:01:37 -04:00
parent b057857485
commit 848e542ee4
2 changed files with 0 additions and 12 deletions
Mage.Client/src/main/java/mage/client
deckeditor
DeckEditorPanel.java
draft
DraftPanel.java

4
Mage.Client/src/main/java/mage/client/deckeditor/DeckEditorPanel.java
View file

@ -308,10 +308,6 @@ public class DeckEditorPanel extends javax.swing.JPanel {
} }
} }
//private void setTimeout(String text) {
// this.txtTimeRemaining.setText(text);
//}
private void setTimeout(int s){ private void setTimeout(int s){
int minute = s/60; int minute = s/60;
int second = s - (minute*60); int second = s - (minute*60);

8
Mage.Client/src/main/java/mage/client/draft/DraftPanel.java
View file

@ -78,11 +78,9 @@ public class DraftPanel extends javax.swing.JPanel {
@Override @Override
public void actionPerformed(ActionEvent e) { public void actionPerformed(ActionEvent e) {
if (--timeout > 0) { if (--timeout > 0) {
//setTimeout(Integer.toString(timeout));
setTimeout(timeout); setTimeout(timeout);
} }
else { else {
//setTimeout("0");
setTimeout(0); setTimeout(0);
countdown.stop(); countdown.stop();
} }
@ -121,7 +119,6 @@ public class DraftPanel extends javax.swing.JPanel {
SimpleCardView source = (SimpleCardView) event.getSource(); SimpleCardView source = (SimpleCardView) event.getSource();
DraftPickView view = session.sendCardPick(draftId, source.getId()); DraftPickView view = session.sendCardPick(draftId, source.getId());
if (view != null) { if (view != null) {
//draftBooster.loadBooster(view.getBooster(), bigCard);
draftBooster.loadBooster(emptyView, bigCard); draftBooster.loadBooster(emptyView, bigCard);
draftPicks.loadCards(CardsViewUtil.convertSimple(view.getPicks()), bigCard, null); draftPicks.loadCards(CardsViewUtil.convertSimple(view.getPicks()), bigCard, null);
Plugins.getInstance().getActionCallback().hidePopup(); Plugins.getInstance().getActionCallback().hidePopup();
@ -134,16 +131,11 @@ public class DraftPanel extends javax.swing.JPanel {
setMessage("Pick a card"); setMessage("Pick a card");
countdown.stop(); countdown.stop();
this.timeout = draftPickView.getTimeout(); this.timeout = draftPickView.getTimeout();
//setTimeout(Integer.toString(timeout));
setTimeout(timeout); setTimeout(timeout);
if (timeout != 0) { if (timeout != 0) {
countdown.start(); countdown.start();
} }
} }
// private void setTimeout(String text) {
// this.txtTimeRemaining.setText(text);
// }
private void setTimeout(int s){ private void setTimeout(int s){
int minute = s/60; int minute = s/60;