[dmdirc commit] r5810 - in trunk: src/com/dmdirc/actions/wrappers test/com/dmdirc/plugins
com...@dmdirc.com
Date: 2010-01-19 16:53:05 +0000 (Tue, 19 Jan 2010)
New Revision: 5810
Modified:
trunk/src/com/dmdirc/actions/wrappers/PerformWrapper.java
trunk/test/com/dmdirc/plugins/testplugin.jar
Log:
Update test plugin to use config file Methods to support per-profile performs
Git-version: 0.6.3m2-337-g4ecaf4c
Modified: trunk/src/com/dmdirc/actions/wrappers/PerformWrapper.java
===================================================================
--- trunk/src/com/dmdirc/actions/wrappers/PerformWrapper.java 2010-01-18 23:38:05 UTC (rev 5809)
+++ trunk/src/com/dmdirc/actions/wrappers/PerformWrapper.java 2010-01-19 16:53:05 UTC (rev 5810)
@@ -22,6 +22,8 @@
package com.dmdirc.actions.wrappers;
+import com.dmdirc.Precondition;
+import com.dmdirc.Server;
import com.dmdirc.actions.Action;
import com.dmdirc.actions.ActionComponentChain;
import com.dmdirc.actions.interfaces.ActionComponent;
@@ -46,6 +48,9 @@
/** A singleton instance of the Perform Wrapper. */
private static PerformWrapper me = new PerformWrapper();
+
+ /** The component name for per-profile perform conditions. */
+ private static String PP_COMP_NAME = "SERVER_IDENTITY.IDENTITY_NAME";
/**
* Creates a new instance of PerformWrapper.
@@ -91,7 +96,7 @@
&& !target) {
target = true;
} else if (condition.getComponent() instanceof ActionComponentChain
- && "SERVER_IDENTITY.IDENTITY_NAME".equals(condition.getComponent().toString())
+ && PP_COMP_NAME.equals(condition.getComponent().toString())
&& !profile) {
profile = true;
} else {
@@ -101,8 +106,41 @@
return target || profile;
}
-
+
/**
+ * Determines if the specified action is a per-profile perform, as opposed
+ * to a generic perform.
+ *
+ * @param action The action to be tested
+ * @return True if the action is per-profile, false otherwise
+ * @since 0.6.3
+ */
+ public boolean isPerProfilePerform(final Action action) {
+ return contains(action) && action.getConditions().size() == 2;
+ }
+
+ /**
+ * Retrieves the name of the profile that is targetted by the specified
+ * per-profile perform action.
+ *
+ * @param action The action whose perform should be retrieved
+ * @return The action's targetted profile name
+ * @since 0.6.3
+ */
+ @Precondition("The action is a per-profile perform")
+ public String getProfileName(final Action action) {
+ Logger.assertTrue(isPerProfilePerform(action));
+
+ for (ActionCondition condition : action.getConditions()) {
+ if (PP_COMP_NAME.equals(condition.getComponent().toString())) {
+ return condition.getTarget();
+ }
+ }
+
+ throw new IllegalStateException("Profile component not found in action");
+ }
+
+ /**
* Retrieve the action that handles the perform for the specified server,
* or null if no such action exists.
*
@@ -110,8 +148,22 @@
* @return The action that handles the server's perform, or null
*/
public Action getActionForServer(final String server) {
- return getAction(CoreActionComponent.SERVER_NAME, server);
+ return getActionForServer(server, null);
}
+
+ /**
+ * Retrieve the action that handles the perform for the specified server,
+ * or null if no such action exists.
+ *
+ * @param server The server to look for
+ * @param profile The name of the profile the perform works for
+ * @return The action that handles the servers's perform for the specified
+ * profile, or null
+ * @since 0.6.3
+ */
+ public Action getActionForServer(final String server, final String profile) {
+ return getAction(CoreActionComponent.SERVER_NAME, server, profile);
+ }
/**
* Retrieve the action that handles the perform for the specified network,
@@ -119,10 +171,24 @@
*
* @param network The network to look for
* @return The action that handles the network's perform, or null
- */
+ */
public Action getActionForNetwork(final String network) {
- return getAction(CoreActionComponent.SERVER_NETWORK, network);
+ return getActionForNetwork(network, null);
}
+
+ /**
+ * Retrieve the action that handles the perform for the specified network,
+ * or null if no such action exists.
+ *
+ * @param network The network to look for
+ * @param profile The name of the profile the perform works for
+ * @return The action that handles the network's perform for the specified
+ * profile, or null
+ * @since 0.6.3
+ */
+ public Action getActionForNetwork(final String network, final String profile) {
+ return getAction(CoreActionComponent.SERVER_NETWORK, network, profile);
+ }
/**
* Creates a new, empty, perform wrapper for the specified server.
@@ -131,18 +197,44 @@
* @return The new perform wrapper action
*/
public Action createActionForServer(final String server) {
- return createAction(server, "");
+ return createActionForServer(server, null);
}
/**
+ * Creates a new, empty, perform wrapper for the specified server, which
+ * is only applicable when the specified profile is in use.
+ *
+ * @param server The server to create the action for
+ * @param profile The name of the profile which must be in use
+ * @return The new perform wrapper action
+ * @since 0.6.3
+ */
+ public Action createActionForServer(final String server, final String profile) {
+ return createAction(server, "", profile);
+ }
+
+ /**
* Creates a new, empty, perform wrapper for the specified network.
*
* @param network The network to create the action for
* @return The new perform wrapper action
*/
public Action createActionForNetwork(final String network) {
- return createAction("", network);
+ return createActionForNetwork(network, null);
}
+
+ /**
+ * Creates a new, empty, perform wrapper for the specified network, which
+ * is only applicable when the specified profile is in use.
+ *
+ * @param network The network to create the action for
+ * @param profile The name of the profile which must be in use
+ * @return The new perform wrapper action
+ * @since 0.6.3
+ */
+ public Action createActionForNetwork(final String network, final String profile) {
+ return createAction("", network, profile);
+ }
/**
* Creates a new, empty, perform wrapper for the specified server or
@@ -151,9 +243,12 @@
*
* @param server The server to create the action for
* @param network The network to create the action for
+ * @param profile The profile the action is for (or null if "global")
+ * @since 0.6.3
* @return The new perform wrapper action
*/
- private Action createAction(final String server, final String network) {
+ private Action createAction(final String server, final String network,
+ final String profile) {
final List<ActionCondition> conditions = new ArrayList<ActionCondition>();
final CoreActionComponent component =
server.isEmpty() ? CoreActionComponent.SERVER_NETWORK
@@ -161,6 +256,12 @@
conditions.add(new ActionCondition(0, component,
CoreActionComparison.STRING_EQUALS, server + network));
+
+ if (profile != null) {
+ conditions.add(new ActionCondition(0,
+ new ActionComponentChain(Server.class, PP_COMP_NAME),
+ CoreActionComparison.STRING_EQUALS, profile));
+ }
return new Action(getName(), server + network,
new ActionType[]{CoreActionType.SERVER_CONNECTED},
@@ -173,12 +274,28 @@
*
* @param component The action component to look for
* @param target The string the component is matched against
+ * @param profile The name of the profile that the action must target, or
+ * null for a non-profile specific action
+ * @since 0.6.3
* @return The matching action if one exists, or null
*/
- private Action getAction(final ActionComponent component, final String target) {
+ private Action getAction(final ActionComponent component, final String target,
+ final String profile) {
for (Action action : this) {
- if (action.getConditions().get(0).getComponent() == component
- && action.getConditions().get(0).getTarget().equalsIgnoreCase(target)) {
+ int matches = profile == null ? 1 : 2;
+
+ for (ActionCondition condition : action.getConditions()) {
+ if (condition.getComponent() == component
+ && condition.getTarget().equalsIgnoreCase(target)) {
+ matches--;
+ } else if (profile != null
+ && PP_COMP_NAME.equals(condition.getComponent().toString())
+ && condition.getTarget().equalsIgnoreCase(profile)) {
+ matches--;
+ }
+ }
+
+ if (matches == 0) {
return action;
}
}
Modified: trunk/test/com/dmdirc/plugins/testplugin.jar
===================================================================
(Binary files differ)