0ct0pu5/wesnoth
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

eclipse plugin: refactor the setup workspace trigger code

Browse source
This commit is contained in:
Timotei Dolean 2011-02-10 09:22:00 +00:00
parent 6ab6612fbe
commit cfa2e75665
3 changed files with 27 additions and 39 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

49
utils/java/org.wesnoth/src/org/wesnoth/Activator.java
View file

@ -16,8 +16,6 @@ import org.eclipse.swt.widgets.Shell;
import org.eclipse.ui.PlatformUI;
import org.eclipse.ui.plugin.AbstractUIPlugin;
import org.osgi.framework.BundleContext;
import org.wesnoth.preferences.Preferences;
import org.wesnoth.utils.GUIUtils;
import org.wesnoth.utils.PreprocessorUtils;
import org.wesnoth.utils.ProjectCache;
import org.wesnoth.utils.ProjectUtils;
@ -31,9 +29,14 @@ public class Activator extends AbstractUIPlugin
{
// The shared instance
private static Activator plugin;
// a switch for knowing if we already started checking conditions
private static boolean checkingConditions = false;
/**
* Switch for knowing if we already started checking conditions
* This way we prevent a stack overflow occuring
*/
public static boolean IsCheckingConditions = false;
/**
* Switch for knowing if we already intend to setup the workspace
*/
public static boolean IsSettingUpWorkspace = false;
/**
@ -74,21 +77,13 @@ public class Activator extends AbstractUIPlugin
*/
public static Activator getDefault()
{
if (checkingConditions == false &&
if (IsCheckingConditions == false &&
PlatformUI.isWorkbenchRunning())
{
if (!checkConditions())
if (WorkspaceUtils.checkConditions(false) == false &&
IsSettingUpWorkspace == false)
{
GUIUtils.showInfoMessageBox(
Messages.Activator_0 +
Messages.Activator_1 +
Messages.Activator_2 +
Messages.Activator_3 +
Messages.Activator_4 +
Messages.Activator_5);
if (IsSettingUpWorkspace == false)
WorkspaceUtils.setupWorkspace(true);
WorkspaceUtils.setupWorkspace(true);
}
}
return plugin;
@ -115,24 +110,4 @@ public class Activator extends AbstractUIPlugin
{
return plugin.getWorkbench().getDisplay().getActiveShell();
}
/**
* Checks if the user has set some needed preferences and they are valid
*/
public static boolean checkConditions()
{
checkingConditions = true;
String execDir = Preferences.getString(Constants.P_WESNOTH_EXEC_PATH);
String userDir = Preferences.getString(Constants.P_WESNOTH_USER_DIR);
String wmltoolsDir = Preferences.getString(Constants.P_WESNOTH_WMLTOOLS_DIR);
String workingDir = Preferences.getString(Constants.P_WESNOTH_WORKING_DIR);
if (!WorkspaceUtils.validPath(execDir) || !WorkspaceUtils.validPath(userDir) ||
!WorkspaceUtils.validPath(wmltoolsDir) || !WorkspaceUtils.validPath(workingDir))
{
return false;
}
return true;
}
}

2
utils/java/org.wesnoth/src/org/wesnoth/handlers/SetupWorkspaceHandler.java
View file

@ -19,7 +19,7 @@ public class SetupWorkspaceHandler extends AbstractHandler
@Override
public Object execute(ExecutionEvent event) {
Activator.IsSettingUpWorkspace = true;
WorkspaceUtils.setupWorkspace(false);
WorkspaceUtils.setupWorkspace(true);
Activator.IsSettingUpWorkspace = false;
return null;
}

15
utils/java/org.wesnoth/src/org/wesnoth/utils/WorkspaceUtils.java
View file

@ -286,6 +286,17 @@ public class WorkspaceUtils
*/
public static void setupWorkspace(final boolean guided)
{
if (guided)
{
GUIUtils.showInfoMessageBox(
Messages.Activator_0 +
Messages.Activator_1 +
Messages.Activator_2 +
Messages.Activator_3 +
Messages.Activator_4 +
Messages.Activator_5);
}
if (!checkConditions(false))
{
PreferenceDialog pref = PreferencesUtil.createPreferenceDialogOn(
@ -444,8 +455,10 @@ public class WorkspaceUtils
* @param displayWarning true to display a messagebox warning
* the user if conditions are not met
*/
private static boolean checkConditions(boolean displayWarning)
public static boolean checkConditions(boolean displayWarning)
{
Activator.IsCheckingConditions = true;
String execDir = Preferences.getString(Constants.P_WESNOTH_EXEC_PATH);
String userDir = Preferences.getString(Constants.P_WESNOTH_USER_DIR);
String wmltoolsDir = Preferences.getString(Constants.P_WESNOTH_WMLTOOLS_DIR);