External/mage
1
0
Fork 1
mirror of https://github.com/magefree/mage.git synced 2025-12-25 04:52:07 -08:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge

Browse source
This commit is contained in:
BetaSteward 2011-06-05 09:50:31 -04:00
commit 6cbd5369c3
32 changed files with 195 additions and 175 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Mage.Client/src/main/java/mage/client/MagePane.form
View file

@ -1,4 +1,4 @@
<?xml version="1.0" encoding="UTF-8" ?>
<?xml version="1.1" encoding="UTF-8" ?>
<Form version="1.3" maxVersion="1.7" type="org.netbeans.modules.form.forminfo.JInternalFrameFormInfo">
<Properties>

40
Mage.Client/src/main/java/mage/client/MagePane.java
View file

@ -34,13 +34,19 @@
package mage.client;
import java.beans.PropertyVetoException;
import java.util.logging.Level;
import java.util.logging.Logger;
import javax.swing.JLayeredPane;
import javax.swing.event.InternalFrameEvent;
import javax.swing.event.InternalFrameListener;
import javax.swing.plaf.basic.BasicInternalFrameUI;
/**
*
* @author BetaSteward_at_googlemail.com
*/
public class MagePane extends javax.swing.JInternalFrame {
public class MagePane extends javax.swing.JInternalFrame implements InternalFrameListener {
/** Creates new form MagePane */
public MagePane() {
@ -89,4 +95,36 @@ public class MagePane extends javax.swing.JInternalFrame {
// Variables declaration - do not modify//GEN-BEGIN:variables
// End of variables declaration//GEN-END:variables
@Override
public void internalFrameOpened(InternalFrameEvent e) {
}
@Override
public void internalFrameClosing(InternalFrameEvent e) {
}
@Override
public void internalFrameClosed(InternalFrameEvent e) {
try {
MageFrame.getDesktop().getAllFramesInLayer(JLayeredPane.DEFAULT_LAYER)[0].setSelected(true);
} catch (PropertyVetoException ex) {
}
}
@Override
public void internalFrameIconified(InternalFrameEvent e) {
}
@Override
public void internalFrameDeiconified(InternalFrameEvent e) {
}
@Override
public void internalFrameActivated(InternalFrameEvent e) {
}
@Override
public void internalFrameDeactivated(InternalFrameEvent e) {
}
}

2
Mage.Client/src/main/java/mage/client/game/FeedbackPanel.java
View file

@ -144,7 +144,7 @@ public class FeedbackPanel extends javax.swing.JPanel {
this.btnRight.setVisible(false);
this.btnSpecial.setVisible(false);
this.lblMessage.setText("");
logger.info("feedback - clear");
logger.debug("feedback - clear");
}
private synchronized void startModal() {

4
Mage.Client/src/main/java/mage/client/table/TablesPane.form
View file

@ -1,4 +1,4 @@
<?xml version="1.0" encoding="UTF-8" ?>
<?xml version="1.1" encoding="UTF-8" ?>
<Form version="1.3" maxVersion="1.7" type="org.netbeans.modules.form.forminfo.JInternalFrameFormInfo">
<SyntheticProperties>
@ -32,4 +32,4 @@
<Component class="mage.client.table.TablesPanel" name="tablesPanel">
</Component>
</SubComponents>
</Form>
</Form>

2
Mage.Client/src/main/java/mage/client/table/TablesPane.java
View file

@ -38,6 +38,8 @@ import java.util.Map;
import java.util.UUID;
import javax.swing.JComponent;
import javax.swing.event.InternalFrameEvent;
import javax.swing.event.InternalFrameListener;
import mage.client.MageFrame;
import mage.client.MagePane;

2
Mage.Client/src/main/java/mage/client/table/TablesPanel.form
View file

@ -96,7 +96,7 @@
<Layout class="org.netbeans.modules.form.compat2.layouts.support.JSplitPaneSupportLayout"/>
<SubComponents>
<Component class="mage.client.chat.ChatPanel" name="chatPanel">
<Component class="mage.client.chat.ChatPanel" name="chatPanel">
<Properties>
<Property name="minimumSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
<Dimension value="[100, 43]"/>

3
Mage.Client/src/main/java/mage/client/table/TablesPanel.java
View file

@ -473,7 +473,8 @@ class UpdateTablesTask extends SwingWorker<Void, Collection<TableView>> {
@Override
protected Void doInBackground() throws Exception {
while (!isCancelled()) {
this.publish(session.getTables(roomId));
if (MageFrame.getDesktop().getSelectedFrame() instanceof TablesPane)
this.publish(session.getTables(roomId));
Thread.sleep(1000);
}
return null;