[openrtm-commit:03122] r791 - in trunk/rtmtools/jp.go.aist.rtm.systemeditor/src/jp/go/aist/rtm/systemeditor: nl ui/action ui/dialog ui/editor ui/editor/action ui/editor/editpolicy ui/preference ui/util ui/views/compositecomponentview ui/views/configurationview ui/views/executioncontextview ui/views/managercontrolview
openrtm ＠ openrtm.org
openrtm ＠ openrtm.org
2018年 1月 23日 (火) 22:41:04 JST
Author: ga
Date: 2018-01-23 22:41:03 +0900 (Tue, 23 Jan 2018)
New Revision: 791
Modified:
trunk/rtmtools/jp.go.aist.rtm.systemeditor/src/jp/go/aist/rtm/systemeditor/nl/messages.properties
trunk/rtmtools/jp.go.aist.rtm.systemeditor/src/jp/go/aist/rtm/systemeditor/ui/action/AllComponentActionDelegate.java
trunk/rtmtools/jp.go.aist.rtm.systemeditor/src/jp/go/aist/rtm/systemeditor/ui/action/AllDisconnectPopupMenuActionDelegate.java
trunk/rtmtools/jp.go.aist.rtm.systemeditor/src/jp/go/aist/rtm/systemeditor/ui/action/DeployActionDelegate.java
trunk/rtmtools/jp.go.aist.rtm.systemeditor/src/jp/go/aist/rtm/systemeditor/ui/action/ExportPortAction.java
trunk/rtmtools/jp.go.aist.rtm.systemeditor/src/jp/go/aist/rtm/systemeditor/ui/action/IComponentActionDelegate.java
trunk/rtmtools/jp.go.aist.rtm.systemeditor/src/jp/go/aist/rtm/systemeditor/ui/dialog/ConfigurationDialog.java
trunk/rtmtools/jp.go.aist.rtm.systemeditor/src/jp/go/aist/rtm/systemeditor/ui/dialog/ConnectorDialogBase.java
trunk/rtmtools/jp.go.aist.rtm.systemeditor/src/jp/go/aist/rtm/systemeditor/ui/dialog/CreateComponentDialog.java
trunk/rtmtools/jp.go.aist.rtm.systemeditor/src/jp/go/aist/rtm/systemeditor/ui/dialog/DataConnectorCreaterDialog.java
trunk/rtmtools/jp.go.aist.rtm.systemeditor/src/jp/go/aist/rtm/systemeditor/ui/dialog/DisconnectDialog.java
trunk/rtmtools/jp.go.aist.rtm.systemeditor/src/jp/go/aist/rtm/systemeditor/ui/dialog/IconPreferenceDialog.java
trunk/rtmtools/jp.go.aist.rtm.systemeditor/src/jp/go/aist/rtm/systemeditor/ui/dialog/ManagerConfigurationDialog.java
trunk/rtmtools/jp.go.aist.rtm.systemeditor/src/jp/go/aist/rtm/systemeditor/ui/dialog/NewCompositeComponentDialog.java
trunk/rtmtools/jp.go.aist.rtm.systemeditor/src/jp/go/aist/rtm/systemeditor/ui/dialog/ProfileInformationDialog.java
trunk/rtmtools/jp.go.aist.rtm.systemeditor/src/jp/go/aist/rtm/systemeditor/ui/dialog/ServiceConnectorCreaterDialog.java
trunk/rtmtools/jp.go.aist.rtm.systemeditor/src/jp/go/aist/rtm/systemeditor/ui/editor/AbstractSystemDiagramEditor.java
trunk/rtmtools/jp.go.aist.rtm.systemeditor/src/jp/go/aist/rtm/systemeditor/ui/editor/OfflineSystemDiagramEditor.java
trunk/rtmtools/jp.go.aist.rtm.systemeditor/src/jp/go/aist/rtm/systemeditor/ui/editor/SystemDiagramEditor.java
trunk/rtmtools/jp.go.aist.rtm.systemeditor/src/jp/go/aist/rtm/systemeditor/ui/editor/SystemDiagramEditorContributor.java
trunk/rtmtools/jp.go.aist.rtm.systemeditor/src/jp/go/aist/rtm/systemeditor/ui/editor/action/ChangeComponentDirectionAction.java
trunk/rtmtools/jp.go.aist.rtm.systemeditor/src/jp/go/aist/rtm/systemeditor/ui/editor/action/MoveComponentAction.java
trunk/rtmtools/jp.go.aist.rtm.systemeditor/src/jp/go/aist/rtm/systemeditor/ui/editor/action/OpenAction.java
trunk/rtmtools/jp.go.aist.rtm.systemeditor/src/jp/go/aist/rtm/systemeditor/ui/editor/action/OpenAndCreateRestoreAction.java
trunk/rtmtools/jp.go.aist.rtm.systemeditor/src/jp/go/aist/rtm/systemeditor/ui/editor/action/OpenAndQuickRestoreAction.java
trunk/rtmtools/jp.go.aist.rtm.systemeditor/src/jp/go/aist/rtm/systemeditor/ui/editor/action/OpenAndRestoreAction.java
trunk/rtmtools/jp.go.aist.rtm.systemeditor/src/jp/go/aist/rtm/systemeditor/ui/editor/action/OpenWithMappingRestoreAction.java
trunk/rtmtools/jp.go.aist.rtm.systemeditor/src/jp/go/aist/rtm/systemeditor/ui/editor/editpolicy/GraphicalConnectorCreateManager.java
trunk/rtmtools/jp.go.aist.rtm.systemeditor/src/jp/go/aist/rtm/systemeditor/ui/editor/editpolicy/SystemXYLayoutEditPolicy.java
trunk/rtmtools/jp.go.aist.rtm.systemeditor/src/jp/go/aist/rtm/systemeditor/ui/preference/ColorPreferencePage.java
trunk/rtmtools/jp.go.aist.rtm.systemeditor/src/jp/go/aist/rtm/systemeditor/ui/preference/IconPreferencePage.java
trunk/rtmtools/jp.go.aist.rtm.systemeditor/src/jp/go/aist/rtm/systemeditor/ui/preference/OfflineEditorPreferencePage.java
trunk/rtmtools/jp.go.aist.rtm.systemeditor/src/jp/go/aist/rtm/systemeditor/ui/util/ComponentActionDelegate.java
trunk/rtmtools/jp.go.aist.rtm.systemeditor/src/jp/go/aist/rtm/systemeditor/ui/util/CompositeComponentHelper.java
trunk/rtmtools/jp.go.aist.rtm.systemeditor/src/jp/go/aist/rtm/systemeditor/ui/views/compositecomponentview/CompositeComponentView.java
trunk/rtmtools/jp.go.aist.rtm.systemeditor/src/jp/go/aist/rtm/systemeditor/ui/views/configurationview/ConfigurationView.java
trunk/rtmtools/jp.go.aist.rtm.systemeditor/src/jp/go/aist/rtm/systemeditor/ui/views/executioncontextview/ExecutionContextView.java
trunk/rtmtools/jp.go.aist.rtm.systemeditor/src/jp/go/aist/rtm/systemeditor/ui/views/managercontrolview/ManagerControlView.java
Log:
Add time stamp option selection pull-down to data port connection dialog. #4390
Modified: trunk/rtmtools/jp.go.aist.rtm.systemeditor/src/jp/go/aist/rtm/systemeditor/nl/messages.properties
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.systemeditor/src/jp/go/aist/rtm/systemeditor/nl/messages.properties 2018-01-23 13:40:04 UTC (rev 790)
+++ trunk/rtmtools/jp.go.aist.rtm.systemeditor/src/jp/go/aist/rtm/systemeditor/nl/messages.properties 2018-01-23 13:41:03 UTC (rev 791)
@@ -6,9 +6,10 @@
Common.button.import=Import
Common.button.export=Export
Common.button.browse=Browse..
+Common.button.apply=Apply
+Common.button.cancel=Cancel
Restoration.0=Failed to restore RTC configuration:[
-Restoration.4=Failed to Activate RTC. [
Restoration.7=Could not to access RTC:[
Main.0=Please specify the XML file path or URI.
Main.1=XML file cannot be found.
@@ -25,44 +26,20 @@
IComponentActionDelegate.11=Are you sure you want to reset the component?
IComponentActionDelegate.12=Are you sure you want to exit the component?
IComponentActionDelegate.14=System Error
-IComponentActionDelegate.15=Confirm
-CombineActionDelegate.12=Error
-CombineActionDelegate.13=Failed to connect.
AllComponentActionDelegate.4=Are you sure?
AllComponentActionDelegate.5=Are you sure you want to start all components?
AllComponentActionDelegate.6=Are you sure you want to stop all components?
AllComponentActionDelegate.7=Are you sure you want to activate all components?
AllComponentActionDelegate.8=Are you sure you want to deactivate all components?
-AllComponentActionDelegate.9=Confirm
AllComponentActionDelegate.10=Change the state of the component.
AllComponentActionDelegate.11=Sending a request to the component...
AllComponentActionDelegate.12=Sent the request to the component.
-AllComponentActionDelegate.13=Error
AllComponentActionDelegate.14=An error has occurred while sending the request:\r\n
-ConnectorCreaterDialogBase.0=\u30d7\u30ed\u30d1\u30c6\u30a3\u540d\u304c\u91cd\u8907\u3057\u3066\u3044\u307e\u3059\u3002
+ConnectorCreaterDialogBase.0=Duplicate property name.
DataConnectorCreaterDialog.1=Property Name is duplicated.
-DataConnectorCreaterDialog.2=Name :
-DataConnectorCreaterDialog.3=Data Type :
-DataConnectorCreaterDialog.4=*Any input
-DataConnectorCreaterDialog.6=Interface Type :
-DataConnectorCreaterDialog.7=*Any input
-DataConnectorCreaterDialog.9=Dataflow Type :
-DataConnectorCreaterDialog.10=*Any input
-DataConnectorCreaterDialog.12=Subscription Type :
-DataConnectorCreaterDialog.13=*Any input
-DataConnectorCreaterDialog.15=Push Rate(Hz) :
-DataConnectorCreaterDialog.16=Connector Profile
+DataConnectorCreaterDialog.2=*Any input
DataConnectorCreaterDialog.19=Push Rate must be positive numeric.
-DataConnectorCreaterDialog.20=Push Policy :
-DataConnectorCreaterDialog.21=Skip Count :
DataConnectorCreaterDialog.22=detail...
-DataConnectorCreaterDialog.23=Buffer (Outport)
-DataConnectorCreaterDialog.24=Buffer (Inport)
-DataConnectorCreaterDialog.25=Buffer length :
-DataConnectorCreaterDialog.26=Buffer full policy :
-DataConnectorCreaterDialog.27=Buffer write timeout :
-DataConnectorCreaterDialog.28=Buffer empty policy :
-DataConnectorCreaterDialog.29=Buffer read timeout :
DataConnectorCreaterDialog.30=Skip count must be positive integer.
DataConnectorCreaterDialog.31=Outport buffer length must be positive integer.
DataConnectorCreaterDialog.32=Outport buffer write timeout must be positive numeric.
@@ -70,126 +47,44 @@
DataConnectorCreaterDialog.34=Inport buffer length must be positive integer.
DataConnectorCreaterDialog.35=Inport buffer write timeout must be positive numeric.
DataConnectorCreaterDialog.36=Inport buffer read timeout must be positive numeric.
-ProfileInformationDialog.0=Vendor :
-ProfileInformationDialog.1=System Name :
-ProfileInformationDialog.2=Version :
-ProfileInformationDialog.3=Path :
ProfileInformationDialog.4=Browse...
-ProfileInformationDialog.8=Update Log :
-ProfileInformationDialog.9=Profile Information
-ProfileInformationDialog.16=Required :
ProfileInformationDialog.17=&Select All
ProfileInformationDialog.18=&Deselect All
DeploymentInformationDialog.0=Deployment Information
Deployment.0=Deployment Information is Incomplete. Do you continue processing?
-NewCompositeComponentDialog.2=Manager :
-NewCompositeComponentDialog.3=Name :
-NewCompositeComponentDialog.4=Type :
-NewCompositeComponentDialog.8=Path :
-NewCompositeComponentDialog.9=Port :
NewCompositeComponentDialog.11=&Select All
NewCompositeComponentDialog.12=&Deselect All
-NewCompositeComponentDialog.13=New Composite Component
NewCompositeComponentDialog.msg.already_exist_name=The component name already exists.
NewCompositeComponentDialog.msg.contain_grouping_fail=The Grouping composite component cannot be included in the composite components other than Grouping.
-CreateComponentDialog.2=Type :
-CreateComponentDialog.manager_name.title=Manager Name :
-CreateComponentDialog.3=Parameter :
CreateComponentDialog.6=Invalid parameter format.
-CreateComponentDialog.add_button=Add
-CreateComponentDialog.del_button=Delete
-CreateComponentDialog.apply_button=Apply
ServiceConnectorCreaterDialog.1=Please enter Port Profile.
-ServiceConnectorCreaterDialog.2=Error
ServiceConnectorCreaterDialog.3=No corresponding port interface.
ServiceConnectorCreaterDialog.4=Port interfaces do not match completely.
-ServiceConnectorCreaterDialog.5=Name :
-ServiceConnectorCreaterDialog.6=Port Profile
-ServiceConnectorCreaterDialog.7=Consumer
-ServiceConnectorCreaterDialog.8=Provider
-ServiceConnectorCreaterDialog.9=Add
-ServiceConnectorCreaterDialog.10=Delete
ServiceConnectorCreaterDialog.11=detail...
-ServiceConnectorCreaterDialog.12=unknown
ServiceConnectorCreaterDialog.13=Unmatch interface type consumer={0} provider={1}
ServiceConnectorCreaterDialog.14=Unmatch interface instance_name consumer={0} provider={1}
-ConfigurationDialog.3=Apply
-ConfigurationDialog.4=ConfigurationSet :
ConfigurationDialog.6=Constraint [
ConfigurationDialog.7=] is not satisfied.
-ConfigurationDialog.9=Constraint [
-ConfigurationDialog.10=] is not satisfied.
-ConfigurationDialog.12=Constraint [
-ConfigurationDialog.13=] is not satisfied.
ConfigurationDialog.20=Warning
ConfigurationDialog.21=Constraint is not satisfied.
-ConfigurationDialog.25=Configuration
-OfflineSystemDiagramEditorContributor.1=Pos: (
-OfflineSystemDiagramEditorContributor.3=) Size: (
-OfflineSystemDiagramEditor.1=Offline System Diagram
OfflineSystemDiagramEditor.2=Opening the file...
OfflineSystemDiagramEditor.3=Opening the file and retrieving latest information from the tree as necessary...
OfflineSystemDiagramEditor.5=Failed to load the file. \r\n Please check if the files other than Offline System Diagram are loaded. \n
OfflineSystemDiagramEditor.6=Failed to open file.
-OfflineSystemDiagramEditor.7=Offline System Diagram
-SystemDiagramEditor.1=System Diagram
SystemDiagramEditor.3=Opening the file...
SystemDiagramEditor.4=Opening file and retrieving latest information from the tree as necessary...
SystemDiagramEditor.5=Failed to load the file. \r\n Please check if the files other than System Diagram are loaded.
-SystemDiagramEditor.6=Failed to load the file. \r\n Please check if the files other than System Diagram are loaded.
SystemDiagramEditor.7=Restoring system...
SystemDiagramEditor.8=Failed to restore system.
SystemDiagramEditor.9=Failed to open file.
-SystemDiagramEditor.10=System Diagram.
-SystemDiagramEditor.12=Error
SystemDiagramEditor.13=Failed to restore. \r\n
-SystemDiagramEditorContributor.1=Pos: (
-SystemDiagramEditorContributor.3=) Size: (
-AbstractSystemDiagramEditor.3=Save As...
-AbstractSystemDiagramEditor.4=Save As...
-AbstractSystemDiagramEditor.6=Information
-AbstractSystemDiagramEditor.7=Cannot be saved because composite component[
-AbstractSystemDiagramEditor.8=] is out of sync.
-AbstractSystemDiagramEditor.9=RTSystem :
-AbstractSystemDiagramEditor.12=Error During Save
-AbstractSystemDiagramEditor.13=The current model could not be saved.
-AbstractSystemDiagramEditor.15=Information
-AbstractSystemDiagramEditor.16=Cannot be saved because composite component[
-AbstractSystemDiagramEditor.17=] is out of sync.
-AbstractSystemDiagramEditor.18=RTSystem :
AbstractSystemDiagramEditor.21=Error
AbstractSystemDiagramEditor.22=Failed to save file.
-AbstractSystemDiagramEditor.23=Error
AbstractSystemDiagramEditor.24=Failed to create file.
-AbstractSystemDiagramEditor.26=Saving
-AbstractSystemDiagramEditor.27=Error writing file.
-AbstractSystemDiagramEditor.28=Error writing file.
-AbstractSystemDiagramEditor.29=yyyy_MM_dd_hh_mm_ss_SSS
AbstractSystemDiagramEditor.32=Files have not been saved. Save the files?
AbstractSystemDiagramEditor.33=Validation error.
-OpenAndQuickRestoreAction.0=Open and Quick Restore...
-OpenAndQuickRestoreAction.1=Open and Quick Restore...
-OpenAndRestoreAction.0=Open and Restore...
-OpenAndRestoreAction.1=Open and Restore...
-OpenAndCreateRestoreAction.0=Open and Create Restore...
-OpenAndCreateRestoreAction.1=Open and Create Restore...
-OpenAction.0=Open...
-OpenAction.1=Open...
-OpenWithMappingRestoreAction.0=Open with Mapping Restore...
-OpenWithMappingRestoreAction.1=Open with Mapping Restore...
-MoveComponentAction.8=Move
-ChangeComponentDirectionAction.2=Change Direction
-DeleteCommand.0=Confirm
DeleteCommand.1=Opening in another editor. Are you sure you want to delete it?
-GraphicalConnectorCreateManager.0=Error
GraphicalConnectorCreateManager.1=Failed to connect.
-SystemXYLayoutEditPolicy.0=Information
-SystemXYLayoutEditPolicy.1=Cannot be registered because composite component[
-SystemXYLayoutEditPolicy.2=] is out of sync.
-SystemXYLayoutEditPolicy.3=Information
-SystemXYLayoutEditPolicy.4=Cannot be registered because it is already registered in Composite component[
-SystemXYLayoutEditPolicy.5=].
-SystemXYLayoutEditPolicy.6=Information
ComponentCommandCreator.1=The component[
ComponentCommandCreator.2=] already exists.
SystemEditorPreferencePage.0=Connection
@@ -204,8 +99,6 @@
SystemEditorPreferencePage.11=count
OnlineEditorPreferencePage.1=Component Actions
OnlineEditorPreferencePage.2=Confirms before executes it ?
-OfflineEditorPreferencePage.5=Add
-OfflineEditorPreferencePage.7=Delete
OfflineEditorPreferencePage.8=Interface Type
OfflineEditorPreferencePage.9=Data Flow Type
OfflineEditorPreferencePage.10=Subscription Type
@@ -213,14 +106,7 @@
OfflineEditorPreferencePage.12=Buffer Full Policy
OfflineEditorPreferencePage.13=Buffer Empty Policy
ColorPreferencePage.0=RTC State [RTC body]
-ColorPreferencePage.1=Created :
-ColorPreferencePage.2=Inactive :
-ColorPreferencePage.3=Active :
-ColorPreferencePage.4=Error :
-ColorPreferencePage.5=Unknown :
ColorPreferencePage.6=ExecutionContext State [RTC border]
-ColorPreferencePage.7=Running :
-ColorPreferencePage.8=Stopped :
ColorPreferencePage.9=Data Port State
ColorPreferencePage.10=Disconnected :
ColorPreferencePage.11=Connected :
@@ -227,35 +113,9 @@
ColorPreferencePage.12=Service Port State
ColorPreferencePage.13=Disconnected :
ColorPreferencePage.14=Connected :
-ProfileHandler.7=Target Component does not exist in RepositoryView.
-ProfileHandler.13=component id is null
-ProfileHandler.28=cannot find port:componentId
-ProfileHandler.29=,instanceName
-ProfileHandler.30=,portName
-RtsProfileHandler.7=cannot find component:componentId
-RtsProfileHandler.8=,instanceName
-RtsProfileHandler.10=cannot find port:componentId
-RtsProfileHandler.11=,instanceName
-RtsProfileHandler.12=,portName
-ConfigurationView.7=Edit Value
-ConfigurationView.8=Apply
-ConfigurationView.9=Cancel
-ConfigurationView.10=Confirm
ConfigurationView.11=Active configuration set has been modified. \r\n Apply changes?
-ConfigurationView.12=Error
ConfigurationView.13=Failed to update.
-ConfigurationView.15=ComponentName :
-ConfigurationView.16=active
-ConfigurationView.17=config
-ConfigurationView.18=Add
-ConfigurationView.21=value
-ConfigurationView.22=Delete
ConfigurationView.23=Copy
-ConfigurationView.26=ConfigurationSet :
-ConfigurationView.27=name
-ConfigurationView.28=Value
-ConfigurationView.29=Add
-ConfigurationView.32=Delete
ConfigurationView.39=Warning
ConfigurationView.40=The name already exists.
ConfigurationView.43=The key already exists.
@@ -275,32 +135,11 @@
ConfigurationCondition.16=Format error of enumeration constraint [value]
ConfigurationCondition.21=Format error of hash condition [cond]
ConfigurationCondition.23=Format error of hash key [key]
-ManagerControlView.0=Loadable Modules
-ManagerControlView.1=module
-ManagerControlView.2=RTC Instances
-ManagerControlView.4=Managers
-ManagerControlView.5=component
-ManagerControlView.6=Create
-ManagerControlView.7=Configure
-ManagerControlView.restart=Restart
-ManagerControlView.8=Shutdown
-ManagerControlView.manager_name=manager name
-ManagerControlView.manager_language=manager language
-CompositeComponentView.label.component_name=component:
-CompositeComponentView.label.component_type=type:
-CompositeComponentView.column.component.label=component
-CompositeComponentView.column.port.label=port
-CompositeComponentView.button.apply.label=Apply
-CompositeComponentView.button.cancel.label=Cancel
-CompositeComponentView.confirm.apply_title=Confirm
CompositeComponentView.confirm.apply_message=Apply changes?
-AllDisconnectPopupMenuActionDelegate.0=Confirm
AllDisconnectPopupMenuActionDelegate.1=Are you sure you want to delete all connections at this port?
ExportPortPopupMenuActionDelegate.action.unexport=Unexport
ExportPortPopupMenuActionDelegate.action.export=Export
-ExportPortAction.error.title=Error
ExportPortAction.error.update_fail=Update failure.
-CompositeComponentHelper.confirm.title=Confirm
DecomposeComponentAction.0=Opening in another editor. Are you sure you want to decompose it?
TimeoutWrapper.0=Time out
TimeoutWrapper.1=The server did not return any response.
@@ -307,18 +146,11 @@
ComponentActionDelegate.1=Change state of the component.
ComponentActionDelegate.2=Sending request to the component.
ComponentActionDelegate.3=Sent request to the component.
-ComponentActionDelegate.4=Error
ComponentActionDelegate.5=An error has occured.
ComponentActionDelegate.6=Invalid parameter.
ComponentActionDelegate.7=Unsupported.
ComponentActionDelegate.8=An out of resource error has occured.
ComponentActionDelegate.9=Invalid precondition.
-ExecutionContextView.1=component:
-ExecutionContextView.2=rate:
-ExecutionContextView.3=Execution Context
-ExecutionContextView.4=Name
-ExecutionContextView.5=Value
-ExecutionContextView.6=Apply
ExecutionContextView.7=Start
ExecutionContextView.8=Stop
ExecutionContextView.9=Activate
@@ -334,14 +166,9 @@
ConnectPortActionDelegate.disconnect=Disconnect
ConnectPortActionDelegate.error.1=Port can not be disconnect.
ConnectPortActionDelegate.error.2=Disconnect failure. [{0}]
-DisconnectDialog.title=Disconnect Profile
DisconnectDialog.explain=Select the connection for disconnect, apply with OK.
-IconPreferenceDialog.title=Icon Preference
-IconPreferenceDialog.label.pattern=Pattern:
-IconPreferenceDialog.label.path=Icon path:
IconPreferenceDialog.filter.name=Icon image
-IconPreferencePage.error.import=Icon profile import failure.
-IconPreferencePage.error.export=Icon profile export failure.
+IconPreferencePage.error=Icon profile import failure.
RestoreComponentDialog.head_message=Please assign components to be restored to nodes.
RestoreComponentDialog.msg_no_ep_name=No endpoint name
RestoreComponentDialog.msg_ep_unreach=Endpoint unreachable
Modified: trunk/rtmtools/jp.go.aist.rtm.systemeditor/src/jp/go/aist/rtm/systemeditor/ui/action/AllComponentActionDelegate.java
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.systemeditor/src/jp/go/aist/rtm/systemeditor/ui/action/AllComponentActionDelegate.java 2018-01-23 13:40:04 UTC (rev 790)
+++ trunk/rtmtools/jp.go.aist.rtm.systemeditor/src/jp/go/aist/rtm/systemeditor/ui/action/AllComponentActionDelegate.java 2018-01-23 13:41:03 UTC (rev 791)
@@ -82,7 +82,7 @@
if (SystemEditorPreferenceManager.getInstance()
.isConfirmComponentAction()) {
isOk = MessageDialog.openConfirm(targetEditor.getSite()
- .getShell(), Messages.getString("AllComponentActionDelegate.9"), comfirmMessage); //$NON-NLS-1$
+ .getShell(), Messages.getString("Common.dialog.confirm_title"), comfirmMessage); //$NON-NLS-1$
}
if (isOk) {
@@ -123,7 +123,7 @@
dialog.run(false, false, runable);
} catch (InvocationTargetException e) {
MessageDialog.openError(targetEditor.getSite().getShell(),
- Messages.getString("AllComponentActionDelegate.13"), Messages.getString("AllComponentActionDelegate.14") + e.getMessage()); //$NON-NLS-1$ //$NON-NLS-2$
+ Messages.getString("Common.dialog.error_title"), Messages.getString("AllComponentActionDelegate.14") + e.getMessage()); //$NON-NLS-1$ //$NON-NLS-2$
} catch (InterruptedException e) {
LOGGER.error("Fail in dialog (interrupted)", e);
}
Modified: trunk/rtmtools/jp.go.aist.rtm.systemeditor/src/jp/go/aist/rtm/systemeditor/ui/action/AllDisconnectPopupMenuActionDelegate.java
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.systemeditor/src/jp/go/aist/rtm/systemeditor/ui/action/AllDisconnectPopupMenuActionDelegate.java 2018-01-23 13:40:04 UTC (rev 790)
+++ trunk/rtmtools/jp.go.aist.rtm.systemeditor/src/jp/go/aist/rtm/systemeditor/ui/action/AllDisconnectPopupMenuActionDelegate.java 2018-01-23 13:41:03 UTC (rev 791)
@@ -29,7 +29,7 @@
public void run(IAction action) {
if (port == null) return;
boolean isOk = MessageDialog.openConfirm(targetPart.getSite()
- .getShell(), Messages.getString("AllDisconnectPopupMenuActionDelegate.0"), Messages.getString("AllDisconnectPopupMenuActionDelegate.1")); //$NON-NLS-1$ //$NON-NLS-2$
+ .getShell(), Messages.getString("Common.dialog.confirm_title"), Messages.getString("AllDisconnectPopupMenuActionDelegate.1")); //$NON-NLS-1$ //$NON-NLS-2$
if (!isOk) return;
AllDisconnectAction allDisconnectAction = new AllDisconnectAction();
allDisconnectAction.setTarget(port);
Modified: trunk/rtmtools/jp.go.aist.rtm.systemeditor/src/jp/go/aist/rtm/systemeditor/ui/action/DeployActionDelegate.java
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.systemeditor/src/jp/go/aist/rtm/systemeditor/ui/action/DeployActionDelegate.java 2018-01-23 13:40:04 UTC (rev 790)
+++ trunk/rtmtools/jp.go.aist.rtm.systemeditor/src/jp/go/aist/rtm/systemeditor/ui/action/DeployActionDelegate.java 2018-01-23 13:41:03 UTC (rev 791)
@@ -423,7 +423,7 @@
} catch (Exception e) {
monitor.done();
throw new InvocationTargetException(e,
- Messages.getString("SystemDiagramEditor.6") + "\r\n" + e.getMessage()); //$NON-NLS-1$
+ Messages.getString("SystemDiagramEditor.5") + "\r\n" + e.getMessage()); //$NON-NLS-1$
}
monitor.internalWorked(35);
Modified: trunk/rtmtools/jp.go.aist.rtm.systemeditor/src/jp/go/aist/rtm/systemeditor/ui/action/ExportPortAction.java
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.systemeditor/src/jp/go/aist/rtm/systemeditor/ui/action/ExportPortAction.java 2018-01-23 13:40:04 UTC (rev 790)
+++ trunk/rtmtools/jp.go.aist.rtm.systemeditor/src/jp/go/aist/rtm/systemeditor/ui/action/ExportPortAction.java 2018-01-23 13:41:03 UTC (rev 791)
@@ -28,7 +28,7 @@
private static final Logger LOGGER = LoggerFactory
.getLogger(ExportPortAction.class);
- private static final String ERROR_TITLE = Messages.getString("ExportPortAction.error.title"); // Error
+ private static final String ERROR_TITLE = Messages.getString("Common.dialog.error_title"); // Error
private static final String ERROR_UPDATE_FAIL = Messages.getString("ExportPortAction.error.update_fail"); // Update failure.
Modified: trunk/rtmtools/jp.go.aist.rtm.systemeditor/src/jp/go/aist/rtm/systemeditor/ui/action/IComponentActionDelegate.java
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.systemeditor/src/jp/go/aist/rtm/systemeditor/ui/action/IComponentActionDelegate.java 2018-01-23 13:40:04 UTC (rev 790)
+++ trunk/rtmtools/jp.go.aist.rtm.systemeditor/src/jp/go/aist/rtm/systemeditor/ui/action/IComponentActionDelegate.java 2018-01-23 13:41:03 UTC (rev 791)
@@ -61,7 +61,7 @@
+ ".Exit"; //$NON-NLS-1$
static final String TITLE_CONFIRM_DIALOG = Messages
- .getString("IComponentActionDelegate.15");
+ .getString("Common.dialog.confirm_title");
static final String MSG_CONFIRM_START = Messages.getString("IComponentActionDelegate.7");
static final String MSG_CONFIRM_STOP = Messages.getString("IComponentActionDelegate.8");
Modified: trunk/rtmtools/jp.go.aist.rtm.systemeditor/src/jp/go/aist/rtm/systemeditor/ui/dialog/ConfigurationDialog.java
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.systemeditor/src/jp/go/aist/rtm/systemeditor/ui/dialog/ConfigurationDialog.java 2018-01-23 13:40:04 UTC (rev 790)
+++ trunk/rtmtools/jp.go.aist.rtm.systemeditor/src/jp/go/aist/rtm/systemeditor/ui/dialog/ConfigurationDialog.java 2018-01-23 13:41:03 UTC (rev 791)
@@ -136,7 +136,7 @@
Button applyCheckBox = new Button(mainComposite, SWT.CHECK);
applyCheckBox.setLayoutData(gd);
- applyCheckBox.setText(Messages.getString("ConfigurationDialog.3")); //$NON-NLS-1$
+ applyCheckBox.setText("Apply"); //$NON-NLS-1$
applyCheckBox.addSelectionListener(new SelectionListener() {
public void widgetDefaultSelected(SelectionEvent e) {
}
@@ -265,7 +265,7 @@
gd.grabExcessHorizontalSpace = true;
Label nameLabel = new Label(configSetComposite, SWT.NONE);
- nameLabel.setText(Messages.getString("ConfigurationDialog.4")); //$NON-NLS-1$
+ nameLabel.setText("ConfigurationSet :"); //$NON-NLS-1$
Label nameText = new Label(configSetComposite, SWT.SINGLE);
nameText.setLayoutData(gd);
nameText.setText(configSet.getId());
@@ -887,7 +887,7 @@
String value = valueText.getText();
ConfigurationCondition condition = wd.getCondition();
if (!condition.validate(value)) {
- valueText.setToolTipText(Messages.getString("ConfigurationDialog.12") + condition + Messages.getString("ConfigurationDialog.13")); //$NON-NLS-1$ //$NON-NLS-2$
+ valueText.setToolTipText(Messages.getString("ConfigurationDialog.6") + condition + Messages.getString("ConfigurationDialog.7")); //$NON-NLS-1$ //$NON-NLS-2$
valueText.setBackground(colorRegistry.get(ERROR_COLOR));
} else {
valueText.setToolTipText(null);
@@ -944,7 +944,7 @@
String value = valueSpinner.getText();
ConfigurationCondition condition = wd.getCondition();
if (!condition.validate(value)) {
- valueSpinner.setToolTipText(Messages.getString("ConfigurationDialog.9") + condition + Messages.getString("ConfigurationDialog.10")); //$NON-NLS-1$ //$NON-NLS-2$
+ valueSpinner.setToolTipText(Messages.getString("ConfigurationDialog.6") + condition + Messages.getString("ConfigurationDialog.7")); //$NON-NLS-1$ //$NON-NLS-2$
// 最小/最大値を超える値を丸める
wd.setValue(condition.adjustMinMaxValue(value));
if (wd.isValueModified()) {
@@ -1200,7 +1200,7 @@
@Override
protected void configureShell(Shell shell) {
super.configureShell(shell);
- shell.setText(Messages.getString("ConfigurationDialog.25")); //$NON-NLS-1$
+ shell.setText("Configuration"); //$NON-NLS-1$
}
@Override
Modified: trunk/rtmtools/jp.go.aist.rtm.systemeditor/src/jp/go/aist/rtm/systemeditor/ui/dialog/ConnectorDialogBase.java
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.systemeditor/src/jp/go/aist/rtm/systemeditor/ui/dialog/ConnectorDialogBase.java 2018-01-23 13:40:04 UTC (rev 790)
+++ trunk/rtmtools/jp.go.aist.rtm.systemeditor/src/jp/go/aist/rtm/systemeditor/ui/dialog/ConnectorDialogBase.java 2018-01-23 13:41:03 UTC (rev 791)
@@ -93,7 +93,7 @@
buttonComposite.setLayoutData(gd);
Button addButton = new Button(buttonComposite, SWT.TOP);
- addButton.setText(getString("ServiceConnectorCreaterDialog.9"));
+ addButton.setText(getString("Common.button.add"));
gd = new GridData();
gd.widthHint = EXEC_BUTTON_WIDTH;
addButton.setLayoutData(gd);
@@ -108,7 +108,7 @@
});
Button deleteButton = new Button(buttonComposite, SWT.TOP);
- deleteButton.setText(getString("ServiceConnectorCreaterDialog.10"));
+ deleteButton.setText(getString("Common.button.delete"));
gd = new GridData();
gd.widthHint = EXEC_BUTTON_WIDTH;
deleteButton.setLayoutData(gd);
Modified: trunk/rtmtools/jp.go.aist.rtm.systemeditor/src/jp/go/aist/rtm/systemeditor/ui/dialog/CreateComponentDialog.java
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.systemeditor/src/jp/go/aist/rtm/systemeditor/ui/dialog/CreateComponentDialog.java 2018-01-23 13:40:04 UTC (rev 790)
+++ trunk/rtmtools/jp.go.aist.rtm.systemeditor/src/jp/go/aist/rtm/systemeditor/ui/dialog/CreateComponentDialog.java 2018-01-23 13:41:03 UTC (rev 791)
@@ -59,19 +59,13 @@
private static final int PARAMETER_KEY = 0;
private static final int PARAMETER_VALUE = 1;
- private static final String LABEL_TYPE_TITLE = Messages
- .getString("CreateComponentDialog.2");
- private static final String LABEL_MANAGER_NAME_TITLE = Messages
- .getString("CreateComponentDialog.manager_name.title");
- private static final String LABEL_PARAMETER_TITLE = Messages
- .getString("CreateComponentDialog.3");
private static final String ERR_INVALID_PARAM = Messages
.getString("CreateComponentDialog.6");
private static final String LABEL_BUTTON_ADD = Messages
- .getString("CreateComponentDialog.add_button");
+ .getString("Common.button.add");
private static final String LABEL_BUTTON_DEL = Messages
- .getString("CreateComponentDialog.del_button");
+ .getString("Common.button.delete");
private static final int BUTTON_WIDTH = 70;
@@ -182,7 +176,7 @@
mainComposite.setLayoutData(new GridData(GridData.FILL_BOTH));
Label typeLabel = new Label(mainComposite, SWT.NONE);
- typeLabel.setText(LABEL_TYPE_TITLE);
+ typeLabel.setText("Type :");
this.typeCombo = new Combo(mainComposite, SWT.READ_ONLY);
GridData gd = new GridData(GridData.GRAB_HORIZONTAL);
gd.minimumWidth = 180;
@@ -211,7 +205,7 @@
});
Label mnLabel = new Label(mainComposite, SWT.NONE);
- mnLabel.setText(LABEL_MANAGER_NAME_TITLE);
+ mnLabel.setText("Manager Name :");
this.managerNameCombo = new Combo(mainComposite, SWT.READ_ONLY);
gd = new GridData(GridData.GRAB_HORIZONTAL);
gd.minimumWidth = 180;
@@ -233,7 +227,7 @@
});
Group parameterGroup = new Group(mainComposite, SWT.SHADOW_IN);
- parameterGroup.setText(LABEL_PARAMETER_TITLE);
+ parameterGroup.setText("Parameter :");
gl = new GridLayout(2, false);
parameterGroup.setLayout(gl);
gd = new GridData(GridData.FILL_BOTH);
Modified: trunk/rtmtools/jp.go.aist.rtm.systemeditor/src/jp/go/aist/rtm/systemeditor/ui/dialog/DataConnectorCreaterDialog.java
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.systemeditor/src/jp/go/aist/rtm/systemeditor/ui/dialog/DataConnectorCreaterDialog.java 2018-01-23 13:40:04 UTC (rev 790)
+++ trunk/rtmtools/jp.go.aist.rtm.systemeditor/src/jp/go/aist/rtm/systemeditor/ui/dialog/DataConnectorCreaterDialog.java 2018-01-23 13:41:03 UTC (rev 791)
@@ -44,19 +44,8 @@
*/
public class DataConnectorCreaterDialog extends ConnectorDialogBase {
- static final String LABEL_PUSH_POLICY = Messages.getString("DataConnectorCreaterDialog.20");
- static final String LABEL_SKIP_COUNT = Messages.getString("DataConnectorCreaterDialog.21");
static final String LABEL_DETAIL = Messages.getString("DataConnectorCreaterDialog.22");
- static final String LABEL_OUTPORT_BUFFER = Messages.getString("DataConnectorCreaterDialog.23");
- static final String LABEL_INPORT_BUFFER = Messages.getString("DataConnectorCreaterDialog.24");
-
- static final String LABEL_BUFFER_LENGTH = Messages.getString("DataConnectorCreaterDialog.25");
- static final String LABEL_BUFFER_FULL_POLICY = Messages.getString("DataConnectorCreaterDialog.26");
- static final String LABEL_BUFFER_WRITE_TIMEOUT = Messages.getString("DataConnectorCreaterDialog.27");
- static final String LABEL_BUFFER_EMPTY_POLICY = Messages.getString("DataConnectorCreaterDialog.28");
- static final String LABEL_BUFFER_READ_TIMEOUT = Messages.getString("DataConnectorCreaterDialog.29");
-
static final String MSG_ERROR_PUSH_RATE_NOT_NUMERIC = Messages.getString("DataConnectorCreaterDialog.19");
static final String MSG_ERROR_SKIP_COUNT_NOT_INTEGER = Messages.getString("DataConnectorCreaterDialog.30");
static final String MSG_ERROR_OUTPORT_BUFF_LENGTH_NOT_INTEGER = Messages.getString("DataConnectorCreaterDialog.31");
@@ -74,6 +63,7 @@
private Text pushRateText;
private Combo pushPolicyCombo;
private Text skipCountText;
+ private Combo timePolicyCombo;
Composite detailComposite;
Point defaultDialogSize;
@@ -174,7 +164,7 @@
int style;
Label name = new Label(portProfileEditComposite, SWT.NONE);
- name.setText(Messages.getString("DataConnectorCreaterDialog.2")); //$NON-NLS-1$
+ name.setText("Name :"); //$NON-NLS-1$
nameText = new Text(portProfileEditComposite, SWT.SINGLE | SWT.BORDER);
gd = new GridData();
gd.horizontalAlignment = GridData.FILL;
@@ -190,7 +180,7 @@
createLabel(portProfileEditComposite, "");
Label dataTypeLabel = new Label(portProfileEditComposite, SWT.NONE);
- dataTypeLabel.setText(Messages.getString("DataConnectorCreaterDialog.3")); //$NON-NLS-1$
+ dataTypeLabel.setText("Data Type :"); //$NON-NLS-1$
style = ConnectorUtil.isAllowAnyDataType(outport, inport) ? SWT.DROP_DOWN
: SWT.DROP_DOWN | SWT.READ_ONLY;
dataTypeCombo = new Combo(portProfileEditComposite, style);
@@ -207,10 +197,10 @@
Label dataTypeFooterLabel = new Label(portProfileEditComposite,
SWT.NONE);
dataTypeFooterLabel.setText(ConnectorUtil.isAllowAnyDataType(
- outport, inport) ? Messages.getString("DataConnectorCreaterDialog.4") : ""); //$NON-NLS-1$ //$NON-NLS-2$
+ outport, inport) ? Messages.getString("DataConnectorCreaterDialog.2") : ""); //$NON-NLS-1$ //$NON-NLS-2$
Label interfaceTypeLabel = new Label(portProfileEditComposite, SWT.NONE);
- interfaceTypeLabel.setText(Messages.getString("DataConnectorCreaterDialog.6")); //$NON-NLS-1$
+ interfaceTypeLabel.setText("Interface Type :"); //$NON-NLS-1$
style = ConnectorUtil.isAllowAnyInterfaceType(outport, inport) ? SWT.DROP_DOWN
: SWT.DROP_DOWN | SWT.READ_ONLY;
interfaceTypeCombo = new Combo(portProfileEditComposite, style);
@@ -227,10 +217,10 @@
Label interfaceTypeFooterLabel = new Label(portProfileEditComposite,
SWT.NONE);
interfaceTypeFooterLabel.setText(ConnectorUtil
- .isAllowAnyInterfaceType(outport, inport) ? Messages.getString("DataConnectorCreaterDialog.7") : ""); //$NON-NLS-1$ //$NON-NLS-2$
+ .isAllowAnyInterfaceType(outport, inport) ? Messages.getString("DataConnectorCreaterDialog.2") : ""); //$NON-NLS-1$ //$NON-NLS-2$
Label dataflowTypeLabel = new Label(portProfileEditComposite, SWT.NONE);
- dataflowTypeLabel.setText(Messages.getString("DataConnectorCreaterDialog.9")); //$NON-NLS-1$
+ dataflowTypeLabel.setText("Dataflow Type :"); //$NON-NLS-1$
style = ConnectorUtil.isAllowAnyDataflowType(outport, inport) ? SWT.DROP_DOWN
: SWT.DROP_DOWN | SWT.READ_ONLY;
dataflowTypeCombo = new Combo(portProfileEditComposite, style);
@@ -250,11 +240,11 @@
Label dataflowTypeFooterLabel = new Label(portProfileEditComposite,
SWT.NONE);
dataflowTypeFooterLabel.setText(ConnectorUtil
- .isAllowAnyDataflowType(outport, inport) ? Messages.getString("DataConnectorCreaterDialog.10") : ""); //$NON-NLS-1$ //$NON-NLS-2$
+ .isAllowAnyDataflowType(outport, inport) ? Messages.getString("DataConnectorCreaterDialog.2") : ""); //$NON-NLS-1$ //$NON-NLS-2$
Label subscriptionTypeLabel = new Label(portProfileEditComposite,
SWT.NONE);
- subscriptionTypeLabel.setText(Messages.getString("DataConnectorCreaterDialog.12")); //$NON-NLS-1$
+ subscriptionTypeLabel.setText("Subscription Type :"); //$NON-NLS-1$
style = ConnectorUtil.isAllowAnySubscriptionType(outport, inport) ? SWT.DROP_DOWN
: SWT.DROP_DOWN | SWT.READ_ONLY;
subscriptionTypeCombo = new Combo(portProfileEditComposite, style);
@@ -282,11 +272,11 @@
Label subscriptionTypeFooterLabel = new Label(portProfileEditComposite,
SWT.NONE);
subscriptionTypeFooterLabel.setText(ConnectorUtil
- .isAllowAnySubscriptionType(outport, inport) ? Messages.getString("DataConnectorCreaterDialog.13") : ""); //$NON-NLS-1$ //$NON-NLS-2$
+ .isAllowAnySubscriptionType(outport, inport) ? Messages.getString("DataConnectorCreaterDialog.2") : ""); //$NON-NLS-1$ //$NON-NLS-2$
subscriptionTypeCombo.setEnabled(false);
Label pushRate = new Label(portProfileEditComposite, SWT.NONE);
- pushRate.setText(Messages.getString("DataConnectorCreaterDialog.15")); //$NON-NLS-1$
+ pushRate.setText("Push Rate(Hz) :"); //$NON-NLS-1$
pushRateText = new Text(portProfileEditComposite, SWT.SINGLE
| SWT.BORDER);
pushRateText.setEnabled(false);
@@ -318,7 +308,7 @@
footerLabel.setText("");
// Push Policy
- createLabel(portProfileEditComposite, LABEL_PUSH_POLICY);
+ createLabel(portProfileEditComposite, "Push Policy :");
style = SWT.DROP_DOWN | SWT.READ_ONLY;
pushPolicyCombo = new Combo(portProfileEditComposite, style);
gd = new GridData();
@@ -342,7 +332,7 @@
createLabel(portProfileEditComposite, "");
// Skip Count
- createLabel(portProfileEditComposite, LABEL_SKIP_COUNT);
+ createLabel(portProfileEditComposite, "Skip Count :");
skipCountText = new Text(portProfileEditComposite, SWT.SINGLE
| SWT.BORDER);
skipCountText.setEnabled(false);
@@ -365,6 +355,27 @@
});
createLabel(portProfileEditComposite, "");
+ // TimeStamp Policy
+ createLabel(portProfileEditComposite, "TimeStamp Policy :");
+ style = SWT.DROP_DOWN | SWT.READ_ONLY;
+ timePolicyCombo = new Combo(portProfileEditComposite, style);
+ gd = new GridData();
+ gd.horizontalAlignment = GridData.FILL;
+ gd.grabExcessHorizontalSpace = true;
+ timePolicyCombo.setLayoutData(gd);
+ timePolicyCombo.add("");
+ timePolicyCombo.add("on_write");
+ timePolicyCombo.add("on_send");
+ timePolicyCombo.add("on_received");
+ timePolicyCombo.add("on_read");
+ timePolicyCombo.addModifyListener(new ModifyListener() {
+ public void modifyText(ModifyEvent e) {
+ connectorProfile.setTimestampPolicy(timePolicyCombo.getText());
+ notifyModified();
+ }
+ });
+ createLabel(portProfileEditComposite, "");
+
final Button detailCheck = new Button(portProfileEditComposite,
SWT.CHECK);
detailCheck.setText(LABEL_DETAIL);
@@ -410,10 +421,10 @@
detailComposite.setVisible(false);
ob = new BufferPackage();
- createBufferComposite(detailComposite, LABEL_OUTPORT_BUFFER, ob);
+ createBufferComposite(detailComposite, "Buffer (Outport)", ob);
ib = new BufferPackage();
- createBufferComposite(detailComposite, LABEL_INPORT_BUFFER, ib);
+ createBufferComposite(detailComposite, "Buffer (Inport)", ib);
additionalTableViewer = createAdditionalTableViewer(detailComposite);
@@ -445,7 +456,7 @@
final boolean isOutport = (pkg == ob);
// Buffer length
- createLabel(composite, LABEL_BUFFER_LENGTH);
+ createLabel(composite, "Buffer length :");
pkg.lengthText = new Text(composite, SWT.SINGLE | SWT.BORDER);
gd = new GridData();
gd.horizontalAlignment = GridData.FILL;
@@ -471,7 +482,7 @@
createLabel(composite, "");
// Buffer full policy
- createLabel(composite, LABEL_BUFFER_FULL_POLICY);
+ createLabel(composite, "Buffer full policy :");
pkg.fullPolicyCombo = new Combo(composite, SWT.DROP_DOWN
| SWT.READ_ONLY);
gd = new GridData();
@@ -493,7 +504,7 @@
createLabel(composite, "");
// Buffer write timeout
- createLabel(composite, LABEL_BUFFER_WRITE_TIMEOUT);
+ createLabel(composite, "Buffer write timeout :");
pkg.writeTimeoutText = new Text(composite, SWT.SINGLE | SWT.BORDER);
gd = new GridData();
gd.horizontalAlignment = GridData.FILL;
@@ -519,7 +530,7 @@
createLabel(composite, "");
// Buffer empty policy
- createLabel(composite, LABEL_BUFFER_EMPTY_POLICY);
+ createLabel(composite, "Buffer empty policy :");
pkg.emptyPolicyCombo = new Combo(composite, SWT.DROP_DOWN
| SWT.READ_ONLY);
gd = new GridData();
@@ -541,7 +552,7 @@
createLabel(composite, "");
// Buffer read timeout
- createLabel(composite, LABEL_BUFFER_READ_TIMEOUT);
+ createLabel(composite, "Buffer read timeout :");
pkg.readTimeoutText = new Text(composite, SWT.SINGLE | SWT.BORDER);
gd = new GridData();
gd.horizontalAlignment = GridData.FILL;
@@ -771,7 +782,7 @@
@Override
protected void configureShell(Shell shell) {
super.configureShell(shell);
- shell.setText(Messages.getString("DataConnectorCreaterDialog.16")); //$NON-NLS-1$
+ shell.setText("Connector Profile"); //$NON-NLS-1$
}
@SuppressWarnings("unchecked")
@@ -944,13 +955,9 @@
}
}
- subscriptionTypeCombo.setEnabled(connectorProfile
- .isSubscriptionTypeAvailable());
-
+ subscriptionTypeCombo.setEnabled(connectorProfile.isSubscriptionTypeAvailable());
pushRateText.setEnabled(connectorProfile.isPushIntervalAvailable());
-
pushPolicyCombo.setEnabled(connectorProfile.isPushPolicyAvailable());
-
skipCountText.setEnabled(connectorProfile.isSkipCountAvailable());
}
Modified: trunk/rtmtools/jp.go.aist.rtm.systemeditor/src/jp/go/aist/rtm/systemeditor/ui/dialog/DisconnectDialog.java
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.systemeditor/src/jp/go/aist/rtm/systemeditor/ui/dialog/DisconnectDialog.java 2018-01-23 13:40:04 UTC (rev 790)
+++ trunk/rtmtools/jp.go.aist.rtm.systemeditor/src/jp/go/aist/rtm/systemeditor/ui/dialog/DisconnectDialog.java 2018-01-23 13:41:03 UTC (rev 791)
@@ -33,7 +33,6 @@
public class DisconnectDialog extends TitleAreaDialog {
- static final String DIALOG_TITLE = getString("DisconnectDialog.title");
static final String DIALOG_EXPLAN = getString("DisconnectDialog.explain");
static final String PROPERTY_CONN_ID = "PROPERTY_CONN_ID";
@@ -171,7 +170,7 @@
@Override
protected void configureShell(Shell shell) {
super.configureShell(shell);
- shell.setText(DIALOG_TITLE);
+ shell.setText("Disconnect Profile");
}
/** 表示内容を構築 */
Modified: trunk/rtmtools/jp.go.aist.rtm.systemeditor/src/jp/go/aist/rtm/systemeditor/ui/dialog/IconPreferenceDialog.java
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.systemeditor/src/jp/go/aist/rtm/systemeditor/ui/dialog/IconPreferenceDialog.java 2018-01-23 13:40:04 UTC (rev 790)
+++ trunk/rtmtools/jp.go.aist.rtm.systemeditor/src/jp/go/aist/rtm/systemeditor/ui/dialog/IconPreferenceDialog.java 2018-01-23 13:41:03 UTC (rev 791)
@@ -33,11 +33,6 @@
static final int EXEC_BUTTON_WIDTH = 70;
- static final String DIALOG_TITLE = getString("IconPreferenceDialog.title");
-
- static final String LABEL_PATTERN = getString("IconPreferenceDialog.label.pattern");
- static final String LABEL_ICON_PATH = getString("IconPreferenceDialog.label.path");
-
static final String BUTTON_LABEL_BROWSE = getString("Common.button.browse");
static final String ICON_EXTENSION = "*.ico;*.bmp;*.png;*.gif;*.jpg";
@@ -85,7 +80,7 @@
mainComposite.setFont(parent.getFont());
Label label = new Label(mainComposite, SWT.NONE);
- label.setText(LABEL_PATTERN);
+ label.setText("Pattern:");
gd = new GridData();
label.setLayoutData(gd);
@@ -119,7 +114,7 @@
});
label = new Label(mainComposite, SWT.NONE);
- label.setText(LABEL_ICON_PATH);
+ label.setText("Icon path:");
gd = new GridData();
label.setLayoutData(gd);
@@ -213,7 +208,7 @@
@Override
protected void configureShell(Shell shell) {
super.configureShell(shell);
- shell.setText(DIALOG_TITLE);
+ shell.setText("Icon Preference");
}
/** 表示内容を構築 */
Modified: trunk/rtmtools/jp.go.aist.rtm.systemeditor/src/jp/go/aist/rtm/systemeditor/ui/dialog/ManagerConfigurationDialog.java
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.systemeditor/src/jp/go/aist/rtm/systemeditor/ui/dialog/ManagerConfigurationDialog.java 2018-01-23 13:40:04 UTC (rev 790)
+++ trunk/rtmtools/jp.go.aist.rtm.systemeditor/src/jp/go/aist/rtm/systemeditor/ui/dialog/ManagerConfigurationDialog.java 2018-01-23 13:41:03 UTC (rev 791)
@@ -48,11 +48,11 @@
private static final String WHITE_COLOR = "WHITE_COLOR";
private static final String LABEL_BUTTON_ADD = Messages
- .getString("CreateComponentDialog.add_button");
+ .getString("Common.button.add");
private static final String LABEL_BUTTON_DEL = Messages
- .getString("CreateComponentDialog.del_button");
+ .getString("Common.button.delete");
private static final String LABEL_BUTTON_APPLY = Messages
- .getString("CreateComponentDialog.apply_button");
+ .getString("Common.button.apply");
private static final int BUTTON_WIDTH = 70;
Modified: trunk/rtmtools/jp.go.aist.rtm.systemeditor/src/jp/go/aist/rtm/systemeditor/ui/dialog/NewCompositeComponentDialog.java
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.systemeditor/src/jp/go/aist/rtm/systemeditor/ui/dialog/NewCompositeComponentDialog.java 2018-01-23 13:40:04 UTC (rev 790)
+++ trunk/rtmtools/jp.go.aist.rtm.systemeditor/src/jp/go/aist/rtm/systemeditor/ui/dialog/NewCompositeComponentDialog.java 2018-01-23 13:41:03 UTC (rev 791)
@@ -132,7 +132,7 @@
if (creator.isOnline()) {
// オンラインの場合はコンポーネントを生成するマネージャを選択
Label mgr = new Label(portProfileEditComposite, SWT.NONE);
- mgr.setText(Messages.getString("NewCompositeComponentDialog.2")); //$NON-NLS-1$
+ mgr.setText("Manager :"); //$NON-NLS-1$
mgrList = NameServerManager.eInstance.getRTCManagerList();
mgrCombo = new Combo(portProfileEditComposite, SWT.NONE
| SWT.READ_ONLY);
@@ -159,7 +159,7 @@
}
Label name = new Label(portProfileEditComposite, SWT.NONE);
- name.setText(Messages.getString("NewCompositeComponentDialog.3")); //$NON-NLS-1$
+ name.setText("Name :"); //$NON-NLS-1$
nameText = new Text(portProfileEditComposite, SWT.SINGLE | SWT.BORDER);
gd = new GridData(GridData.GRAB_HORIZONTAL);
gd.minimumWidth = 180;
@@ -169,7 +169,7 @@
nameText.setLayoutData(gd);
Label type = new Label(portProfileEditComposite, SWT.NONE);
- type.setText(Messages.getString("NewCompositeComponentDialog.4")); //$NON-NLS-1$
+ type.setText("Type :"); //$NON-NLS-1$
typeCombo = new Combo(portProfileEditComposite, SWT.NONE
| SWT.READ_ONLY);
gd = new GridData(GridData.GRAB_HORIZONTAL);
@@ -192,7 +192,7 @@
});
Label pathLabel = new Label(portProfileEditComposite, SWT.NONE);
- pathLabel.setText(Messages.getString("NewCompositeComponentDialog.8")); //$NON-NLS-1$
+ pathLabel.setText("Path :"); //$NON-NLS-1$
pathCombo = new Combo(portProfileEditComposite, SWT.NONE);
gd = new GridData(GridData.GRAB_HORIZONTAL);
gd.minimumWidth = 180;
@@ -224,7 +224,7 @@
*/
private void createPortArea(Composite portProfileEditComposite) {
Label pathLabel = new Label(portProfileEditComposite, SWT.NONE);
- pathLabel.setText(Messages.getString("NewCompositeComponentDialog.9")); //$NON-NLS-1$
+ pathLabel.setText("Port :"); //$NON-NLS-1$
final CheckboxTableViewer viewer = CheckboxTableViewer.newCheckList(
portProfileEditComposite, SWT.BORDER);
viewer.setContentProvider(new ArrayContentProvider());
@@ -300,7 +300,7 @@
@Override
protected void configureShell(Shell shell) {
super.configureShell(shell);
- shell.setText(Messages.getString("NewCompositeComponentDialog.13")); //$NON-NLS-1$
+ shell.setText("New Composite Component"); //$NON-NLS-1$
}
@Override
Modified: trunk/rtmtools/jp.go.aist.rtm.systemeditor/src/jp/go/aist/rtm/systemeditor/ui/dialog/ProfileInformationDialog.java
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.systemeditor/src/jp/go/aist/rtm/systemeditor/ui/dialog/ProfileInformationDialog.java 2018-01-23 13:40:04 UTC (rev 790)
+++ trunk/rtmtools/jp.go.aist.rtm.systemeditor/src/jp/go/aist/rtm/systemeditor/ui/dialog/ProfileInformationDialog.java 2018-01-23 13:41:03 UTC (rev 791)
@@ -91,21 +91,20 @@
}
};
- txtVendor = createLabelAndText(mainComposite, Messages.getString("ProfileInformationDialog.0")); //$NON-NLS-1$
+ txtVendor = createLabelAndText(mainComposite, "Vendor:"); //$NON-NLS-1$
if (inputId != null) txtVendor.setText(inputId.vendor);
txtVendor.addKeyListener(listener);
- txtSystemName = createLabelAndText(mainComposite, Messages.getString("ProfileInformationDialog.1")); //$NON-NLS-1$
+ txtSystemName = createLabelAndText(mainComposite, "System Name:"); //$NON-NLS-1$
if (inputId != null) txtSystemName.setText(inputId.name);
txtSystemName.addKeyListener(listener);
- txtVersion = createLabelAndText(mainComposite, Messages.getString("ProfileInformationDialog.2")); //$NON-NLS-1$
+ txtVersion = createLabelAndText(mainComposite, "Version:"); //$NON-NLS-1$
if (inputId != null) txtVersion.setText(inputId.version);
txtVersion.addKeyListener(listener);
//
- txtPath = createLabelAndTextAndButton(mainComposite, Messages.getString("ProfileInformationDialog.3"),
- inputPath, isOverWrite); //$NON-NLS-1$
+ txtPath = createLabelAndTextAndButton(mainComposite, "Path:", inputPath, isOverWrite); //$NON-NLS-1$
//
Label label = new Label(mainComposite, SWT.LEFT);
- label.setText(Messages.getString("ProfileInformationDialog.8")); //$NON-NLS-1$
+ label.setText("Update Log:"); //$NON-NLS-1$
txtUpdateLog = new Text(mainComposite, SWT.MULTI | SWT.BORDER | SWT.LEFT);
txtUpdateLog.addKeyListener(listener);
GridData gd = new GridData();
@@ -198,7 +197,7 @@
@Override
protected void configureShell(Shell shell) {
super.configureShell(shell);
- shell.setText(Messages.getString("ProfileInformationDialog.9")); //$NON-NLS-1$
+ shell.setText("Profile Information"); //$NON-NLS-1$
}
@Override
@@ -333,7 +332,7 @@
// 必須コンポーネント選択エリア 2008.12.11
private void createRequiedComponentsArea(Composite mainComposite) {
Label pathLabel = new Label(mainComposite, SWT.LEFT);
- pathLabel.setText(Messages.getString("ProfileInformationDialog.16")); //$NON-NLS-1$
+ pathLabel.setText("Required:"); //$NON-NLS-1$
viewer = CheckboxTableViewer.newCheckList(mainComposite, SWT.BORDER);
viewer.setContentProvider(new ArrayContentProvider());
viewer.setLabelProvider(new ITableLabelProvider() {
Modified: trunk/rtmtools/jp.go.aist.rtm.systemeditor/src/jp/go/aist/rtm/systemeditor/ui/dialog/ServiceConnectorCreaterDialog.java
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.systemeditor/src/jp/go/aist/rtm/systemeditor/ui/dialog/ServiceConnectorCreaterDialog.java 2018-01-23 13:40:04 UTC (rev 790)
+++ trunk/rtmtools/jp.go.aist.rtm.systemeditor/src/jp/go/aist/rtm/systemeditor/ui/dialog/ServiceConnectorCreaterDialog.java 2018-01-23 13:41:03 UTC (rev 791)
@@ -69,7 +69,6 @@
static final int EXEC_BUTTON_WIDTH = 70;
- static final String MSG_ERROR = getString("ServiceConnectorCreaterDialog.2");
static final String MSG_NOMATCH_INTERFACE = getString("ServiceConnectorCreaterDialog.3");
static final String MSG_UNMATCH_INTERFACE = getString("ServiceConnectorCreaterDialog.4");
@@ -76,21 +75,13 @@
static final String MSG_UNMATCH_INTERFACE_TYPE = getString("ServiceConnectorCreaterDialog.13");
static final String MSG_UNMATCH_INTERFACE_INSTANCE = getString("ServiceConnectorCreaterDialog.14");
- static final String DIALOG_TITLE = getString("ServiceConnectorCreaterDialog.6");
-
static final String LABEL_ENTER_PROFILE = getString("ServiceConnectorCreaterDialog.1");
- static final String LABEL_NAME = getString("ServiceConnectorCreaterDialog.5");
- static final String LABEL_PROPERTY_CONSUMER = getString("ServiceConnectorCreaterDialog.7");
- static final String LABEL_PROPERTY_PROVIDER = getString("ServiceConnectorCreaterDialog.8");
+ static final String LABEL_BUTTON_ADD = getString("Common.button.add");
+ static final String LABEL_BUTTON_DELETE = getString("Common.button.delete");
- static final String LABEL_BUTTON_ADD = getString("ServiceConnectorCreaterDialog.9");
- static final String LABEL_BUTTON_DELETE = getString("ServiceConnectorCreaterDialog.10");
-
static final String LABEL_DETAIL = getString("ServiceConnectorCreaterDialog.11");
- static final String LABEL_UNKNOWN = getString("ServiceConnectorCreaterDialog.12");
-
static final int PROPERTY_CONSUMER = 0;
static final int PROPERTY_PROVIDER = 1;
@@ -166,8 +157,8 @@
if (port == null) {
return;
}
- String compName = LABEL_UNKNOWN;
- String portName = LABEL_UNKNOWN;
+ String compName = "unknown";
+ String portName = "unknown";
//
String name = port.getNameL();
if (name != null) {
@@ -220,7 +211,7 @@
createConnectorProfileComposite(mainComposite);
- baseMessage = MSG_ERROR;
+ baseMessage = "Error";
try {
List<PortInterfaceProfile> interfaces1 = (first != null) ? first
.getInterfaces() : new ArrayList<PortInterfaceProfile>();
@@ -268,7 +259,7 @@
portProfileEditComposite.setLayoutData(gd);
Label name = new Label(portProfileEditComposite, SWT.NONE);
- name.setText(LABEL_NAME);
+ name.setText("Name :");
nameText = new Text(portProfileEditComposite, SWT.SINGLE | SWT.BORDER);
gd = new GridData();
gd.horizontalAlignment = GridData.FILL;
@@ -354,10 +345,10 @@
interfaceTable.setHeaderVisible(true);
TableViewerColumn col = null;
- col = createColumn(interfaceTableViewer, LABEL_PROPERTY_CONSUMER, 300);
+ col = createColumn(interfaceTableViewer, "Consumer", 300);
col.setEditingSupport(new InterfaceTableEdittingSupport(
interfaceTableViewer, PROPERTY_CONSUMER));
- col = createColumn(interfaceTableViewer, LABEL_PROPERTY_PROVIDER, 300);
+ col = createColumn(interfaceTableViewer, "Provider", 300);
col.setEditingSupport(new InterfaceTableEdittingSupport(
interfaceTableViewer, PROPERTY_PROVIDER));
@@ -519,7 +510,7 @@
@Override
protected void configureShell(Shell shell) {
super.configureShell(shell);
- shell.setText(DIALOG_TITLE);
+ shell.setText("Port Profile");
}
@SuppressWarnings("unchecked")
Modified: trunk/rtmtools/jp.go.aist.rtm.systemeditor/src/jp/go/aist/rtm/systemeditor/ui/editor/AbstractSystemDiagramEditor.java
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.systemeditor/src/jp/go/aist/rtm/systemeditor/ui/editor/AbstractSystemDiagramEditor.java 2018-01-23 13:40:04 UTC (rev 790)
+++ trunk/rtmtools/jp.go.aist.rtm.systemeditor/src/jp/go/aist/rtm/systemeditor/ui/editor/AbstractSystemDiagramEditor.java 2018-01-23 13:41:03 UTC (rev 791)
@@ -212,8 +212,8 @@
@Override
protected void init() {
setId(ActionFactory.SAVE_AS.getId());
- setText(Messages.getString("AbstractSystemDiagramEditor.3")); //$NON-NLS-1$
- setToolTipText(Messages.getString("AbstractSystemDiagramEditor.4")); //$NON-NLS-1$
+ setText("Save As...");
+ setToolTipText("Save As...");
}
@Override
@@ -380,8 +380,8 @@
save(file, monitor);
} catch (CoreException e) {
LOGGER.error("Fail to save. file=" + file, e);
- ErrorDialog.openError(getSite().getShell(), Messages.getString("AbstractSystemDiagramEditor.12"), //$NON-NLS-1$
- Messages.getString("AbstractSystemDiagramEditor.13"), e.getStatus()); //$NON-NLS-1$
+ ErrorDialog.openError(getSite().getShell(), "Error During Save",
+ "The current model could not be saved.", e.getStatus());
}
}
@@ -481,7 +481,7 @@
try {
newPath.toFile().createNewFile();
} catch (IOException e) {
- MessageDialog.openError(getSite().getShell(), Messages.getString("AbstractSystemDiagramEditor.23"), //$NON-NLS-1$
+ MessageDialog.openError(getSite().getShell(), Messages.getString("AbstractSystemDiagramEditor.21"), //$NON-NLS-1$
Messages.getString("AbstractSystemDiagramEditor.24") + newPath.toOSString()); //$NON-NLS-1$
}
}
@@ -568,9 +568,7 @@
if (progressMonitor == null) {
progressMonitor = new NullProgressMonitor();
}
- progressMonitor.beginTask(Messages
- .getString("AbstractSystemDiagramEditor.26")
- + file.getLocation().toOSString(), 6);
+ progressMonitor.beginTask("Saving" + file.getLocation().toOSString(), 6);
try {
// STEP1: リソースを作成
@@ -642,13 +640,13 @@
} catch (FileNotFoundException e) {
progressMonitor.done();
IStatus status = new Status(IStatus.ERROR, RTSystemEditorPlugin.getDefault()
- .getClass().getName(), 0, Messages.getString("AbstractSystemDiagramEditor.27"), e); //$NON-NLS-1$
+ .getClass().getName(), 0, "Error writing file.", e);
throw new CoreException(status);
} catch (Exception e) {
progressMonitor.done();
IStatus status = new Status(IStatus.ERROR, RTSystemEditorPlugin.getDefault()
- .getClass().getName(), 0, Messages.getString("AbstractSystemDiagramEditor.28"), e); //$NON-NLS-1$
+ .getClass().getName(), 0, "Error writing file.", e);
throw new CoreException(status);
}
}
@@ -742,8 +740,7 @@
final IEditorSite site, final RestoreOption doReplace)
throws PartInitException;
- private SimpleDateFormat formater = new SimpleDateFormat(
- Messages.getString("AbstractSystemDiagramEditor.29")); //$NON-NLS-1$
+ private SimpleDateFormat formater = new SimpleDateFormat("yyyy_MM_dd_hh_mm_ss_SSS");
protected IEditorInput getTargetInput(IEditorInput input, String windowName) {
if (input instanceof NullEditorInput) {
Modified: trunk/rtmtools/jp.go.aist.rtm.systemeditor/src/jp/go/aist/rtm/systemeditor/ui/editor/OfflineSystemDiagramEditor.java
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.systemeditor/src/jp/go/aist/rtm/systemeditor/ui/editor/OfflineSystemDiagramEditor.java 2018-01-23 13:40:04 UTC (rev 790)
+++ trunk/rtmtools/jp.go.aist.rtm.systemeditor/src/jp/go/aist/rtm/systemeditor/ui/editor/OfflineSystemDiagramEditor.java 2018-01-23 13:41:03 UTC (rev 791)
@@ -55,8 +55,7 @@
protected IEditorInput load(IEditorInput input, final IEditorSite site,
final RestoreOption restore) throws PartInitException {
- IEditorInput targetInput = getTargetInput(input
- , Messages.getString("OfflineSystemDiagramEditor.7"));
+ IEditorInput targetInput = getTargetInput(input, "Offline System Diagram");
if (targetInput instanceof FileEditorInput) {
// RTSプロファイルをファイルからロードする
Modified: trunk/rtmtools/jp.go.aist.rtm.systemeditor/src/jp/go/aist/rtm/systemeditor/ui/editor/SystemDiagramEditor.java
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.systemeditor/src/jp/go/aist/rtm/systemeditor/ui/editor/SystemDiagramEditor.java 2018-01-23 13:40:04 UTC (rev 790)
+++ trunk/rtmtools/jp.go.aist.rtm.systemeditor/src/jp/go/aist/rtm/systemeditor/ui/editor/SystemDiagramEditor.java 2018-01-23 13:41:03 UTC (rev 791)
@@ -103,8 +103,7 @@
protected IEditorInput load(IEditorInput input, final IEditorSite site,
final RestoreOption restore) throws PartInitException {
- IEditorInput targetInput = getTargetInput(input,
- Messages.getString("SystemDiagramEditor.10"));
+ IEditorInput targetInput = getTargetInput(input, "System Diagram");
if (getSystemDiagram() != null) {
getSystemDiagram().setSynchronizeInterval(0);
@@ -220,7 +219,7 @@
monitor.done();
throw new InvocationTargetException(
e,
- Messages.getString("SystemDiagramEditor.6") + "\r\n" + e.getMessage()); //$NON-NLS-1$
+ Messages.getString("SystemDiagramEditor.5") + "\r\n" + e.getMessage()); //$NON-NLS-1$
}
monitor.internalWorked(35);
@@ -301,7 +300,7 @@
} catch (Exception e) {
throw new InvocationTargetException(e,
- Messages.getString("SystemDiagramEditor.6") + "\r\n"
+ Messages.getString("SystemDiagramEditor.5") + "\r\n"
+ e.getMessage());
}
@@ -377,7 +376,7 @@
Restoration.processAllRestoreConfigurationSet(resultHolder, systemDiagram );
if (resultHolder.isSuccess() == false) {
Dialog dialog = new jp.go.aist.rtm.toolscommon.ui.dialog.ErrorDialog(
- site.getShell(), Messages.getString("SystemDiagramEditor.12"), null, Messages.getString("SystemDiagramEditor.13"), buffer //$NON-NLS-1$ //$NON-NLS-2$
+ site.getShell(), Messages.getString("Common.dialog.error_title"), null, Messages.getString("SystemDiagramEditor.13"), buffer //$NON-NLS-1$ //$NON-NLS-2$
.toString(), MessageDialog.ERROR);
dialog.open();
}
Modified: trunk/rtmtools/jp.go.aist.rtm.systemeditor/src/jp/go/aist/rtm/systemeditor/ui/editor/SystemDiagramEditorContributor.java
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.systemeditor/src/jp/go/aist/rtm/systemeditor/ui/editor/SystemDiagramEditorContributor.java 2018-01-23 13:40:04 UTC (rev 790)
+++ trunk/rtmtools/jp.go.aist.rtm.systemeditor/src/jp/go/aist/rtm/systemeditor/ui/editor/SystemDiagramEditorContributor.java 2018-01-23 13:41:03 UTC (rev 791)
@@ -128,9 +128,9 @@
IFigure figure = componentEditPart.getFigure();
Rectangle bounds = figure.getBounds();
- message = Messages.getString("SystemDiagramEditorContributor.1") + bounds.x + "," + bounds.y //$NON-NLS-1$ //$NON-NLS-2$
- + Messages.getString("SystemDiagramEditorContributor.3") + bounds.width + "," //$NON-NLS-1$ //$NON-NLS-2$
- + bounds.height + ")"; //$NON-NLS-1$
+ message = "Pos: (" + bounds.x + "," + bounds.y
+ + ") Size: (" + bounds.width + ","
+ + bounds.height + ")";
}
manager.setMessage(message);
Modified: trunk/rtmtools/jp.go.aist.rtm.systemeditor/src/jp/go/aist/rtm/systemeditor/ui/editor/action/ChangeComponentDirectionAction.java
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.systemeditor/src/jp/go/aist/rtm/systemeditor/ui/editor/action/ChangeComponentDirectionAction.java 2018-01-23 13:40:04 UTC (rev 790)
+++ trunk/rtmtools/jp.go.aist.rtm.systemeditor/src/jp/go/aist/rtm/systemeditor/ui/editor/action/ChangeComponentDirectionAction.java 2018-01-23 13:41:03 UTC (rev 791)
@@ -41,7 +41,8 @@
public ChangeComponentDirectionAction(IWorkbenchPart part, String id) {
super(part);
setId(id);
- setText(Messages.getString("ChangeComponentDirectionAction.2")); //$NON-NLS-1$
+ setText("Change Direction");
+ setToolTipText("Change Direction");
}
protected boolean calculateEnabled() {
Modified: trunk/rtmtools/jp.go.aist.rtm.systemeditor/src/jp/go/aist/rtm/systemeditor/ui/editor/action/MoveComponentAction.java
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.systemeditor/src/jp/go/aist/rtm/systemeditor/ui/editor/action/MoveComponentAction.java 2018-01-23 13:40:04 UTC (rev 790)
+++ trunk/rtmtools/jp.go.aist.rtm.systemeditor/src/jp/go/aist/rtm/systemeditor/ui/editor/action/MoveComponentAction.java 2018-01-23 13:41:03 UTC (rev 791)
@@ -88,7 +88,8 @@
public MoveComponentAction(IWorkbenchPart part, String id) {
super(part);
setId(id);
- setText(Messages.getString("MoveComponentAction.8")); //$NON-NLS-1$
+ setText("Move");
+ setToolTipText("Move");
}
/**
Modified: trunk/rtmtools/jp.go.aist.rtm.systemeditor/src/jp/go/aist/rtm/systemeditor/ui/editor/action/OpenAction.java
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.systemeditor/src/jp/go/aist/rtm/systemeditor/ui/editor/action/OpenAction.java 2018-01-23 13:40:04 UTC (rev 790)
+++ trunk/rtmtools/jp.go.aist.rtm.systemeditor/src/jp/go/aist/rtm/systemeditor/ui/editor/action/OpenAction.java 2018-01-23 13:41:03 UTC (rev 791)
@@ -19,8 +19,8 @@
@Override
protected void init() {
setId(ID);
- setText(Messages.getString("OpenAction.0")); //$NON-NLS-1$
- setToolTipText(Messages.getString("OpenAction.1")); //$NON-NLS-1$
+ setText("Open...");
+ setToolTipText("Open...");
}
@Override
Modified: trunk/rtmtools/jp.go.aist.rtm.systemeditor/src/jp/go/aist/rtm/systemeditor/ui/editor/action/OpenAndCreateRestoreAction.java
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.systemeditor/src/jp/go/aist/rtm/systemeditor/ui/editor/action/OpenAndCreateRestoreAction.java 2018-01-23 13:40:04 UTC (rev 790)
+++ trunk/rtmtools/jp.go.aist.rtm.systemeditor/src/jp/go/aist/rtm/systemeditor/ui/editor/action/OpenAndCreateRestoreAction.java 2018-01-23 13:41:03 UTC (rev 791)
@@ -19,8 +19,8 @@
@Override
protected void init() {
setId(ID);
- setText(Messages.getString("OpenAndCreateRestoreAction.0"));
- setToolTipText(Messages.getString("OpenAndCreateRestoreAction.1"));
+ setText("Open and Create Restore...");
+ setToolTipText("Open and Create Restore...");
}
@Override
Modified: trunk/rtmtools/jp.go.aist.rtm.systemeditor/src/jp/go/aist/rtm/systemeditor/ui/editor/action/OpenAndQuickRestoreAction.java
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.systemeditor/src/jp/go/aist/rtm/systemeditor/ui/editor/action/OpenAndQuickRestoreAction.java 2018-01-23 13:40:04 UTC (rev 790)
+++ trunk/rtmtools/jp.go.aist.rtm.systemeditor/src/jp/go/aist/rtm/systemeditor/ui/editor/action/OpenAndQuickRestoreAction.java 2018-01-23 13:41:03 UTC (rev 791)
@@ -20,8 +20,8 @@
@Override
protected void init() {
setId(ID);
- setText(Messages.getString("OpenAndQuickRestoreAction.0")); //$NON-NLS-1$
- setToolTipText(Messages.getString("OpenAndQuickRestoreAction.1")); //$NON-NLS-1$
+ setText("Open and Quick Restore...");
+ setToolTipText("Open and Quick Restore...");
}
@Override
Modified: trunk/rtmtools/jp.go.aist.rtm.systemeditor/src/jp/go/aist/rtm/systemeditor/ui/editor/action/OpenAndRestoreAction.java
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.systemeditor/src/jp/go/aist/rtm/systemeditor/ui/editor/action/OpenAndRestoreAction.java 2018-01-23 13:40:04 UTC (rev 790)
+++ trunk/rtmtools/jp.go.aist.rtm.systemeditor/src/jp/go/aist/rtm/systemeditor/ui/editor/action/OpenAndRestoreAction.java 2018-01-23 13:41:03 UTC (rev 791)
@@ -19,8 +19,8 @@
@Override
protected void init() {
setId(ID);
- setText(Messages.getString("OpenAndRestoreAction.0")); //$NON-NLS-1$
- setToolTipText(Messages.getString("OpenAndRestoreAction.1")); //$NON-NLS-1$
+ setText("Open and Restore...");
+ setToolTipText("Open and Restore...");
}
@Override
Modified: trunk/rtmtools/jp.go.aist.rtm.systemeditor/src/jp/go/aist/rtm/systemeditor/ui/editor/action/OpenWithMappingRestoreAction.java
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.systemeditor/src/jp/go/aist/rtm/systemeditor/ui/editor/action/OpenWithMappingRestoreAction.java 2018-01-23 13:40:04 UTC (rev 790)
+++ trunk/rtmtools/jp.go.aist.rtm.systemeditor/src/jp/go/aist/rtm/systemeditor/ui/editor/action/OpenWithMappingRestoreAction.java 2018-01-23 13:41:03 UTC (rev 791)
@@ -1,6 +1,5 @@
package jp.go.aist.rtm.systemeditor.ui.editor.action;
-import jp.go.aist.rtm.systemeditor.nl.Messages;
import jp.go.aist.rtm.systemeditor.ui.editor.AbstractSystemDiagramEditor;
import org.eclipse.gef.ui.actions.EditorPartAction;
@@ -20,8 +19,8 @@
@Override
protected void init() {
setId(ID);
- setText(Messages.getString("OpenWithMappingRestoreAction.0"));
- setToolTipText(Messages.getString("OpenWithMappingRestoreAction.1"));
+ setText("Open with Mapping Restore...");
+ setToolTipText("Open with Mapping Restore...");
}
@Override
Modified: trunk/rtmtools/jp.go.aist.rtm.systemeditor/src/jp/go/aist/rtm/systemeditor/ui/editor/editpolicy/GraphicalConnectorCreateManager.java
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.systemeditor/src/jp/go/aist/rtm/systemeditor/ui/editor/editpolicy/GraphicalConnectorCreateManager.java 2018-01-23 13:40:04 UTC (rev 790)
+++ trunk/rtmtools/jp.go.aist.rtm.systemeditor/src/jp/go/aist/rtm/systemeditor/ui/editor/editpolicy/GraphicalConnectorCreateManager.java 2018-01-23 13:41:03 UTC (rev 791)
@@ -33,7 +33,7 @@
.getLogger(GraphicalConnectorCreateManager.class);
static final String ERROR_TITLE = Messages
- .getString("GraphicalConnectorCreateManager.0");
+ .getString("Common.dialog.error_title");
static final String ERROR_CONNECT_FAILED = Messages
.getString("GraphicalConnectorCreateManager.1");
Modified: trunk/rtmtools/jp.go.aist.rtm.systemeditor/src/jp/go/aist/rtm/systemeditor/ui/editor/editpolicy/SystemXYLayoutEditPolicy.java
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.systemeditor/src/jp/go/aist/rtm/systemeditor/ui/editor/editpolicy/SystemXYLayoutEditPolicy.java 2018-01-23 13:40:04 UTC (rev 790)
+++ trunk/rtmtools/jp.go.aist.rtm.systemeditor/src/jp/go/aist/rtm/systemeditor/ui/editor/editpolicy/SystemXYLayoutEditPolicy.java 2018-01-23 13:41:03 UTC (rev 791)
@@ -49,8 +49,7 @@
if (result.getCommandPairs().isEmpty()) {
MessageDialog.openInformation(PlatformUI.getWorkbench()
- .getActiveWorkbenchWindow().getShell(), Messages
- .getString("SystemXYLayoutEditPolicy.6"), creator
+ .getActiveWorkbenchWindow().getShell(), "Information", creator
.getMessage());
return null;
}
Modified: trunk/rtmtools/jp.go.aist.rtm.systemeditor/src/jp/go/aist/rtm/systemeditor/ui/preference/ColorPreferencePage.java
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.systemeditor/src/jp/go/aist/rtm/systemeditor/ui/preference/ColorPreferencePage.java 2018-01-23 13:40:04 UTC (rev 790)
+++ trunk/rtmtools/jp.go.aist.rtm.systemeditor/src/jp/go/aist/rtm/systemeditor/ui/preference/ColorPreferencePage.java 2018-01-23 13:41:03 UTC (rev 791)
@@ -63,15 +63,15 @@
stateGroup.setText(Messages.getString("ColorPreferencePage.0")); //$NON-NLS-1$
- stateCreatedColorSelector = createColorSetting(Messages.getString("ColorPreferencePage.1"), stateGroup, //$NON-NLS-1$
+ stateCreatedColorSelector = createColorSetting("Created:", stateGroup,
SystemEditorPreferenceManager.COLOR_RTC_STATE_CREATED);
- stateInactiveColorSelector = createColorSetting(Messages.getString("ColorPreferencePage.2"), //$NON-NLS-1$
+ stateInactiveColorSelector = createColorSetting("Inactive:",
stateGroup, SystemEditorPreferenceManager.COLOR_RTC_STATE_INACTIVE);
- stateActiveColorSelector = createColorSetting(Messages.getString("ColorPreferencePage.3"), stateGroup, //$NON-NLS-1$
+ stateActiveColorSelector = createColorSetting("Active:", stateGroup,
SystemEditorPreferenceManager.COLOR_RTC_STATE_ACTIVE);
- stateErrorColorSelector = createColorSetting(Messages.getString("ColorPreferencePage.4"), stateGroup, //$NON-NLS-1$
+ stateErrorColorSelector = createColorSetting("Error:", stateGroup,
SystemEditorPreferenceManager.COLOR_RTC_STATE_ERROR);
- stateUnknownColorSelector = createColorSetting(Messages.getString("ColorPreferencePage.5"), stateGroup, //$NON-NLS-1$
+ stateUnknownColorSelector = createColorSetting("Unknown:", stateGroup,
SystemEditorPreferenceManager.COLOR_RTC_STATE_UNKNOWN);
Group executionContextGroup = new Group(composite, SWT.NONE);
@@ -83,10 +83,10 @@
executionContextGroup.setText(Messages.getString("ColorPreferencePage.6")); //$NON-NLS-1$
- executionRunningColorSelector = createColorSetting(Messages.getString("ColorPreferencePage.7"), //$NON-NLS-1$
+ executionRunningColorSelector = createColorSetting("Running:",
executionContextGroup,
SystemEditorPreferenceManager.COLOR_RTC_EXECUTION_CONTEXT_RUNNING);
- executionStoppedColorSelector = createColorSetting(Messages.getString("ColorPreferencePage.8"), //$NON-NLS-1$
+ executionStoppedColorSelector = createColorSetting("Stopped:",
executionContextGroup,
SystemEditorPreferenceManager.COLOR_RTC_EXECUTION_CONTEXT_STOPPED);
Modified: trunk/rtmtools/jp.go.aist.rtm.systemeditor/src/jp/go/aist/rtm/systemeditor/ui/preference/IconPreferencePage.java
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.systemeditor/src/jp/go/aist/rtm/systemeditor/ui/preference/IconPreferencePage.java 2018-01-23 13:40:04 UTC (rev 790)
+++ trunk/rtmtools/jp.go.aist.rtm.systemeditor/src/jp/go/aist/rtm/systemeditor/ui/preference/IconPreferencePage.java 2018-01-23 13:41:03 UTC (rev 791)
@@ -46,8 +46,7 @@
static final int EXEC_BUTTON_WIDTH = 90;
- static final String ERROR_IMPORT_PROFILE = getString("IconPreferencePage.error.import");
- static final String ERROR_EXPORT_PROFILE = getString("IconPreferencePage.error.export");
+ static final String ERROR_PROFILE = getString("IconPreferencePage.error");
static final String BUTTON_LABEL_ADD = getString("Common.button.add");
static final String BUTTON_LABEL_EDIT = getString("Common.button.edit");
@@ -202,7 +201,7 @@
entryList = store.toEntries();
iconTableViewer.setInput(entryList);
} catch (Exception e1) {
- setErrorMessage(ERROR_IMPORT_PROFILE);
+ setErrorMessage(ERROR_PROFILE);
LOGGER.error("Fail to load profile for icon store", e1);
}
}
@@ -230,7 +229,7 @@
File file = new File(s);
store.saveProfile(file.getAbsolutePath());
} catch (Exception e1) {
- setErrorMessage(ERROR_EXPORT_PROFILE);
+ setErrorMessage(ERROR_PROFILE);
LOGGER.error("Fail to save profile", e1);
}
}
Modified: trunk/rtmtools/jp.go.aist.rtm.systemeditor/src/jp/go/aist/rtm/systemeditor/ui/preference/OfflineEditorPreferencePage.java
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.systemeditor/src/jp/go/aist/rtm/systemeditor/ui/preference/OfflineEditorPreferencePage.java 2018-01-23 13:40:04 UTC (rev 790)
+++ trunk/rtmtools/jp.go.aist.rtm.systemeditor/src/jp/go/aist/rtm/systemeditor/ui/preference/OfflineEditorPreferencePage.java 2018-01-23 13:41:03 UTC (rev 791)
@@ -220,7 +220,7 @@
//////////
Button addButton = new Button(composite, SWT.PUSH);
- addButton.setText(Messages.getString("OfflineEditorPreferencePage.5")); //$NON-NLS-1$
+ addButton.setText(Messages.getString("Common.button.add")); //$NON-NLS-1$
addButton.addSelectionListener(new SelectionAdapter() {
@SuppressWarnings("unchecked")
@Override
@@ -234,7 +234,7 @@
/////
Button deleteButton = new Button(composite, SWT.PUSH);
//
- deleteButton.setText(Messages.getString("OfflineEditorPreferencePage.7")); //$NON-NLS-1$
+ deleteButton.setText(Messages.getString("Common.button.delete")); //$NON-NLS-1$
deleteButton.addSelectionListener(new SelectionAdapter() {
@SuppressWarnings("unchecked")
@Override
Modified: trunk/rtmtools/jp.go.aist.rtm.systemeditor/src/jp/go/aist/rtm/systemeditor/ui/util/ComponentActionDelegate.java
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.systemeditor/src/jp/go/aist/rtm/systemeditor/ui/util/ComponentActionDelegate.java 2018-01-23 13:40:04 UTC (rev 790)
+++ trunk/rtmtools/jp.go.aist.rtm.systemeditor/src/jp/go/aist/rtm/systemeditor/ui/util/ComponentActionDelegate.java 2018-01-23 13:41:03 UTC (rev 791)
@@ -27,7 +27,7 @@
static final String MSG_SUB_TASK1 = Messages.getString("ComponentActionDelegate.2");
static final String MSG_SUB_TASK2 = Messages.getString("ComponentActionDelegate.3");
- static final String ERROR_TITLE = Messages.getString("ComponentActionDelegate.4");
+ static final String ERROR_TITLE = Messages.getString("Common.dialog.error_title");
static final String ERROR_DEFAULT =Messages.getString("ComponentActionDelegate.5");
static final String ERROR_INVALID_PARAM = Messages.getString("ComponentActionDelegate.6");
Modified: trunk/rtmtools/jp.go.aist.rtm.systemeditor/src/jp/go/aist/rtm/systemeditor/ui/util/CompositeComponentHelper.java
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.systemeditor/src/jp/go/aist/rtm/systemeditor/ui/util/CompositeComponentHelper.java 2018-01-23 13:40:04 UTC (rev 790)
+++ trunk/rtmtools/jp.go.aist.rtm.systemeditor/src/jp/go/aist/rtm/systemeditor/ui/util/CompositeComponentHelper.java 2018-01-23 13:41:03 UTC (rev 791)
@@ -14,7 +14,7 @@
*/
public class CompositeComponentHelper {
- private static final String CONFIRM_TITLE = Messages.getString("CompositeComponentHelper.confirm.title"); // Confirm
+ private static final String CONFIRM_TITLE = Messages.getString("Common.dialog.confirm_title"); // Confirm
/**
* 子ウィンドウが開いているときに削除または解除を行うかを確認する
Modified: trunk/rtmtools/jp.go.aist.rtm.systemeditor/src/jp/go/aist/rtm/systemeditor/ui/views/compositecomponentview/CompositeComponentView.java
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.systemeditor/src/jp/go/aist/rtm/systemeditor/ui/views/compositecomponentview/CompositeComponentView.java 2018-01-23 13:40:04 UTC (rev 790)
+++ trunk/rtmtools/jp.go.aist.rtm.systemeditor/src/jp/go/aist/rtm/systemeditor/ui/views/compositecomponentview/CompositeComponentView.java 2018-01-23 13:41:03 UTC (rev 791)
@@ -75,22 +75,14 @@
private static final String PROPERTY_PORT_NAME = "PROPERTY_PORT_NAME";
- private static final String LABEL_COMPONENT_NAME = Messages.getString("CompositeComponentView.label.component_name"); // component:
-
- private static final String LABEL_COMPONENT_TYPE = Messages.getString("CompositeComponentView.label.component_type"); // type:
-
private static final String COLUMN_CHECK_LABEL = "";
- private static final String COLUMN_COMPONENT_LABEL = Messages.getString("CompositeComponentView.column.component.label"); // component
+ private static final String BUTTON_APPLY_LABEL = Messages.getString("Common.button.apply"); // Apply
- private static final String COLUMN_PORT_LABEL = Messages.getString("CompositeComponentView.column.port.label"); // port
+ private static final String BUTTON_CANCEL_LABEL = Messages.getString("Common.button.cancel"); // Cancel
- private static final String BUTTON_APPLY_LABEL = Messages.getString("CompositeComponentView.button.apply.label"); // Apply
+ private static final String CONFIRM_APPLY_TITLE = Messages.getString("Common.dialog.confirm_title"); // Confirm
- private static final String BUTTON_CANCEL_LABEL = Messages.getString("CompositeComponentView.button.cancel.label"); // Cancel
-
- private static final String CONFIRM_APPLY_TITLE = Messages.getString("CompositeComponentView.confirm.apply_title"); // Confirm
-
private static final String CONFIRM_APPLY_MESSAGE = Messages.getString("CompositeComponentView.confirm.apply_message"); // Apply changes?
private Component targetComponent;
@@ -143,7 +135,7 @@
gd.horizontalSpan = 0;
gd.verticalSpan = 0;
nameLabel.setLayoutData(gd);
- nameLabel.setText(LABEL_COMPONENT_NAME);
+ nameLabel.setText("component:");
nameText = new Text(composite, SWT.BORDER);
gd = new GridData();
@@ -160,7 +152,7 @@
gd.horizontalSpan = 0;
gd.verticalSpan = 0;
typeLabel.setLayoutData(gd);
- typeLabel.setText(LABEL_COMPONENT_TYPE);
+ typeLabel.setText("type:");
typeText = new Text(composite, SWT.BORDER);
gd = new GridData();
@@ -218,10 +210,10 @@
checkCol.setText(COLUMN_CHECK_LABEL);
checkCol.setWidth(40);
final TableColumn compCol = new TableColumn(portTable, SWT.NONE);
- compCol.setText(COLUMN_COMPONENT_LABEL);
+ compCol.setText("component");
compCol.setWidth(200);
final TableColumn portCol = new TableColumn(portTable, SWT.NONE);
- portCol.setText(COLUMN_PORT_LABEL);
+ portCol.setText("port");
portCol.setWidth(200);
final Composite execButtonComposite = new Composite(composite, SWT.NONE);
Modified: trunk/rtmtools/jp.go.aist.rtm.systemeditor/src/jp/go/aist/rtm/systemeditor/ui/views/configurationview/ConfigurationView.java
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.systemeditor/src/jp/go/aist/rtm/systemeditor/ui/views/configurationview/ConfigurationView.java 2018-01-23 13:40:04 UTC (rev 790)
+++ trunk/rtmtools/jp.go.aist.rtm.systemeditor/src/jp/go/aist/rtm/systemeditor/ui/views/configurationview/ConfigurationView.java 2018-01-23 13:41:03 UTC (rev 791)
@@ -125,37 +125,25 @@
private static final int BUTTON_WIDTH = 70;
- private static final String LABEL_COMPONENT_NAME = Messages.getString("ConfigurationView.15");
+ private static final String LABEL_BUTTON_EDIT = Messages.getString("Common.button.edit");
+ private static final String LABEL_BUTTON_APPLY = Messages.getString("Common.button.apply");
+ private static final String LABEL_BUTTON_CANCEL = Messages.getString("Common.button.cancel");
- private static final String LABEL_BUTTON_EDIT = Messages.getString("ConfigurationView.7");
- private static final String LABEL_BUTTON_APPLY = Messages.getString("ConfigurationView.8");
- private static final String LABEL_BUTTON_CANCEL = Messages.getString("ConfigurationView.9");
-
- private static final String LABEL_COLUMN_ACTIVE = Messages.getString("ConfigurationView.16");
- private static final String LABEL_COLUMN_CONFIG = Messages.getString("ConfigurationView.17");
-
- private static final String LABEL_BUTTON_ADD = Messages.getString("ConfigurationView.18");
- private static final String LABEL_BUTTON_DEL = Messages.getString("ConfigurationView.22");
+ private static final String LABEL_BUTTON_ADD = Messages.getString("Common.button.add");
+ private static final String LABEL_BUTTON_DEL = Messages.getString("Common.button.delete");
private static final String LABEL_BUTTON_COPY = Messages.getString("ConfigurationView.23");
private static final String LABEL_BUTTON_DETAIL = Messages.getString("ConfigurationView.48");
private static final String LABEL_TOOLTIP_DETAIL = Messages.getString("ConfigurationView.47");
- private static final String LABE_CONFIGSET_NAME = Messages.getString("ConfigurationView.26");
-
- private static final String LABEL_COLUMN_KEY = Messages.getString("ConfigurationView.27");
- private static final String LABEL_COLUMN_VALUE = Messages.getString("ConfigurationView.21");
-
- private static final String LAVEL_DEFAULT_NV_VALUE = Messages.getString("ConfigurationView.21");
-
- private static final String LABEL_BUTTON_NV_ADD = Messages.getString("ConfigurationView.29");
- private static final String LABEL_BUTTON_NV_DEL = Messages.getString("ConfigurationView.32");
+ private static final String LABEL_BUTTON_NV_ADD = Messages.getString("Common.button.add");
+ private static final String LABEL_BUTTON_NV_DEL = Messages.getString("Common.button.delete");
private static final String LABEL_BUTTON_NV_DETAIL = Messages.getString("ConfigurationView.48");
private static final String LABEL_TOOLTIP_NV_DETAIL = Messages.getString("ConfigurationView.47");
- private static final String MSG_ERROR = Messages.getString("ConfigurationView.12");
+ private static final String MSG_ERROR = Messages.getString("Common.dialog.error_title");
private static final String MSG_UPDATE_FAILURE = Messages.getString("ConfigurationView.13");
- private static final String MSG_CONFIRM = Messages.getString("ConfigurationView.10");
+ private static final String MSG_CONFIRM = Messages.getString("Common.dialog.confirm_title");
private static final String MSG_CHECK_APPLY_CHANGE = Messages.getString("ConfigurationView.11");
private static final String MSG_WARNING = Messages.getString("ConfigurationView.39");
@@ -452,7 +440,7 @@
gd.horizontalSpan = 0;
gd.verticalSpan = 0;
componentNameLabelConst.setLayoutData(gd);
- componentNameLabelConst.setText(LABEL_COMPONENT_NAME);
+ componentNameLabelConst.setText("ComponentName:");
componentNameLabel = new Label(componentNameComposite, SWT.BORDER);
gd = new GridData();
@@ -495,11 +483,11 @@
leftTable.setLayout(gl);
final TableColumn activeCol = new TableColumn(leftTable, SWT.RIGHT);
- activeCol.setText(LABEL_COLUMN_ACTIVE);
+ activeCol.setText("active");
activeCol.setWidth(50);
final TableColumn configCol = new TableColumn(leftTable, SWT.LEFT);
- configCol.setText(LABEL_COLUMN_CONFIG);
+ configCol.setText("config");
activeCol.setWidth(50);
ControlAdapter controlAdapter = new ControlAdapter() {
@@ -586,7 +574,7 @@
.getNamedValueList();
for (String key : copiedComponent.getDefaultNameSet()) {
NamedValueConfigurationWrapper nvw = new NamedValueConfigurationWrapper(
- key, LAVEL_DEFAULT_NV_VALUE);
+ key, "value");
String type = copiedComponent.getWidgetSetting().get(key);
String cond = copiedComponent.getDefaultConditionSetting()
.get(key);
@@ -700,7 +688,7 @@
gd.horizontalSpan = 0;
gd.verticalSpan = 0;
configurationNameLabelConst.setLayoutData(gd);
- configurationNameLabelConst.setText(LABE_CONFIGSET_NAME);
+ configurationNameLabelConst.setText("ConfigurationSet:");
configrationSetNameLabel = new Label(configurationNameComposite,
SWT.BORDER);
@@ -752,11 +740,11 @@
rightTable.setHeaderVisible(true);
final TableColumn keyCol = new TableColumn(rightTable, SWT.LEFT);
- keyCol.setText(LABEL_COLUMN_KEY);
+ keyCol.setText("name");
keyCol.setWidth(150);
final TableColumn valueCol = new TableColumn(rightTable, SWT.LEFT);
- valueCol.setText(LABEL_COLUMN_VALUE);
+ valueCol.setText("value");
valueCol.setWidth(300);
ControlAdapter controlAdapter = new ControlAdapter() {
@@ -799,7 +787,7 @@
NamedValueConfigurationWrapper namedValueConfigurationWrapper = new NamedValueConfigurationWrapper(null,
null);
namedValueConfigurationWrapper.setKey(createDefaultNamedValueKey("name")); // modified_key
- namedValueConfigurationWrapper.setValue(LAVEL_DEFAULT_NV_VALUE);
+ namedValueConfigurationWrapper.setValue("value");
currentConfugurationSet.addNamedValue(namedValueConfigurationWrapper);
refreshRightData();
Modified: trunk/rtmtools/jp.go.aist.rtm.systemeditor/src/jp/go/aist/rtm/systemeditor/ui/views/executioncontextview/ExecutionContextView.java
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.systemeditor/src/jp/go/aist/rtm/systemeditor/ui/views/executioncontextview/ExecutionContextView.java 2018-01-23 13:40:04 UTC (rev 790)
+++ trunk/rtmtools/jp.go.aist.rtm.systemeditor/src/jp/go/aist/rtm/systemeditor/ui/views/executioncontextview/ExecutionContextView.java 2018-01-23 13:41:03 UTC (rev 791)
@@ -63,14 +63,7 @@
static final String PROPERTY_NAME = "PROPERTY_NAME";
static final String PROPERTY_VALUE = "PROPERTY_VALUE";
- static final String LABEL_COMPONENT = Messages.getString("ExecutionContextView.1");
- static final String LABEL_RATE = Messages.getString("ExecutionContextView.2");
-
- static final String LABEL_COLUMN_EC = Messages.getString("ExecutionContextView.3");
- static final String LABEL_COLUMN_NAME = Messages.getString("ExecutionContextView.4");
- static final String LABEL_COLUMN_VALUE = Messages.getString("ExecutionContextView.5");
-
- static final String LABEL_BUTTON_APPLY = Messages.getString("ExecutionContextView.6");
+ static final String LABEL_BUTTON_APPLY = Messages.getString("Common.button.apply");
static final String LABEL_BUTTON_START = Messages.getString("ExecutionContextView.7");
static final String LABEL_BUTTON_STOP = Messages.getString("ExecutionContextView.8");
static final String LABEL_BUTTON_ACTIVATE = Messages.getString("ExecutionContextView.9");
@@ -133,7 +126,7 @@
Label nameLabel = new Label(parent, SWT.NONE);
gd = new GridData();
nameLabel.setLayoutData(gd);
- nameLabel.setText(LABEL_COMPONENT);
+ nameLabel.setText("component:");
componentNameLabel = new Label(parent, SWT.BORDER);
gd = new GridData();
@@ -194,7 +187,7 @@
eclistTable.setLayout(gl);
TableColumn col = new TableColumn(eclistTable, SWT.RIGHT);
- col.setText(LABEL_COLUMN_EC);
+ col.setText("Execution Context");
col.setWidth(120);
return composite;
@@ -212,7 +205,7 @@
composite.setLayout(gl);
Label rateLabel = new Label(composite, SWT.NONE);
- rateLabel.setText(LABEL_RATE);
+ rateLabel.setText("rate:");
rateText = new Text(composite, SWT.SINGLE | SWT.BORDER);
gd = new GridData();
@@ -275,11 +268,11 @@
ecdetailTable.setHeaderVisible(true);
TableColumn col = new TableColumn(ecdetailTable, SWT.LEFT);
- col.setText(LABEL_COLUMN_NAME);
+ col.setText("Name");
col.setWidth(120);
col = new TableColumn(ecdetailTable, SWT.LEFT);
- col.setText(LABEL_COLUMN_VALUE);
+ col.setText("Value");
col.setWidth(180);
return composite;
Modified: trunk/rtmtools/jp.go.aist.rtm.systemeditor/src/jp/go/aist/rtm/systemeditor/ui/views/managercontrolview/ManagerControlView.java
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.systemeditor/src/jp/go/aist/rtm/systemeditor/ui/views/managercontrolview/ManagerControlView.java 2018-01-23 13:40:04 UTC (rev 790)
+++ trunk/rtmtools/jp.go.aist.rtm.systemeditor/src/jp/go/aist/rtm/systemeditor/ui/views/managercontrolview/ManagerControlView.java 2018-01-23 13:41:03 UTC (rev 791)
@@ -54,30 +54,6 @@
private static final Logger LOGGER = LoggerFactory
.getLogger(ManagerControlView.class);
- private static final String LABEL_LOADABLE_MODULE_BUTTON = Messages
- .getString("ManagerControlView.0");
- private static final String LABEL_RTC_INSTANCE_BUTTON = Messages
- .getString("ManagerControlView.2");
- private static final String LABEL_MANAGERS_BUTTON = Messages
- .getString("ManagerControlView.4");
- private static final String LABEL_CREATE_BUTTON = Messages
- .getString("ManagerControlView.6");
- private static final String LABEL_CONFIGURE_BUTTON = Messages
- .getString("ManagerControlView.7");
- private static final String LABEL_RESTART_BUTTON = Messages
- .getString("ManagerControlView.restart");
- private static final String LABEL_SHUTDOWN_BUTTON = Messages
- .getString("ManagerControlView.8");
-
- private static final String LABEL_MODULE_COLUMN = Messages
- .getString("ManagerControlView.1");
- private static final String LABEL_COMPONENT_COLUMN = Messages
- .getString("ManagerControlView.5");
- private static final String LABEL_PROCESS_GROUP_COLUMN = Messages
- .getString("ManagerControlView.manager_name");
- private static final String LABEL_LANGUAGE_COLUMN = Messages
- .getString("ManagerControlView.manager_language");
-
private static final int MENU_BUTTON_WIDTH = 110;
private static final int EXEC_BUTTON_WIDTH = 110;
@@ -128,7 +104,7 @@
menuButtonComposite.setLayoutData(gd);
this.loadableModuleButton = new Button(menuButtonComposite, SWT.TOP);
- this.loadableModuleButton.setText(LABEL_LOADABLE_MODULE_BUTTON);
+ this.loadableModuleButton.setText("Loadable Modules");
gd = new GridData();
gd.widthHint = MENU_BUTTON_WIDTH;
this.loadableModuleButton.setLayoutData(gd);
@@ -140,7 +116,7 @@
isSelectedRtcInstances = false;
isSelectedManagers = false;
if (targetManager != null) {
- moduleColumn1.setText(LABEL_MODULE_COLUMN);
+ moduleColumn1.setText("module");
moduleColumn2.setText("");
isSelectedLoadableModules = true;
}
@@ -149,7 +125,7 @@
});
this.rtcInstanceButton = new Button(menuButtonComposite, SWT.TOP);
- this.rtcInstanceButton.setText(LABEL_RTC_INSTANCE_BUTTON);
+ this.rtcInstanceButton.setText("RTC Instances");
gd = new GridData();
gd.widthHint = MENU_BUTTON_WIDTH;
this.rtcInstanceButton.setLayoutData(gd);
@@ -161,8 +137,8 @@
isSelectedRtcInstances = false;
isSelectedManagers = false;
if (targetManager != null) {
- moduleColumn1.setText(LABEL_COMPONENT_COLUMN);
- moduleColumn2.setText(LABEL_PROCESS_GROUP_COLUMN);
+ moduleColumn1.setText("component");
+ moduleColumn2.setText("manager name");
isSelectedRtcInstances = true;
}
refreshModuleListData();
@@ -170,7 +146,7 @@
});
this.managersButton = new Button(menuButtonComposite, SWT.TOP);
- this.managersButton.setText(LABEL_MANAGERS_BUTTON);
+ this.managersButton.setText("Managers");
gd = new GridData();
gd.widthHint = MENU_BUTTON_WIDTH;
this.managersButton.setLayoutData(gd);
@@ -182,8 +158,8 @@
isSelectedRtcInstances = false;
isSelectedManagers = false;
if (targetManager != null) {
- moduleColumn1.setText(LABEL_PROCESS_GROUP_COLUMN);
- moduleColumn2.setText(LABEL_LANGUAGE_COLUMN);
+ moduleColumn1.setText("manager name");
+ moduleColumn2.setText("manager language");
isSelectedManagers = true;
}
refreshModuleListData();
@@ -231,7 +207,7 @@
});
this.moduleColumn1 = new TableColumn(this.modulesTable, SWT.NONE);
- this.moduleColumn1.setText(LABEL_MODULE_COLUMN);
+ this.moduleColumn1.setText("module");
this.moduleColumn1.setWidth(300);
this.moduleColumn2 = new TableColumn(this.modulesTable, SWT.NONE);
this.moduleColumn2.setText("");
@@ -250,7 +226,7 @@
execButtonComposite.setLayoutData(gd);
this.createButton = new Button(execButtonComposite, SWT.TOP);
- this.createButton.setText(LABEL_CREATE_BUTTON);
+ this.createButton.setText("Create");
gd = new GridData();
gd.widthHint = EXEC_BUTTON_WIDTH;
this.createButton.setLayoutData(gd);
@@ -291,7 +267,7 @@
});
this.configureButton = new Button(execButtonComposite, SWT.TOP);
- this.configureButton.setText(LABEL_CONFIGURE_BUTTON);
+ this.configureButton.setText("Configure");
gd = new GridData();
gd.widthHint = EXEC_BUTTON_WIDTH;
this.configureButton.setLayoutData(gd);
@@ -315,7 +291,7 @@
});
this.restartButton = new Button(execButtonComposite, SWT.TOP);
- this.restartButton.setText(LABEL_RESTART_BUTTON);
+ this.restartButton.setText("Restart");
gd = new GridData();
gd.widthHint = EXEC_BUTTON_WIDTH;
this.restartButton.setLayoutData(gd);
@@ -337,7 +313,7 @@
});
this.shutdownButton = new Button(execButtonComposite, SWT.TOP);
- this.shutdownButton.setText(LABEL_SHUTDOWN_BUTTON);
+ this.shutdownButton.setText("Shutdown");
gd = new GridData();
gd.widthHint = EXEC_BUTTON_WIDTH;
this.shutdownButton.setLayoutData(gd);
More information about the openrtm-commit
mailing list