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

eclipse plugin: Allow users to save preferences...

Browse source 
...when trying to save an empty install
This commit is contained in:
Timotei Dolean 2011-06-24 15:19:15 +00:00
parent d8c341eac1
commit 476eccdafa
2 changed files with 50 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

67
utils/java/org.wesnoth/src/org/wesnoth/preferences/WesnothInstallsPage.java
View file

@ -427,32 +427,39 @@ public class WesnothInstallsPage extends AbstractPreferencePage
Text textControl = wesnothWorkingDirField_.getTextControl(
getFieldEditorParent());
String wesnothExec = wesnothExecutableField_.getStringValue();
if (wesnothWorkingDirField_.getStringValue().isEmpty() &&
!wesnothExec.isEmpty() &&
new File(wesnothExec.substring(0,
wesnothExec.lastIndexOf(new File(wesnothExec).getName()))).exists())
String workingDirValue = wesnothWorkingDirField_.getStringValue();
String wesnothExecValue = wesnothExecutableField_.getStringValue();
if ( workingDirValue.isEmpty() &&
! wesnothExecValue.isEmpty() &&
new File(wesnothExecValue.substring(0,
wesnothExecValue.lastIndexOf(new File(wesnothExecValue).getName()))).exists())
{
textControl.setText(wesnothExec.substring(0,
wesnothExec.lastIndexOf(new File(wesnothExec).getName()))
textControl.setText(wesnothExecValue.substring(0,
wesnothExecValue.lastIndexOf(new File(wesnothExecValue).getName()))
);
}
// guess the wmltools path
if (wmlToolsField_.getStringValue().isEmpty() &&
!wesnothWorkingDirField_.getStringValue().isEmpty())
String wmlToolsValue = wmlToolsField_.getStringValue();
if ( wmlToolsValue.isEmpty() &&
! workingDirValue.isEmpty() )
{
String path = wesnothWorkingDirField_.getStringValue() + "/data/tools"; //$NON-NLS-1$
if (testWMLToolsPath(path))
wmlToolsField_.setStringValue(path);
String path = workingDirValue + "/data/tools"; //$NON-NLS-1$
if ( testWMLToolsPath( path ) ) {
wmlToolsField_.setStringValue( path );
wmlToolsValue = path;
}
}
String userDirValue = wesnothUserDirField_.getStringValue();
// guess the userdata path
if (wesnothUserDirField_.getStringValue().isEmpty() &&
!wesnothWorkingDirField_.getStringValue().isEmpty())
if ( userDirValue.isEmpty() &&
! workingDirValue.isEmpty() )
{
String path = wesnothWorkingDirField_.getStringValue() + "/userdata"; //$NON-NLS-1$
testPaths(new String[] { path },wesnothUserDirField_);
String path = workingDirValue + "/userdata"; //$NON-NLS-1$
testPaths( new String[] { path }, wesnothUserDirField_ );
}
checkState();
@ -499,6 +506,22 @@ public class WesnothInstallsPage extends AbstractPreferencePage
}
}
/**
* Checks whether the fields are empty (contain no text)
* and the combobox/name don't have any values also
* (the user doesn't create a new install)
* @return
*/
private boolean isFieldsEmpty()
{
return wmlToolsField_.getStringValue( ).isEmpty( ) &&
wesnothExecutableField_.getStringValue( ).isEmpty( ) &&
wesnothUserDirField_.getStringValue( ).isEmpty( ) &&
wesnothWorkingDirField_.getStringValue( ).isEmpty( ) &&
cmbVersion_.getText( ).isEmpty( ) &&
txtInstallName_.getText( ).isEmpty( );
}
/**
* Saves the current install
* @return true if the save was successfully, false otherwise
@ -509,9 +532,17 @@ public class WesnothInstallsPage extends AbstractPreferencePage
// if it's editable, it means we are creating a new install
if ( txtInstallName_.getEditable() ) {
boolean isFieldsEmpty = isFieldsEmpty( );
if ( installName.isEmpty() == true ) {
GUIUtils.showErrorMessageBox( "Please enter a name for the install" );
return false;
// if we haven't completed anything,
// we can skip the saving without alerting the user.
if ( !isFieldsEmpty )
GUIUtils.showErrorMessageBox( "Please enter a name for the install" );
// we consider successfully save if the fields are all
// empty
return isFieldsEmpty;
}
if ( cmbVersion_.getText().isEmpty() == true ) {

2
utils/java/org.wesnoth/src/org/wesnoth/utils/GUIUtils.java
View file

@ -18,7 +18,6 @@ import org.eclipse.ui.console.IConsoleManager;
import org.eclipse.ui.console.MessageConsole;
import org.wesnoth.Logger;
public class GUIUtils
{
/**
@ -87,6 +86,7 @@ public class GUIUtils
{
if (window == null || window.getShell() == null || message == null)
return -1;
MyRunnable<Integer> runnable = new MyRunnable<Integer>() {
@Override
public void run()