Author: rob.stryker(a)jboss.com Date: 2009-04-08 01:40:57 -0400 (Wed, 08 Apr 2009) New Revision: 14584 Modified: trunk/archives/plugins/org.jboss.ide.eclipse.archives.ui/src/main/org/jboss/ide/eclipse/archives/ui/ArchivesUIMessages.java trunk/archives/plugins/org.jboss.ide.eclipse.archives.ui/src/main/org/jboss/ide/eclipse/archives/ui/ArchivesUIMessages.properties trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/Messages.java trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/Messages.properties trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/editor/PollerSection.java Log: JBIDE-4044 - NLS Modified: trunk/archives/plugins/org.jboss.ide.eclipse.archives.ui/src/main/org/jboss/ide/eclipse/archives/ui/ArchivesUIMessages.java =================================================================== --- trunk/archives/plugins/org.jboss.ide.eclipse.archives.ui/src/main/org/jboss/ide/eclipse/archives/ui/ArchivesUIMessages.java 2009-04-08 02:47:57 UTC (rev 14583) +++ trunk/archives/plugins/org.jboss.ide.eclipse.archives.ui/src/main/org/jboss/ide/eclipse/archives/ui/ArchivesUIMessages.java 2009-04-08 05:40:57 UTC (rev 14584) @@ -51,38 +51,16 @@ public static String PackageInfoWizardPage_error_noDestination; public static String PackageInfoWizardPage_explodedButton_label; public static String PackageInfoWizardPage_infoGroup_label; - public static String PackageInfoWizardPage_manifestBrowseButton_label; public static String PackageInfoWizardPage_message; public static String PackageInfoWizardPage_packageName_label; public static String PackageInfoWizardPage_packageTypeGroup_label; public static String PackageInfoWizardPage_title; - public static String PackageNodeDestinationComposite_destinationBrowseButton_label; - - public static String PackageDestinationComposite_filesystemBrowseButton_label; public static String PackageDestinationComposite_workspaceBrowseButton_label; - - public static String PackageNodeDestinationDialog_filesetLabel; - public static String PackageNodeDestinationDialog_folderLabel; - public static String PackageNodeDestinationDialog_messagePrefix; - public static String PackageNodeDestinationDialog_packageLabel; public static String PackageNodeDestinationDialog_title; - public static String PackagesLabelProvider_filesetProperty_destination; - public static String PackagesLabelProvider_filesetProperty_dir; - public static String PackagesLabelProvider_filesetProperty_excludes; - public static String PackagesLabelProvider_filesetProperty_file; - public static String PackagesLabelProvider_filesetProperty_includes; - public static String PackagesLabelProvider_filesetProperty_project; - public static String PackagesLabelProvider_filesetProperty_sourceFolder; - - public static String ProjectPackagesView_noProjectSelectedMessage; - public static String ProjectPackagesView_noPackagesDefinedMessage; - public static String ProjectPackagesView_createPackagesMessage; public static String ProjectPackagesView_newFolderAction_label; public static String ProjectPackagesView_newFilesetAction_label; - public static String ProjectPackagesView_newActionAction_label; - public static String ProjectPackagesView_collapseAllAction_label; public static String ProjectPackagesView_deletePackageAction_label; public static String ProjectPackagesView_editPackageAction_label; public static String ProjectPackagesView_newPackageMenu_label; @@ -90,8 +68,6 @@ public static String ProjectPackagesView_deleteFolderAction_label; public static String ProjectPackagesView_editFilesetAction_label; public static String ProjectPackagesView_deleteFilesetAction_label; - public static String ProjectPackagesView_editActionAction_label; - public static String ProjectPackagesView_deleteActionAction_label; public static String ProjectPackagesView_buildArchiveAction_label; public static String ProjectPackagesView_buildProjectAction_label; @@ -105,23 +81,10 @@ public static String FilesetInfoWizardPage_edit_title; public static String FilesetInfoWizardPage_infoGroup_title; public static String FilesetInfoWizardPage_destination_label; - public static String FilesetInfoWizardPage_multipleFilesButton_label; - public static String FilesetInfoWizardPage_singleFileButton_label; - public static String FilesetInfoWizardPage_rootProject_label; public static String FilesetInfoWizardPage_rootDirectory_label; - public static String FilesetInfoWizardPage_rootDirWorkspaceBrowseButton_label; - public static String FilesetInfoWizardPage_rootDirFilesystemBrowseButton_label; public static String FilesetInfoWizardPage_includes_label; public static String FilesetInfoWizardPage_excludes_label; - public static String FilesetInfoWizardPage_singleFileProject_label; - public static String FilesetInfoWizardPage_singleFile_label; - public static String FilesetInfoWizardPage_fileWorkspaceBrowseButton_label; - public static String FilesetInfoWizardPage_fileFilesystemBrowseButton_label; public static String FilesetInfoWizardPage_previewGroup_label; - public static String FilesetInfoWizardPage_noProjectMessage; - public static String FilesetInfoWizardPage_rootDirWorkspaceBrowser_message; - public static String FilesetInfoWizardPage_fileWorkspaceBrowser_title; - public static String FilesetInfoWizardPage_fileWorkspaceBrowser_message; /* Preference Page */ public static String PreferencePageTitle; @@ -139,16 +102,6 @@ public static String FilesetPreferences; public static String EnableDefaultExcludes; - public static String ArchivesVariables; - public static String VariablesGroup; - public static String Add; - public static String Edit; - public static String Remove; - public static String Enable; - public static String Disable; - public static String MoveUp; - public static String MoveDown; - static { NLS.initializeMessages("org.jboss.ide.eclipse.archives.ui.ArchivesUIMessages", ArchivesUIMessages.class); //$NON-NLS-1$ } Modified: trunk/archives/plugins/org.jboss.ide.eclipse.archives.ui/src/main/org/jboss/ide/eclipse/archives/ui/ArchivesUIMessages.properties =================================================================== --- trunk/archives/plugins/org.jboss.ide.eclipse.archives.ui/src/main/org/jboss/ide/eclipse/archives/ui/ArchivesUIMessages.properties 2009-04-08 02:47:57 UTC (rev 14583) +++ trunk/archives/plugins/org.jboss.ide.eclipse.archives.ui/src/main/org/jboss/ide/eclipse/archives/ui/ArchivesUIMessages.properties 2009-04-08 05:40:57 UTC (rev 14584) @@ -24,24 +24,15 @@ Yes=Yes No=No - - -ProjectPackagesView_noProjectSelectedMessage=Please select an opened project or resource. -ProjectPackagesView_noPackagesDefinedMessage=No archives have been defined for the project "{0}". -ProjectPackagesView_createPackagesMessage=Project has no defined archives. Create an Archive: ProjectPackagesView_newPackageMenu_label=New Archive ProjectPackagesView_newFolderAction_label=New Folder ProjectPackagesView_newFilesetAction_label=New Fileset -ProjectPackagesView_newActionAction_label=New Action -ProjectPackagesView_collapseAllAction_label=Collapse All ProjectPackagesView_deletePackageAction_label=Delete Archive ProjectPackagesView_deleteFilesetAction_label=Delete Fileset ProjectPackagesView_deleteFolderAction_label=Delete Folder -ProjectPackagesView_deleteActionAction_label=Delete Action ProjectPackagesView_editPackageAction_label=Edit Archive ProjectPackagesView_editFolderAction_label=Edit Folder ProjectPackagesView_editFilesetAction_label=Edit Fileset -ProjectPackagesView_editActionAction_label=Edit Action ProjectPackagesView_buildArchiveAction_label=Build Archive (Full) ProjectPackagesView_buildProjectAction_label=Build Project (Full) ProjectPackagesView_createFolderDialog_title=Create a folder @@ -54,30 +45,16 @@ FilesetInfoWizardPage_edit_title=Edit Fileset FilesetInfoWizardPage_infoGroup_title=Fileset information FilesetInfoWizardPage_destination_label=Destination: -FilesetInfoWizardPage_multipleFilesButton_label=Create a fileset that has multiple files -FilesetInfoWizardPage_singleFileButton_label=Create a fileset that has just one file -FilesetInfoWizardPage_rootProject_label=Root project: FilesetInfoWizardPage_rootDirectory_label=Root directory: -FilesetInfoWizardPage_rootDirWorkspaceBrowseButton_label=Workspace... -FilesetInfoWizardPage_rootDirFilesystemBrowseButton_label=Filesystem... FilesetInfoWizardPage_includes_label=Includes: FilesetInfoWizardPage_excludes_label=Excludes: -FilesetInfoWizardPage_singleFileProject_label=Project: -FilesetInfoWizardPage_singleFile_label=File: -FilesetInfoWizardPage_fileWorkspaceBrowseButton_label=Workspace... -FilesetInfoWizardPage_fileFilesystemBrowseButton_label=Filesystem... FilesetInfoWizardPage_previewGroup_label=Preview -FilesetInfoWizardPage_noProjectMessage=N/A -FilesetInfoWizardPage_rootDirWorkspaceBrowser_message=Select a root directory for this fileset -FilesetInfoWizardPage_fileWorkspaceBrowser_title=Select file -FilesetInfoWizardPage_fileWorkspaceBrowser_message=Select a file for this fileset PackageInfoWizardPage_title=Create a new archive PackageInfoWizardPage_message=Create a new archive consisting of filesets in the workspace. PackageInfoWizardPage_infoGroup_label=Archive information PackageInfoWizardPage_packageName_label=Archive name: PackageInfoWizardPage_destination_label=Destination: -PackageInfoWizardPage_manifestBrowseButton_label=Browse... PackageInfoWizardPage_packageTypeGroup_label=Archive type PackageInfoWizardPage_compressedButton_label=Standard archive using zip compression PackageInfoWizardPage_explodedButton_label=Exploded archive resulting in a folder (no compression) @@ -85,27 +62,10 @@ PackageInfoWizardPage_error_packageAlreadyExists=The archive "{0}" already exists. PackageInfoWizardPage_error_noDestination=There is no destination selected for this archive. -PackageNodeDestinationComposite_destinationBrowseButton_label=Browse... - -PackageDestinationComposite_filesystemBrowseButton_label=Filesystem... PackageDestinationComposite_workspaceBrowseButton_label=Workspace... NewJARWizard_windowTitle=New JAR NewJARWizard_windowTitle_editJAR=Edit Archive - -PackagesLabelProvider_filesetProperty_destination=Destination : -PackagesLabelProvider_filesetProperty_sourceFolder=Source Folder : -PackagesLabelProvider_filesetProperty_excludes=Excludes : -PackagesLabelProvider_filesetProperty_includes=Includes : -PackagesLabelProvider_filesetProperty_project=Project : -PackagesLabelProvider_filesetProperty_file=File : - -PackagesLabelProvider_filesetProperty_dir=Dir : - -PackageNodeDestinationDialog_messagePrefix=Please select a destination for this -PackageNodeDestinationDialog_packageLabel=archive -PackageNodeDestinationDialog_filesetLabel=fileset -PackageNodeDestinationDialog_folderLabel=folder PackageNodeDestinationDialog_title=Select a destination PreferencePageTitle=Project Archives @@ -121,13 +81,4 @@ ShowRootProject=Show project at the root ShowAllProjects=Show all projects that contain packages FilesetPreferences=Fileset Preferences -EnableDefaultExcludes=Enable Default Excludes -ArchivesVariables=Archives Variables -VariablesGroup=Enabled Variables -Add=Add -Edit=Edit -Remove=Remove -Enable=Enable -Disable=Disable -MoveUp=Move Up -MoveDown=Move Down \ No newline at end of file +EnableDefaultExcludes=Enable Default Excludes \ No newline at end of file Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/Messages.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/Messages.java 2009-04-08 02:47:57 UTC (rev 14583) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/Messages.java 2009-04-08 05:40:57 UTC (rev 14584) @@ -39,7 +39,6 @@ public static String rwf_TitleCreate; public static String rwf_TitleEdit; public static String rwf_Explanation; - public static String rwf_BaseName; public static String rwf_NameInUse; public static String rwf_homeMissingFiles; public static String rwf_homeIncorrectVersion; @@ -52,7 +51,6 @@ public static String swf_Explanation; public static String swf_Explanation2; public static String swf_AuthenticationGroup; - public static String swf_DeployGroup; public static String swf_Username; public static String swf_Password; public static String swf_BaseName; @@ -69,30 +67,6 @@ public static String credentials_save; - /* Module extension properties */ - public static String ModulePropertyType; - public static String ModulePropertyProject; - public static String ModulePropertyModuleFactory; - public static String ModulePropertyName; - - public static String RefreshViewerAction; - public static String DisableCategoryAction; - public static String EditLaunchConfigurationAction; - public static String TwiddleServerAction; - public static String CloneServerAction; - - /* Properties of view extenders (categories) */ - public static String ExtensionID; - public static String ExtensionName; - public static String ExtensionDescription; - public static String ExtensionProviderClass; - - /* Properties of JBoss Servers in the view Properties */ - public static String ServerRuntimeVersion; - public static String ServerHome; - public static String ServerConfigurationName; - public static String ServerDeployDir; - public static String property; public static String value; @@ -106,12 +80,6 @@ /* Action Delegate */ - public static String ActionDelegateStartServer; - public static String ActionDelegateStopServer; - public static String ActionDelegateDebugServer; - public static String ActionDelegateNew; - public static String ActionDelegateNewMBeanStubs; - public static String ActionDelegateNewServer; public static String ActionDelegateMakeDeployable; public static String ActionDelegateMakeUndeployable; public static String ActionDelegateDeployableServersNotFoundTitle; @@ -131,7 +99,6 @@ public static String TwiddleDialogExecute; public static String TwiddleDialogDone; public static String TwiddleDialogArguments; - public static String TwiddleDialogTutorial; /* XPath Dialog */ public static String XPathNewCategory; @@ -147,36 +114,12 @@ public static String XPathPattern; public static String XPathAttribute; - /* Preference Page */ - public static String PreferencePageServerTimeouts; - public static String PreferencePageStartTimeouts; - public static String PreferencePageStopTimeouts; - public static String PreferencePageUponTimeout; - public static String PreferencePageUponTimeoutAbort; - public static String PreferencePageUponTimeoutIgnore; - /* View Preference Page */ - public static String ViewPreferencePageName; - public static String ViewPreferencePageEnabled; - public static String ViewPreferencePageWeight; - public static String ViewPreferencePageDescription; - public static String ViewExtensionEnablementDescription; - public static String ViewExtensionPreferenceDescription; - public static String DescriptorXPathRemoveCategory; public static String DescriptorXPathRemoveCategoryDesc; public static String DescriptorXPathNewXPath; public static String DescriptorXPathEditXPath; public static String DescriptorXPathDeleteXPath; - public static String DescriptorXPathAttributeValue; - public static String DescriptorXPathXPathXML; - public static String DescriptorXPathAttributeKeyValue; - public static String DescriptorXPathDescriptorValues; - public static String DescriptorXPathNameLocation; - public static String DescriptorXPathServerName; - public static String DescriptorXPathPortCategory; - public static String DescriptorXPathSimple; - public static String DescriptorXPathComplex; public static String DescriptorXPathMatch; @@ -221,7 +164,7 @@ public static String LaunchInvalidHostChanged; static { - NLS.initializeMessages(JBossServerUIPlugin.PLUGIN_ID + ".Messages", + NLS.initializeMessages("org.jboss.ide.eclipse.as.ui.Messages", Messages.class); } } Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/Messages.properties =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/Messages.properties 2009-04-08 02:47:57 UTC (rev 14583) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/Messages.properties 2009-04-08 05:40:57 UTC (rev 14584) @@ -9,7 +9,6 @@ rwf_TitleCreate=Create a new JBoss Runtime rwf_TitleEdit=Edit a JBoss Runtime rwf_Explanation=A JBoss Server runtime references a JBoss installation directory.\nIt can be used to set up classpaths for projects which depend on this runtime,\nas well as by a "server" which will be able to start and stop instances of JBoss. -rwf_BaseName=JBoss _VERSION_ Runtime rwf_NameInUse=Runtime name already in use rwf_homeMissingFiles=The home directory does not exist or is missing the run.jar. rwf_homeIncorrectVersion=This server type expects a version of {0} but the server directory is of version {1}. @@ -28,7 +27,6 @@ swf_Password=Password swf_BaseName=JBoss _VERSION_ Server swf_NameInUse=Server name already in use -swf_DeployGroup=Deployment swf_DeployEditorHeading=Deployment swf_DeploymentDescription=The temporary deployment location is where files will \nbe copied to before being renamed into the deploy directory. \nThis folder should be on the same file system \nas the deploy folder. swf_DeployDirectory=Deploy Directory @@ -42,29 +40,11 @@ #Server View (server and categories, properties) property=Property value=Value -ExtensionID=Extension ID -ExtensionName=Extension Name -ExtensionDescription=Extension Description -ExtensionProviderClass=Extension Provider Class -RefreshViewerAction=Refresh Viewer -DisableCategoryAction=Disable Category -EditLaunchConfigurationAction=Edit Launch Configuration -TwiddleServerAction=Twiddle Server -CloneServerAction=Clone Server -ServerRuntimeVersion=Runtime Version -ServerHome=Home Directory -ServerConfigurationName=Configuration Name -ServerDeployDir=Deploy Directory - #Server View Dialog Heading ServerDialogHeading=JBoss Server #View's Module extension -ModulePropertyType=Type -ModulePropertyProject=Project -ModulePropertyModuleFactory=Factory -ModulePropertyName=Name DeleteModuleText=Remove FullPublishModuleText=Full Publish IncrementalPublishModuleText=Incremental Publish @@ -74,12 +54,6 @@ #Action Delegate -ActionDelegateStartServer=Start Server -ActionDelegateStopServer=Stop Server -ActionDelegateDebugServer=Start Server (Debug Mode) -ActionDelegateNew=New -ActionDelegateNewMBeanStubs=New MBean Stubs -ActionDelegateNewServer=New Server ActionDelegateMakeDeployable=Make Deployable ActionDelegateMakeUndeployable=Make Undeployable ActionDelegateDeployableServersNotFoundTitle=No deployable servers found @@ -98,7 +72,6 @@ TwiddleDialogExecute=Execute Twiddle TwiddleDialogDone=Done TwiddleDialogArguments=Twiddle Arguments\: -TwiddleDialogTutorial=Twiddle Tutorial #XPath Dialog @@ -116,25 +89,7 @@ #preference page -PreferencePageServerTimeouts=Server Timeouts -PreferencePageStartTimeouts=Start Timeout -PreferencePageStopTimeouts=Stop Timeout -PreferencePageUponTimeout=Upon Timeout\: -PreferencePageUponTimeoutAbort=Abort Server Transition -PreferencePageUponTimeoutIgnore=Set Server State to Target State -#View Preference Page -ViewPreferencePageName=Name -ViewPreferencePageEnabled=Enabled -ViewPreferencePageWeight=Weight -ViewPreferencePageDescription=Description - -ViewExtensionEnablementDescription=Below is a list of extensions that may be enabled for the\ -JBoss Servers View. \n The enablement box designates whether the extension should be present.\ -The weight field \ndesignates how "heavy" each extension is. (Heavier elements fall towards the bottom.) - -ViewExtensionPreferenceDescription=Below, you may set or clear any preferences specific to each view extension above. \nSome extensions may have no preferences to set. - ########################################### ############## view providers ########################################### @@ -145,15 +100,6 @@ DescriptorXPathNewXPath=New XPath DescriptorXPathEditXPath=Edit XPath DescriptorXPathDeleteXPath=Delete XPath -DescriptorXPathAttributeValue=Value -DescriptorXPathXPathXML=XPath / XML -DescriptorXPathAttributeKeyValue=Attribute Key / Value -DescriptorXPathDescriptorValues=Descriptor Values -DescriptorXPathNameLocation=Name / Location -DescriptorXPathServerName=Server Name\: -DescriptorXPathPortCategory=Port Category\: -DescriptorXPathSimple=Show only xpath value in properties view. -DescriptorXPathComplex=Show all details in properties view. DescriptorXPathMatch=Match #Editor Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/editor/PollerSection.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/editor/PollerSection.java 2009-04-08 02:47:57 UTC (rev 14583) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/editor/PollerSection.java 2009-04-08 05:40:57 UTC (rev 14584) @@ -127,7 +127,7 @@ public class SetStopPollerCommand extends SetPollerCommand { public SetStopPollerCommand(IServerWorkingCopy server) { - super(server, Messages.EditorChangeStartPollerCommandName, IJBossServerConstants.SHUTDOWN_POLLER_KEY, + super(server, Messages.EditorChangeStopPollerCommandName, IJBossServerConstants.SHUTDOWN_POLLER_KEY, IJBossServerConstants.DEFAULT_SHUTDOWN_POLLER, shutdownTypes, stopPollerCombo, stopPollerListener); }