TotalFreedomMC/TF-EssentialsX
1
0
Fork 0
mirror of https://github.com/TotalFreedomMC/TF-EssentialsX.git synced 2025-02-14 13:13:24 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'master' of github.com:essentials/Essentials into essmaster

Browse source
This commit is contained in:
KHobbits 2011-10-24 17:00:05 +01:00
commit d4a495fb52
7 changed files with 105 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
EssentialsUpdate/src/com/earth2me/essentials/update/states/AbstractState.java
View file

@ -7,6 +7,17 @@ import org.bukkit.entity.Player;
public abstract class AbstractState
{
private transient boolean abortion = false;
private final transient StateMap stateMap;
public AbstractState(final StateMap stateMap)
{
this.stateMap = stateMap;
}
public AbstractState getState(final Class<? extends AbstractState> stateClass)
{
return stateMap.get(stateClass);
}
public abstract AbstractState getNextState();
@ -40,7 +51,7 @@ public abstract class AbstractState
|| trimmedAnswer.equalsIgnoreCase("bye")
|| trimmedAnswer.equalsIgnoreCase("abort"))
{
abortion = true;
abort();
return null;
}
final boolean found = reactOnAnswer(trimmedAnswer);
@ -64,4 +75,9 @@ public abstract class AbstractState
{
return abortion;
}
protected void abort()
{
abortion = true;
}
}

16
EssentialsUpdate/src/com/earth2me/essentials/update/states/AbstractYesNoState.java
View file

@ -4,11 +4,17 @@ package com.earth2me.essentials.update.states;
public abstract class AbstractYesNoState extends AbstractState
{
private boolean answer = false;
private final transient AbstractState yesState;
private final transient AbstractState noState;
private final transient Class<? extends AbstractState> yesState;
private final transient Class<? extends AbstractState> noState;
public AbstractYesNoState(final AbstractState yesState, final AbstractState noState)
public AbstractYesNoState(final StateMap states, final Class<? extends AbstractState> nextState)
{
this(states, nextState, nextState);
}
public AbstractYesNoState(final StateMap states, final Class<? extends AbstractState> yesState, final Class<? extends AbstractState> noState)
{
super(states);
this.yesState = yesState;
this.noState = noState;
}
@ -16,7 +22,9 @@ public abstract class AbstractYesNoState extends AbstractState
@Override
public AbstractState getNextState()
{
return answer ? yesState : noState;
return answer
? (yesState == null ? null : getState(yesState))
: (noState == null ? null : getState(noState));
}
@Override

8
EssentialsUpdate/src/com/earth2me/essentials/update/states/EssentialsChat.java
View file

@ -1,7 +1,7 @@
package com.earth2me.essentials.update.states;
import com.earth2me.essentials.update.WorkListener;
import com.earth2me.essentials.update.tasks.InstallChat;
import com.earth2me.essentials.update.tasks.InstallModule;
import org.bukkit.Bukkit;
import org.bukkit.entity.Player;
import org.bukkit.plugin.Plugin;
@ -9,9 +9,9 @@ import org.bukkit.plugin.Plugin;
public class EssentialsChat extends AbstractYesNoState
{
public EssentialsChat(final AbstractState next)
public EssentialsChat(final StateMap states)
{
super(next, next);
super(states, EssentialsProtect.class);
}
@Override
@ -38,7 +38,7 @@ public class EssentialsChat extends AbstractYesNoState
{
if (getAnswer())
{
new InstallChat(listener).start();
new InstallModule(listener, "EssentialsChat").start();
return;
}
listener.onWorkDone();

46
EssentialsUpdate/src/com/earth2me/essentials/update/states/EssentialsProtect.java Normal file
View file

@ -0,0 +1,46 @@
package com.earth2me.essentials.update.states;
import com.earth2me.essentials.update.WorkListener;
import com.earth2me.essentials.update.tasks.InstallModule;
import org.bukkit.Bukkit;
import org.bukkit.entity.Player;
import org.bukkit.plugin.Plugin;
public class EssentialsProtect extends AbstractYesNoState
{
public EssentialsProtect(final StateMap states)
{
super(states, null);
}
@Override
public boolean guessAnswer()
{
final Plugin plugin = Bukkit.getPluginManager().getPlugin("EssentialsProtect");
if (plugin != null)
{
setAnswer(true);
return true;
}
return false;
}
@Override
public void askQuestion(final Player sender)
{
sender.sendMessage("Do you want to install EssentialsProtect? (yes/no)");
sender.sendMessage("Short descriptive text about what EssentialsProtect does.");
}
@Override
public void doWork(final WorkListener listener)
{
if (getAnswer())
{
new InstallModule(listener, "EssentialsProtect").start();
return;
}
listener.onWorkDone();
}
}

20
EssentialsUpdate/src/com/earth2me/essentials/update/states/StateMachine.java
View file

@ -2,8 +2,7 @@ package com.earth2me.essentials.update.states;
import com.earth2me.essentials.update.WorkListener;
import com.earth2me.essentials.update.VersionInfo;
import java.util.ArrayList;
import java.util.List;
import java.util.Iterator;
import org.bukkit.Bukkit;
import org.bukkit.entity.Player;
import org.bukkit.plugin.Plugin;
@ -15,7 +14,7 @@ public class StateMachine extends WorkListener
{
ABORT, WAIT, DONE
}
private final transient List<AbstractState> states = new ArrayList<AbstractState>();
private final transient StateMap states = new StateMap();
private transient AbstractState current;
private final transient Player player;
@ -24,9 +23,9 @@ public class StateMachine extends WorkListener
super(plugin, newVersionInfo);
this.player = player;
states.clear();
final AbstractState state = new EssentialsChat(null);
states.add(state);
current = state;
states.add(new EssentialsChat(states));
states.add(new EssentialsProtect(states));
current = states.values().iterator().next();
}
public MachineResult askQuestion()
@ -60,16 +59,17 @@ public class StateMachine extends WorkListener
current = next;
return askQuestion();
}
private int position = 0;
private transient Iterator<AbstractState> iterator;
public void startWork()
{
iterator = states.values().iterator();
callStateWork();
}
private void callStateWork()
{
if (position > states.size())
if (!iterator.hasNext())
{
if (player.isOnline())
{
@ -77,14 +77,13 @@ public class StateMachine extends WorkListener
}
return;
}
final AbstractState state = states.get(position);
final AbstractState state = iterator.next();
state.doWork(this);
}
@Override
public void onWorkAbort(final String message)
{
position = 0;
Bukkit.getScheduler().scheduleSyncDelayedTask(getPlugin(), new Runnable()
{
@Override
@ -101,7 +100,6 @@ public class StateMachine extends WorkListener
@Override
public void onWorkDone(final String message)
{
position++;
Bukkit.getScheduler().scheduleSyncDelayedTask(getPlugin(), new Runnable()
{
@Override

17
EssentialsUpdate/src/com/earth2me/essentials/update/states/StateMap.java Normal file
View file

@ -0,0 +1,17 @@
package com.earth2me.essentials.update.states;
import java.util.LinkedHashMap;
public class StateMap extends LinkedHashMap<Class<? extends AbstractState>, AbstractState>
{
public StateMap()
{
super();
}
public AbstractState add(AbstractState state)
{
return put(state.getClass(), state);
}
}

12
EssentialsUpdate/src/com/earth2me/essentials/update/tasks/InstallChat.java
View file

@ -1,12 +0,0 @@
package com.earth2me.essentials.update.tasks;
import com.earth2me.essentials.update.WorkListener;
public class InstallChat extends InstallModule
{
public InstallChat(final WorkListener listener)
{
super(listener, "EssentialsChat");
}
}