diff --git a/java/src/mimis/Manager.java b/java/src/mimis/Manager.java index e4d1e79..626deb7 100644 --- a/java/src/mimis/Manager.java +++ b/java/src/mimis/Manager.java @@ -7,47 +7,46 @@ import java.util.Map; import javax.swing.JToggleButton; import mimis.exception.worker.DeactivateException; -import mimis.manager.ManageButton; -import mimis.manager.Titled; +import mimis.manager.WorkerButton; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -public class Manager extends Worker { +public class Manager extends Worker { protected Log log = LogFactory.getLog(getClass()); protected static final long serialVersionUID = 1L; protected static final int INTERVAL = 1000; - protected T[] manageableArray; - protected Map> buttonMap; + protected Worker[] workerArray; + protected Map buttonMap; - public Manager(T[] manageableArray) { - this.manageableArray = manageableArray; + public Manager(T[] workerArray) { + this.workerArray = workerArray; createButtons(); } protected void deactivate() throws DeactivateException { super.deactivate(); - for (T manageable : manageableArray) { + for (Worker manageable : workerArray) { manageable.stop(); } } public void exit() { super.exit(); - for (T manageable : manageableArray) { + for (Worker manageable : workerArray) { manageable.exit(); } } public int count() { - return manageableArray.length; + return workerArray.length; } protected void createButtons() { - buttonMap = new HashMap>(); - for (T manageable : manageableArray) { - ManageButton button = new ManageButton(manageable); + buttonMap = new HashMap(); + for (Worker manageable : workerArray) { + WorkerButton button = new WorkerButton(manageable); buttonMap.put(manageable, button); } } @@ -57,11 +56,10 @@ public class Manager extends Worker { } protected void work() { - /* Todo: timertask! */ long before = Calendar.getInstance().getTimeInMillis(); - for (T manageable : manageableArray) { + for (Worker manageable : workerArray) { boolean active = manageable.active(); - ManageButton button = buttonMap.get(manageable); + WorkerButton button = buttonMap.get(manageable); button.setPressed(active); } long after = Calendar.getInstance().getTimeInMillis(); diff --git a/java/src/mimis/manager/ManageButton.java b/java/src/mimis/manager/WorkerButton.java similarity index 70% rename from java/src/mimis/manager/ManageButton.java rename to java/src/mimis/manager/WorkerButton.java index f4a8aff..e94528a 100644 --- a/java/src/mimis/manager/ManageButton.java +++ b/java/src/mimis/manager/WorkerButton.java @@ -7,30 +7,33 @@ import javax.swing.Action; import javax.swing.JToggleButton; import mimis.Worker; + import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -public class ManageButton extends JToggleButton implements MouseListener { +public class WorkerButton extends JToggleButton implements MouseListener { protected Log log = LogFactory.getLog(getClass()); protected static final long serialVersionUID = 1L; - protected T manageable; + protected Worker worker; protected Action action; - public ManageButton(T manageable) { - this.manageable = manageable; - setText(manageable.title()); + public WorkerButton(Worker worker) { + this.worker = worker; setFocusable(false); addMouseListener(this); + if (worker instanceof Titled) { + setText(((Titled) worker).title()); + } } public void mouseClicked(MouseEvent event) { - if (manageable.active()) { + if (worker.active()) { log.trace("Stop"); - manageable.stop(); + worker.stop(); } else { log.trace("Start"); - manageable.start(); + worker.start(); } } diff --git a/java/src/org/wiigee/device/Device.java b/java/src/org/wiigee/device/Device.java index 86bc2f0..0f6e016 100644 --- a/java/src/org/wiigee/device/Device.java +++ b/java/src/org/wiigee/device/Device.java @@ -112,7 +112,7 @@ public class Device { } /** - * Adds a ButtonListener to the Device. Everytime a ManageButton has been + * Adds a ButtonListener to the Device. Everytime a WorkerButton has been * pressed or released, the Listener would be notified about this via * the corresponding Events. * diff --git a/java/src/org/wiigee/event/ButtonPressedEvent.java b/java/src/org/wiigee/event/ButtonPressedEvent.java index 0251dab..818ae1f 100644 --- a/java/src/org/wiigee/event/ButtonPressedEvent.java +++ b/java/src/org/wiigee/event/ButtonPressedEvent.java @@ -55,7 +55,7 @@ public class ButtonPressedEvent extends ActionStartEvent { /** * Create a WiimoteButtonPressedEvent with the Wiimote source whose - * ManageButton has been pressed and the integer representation of the button. + * WorkerButton has been pressed and the integer representation of the button. * * @param source * @param button diff --git a/java/src/wiiusej/wiiusejevents/physicalevents/ClassicControllerButtonsEvent.java b/java/src/wiiusej/wiiusejevents/physicalevents/ClassicControllerButtonsEvent.java index 9f9fa50..f3a2f54 100644 --- a/java/src/wiiusej/wiiusejevents/physicalevents/ClassicControllerButtonsEvent.java +++ b/java/src/wiiusej/wiiusejevents/physicalevents/ClassicControllerButtonsEvent.java @@ -56,7 +56,7 @@ public class ClassicControllerButtonsEvent extends ButtonsEvent{ super(id, buttonsJustPressed, buttonsJustReleased, buttonsHeld); } - /* ManageButton LEFT */ + /* WorkerButton LEFT */ public boolean isButtonLeftJustPressed() { return isButtonJustPressed(CLASSIC_CTRL_BUTTON_LEFT); @@ -74,7 +74,7 @@ public class ClassicControllerButtonsEvent extends ButtonsEvent{ return isButtonPressed(CLASSIC_CTRL_BUTTON_LEFT); } - /* ManageButton RIGHT */ + /* WorkerButton RIGHT */ public boolean isButtonRightJustPressed() { return isButtonJustPressed(CLASSIC_CTRL_BUTTON_RIGHT); @@ -92,7 +92,7 @@ public class ClassicControllerButtonsEvent extends ButtonsEvent{ return isButtonPressed(CLASSIC_CTRL_BUTTON_RIGHT); } - /* ManageButton UP */ + /* WorkerButton UP */ public boolean isButtonUpJustPressed() { return isButtonJustPressed(CLASSIC_CTRL_BUTTON_UP); @@ -110,7 +110,7 @@ public class ClassicControllerButtonsEvent extends ButtonsEvent{ return isButtonPressed(CLASSIC_CTRL_BUTTON_UP); } - /* ManageButton DOWN */ + /* WorkerButton DOWN */ public boolean isButtonDownJustPressed() { return isButtonJustPressed(CLASSIC_CTRL_BUTTON_DOWN); @@ -128,7 +128,7 @@ public class ClassicControllerButtonsEvent extends ButtonsEvent{ return isButtonPressed(CLASSIC_CTRL_BUTTON_DOWN); } - /* ManageButton A */ + /* WorkerButton A */ public boolean isButtonAJustPressed() { return isButtonJustPressed(CLASSIC_CTRL_BUTTON_A); @@ -146,7 +146,7 @@ public class ClassicControllerButtonsEvent extends ButtonsEvent{ return isButtonPressed(CLASSIC_CTRL_BUTTON_A); } - /* ManageButton B */ + /* WorkerButton B */ public boolean isButtonBJustPressed() { return isButtonJustPressed(CLASSIC_CTRL_BUTTON_B); @@ -164,7 +164,7 @@ public class ClassicControllerButtonsEvent extends ButtonsEvent{ return isButtonPressed(CLASSIC_CTRL_BUTTON_B); } - /* ManageButton X */ + /* WorkerButton X */ public boolean isButtonXJustPressed() { return isButtonJustPressed(CLASSIC_CTRL_BUTTON_X); @@ -182,7 +182,7 @@ public class ClassicControllerButtonsEvent extends ButtonsEvent{ return isButtonPressed(CLASSIC_CTRL_BUTTON_X); } - /* ManageButton Y */ + /* WorkerButton Y */ public boolean isButtonYJustPressed() { return isButtonJustPressed(CLASSIC_CTRL_BUTTON_Y); @@ -200,7 +200,7 @@ public class ClassicControllerButtonsEvent extends ButtonsEvent{ return isButtonPressed(CLASSIC_CTRL_BUTTON_Y); } - /* ManageButton FullLeft */ + /* WorkerButton FullLeft */ public boolean isButtonFullLeftJustPressed() { return isButtonJustPressed(CLASSIC_CTRL_BUTTON_FULL_L); @@ -218,7 +218,7 @@ public class ClassicControllerButtonsEvent extends ButtonsEvent{ return isButtonPressed(CLASSIC_CTRL_BUTTON_FULL_L); } - /* ManageButton FullRight */ + /* WorkerButton FullRight */ public boolean isButtonFullRightJustPressed() { return isButtonJustPressed(CLASSIC_CTRL_BUTTON_FULL_R); @@ -236,7 +236,7 @@ public class ClassicControllerButtonsEvent extends ButtonsEvent{ return isButtonPressed(CLASSIC_CTRL_BUTTON_FULL_R); } - /* ManageButton Home */ + /* WorkerButton Home */ public boolean isButtonHomeJustPressed() { return isButtonJustPressed(CLASSIC_CTRL_BUTTON_HOME); @@ -254,7 +254,7 @@ public class ClassicControllerButtonsEvent extends ButtonsEvent{ return isButtonPressed(CLASSIC_CTRL_BUTTON_HOME); } - /* ManageButton Minus */ + /* WorkerButton Minus */ public boolean isButtonMinusJustPressed() { return isButtonJustPressed(CLASSIC_CTRL_BUTTON_MINUS); @@ -272,7 +272,7 @@ public class ClassicControllerButtonsEvent extends ButtonsEvent{ return isButtonPressed(CLASSIC_CTRL_BUTTON_MINUS); } - /* ManageButton Plus */ + /* WorkerButton Plus */ public boolean isButtonPlusJustPressed() { return isButtonJustPressed(CLASSIC_CTRL_BUTTON_PLUS); @@ -290,7 +290,7 @@ public class ClassicControllerButtonsEvent extends ButtonsEvent{ return isButtonPressed(CLASSIC_CTRL_BUTTON_PLUS); } - /* ManageButton ZL */ + /* WorkerButton ZL */ public boolean isButtonZLJustPressed() { return isButtonJustPressed(CLASSIC_CTRL_BUTTON_ZL); @@ -308,7 +308,7 @@ public class ClassicControllerButtonsEvent extends ButtonsEvent{ return isButtonPressed(CLASSIC_CTRL_BUTTON_ZL); } - /* ManageButton ZR */ + /* WorkerButton ZR */ public boolean isButtonZRJustPressed() { return isButtonJustPressed(CLASSIC_CTRL_BUTTON_ZR); diff --git a/java/src/wiiusej/wiiusejevents/physicalevents/GuitarHeroButtonsEvent.java b/java/src/wiiusej/wiiusejevents/physicalevents/GuitarHeroButtonsEvent.java index f38e618..174671d 100644 --- a/java/src/wiiusej/wiiusejevents/physicalevents/GuitarHeroButtonsEvent.java +++ b/java/src/wiiusej/wiiusejevents/physicalevents/GuitarHeroButtonsEvent.java @@ -50,7 +50,7 @@ public class GuitarHeroButtonsEvent extends ButtonsEvent { super(id, buttonsJustPressed, buttonsJustReleased, buttonsHeld); } - /* ManageButton Strum Up */ + /* WorkerButton Strum Up */ public boolean isButtonStrumUpJustPressed() { return isButtonJustPressed(GUITAR_HERO_3_BUTTON_STRUM_UP); @@ -68,7 +68,7 @@ public class GuitarHeroButtonsEvent extends ButtonsEvent { return isButtonPressed(GUITAR_HERO_3_BUTTON_STRUM_UP); } - /* ManageButton Strum Down */ + /* WorkerButton Strum Down */ public boolean isButtonStrumDownJustPressed() { return isButtonJustPressed(GUITAR_HERO_3_BUTTON_STRUM_DOWN); @@ -86,7 +86,7 @@ public class GuitarHeroButtonsEvent extends ButtonsEvent { return isButtonPressed(GUITAR_HERO_3_BUTTON_STRUM_DOWN); } - /* ManageButton blue */ + /* WorkerButton blue */ public boolean isButtonBlueJustPressed() { return isButtonJustPressed(GUITAR_HERO_3_BUTTON_BLUE); @@ -104,7 +104,7 @@ public class GuitarHeroButtonsEvent extends ButtonsEvent { return isButtonPressed(GUITAR_HERO_3_BUTTON_BLUE); } - /* ManageButton Green */ + /* WorkerButton Green */ public boolean isButtonGreenJustPressed() { return isButtonJustPressed(GUITAR_HERO_3_BUTTON_GREEN); @@ -122,7 +122,7 @@ public class GuitarHeroButtonsEvent extends ButtonsEvent { return isButtonPressed(GUITAR_HERO_3_BUTTON_GREEN); } - /* ManageButton Minus */ + /* WorkerButton Minus */ public boolean isButtonMinusJustPressed() { return isButtonJustPressed(GUITAR_HERO_3_BUTTON_MINUS); @@ -140,7 +140,7 @@ public class GuitarHeroButtonsEvent extends ButtonsEvent { return isButtonPressed(GUITAR_HERO_3_BUTTON_MINUS); } - /* ManageButton Orange */ + /* WorkerButton Orange */ public boolean isButtonOrangeJustPressed() { return isButtonJustPressed(GUITAR_HERO_3_BUTTON_ORANGE); @@ -158,7 +158,7 @@ public class GuitarHeroButtonsEvent extends ButtonsEvent { return isButtonPressed(GUITAR_HERO_3_BUTTON_ORANGE); } - /* ManageButton Plus */ + /* WorkerButton Plus */ public boolean isButtonPlusJustPressed() { return isButtonJustPressed(GUITAR_HERO_3_BUTTON_PLUS); @@ -176,7 +176,7 @@ public class GuitarHeroButtonsEvent extends ButtonsEvent { return isButtonPressed(GUITAR_HERO_3_BUTTON_PLUS); } - /* ManageButton Red */ + /* WorkerButton Red */ public boolean isButtonRedJustPressed() { return isButtonJustPressed(GUITAR_HERO_3_BUTTON_RED); @@ -194,7 +194,7 @@ public class GuitarHeroButtonsEvent extends ButtonsEvent { return isButtonPressed(GUITAR_HERO_3_BUTTON_RED); } - /* ManageButton Yellow */ + /* WorkerButton Yellow */ public boolean isButtonYellowJustPressed() { return isButtonJustPressed(GUITAR_HERO_3_BUTTON_YELLOW); diff --git a/java/src/wiiusej/wiiusejevents/physicalevents/NunchukButtonsEvent.java b/java/src/wiiusej/wiiusejevents/physicalevents/NunchukButtonsEvent.java index 69c20e6..f83b68c 100644 --- a/java/src/wiiusej/wiiusejevents/physicalevents/NunchukButtonsEvent.java +++ b/java/src/wiiusej/wiiusejevents/physicalevents/NunchukButtonsEvent.java @@ -44,7 +44,7 @@ public class NunchukButtonsEvent extends ButtonsEvent { super(id, buttonsJustPressed, buttonsJustReleased, buttonsHeld); } - /* ManageButton Z */ + /* WorkerButton Z */ public boolean isButtonZJustPressed() { return isButtonJustPressed(NUNCHUK_BUTTON_Z); @@ -62,7 +62,7 @@ public class NunchukButtonsEvent extends ButtonsEvent { return isButtonPressed(NUNCHUK_BUTTON_Z); } - /* ManageButton Z */ + /* WorkerButton Z */ public boolean isButtonCJustPressed() { return isButtonJustPressed(NUNCHUK_BUTTON_C); diff --git a/java/src/wiiusej/wiiusejevents/physicalevents/WiimoteButtonsEvent.java b/java/src/wiiusej/wiiusejevents/physicalevents/WiimoteButtonsEvent.java index 7cd3630..6ae3a09 100644 --- a/java/src/wiiusej/wiiusejevents/physicalevents/WiimoteButtonsEvent.java +++ b/java/src/wiiusej/wiiusejevents/physicalevents/WiimoteButtonsEvent.java @@ -60,7 +60,7 @@ public class WiimoteButtonsEvent extends ButtonsEvent { super(id, buttonsJustPressed, buttonsJustReleased, buttonsHeld); } - /* ManageButton ONE */ + /* WorkerButton ONE */ public boolean isButtonOneJustPressed() { return isButtonJustPressed(WIIMOTE_BUTTON_ONE); @@ -78,7 +78,7 @@ public class WiimoteButtonsEvent extends ButtonsEvent { return isButtonPressed(WIIMOTE_BUTTON_ONE); } - /* ManageButton TWO */ + /* WorkerButton TWO */ public boolean isButtonTwoJustPressed() { return isButtonJustPressed(WIIMOTE_BUTTON_TWO); @@ -96,7 +96,7 @@ public class WiimoteButtonsEvent extends ButtonsEvent { return isButtonPressed(WIIMOTE_BUTTON_TWO); } - /* ManageButton A */ + /* WorkerButton A */ public boolean isButtonAJustPressed() { return isButtonJustPressed(WIIMOTE_BUTTON_A); @@ -114,7 +114,7 @@ public class WiimoteButtonsEvent extends ButtonsEvent { return isButtonPressed(WIIMOTE_BUTTON_A); } - /* ManageButton B */ + /* WorkerButton B */ public boolean isButtonBJustPressed() { return isButtonJustPressed(WIIMOTE_BUTTON_B); @@ -132,7 +132,7 @@ public class WiimoteButtonsEvent extends ButtonsEvent { return isButtonPressed(WIIMOTE_BUTTON_B); } - /* ManageButton LEFT */ + /* WorkerButton LEFT */ public boolean isButtonLeftJustPressed() { return isButtonJustPressed(WIIMOTE_BUTTON_LEFT); @@ -150,7 +150,7 @@ public class WiimoteButtonsEvent extends ButtonsEvent { return isButtonPressed(WIIMOTE_BUTTON_LEFT); } - /* ManageButton RIGHT */ + /* WorkerButton RIGHT */ public boolean isButtonRightJustPressed() { return isButtonJustPressed(WIIMOTE_BUTTON_RIGHT); @@ -168,7 +168,7 @@ public class WiimoteButtonsEvent extends ButtonsEvent { return isButtonPressed(WIIMOTE_BUTTON_RIGHT); } - /* ManageButton UP */ + /* WorkerButton UP */ public boolean isButtonUpJustPressed() { return isButtonJustPressed(WIIMOTE_BUTTON_UP); @@ -186,7 +186,7 @@ public class WiimoteButtonsEvent extends ButtonsEvent { return isButtonPressed(WIIMOTE_BUTTON_UP); } - /* ManageButton DOWN */ + /* WorkerButton DOWN */ public boolean isButtonDownJustPressed() { return isButtonJustPressed(WIIMOTE_BUTTON_DOWN); @@ -204,7 +204,7 @@ public class WiimoteButtonsEvent extends ButtonsEvent { return isButtonPressed(WIIMOTE_BUTTON_DOWN); } - /* ManageButton - */ + /* WorkerButton - */ public boolean isButtonMinusJustPressed() { return isButtonJustPressed(WIIMOTE_BUTTON_MINUS); @@ -222,7 +222,7 @@ public class WiimoteButtonsEvent extends ButtonsEvent { return isButtonPressed(WIIMOTE_BUTTON_MINUS); } - /* ManageButton + */ + /* WorkerButton + */ public boolean isButtonPlusJustPressed() { return isButtonJustPressed(WIIMOTE_BUTTON_PLUS); @@ -240,7 +240,7 @@ public class WiimoteButtonsEvent extends ButtonsEvent { return isButtonPressed(WIIMOTE_BUTTON_PLUS); } - /* ManageButton HOME */ + /* WorkerButton HOME */ public boolean isButtonHomeJustPressed() { return isButtonJustPressed(WIIMOTE_BUTTON_HOME);