eclipse plugin: Cleanup in the externalized strings
This commit is contained in:
parent
de450a06ab
commit
547f8102dc
32 changed files with 120 additions and 348 deletions
|
@ -51,20 +51,20 @@ public class Logger {
|
|||
return;
|
||||
try
|
||||
{
|
||||
String logFilePath = String.format("%s/logs/log%s.txt", //$NON-NLS-1$
|
||||
String logFilePath = String.format("%s/logs/log%s.txt", //$NON-NLS-1$
|
||||
WorkspaceUtils.getTemporaryFolder(), WorkspaceUtils.getRandomFileName());
|
||||
|
||||
if (WorkspaceUtils.getTemporaryFolder() == null)
|
||||
throw new IOException(Messages.Logger_6);
|
||||
throw new IOException("Could not create the temporary folder."); //$NON-NLS-1$
|
||||
|
||||
new File(WorkspaceUtils.getTemporaryFolder() + "/logs/").mkdirs(); //$NON-NLS-1$
|
||||
new File(WorkspaceUtils.getTemporaryFolder() + "/logs/").mkdirs(); //$NON-NLS-1$
|
||||
|
||||
logWriter_ = new BufferedWriter(new FileWriter(logFilePath));
|
||||
log(Messages.Logger_2);
|
||||
log(Messages.Logger_3);
|
||||
log("Logging started."); //$NON-NLS-1$
|
||||
log("Error codes: 1 - INFO, 2 - WARNING, 4 - ERROR"); //$NON-NLS-1$
|
||||
} catch (IOException e)
|
||||
{
|
||||
JOptionPane.showMessageDialog(null, Messages.Logger_4 + e.getMessage());
|
||||
JOptionPane.showMessageDialog(null, "There was an error trying to open the log." + e.getMessage()); //$NON-NLS-1$
|
||||
e.printStackTrace();
|
||||
}
|
||||
}
|
||||
|
@ -78,7 +78,7 @@ public class Logger {
|
|||
return;
|
||||
try
|
||||
{
|
||||
log(Messages.Logger_5);
|
||||
log("Logging ended."); //$NON-NLS-1$
|
||||
logWriter_.close();
|
||||
} catch (IOException e)
|
||||
{
|
||||
|
@ -142,8 +142,8 @@ public class Logger {
|
|||
{
|
||||
try
|
||||
{
|
||||
logWriter_.write(String.format("%s | %d | %s\n", //$NON-NLS-1$
|
||||
new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()), //$NON-NLS-1$
|
||||
logWriter_.write(String.format("%s | %d | %s\n", //$NON-NLS-1$
|
||||
new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()), //$NON-NLS-1$
|
||||
severity, message));
|
||||
logWriter_.flush();
|
||||
} catch (IOException e)
|
||||
|
|
|
@ -14,12 +14,7 @@ public class Messages extends NLS
|
|||
{
|
||||
private static final String BUNDLE_NAME = "org.wesnoth.messages"; //$NON-NLS-1$
|
||||
public static String ActionWiper_6;
|
||||
public static String Activator_0;
|
||||
public static String Activator_1;
|
||||
public static String Activator_2;
|
||||
public static String Activator_3;
|
||||
public static String Activator_4;
|
||||
public static String Activator_5;
|
||||
public static String WorkspaceUtils_0;
|
||||
public static String AddonUploadPreferencePage_10;
|
||||
public static String AddonUploadPreferencePage_11;
|
||||
public static String AddonUploadPreferencePage_12;
|
||||
|
@ -35,12 +30,6 @@ public class Messages extends NLS
|
|||
public static String AdvancedPreferencePage_0;
|
||||
public static String AdvancedPreferencePage_1;
|
||||
public static String AdvancedPreferencePage_2;
|
||||
public static String AdvancedPreferencePage_3;
|
||||
public static String ApplicationActionBarAdvisor_0;
|
||||
public static String ApplicationActionBarAdvisor_2;
|
||||
public static String ApplicationActionBarAdvisor_3;
|
||||
public static String ApplicationActionBarAdvisor_4;
|
||||
public static String ApplicationActionBarAdvisor_5;
|
||||
public static String CampaignNewWizard_0;
|
||||
public static String CampaignNewWizard_1;
|
||||
public static String CampaignPage0_1;
|
||||
|
@ -75,18 +64,11 @@ public class Messages extends NLS
|
|||
public static String CampaignPage2_6;
|
||||
public static String CampaignPage2_7;
|
||||
public static String CampaignPage2_8;
|
||||
public static String Define_0;
|
||||
public static String Define_1;
|
||||
public static String Define_2;
|
||||
public static String EmptyProjectNewWizard_0;
|
||||
public static String EmptyProjectNewWizard_1;
|
||||
public static String EmptyProjectPage0_1;
|
||||
public static String EmptyProjectPage0_2;
|
||||
public static String EmptyProjectPage1_1;
|
||||
public static String EmptyProjectPage1_10;
|
||||
public static String EmptyProjectPage1_11;
|
||||
public static String EmptyProjectPage1_12;
|
||||
public static String EmptyProjectPage1_13;
|
||||
public static String EmptyProjectPage1_14;
|
||||
public static String EmptyProjectPage1_15;
|
||||
public static String EmptyProjectPage1_16;
|
||||
|
@ -98,15 +80,7 @@ public class Messages extends NLS
|
|||
public static String EmptyProjectPage1_21;
|
||||
public static String EmptyProjectPage1_22;
|
||||
public static String EmptyProjectPage1_23;
|
||||
public static String EmptyProjectPage1_24;
|
||||
public static String EmptyProjectPage1_25;
|
||||
public static String EmptyProjectPage1_26;
|
||||
public static String EmptyProjectPage1_27;
|
||||
public static String EmptyProjectPage1_28;
|
||||
public static String EmptyProjectPage1_29;
|
||||
public static String EmptyProjectPage1_3;
|
||||
public static String EmptyProjectPage1_30;
|
||||
public static String EmptyProjectPage1_31;
|
||||
public static String EmptyProjectPage1_32;
|
||||
public static String EmptyProjectPage1_33;
|
||||
public static String EmptyProjectPage1_35;
|
||||
|
@ -115,11 +89,9 @@ public class Messages extends NLS
|
|||
public static String EmptyProjectPage1_6;
|
||||
public static String EmptyProjectPage1_7;
|
||||
public static String EmptyProjectPage1_8;
|
||||
public static String EmptyProjectPage1_9;
|
||||
public static String EraNewWizard_0;
|
||||
public static String EraNewWizard_1;
|
||||
public static String EraNewWizard_2;
|
||||
public static String EraNewWizard_7;
|
||||
public static String EraNewWizard_8;
|
||||
public static String EraPage0_1;
|
||||
public static String EraPage0_10;
|
||||
|
@ -137,10 +109,8 @@ public class Messages extends NLS
|
|||
public static String EraPage0_7;
|
||||
public static String EraPage0_8;
|
||||
public static String EraPage0_9;
|
||||
public static String ExternalToolInvoker_0;
|
||||
public static String FactionNewWizard_0;
|
||||
public static String FactionNewWizard_1;
|
||||
public static String FactionNewWizard_13;
|
||||
public static String FactionNewWizard_14;
|
||||
public static String FactionNewWizard_2;
|
||||
public static String FactionPage0_1;
|
||||
|
@ -168,25 +138,13 @@ public class Messages extends NLS
|
|||
public static String FactionPage1_4;
|
||||
public static String FactionPage1_5;
|
||||
public static String GameUtils_0;
|
||||
public static String GameUtils_1;
|
||||
public static String GameUtils_11;
|
||||
public static String GameUtils_12;
|
||||
public static String GameUtils_2;
|
||||
public static String GameUtils_3;
|
||||
public static String GameUtils_4;
|
||||
public static String GameUtils_5;
|
||||
public static String GameUtils_7;
|
||||
public static String GameUtils_9;
|
||||
public static String ImportMapHandler_0;
|
||||
public static String ImportMapHandler_1;
|
||||
public static String ImportMapHandler_3;
|
||||
public static String ImportMapHandler_4;
|
||||
public static String Logger_2;
|
||||
public static String Logger_3;
|
||||
public static String Logger_4;
|
||||
public static String Logger_5;
|
||||
public static String Logger_6;
|
||||
public static String MapUtils_0;
|
||||
public static String MapUtils_1;
|
||||
public static String MapUtils_2;
|
||||
public static String MapUtils_4;
|
||||
|
@ -203,33 +161,19 @@ public class Messages extends NLS
|
|||
public static String NewConfigFilePage0_8;
|
||||
public static String NewConfigFilePage0_9;
|
||||
public static String NewConfigFileWizard_0;
|
||||
public static String NewConfigFileWizard_1;
|
||||
public static String NewConfigFileWizard_2;
|
||||
public static String NewConfigFileWizard_4;
|
||||
public static String NewWizardPageTemplate_1;
|
||||
public static String OpenMapInEditorHandler_0;
|
||||
public static String OpenMapInEditorHandler_1;
|
||||
public static String OpenMapInEditorHandler_3;
|
||||
public static String OpenMapInEditorHandler_4;
|
||||
public static String PreprocessorUtils_1;
|
||||
public static String PreprocessorUtils_10;
|
||||
public static String PreprocessorUtils_11;
|
||||
public static String PreprocessorUtils_12;
|
||||
public static String ProjectUtils_0;
|
||||
public static String ProjectUtils_4;
|
||||
public static String ProjectUtils_6;
|
||||
public static String ReloadFilesHandler_0;
|
||||
public static String ResourceUtils_12;
|
||||
public static String ResourceUtils_21;
|
||||
public static String ResourceUtils_4;
|
||||
public static String ResourceUtils_5;
|
||||
public static String ResourceUtils_7;
|
||||
public static String ScenarioNewWizard_0;
|
||||
public static String ScenarioNewWizard_15;
|
||||
public static String ScenarioNewWizard_2;
|
||||
public static String ScenarioNewWizard_20;
|
||||
public static String ScenarioNewWizard_3;
|
||||
public static String ScenarioNewWizard_4;
|
||||
public static String ScenarioNewWizard_5;
|
||||
public static String ScenarioPage0_1;
|
||||
public static String ScenarioPage0_10;
|
||||
|
@ -259,20 +203,6 @@ public class Messages extends NLS
|
|||
public static String ScenarioPage2_2;
|
||||
public static String ScenarioPage2_3;
|
||||
public static String ScenarioPage2_4;
|
||||
public static String SchemaFactory_1;
|
||||
public static String SchemaFactory_4;
|
||||
public static String SchemaParser_0;
|
||||
public static String SchemaParser_1;
|
||||
public static String SchemaParser_18;
|
||||
public static String SchemaParser_2;
|
||||
public static String SchemaParser_25;
|
||||
public static String SchemaParser_3;
|
||||
public static String SchemaParser_30;
|
||||
public static String SchemaParser_32;
|
||||
public static String SchemaParser_34;
|
||||
public static String SchemaParser_36;
|
||||
public static String TemplateProvider_0;
|
||||
public static String TemplateProvider_15;
|
||||
public static String UploadAddon_0;
|
||||
public static String UploadAddon_1;
|
||||
public static String WesnothInstallsPage_0;
|
||||
|
@ -289,8 +219,6 @@ public class Messages extends NLS
|
|||
public static String WesnothInstallsPage_8;
|
||||
public static String WesnothInstallsPage_9;
|
||||
public static String WesnothInstallsUtils_1;
|
||||
public static String WesnothInstallsUtils_2;
|
||||
public static String WesnothInstallsUtils_3;
|
||||
public static String WesnothPreferencesPage_0;
|
||||
public static String WesnothPreferencesPage_10;
|
||||
public static String WesnothPreferencesPage_11;
|
||||
|
@ -303,17 +231,13 @@ public class Messages extends NLS
|
|||
public static String WesnothPreferencesPage_7;
|
||||
public static String WesnothPreferencesPage_8;
|
||||
public static String WesnothPreferencesPage_9;
|
||||
public static String WesnothProjectBuilder_0;
|
||||
public static String WesnothProjectBuilder_1;
|
||||
public static String WesnothProjectBuilder_10;
|
||||
public static String WesnothProjectBuilder_12;
|
||||
public static String WesnothProjectBuilder_13;
|
||||
public static String WesnothProjectBuilder_19;
|
||||
public static String WesnothProjectBuilder_22;
|
||||
public static String WesnothProjectBuilder_3;
|
||||
public static String WesnothProjectBuilder_4;
|
||||
public static String WesnothProjectBuilder_5;
|
||||
public static String WesnothProjectBuilder_6;
|
||||
public static String WesnothProjectBuilder_6;
|
||||
public static String WesnothProjectBuilder_7;
|
||||
public static String WesnothProjectBuilder_8;
|
||||
public static String WesnothProjectPage_0;
|
||||
public static String WesnothProjectPage_1;
|
||||
|
@ -361,17 +285,15 @@ public class Messages extends NLS
|
|||
public static String WizardLauncherPage1_13;
|
||||
public static String WizardLauncherPage1_14;
|
||||
public static String WizardLauncherPage1_2;
|
||||
public static String WizardLauncherPage1_3;
|
||||
public static String WizardLauncherPage1_6;
|
||||
public static String WizardLauncherPage1_7;
|
||||
public static String WMLTools_28;
|
||||
public static String WMLJavaValidator_0;
|
||||
public static String WMLJavaValidator_1;
|
||||
public static String WMLJavaValidator_2;
|
||||
public static String WMLTools_28;
|
||||
public static String WMLTools_29;
|
||||
public static String WMLTools_42;
|
||||
public static String WMLTools_43;
|
||||
public static String WMLTools_45;
|
||||
public static String WMLTools_46;
|
||||
public static String WMLTools_47;
|
||||
public static String WMLTools_48;
|
||||
public static String WMLToolsPreferencePage_0;
|
||||
public static String WMLToolsPreferencePage_1;
|
||||
public static String WMLToolsPreferencePage_10;
|
||||
|
@ -383,24 +305,15 @@ public class Messages extends NLS
|
|||
public static String WMLToolsPreferencePage_6;
|
||||
public static String WMLToolsPreferencePage_7;
|
||||
public static String WMLToolsPreferencePage_9;
|
||||
public static String WorkspaceUtils_10;
|
||||
public static String WorkspaceUtils_11;
|
||||
public static String WorkspaceUtils_12;
|
||||
public static String WorkspaceUtils_13;
|
||||
public static String WorkspaceUtils_18;
|
||||
public static String WorkspaceUtils_19;
|
||||
public static String WorkspaceUtils_20;
|
||||
public static String WorkspaceUtils_21;
|
||||
public static String WorkspaceUtils_22;
|
||||
public static String WorkspaceUtils_25;
|
||||
public static String WorkspaceUtils_26;
|
||||
public static String WorkspaceUtils_27;
|
||||
public static String WorkspaceUtils_28;
|
||||
public static String WorkspaceUtils_29;
|
||||
public static String WorkspaceUtils_30;
|
||||
public static String WorkspaceUtils_33;
|
||||
public static String WorkspaceUtils_7;
|
||||
public static String WorkspaceUtils_8;
|
||||
public static String WorkspaceUtils_9;
|
||||
static
|
||||
{
|
||||
|
|
|
@ -229,6 +229,17 @@ public class DependencyTreeBuilder implements Serializable
|
|||
|
||||
}
|
||||
|
||||
/**
|
||||
* Returns the node specified by the file
|
||||
* @param file The file to get the depedency node for
|
||||
* @return An instance of {@link ProjectDependencyNode}
|
||||
*
|
||||
*/
|
||||
public ProjectDependencyNode getNode( IFile file )
|
||||
{
|
||||
return tree_.get( file.getProjectRelativePath( ).toString( ) );
|
||||
}
|
||||
|
||||
/**
|
||||
* Deserializes this object from the input
|
||||
* @param input The object input stream
|
||||
|
|
|
@ -74,7 +74,7 @@ public class WesnothProjectBuilder extends IncrementalProjectBuilder
|
|||
|
||||
String installName = WesnothInstallsUtils.getInstallNameForResource( getProject() );
|
||||
|
||||
Logger.getInstance().log(Messages.WesnothProjectBuilder_0);
|
||||
Logger.getInstance().log("building..."); //$NON-NLS-1$
|
||||
monitor.beginTask(String.format(Messages.WesnothProjectBuilder_1, getProject().getName()), 100);
|
||||
|
||||
Paths paths = Preferences.getPaths( installName );
|
||||
|
@ -82,8 +82,8 @@ public class WesnothProjectBuilder extends IncrementalProjectBuilder
|
|||
monitor.subTask(Messages.WesnothProjectBuilder_3);
|
||||
if ( paths.getUserDir( ).isEmpty( ) )
|
||||
{
|
||||
Logger.getInstance().log(Messages.WesnothProjectBuilder_4,
|
||||
Messages.WesnothProjectBuilder_5);
|
||||
Logger.getInstance().log("no preferences set (project builder)", //$NON-NLS-1$
|
||||
Messages.WesnothProjectBuilder_7);
|
||||
return null;
|
||||
}
|
||||
monitor.worked(5);
|
||||
|
@ -101,7 +101,7 @@ public class WesnothProjectBuilder extends IncrementalProjectBuilder
|
|||
monitor.subTask(Messages.WesnothProjectBuilder_8);
|
||||
Map<String, String> properties = new HashMap<String, String>();
|
||||
properties.put("wesnoth.user.dir", paths.getUserDir( )); //$NON-NLS-1$
|
||||
Logger.getInstance().log(Messages.WesnothProjectBuilder_10);
|
||||
Logger.getInstance().log("Ant result:"); //$NON-NLS-1$
|
||||
|
||||
String result = AntUtils.runAnt(
|
||||
getProject().getLocation().toOSString() + "/build.xml", //$NON-NLS-1$
|
||||
|
@ -111,7 +111,7 @@ public class WesnothProjectBuilder extends IncrementalProjectBuilder
|
|||
|
||||
if (result == null)
|
||||
{
|
||||
Logger.getInstance().log(Messages.WesnothProjectBuilder_12,
|
||||
Logger.getInstance().log("error running the ant job", //$NON-NLS-1$
|
||||
Messages.WesnothProjectBuilder_13);
|
||||
return null;
|
||||
}
|
||||
|
|
|
@ -27,14 +27,13 @@ public class ImportMapHandler extends AbstractHandler
|
|||
IFolder selectedFolder = WorkspaceUtils.getSelectedFolder();
|
||||
if (selectedFolder == null)
|
||||
{
|
||||
Logger.getInstance().log(Messages.ImportMapHandler_0,
|
||||
Logger.getInstance().log("no directory selected (importMapHandler)", //$NON-NLS-1$
|
||||
Messages.ImportMapHandler_1);
|
||||
return null;
|
||||
}
|
||||
|
||||
if (!selectedFolder.getName().equals("maps") && //$NON-NLS-1$
|
||||
GUIUtils.showMessageBox(Messages.ImportMapHandler_3 +
|
||||
Messages.ImportMapHandler_4,
|
||||
GUIUtils.showMessageBox(Messages.ImportMapHandler_3,
|
||||
SWT.ICON_QUESTION | SWT.YES | SWT.NO) == SWT.NO)
|
||||
return null;
|
||||
|
||||
|
|
|
@ -25,14 +25,14 @@ public class OpenMapInEditorHandler extends AbstractHandler
|
|||
IFile selectedFile = WorkspaceUtils.getSelectedFile();
|
||||
if (selectedFile == null)
|
||||
{
|
||||
Logger.getInstance().log(Messages.OpenMapInEditorHandler_0,
|
||||
Logger.getInstance().log("file null (open map handler)", //$NON-NLS-1$
|
||||
Messages.OpenMapInEditorHandler_1);
|
||||
return null;
|
||||
}
|
||||
|
||||
if (!selectedFile.getName().endsWith(".map")) //$NON-NLS-1$
|
||||
{
|
||||
Logger.getInstance().log(Messages.OpenMapInEditorHandler_3+selectedFile.getName(),
|
||||
Logger.getInstance().log("non-map file selected: "+selectedFile.getName(), //$NON-NLS-1$
|
||||
Messages.OpenMapInEditorHandler_4);
|
||||
return null;
|
||||
}
|
||||
|
|
|
@ -127,11 +127,8 @@ public class WesnothInstallsUtils
|
|||
if ( Preferences.getDefaultInstallName( ).isEmpty( ) )
|
||||
return false;
|
||||
|
||||
if ( GUIUtils.showMessageBox(
|
||||
Messages.WesnothInstallsUtils_1 +
|
||||
resource.getProject( ).getName( ) +
|
||||
Messages.WesnothInstallsUtils_2 +
|
||||
Messages.WesnothInstallsUtils_3,
|
||||
if ( GUIUtils.showMessageBox( String.format(
|
||||
Messages.WesnothInstallsUtils_1, resource.getProject( ).getName( ) ),
|
||||
SWT.ICON_QUESTION | SWT.YES | SWT.NO) == SWT.NO )
|
||||
return false; // no hope :(
|
||||
|
||||
|
|
|
@ -1,10 +1,5 @@
|
|||
ActionWiper_6=&Run
|
||||
Activator_0=Hello\!\n
|
||||
Activator_1=Welcome to 'Wesnoth User Made Content Eclipse Plugin'.\n
|
||||
Activator_2=Since this is the first time you are using it
|
||||
Activator_3=I'll guide you through setting it up.\n\n
|
||||
Activator_4=First you'll have to setup your preferences.\n
|
||||
Activator_5=Press OK to continue.
|
||||
WorkspaceUtils_0=Hello\!\n Welcome to 'Wesnoth User Made Content Eclipse Plugin'.\n Since this is the first time you are using it I'll guide you through setting it up.\n\n First you'll have to setup your preferences.\nPress OK to continue.
|
||||
AddonUploadPreferencePage_10=Addon uploader preferences
|
||||
AddonUploadPreferencePage_11=Password (stored in plain text)
|
||||
AddonUploadPreferencePage_12=This is the password used to authenticate to the addons server
|
||||
|
@ -19,13 +14,7 @@ AddonUploadPreferencePage_24=Based on this number you will upload the addons to
|
|||
AddonUploadPreferencePage_25=Ports available by wesnoth's version:\n
|
||||
AdvancedPreferencePage_0=Advanced preferences
|
||||
AdvancedPreferencePage_1=NO_TERRAIN_GFX defined
|
||||
AdvancedPreferencePage_2=If this is set the Terrain Graphics macros won't be parsed
|
||||
AdvancedPreferencePage_3=\ => improved performance. Check this only if you need them.
|
||||
ApplicationActionBarAdvisor_0=&File
|
||||
ApplicationActionBarAdvisor_2=&Edit
|
||||
ApplicationActionBarAdvisor_3=&Project
|
||||
ApplicationActionBarAdvisor_4=&Window
|
||||
ApplicationActionBarAdvisor_5=&Help
|
||||
AdvancedPreferencePage_2=If this is set the Terrain Graphics macros won't be parsed resulting in improved performance. Check this only if you need them.
|
||||
CampaignNewWizard_0=Create a new Campaign
|
||||
CampaignNewWizard_1=Creating the project structure...
|
||||
CampaignPage0_1=Campaign wizard
|
||||
|
@ -60,18 +49,11 @@ CampaignPage2_5=ID* :
|
|||
CampaignPage2_6=Abbreviation* :
|
||||
CampaignPage2_7=Define* :
|
||||
CampaignPage2_8=Difficulties:
|
||||
Define_0=loaded
|
||||
Define_1=\ defines for file:
|
||||
Define_2=There was an error on creating the Defines SAX handler
|
||||
EmptyProjectNewWizard_0=Create a new empty project
|
||||
EmptyProjectNewWizard_1=Creating the project structure...
|
||||
EmptyProjectPage0_1=Empty project wizard
|
||||
EmptyProjectPage0_2=Specify the name of the new project.
|
||||
EmptyProjectPage1_1=Create new empty project
|
||||
EmptyProjectPage1_10=\r\nwhere x, y and z are numbers and a value for x greater than 0 \r\n
|
||||
EmptyProjectPage1_11=implies the campaign is complete and balanced. \r\nTrailing non-numeric
|
||||
EmptyProjectPage1_12=\ elements are ok, but nothing should\r\nappear before the numbers. This
|
||||
EmptyProjectPage1_13=\ is necessary for the Update \r\nadd-ons button to work correctly.
|
||||
EmptyProjectPage1_14=Format: x.y.z
|
||||
EmptyProjectPage1_15=Translations folder:
|
||||
EmptyProjectPage1_16=Relative to the data folder
|
||||
|
@ -82,16 +64,8 @@ EmptyProjectPage1_2=Specify PBL related information.
|
|||
EmptyProjectPage1_20=Type:
|
||||
EmptyProjectPage1_21=Passphrase:
|
||||
EmptyProjectPage1_22=Icon:
|
||||
EmptyProjectPage1_23=An image, displayed leftmost on the
|
||||
EmptyProjectPage1_24="add-ons" screen.\r\nIt must be a standard Wesnoth graphic and not a
|
||||
EmptyProjectPage1_25=custom one. \r\n(Well, a custom graphic will work if the user already
|
||||
EmptyProjectPage1_26=has the campaign \r\ninstalled, or if it is a custom graphic from a
|
||||
EmptyProjectPage1_27=\ different campaign that the \r\nuser has installed but others won't
|
||||
EmptyProjectPage1_28=see it\!) (Note that the icon used to \r\ndisplay your campaign for when
|
||||
EmptyProjectPage1_29=\ it is played can be custom; for more\r\ninformation see CampaignWML.)
|
||||
EmptyProjectPage1_23=An image, displayed leftmost on the "add-ons" screen.\r\nIt must be a standard Wesnoth graphic and not a custom one. \r\n(Well, a custom graphic will work if the user already has the campaign \r\ninstalled, or if it is a custom graphic from a different campaign that the \r\nuser has installed but others won't see it\!) (Note that the icon used to \r\ndisplay your campaign for when it is played can be custom; for more\r\ninformation see CampaignWML.) If the icon is a unit with magenta color,\r\nplease use ImagePathFunctionWML to team-color it.
|
||||
EmptyProjectPage1_3=This is a 'data/campaigns/' project
|
||||
EmptyProjectPage1_30=If the icon is a unit with magenta color,\r\nplease use
|
||||
EmptyProjectPage1_31=ImagePathFunctionWML to team-color it.
|
||||
EmptyProjectPage1_32=Relative to the 'data/core/images' directory
|
||||
EmptyProjectPage1_33=Project name is mandatory
|
||||
EmptyProjectPage1_35=The version must have the format: x.y.z
|
||||
|
@ -99,12 +73,10 @@ EmptyProjectPage1_4=Generate '_server.pbl' with the following information
|
|||
EmptyProjectPage1_5=Project title*:
|
||||
EmptyProjectPage1_6=This is the title shown in the addons list
|
||||
EmptyProjectPage1_7=Version* :
|
||||
EmptyProjectPage1_8=Displayed to the right of the title, it is just text.
|
||||
EmptyProjectPage1_9=\ However,\r\nstarting with Wesnoth 1.6, the required format is x.y.z
|
||||
EmptyProjectPage1_8=Displayed to the right of the title, it is just text. However,\r\nstarting with Wesnoth 1.6, the required format is x.y.z \r\nwhere x, y and z are numbers and a value for x greater than 0 \r\nimplies the campaign is complete and balanced. \r\nTrailing non-numeric elements are ok, but nothing should\r\nappear before the numbers. This is necessary for the Update \r\nadd-ons button to work correctly.
|
||||
EraNewWizard_0=Create a new era
|
||||
EraNewWizard_1=Creating
|
||||
EraNewWizard_2=Opening file for editing...
|
||||
EraNewWizard_7='era' template not found
|
||||
EraNewWizard_8=Template for "era" not found.
|
||||
EraPage0_1=Era wizard
|
||||
EraPage0_10=You need to specify a valid directory path first.
|
||||
|
@ -122,10 +94,8 @@ EraPage0_6=Era Id*:
|
|||
EraPage0_7=Era name*:
|
||||
EraPage0_8=whether clients are required to have this era installed beforehand to be allowed join a game using this era. Possible values 'yes' (the default) and 'no'.
|
||||
EraPage0_9=Require era
|
||||
ExternalToolInvoker_0=Invoking tool %s with args: %s
|
||||
FactionNewWizard_0=Create a new faction
|
||||
FactionNewWizard_1=Creating
|
||||
FactionNewWizard_13='faction' template not found
|
||||
FactionNewWizard_14=Template for "faction" not found.
|
||||
FactionNewWizard_2=Opening file for editing...
|
||||
FactionPage0_1=Faction wizard
|
||||
|
@ -152,26 +122,14 @@ FactionPage1_2=Faction details
|
|||
FactionPage1_3=Random faction
|
||||
FactionPage1_4=Choices:
|
||||
FactionPage1_5=Except
|
||||
GameUtils_0=Please select a directory or a resource inside the
|
||||
GameUtils_1=campaign project before.
|
||||
GameUtils_11=non-existing map file
|
||||
GameUtils_0=Please select a directory or a resource inside the campaign project before.
|
||||
GameUtils_12=Please select an existing map file before opening it.
|
||||
GameUtils_2=You need to have a valid campaign file (_main.cfg)
|
||||
GameUtils_3=\ in your directory or selected.
|
||||
GameUtils_4=I couldn't get the scenario's ID
|
||||
GameUtils_5=or the file is not a scenario.
|
||||
GameUtils_2=You need to have a valid campaign file (_main.cfg) in your directory or selected.
|
||||
GameUtils_4=I couldn't get the scenario's ID or the file is not a scenario.
|
||||
GameUtils_7=Please set the wesnoth's executable path first.
|
||||
GameUtils_9=Wesnoth game:
|
||||
ImportMapHandler_0=no directory selected (importMapHandler)
|
||||
ImportMapHandler_1=Please select a folder before proceeding.
|
||||
ImportMapHandler_3=A map should be imported into a 'maps' folder.
|
||||
ImportMapHandler_4=Do you want to proceed?
|
||||
Logger_2=Logging started.
|
||||
Logger_3=Error codes: 1 - INFO, 2 - WARNING, 4 - ERROR
|
||||
Logger_4=There was an error trying to open the log.
|
||||
Logger_5=Logging ended.
|
||||
Logger_6=Could not create the temporary folder.
|
||||
MapUtils_0=no directory selected (importMap)
|
||||
ImportMapHandler_3=A map should be imported into a 'maps' folder. Do you want to proceed?
|
||||
MapUtils_1=Please select a directory before importing a map
|
||||
MapUtils_2=Import wesnoth map
|
||||
MapUtils_4=There is already an existing map with the same name. Overwrite?
|
||||
|
@ -188,33 +146,19 @@ NewConfigFilePage0_7=Select new file container
|
|||
NewConfigFilePage0_8=File container must be specified
|
||||
NewConfigFilePage0_9=File container must exist
|
||||
NewConfigFileWizard_0=Creating
|
||||
NewConfigFileWizard_1=Container "
|
||||
NewConfigFileWizard_2=" does not exist.
|
||||
NewConfigFileWizard_4=Opening file for editing...
|
||||
NewWizardPageTemplate_1=Select a container
|
||||
OpenMapInEditorHandler_0=file null (open map handler)
|
||||
OpenMapInEditorHandler_1=Please select a file before proceeding
|
||||
OpenMapInEditorHandler_3=non-map file selected:
|
||||
OpenMapInEditorHandler_4=Please select a '.map' file
|
||||
PreprocessorUtils_1=skipped preprocessing a non-modified file:
|
||||
PreprocessorUtils_10=preprocessing file:
|
||||
PreprocessorUtils_11=file null or non existent.
|
||||
PreprocessorUtils_12=The file is null or does not exist
|
||||
ProjectUtils_0=Cleaning files...
|
||||
ProjectUtils_4=Creating project '%s' ...
|
||||
ProjectUtils_6=Configuring project...
|
||||
ReloadFilesHandler_0=Files reloaded.
|
||||
ResourceUtils_12=property %s not found in file %s
|
||||
ResourceUtils_21=Using output:
|
||||
ResourceUtils_4=Error creating the resource
|
||||
ResourceUtils_5=Error creating the resource
|
||||
ResourceUtils_7=file contents are null
|
||||
ScenarioNewWizard_0=Create a new scenario
|
||||
ScenarioNewWizard_15=incorrect arguments
|
||||
ScenarioNewWizard_2=Creating
|
||||
ScenarioNewWizard_20=Template for "scenario" not found.
|
||||
ScenarioNewWizard_3=Container "
|
||||
ScenarioNewWizard_4=" does not exist.
|
||||
ScenarioNewWizard_5=Opening file for editing...
|
||||
ScenarioPage0_1=Scenario File
|
||||
ScenarioPage0_10=Map data:
|
||||
|
@ -244,20 +188,6 @@ ScenarioPage2_1=Scenario file
|
|||
ScenarioPage2_2=Set multiplayer scenario details
|
||||
ScenarioPage2_3=This is a multiplayer scenario
|
||||
ScenarioPage2_4=Allow new game
|
||||
SchemaFactory_1=this is a scenario tag
|
||||
SchemaFactory_4=this is a campaign tag
|
||||
SchemaParser_0=Tag shouldn't have been null\!
|
||||
SchemaParser_1=schema not parsed since there is already in cache.
|
||||
SchemaParser_18=Error. invalid primitive on line :
|
||||
SchemaParser_2=parsing schema
|
||||
SchemaParser_25=description
|
||||
SchemaParser_3=forced
|
||||
SchemaParser_30=Error. invalid attribute on line :
|
||||
SchemaParser_32=Error. invalid attribute value on line:
|
||||
SchemaParser_34=Undefined primitive type in schema.cfg for:
|
||||
SchemaParser_36=parsing done
|
||||
TemplateProvider_0=reading templates from:
|
||||
TemplateProvider_15=error parsing 'structure template' (%s) on line %s
|
||||
UploadAddon_0=Uploading addon...
|
||||
UploadAddon_1=Upload addon result:
|
||||
WesnothInstallsPage_0=Wesnoth Installs Preferences
|
||||
|
@ -273,9 +203,7 @@ WesnothInstallsPage_6=Version
|
|||
WesnothInstallsPage_7=Default?
|
||||
WesnothInstallsPage_8=New
|
||||
WesnothInstallsPage_9=Remove
|
||||
WesnothInstallsUtils_1=The existing set install for the project
|
||||
WesnothInstallsUtils_2=\ doesn't exist anymore or isn't fully configured.
|
||||
WesnothInstallsUtils_3=Do you want to try fallback to the default?
|
||||
WesnothInstallsUtils_1=The existing set install for the project %s doesn't exist anymore or isn't fully configured. Do you want to try fallback to the default?
|
||||
WesnothPreferencesPage_0=Wesnoth User-Made-Content Plugin preferences
|
||||
WesnothPreferencesPage_10=This directory should contain the data/add-ons/ directory, where user addons are stored.
|
||||
WesnothPreferencesPage_11=WML* tools directory*:
|
||||
|
@ -288,17 +216,13 @@ WesnothPreferencesPage_6=The executable used to launch wesnoth (wesnoth / wesnot
|
|||
WesnothPreferencesPage_7=Working directory*:
|
||||
WesnothPreferencesPage_8=This directory should containing data, manual, images directories of wesnoth.
|
||||
WesnothPreferencesPage_9=User data directory*:
|
||||
WesnothProjectBuilder_0=building...
|
||||
WesnothProjectBuilder_1=Building project %s ...
|
||||
WesnothProjectBuilder_10=Ant result:
|
||||
WesnothProjectBuilder_12=error running the ant job
|
||||
WesnothProjectBuilder_13=There was an error running the ant job.
|
||||
WesnothProjectBuilder_19=Preprocessing file %s ...
|
||||
WesnothProjectBuilder_22=Gathering file information...
|
||||
WesnothProjectBuilder_3=Checking conditions...
|
||||
WesnothProjectBuilder_4=no preferences set (project builder)
|
||||
WesnothProjectBuilder_5=Please set the wesnoth user dir before creating the content
|
||||
WesnothProjectBuilder_6=Creating temporary directory...
|
||||
WesnothProjectBuilder_7=Please set the wesnoth user dir before creating the content
|
||||
WesnothProjectBuilder_8=Copying resources...
|
||||
WesnothProjectPage_0=General
|
||||
WesnothProjectPage_1=Wesnoth install:
|
||||
|
@ -346,17 +270,15 @@ WizardLauncherPage1_12=Other
|
|||
WizardLauncherPage1_13=Custom tag:
|
||||
WizardLauncherPage1_14=Other
|
||||
WizardLauncherPage1_2=Select wizard to launch
|
||||
WizardLauncherPage1_3=wizards
|
||||
WizardLauncherPage1_6=Error in template 'wizards' on line:
|
||||
WizardLauncherPage1_7=Other
|
||||
WMLJavaValidator_0=Incorrect closing tag name.
|
||||
WMLJavaValidator_1=There is no such wml tag name.
|
||||
WMLJavaValidator_2=triggered wmlkey expensive validation.
|
||||
WMLTools_28=Running
|
||||
WMLTools_29=\ result:
|
||||
WMLTools_42=Please set the python executable path in the
|
||||
WMLTools_43=preferences before you use this feature.
|
||||
WMLTools_45=Please set the wmltools directory in the
|
||||
WMLTools_46=preferences before you use this feature.
|
||||
WMLTools_42=Please set the python executable path in the preferences before you use this feature.
|
||||
WMLTools_45=Please set the wmltools directory in the preferences before you use this feature.
|
||||
WMLTools_47=The file %s was not found
|
||||
WMLTools_48=The file does not exist or is null:
|
||||
WMLToolsPreferencePage_0=WML Tools preferences
|
||||
WMLToolsPreferencePage_1=WMLINDENT:
|
||||
WMLToolsPreferencePage_10=Dry run
|
||||
|
@ -368,22 +290,13 @@ WMLToolsPreferencePage_5=WMLSCOPE:
|
|||
WMLToolsPreferencePage_6=Verbose level:
|
||||
WMLToolsPreferencePage_7=Report collisions
|
||||
WMLToolsPreferencePage_9=WMLLINT:
|
||||
WorkspaceUtils_10=Now, I'll make projects for each existing campaign
|
||||
WorkspaceUtils_11=and user addon. It will take a while.
|
||||
WorkspaceUtils_12=Press OK to continue.
|
||||
WorkspaceUtils_13=Setting up the workspace...
|
||||
WorkspaceUtils_18=Do you want me to create for you
|
||||
WorkspaceUtils_19=\ projects for each of your addon, so you can easily use them?
|
||||
WorkspaceUtils_20=Do you want me to create for you
|
||||
WorkspaceUtils_21=\ projects for each mainline campaign?
|
||||
WorkspaceUtils_18=Do you want me to create for you projects for each of your addon, so you can easily use them?
|
||||
WorkspaceUtils_20=What about projects for each mainline campaign?
|
||||
WorkspaceUtils_22=Setting up the workspace...
|
||||
WorkspaceUtils_25=Congrats\!\n
|
||||
WorkspaceUtils_26=Everything is set up. Now you can use the plugin.\n\n
|
||||
WorkspaceUtils_27=Good luck and have fun\!
|
||||
WorkspaceUtils_28=setupWorkspace was successful
|
||||
WorkspaceUtils_25=Congrats\!\n Everything is set up. Now you can use the plugin.\n\n Good luck and have fun\!
|
||||
WorkspaceUtils_29=Workspace was set up successfully.
|
||||
WorkspaceUtils_30=There was an error trying to setup the workspace.
|
||||
WorkspaceUtils_33=Please set all plugin's preferences before using it.
|
||||
WorkspaceUtils_7=Not all mandatory preferences were setup,
|
||||
WorkspaceUtils_8=aborting. Please re-run this if you want to use the plugin.
|
||||
WorkspaceUtils_9=Good. The preferences were set.\n
|
||||
WorkspaceUtils_7=Not all mandatory preferences were setup, aborting. Please re-run this if you want to use the plugin.
|
||||
WorkspaceUtils_9=Good. The preferences were set.\nNow, I'll make projects for each existing campaign and user addon. It will take a while. Press OK to continue.
|
||||
|
|
|
@ -9,9 +9,9 @@
|
|||
package org.wesnoth.preferences;
|
||||
|
||||
import org.eclipse.jface.preference.BooleanFieldEditor;
|
||||
import org.wesnoth.WesnothPlugin;
|
||||
import org.wesnoth.Constants;
|
||||
import org.wesnoth.Messages;
|
||||
import org.wesnoth.WesnothPlugin;
|
||||
|
||||
public class AdvancedPreferencePage extends AbstractPreferencePage
|
||||
{
|
||||
|
@ -29,7 +29,6 @@ public class AdvancedPreferencePage extends AbstractPreferencePage
|
|||
addField(new BooleanFieldEditor(
|
||||
Constants.P_ADV_NO_TERRAIN_GFX, Messages.AdvancedPreferencePage_1, 1,
|
||||
getFieldEditorParent()),
|
||||
Messages.AdvancedPreferencePage_2 +
|
||||
Messages.AdvancedPreferencePage_3);
|
||||
Messages.AdvancedPreferencePage_2);
|
||||
}
|
||||
}
|
||||
|
|
|
@ -552,8 +552,7 @@ public class WesnothInstallsPage extends AbstractPreferencePage
|
|||
}
|
||||
|
||||
if ( cmbVersion_.getText().isEmpty() == true ) {
|
||||
GUIUtils.showErrorMessageBox(
|
||||
Messages.WesnothInstallsPage_20 );
|
||||
GUIUtils.showErrorMessageBox( Messages.WesnothInstallsPage_20 );
|
||||
return false;
|
||||
}
|
||||
|
||||
|
|
|
@ -14,7 +14,6 @@ import java.util.List;
|
|||
import java.util.Map;
|
||||
|
||||
import org.wesnoth.Logger;
|
||||
import org.wesnoth.Messages;
|
||||
import org.wesnoth.utils.ResourceUtils;
|
||||
|
||||
|
||||
|
@ -93,11 +92,11 @@ public class Define
|
|||
getWMLSAXHandlerFromResource(file, new DefinesSAXHandler());
|
||||
|
||||
if (handler != null){
|
||||
Logger.getInstance().log(Messages.Define_0 + handler.getDefines().size() + Messages.Define_1 + file);
|
||||
Logger.getInstance().log("loaded " + handler.getDefines().size() + " defines for file:" + file); //$NON-NLS-1$ //$NON-NLS-1$ //$NON-NLS-2$
|
||||
return handler.getDefines();
|
||||
}
|
||||
|
||||
Logger.getInstance().log(Messages.Define_2);
|
||||
Logger.getInstance().log("There was an error on creating the Defines SAX handler"); //$NON-NLS-1$
|
||||
return new HashMap<String, Define>(0);
|
||||
}
|
||||
|
||||
|
|
|
@ -102,7 +102,7 @@ public class PreprocessorUtils
|
|||
if (filesTimeStamps_.containsKey(filePath) &&
|
||||
filesTimeStamps_.get(filePath) >= new File(filePath).lastModified())
|
||||
{
|
||||
Logger.getInstance().log(Messages.PreprocessorUtils_1 + filePath);
|
||||
Logger.getInstance().log("skipped preprocessing a non-modified file: " + filePath); //$NON-NLS-1$
|
||||
return -1;
|
||||
}
|
||||
|
||||
|
@ -163,7 +163,7 @@ public class PreprocessorUtils
|
|||
arguments.add( definesArg.toString() );
|
||||
}
|
||||
|
||||
Logger.getInstance().log(Messages.PreprocessorUtils_10 + filePath);
|
||||
Logger.getInstance().log("preprocessing file: " + filePath); //$NON-NLS-1$
|
||||
ExternalToolInvoker wesnoth = new ExternalToolInvoker(
|
||||
paths.getWesnothExecutablePath( ),
|
||||
arguments);
|
||||
|
@ -188,7 +188,7 @@ public class PreprocessorUtils
|
|||
{
|
||||
if (file == null || !file.exists())
|
||||
{
|
||||
Logger.getInstance().log(Messages.PreprocessorUtils_11,
|
||||
Logger.getInstance().log("file null or non existent.", //$NON-NLS-1$
|
||||
Messages.PreprocessorUtils_12);
|
||||
return;
|
||||
}
|
||||
|
|
|
@ -16,7 +16,6 @@ import java.util.Map;
|
|||
import java.util.Stack;
|
||||
|
||||
import org.wesnoth.Logger;
|
||||
import org.wesnoth.Messages;
|
||||
import org.wesnoth.installs.WesnothInstall;
|
||||
import org.wesnoth.installs.WesnothInstallsUtils;
|
||||
import org.wesnoth.preferences.Preferences;
|
||||
|
@ -99,7 +98,7 @@ public class SchemaParser
|
|||
{
|
||||
if (parsingDone_ && !force)
|
||||
{
|
||||
Logger.getInstance().log(Messages.SchemaParser_1);
|
||||
Logger.getInstance().log("schema not parsed since there is already in cache."); //$NON-NLS-1$
|
||||
return;
|
||||
}
|
||||
|
||||
|
@ -110,7 +109,7 @@ public class SchemaParser
|
|||
tags_.clear();
|
||||
}
|
||||
|
||||
Logger.getInstance().log(Messages.SchemaParser_2 + (force == true ? Messages.SchemaParser_3 : "")); //$NON-NLS-1$
|
||||
Logger.getInstance().log("parsing schema " + (force == true ? "forced" : "")); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
|
||||
File schemaFile = new File(schemaPath);
|
||||
String res = ResourceUtils.getFileContents(schemaFile);
|
||||
String[] lines = StringUtils.getLines(res);
|
||||
|
@ -184,7 +183,7 @@ public class SchemaParser
|
|||
if (tokens.length != 2)
|
||||
{
|
||||
Logger.getInstance().logError(
|
||||
Messages.SchemaParser_18 + index);
|
||||
"Error. invalid primitive on line :" + index); //$NON-NLS-1$
|
||||
continue;
|
||||
}
|
||||
primitives_.put(tokens[0].trim(), tokens[1].trim());
|
||||
|
@ -221,11 +220,11 @@ public class SchemaParser
|
|||
}
|
||||
|
||||
if ( currentTag != null ) {
|
||||
currentTag.setDescription(new Tag(Messages.SchemaParser_25, '?'));
|
||||
currentTag.setDescription(new Tag("description", '?')); //$NON-NLS-1$
|
||||
currentTag.getDescription().getKeyChildren().add(
|
||||
new TagKey(tokens[0], '?', "", value.toString(), true)); //$NON-NLS-1$
|
||||
}else {
|
||||
System.out.println( Messages.SchemaParser_0 );
|
||||
System.out.println( "Tag shouldn't have been null!" ); //$NON-NLS-1$
|
||||
}
|
||||
}
|
||||
else
|
||||
|
@ -238,7 +237,7 @@ public class SchemaParser
|
|||
if (tokens.length != 2)
|
||||
{
|
||||
Logger.getInstance().logError(
|
||||
Messages.SchemaParser_30 + index);
|
||||
"Error. invalid attribute on line :" + index); //$NON-NLS-1$
|
||||
continue;
|
||||
}
|
||||
|
||||
|
@ -246,7 +245,7 @@ public class SchemaParser
|
|||
if (value.length != 2)
|
||||
{
|
||||
Logger.getInstance().logError(
|
||||
Messages.SchemaParser_32 + index);
|
||||
"Error. invalid attribute value on line:" + index); //$NON-NLS-1$
|
||||
continue;
|
||||
}
|
||||
|
||||
|
@ -270,7 +269,7 @@ public class SchemaParser
|
|||
{
|
||||
if (primitives_.get(value[1]) == null)
|
||||
Logger.getInstance().logError(
|
||||
Messages.SchemaParser_34 + value[1]);
|
||||
"Undefined primitive type in schema.cfg for: " + value[1]); //$NON-NLS-1$
|
||||
|
||||
currentTag.addKey(tokens[0], primitives_.get(value[1]),
|
||||
getCardinality(value[0]), value[1].equals("tstring")); //$NON-NLS-1$
|
||||
|
@ -291,7 +290,7 @@ public class SchemaParser
|
|||
expandTag(tag,0);
|
||||
}
|
||||
|
||||
Logger.getInstance().log(Messages.SchemaParser_36);
|
||||
Logger.getInstance().log("parsing done"); //$NON-NLS-1$
|
||||
parsingDone_ = true;
|
||||
}
|
||||
|
||||
|
|
|
@ -21,7 +21,6 @@ import java.util.regex.Pattern;
|
|||
|
||||
import org.wesnoth.Constants;
|
||||
import org.wesnoth.Logger;
|
||||
import org.wesnoth.Messages;
|
||||
import org.wesnoth.utils.Pair;
|
||||
import org.wesnoth.utils.StringUtils;
|
||||
|
||||
|
@ -54,7 +53,7 @@ public class TemplateProvider
|
|||
{
|
||||
try
|
||||
{
|
||||
Logger.getInstance().log(Messages.TemplateProvider_0 +
|
||||
Logger.getInstance().log("reading templates from: " + //$NON-NLS-1$
|
||||
Constants.PLUGIN_FULL_PATH + Constants.TEMPLATES_FILENAME);
|
||||
|
||||
BufferedReader reader = new BufferedReader(
|
||||
|
@ -189,7 +188,7 @@ public class TemplateProvider
|
|||
if (tmpLine.length != 2)
|
||||
{
|
||||
Logger.getInstance().logError(
|
||||
String.format(Messages.TemplateProvider_15,
|
||||
String.format("error parsing 'structure template' (%s) on line %s", //$NON-NLS-1$
|
||||
structureTemplate, line));
|
||||
continue;
|
||||
}
|
||||
|
|
|
@ -22,7 +22,6 @@ import java.util.Locale;
|
|||
|
||||
import org.wesnoth.Constants;
|
||||
import org.wesnoth.Logger;
|
||||
import org.wesnoth.Messages;
|
||||
|
||||
/**
|
||||
* A tool to invoke an external tool/executable
|
||||
|
@ -60,7 +59,7 @@ public class ExternalToolInvoker
|
|||
arguments_ = commandline;
|
||||
|
||||
processBuilder_ = new ProcessBuilder(commandline);
|
||||
Logger.getInstance().log(String.format(Messages.ExternalToolInvoker_0,
|
||||
Logger.getInstance().log(String.format("Invoking tool %s with args: %s", //$NON-NLS-1$
|
||||
fileName, arguments));
|
||||
|
||||
outputContent_ = new StringBuilder();
|
||||
|
|
|
@ -22,7 +22,6 @@ import org.wesnoth.preferences.Preferences;
|
|||
import org.wesnoth.preferences.Preferences.Paths;
|
||||
import org.wesnoth.projects.ProjectUtils;
|
||||
|
||||
|
||||
public class GameUtils
|
||||
{
|
||||
/**
|
||||
|
@ -62,7 +61,7 @@ public class GameUtils
|
|||
if ( selectedResource == null )
|
||||
{
|
||||
GUIUtils.showWarnMessageBox(Messages.GameUtils_0 +
|
||||
Messages.GameUtils_1);
|
||||
""); //$NON-NLS-1$
|
||||
return;
|
||||
}
|
||||
|
||||
|
@ -81,14 +80,14 @@ public class GameUtils
|
|||
if (campaignId == null)
|
||||
{
|
||||
GUIUtils.showErrorMessageBox(Messages.GameUtils_2 +
|
||||
Messages.GameUtils_3);
|
||||
""); //$NON-NLS-1$
|
||||
return;
|
||||
}
|
||||
|
||||
if (scenario == true && scenarioId == null)
|
||||
{
|
||||
GUIUtils.showErrorMessageBox(Messages.GameUtils_4 +
|
||||
Messages.GameUtils_5);
|
||||
""); //$NON-NLS-1$
|
||||
return;
|
||||
}
|
||||
|
||||
|
@ -175,7 +174,7 @@ public class GameUtils
|
|||
{
|
||||
if (file == null || !file.exists())
|
||||
{
|
||||
Logger.getInstance().log(Messages.GameUtils_11,
|
||||
Logger.getInstance().log("non-existing map file", //$NON-NLS-1$
|
||||
Messages.GameUtils_12);
|
||||
return;
|
||||
}
|
||||
|
|
|
@ -14,10 +14,9 @@ import org.eclipse.core.resources.IResource;
|
|||
import org.eclipse.core.runtime.Path;
|
||||
import org.eclipse.swt.SWT;
|
||||
import org.eclipse.swt.widgets.FileDialog;
|
||||
import org.wesnoth.WesnothPlugin;
|
||||
import org.wesnoth.Logger;
|
||||
import org.wesnoth.Messages;
|
||||
|
||||
import org.wesnoth.WesnothPlugin;
|
||||
|
||||
public class MapUtils
|
||||
{
|
||||
|
@ -28,7 +27,7 @@ public class MapUtils
|
|||
{
|
||||
if (WorkspaceUtils.getSelectedFolder() == null)
|
||||
{
|
||||
Logger.getInstance().log(Messages.MapUtils_0,
|
||||
Logger.getInstance().log("no directory selected (importMap)", //$NON-NLS-1$
|
||||
Messages.MapUtils_1);
|
||||
return;
|
||||
}
|
||||
|
|
|
@ -31,7 +31,6 @@ import org.eclipse.core.resources.IProject;
|
|||
import org.eclipse.core.resources.IResource;
|
||||
import org.eclipse.core.resources.ResourcesPlugin;
|
||||
import org.eclipse.core.runtime.CoreException;
|
||||
import org.eclipse.core.runtime.IStatus;
|
||||
import org.eclipse.core.runtime.NullProgressMonitor;
|
||||
import org.eclipse.core.runtime.Path;
|
||||
import org.eclipse.emf.common.util.URI;
|
||||
|
@ -157,7 +156,7 @@ public class ResourceUtils
|
|||
|
||||
} catch (CoreException e)
|
||||
{
|
||||
Logger.getInstance().log(Messages.ResourceUtils_4 + resourceName, IStatus.ERROR);
|
||||
Logger.getInstance().logError( "Error creating the resource" + resourceName ); //$NON-NLS-1$
|
||||
GUIUtils.showMessageBox(Messages.ResourceUtils_5 + resourceName, SWT.ICON_ERROR);
|
||||
Logger.getInstance().logException(e);
|
||||
}
|
||||
|
@ -188,7 +187,7 @@ public class ResourceUtils
|
|||
if (fileContentsString == null)
|
||||
{
|
||||
fileContentsString = ""; //$NON-NLS-1$
|
||||
Logger.getInstance().log(Messages.ResourceUtils_7, IStatus.WARNING);
|
||||
Logger.getInstance().logWarn( "file contents are null" ); //$NON-NLS-1$
|
||||
}
|
||||
|
||||
if (file.exists() && overwrite)
|
||||
|
@ -301,7 +300,7 @@ public class ResourceUtils
|
|||
{
|
||||
boolean valid = filePath != null && !filePath.isEmpty() && new File(filePath).exists();
|
||||
if ( valid == false )
|
||||
Logger.getInstance().logWarn(Messages.WMLTools_48 + filePath);
|
||||
Logger.getInstance().logWarn("The file does not exist or is null: " + filePath); //$NON-NLS-1$
|
||||
return valid;
|
||||
}
|
||||
|
||||
|
@ -423,7 +422,7 @@ public class ResourceUtils
|
|||
}
|
||||
catch (SAXException e) {
|
||||
Logger.getInstance().logException(e);
|
||||
Logger.getInstance().logError(Messages.ResourceUtils_21 + parser.getOutputContent());
|
||||
Logger.getInstance().logError("Using output: " + parser.getOutputContent()); //$NON-NLS-1$
|
||||
return null;
|
||||
}
|
||||
catch (Exception e)
|
||||
|
|
|
@ -17,6 +17,11 @@ import org.wesnoth.wml.WMLTag;
|
|||
|
||||
public class WMLGrammarUtils
|
||||
{
|
||||
/**
|
||||
* Returns the list of child keys for this tag
|
||||
* @param tag The tag to process
|
||||
* @return A list of {@link WMLKey}
|
||||
*/
|
||||
public static List<WMLKey> getTagKeys( WMLTag tag )
|
||||
{
|
||||
List<WMLKey> result = new ArrayList<WMLKey>();
|
||||
|
@ -28,6 +33,11 @@ public class WMLGrammarUtils
|
|||
return result;
|
||||
}
|
||||
|
||||
/**
|
||||
* Returns the list of child tags for this tag
|
||||
* @param tag The tag to process
|
||||
* @return A list of {@link WMLTag}
|
||||
*/
|
||||
public static List<WMLTag> getTagTags( WMLTag tag )
|
||||
{
|
||||
List<WMLTag> result = new ArrayList<WMLTag>();
|
||||
|
|
|
@ -463,15 +463,14 @@ public class WMLTools
|
|||
{
|
||||
if ( !ResourceUtils.isValidFilePath( Preferences.getString(Constants.P_PYTHON_PATH) ) )
|
||||
{
|
||||
GUIUtils.showWarnMessageBox(Messages.WMLTools_42 + Messages.WMLTools_43);
|
||||
GUIUtils.showWarnMessageBox( Messages.WMLTools_42 );
|
||||
return false;
|
||||
}
|
||||
|
||||
if ( wmlTool != null ) {
|
||||
if ( paths.getWMLToolsDir( ).equals( "" ) ) //$NON-NLS-1$
|
||||
{
|
||||
GUIUtils.showWarnMessageBox(Messages.WMLTools_45 +
|
||||
Messages.WMLTools_46);
|
||||
GUIUtils.showWarnMessageBox( Messages.WMLTools_45 );
|
||||
return false;
|
||||
}
|
||||
File wmlToolFile = new File( paths.getWMLToolsDir( ) + wmlTool );
|
||||
|
|
|
@ -325,13 +325,7 @@ public class WorkspaceUtils
|
|||
{
|
||||
if (guided)
|
||||
{
|
||||
GUIUtils.showInfoMessageBox(
|
||||
Messages.Activator_0 +
|
||||
Messages.Activator_1 +
|
||||
Messages.Activator_2 +
|
||||
Messages.Activator_3 +
|
||||
Messages.Activator_4 +
|
||||
Messages.Activator_5);
|
||||
GUIUtils.showInfoMessageBox( Messages.WorkspaceUtils_0 );
|
||||
}
|
||||
|
||||
if (!checkPathsAreSet( null, false ))
|
||||
|
@ -341,22 +335,17 @@ public class WorkspaceUtils
|
|||
if ( pref.open() == Window.CANCEL ||
|
||||
!checkPathsAreSet ( null, true ) )
|
||||
{
|
||||
GUIUtils.showErrorMessageBox(Messages.WorkspaceUtils_7 +
|
||||
Messages.WorkspaceUtils_8);
|
||||
GUIUtils.showErrorMessageBox( Messages.WorkspaceUtils_7 );
|
||||
return;
|
||||
}
|
||||
|
||||
if (guided)
|
||||
{
|
||||
GUIUtils.showInfoMessageBox(
|
||||
Messages.WorkspaceUtils_9 +
|
||||
Messages.WorkspaceUtils_10+
|
||||
Messages.WorkspaceUtils_11+
|
||||
Messages.WorkspaceUtils_12);
|
||||
GUIUtils.showInfoMessageBox( Messages.WorkspaceUtils_9 );
|
||||
}
|
||||
}
|
||||
|
||||
WorkspaceJob job = new WorkspaceJob(Messages.WorkspaceUtils_13){
|
||||
WorkspaceJob job = new WorkspaceJob( Messages.WorkspaceUtils_13 ){
|
||||
@Override
|
||||
public IStatus runInWorkspace(IProgressMonitor monitor)
|
||||
{
|
||||
|
@ -367,8 +356,7 @@ public class WorkspaceUtils
|
|||
String addonsDir = Preferences.getPaths( null ).getAddonsDir( );
|
||||
String campaignsDir = Preferences.getPaths( null ).getCampaignDir( );
|
||||
|
||||
if (GUIUtils.showMessageBox(Messages.WorkspaceUtils_18 +
|
||||
Messages.WorkspaceUtils_19,
|
||||
if (GUIUtils.showMessageBox( Messages.WorkspaceUtils_18 ,
|
||||
SWT.ICON_QUESTION | SWT.YES | SWT.NO) == SWT.YES)
|
||||
{
|
||||
// useraddons/add-ons/data
|
||||
|
@ -377,8 +365,7 @@ public class WorkspaceUtils
|
|||
files.addAll(Arrays.asList(tmp));
|
||||
}
|
||||
|
||||
if (GUIUtils.showMessageBox(Messages.WorkspaceUtils_20 +
|
||||
Messages.WorkspaceUtils_21,
|
||||
if (GUIUtils.showMessageBox( Messages.WorkspaceUtils_20 ,
|
||||
SWT.ICON_QUESTION | SWT.YES | SWT.NO) == SWT.YES)
|
||||
{
|
||||
// workingdir/data/campaigns
|
||||
|
@ -419,14 +406,11 @@ public class WorkspaceUtils
|
|||
|
||||
if (guided)
|
||||
{
|
||||
GUIUtils.showInfoMessageBox(
|
||||
Messages.WorkspaceUtils_25 +
|
||||
Messages.WorkspaceUtils_26 +
|
||||
Messages.WorkspaceUtils_27);
|
||||
GUIUtils.showInfoMessageBox( Messages.WorkspaceUtils_25 );
|
||||
}
|
||||
else
|
||||
{
|
||||
Logger.getInstance().log(Messages.WorkspaceUtils_28,
|
||||
Logger.getInstance().log("setupWorkspace was successful", //$NON-NLS-1$
|
||||
Messages.WorkspaceUtils_29);
|
||||
}
|
||||
} catch (Exception e)
|
||||
|
|
|
@ -1,28 +0,0 @@
|
|||
/*******************************************************************************
|
||||
* Copyright (c) 2010 - 2011 by Timotei Dolean <timotei21@gmail.com>
|
||||
*
|
||||
* This program and the accompanying materials are made available
|
||||
* under the terms of the Eclipse Public License v1.0
|
||||
* which accompanies this distribution, and is available at
|
||||
* http://www.eclipse.org/legal/epl-v10.html
|
||||
*******************************************************************************/
|
||||
package org.wesnoth.validation;
|
||||
|
||||
import org.eclipse.osgi.util.NLS;
|
||||
|
||||
public class Messages extends NLS
|
||||
{
|
||||
private static final String BUNDLE_NAME = "org.wesnoth.validation.messages"; //$NON-NLS-1$
|
||||
public static String WMLJavaValidator_0;
|
||||
public static String WMLJavaValidator_1;
|
||||
public static String WMLJavaValidator_2;
|
||||
static
|
||||
{
|
||||
// initialize resource bundle
|
||||
NLS.initializeMessages(BUNDLE_NAME, Messages.class);
|
||||
}
|
||||
|
||||
private Messages()
|
||||
{
|
||||
}
|
||||
}
|
|
@ -17,6 +17,7 @@ import org.eclipse.xtext.parsetree.LeafNode;
|
|||
import org.eclipse.xtext.parsetree.NodeUtil;
|
||||
import org.eclipse.xtext.validation.Check;
|
||||
import org.eclipse.xtext.validation.CheckType;
|
||||
import org.wesnoth.Messages;
|
||||
import org.wesnoth.installs.WesnothInstallsUtils;
|
||||
import org.wesnoth.schema.SchemaParser;
|
||||
import org.wesnoth.schema.Tag;
|
||||
|
|
|
@ -1,3 +0,0 @@
|
|||
WMLJavaValidator_0=Incorrect closing tag name.
|
||||
WMLJavaValidator_1=There is no such wml tag name.
|
||||
WMLJavaValidator_2=triggered wmlkey expensive validation.
|
|
@ -144,8 +144,7 @@ public class CampaignPage1 extends NewWizardPageTemplate
|
|||
GridData gd_lblRelativeToThe_1 = new GridData(SWT.FILL, SWT.CENTER, false, false, 1, 1);
|
||||
gd_lblRelativeToThe_1.widthHint = 285;
|
||||
lblRelativeToThe_1.setLayoutData(gd_lblRelativeToThe_1);
|
||||
lblRelativeToThe_1
|
||||
.setToolTipText(Messages.CampaignPage1_17);
|
||||
lblRelativeToThe_1.setToolTipText(Messages.CampaignPage1_17);
|
||||
lblRelativeToThe_1.setText(Messages.CampaignPage1_18);
|
||||
|
||||
updateIsPageComplete();
|
||||
|
|
|
@ -89,12 +89,7 @@ public class EmptyProjectPage1 extends NewWizardPageTemplate
|
|||
txtVersion_.addModifyListener(updatePageCompleteListener);
|
||||
|
||||
Label lblFormat = new Label(container, SWT.NONE);
|
||||
lblFormat.setToolTipText(Messages.EmptyProjectPage1_8 +
|
||||
Messages.EmptyProjectPage1_9 +
|
||||
Messages.EmptyProjectPage1_10 +
|
||||
Messages.EmptyProjectPage1_11 +
|
||||
Messages.EmptyProjectPage1_12 +
|
||||
Messages.EmptyProjectPage1_13);
|
||||
lblFormat.setToolTipText( Messages.EmptyProjectPage1_8 );
|
||||
lblFormat.setText(Messages.EmptyProjectPage1_14);
|
||||
|
||||
Label lblTranslationsDir = new Label(container, SWT.NONE);
|
||||
|
@ -154,15 +149,7 @@ public class EmptyProjectPage1 extends NewWizardPageTemplate
|
|||
GridData gd_lblRelativeToThe_1 = new GridData(SWT.FILL, SWT.CENTER, false, false, 1, 1);
|
||||
gd_lblRelativeToThe_1.widthHint = 285;
|
||||
lblRelativeToThe_1.setLayoutData(gd_lblRelativeToThe_1);
|
||||
lblRelativeToThe_1.setToolTipText(Messages.EmptyProjectPage1_23 +
|
||||
Messages.EmptyProjectPage1_24 +
|
||||
Messages.EmptyProjectPage1_25 +
|
||||
Messages.EmptyProjectPage1_26 +
|
||||
Messages.EmptyProjectPage1_27 +
|
||||
Messages.EmptyProjectPage1_28 +
|
||||
Messages.EmptyProjectPage1_29 +
|
||||
Messages.EmptyProjectPage1_30 +
|
||||
Messages.EmptyProjectPage1_31);
|
||||
lblRelativeToThe_1.setToolTipText( Messages.EmptyProjectPage1_23 );
|
||||
lblRelativeToThe_1.setText(Messages.EmptyProjectPage1_32);
|
||||
|
||||
updateIsPageComplete();
|
||||
|
|
|
@ -149,7 +149,7 @@ public class EraNewWizard extends NewWizardTemplate
|
|||
|
||||
if (template == null)
|
||||
{
|
||||
Logger.getInstance().log(Messages.EraNewWizard_7,
|
||||
Logger.getInstance().log("'era' template not found", //$NON-NLS-1$
|
||||
Messages.EraNewWizard_8);
|
||||
return null;
|
||||
}
|
||||
|
|
|
@ -114,8 +114,7 @@ public class EraPage0 extends NewWizardPageTemplate
|
|||
txtEraName_.addModifyListener(modifyListener);
|
||||
|
||||
chkRequireEra_ = new Button(container, SWT.CHECK);
|
||||
chkRequireEra_
|
||||
.setToolTipText(Messages.EraPage0_8);
|
||||
chkRequireEra_.setToolTipText(Messages.EraPage0_8);
|
||||
chkRequireEra_.setText(Messages.EraPage0_9);
|
||||
new Label(container, SWT.NONE);
|
||||
new Label(container, SWT.NONE);
|
||||
|
|
|
@ -168,7 +168,7 @@ public class FactionNewWizard extends NewWizardTemplate
|
|||
|
||||
if (template == null)
|
||||
{
|
||||
Logger.getInstance().log(Messages.FactionNewWizard_13,
|
||||
Logger.getInstance().log("'faction' template not found", //$NON-NLS-1$
|
||||
Messages.FactionNewWizard_14);
|
||||
return null;
|
||||
}
|
||||
|
|
|
@ -40,7 +40,7 @@ public class WizardLauncherPage1 extends NewWizardPageTemplate
|
|||
|
||||
list_ = new HashMap<String, String>();
|
||||
|
||||
String[] templates = StringUtils.getLines(TemplateProvider.getInstance().getTemplate("wizards"));
|
||||
String[] templates = StringUtils.getLines(TemplateProvider.getInstance().getTemplate("wizards")); //$NON-NLS-1$
|
||||
|
||||
for (String line : templates)
|
||||
{
|
||||
|
@ -49,7 +49,7 @@ public class WizardLauncherPage1 extends NewWizardPageTemplate
|
|||
String[] tokens = line.split(":"); //$NON-NLS-1$
|
||||
if (tokens.length != 2)
|
||||
{
|
||||
Logger.getInstance().logError("Error in template 'wizards' on line:" + line);
|
||||
Logger.getInstance().logError("Error in template 'wizards' on line:" + line); //$NON-NLS-1$
|
||||
continue;
|
||||
}
|
||||
list_.put(tokens[0], tokens[1]);
|
||||
|
|
|
@ -99,7 +99,7 @@ public class NewConfigFileWizard extends NewWizardTemplate {
|
|||
|
||||
if (!resource.exists() || !(resource instanceof IContainer))
|
||||
{
|
||||
throw new Exception(Messages.NewConfigFileWizard_1 + containerName + Messages.NewConfigFileWizard_2);
|
||||
throw new Exception( "Container " + containerName + " does not exist." ); //$NON-NLS-1$ //$NON-NLS-2$
|
||||
}
|
||||
|
||||
IContainer container = (IContainer) resource;
|
||||
|
|
|
@ -140,7 +140,7 @@ public class ScenarioNewWizard extends NewWizardTemplate
|
|||
|
||||
if (!resource.exists() || !(resource instanceof IContainer))
|
||||
{
|
||||
throw new Exception(Messages.ScenarioNewWizard_3 + containerName + Messages.ScenarioNewWizard_4);
|
||||
throw new Exception( "Container " + containerName + " does not exist." ); //$NON-NLS-1$ //$NON-NLS-2$
|
||||
}
|
||||
|
||||
final IContainer container = (IContainer) resource;
|
||||
|
@ -227,7 +227,7 @@ public class ScenarioNewWizard extends NewWizardTemplate
|
|||
{
|
||||
startingGold = page1_.getStartingGoldByDifficulties();
|
||||
if (startingGold == null)
|
||||
throw new Exception(Messages.ScenarioNewWizard_15);
|
||||
throw new Exception("incorrect arguments"); //$NON-NLS-1$
|
||||
}
|
||||
params.add(new ReplaceableParameter("$$starting_gold", startingGold)); //$NON-NLS-1$
|
||||
|
||||
|
|
Loading…
Add table
Reference in a new issue