RCP/RAP code merge
authorVictor Kirhenshtein <victor@netxms.org>
Wed, 13 Nov 2013 10:03:54 +0000 (12:03 +0200)
committerVictor Kirhenshtein <victor@netxms.org>
Wed, 13 Nov 2013 10:03:54 +0000 (12:03 +0200)
commit8f49dbb6f0454913ead24b56563aec59ff4932fc
tree8ad70e0952ba3807e25a681e3f0ce8d1075d4634
parent12bb962b12ec74f03c0fc122b82a999301623fc5
RCP/RAP code merge
47 files changed:
src/java/netxms-eclipse/ObjectManager/src/org/netxms/ui/eclipse/objectmanager/Activator.java
src/java/netxms-eclipse/ObjectManager/src/org/netxms/ui/eclipse/objectmanager/actions/BindObject.java
src/java/netxms-eclipse/ObjectManager/src/org/netxms/ui/eclipse/objectmanager/actions/CreateMobileDevice.java
src/java/netxms-eclipse/ObjectManager/src/org/netxms/ui/eclipse/objectmanager/actions/RemoveClusterNode.java
src/java/netxms-eclipse/ObjectManager/src/org/netxms/ui/eclipse/objectmanager/dialogs/ZoneSelectionDialog.java
src/java/netxms-eclipse/ObjectManager/src/org/netxms/ui/eclipse/objectmanager/propertypages/ConditionEvents.java
webui/webapp/ObjectManager/OSGI-INF/l10n/bundle.properties [new file with mode: 0644]
webui/webapp/ObjectManager/OSGI-INF/l10n/bundle_es.properties [new file with mode: 0644]
webui/webapp/ObjectManager/OSGI-INF/l10n/bundle_ru.properties [new file with mode: 0644]
webui/webapp/ObjectManager/OSGI-INF/l10n/bundle_zh_CN.properties [new file with mode: 0644]
webui/webapp/ObjectManager/build.properties
webui/webapp/ObjectManager/plugin.xml
webui/webapp/ObjectManager/src/org/netxms/ui/eclipse/objectmanager/Activator.java
webui/webapp/ObjectManager/src/org/netxms/ui/eclipse/objectmanager/Messages.java [new file with mode: 0644]
webui/webapp/ObjectManager/src/org/netxms/ui/eclipse/objectmanager/actions/AbstractNodePoll.java
webui/webapp/ObjectManager/src/org/netxms/ui/eclipse/objectmanager/actions/AddClusterNode.java
webui/webapp/ObjectManager/src/org/netxms/ui/eclipse/objectmanager/actions/BindObject.java
webui/webapp/ObjectManager/src/org/netxms/ui/eclipse/objectmanager/actions/ChangeInterfaceExpectedState.java
webui/webapp/ObjectManager/src/org/netxms/ui/eclipse/objectmanager/actions/ChangeZone.java
webui/webapp/ObjectManager/src/org/netxms/ui/eclipse/objectmanager/actions/CreateCluster.java
webui/webapp/ObjectManager/src/org/netxms/ui/eclipse/objectmanager/actions/CreateCondition.java
webui/webapp/ObjectManager/src/org/netxms/ui/eclipse/objectmanager/actions/CreateContainer.java
webui/webapp/ObjectManager/src/org/netxms/ui/eclipse/objectmanager/actions/CreateInterface.java
webui/webapp/ObjectManager/src/org/netxms/ui/eclipse/objectmanager/actions/CreateMobileDevice.java
webui/webapp/ObjectManager/src/org/netxms/ui/eclipse/objectmanager/actions/CreateNetworkService.java
webui/webapp/ObjectManager/src/org/netxms/ui/eclipse/objectmanager/actions/CreateNode.java
webui/webapp/ObjectManager/src/org/netxms/ui/eclipse/objectmanager/actions/CreateRack.java
webui/webapp/ObjectManager/src/org/netxms/ui/eclipse/objectmanager/actions/CreateZone.java
webui/webapp/ObjectManager/src/org/netxms/ui/eclipse/objectmanager/actions/DeleteObject.java
webui/webapp/ObjectManager/src/org/netxms/ui/eclipse/objectmanager/actions/Manage.java
webui/webapp/ObjectManager/src/org/netxms/ui/eclipse/objectmanager/actions/RemoveClusterNode.java
webui/webapp/ObjectManager/src/org/netxms/ui/eclipse/objectmanager/actions/UnbindObject.java
webui/webapp/ObjectManager/src/org/netxms/ui/eclipse/objectmanager/actions/Unmanage.java
webui/webapp/ObjectManager/src/org/netxms/ui/eclipse/objectmanager/dialogs/ConditionDciEditDialog.java
webui/webapp/ObjectManager/src/org/netxms/ui/eclipse/objectmanager/dialogs/ZoneSelectionDialog.java
webui/webapp/ObjectManager/src/org/netxms/ui/eclipse/objectmanager/messages.properties [new file with mode: 0644]
webui/webapp/ObjectManager/src/org/netxms/ui/eclipse/objectmanager/messages_es.properties [new file with mode: 0644]
webui/webapp/ObjectManager/src/org/netxms/ui/eclipse/objectmanager/messages_ru.properties [new file with mode: 0644]
webui/webapp/ObjectManager/src/org/netxms/ui/eclipse/objectmanager/messages_zh_CN.properties [new file with mode: 0644]
webui/webapp/ObjectManager/src/org/netxms/ui/eclipse/objectmanager/propertypages/AccessControl.java
webui/webapp/ObjectManager/src/org/netxms/ui/eclipse/objectmanager/propertypages/ConditionData.java
webui/webapp/ObjectManager/src/org/netxms/ui/eclipse/objectmanager/propertypages/ConditionEvents.java
webui/webapp/ObjectManager/src/org/netxms/ui/eclipse/objectmanager/propertypages/helpers/AccessListComparator.java
webui/webapp/ObjectManager/src/org/netxms/ui/eclipse/objectmanager/propertypages/helpers/AttrViewerComparator.java
webui/webapp/ObjectManager/src/org/netxms/ui/eclipse/objectmanager/propertypages/helpers/DciListLabelProvider.java
webui/webapp/ObjectManager/src/org/netxms/ui/eclipse/objectmanager/propertypages/helpers/NetworkListComparator.java
webui/webapp/ObjectManager/src/org/netxms/ui/eclipse/objectmanager/propertypages/helpers/ResourceListComparator.java