changes in branding provider
authorVictor Kirhenshtein <victor@netxms.org>
Tue, 10 Jun 2014 09:45:34 +0000 (12:45 +0300)
committerVictor Kirhenshtein <victor@netxms.org>
Tue, 10 Jun 2014 09:45:34 +0000 (12:45 +0300)
20 files changed:
src/java/netxms-eclipse/Core/src/org/netxms/ui/eclipse/console/ApplicationWorkbenchAdvisor.java
src/java/netxms-eclipse/Core/src/org/netxms/ui/eclipse/console/BrandingManager.java
src/java/netxms-eclipse/Core/src/org/netxms/ui/eclipse/console/Messages.java
src/java/netxms-eclipse/Core/src/org/netxms/ui/eclipse/console/api/BrandingProvider.java
src/java/netxms-eclipse/Core/src/org/netxms/ui/eclipse/console/messages.properties
src/java/netxms-eclipse/Core/src/org/netxms/ui/eclipse/console/messages_cs.properties
src/java/netxms-eclipse/Core/src/org/netxms/ui/eclipse/console/messages_es.properties
src/java/netxms-eclipse/Core/src/org/netxms/ui/eclipse/console/messages_ru.properties
src/java/netxms-eclipse/Core/src/org/netxms/ui/eclipse/console/messages_zh_CN.properties
webui/webapp/Core/src/org/netxms/ui/eclipse/console/ApplicationActionBarAdvisor.java
webui/webapp/Core/src/org/netxms/ui/eclipse/console/ApplicationWorkbenchAdvisor.java
webui/webapp/Core/src/org/netxms/ui/eclipse/console/BrandingManager.java
webui/webapp/Core/src/org/netxms/ui/eclipse/console/Messages.java
webui/webapp/Core/src/org/netxms/ui/eclipse/console/api/BrandingProvider.java
webui/webapp/Core/src/org/netxms/ui/eclipse/console/messages.properties
webui/webapp/Core/src/org/netxms/ui/eclipse/console/messages_cs.properties
webui/webapp/Core/src/org/netxms/ui/eclipse/console/messages_es.properties
webui/webapp/Core/src/org/netxms/ui/eclipse/console/messages_ru.properties
webui/webapp/Core/src/org/netxms/ui/eclipse/console/messages_zh_CN.properties
webui/webapp/Mobile/src/org/netxms/webui/mobile/MobileApplicationWorkbenchAdvisor.java

index dd07624..b01dbf4 100644 (file)
@@ -142,9 +142,12 @@ public class ApplicationWorkbenchAdvisor extends WorkbenchAdvisor
                                                @Override
                                                public void run()
                                                {
-                                                       MessageDialog.openError(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), 
-                                                                       Messages.get().ApplicationWorkbenchAdvisor_CommunicationError,
-                                                                       ((n.getCode() == SessionNotification.CONNECTION_BROKEN) ? Messages.get().ApplicationWorkbenchAdvisor_ConnectionLostMessage : Messages.get().ApplicationWorkbenchAdvisor_ServerShutdownMessage) + Messages.get().ApplicationWorkbenchAdvisor_OKToCloseMessage);
+                       String productName = BrandingManager.getInstance().getProductName();
+                     MessageDialog.openError(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(),
+                                                               Messages.get().ApplicationWorkbenchAdvisor_CommunicationError,
+                           ((n.getCode() == SessionNotification.CONNECTION_BROKEN) ? String.format(Messages.get().ApplicationWorkbenchAdvisor_ConnectionLostMessage, productName)
+                                 : String.format(Messages.get().ApplicationWorkbenchAdvisor_ServerShutdownMessage, productName))
+                                 + Messages.get().ApplicationWorkbenchAdvisor_OKToCloseMessage);
                                                        PlatformUI.getWorkbench().getActiveWorkbenchWindow().close();
                                                }
                                        });
index 691acd8..dbbc48c 100644 (file)
@@ -32,7 +32,7 @@ import org.netxms.ui.eclipse.console.api.BrandingProvider;
 
 /**
  * Branding manager. There should be only one instance of branding manager,
- * created early during console startup.
+ * created early during application startup.
  */
 public class BrandingManager
 {
@@ -96,6 +96,38 @@ public class BrandingManager
                }
        }
        
+       /**
+        * Get product name.
+        * 
+        * @return product name or default product name if no branding provider defines one.
+        */
+       public String getProductName()
+       {
+               for(BrandingProvider p : providers.values())
+               {
+                       String name = p.getProductName();
+                       if (name != null)
+                               return name;
+               }
+               return Messages.get().BrandingManager_ProductName;
+       }
+       
+   /**
+    * Get product name for management console.
+    * 
+    * @return product name or default product name if no branding provider defines one.
+    */
+   public String getConsoleProductName()
+   {
+      for(BrandingProvider p : providers.values())
+      {
+         String name = p.getConsoleProductName();
+         if (name != null)
+            return name;
+      }
+               return Messages.get().ApplicationActionBarAdvisor_AboutProductName;
+       }
+       
        /**
         * Get default perspective ID. 
         * 
index 1e79431..544b939 100644 (file)
@@ -13,6 +13,7 @@ public class Messages extends NLS
        public static String AbstractTraceView_CopyToClipboard;
        public static String AbstractTraceView_Pause;
        public static String AbstractTraceView_ShowFilter;
+       public static String BrandingManager_ProductName;
        public static String ConsoleJob_ErrorDialogTitle;
        public static String ExportToCsvAction_ExportToCsv;
        public static String ExportToCsvAction_ExportAllToCsv;
@@ -66,6 +67,7 @@ public class Messages extends NLS
        public static String LoginJob_sync_users;
        public static String MacAddressValidator_ErrorMessage;
        public static String ApplicationActionBarAdvisor_About;
+   public static String ApplicationActionBarAdvisor_AboutProductName;
        public static String ApplicationActionBarAdvisor_AboutTitle;
        public static String ApplicationActionBarAdvisor_AboutText;
        public static String ApplicationActionBarAdvisor_ConfirmRestart;
index 5253c43..48d3d98 100644 (file)
@@ -1,6 +1,6 @@
 /**
  * NetXMS - open source network management system
- * Copyright (C) 2003-2012 Victor Kirhenshtein
+ * Copyright (C) 2003-2014 Victor Kirhenshtein
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -28,6 +28,20 @@ import org.eclipse.swt.widgets.Shell;
  */
 public interface BrandingProvider
 {
+       /**
+        * Get common product name.
+        * 
+        * @return
+        */
+       public String getProductName();
+       
+       /**
+    * Get product name for management console.
+    * 
+    * @return
+    */
+   public String getConsoleProductName();
+   
        /**
         * Get default perspective. Should return null to use default (or defined by another branding manager)
         * 
index 2bc75bd..543b2ec 100644 (file)
@@ -6,6 +6,7 @@ AbstractTraceView_CopyToClipboard=&Copy to clipboard
 AbstractTraceView_Pause=&Pause
 AbstractTraceView_ShowFilter=Show &filter
 Activator_TrayTooltip=NetXMS Management Console
+BrandingManager_ProductName=NetXMS
 ConsoleJob_ErrorDialogTitle=Job failed
 DataCollectionDisplayInfo_Float=Float
 DataCollectionDisplayInfo_Integer64=Integer 64-bit
@@ -49,6 +50,7 @@ LoginJob_sync_objects=Synchronizing objects...
 LoginJob_sync_users=Synchronizing user database...
 MacAddressValidator_ErrorMessage=Please enter valid MAC address in "%s" field
 ApplicationActionBarAdvisor_About=&About
+ApplicationActionBarAdvisor_AboutProductName=NetXMS Management Console
 ApplicationActionBarAdvisor_AboutText=NetXMS Management Console\nVersion %s\nCopyright (c) 2003-2013 Raden Solutions
 ApplicationActionBarAdvisor_AboutTitle=About
 ApplicationActionBarAdvisor_ConfirmRestart=Confirm Restart
@@ -66,9 +68,9 @@ ApplicationActionBarAdvisor_Tools=&Tools
 ApplicationActionBarAdvisor_View=&View
 ApplicationActionBarAdvisor_Progress=&Progress
 ApplicationWorkbenchAdvisor_CommunicationError=Communication Error
-ApplicationWorkbenchAdvisor_ConnectionLostMessage=Connection with NetXMS server was lost
+ApplicationWorkbenchAdvisor_ConnectionLostMessage=Connection with %s server was lost
 ApplicationWorkbenchAdvisor_OKToCloseMessage=. Press OK to close application.
-ApplicationWorkbenchAdvisor_ServerShutdownMessage=NetXMS server was shut down
+ApplicationWorkbenchAdvisor_ServerShutdownMessage=%s server was shut down
 ApplicationWorkbenchWindowAdvisor_CannotChangePswd=Cannot change password:
 ApplicationWorkbenchWindowAdvisor_CertDialogTitle=Path to the certificate store
 ApplicationWorkbenchWindowAdvisor_CertPassword=Certificate password
index fcd1314..76fd2e0 100644 (file)
@@ -7,6 +7,7 @@ AbstractTraceView_Pause=&Pauza
 AbstractTraceView_ShowFilter=Zobrazit &filtr
 Activator_TrayTooltip=NetXMS \u0159\u00edd\u00edc\u00ed konzole
 ApplicationActionBarAdvisor_About=O
+ApplicationActionBarAdvisor_AboutProductName=NetXMS konzole pro spr\u00e1vu
 ApplicationActionBarAdvisor_AboutText=NetXMS konzole pro spr\u00e1vu (Web edice)\nVerze %s\nCopyright (c) 2003-2013 Raden Solutions
 ApplicationActionBarAdvisor_AboutTitle=O
 ApplicationActionBarAdvisor_Configuration=&Konfigurace
@@ -24,9 +25,9 @@ ApplicationActionBarAdvisor_Tools=&N\u00e1stroje
 ApplicationActionBarAdvisor_View=&Zobrazit
 ApplicationActionBarAdvisor_Window=&Okno
 ApplicationWorkbenchAdvisor_CommunicationError=Chyba komunikace
-ApplicationWorkbenchAdvisor_ConnectionLostMessage=Spojen\u00ed s NetXMS serverem bylo ztraceno
+ApplicationWorkbenchAdvisor_ConnectionLostMessage=Spojen\u00ed s %s serverem bylo ztraceno
 ApplicationWorkbenchAdvisor_OKToCloseMessage=. Stiskn\u011bte OK k zav\u0159en\u00ed aplikace.
-ApplicationWorkbenchAdvisor_ServerShutdownMessage=NetXMS server byl vypnut
+ApplicationWorkbenchAdvisor_ServerShutdownMessage=%s server byl vypnut
 ApplicationWorkbenchWindowAdvisor_CannotChangePswd=Nelze zm\u011bnit heslo\:
 ApplicationWorkbenchWindowAdvisor_CertDialogTitle=Cesta k \u00falo\u017ei\u0161ti certifik\u00e1tu
 ApplicationWorkbenchWindowAdvisor_CertPassword=Heslo certifik\u00e1tu
@@ -42,6 +43,7 @@ ApplicationWorkbenchWindowAdvisor_NoEncryptionSupport=NetXMS server %s nepodporu
 ApplicationWorkbenchWindowAdvisor_NoEncryptionSupportDetails=NetXMS server na kter\u00fd se p\u0159\u00edpojujete nepodporuje \u0161ifrov\u00e1n\u00ed. Pokud budete pokra\u010dovat, tak bude informace obsahuj\u00edc\u00ed pov\u011b\u0159en\u00ed odesl\u00e1na jako prost\u00fd text a m\u016f\u017ee b\u00fdt snadno p\u0159e\u010dtena t\u0159et\u00ed stranou.\n\nKontaktujte sv\u00e9ho s\u00ed\u0165ov\u00e9ho administr\u00e1tora, nebo vlastn\u00edka NetXMS serveru.
 ApplicationWorkbenchWindowAdvisor_PasswordChanged=Heslo \u00fasp\u011b\u0161n\u011b zm\u011bn\u011bno
 ApplicationWorkbenchWindowAdvisor_PkcsFiles=PKCS12 soubor (*.p12, *.pfx)
+BrandingManager_ProductName=NetXMS
 ConsoleJob_ErrorDialogTitle=\u00daloha se nezda\u0159ila
 DataCollectionDisplayInfo_Float=Float
 DataCollectionDisplayInfo_Integer=Integer
index cce0554..e5909d5 100644 (file)
@@ -7,6 +7,7 @@ AbstractTraceView_Pause=&Pause
 AbstractTraceView_ShowFilter=Show &filter
 Activator_TrayTooltip=Consola Administrativa de NetXMS
 ApplicationActionBarAdvisor_About=&About
+ApplicationActionBarAdvisor_AboutProductName=NetXMS Management Console
 ApplicationActionBarAdvisor_AboutText=NetXMS Management Console\nVersion %s\nCopyright (c) 2003-2013 Raden Solutions
 ApplicationActionBarAdvisor_AboutTitle=About
 ApplicationActionBarAdvisor_Configuration=&Configuraci\u00f3n
@@ -24,9 +25,9 @@ ApplicationActionBarAdvisor_Tools=&Herramientas
 ApplicationActionBarAdvisor_View=&Vistas
 ApplicationActionBarAdvisor_Window=V&entanas
 ApplicationWorkbenchAdvisor_CommunicationError=Error de comunicaciones
-ApplicationWorkbenchAdvisor_ConnectionLostMessage=Se ha perdido conexi\u00f3n con el servidor NetXMS
+ApplicationWorkbenchAdvisor_ConnectionLostMessage=Se ha perdido conexi\u00f3n con el servidor %s
 ApplicationWorkbenchAdvisor_OKToCloseMessage=. Pulsar Aceptar para cerrar la aplicaci\u00f3n.
-ApplicationWorkbenchAdvisor_ServerShutdownMessage=Se detendr\u00e1 el servidor NetXMS
+ApplicationWorkbenchAdvisor_ServerShutdownMessage=Se detendr\u00e1 el servidor %s
 ApplicationWorkbenchWindowAdvisor_CannotChangePswd=No es posible cambiar la contrase\u00f1a:
 ApplicationWorkbenchWindowAdvisor_CertDialogTitle=Path to the certificate store
 ApplicationWorkbenchWindowAdvisor_CertPassword=Certificate password
@@ -42,7 +43,8 @@ ApplicationWorkbenchWindowAdvisor_NoEncryptionSupport=NetXMS server %s does not
 ApplicationWorkbenchWindowAdvisor_NoEncryptionSupportDetails=NetXMS server you are connecting to does not support encryption. If you countinue, information containing your credentials will be sent in clear text and could easily be read by a third party.\n\nFor assistance, contact your network administrator or the owner of the NetXMS server.\n\n
 ApplicationWorkbenchWindowAdvisor_PasswordChanged=La contrase\u00f1a ha sido cambiada
 ApplicationWorkbenchWindowAdvisor_PkcsFiles=PKCS12 file (*.p12, *.pfx)
-ConsoleJob_ErrorDialogTitle=Job failed
+BrandingManager_ProductName=NetXMS
+ConsoleJob_ErrorDialogTitle=El proceso ha fallado
 DataCollectionDisplayInfo_Float=Flotante
 DataCollectionDisplayInfo_Integer=Entero
 DataCollectionDisplayInfo_Integer64=Entero de 64-bits
@@ -55,9 +57,9 @@ ExportToCsvAction_ExportAllToCsv=Export all to CSV...
 ExportToCsvAction_ExportToCsv=E&xport to CSV...
 ExportToCsvAction_SaveError=Cannot save table data to file
 ExportToCsvAction_SaveTo=Save data to CSV file %s
-FilterText_CloseFilter=Close filter
-FilterText_Filter=Filter:
-FilterText_FilterIsEmpty=Filter is empty
+FilterText_CloseFilter=Cerrar el filtro
+FilterText_Filter=Filtro:
+FilterText_FilterIsEmpty=El filtro est\u00e1 vac\u00edo
 HttpProxyPrefs_ExcludedAddresses=Direcci\u00f3n exclu\u00edda
 HttpProxyPrefs_Login=Usuario
 HttpProxyPrefs_Password=Contrase\u00f1a
index 7aa5529..05cd68b 100644 (file)
@@ -7,6 +7,7 @@ AbstractTraceView_Pause=&\u041f\u0430\u0443\u0437\u0430
 AbstractTraceView_ShowFilter=\u041f\u043e\u043a\u0430\u0437\u0430\u0442\u044c &\u0444\u0438\u043b\u044c\u0442\u0440
 Activator_TrayTooltip=\u041a\u043e\u043d\u0441\u043e\u043b\u044c \u0443\u043f\u0440\u0430\u0432\u043b\u0435\u043d\u0438\u044f NetXMS
 ApplicationActionBarAdvisor_About=&\u041e NetXMS
+ApplicationActionBarAdvisor_AboutProductName=NetXMS
 ApplicationActionBarAdvisor_AboutText=\u041a\u043e\u043d\u0441\u043e\u043b\u044c \u0443\u043f\u0440\u0430\u0432\u043b\u0435\u043d\u0438\u044f NetXMS\n\u0412\u0435\u0440\u0441\u0438\u044f %s\n\u0412\u0441\u0435 \u043f\u0440\u0430\u0432\u0430 \u0437\u0430\u0449\u0438\u0449\u0435\u043d\u044b (c) 2003-2014 Raden Solutions
 ApplicationActionBarAdvisor_AboutTitle=\u041e NetXMS
 ApplicationActionBarAdvisor_Configuration=&\u041d\u0430\u0441\u0442\u0440\u043e\u0439\u043a\u0438
@@ -26,7 +27,7 @@ ApplicationActionBarAdvisor_Window=&\u041e\u043a\u043d\u043e
 ApplicationWorkbenchAdvisor_CommunicationError=\u041e\u0448\u0438\u0431\u043a\u0430 \u0441\u043e\u0435\u0434\u0438\u043d\u0435\u043d\u0438\u044f
 ApplicationWorkbenchAdvisor_ConnectionLostMessage=\u0421\u043e\u0435\u0434\u0438\u043d\u0435\u043d\u0438\u0435 \u0441 \u0441\u0435\u0440\u0432\u0435\u0440\u043e\u043c \u043f\u043e\u0442\u0435\u0440\u044f\u043d\u043e
 ApplicationWorkbenchAdvisor_OKToCloseMessage=\u041d\u0430\u0436\u043c\u0438\u0442\u0435 OK, \u0447\u0442\u043e\u0431\u044b \u0437\u0430\u043a\u0440\u044b\u0442\u044c \u043f\u0440\u0438\u043b\u043e\u0436\u0435\u043d\u0438\u0435.
-ApplicationWorkbenchAdvisor_ServerShutdownMessage=\u0421\u0435\u0440\u0432\u0435\u0440 NetXMS \u0437\u0430\u0432\u0435\u0440\u0448\u0438\u043b \u0440\u0430\u0431\u043e\u0442\u0443
+ApplicationWorkbenchAdvisor_ServerShutdownMessage=\u0421\u0435\u0440\u0432\u0435\u0440 %s \u0437\u0430\u0432\u0435\u0440\u0448\u0438\u043b \u0440\u0430\u0431\u043e\u0442\u0443
 ApplicationWorkbenchWindowAdvisor_CannotChangePswd=\u041d\u0435 \u0443\u0434\u0430\u0435\u0442\u0441\u044f \u0438\u0437\u043c\u0435\u043d\u0438\u0442\u044c \u043f\u0430\u0440\u043e\u043b\u044c:
 ApplicationWorkbenchWindowAdvisor_CertDialogTitle=\u041f\u0443\u0442\u044c \u043a \u0445\u0440\u0430\u043d\u0438\u043b\u0438\u0449\u0443 \u043a\u043b\u044e\u0447\u0435\u0439 (\u0441\u0435\u0440\u0442\u0438\u0444\u0438\u043a\u0430\u0442\u043e\u0432)
 ApplicationWorkbenchWindowAdvisor_CertPassword=\u041f\u0430\u0440\u043e\u043b\u044c \u0441\u0435\u0440\u0442\u0438\u0444\u0438\u043a\u0430\u0442\u0430
@@ -42,11 +43,12 @@ ApplicationWorkbenchWindowAdvisor_NoEncryptionSupport=\u0421\u0435\u0440\u0432\u
 ApplicationWorkbenchWindowAdvisor_NoEncryptionSupportDetails=\u0421\u0435\u0440\u0432\u0435\u0440 NetXMS \u043d\u0435 \u043f\u043e\u0434\u0434\u0435\u0440\u0436\u0438\u0432\u0430\u0435\u0442 \u0448\u0438\u0444\u0440\u043e\u0432\u0430\u043d\u0438\u0435. \u0415\u0441\u043b\u0438 \u0412\u044b \u043f\u0440\u043e\u0434\u043e\u043b\u0436\u0438\u0442\u0435 \u0440\u0430\u0431\u043e\u0442\u0443 \u0441 \u0438\u0441\u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u043d\u0438\u0435\u043c \u043d\u0435\u0437\u0430\u0449\u0438\u0449\u0435\u043d\u043d\u043e\u0433\u043e \u0441\u043e\u0435\u0434\u0438\u043d\u0435\u043d\u0438\u044f, \u0442\u043e \u0412\u0430\u0448\u0438 \u043f\u0435\u0440\u0441\u043e\u043d\u0430\u043b\u044c\u043d\u044b\u0435 \u0434\u0430\u043d\u043d\u044b\u0435 \u0431\u0443\u0434\u0443\u0442 \u043f\u0435\u0440\u0435\u0434\u0430\u0432\u0430\u0442\u044c\u0441\u044f \u0432 \u043e\u0442\u043a\u0440\u044b\u0442\u043e\u043c \u0432\u0438\u0434\u0435.\n\n\u041e\u0431\u0440\u0430\u0442\u0438\u0442\u0435\u0441\u044c \u0437\u0430 \u043f\u043e\u043c\u043e\u0449\u044c\u044e \u043a \u0430\u0434\u043c\u0438\u043d\u0438\u0441\u0442\u0440\u0430\u0442\u043e\u0440\u0443 \u0441\u0435\u0442\u0438 \u0438\u043b\u0438 \u0432\u043b\u0430\u0434\u0435\u043b\u044c\u0446\u0443 \u0441\u0435\u0440\u0432\u0435\u0440\u0430.\n\n
 ApplicationWorkbenchWindowAdvisor_PasswordChanged=\u041f\u0430\u0440\u043e\u043b\u044c \u0438\u0437\u043c\u0435\u043d\u0435\u043d
 ApplicationWorkbenchWindowAdvisor_PkcsFiles=\u0424\u0430\u0439\u043b PKCS12 (*.p12, *.pfx)
+BrandingManager_ProductName=NetXMS
 ConsoleJob_ErrorDialogTitle=\u0421\u0431\u043e\u0439 \u0432\u044b\u043f\u043e\u043b\u043d\u0435\u043d\u0438\u044f \u0437\u0430\u0434\u0430\u043d\u0438\u044f
 DataCollectionDisplayInfo_Float=\u0414\u0440\u043e\u0431\u043d\u043e\u0435
 DataCollectionDisplayInfo_Integer=\u0426\u0435\u043b\u043e\u0435
 DataCollectionDisplayInfo_Integer64=\u0426\u0435\u043b\u043e\u0435 64-\u0431\u0438\u0442
-DataCollectionDisplayInfo_Null=<\u041d\u0435\u0442 \u0434\u0430\u043d\u043d\u044b\u0445>
+DataCollectionDisplayInfo_Null= <\u041d\u0435\u0442 \u0434\u0430\u043d\u043d\u044b\u0445>
 DataCollectionDisplayInfo_String=\u0421\u0442\u0440\u043e\u043a\u0430
 DataCollectionDisplayInfo_UInteger=\u0411\u0435\u0437\u0437\u043d\u0430\u043a\u043e\u0432\u043e\u0435 \u0446\u0435\u043b\u043e\u0435
 DataCollectionDisplayInfo_UInteger64=\u0411\u0435\u0437\u0437\u043d\u0430\u043a\u043e\u0432\u043e\u0435 \u0446\u0435\u043b\u043e\u0435 64-\u0431\u0438\u0442
index 73ffa30..7b34a91 100644 (file)
@@ -7,6 +7,7 @@ AbstractTraceView_Pause=&Pause
 AbstractTraceView_ShowFilter=Show &filter
 Activator_TrayTooltip=\u7f51\u7edc\u7ba1\u7406\u7cfb\u7edf\u63a7\u5236\u53f0
 ApplicationActionBarAdvisor_About=&About
+ApplicationActionBarAdvisor_AboutProductName=NetXMS Management Console
 ApplicationActionBarAdvisor_AboutText=NetXMS Management Console\nVersion %s\nCopyright (c) 2003-2013 Raden Solutions
 ApplicationActionBarAdvisor_AboutTitle=About
 ApplicationActionBarAdvisor_Configuration=\u914d\u7f6e
@@ -42,6 +43,7 @@ ApplicationWorkbenchWindowAdvisor_NoEncryptionSupport=NetXMS server %s does not
 ApplicationWorkbenchWindowAdvisor_NoEncryptionSupportDetails=NetXMS server you are connecting to does not support encryption. If you countinue, information containing your credentials will be sent in clear text and could easily be read by a third party.\n\nFor assistance, contact your network administrator or the owner of the NetXMS server.\n\n
 ApplicationWorkbenchWindowAdvisor_PasswordChanged=\u66f4\u6539\u53e3\u4ee4\u6210\u529f
 ApplicationWorkbenchWindowAdvisor_PkcsFiles=PKCS12 file (*.p12, *.pfx)
+BrandingManager_ProductName=NetXMS
 ConsoleJob_ErrorDialogTitle=Job failed
 DataCollectionDisplayInfo_Float=\u6d6e\u70b9\u6570
 DataCollectionDisplayInfo_Integer=\u6574\u6570
index babe816..db53b45 100644 (file)
@@ -93,7 +93,7 @@ public class ApplicationActionBarAdvisor extends ActionBarAdvisor
                actionExit = ActionFactory.QUIT.create(window);
                register(actionExit);
 
-               actionAbout = new Action(String.format(Messages.get().ApplicationActionBarAdvisor_AboutActionName, BrandingManager.getInstance().getProductName())) {
+               actionAbout = new Action(String.format(Messages.get().ApplicationActionBarAdvisor_AboutActionName, BrandingManager.getInstance().getConsoleProductName())) {
                        @Override
                        public void run()
                        {
index 1f6f7fb..a78f9a2 100644 (file)
@@ -214,17 +214,19 @@ public class ApplicationWorkbenchAdvisor extends WorkbenchAdvisor
             @Override
             public void notificationHandler(final SessionNotification n)
             {
-               if ((n.getCode() == SessionNotification.CONNECTION_BROKEN) || (n.getCode() == SessionNotification.SERVER_SHUTDOWN))
+                               if ((n.getCode() == SessionNotification.CONNECTION_BROKEN) ||
+                                   (n.getCode() == SessionNotification.SERVER_SHUTDOWN))
                {
                   display.asyncExec(new Runnable() {
                      @Override
                      public void run()
                      {
+                       String productName = BrandingManager.getInstance().getProductName();
                         MessageDialog.openError(
                               PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(),
                               Messages.get().ApplicationWorkbenchAdvisor_CommunicationError,
-                              ((n.getCode() == SessionNotification.CONNECTION_BROKEN) ? Messages.get().ApplicationWorkbenchAdvisor_ConnectionLostMessage
-                                    : Messages.get().ApplicationWorkbenchAdvisor_ServerShutdownMessage)
+                              ((n.getCode() == SessionNotification.CONNECTION_BROKEN) ? String.format(Messages.get().ApplicationWorkbenchAdvisor_ConnectionLostMessage, productName)
+                                    : String.format(Messages.get().ApplicationWorkbenchAdvisor_ServerShutdownMessage, productName))
                                     + Messages.get().ApplicationWorkbenchAdvisor_OKToCloseMessage);
                         PlatformUI.getWorkbench().getActiveWorkbenchWindow().close();
                      }
index 5f34080..2eee768 100644 (file)
@@ -114,9 +114,25 @@ public class BrandingManager
                        if (name != null)
                                return name;
                }
-               return Messages.get().ApplicationActionBarAdvisor_AboutProductName;
+               return Messages.get().BrandingManager_ProductName;
        }
        
+   /**
+    * Get product name for management console.
+    * 
+    * @return product name or default product name if no branding provider defines one.
+    */
+   public String getConsoleProductName()
+   {
+      for(BrandingProvider p : providers.values())
+      {
+         String name = p.getConsoleProductName();
+         if (name != null)
+            return name;
+      }
+      return Messages.get().ApplicationActionBarAdvisor_AboutProductName;
+   }
+   
        /**
         * Get default perspective ID. 
         * 
index 242b3a5..d748fd4 100644 (file)
@@ -16,6 +16,7 @@ public class Messages extends NLS
        public String AbstractTraceView_CopyToClipboard;
        public String AbstractTraceView_Pause;
        public String AbstractTraceView_ShowFilter;
+       public String BrandingManager_ProductName;
        public String ConsoleJob_ErrorDialogTitle;
        public String ExportToCsvAction_ExportToCsv;
        public String ExportToCsvAction_ExportAllToCsv;
@@ -69,6 +70,7 @@ public class Messages extends NLS
        public String LoginJob_sync_users;
        public String MacAddressValidator_ErrorMessage;
        public String ApplicationActionBarAdvisor_About;
+   public String ApplicationActionBarAdvisor_AboutProductName;
        public String ApplicationActionBarAdvisor_AboutTitle;
        public String ApplicationActionBarAdvisor_AboutText;
        public String ApplicationActionBarAdvisor_ConfirmRestart;
@@ -160,7 +162,6 @@ public class Messages extends NLS
 
        //move.start
    public String ApplicationActionBarAdvisor_AboutActionName;
-       public String ApplicationActionBarAdvisor_AboutProductName;
        public String ApplicationWorkbenchWindowAdvisor_AppTitle;
    public String LoginForm_AdvOptionsDisabled;
    public String LoginForm_Error;
index 37099c8..0e42dc1 100644 (file)
@@ -1,6 +1,6 @@
 /**
  * NetXMS - open source network management system
- * Copyright (C) 2003-2012 Victor Kirhenshtein
+ * Copyright (C) 2003-2014 Victor Kirhenshtein
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -31,12 +31,19 @@ import org.eclipse.swt.widgets.Shell;
 public interface BrandingProvider
 {
        /**
-        * Get product name.
+        * Get common product name.
         * 
         * @return
         */
        public String getProductName();
        
+   /**
+    * Get product name for management console.
+    * 
+    * @return
+    */
+   public String getConsoleProductName();
+   
        /**
         * Get default perspective. Should return null to use default (or defined by another branding manager)
         * 
index 05a36f3..cb612da 100644 (file)
@@ -6,6 +6,7 @@ AbstractTraceView_CopyToClipboard=&Copy to clipboard
 AbstractTraceView_Pause=&Pause
 AbstractTraceView_ShowFilter=Show &filter
 Activator_TrayTooltip=NetXMS Management Console
+BrandingManager_ProductName=NetXMS
 ConsoleJob_ErrorDialogTitle=Job failed
 DataCollectionDisplayInfo_Float=Float
 DataCollectionDisplayInfo_Integer64=Integer 64-bit
@@ -68,9 +69,9 @@ ApplicationActionBarAdvisor_Tools=&Tools
 ApplicationActionBarAdvisor_View=&View
 ApplicationActionBarAdvisor_Progress=&Progress
 ApplicationWorkbenchAdvisor_CommunicationError=Communication Error
-ApplicationWorkbenchAdvisor_ConnectionLostMessage=Connection with NetXMS server was lost
+ApplicationWorkbenchAdvisor_ConnectionLostMessage=Connection with %s server was lost
 ApplicationWorkbenchAdvisor_OKToCloseMessage=. Press OK to close application.
-ApplicationWorkbenchAdvisor_ServerShutdownMessage=NetXMS server was shut down
+ApplicationWorkbenchAdvisor_ServerShutdownMessage=%s server was shut down
 ApplicationWorkbenchWindowAdvisor_AppTitle=NetXMS Management Console
 ApplicationWorkbenchWindowAdvisor_CannotChangePswd=Cannot change password:
 ApplicationWorkbenchWindowAdvisor_CertDialogTitle=Path to the certificate store
index 5426473..b5b7f48 100644 (file)
@@ -26,9 +26,9 @@ ApplicationActionBarAdvisor_Tools=&N\u00e1stroje
 ApplicationActionBarAdvisor_View=&Zobrazit
 ApplicationActionBarAdvisor_Window=&Okno
 ApplicationWorkbenchAdvisor_CommunicationError=Chyba komunikace
-ApplicationWorkbenchAdvisor_ConnectionLostMessage=Spojen\u00ed s NetXMS serverem bylo ztraceno
+ApplicationWorkbenchAdvisor_ConnectionLostMessage=Spojen\u00ed s %s serverem bylo ztraceno
 ApplicationWorkbenchAdvisor_OKToCloseMessage=. Stiskn\u011bte OK k zav\u0159en\u00ed aplikace.
-ApplicationWorkbenchAdvisor_ServerShutdownMessage=NetXMS server byl vypnut
+ApplicationWorkbenchAdvisor_ServerShutdownMessage=%s server byl vypnut
 ApplicationWorkbenchWindowAdvisor_AppTitle=NetXMS konzole pro spr\u00e1vu
 ApplicationWorkbenchWindowAdvisor_CannotChangePswd=Nelze zm\u011bnit heslo\:
 ApplicationWorkbenchWindowAdvisor_CertDialogTitle=Cesta k \u00falo\u017ei\u0161ti certifik\u00e1tu
@@ -45,6 +45,7 @@ ApplicationWorkbenchWindowAdvisor_NoEncryptionSupport=NetXMS server %s nepodporu
 ApplicationWorkbenchWindowAdvisor_NoEncryptionSupportDetails=NetXMS server na kter\u00fd se p\u0159\u00edpojujete nepodporuje \u0161ifrov\u00e1n\u00ed. Pokud budete pokra\u010dovat, tak bude informace obsahuj\u00edc\u00ed pov\u011b\u0159en\u00ed odesl\u00e1na jako prost\u00fd text a m\u016f\u017ee b\u00fdt snadno p\u0159e\u010dtena t\u0159et\u00ed stranou.\n\nKontaktujte sv\u00e9ho s\u00ed\u0165ov\u00e9ho administr\u00e1tora, nebo vlastn\u00edka NetXMS serveru.
 ApplicationWorkbenchWindowAdvisor_PasswordChanged=Heslo \u00fasp\u011b\u0161n\u011b zm\u011bn\u011bno
 ApplicationWorkbenchWindowAdvisor_PkcsFiles=PKCS12 soubor (*.p12, *.pfx)
+BrandingManager_ProductName=NetXMS
 ConsoleJob_ErrorDialogTitle=\u00daloha se nezda\u0159ila
 DataCollectionDisplayInfo_Float=Float
 DataCollectionDisplayInfo_Integer=Integer
index cb3dbfc..ae1677b 100644 (file)
@@ -26,9 +26,9 @@ ApplicationActionBarAdvisor_Tools=&Herramientas
 ApplicationActionBarAdvisor_View=&Vistas
 ApplicationActionBarAdvisor_Window=V&entanas
 ApplicationWorkbenchAdvisor_CommunicationError=Error de comunicaciones
-ApplicationWorkbenchAdvisor_ConnectionLostMessage=Se ha perdido conexi\u00f3n con el servidor NetXMS
+ApplicationWorkbenchAdvisor_ConnectionLostMessage=Se ha perdido conexi\u00f3n con el servidor %s
 ApplicationWorkbenchAdvisor_OKToCloseMessage=. Pulsar Aceptar para cerrar la aplicaci\u00f3n.
-ApplicationWorkbenchAdvisor_ServerShutdownMessage=Se detendr\u00e1 el servidor NetXMS
+ApplicationWorkbenchAdvisor_ServerShutdownMessage=Se detendr\u00e1 el servidor %s
 ApplicationWorkbenchWindowAdvisor_AppTitle=NetXMS Management Console
 ApplicationWorkbenchWindowAdvisor_CannotChangePswd=No es posible cambiar la contrase\u00f1a: 
 ApplicationWorkbenchWindowAdvisor_CertDialogTitle=Path to the certificate store
@@ -39,12 +39,13 @@ ApplicationWorkbenchWindowAdvisor_CertStorePasswordMsg=The selected store is pas
 ApplicationWorkbenchWindowAdvisor_ChangingPassword=Changing password...
 ApplicationWorkbenchWindowAdvisor_ConnectionError=Error de conexi\u00f3n
 ApplicationWorkbenchWindowAdvisor_Error=Error
-ApplicationWorkbenchWindowAdvisor_Exception=Exception
+ApplicationWorkbenchWindowAdvisor_Exception=Excepci\u00f3n
 ApplicationWorkbenchWindowAdvisor_Information=Informaci\u00f3n
 ApplicationWorkbenchWindowAdvisor_NoEncryptionSupport=NetXMS server %s does not support encryption. Do you want to connect anyway?
 ApplicationWorkbenchWindowAdvisor_NoEncryptionSupportDetails=NetXMS server you are connecting to does not support encryption. If you countinue, information containing your credentials will be sent in clear text and could easily be read by a third party.\n\nFor assistance, contact your network administrator or the owner of the NetXMS server.\n\n
 ApplicationWorkbenchWindowAdvisor_PasswordChanged=La contrase\u00f1a ha sido cambiada
 ApplicationWorkbenchWindowAdvisor_PkcsFiles=PKCS12 file (*.p12, *.pfx)
+BrandingManager_ProductName=NetXMS
 ConsoleJob_ErrorDialogTitle=El proceso ha fallado
 DataCollectionDisplayInfo_Float=Flotante
 DataCollectionDisplayInfo_Integer=Entero
index f2df61b..aba4e63 100644 (file)
@@ -9,7 +9,7 @@ Activator_TrayTooltip=\u041a\u043e\u043d\u0441\u043e\u043b\u044c \u0443\u043f\u0
 ApplicationActionBarAdvisor_About=&\u041e NetXMS
 ApplicationActionBarAdvisor_AboutActionName=&\u041e %s
 ApplicationActionBarAdvisor_AboutProductName=NetXMS
-ApplicationActionBarAdvisor_AboutText=\u041a\u043e\u043d\u0441\u043e\u043b\u044c \u0443\u043f\u0440\u0430\u0432\u043b\u0435\u043d\u0438\u044f NetXMS\n\u0412\u0435\u0440\u0441\u0438\u044f %s\n\u0412\u0441\u0435 \u043f\u0440\u0430\u0432\u0430 \u0437\u0430\u0449\u0438\u0449\u0435\u043d\u044b (c) 2003-2013 Raden Solutions
+ApplicationActionBarAdvisor_AboutText=\u041a\u043e\u043d\u0441\u043e\u043b\u044c \u0443\u043f\u0440\u0430\u0432\u043b\u0435\u043d\u0438\u044f NetXMS\n\u0412\u0435\u0440\u0441\u0438\u044f %s\n\u0412\u0441\u0435 \u043f\u0440\u0430\u0432\u0430 \u0437\u0430\u0449\u0438\u0449\u0435\u043d\u044b (c) 2003-2014 Raden Solutions
 ApplicationActionBarAdvisor_AboutTitle=\u041e NetXMS
 ApplicationActionBarAdvisor_Configuration=&\u041d\u0430\u0441\u0442\u0440\u043e\u0439\u043a\u0438
 ApplicationActionBarAdvisor_ConfirmRestart=\u041f\u043e\u0434\u0442\u0432\u0435\u0440\u0434\u0438\u0442\u044c \u043f\u0435\u0440\u0435\u0437\u0430\u0433\u0440\u0443\u0437\u043a\u0443
@@ -28,7 +28,7 @@ ApplicationActionBarAdvisor_Window=&\u041e\u043a\u043d\u043e
 ApplicationWorkbenchAdvisor_CommunicationError=\u041e\u0448\u0438\u0431\u043a\u0430 \u0441\u043e\u0435\u0434\u0438\u043d\u0435\u043d\u0438\u044f
 ApplicationWorkbenchAdvisor_ConnectionLostMessage=\u0421\u043e\u0435\u0434\u0438\u043d\u0435\u043d\u0438\u0435 \u0441 \u0441\u0435\u0440\u0432\u0435\u0440\u043e\u043c \u043f\u043e\u0442\u0435\u0440\u044f\u043d\u043e
 ApplicationWorkbenchAdvisor_OKToCloseMessage=\u041d\u0430\u0436\u043c\u0438\u0442\u0435 OK, \u0447\u0442\u043e\u0431\u044b \u0437\u0430\u043a\u0440\u044b\u0442\u044c \u043f\u0440\u0438\u043b\u043e\u0436\u0435\u043d\u0438\u0435.
-ApplicationWorkbenchAdvisor_ServerShutdownMessage=\u0421\u0435\u0440\u0432\u0435\u0440 NetXMS \u0437\u0430\u0432\u0435\u0440\u0448\u0438\u043b \u0440\u0430\u0431\u043e\u0442\u0443
+ApplicationWorkbenchAdvisor_ServerShutdownMessage=\u0421\u0435\u0440\u0432\u0435\u0440 %s \u0437\u0430\u0432\u0435\u0440\u0448\u0438\u043b \u0440\u0430\u0431\u043e\u0442\u0443
 ApplicationWorkbenchWindowAdvisor_AppTitle=NetXMS Management Console
 ApplicationWorkbenchWindowAdvisor_CannotChangePswd=\u041d\u0435 \u0443\u0434\u0430\u0435\u0442\u0441\u044f \u0438\u0437\u043c\u0435\u043d\u0438\u0442\u044c \u043f\u0430\u0440\u043e\u043b\u044c:
 ApplicationWorkbenchWindowAdvisor_CertDialogTitle=\u041f\u0443\u0442\u044c \u043a \u0445\u0440\u0430\u043d\u0438\u043b\u0438\u0449\u0443 \u043a\u043b\u044e\u0447\u0435\u0439 (\u0441\u0435\u0440\u0442\u0438\u0444\u0438\u043a\u0430\u0442\u043e\u0432)
@@ -45,6 +45,7 @@ ApplicationWorkbenchWindowAdvisor_NoEncryptionSupport=\u0421\u0435\u0440\u0432\u
 ApplicationWorkbenchWindowAdvisor_NoEncryptionSupportDetails=\u0421\u0435\u0440\u0432\u0435\u0440 NetXMS \u043d\u0435 \u043f\u043e\u0434\u0434\u0435\u0440\u0436\u0438\u0432\u0430\u0435\u0442 \u0448\u0438\u0444\u0440\u043e\u0432\u0430\u043d\u0438\u0435. \u0415\u0441\u043b\u0438 \u0412\u044b \u043f\u0440\u043e\u0434\u043e\u043b\u0436\u0438\u0442\u0435 \u0440\u0430\u0431\u043e\u0442\u0443 \u0441 \u0438\u0441\u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u043d\u0438\u0435\u043c \u043d\u0435\u0437\u0430\u0449\u0438\u0449\u0435\u043d\u043d\u043e\u0433\u043e \u0441\u043e\u0435\u0434\u0438\u043d\u0435\u043d\u0438\u044f, \u0442\u043e \u0412\u0430\u0448\u0438 \u043f\u0435\u0440\u0441\u043e\u043d\u0430\u043b\u044c\u043d\u044b\u0435 \u0434\u0430\u043d\u043d\u044b\u0435 \u0431\u0443\u0434\u0443\u0442 \u043f\u0435\u0440\u0435\u0434\u0430\u0432\u0430\u0442\u044c\u0441\u044f \u0432 \u043e\u0442\u043a\u0440\u044b\u0442\u043e\u043c \u0432\u0438\u0434\u0435.\n\n\u041e\u0431\u0440\u0430\u0442\u0438\u0442\u0435\u0441\u044c \u0437\u0430 \u043f\u043e\u043c\u043e\u0449\u044c\u044e \u043a \u0430\u0434\u043c\u0438\u043d\u0438\u0441\u0442\u0440\u0430\u0442\u043e\u0440\u0443 \u0441\u0435\u0442\u0438 \u0438\u043b\u0438 \u0432\u043b\u0430\u0434\u0435\u043b\u044c\u0446\u0443 \u0441\u0435\u0440\u0432\u0435\u0440\u0430.\n\n
 ApplicationWorkbenchWindowAdvisor_PasswordChanged=\u041f\u0430\u0440\u043e\u043b\u044c \u0438\u0437\u043c\u0435\u043d\u0435\u043d
 ApplicationWorkbenchWindowAdvisor_PkcsFiles=\u0424\u0430\u0439\u043b PKCS12 (*.p12, *.pfx)
+BrandingManager_ProductName=NetXMS
 ConsoleJob_ErrorDialogTitle=\u0421\u0431\u043e\u0439 \u0432\u044b\u043f\u043e\u043b\u043d\u0435\u043d\u0438\u044f \u0437\u0430\u0434\u0430\u043d\u0438\u044f
 DataCollectionDisplayInfo_Float=\u0414\u0440\u043e\u0431\u043d\u043e\u0435
 DataCollectionDisplayInfo_Integer=\u0426\u0435\u043b\u043e\u0435
index d24f781..786d433 100644 (file)
@@ -45,6 +45,7 @@ ApplicationWorkbenchWindowAdvisor_NoEncryptionSupport=NetXMS server %s does not
 ApplicationWorkbenchWindowAdvisor_NoEncryptionSupportDetails=NetXMS server you are connecting to does not support encryption. If you countinue, information containing your credentials will be sent in clear text and could easily be read by a third party.\n\nFor assistance, contact your network administrator or the owner of the NetXMS server.\n\n
 ApplicationWorkbenchWindowAdvisor_PasswordChanged=\u66f4\u6539\u53e3\u4ee4\u6210\u529f
 ApplicationWorkbenchWindowAdvisor_PkcsFiles=PKCS12 file (*.p12, *.pfx)
+BrandingManager_ProductName=NetXMS
 ConsoleJob_ErrorDialogTitle=Job failed
 DataCollectionDisplayInfo_Float=\u6d6e\u70b9\u6570
 DataCollectionDisplayInfo_Integer=\u6574\u6570
index 1f780c3..fabf9de 100644 (file)
@@ -218,13 +218,14 @@ public class MobileApplicationWorkbenchAdvisor extends WorkbenchAdvisor
                      @Override
                      public void run()
                      {
-                        MessageDialog.openError(
-                              PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(),
-                              Messages.get().ApplicationWorkbenchAdvisor_CommunicationError,
-                              ((n.getCode() == SessionNotification.CONNECTION_BROKEN) ? Messages.get().ApplicationWorkbenchAdvisor_ConnectionLostMessage
-                                    : Messages.get().ApplicationWorkbenchAdvisor_ServerShutdownMessage)
-                                    + Messages.get().ApplicationWorkbenchAdvisor_OKToCloseMessage);
-                        PlatformUI.getWorkbench().getActiveWorkbenchWindow().close();
+                        String productName = BrandingManager.getInstance().getProductName();
+                         MessageDialog.openError(
+                               PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(),
+                               Messages.get().ApplicationWorkbenchAdvisor_CommunicationError,
+                               ((n.getCode() == SessionNotification.CONNECTION_BROKEN) ? String.format(Messages.get().ApplicationWorkbenchAdvisor_ConnectionLostMessage, productName)
+                                     : String.format(Messages.get().ApplicationWorkbenchAdvisor_ServerShutdownMessage, productName))
+                                     + Messages.get().ApplicationWorkbenchAdvisor_OKToCloseMessage);
+                         PlatformUI.getWorkbench().getActiveWorkbenchWindow().close();
                      }
                   });
                }